X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_operchans.cpp;h=207c468b14583e48f6c49f27b40a18d0ba7bde82;hb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;hp=97fd9ac73980cf75a4c1fc1f3d6f6b2e31285e75;hpb=4b0f6c610f755e0cb93843d5a2a6c70336eafe39;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 97fd9ac73..207c468b1 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,23 +2,15 @@
  *       | 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-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
@@ -29,7 +21,7 @@ class OperChans : public ModeHandler
 	/* 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)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
@@ -54,72 +46,56 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-	
+
 	OperChans* oc;
  public:
 	ModuleOperChans(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-				
+
 		oc = new OperChans(ServerInstance);
-		ServerInstance->AddMode(oc, 'O');
+		if (!ServerInstance->Modes->AddMode(oc))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreJoin] = 1;
-	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		if (!*user->oper)
+		if (!IS_OPER(user))
 		{
 			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);
+					user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
 					return 1;
 				}
 			}
 		}
+		else
+		{
+			if (chan && chan->IsExtBanned(user->oper, 'O'))
+			{
+				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
+				return 1;
+			}
+		}
+
 		return 0;
 	}
-	
-    	virtual ~ModuleOperChans()
+
+	virtual ~ModuleOperChans()
 	{
 		ServerInstance->Modes->DelMode(oc);
-		DELETE(oc);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+		delete oc;
 	}
-};
-
 
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
-	{
-	}
-	
-	~ModuleOperChansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+	virtual Version GetVersion()
 	{
-		return new ModuleOperChans(Me);
+		return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)