Updated to keep lowermap const within hashcomp.cpp

[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 40e4ee92bbb59cdefd9f93d7d8457172da61e1b6..64a01b8fc119408c5b4a61734e14eeead9977066 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -19,6 +19,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides user and channel +G mode */
 
@@ -42,13 +43,34 @@ class ModuleCensor : public Module
                if ((Censorfile == "") || (!MyConf->Verify()))
                {
                        printf("Error, could not find <censor file=\"\"> definition in your config file!");
-                       exit(0);
+                       log(DEFAULT,"Error, could not find <censor file=\"\"> definition in your config file!");
+                       return;
                }
                Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
                Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0);
                Srv->AddExtendedMode('G',MT_CLIENT,false,0,0);
        }
 
+        virtual void On005Numeric(std::string &output)
+        {
+                std::stringstream line(output);
+                std::string temp1, temp2;
+                while (!line.eof())
+                {
+                        line >> temp1;
+                        if (temp1.substr(0,10) == "CHANMODES=")
+                        {
+                                // append the chanmode to the end
+                                temp1 = temp1.substr(10,temp1.length());
+                                temp1 = "CHANMODES=" + temp1 + "G";
+                        }
+                        temp2 = temp2 + temp1 + " ";
+                }
+               if (temp2.length())
+                       output = temp2.substr(0,temp2.length()-1);
+        }
+
+
        virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
        {
                // check if this is our mode character...
@@ -71,11 +93,14 @@ class ModuleCensor : public Module
        
        virtual void ReplaceLine(std::string &text,std::string pattern, std::string replace)
        {
-               while (strstr(text.c_str(),pattern.c_str()))
+               if ((pattern != "") && (text != ""))
                {
-                       int pos = text.find(pattern);
-                       text.erase(pos,pattern.length());
-                       text.insert(pos,replace);
+                       while (text.find(pattern) != std::string::npos)
+                       {
+                               int pos = text.find(pattern);
+                               text.erase(pos,pattern.length());
+                               text.insert(pos,replace);
+                       }
                }
        }
        
@@ -87,7 +112,7 @@ class ModuleCensor : public Module
                for (int index = 0; index < MyConf->Enumerate("badword"); index++)
                {
                        std::string pattern = MyConf->ReadValue("badword","text",index);
-                       if (strstr(text.c_str(),pattern.c_str()))
+                       if (text.find(pattern) != std::string::npos)
                        {
                                std::string replace = MyConf->ReadValue("badword","replace",index);
 
@@ -106,8 +131,6 @@ class ModuleCensor : public Module
                                {
                                        this->ReplaceLine(text,pattern,replace);
                                }
-                               
-                               return 0;
                        }
                }
                return 0;
@@ -119,7 +142,7 @@ class ModuleCensor : public Module
                for (int index = 0; index < MyConf->Enumerate("badword"); index++)
                {
                        std::string pattern = MyConf->ReadValue("badword","text",index);
-                       if (strstr(text.c_str(),pattern.c_str()))
+                       if (text.find(pattern) != std::string::npos)
                        {
                                std::string replace = MyConf->ReadValue("badword","replace",index);
 
@@ -138,8 +161,6 @@ class ModuleCensor : public Module
                                {
                                        this->ReplaceLine(text,pattern,replace);
                                }
-                               
-                               return 0;
                        }
                }
                return 0;
@@ -159,7 +180,7 @@ class ModuleCensor : public Module
                {
                        // bail if the user forgot to create a config file
                        printf("Error, could not find <censor file=\"\"> definition in your config file!");
-                       exit(0);
+                       log(DEFAULT,"Error, could not find <censor file=\"\"> definition in your config file!");
                }
                Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
        }
@@ -167,7 +188,7 @@ class ModuleCensor : public Module
        virtual Version GetVersion()
        {
                // This is version 2 because version 1.x is the unreleased unrealircd module
-               return Version(1,0,0,0);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
        
 };