X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=0b074ebab4247a183ea2360d7def1f986015a15b;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=2bb1299c94818ed8b2dd1e69397c02074501edaa;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 2bb1299c9..0b074ebab 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,133 +1,74 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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 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/>.
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 #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(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* 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;
 	}
 };
 
 class ModuleOperChans : public Module
 {
-	
-	OperChans* oc;
+	OperChans oc;
  public:
-	ModuleOperChans(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleOperChans() : oc(this)
 	{
-				
-		oc = new OperChans(ServerInstance);
-		ServerInstance->AddMode(oc, 'O');
 	}
 
-	void Implements(char* List)
-	{
-		List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
-	}
-	
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->Modes->InsertMode(output,"O",4);
-	}
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
-		if (!*user->oper)
+		if (chan && chan->IsModeSet(oc) && !user->IsOper())
 		{
-			if (chan)
-			{
-				if (chan->IsModeSet('O'))
-				{
-					user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
-					return 1;
-				}
-			}
+			user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only IRC operators may join %s (+O is set)", chan->name.c_str()));
+			return MOD_RES_DENY;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
-	
-    	virtual ~ModuleOperChans()
-	{
-		DELETE(oc);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-	}
-};
-
 
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
 	{
+		if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
+		{
+			if (user->IsOper() && InspIRCd::Match(user->oper->name, mask.substr(2)))
+				return MOD_RES_DENY;
+		}
+		return MOD_RES_PASSTHRU;
 	}
-	
-	~ModuleOperChansFactory()
+
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["EXTBAN"].push_back('O');
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleOperChans(Me);
+		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)