Update copyrights for 2009.

[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 0450760d717cf458c6ffc8ab70893fdd6a5b9555..af30860165499668501c90f1e0595ebafb69ec7f 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -34,7 +34,7 @@ class InspIRCd* ServerInstance;
 class InviteException : public ListModeBase
 {
  public:
-       InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
+       InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
 };
 
 class ModuleInviteException : public Module
@@ -44,22 +44,20 @@ public:
        ModuleInviteException(InspIRCd* Me) : Module(Me)
        {
                ie = new InviteException(ServerInstance);
-               if (!ServerInstance->AddMode(ie))
+               if (!ServerInstance->Modes->AddMode(ie))
                        throw ModuleException("Could not add new modes!");
                ServerInstance->Modules->PublishInterface("ChannelBanList", this);
-       }
 
-       virtual void Implements(char* List)
-       {
-               ie->DoImplements(List);
-               List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
+               ie->DoImplements(this);
+               Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
-       
+
        virtual void On005Numeric(std::string &output)
        {
                output.append(" INVEX=I");
        }
-        
+
        virtual int OnCheckInvite(User* user, Channel* chan)
        {
                if(chan != NULL)
@@ -68,11 +66,10 @@ public:
                        chan->GetExt(ie->GetInfoKey(), list);
                        if (list)
                        {
-                               char mask[MAXBUF];
-                               snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
+                               std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
                                for (modelist::iterator it = list->begin(); it != list->end(); it++)
                                {
-                                       if(match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
+                                       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;
@@ -82,32 +79,12 @@ public:
                        // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
                }
 
-               return 0;               
+               return 0;
        }
 
-       virtual char* OnRequest(Request* request)
+       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)
-                       {
-                               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;
+               return ie->DoOnRequest(request);
        }
 
        virtual void OnCleanup(int target_type, void* item)
@@ -129,16 +106,16 @@ public:
        {
                ie->DoRehash();
        }
-               
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 
        ~ModuleInviteException()
        {
                ServerInstance->Modes->DelMode(ie);
-               DELETE(ie);
+               delete ie;
                ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };