Clarify handshake failure messages

[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 39824147529159303450ea450884d7a810e74786..c9a0e497a954814a89b136ca2b71de92b9d9aaf6 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -52,8 +52,8 @@ class ModuleCensor : public Module
                OnRehash(NULL);
                if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
 
@@ -114,17 +114,15 @@ 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* MyConf = new ConfigReader;
+               ConfigReader MyConf;
                censors.clear();
 
-               for (int index = 0; index < MyConf->Enumerate("badword"); index++)
+               for (int index = 0; index < MyConf.Enumerate("badword"); index++)
                {
-                       irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str();
-                       irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str();
+                       irc::string pattern = (MyConf.ReadValue("badword","text",index)).c_str();
+                       irc::string replace = (MyConf.ReadValue("badword","replace",index)).c_str();
                        censors[pattern] = replace;
                }
-
-               delete MyConf;
        }
 
        virtual Version GetVersion()