Run DelMode and DelModeWatcher in RemoveModule

[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 06ce93a579d53715590138c1f3a3497b8ef68bb6..b71992c053db8e226e2e8e8cbfa41334a57882aa 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,89 +1,111 @@
-#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-2009 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 +I channel mode */
+/* $ModDep: ../../include/u_listmode.h */
 
-/* Written by Om<om@inspircd.org>, April 2005. */
-/* Based on m_exception, which was originally based on m_chanprotect and m_silence */
+/*
+ * Written by Om <om@inspircd.org>, April 2005.
+ * Based on m_exception, which was originally based on m_chanprotect and m_silence
+ *
+ * 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
+ */
 
-// 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
+/** Handles channel mode +I
+ */
+class InviteException : public ListModeBase
+{
+ public:
+       InviteException(Module* Creator) : ListModeBase(Creator, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
+};
 
-class ModuleInviteException : public ListModeBaseModule
+class ModuleInviteException : public Module
 {
+       InviteException ie;
 public:
-       ModuleInviteException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'I', "End of Channel Invite Exception List", "346", "347")
-       {
-       }
-       
-       virtual void Implements(char* List)
+       ModuleInviteException() : ie(this)
        {
-               this->DoImplements(List);
-               List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
+               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 On005Numeric(std::string &output)
+
+       void On005Numeric(std::string &output)
        {
                output.append(" INVEX=I");
-               output.insert(output.find("CHANMODES=", 0)+10, "I");
        }
-        
-       virtual int OnCheckInvite(userrec* user, chanrec* chan)
+
+       ModResult OnCheckInvite(User* user, Channel* chan)
        {
                if(chan != NULL)
                {
-                       modelist* list = (modelist*)chan->GetExt(infokey);
-                       Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for invite exceptions");
+                       modelist* list = ie.extItem.get(chan);
                        if (list)
                        {
+                               std::string mask = std::string(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 (chan->CheckBan(user, it->mask))
                                        {
-                                               // They match an entry on the list, so let them in.
-                                               return 1;
+                                               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()
+
+       const char* OnRequest(Request* request)
        {
-               return Version(1, 0, 0, 2, VF_STATIC);
+               return ie.DoOnRequest(request);
        }
-};
 
+       void OnCleanup(int target_type, void* item)
+       {
+               ie.DoCleanup(target_type, item);
+       }
 
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleInviteExceptionFactory()
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
+               ie.DoSyncChannel(chan, proto, opaque);
        }
-       
-       ~ModuleInviteExceptionFactory()
+
+       void OnRehash(User* user)
        {
+               ie.DoRehash();
        }
-       
-       virtual Module * CreateModule(Server* serv)
+
+       Version GetVersion()
        {
-               return new ModuleInviteException(serv);
+               return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON, API_VERSION);
        }
-       
-};
 
+       ~ModuleInviteException()
+       {
+               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+       }
+};
 
-extern "C" void * init_module( void )
-{
-       return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)