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 62d7a54d0b676519c9c8032ca49b0736f2c303c6..c9a0e497a954814a89b136ca2b71de92b9d9aaf6 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -26,7 +26,7 @@ typedef std::map<irc::string,irc::string> censor_t;
 class CensorUser : public SimpleUserModeHandler
 {
  public:
-       CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, 'G') { }
+       CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "censor", 'G') { }
 };
 
 /** Handles channel mode +G
@@ -34,7 +34,7 @@ class CensorUser : public SimpleUserModeHandler
 class CensorChannel : public SimpleChannelModeHandler
 {
  public:
-       CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, 'G') { }
+       CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { }
 };
 
 class ModuleCensor : public Module
@@ -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);
        }
 
 
@@ -75,10 +75,11 @@ class ModuleCensor : public Module
                {
                        active = ((Channel*)dest)->IsModeSet('G');
                        Channel* c = (Channel*)dest;
-                       if (CHANOPS_EXEMPT('G') && c->GetPrefixValue(user) == OP_VALUE)
-                       {
+                       ModResult res;
+                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"censor"));
+
+                       if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
-                       }
                }
 
                if (!active)
@@ -113,22 +114,20 @@ 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()
        {
-               return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR);
        }
 
 };