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

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

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 4bc5b43e58b964565f7ae946cf2eaf96229a9032..bbf14865758fcf2d4d1114e73d9b2ad1522c9c4b 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -21,14 +21,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
 /* $ModDesc: Provides user and channel +G mode */
 
-extern InspIRCd* ServerInstance;
+
 
 class CensorException : public ModuleException
 {
@@ -102,13 +102,13 @@ class CensorChannel : public ModeHandler
 class ModuleCensor : public Module
 {
 
-       Server *Srv;
+       
        censor_t censors;
        CensorUser *cu;
        CensorChannel *cc;
  
  public:
-       ModuleCensor(Server* Me)
+       ModuleCensor(InspIRCd* Me)
                : Module::Module(Me)
        {
                /*
@@ -123,12 +123,12 @@ class ModuleCensor : public Module
                 *
                 * XXX - These module pre-date the include directive which exists since beta 5 -- Brain
                 */
-               Srv = Me;
+               
                OnRehash("");
                cu = new CensorUser(ServerInstance);
                cc = new CensorChannel(ServerInstance);
-               Srv->AddMode(cu, 'G');
-               Srv->AddMode(cc, 'G');
+               ServerInstance->AddMode(cu, 'G');
+               ServerInstance->AddMode(cc, 'G');
        }
 
        void Implements(char* List)
@@ -139,7 +139,6 @@ class ModuleCensor : public Module
 
        virtual void On005Numeric(std::string &output)
        {
-               ServerInstance->ModeGrok->InsertMode(output,"G",4);
        }
  
        virtual ~ModuleCensor()
@@ -203,10 +202,10 @@ class ModuleCensor : public Module
                 * reload our config file on rehash - we must destroy and re-allocate the classes
                 * to call the constructor again and re-read our data.
                 */
-               ConfigReader* Conf = new ConfigReader;
+               ConfigReader* Conf = new ConfigReader(ServerInstance);
                std::string Censorfile = Conf->ReadValue("censor","file",0);
                // this automatically re-reads the configuration file into the class
-               ConfigReader* MyConf = new ConfigReader(Censorfile);
+               ConfigReader* MyConf = new ConfigReader(ServerInstance, Censorfile);
                if ((Censorfile == "") || (!MyConf->Verify()))
                {
                        CensorException e;
@@ -244,7 +243,7 @@ class ModuleCensorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleCensor(Me);
        }