Fix comparator logic for ordering by channel

[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 bf208518238b6c940419b1d3a2df8357e07f0568..7531c5c1250bc3cd6d01845f6c339cd0fd9e5b3d 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -52,13 +52,15 @@ class ModuleBanException : public Module
 public:
        ModuleBanException() : be(this)
        {
-               if (!ServerInstance->Modes->AddMode(&be))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(be);
 
                be.DoImplements(this);
                Implementation list[] = { I_OnRehash, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
-               ServerInstance->Modules->Attach(list, this, 4);
-
+               ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
        }
 
        void On005Numeric(std::string &output)
@@ -77,7 +79,7 @@ public:
 
                        for (modelist::iterator it = list->begin(); it != list->end(); it++)
                        {
-                               if (it->mask[0] != type || it->mask[1] != ':')
+                               if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
                                        continue;
 
                                if (chan->CheckBan(user, it->mask.substr(2)))
@@ -115,11 +117,6 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       void OnCleanup(int target_type, void* item)
-       {
-               be.DoCleanup(target_type, item);
-       }
-
        void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                be.DoSyncChannel(chan, proto, opaque);