X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=f31979cea8dd78049d356a1768febdb299987836;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=21e360b1da6e80a8f9a9bf2e0a965045017d5e07;hpb=e2e581f0d3d5d844dc4b5210f566e5a5571a0570;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 21e360b1d..f31979cea 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,123 +2,94 @@
  *       | Inspire 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.
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-class ModuleOperChans : public Module
+class OperChans : public ModeHandler
 {
-	Server* Srv;
  public:
-	ModuleOperChans(Server* Me)
-		: Module::Module(Me)
-	{
-		Srv = Me;
-		// Add a mode +O for channels with no parameters		
-		Srv->AddExtendedMode('O',MT_CHANNEL,false,0,0);
-	}
+	/* This is an oper-only mode */
+	OperChans(Module* Creator) : ModeHandler(Creator, "operonly", 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
 
-	void Implements(char* List)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
-	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		if ((modechar == 'O') && (type == MT_CHANNEL))
+		if (adding)
 		{
-			chanrec* chan = (chanrec*)target;
-			
-			if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!*user->server) || (*user->oper))
-			{
-				log(DEBUG,"Allowing mode +O");
-				return 1;
-			}
-			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 0;
+				channel->SetMode('O',true);
+				return MODEACTION_ALLOW;
 			}
-	
-			// must return 1 to handle the mode!
-			return 1;
 		}
-		
-		return 0;
-	}
-
-        virtual void On005Numeric(std::string &output)
-        {
-		InsertMode(output,"O",4);
-        }
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
-	{
-		if (!*user->oper)
+		else
 		{
-			if (chan)
+			if (channel->IsModeSet('O'))
 			{
-				if (chan->IsCustomModeSet('O'))
-				{
-					WriteServ(user->fd,"520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
-					return 1;
-				}
+				channel->SetMode('O',false);
+				return MODEACTION_ALLOW;
 			}
 		}
-		return 0;
+
+		return MODEACTION_DENY;
 	}
-	
-    	virtual ~ModuleOperChans()
+};
+
+class ModuleOperChans : public Module
+{
+	OperChans oc;
+ public:
+	ModuleOperChans() : oc(this)
 	{
+		if (!ServerInstance->Modes->AddMode(&oc))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
-	
-	virtual Version GetVersion()
+
+	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		if (chan && chan->IsModeSet('O') && !IS_OPER(user))
+		{
+			user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
+				user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+			return MOD_RES_DENY;
+		}
+		return MOD_RES_PASSTHRU;
 	}
-};
 
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
+	{
+		if (mask[0] == 'O' && mask[1] == ':')
+		{
+			if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
+				return MOD_RES_DENY;
+		}
+		return MOD_RES_PASSTHRU;
+	}
 
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
+	void On005Numeric(std::string &output)
 	{
+		ServerInstance->AddExtBanChar('O');
 	}
-	
-	~ModuleOperChansFactory()
+
+	~ModuleOperChans()
 	{
 	}
-	
-	virtual Module * CreateModule(Server* Me)
+
+	Version GetVersion()
 	{
-		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)