Add initial query support to m_mysql [patch by Athenon]

[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 c26e111555f8de83e8181a6428f370bab33c1899..dafa47d2c8d66f4be6da148bc31c8d204f7035bb 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -31,24 +31,22 @@
 class BanException : public ListModeBase
 {
  public:
-       BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { }
+       BanException(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'e', "End of Channel Exception List", 348, 349, true) { }
 };
 
 
 class ModuleBanException : public Module
 {
-       BanException* be;
-
+       BanException be;
 
 public:
-       ModuleBanException(InspIRCd* Me) : Module(Me)
+       ModuleBanException(InspIRCd* Me) : Module(Me), be(Me, this)
        {
-               be = new BanException(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(be))
+               if (!ServerInstance->Modes->AddMode(&be))
                        throw ModuleException("Could not add new modes!");
                ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
-               be->DoImplements(this);
+               be.DoImplements(this);
                Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan, I_OnCheckExtBan, I_OnCheckStringExtBan };
                Me->Modules->Attach(list, this, 6);
 
@@ -59,15 +57,15 @@ public:
                output.append(" EXCEPTS=e");
        }
 
-       virtual int OnCheckExtBan(User *user, Channel *chan, char type)
+       virtual ModResult OnCheckExtBan(User *user, Channel *chan, char type)
        {
                if (chan != NULL)
                {
                        modelist *list;
-                       chan->GetExt(be->GetInfoKey(), list);
+                       chan->GetExt(be.GetInfoKey(), list);
 
                        if (!list)
-                               return 0;
+                               return MOD_RES_PASSTHRU;
 
                        std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
                        for (modelist::iterator it = list->begin(); it != list->end(); it++)
@@ -80,23 +78,23 @@ public:
                                if (InspIRCd::Match(user->GetFullRealHost(), maskptr) || InspIRCd::Match(user->GetFullHost(), maskptr) || (InspIRCd::MatchCIDR(mask, maskptr)))
                                {
                                        // They match an entry on the list, so let them pass this.
-                                       return 1;
+                                       return MOD_RES_ALLOW;
                                }
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
+       virtual ModResult OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
        {
                if (chan != NULL)
                {
                        modelist *list;
-                       chan->GetExt(be->GetInfoKey(), list);
+                       chan->GetExt(be.GetInfoKey(), list);
 
                        if (!list)
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        for (modelist::iterator it = list->begin(); it != list->end(); it++)
                        {
                                if (it->mask[0] != type || it->mask[1] != ':')
@@ -105,24 +103,24 @@ public:
                                std::string maskptr = it->mask.substr(2);
                                if (InspIRCd::Match(str, maskptr))
                                        // They match an entry on the list, so let them in.
-                                       return 1;
+                                       return MOD_RES_ALLOW;
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnCheckBan(User* user, Channel* chan)
+       virtual ModResult OnCheckBan(User* user, Channel* chan)
        {
                if (chan != NULL)
                {
                        modelist* list;
-                       chan->GetExt(be->GetInfoKey(), list);
+                       chan->GetExt(be.GetInfoKey(), list);
 
                        if (!list)
                        {
                                // No list, proceed normally
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        }
 
                        std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
@@ -131,36 +129,36 @@ public:
                                if (InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
                                {
                                        // They match an entry on the list, so let them in.
-                                       return 1;
+                                       return MOD_RES_ALLOW;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnCleanup(int target_type, void* item)
        {
-               be->DoCleanup(target_type, item);
+               be.DoCleanup(target_type, item);
        }
 
        virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
-               be->DoSyncChannel(chan, proto, opaque);
+               be.DoSyncChannel(chan, proto, opaque);
        }
 
        virtual void OnChannelDelete(Channel* chan)
        {
-               be->DoChannelDelete(chan);
+               be.DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(User* user, const std::string &param)
+       virtual void OnRehash(User* user)
        {
-               be->DoRehash();
+               be.DoRehash();
        }
 
        virtual const char* OnRequest(Request* request)
        {
-               return be->DoOnRequest(request);
+               return be.DoOnRequest(request);
        }
 
        virtual Version GetVersion()
@@ -170,8 +168,7 @@ public:
 
        virtual ~ModuleBanException()
        {
-               ServerInstance->Modes->DelMode(be);
-               delete be;
+               ServerInstance->Modes->DelMode(&be);
                ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };