X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=ca948d95b3c195e955ffa24bfd84d7a5aad7bc74;hb=fc4fc43ec232407b38d7ca182cb92c5cac4287aa;hp=074c644e13d0130a631b861bd7c25204aa8a9567;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 074c644e1..ca948d95b 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -24,32 +24,13 @@
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-class OperChans : public ModeHandler
+class OperChans : public SimpleChannelModeHandler
 {
  public:
 	/* This is an oper-only mode */
-	OperChans(Module* Creator) : ModeHandler(Creator, "operonly", 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	OperChans(Module* Creator) : SimpleChannelModeHandler(Creator, "operonly", 'O')
 	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('O'))
-			{
-				channel->SetMode('O',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('O'))
-			{
-				channel->SetMode('O',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
+		oper = true;
 	}
 };
 
@@ -59,10 +40,13 @@ class ModuleOperChans : public Module
  public:
 	ModuleOperChans() : oc(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&oc))
-			throw ModuleException("Could not add new modes!");
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(oc);
 		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
@@ -78,7 +62,7 @@ class ModuleOperChans : public Module
 
 	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		if (mask[0] == 'O' && mask[1] == ':')
+		if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
 		{
 			if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
 				return MOD_RES_DENY;