Add extra /map info (connection uptime, and lag time) to /MAP for opers. Adds feature...

[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 ba582555d89241c785a5b6d953f3feba9aac3dc4..8cca13b1e95f72573d21af91bf29f4520e20fd9c 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,14 +1,26 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *         the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include <string>
 #include <vector>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "mode.h"
-
 #include "u_listmode.h"
 
 /* $ModDesc: Provides support for the +I channel mode */
+/* $ModDep: ../../include/u_listmode.h */
 
 /*
  * Written by Om <om@inspircd.org>, April 2005.
@@ -17,10 +29,13 @@
  * The +I channel mode takes a nick!ident@host, glob patterns allowed,
  * and if a user matches an entry on the +I list then they can join the channel,
  * ignoring if +i is set on the channel
+ * Now supports CIDR and IP addresses -- Brain
  */
 
 class InspIRCd* ServerInstance;
 
+/** Handles channel mode +I
+ */
 class InviteException : public ListModeBase
 {
  public:
@@ -30,25 +45,24 @@ class InviteException : public ListModeBase
 class ModuleInviteException : public Module
 {
        InviteException* ie;
-       
-
 public:
        ModuleInviteException(InspIRCd* Me) : Module(Me)
        {
                ie = new InviteException(ServerInstance);
-               ServerInstance->AddMode(ie, 'I');
+               if (!ServerInstance->AddMode(ie, 'I'))
+                       throw ModuleException("Could not add new modes!");
+               ServerInstance->PublishInterface("ChannelBanList", this);
        }
-       
+
        virtual void Implements(char* List)
        {
                ie->DoImplements(List);
-               List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
+               List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
        }
        
        virtual void On005Numeric(std::string &output)
        {
                output.append(" INVEX=I");
-               ServerInstance->Modes->InsertMode(output, "I", 1);
        }
         
        virtual int OnCheckInvite(userrec* user, chanrec* chan)
@@ -59,9 +73,11 @@ public:
                        chan->GetExt(ie->GetInfoKey(), list);
                        if (list)
                        {
+                               char mask[MAXBUF];
+                               snprintf(mask, MAXBUF, "%s!%s@%s", 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()))
+                                       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;
@@ -74,6 +90,31 @@ public:
                return 0;               
        }
 
+       virtual 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;
+       }
+
        virtual void OnCleanup(int target_type, void* item)
        {
                ie->DoCleanup(target_type, item);
@@ -89,14 +130,21 @@ public:
                ie->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(const std::string &param)
+       virtual void OnRehash(userrec* user, const std::string &param)
        {
                ie->DoRehash();
        }
                
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
+               return Version(1, 1, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION);
+       }
+
+       ~ModuleInviteException()
+       {
+               ServerInstance->Modes->DelMode(ie);
+               DELETE(ie);
+               ServerInstance->UnpublishInterface("ChannelBanList", this);
        }
 };