Renamed to chanrec::modes

[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 f455cef5357d9d356ec9f90d760bf1c57921fa00..03b4f0f9dfc8d2726dac90b43000468050921238 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -23,12 +23,24 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 
+typedef std::map<irc::string,irc::string> censor_t;
+
 /* $ModDesc: Provides user and channel +G mode */
 
+class CensorException : public ModuleException
+{
+ public:
+       virtual const char* GetReason()
+       {
+               return "Could not find <censor file=\"\"> definition in your config file!";
+       }
+};
+
 class ModuleCensor : public Module
 {
- Server *Srv;
- ConfigReader *Conf, *MyConf;
+
+       Server *Srv;
+       censor_t censors;
  
  public:
        ModuleCensor(Server* Me)
@@ -47,16 +59,7 @@ class ModuleCensor : public Module
                 * XXX - These module pre-date the include directive which exists since beta 5 -- Brain
                 */
                Srv = Me;
-               Conf = new ConfigReader;
-               std::string Censorfile = Conf->ReadValue("censor","file",0);
-               MyConf = new ConfigReader(Censorfile);
-               if ((Censorfile == "") || (!MyConf->Verify()))
-               {
-                       printf("Error, could not find <censor file=\"\"> definition in your config file!");
-                       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);
+               OnRehash("");
                Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0);
                Srv->AddExtendedMode('G',MT_CLIENT,false,0,0);
        }
@@ -88,15 +91,13 @@ class ModuleCensor : public Module
        
        virtual ~ModuleCensor()
        {
-               delete MyConf;
-               delete Conf;
        }
        
-       virtual void ReplaceLine(std::string &text,std::string pattern, std::string replace)
+       virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
        {
                if ((pattern != "") && (text != ""))
                {
-                       while (text.find(pattern) != std::string::npos)
+                       while (text.find(pattern) != irc::string::npos)
                        {
                                int pos = text.find(pattern);
                                text.erase(pos,pattern.length());
@@ -110,13 +111,11 @@ class ModuleCensor : public Module
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                bool active = false;
-               for (int index = 0; index < MyConf->Enumerate("badword"); index++)
-               {
-                       std::string pattern = MyConf->ReadValue("badword","text",index);
-                       if (text.find(pattern) != std::string::npos)
+               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)
                        {
-                               std::string replace = MyConf->ReadValue("badword","replace",index);
-
                                if (target_type == TYPE_USER)
                                {
                                        userrec* t = (userrec*)dest;
@@ -125,12 +124,13 @@ class ModuleCensor : public Module
                                else if (target_type == TYPE_CHANNEL)
                                {
                                        chanrec* t = (chanrec*)dest;
-                                       active = (t->IsCustomModeSet('G'));
+                                       active = (t->IsModeSet('G'));
                                }
                                
                                if (active)
                                {
-                                       this->ReplaceLine(text,pattern,replace);
+                                       this->ReplaceLine(text2,index->first,index->second);
+                                       text = text2.c_str();
                                }
                        }
                }
@@ -142,25 +142,30 @@ class ModuleCensor : public Module
                return OnUserPreMessage(user,dest,target_type,text,status);
        }
        
-       virtual void OnRehash(std::string parameter)
+       virtual void OnRehash(const std::string &parameter)
        {
                /*
                 * reload our config file on rehash - we must destroy and re-allocate the classes
                 * to call the constructor again and re-read our data.
                 */
-               delete Conf;
-               delete MyConf;
-               Conf = new ConfigReader;
+               ConfigReader* Conf = new ConfigReader;
                std::string Censorfile = Conf->ReadValue("censor","file",0);
                // this automatically re-reads the configuration file into the class
-               MyConf = new ConfigReader(Censorfile);
+               ConfigReader* MyConf = new ConfigReader(Censorfile);
                if ((Censorfile == "") || (!MyConf->Verify()))
                {
-                       // bail if the user forgot to create a config file
-                       printf("Error, could not find <censor file=\"\"> definition in your config file!\n");
-                       log(DEFAULT,"Error, could not find <censor file=\"\"> definition in your config file!");
+                       CensorException e;
+                       throw(e);
+               }
+               censors.clear();
+                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();
+                       censors[pattern] = replace;
                }
-               Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
+               delete Conf;
+               delete MyConf;
        }
        
        virtual Version GetVersion()