X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=d1111fd864584098ff4d1eff7d7919e6d6bc54b6;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=c4c95bcdc76e4464b34259a4d4524c421b8ba347;hpb=3382adb9e9a79748b4db09bb41a296861800fa2d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index c4c95bcdc..d1111fd86 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,38 +2,26 @@
  *       | 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 <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
 {
  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)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
@@ -62,31 +50,26 @@ 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_On005Numeric] = List[I_OnUserPreJoin] = 1;
-	}
-	
-	virtual void On005Numeric(std::string &output)
-	{
-	}
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+
+	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(520, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
 					return 1;
 				}
 			}
@@ -94,39 +77,16 @@ class ModuleOperChans : public Module
 		return 0;
 	}
 	
-    	virtual ~ModuleOperChans()
+	virtual ~ModuleOperChans()
 	{
-		DELETE(oc);
+		ServerInstance->Modes->DelMode(oc);
+		delete oc;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
 	}
 };
 
-
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
-	{
-	}
-	
-	~ModuleOperChansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperChans(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)