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 60cc6dc392628728404bdec89e23127cb096f37a..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
 {
@@ -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;