X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=7c33e489e80881df653038967ba4f6d61fa57568;hb=caa89fb37c532930805f0b144e3298624ec1adec;hp=3fc192cb5eb510158fb6d80642b5dd7db584e963;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 3fc192cb5..7c33e489e 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
 #include "inspircd.h"
 #include "u_listmode.h"
 #include "wildcard.h"
@@ -48,19 +42,17 @@ class ModuleBanException : public Module
 	
 
 public:
-	ModuleBanException(InspIRCd* Me)
-	: Module(Me)
+	ModuleBanException(InspIRCd* Me) : Module(Me)
 	{
 		be = new BanException(ServerInstance);
-		if (!ServerInstance->AddMode(be, 'e'))
+		if (!ServerInstance->Modes->AddMode(be))
 			throw ModuleException("Could not add new modes!");
-		ServerInstance->PublishInterface("ChannelBanList", this);
-	}
-	
-	virtual void Implements(char* List)
-	{
-		be->DoImplements(List);
-		List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+		be->DoImplements(this);
+		Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan };
+		Me->Modules->Attach(list, this, 4);
+
 	}
 	
 	virtual void On005Numeric(std::string &output)
@@ -68,7 +60,7 @@ public:
 		output.append(" EXCEPTS=e");
 	}
 
-	virtual int OnCheckBan(userrec* user, chanrec* chan)
+	virtual int OnCheckBan(User* user, Channel* chan)
 	{
 		if (chan != NULL)
 		{
@@ -99,27 +91,27 @@ public:
 		be->DoCleanup(target_type, item);
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		be->DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		be->DoChannelDelete(chan);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		be->DoRehash();
 	}
 
-        virtual char* OnRequest(Request* request)
+	virtual const char* OnRequest(Request* request)
 	{
 		ListModeRequest* LM = (ListModeRequest*)request;
 		if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
 		{
-                        modelist* list;
+			modelist* list;
 			LM->chan->GetExt(be->GetInfoKey(), list);
 			if (list)
 			{
@@ -141,36 +133,15 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 	virtual ~ModuleBanException()
 	{
 		ServerInstance->Modes->DelMode(be);
-		DELETE(be);
-		ServerInstance->UnpublishInterface("ChannelBanList", this);
-	}
-};
-
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleBanExceptionFactory()
-	{
-	}
-	
-	~ModuleBanExceptionFactory()
-	{
-	}
-	
-	virtual Module* CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBanException(Me);
+		delete be;
+		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)