Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

[user/henk/code/inspircd.git] / src / modules / m_chanfilter.cpp

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 31a30de0e7933bfa55235c2d2275002ddc9fd158..458d1a29d42abf6214beb6bdaf48d5db749da6d8 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -22,16 +22,18 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "hashcomp.h"
 #include "u_listmode.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
 
+
+
 class ChanFilter : public ListModeBase
 {
  public:
-       ChanFilter(Server* serv) : ListModeBase(serv, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { }
+       ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { }
        
        virtual bool ValidateParam(userrec* user, chanrec* chan, std::string &word)
        {
@@ -63,27 +65,22 @@ class ChanFilter : public ListModeBase
 
 class ModuleChanFilter : public Module
 {
-       Server *Srv;
+       
        ChanFilter* cf;
        
  public:
  
-       ModuleChanFilter(Server* Me)
-       : Module::Module(Me), Srv(Me)
+       ModuleChanFilter(InspIRCd* Me)
+               : Module::Module(Me)
        {
-               cf = new ChanFilter(Srv);
-               Srv->AddMode(cf, 'g');
+               cf = new ChanFilter(ServerInstance);
+               ServerInstance->AddMode(cf, 'g');
        }
 
        void Implements(char* List) 
        { 
                cf->DoImplements(List);
-               List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1;
-       }
-       
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output,"g",1);
+               List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1;
        }
 
        virtual void OnChannelDelete(chanrec* chan)
@@ -144,11 +141,12 @@ class ModuleChanFilter : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+               return Version(1, 0, 0, 1, VF_COMMON | VF_VENDOR);
        }
        
        virtual ~ModuleChanFilter()
        {
+               ServerInstance->Modes->DelMode(cf);
                DELETE(cf);
        }
 };
@@ -165,7 +163,7 @@ class ModuleChanFilterFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleChanFilter(Me);
        }