A ton more clear() and empty() stuff thats been lingering on the long term todo for...

[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 3bbcaeda4be45155c6dfca36978872cf8048ae48..5dd406e54fbe5e395a2dcd7b494389bb074c602e 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,26 +1,21 @@
-/*     +------------------------------------+
- *     | Inspire Internet Relay Chat Daemon |
- *     +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *             <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- * the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "mode.h"
-#include "inspircd.h"
 #include "u_listmode.h"
 #include "wildcard.h"
 
@@ -52,16 +47,18 @@ class ModuleBanException : public Module
 
 public:
        ModuleBanException(InspIRCd* Me)
-       : Module::Module(Me)
+       : Module(Me)
        {
                be = new BanException(ServerInstance);
-               ServerInstance->AddMode(be, 'e');
+               if (!ServerInstance->AddMode(be, 'e'))
+                       throw ModuleException("Could not add new modes!");
+               ServerInstance->PublishInterface("ChannelBanList", this);
        }
        
        virtual void Implements(char* List)
        {
                be->DoImplements(List);
-               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)
@@ -82,7 +79,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;
@@ -110,11 +107,36 @@ public:
                be->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(const std::string &param)
+       virtual void OnRehash(userrec* user, const std::string &param)
        {
                be->DoRehash();
        }
-       
+
+       virtual 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)
+                       {
+                               char mask[MAXBUF];
+                               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 (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();
+                                       }
+                               }
+                               return NULL;
+                       }
+               }
+               return NULL;
+       }
+
        virtual Version GetVersion()
        {
                return Version(1, 1, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
@@ -123,7 +145,8 @@ public:
        virtual ~ModuleBanException()
        {
                ServerInstance->Modes->DelMode(be);
-               DELETE(be);     
+               DELETE(be);
+               ServerInstance->UnpublishInterface("ChannelBanList", this);
        }
 };
 
@@ -145,7 +168,8 @@ class ModuleBanExceptionFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleBanExceptionFactory;
 }
+