Allow commands to optionally route themselves using ENCAP

[user/henk/code/inspircd.git] / src / modules / m_inviteexception.cpp

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 3ea1c83fc62e5eae0c6d4b6c80f7b4e0ef317dae..5acdf4f97f63e0872f75b34c7f6bb88780163d45 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.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.
@@ -39,16 +39,15 @@ class InviteException : public ListModeBase
 
 class ModuleInviteException : public Module
 {
-       InviteException* ie;
+       InviteException ie;
 public:
-       ModuleInviteException(InspIRCd* Me) : Module(Me)
+       ModuleInviteException(InspIRCd* Me) : Module(Me), ie(Me)
        {
-               ie = new InviteException(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(ie))
+               if (!ServerInstance->Modes->AddMode(&ie))
                        throw ModuleException("Could not add new modes!");
                ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
-               ie->DoImplements(this);
+               ie.DoImplements(this);
                Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
@@ -63,7 +62,7 @@ public:
                if(chan != NULL)
                {
                        modelist* list;
-                       chan->GetExt(ie->GetInfoKey(), list);
+                       chan->GetExt(ie.GetInfoKey(), list);
                        if (list)
                        {
                                std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
@@ -84,57 +83,37 @@ public:
 
        virtual const char* OnRequest(Request* request)
        {
-               ListModeRequest* LM = (ListModeRequest*)request;
-               if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
-               {
-                       modelist* list;
-                       LM->chan->GetExt(ie->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.c_str()) || (InspIRCd::MatchCIDR(mask, it->mask)))
-                                       {
-                                               // They match an entry
-                                               return (char*)it->mask.c_str();
-                                       }
-                               }
-                               return NULL;
-                       }
-               }
-               return NULL;
+               return ie.DoOnRequest(request);
        }
 
        virtual void OnCleanup(int target_type, void* item)
        {
-               ie->DoCleanup(target_type, item);
+               ie.DoCleanup(target_type, item);
        }
 
        virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
-               ie->DoSyncChannel(chan, proto, opaque);
+               ie.DoSyncChannel(chan, proto, opaque);
        }
 
        virtual void OnChannelDelete(Channel* chan)
        {
-               ie->DoChannelDelete(chan);
+               ie.DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(User* user, const std::string &param)
+       virtual void OnRehash(User* user)
        {
-               ie->DoRehash();
+               ie.DoRehash();
        }
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 
        ~ModuleInviteException()
        {
-               ServerInstance->Modes->DelMode(ie);
-               delete ie;
+               ServerInstance->Modes->DelMode(&ie);
                ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };