Eliminate duplicate names between user and channel modes

[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 cb6e5784998883482fa86e12264c8684e0a2ca10..ddf2fcb87efc7fb3c6e11224af263dedfd45998f 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,13 +1,21 @@
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 #include "u_listmode.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 */
@@ -15,73 +23,107 @@
 
 // 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
 
 
-class ModuleBanException : public ListModeBaseModule
+/** Handles +e channel mode
+ */
+class BanException : public ListModeBase
 {
+ public:
+       BanException(Module* Creator) : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true) { }
+};
+
+
+class ModuleBanException : public Module
+{
+       BanException be;
+
 public:
-       ModuleBanException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'e', "End of Channel Exception List", "348", "349")
+       ModuleBanException() : be(this)
        {
+               if (!ServerInstance->Modes->AddMode(&be))
+                       throw ModuleException("Could not add new modes!");
+
+               be.DoImplements(this);
+               Implementation list[] = { I_OnRehash, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
+               ServerInstance->Modules->Attach(list, this, 4);
+
        }
-       
-       virtual void Implements(char* List)
+
+       void On005Numeric(std::string &output)
        {
-               this->DoImplements(List);
-               List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+               output.append(" EXCEPTS=e");
        }
-       
-       virtual void On005Numeric(std::string &output)
+
+       ModResult OnExtBanCheck(User *user, Channel *chan, char type)
        {
-               output.append(" EXCEPTS=e");
-               output.insert(output.find("CHANMODES=", 0)+10, "e");
+               if (chan != NULL)
+               {
+                       modelist *list = be.extItem.get(chan);
+
+                       if (!list)
+                               return MOD_RES_PASSTHRU;
+
+                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                       {
+                               if (it->mask[0] != type || it->mask[1] != ':')
+                                       continue;
+
+                               if (chan->CheckBan(user, it->mask.substr(2)))
+                               {
+                                       // They match an entry on the list, so let them pass this.
+                                       return MOD_RES_ALLOW;
+                               }
+                       }
+               }
+
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnCheckBan(userrec* user, chanrec* chan)
+       ModResult OnCheckChannelBan(User* user, Channel* chan)
        {
-               if(chan != NULL)
+               if (chan)
                {
-                       modelist* list = (modelist*)chan->GetExt(infokey);
-                       Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for ban exceptions");
-                       
-                       if(list)
+                       modelist *list = be.extItem.get(chan);
+
+                       if (!list)
+                       {
+                               // No list, proceed normally
+                               return MOD_RES_PASSTHRU;
+                       }
+
+                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
                        {
-                               for (modelist::iterator it = list->begin(); it != list->end(); it++)
-                                       if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
-                                               // They match an entry on the list, so let them in.
-                                               return 1;
-                               return 0;
+                               if (chan->CheckBan(user, it->mask))
+                               {
+                                       // They match an entry on the list, so let them in.
+                                       return MOD_RES_ALLOW;
+                               }
                        }
-                       // 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 MOD_RES_PASSTHRU;
        }
-       
-       virtual Version GetVersion()
+
+       void OnCleanup(int target_type, void* item)
        {
-               return Version(1, 0, 0, 2, VF_STATIC);
+               be.DoCleanup(target_type, item);
        }
-};
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleBanExceptionFactory()
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
+               be.DoSyncChannel(chan, proto, opaque);
        }
-       
-       ~ModuleBanExceptionFactory()
+
+       void OnRehash(User* user)
        {
+               be.DoRehash();
        }
-       
-       virtual Module* CreateModule(Server* serv)
+
+       Version GetVersion()
        {
-               return new ModuleBanException(serv);
+               return Version("Provides support for the +e channel mode", VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)