X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=4f73e096984fcfb6108edfe66af66e97aae44f74;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=69876cfcf9b8a405592e9514a01d63021f4b564a;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 69876cfcf..4f73e0969 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
@@ -22,9 +19,9 @@ class OperChans : public ModeHandler
 {
  public:
 	/* This is an oper-only mode */
-	OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
+	OperChans(Module* Creator) : ModeHandler(Creator, "operonly", 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -49,72 +46,50 @@ class OperChans : public ModeHandler
 
 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');
+		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);
 	}
 
-	void Implements(char* List)
+	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		List[I_OnUserPreJoin] = 1;
+		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;
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		if (!*user->oper)
+		if (mask[0] == 'O' && mask[1] == ':')
 		{
-			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;
-				}
-			}
+			if (IS_OPER(user) && InspIRCd::Match(user->oper, mask.substr(2)))
+				return MOD_RES_DENY;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
-	
-    	virtual ~ModuleOperChans()
-	{
-		ServerInstance->Modes->DelMode(oc);
-		DELETE(oc);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
-	}
-};
 
-
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
+	void On005Numeric(std::string &output)
 	{
+		ServerInstance->AddExtBanChar('O');
 	}
-	
-	~ModuleOperChansFactory()
+
+	~ModuleOperChans()
 	{
 	}
-	
-	virtual Module * CreateModule(InspIRCd* 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 | VF_COMMON);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)