Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 5f2f6f92a68f44b74c53e748c6f28dd67bc5a2e6..3bbcaeda4be45155c6dfca36978872cf8048ae48 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,15 +1,31 @@
-#include <stdio.h>
+/*     +------------------------------------+
+ *     | Inspire Internet Relay Chat Daemon |
+ *     +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * 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 "inspircd.h"
 #include "u_listmode.h"
+#include "wildcard.h"
 
 /* $ModDesc: Provides support for the +e channel mode */
+/* $ModDep: ../../include/u_listmode.h */
 
 /* Written by Om<om@inspircd.org>, April 2005. */
 /* Rewritten to use the listmode utility by Om, December 2005 */
@@ -17,9 +33,11 @@
 
 // The +e channel mode takes a nick!ident@host, glob patterns allowed,
 // and if a user matches an entry on the +e list then they can join the channel, overriding any (+b) bans set on them
+// Now supports CIDR and IP addresses -- Brain
 
 
-
+/** Handles +e channel mode
+ */
 class BanException : public ListModeBase
 {
  public:
@@ -53,17 +71,23 @@ public:
 
        virtual int OnCheckBan(userrec* user, chanrec* chan)
        {
-               if(chan != NULL)
+               if (chan != NULL)
                {
                        modelist* list;
                        chan->GetExt(be->GetInfoKey(), list);
                        
-                       if(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(ServerInstance->MatchText(user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(user->GetFullHost(), it->mask))
+                               {
+                                       if (ServerInstance->MatchText(user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(user->GetFullHost(), it->mask) || (match(mask, it->mask.c_str(), true)))
+                                       {
                                                // They match an entry on the list, so let them in.
                                                return 1;
+                                       }
+                               }
                                return 0;
                        }
                        // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
@@ -93,11 +117,12 @@ public:
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
+               return Version(1, 1, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
        virtual ~ModuleBanException()
        {
+               ServerInstance->Modes->DelMode(be);
                DELETE(be);     
        }
 };