Works with the m_testclient test program/suite!

[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 fa0ff4c1d360c6d51fe5a81ae23cccf65a8d0726..ef8dc4d9166ac6e05bf8f8b0847a21234a9b29fe 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -4,6 +4,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "mode.h"
 #include "helperfuncs.h"
 #include "u_listmode.h"
 
@@ -16,17 +17,30 @@
 // 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
 
+class BanException : public ListModeBase
+{
+ public:
+       BanException(Server* serv) : ListModeBase(serv, 'e', "End of Channel Exception List", "348", "349", true) { }
+};
 
-class ModuleBanException : public ListModeBaseModule
+
+class ModuleBanException : public Module
 {
+       BanException* be;
+       Server* Srv;
+
 public:
-       ModuleBanException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'e', "End of Channel Exception List", "348", "349")
+       ModuleBanException(Server* serv)
+       : Module::Module(serv)
        {
+               be = new BanException(serv);
+               Srv = serv;
+               Srv->AddMode(be, 'e');
        }
        
        virtual void Implements(char* List)
        {
-               this->DoImplements(List);
+               be->DoImplements(List);
                List[I_On005Numeric] = List[I_OnCheckBan] = 1;
        }
        
@@ -40,7 +54,8 @@ public:
        {
                if(chan != NULL)
                {
-                       modelist* list = (modelist*)chan->GetExt(infokey);
+                       modelist* list;
+                       chan->GetExt(be->GetInfoKey(), list);
                        Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for ban exceptions");
                        
                        if(list)
@@ -55,11 +70,36 @@ public:
                }
                return 0;       
        }
+
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               be->DoCleanup(target_type, item);
+       }
+
+       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       {
+               be->DoSyncChannel(chan, proto, opaque);
+       }
+
+       virtual void OnChannelDelete(chanrec* chan)
+       {
+               be->DoChannelDelete(chan);
+       }
+
+       virtual void OnRehash(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