X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=b8f7f2415d269a6e1c3b003dda34bcfe40ddf6fc;hb=117742632909d9bfd71fc4feb3304263558101b7;hp=461b7bece4d7e7f4d3f113221b6e82bd168672d1;hpb=fe23c1d1817b207e7ce311e11ecab18471ed20b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 461b7bece..b8f7f2415 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,103 +1,101 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-Server *Srv;
-	 
-
-class ModuleOperChans : public Module
+class OperChans : public ModeHandler
 {
  public:
-	ModuleOperChans()
-	{
-		Srv = new Server;
+	/* This is an oper-only mode */
+	OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
 
-		// Add a mode +O for channels with no parameters		
-		Srv->AddExtendedMode('Z',MT_CHANNEL,false,0,0);
-	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
-		if ((modechar == 'O') && (type == MT_CHANNEL))
+		if (adding)
 		{
-			chanrec* chan = (chanrec*)target;
-			
-			if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")) || (strchr(source->modes,'o')))
+			if (!channel->IsModeSet('O'))
 			{
-				return 1;
+				channel->SetMode('O',true);
+				return MODEACTION_ALLOW;
 			}
-			else
+		}
+		else
+		{
+			if (channel->IsModeSet('O'))
 			{
-				// eat the mode change, return an error
-				WriteServ(user->fd,"468 %s %s :Only servers and opers may set channel mode +O",user->nick, chan->name);
-				return -1;
+				channel->SetMode('O',false);
+				return MODEACTION_ALLOW;
 			}
-	
-			// must return 1 to handle the mode!
-			return 1;
 		}
-		
-		return 0;
+
+		return MODEACTION_DENY;
 	}
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+};
+
+class ModuleOperChans : public Module
+{
+
+	OperChans* oc;
+ public:
+	ModuleOperChans(InspIRCd* Me)
+		: Module(Me)
 	{
-		if (!strchr(user->modes,'o'))
+
+		oc = new OperChans(ServerInstance);
+		if (!ServerInstance->Modes->AddMode(oc))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
+	}
+
+
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	{
+		if (!IS_OPER(user))
 		{
 			if (chan)
 			{
-				if (chan->IsCustomModeSet('O'))
+				if (chan->IsModeSet('O'))
 				{
-					WriteServ(user->fd,"520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
+					user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
 					return 1;
 				}
 			}
 		}
+		else
+		{
+			if (chan && chan->IsExtBanned(user->oper, 'O'))
+			{
+				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
+				return 1;
+			}
+		}
+
 		return 0;
 	}
-	
-    	virtual ~ModuleOperChans()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
-	}
-
-};
-
 
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
-	{
-	}
-	
-	~ModuleOperChansFactory()
+	virtual ~ModuleOperChans()
 	{
+		ServerInstance->Modes->DelMode(oc);
+		delete oc;
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual Version GetVersion()
 	{
-		return new ModuleOperChans;
+		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)