Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

[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 93fe3ae3bb7eb73764bc37bc9f919a1b81ba0b05..e561b80a1c063788cbaddaf118fce98cb14184ec 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -38,12 +38,10 @@ class CensorChannel : public SimpleChannelModeHandler
 
 class ModuleCensor : public Module
 {
-
-       
        censor_t censors;
        CensorUser *cu;
        CensorChannel *cc;
- 
+
  public:
        ModuleCensor(InspIRCd* Me)
                : Module(Me)
@@ -110,27 +108,27 @@ class ModuleCensor : public Module
 
                irc::string text2 = text.c_str();
                for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
-               { 
+               {
                        if (text2.find(index->first) != irc::string::npos)
                        {
                                if (index->second.empty())
                                {
-                                       user->WriteNumeric(936, "%s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str());
+                                       user->WriteNumeric(ERR_WORDFILTERED, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name.c_str(), index->first.c_str());
                                        return 1;
                                }
-                               
+
                                this->ReplaceLine(text2,index->first,index->second);
                        }
                }
                text = text2.c_str();
                return 0;
        }
-       
+
        virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
-       
+
        virtual void OnRehash(User* user, const std::string &parameter)
        {
                /*
@@ -149,12 +147,12 @@ class ModuleCensor : public Module
 
                delete MyConf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleCensor)