Finally change all the Version() objects

[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 588c42b5ed2b8de412e44be755e067717ac546f2..7c33e489e80881df653038967ba4f6d61fa57568 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,15 +1,22 @@
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 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 "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,55 +24,61 @@
 
 // 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
 
-extern InspIRCd* ServerInstance;
 
+/** Handles +e channel mode
+ */
 class BanException : public ListModeBase
 {
  public:
-       BanException(Server* serv) : ListModeBase(serv, 'e', "End of Channel Exception List", "348", "349", true) { }
+       BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { }
 };
 
 
 class ModuleBanException : public Module
 {
        BanException* be;
-       Server* Srv;
+       
 
 public:
-       ModuleBanException(Server* serv)
-       : Module::Module(serv)
-       {
-               be = new BanException(serv);
-               Srv = serv;
-               Srv->AddMode(be, 'e');
-       }
-       
-       virtual void Implements(char* List)
+       ModuleBanException(InspIRCd* Me) : Module(Me)
        {
-               be->DoImplements(List);
-               List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+               be = new BanException(ServerInstance);
+               if (!ServerInstance->Modes->AddMode(be))
+                       throw ModuleException("Could not add new modes!");
+               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+               be->DoImplements(this);
+               Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan };
+               Me->Modules->Attach(list, this, 4);
+
        }
        
        virtual void On005Numeric(std::string &output)
        {
                output.append(" EXCEPTS=e");
-               ServerInstance->ModeGrok->InsertMode(output, "e", 1);
        }
 
-       virtual int OnCheckBan(userrec* user, chanrec* chan)
+       virtual int OnCheckBan(User* user, Channel* 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(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
+                               {
+                                       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;
+                                       }
+                               }
                                return 0;
                        }
                        // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
@@ -78,52 +91,57 @@ public:
                be->DoCleanup(target_type, item);
        }
 
-       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                be->DoSyncChannel(chan, proto, opaque);
        }
 
-       virtual void OnChannelDelete(chanrec* chan)
+       virtual void OnChannelDelete(Channel* chan)
        {
                be->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
                be->DoRehash();
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
-       }
-       
-       virtual ~ModuleBanException()
-       {
-               DELETE(be);     
-       }
-};
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleBanExceptionFactory()
+       virtual const char* OnRequest(Request* request)
        {
+               ListModeRequest* LM = (ListModeRequest*)request;
+               if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
+               {
+                       modelist* list;
+                       LM->chan->GetExt(be->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;
        }
-       
-       ~ModuleBanExceptionFactory()
+
+       virtual Version GetVersion()
        {
+               return Version(1, 2, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
-       virtual Module* CreateModule(Server* serv)
+       virtual ~ModuleBanException()
        {
-               return new ModuleBanException(serv);
+               ServerInstance->Modes->DelMode(be);
+               delete be;
+               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)