Use loopCall to protect OnUserKick rather than the triggerevents hack

[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 7ad8a1fdd5e5d3749edf6cfb795a85fef733cb4d..c26e111555f8de83e8181a6428f370bab33c1899 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -104,7 +104,8 @@ public:
 
                                std::string maskptr = it->mask.substr(2);
                                if (InspIRCd::Match(str, maskptr))
-                                       return 1; // matches
+                                       // They match an entry on the list, so let them in.
+                                       return 1;
                        }
                }
 
@@ -159,31 +160,12 @@ public:
 
        virtual const char* OnRequest(Request* request)
        {
-               ListModeRequest* LM = (ListModeRequest*)request;
-               if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
-               {
-                       modelist* list;
-                       LM->chan->GetExt(be->GetInfoKey(), list);
-                       if (list)
-                       {
-                               std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
-                               for (modelist::iterator it = list->begin(); it != list->end(); it++)
-                               {
-                                       if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
-                                       {
-                                               // They match an entry
-                                               return (char*)it->mask.c_str();
-                                       }
-                               }
-                               return NULL;
-                       }
-               }
-               return NULL;
+               return be->DoOnRequest(request);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        virtual ~ModuleBanException()