Use Utils->ServerUser instead of ServerInstance->FakeClient in m_spanningtree

[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 5da287f2e53568a74f5ccafa58cc51d47d40e91c..e3c243f84237ab83730d033d511c2d5330ec9b8e 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -2,21 +2,16 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         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"
 
 /* $ModDesc: Provides support for the +I channel mode */
@@ -39,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
@@ -49,22 +44,21 @@ public:
        ModuleInviteException(InspIRCd* Me) : Module(Me)
        {
                ie = new InviteException(ServerInstance);
-               if (!ServerInstance->AddMode(ie, 'I'))
+               if (!ServerInstance->Modes->AddMode(ie))
                        throw ModuleException("Could not add new modes!");
+               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+               ie->DoImplements(this);
+               Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
-       
-       virtual void Implements(char* List)
-       {
-               ie->DoImplements(List);
-               List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
-       }
-       
+
        virtual void On005Numeric(std::string &output)
        {
                output.append(" INVEX=I");
        }
-        
-       virtual int OnCheckInvite(userrec* user, chanrec* chan)
+
+       virtual int OnCheckInvite(User* user, Channel* chan)
        {
                if(chan != NULL)
                {
@@ -72,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;
@@ -86,7 +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 const char* OnRequest(Request* request)
+       {
+               return ie->DoOnRequest(request);
        }
 
        virtual void OnCleanup(int target_type, void* item)
@@ -94,54 +92,32 @@ public:
                ie->DoCleanup(target_type, item);
        }
 
-       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                ie->DoSyncChannel(chan, proto, opaque);
        }
 
-       virtual void OnChannelDelete(chanrec* chan)
+       virtual void OnChannelDelete(Channel* chan)
        {
                ie->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
                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);
-       }
-};
-
-
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleInviteExceptionFactory()
-       {
+               delete ie;
+               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
-       
-       ~ModuleInviteExceptionFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleInviteException(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)