More AddModes fixes

[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 d36d23c68ce4fc1bec97c22849a5d8ef23aac4a5..8bd53d62d2b64ed7199def1873fcc50c4d37dd36 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"
@@ -49,18 +43,18 @@ class ModuleBanException : public Module
 
 public:
        ModuleBanException(InspIRCd* Me)
-       : Module::Module(Me)
+       : Module(Me)
        {
                be = new BanException(ServerInstance);
-               if (!ServerInstance->AddMode(be, 'e'))
+               if (!ServerInstance->AddMode(be))
                        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)
@@ -68,7 +62,7 @@ public:
                output.append(" EXCEPTS=e");
        }
 
-       virtual int OnCheckBan(userrec* user, chanrec* chan)
+       virtual int OnCheckBan(User* user, Channel* chan)
        {
                if (chan != NULL)
                {
@@ -81,7 +75,7 @@ public:
                                snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
                                for (modelist::iterator it = list->begin(); it != list->end(); it++)
                                {
-                                       if (ServerInstance->MatchText(user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(user->GetFullHost(), it->mask) || (match(mask, it->mask.c_str(), true)))
+                                       if (match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
                                        {
                                                // They match an entry on the list, so let them in.
                                                return 1;
@@ -99,27 +93,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 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)
                        {
@@ -127,8 +121,7 @@ public:
                                snprintf(mask, MAXBUF, "%s!%s@%s", LM->user->nick, LM->user->ident, LM->user->GetIPString());
                                for (modelist::iterator it = list->begin(); it != list->end(); it++)
                                {
-                                       if (ServerInstance->MatchText(LM->user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(LM->user->GetFullHost(), it->mask) ||
-                                                       (match(mask, it->mask.c_str(), true)))
+                                       if (match(LM->user->GetFullRealHost(), it->mask.c_str()) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
                                        {
                                                // They match an entry
                                                return (char*)it->mask.c_str();
@@ -148,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" void * init_module( void )
-{
-       return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)