Decide that it wasn't quite appropriate :(

[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 45f5af551a80ccf9abc668f13156175ebd4ab1c6..0d18ac1e4331a173d99de3c1a2a9d13fdea617d2 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -25,6 +25,15 @@ using namespace std;
 
 /* $ModDesc: Provides user and channel +G mode */
 
+class CensorException : public ModuleException
+{
+ public:
+       virtual char* GetReason()
+       {
+               return "Could not find <censor file=\"\"> definition in your config file!";
+       }
+};
+
 class ModuleCensor : public Module
 {
  Server *Srv;
@@ -52,9 +61,8 @@ class ModuleCensor : public Module
                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;
+                       CensorException e;
+                       throw(e);
                }
                Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
                Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0);
@@ -107,13 +115,14 @@ class ModuleCensor : public Module
        
        // format of a config entry is <badword text="shit" replace="poo">
        
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                bool active = false;
+               irc::string text2 = text.c_str();
                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 pattern = (MyConf->ReadValue("badword","text",index)).c_str();
+                       if (text2.find(pattern) != std::string::npos)
                        {
                                std::string replace = MyConf->ReadValue("badword","replace",index);
 
@@ -130,41 +139,16 @@ class ModuleCensor : public Module
                                
                                if (active)
                                {
-                                       this->ReplaceLine(text,pattern,replace);
+                                       this->ReplaceLine(text,std::string(pattern.c_str()),replace);
                                }
                        }
                }
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreNotice(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)
-                       {
-                               std::string replace = MyConf->ReadValue("badword","replace",index);
-
-                               if (target_type == TYPE_USER)
-                               {
-                                       userrec* t = (userrec*)dest;
-                                       active = (strchr(t->modes,'G') > 0);
-                               }
-                               else if (target_type == TYPE_CHANNEL)
-                               {
-                                       chanrec* t = (chanrec*)dest;
-                                       active = (t->IsCustomModeSet('G'));
-                               }
-                               
-                               if (active)
-                               {
-                                       this->ReplaceLine(text,pattern,replace);
-                               }
-                       }
-               }
-               return 0;
+               return OnUserPreMessage(user,dest,target_type,text,status);
        }
        
        virtual void OnRehash(std::string parameter)
@@ -181,9 +165,8 @@ class ModuleCensor : public Module
                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);
                }
                Srv->Log(DEFAULT,std::string("m_censor: read configuration from ")+Censorfile);
        }