X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=ca948d95b3c195e955ffa24bfd84d7a5aad7bc74;hb=ccd4c11ea1a43d079eaae9708482ef4a9148796c;hp=205d9a412b3427633d63d3e4ba0100762dec354e;hpb=a30abe26fc803900eaf5dc4c08a31aa1d3c9c89f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 205d9a412..ca948d95b 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,46 +1,36 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $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;
 	}
 };
 
@@ -50,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)
@@ -69,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;
@@ -88,7 +81,7 @@ class ModuleOperChans : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR | VF_COMMON);
+		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
 	}
 };