Beat ya:

[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..5776b118b04e3354a62c940e6d079524aec17d4a 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -4,41 +4,57 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "mode.h"
 #include "helperfuncs.h"
 #include "u_listmode.h"
 
 /* $ModDesc: Provides support for the +I channel mode */
 
-/* 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
+ */
 
-// 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
+class InviteException : public ListModeBase
+{
+ public:
+       InviteException(Server* serv) : ListModeBase(serv, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
+};
 
-class ModuleInviteException : public ListModeBaseModule
+class ModuleInviteException : public Module
 {
+       InviteException* ie;
+       Server* Srv;
+
 public:
-       ModuleInviteException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'I', "End of Channel Invite Exception List", "346", "347")
+       ModuleInviteException(Server* serv) : Module(serv)
        {
+               ie = new InviteException(serv);
+               Srv = serv;
+               Srv->AddMode(ie, 'I');
        }
        
        virtual void Implements(char* List)
        {
-               this->DoImplements(List);
+               ie->DoImplements(List);
                List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
        }
        
        virtual void On005Numeric(std::string &output)
        {
                output.append(" INVEX=I");
-               output.insert(output.find("CHANMODES=", 0)+10, "I");
+               InsertMode(output, "I", 1);
        }
         
        virtual int OnCheckInvite(userrec* user, chanrec* chan)
        {
                if(chan != NULL)
                {
-                       modelist* list = (modelist*)chan->GetExt(infokey);
+                       modelist* list = (modelist*)chan->GetExt(ie->GetInfoKey());
                        Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for invite exceptions");
                        if (list)
                        {
@@ -56,10 +72,30 @@ public:
 
                return 0;               
        }
+
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               ie->DoCleanup(target_type, item);
+       }
+
+       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       {
+               ie->DoSyncChannel(chan, proto, opaque);
+       }
+
+       virtual void OnChannelDelete(chanrec* chan)
+       {
+               ie->DoChannelDelete(chan);
+       }
+
+       virtual void OnRehash(const std::string &param)
+       {
+               ie->DoRehash();
+       }
                
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 2, VF_STATIC);
+               return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
        }
 };