dz is determined to crash your ircd :P

[user/henk/code/inspircd.git] / src / modules / m_banexception.cpp

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 3fc192cb5eb510158fb6d80642b5dd7db584e963..4f36fb8c9f0cb84e8e2f9fea26bd4aef5999b6f5 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -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"
@@ -54,13 +48,13 @@ public:
                be = new BanException(ServerInstance);
                if (!ServerInstance->AddMode(be, 'e'))
                        throw ModuleException("Could not add new modes!");
-               ServerInstance->PublishInterface("ChannelBanList", this);
+               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
        }
        
        virtual void Implements(char* List)
        {
                be->DoImplements(List);
-               List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+               List[I_OnRehash] = List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckBan] = 1;
        }
        
        virtual void On005Numeric(std::string &output)
@@ -114,12 +108,12 @@ public:
                be->DoRehash();
        }
 
-        virtual char* OnRequest(Request* request)
+       virtual 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)
                        {
@@ -147,30 +141,9 @@ public:
        virtual ~ModuleBanException()
        {
                ServerInstance->Modes->DelMode(be);
-               DELETE(be);
-               ServerInstance->UnpublishInterface("ChannelBanList", this);
+               delete be;
+               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleBanExceptionFactory()
-       {
-       }
-       
-       ~ModuleBanExceptionFactory()
-       {
-       }
-       
-       virtual Module* CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBanException(Me);
-       }
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)