Speaking of forgetting things, someone forgot to change the name of the function

[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 cfb1d351e2167e198bd786870effe6b1bca7274c..52ba5c0a07b02cfc7807bbd13424bb13af13a293 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -22,22 +22,25 @@ 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", "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)
        {
                if (word.length() > 35)
                {
-                       WriteServ(user->fd, "935 %s %s %s :word is too long for censor list",user->nick, chan->name,word.c_str());
+                       user->WriteServ( "935 %s %s %s :word is too long for censor list",user->nick, chan->name,word.c_str());
                        return false;
                }
                
@@ -46,43 +49,43 @@ class ChanFilter : public ListModeBase
        
        virtual bool TellListTooLong(userrec* user, chanrec* chan, std::string &word)
        {
-               WriteServ(user->fd,"939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str());
+               user->WriteServ("939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str());
                return true;
        }
        
        virtual void TellAlreadyOnList(userrec* user, chanrec* chan, std::string &word)
        {
-               WriteServ(user->fd,"937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str());
+               user->WriteServ("937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str());
        }
        
        virtual void TellNotSet(userrec* user, chanrec* chan, std::string &word)
        {
-               WriteServ(user->fd,"938 %s %s :No such spamfilter word is set",user->nick, chan->name);
+               user->WriteServ("938 %s %s :No such spamfilter word is set",user->nick, chan->name);
        }
 };
 
 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);
        }
 
        virtual void OnChannelDelete(chanrec* chan)
@@ -100,7 +103,8 @@ class ModuleChanFilter : public Module
                // Create a copy of the string in irc::string
                irc::string line = text.c_str();
 
-               modelist* list = (modelist*)chan->GetExt(cf->GetInfoKey());
+               modelist* list;
+               chan->GetExt(cf->GetInfoKey(), list);
 
                if (list)
                {
@@ -108,7 +112,7 @@ class ModuleChanFilter : public Module
                        {
                                if (line.find(i->mask.c_str()) != std::string::npos)
                                {
-                                       WriteServ(user->fd,"936 %s %s %s :Your message contained a censored word, and was blocked",user->nick, chan->name, i->mask.c_str());
+                                       user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked",user->nick, chan->name, i->mask.c_str());
                                        return 1;
                                }
                        }
@@ -147,6 +151,7 @@ class ModuleChanFilter : public Module
        
        virtual ~ModuleChanFilter()
        {
+               DELETE(cf);
        }
 };
 
@@ -162,7 +167,7 @@ class ModuleChanFilterFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleChanFilter(Me);
        }