Annotations

[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 03b4f0f9dfc8d2726dac90b43000468050921238..e81ee17a49f21363ab9e71252b9ddba2f39d10e8 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
+ *                                    E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
  *     
@@ -21,12 +21,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
 /* $ModDesc: Provides user and channel +G mode */
 
+/** Thrown by m_censor
+ */
 class CensorException : public ModuleException
 {
  public:
@@ -36,14 +38,80 @@ class CensorException : public ModuleException
        }
 };
 
+/** Handles usermode +G
+ */
+class CensorUser : public ModeHandler
+{
+ public:
+       CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               /* Only opers can change other users modes */
+               if ((source != dest) && (!*source->oper))
+                       return MODEACTION_DENY;
+
+               if (adding)
+               {
+                       if (!dest->IsModeSet('G'))
+                       {
+                               dest->SetMode('G',true);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (dest->IsModeSet('G'))
+                       {
+                               dest->SetMode('G',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
+       }
+};
+
+/** Handles channel mode +G
+ */
+class CensorChannel : public ModeHandler
+{
+ public:
+       CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               if (adding)
+               {
+                       if (!channel->IsModeSet('G'))
+                       {
+                               channel->SetMode('G',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (channel->IsModeSet('G'))
+                       {
+                               channel->SetMode('G',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_ALLOW;
+       }
+};
+
 class ModuleCensor : public Module
 {
 
-       Server *Srv;
+       
        censor_t censors;
+       CensorUser *cu;
+       CensorChannel *cc;
  
  public:
-       ModuleCensor(Server* Me)
+       ModuleCensor(InspIRCd* Me)
                : Module::Module(Me)
        {
                /*
@@ -58,41 +126,27 @@ class ModuleCensor : public Module
                 *
                 * XXX - These module pre-date the include directive which exists since beta 5 -- Brain
                 */
-               Srv = Me;
+               
                OnRehash("");
-               Srv->AddExtendedMode('G',MT_CHANNEL,false,0,0);
-               Srv->AddExtendedMode('G',MT_CLIENT,false,0,0);
+               cu = new CensorUser(ServerInstance);
+               cc = new CensorChannel(ServerInstance);
+               ServerInstance->AddMode(cu, 'G');
+               ServerInstance->AddMode(cc, 'G');
        }
 
        void Implements(char* List)
        {
-               List[I_OnRehash] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
+               List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-
-        virtual void On005Numeric(std::string &output)
-        {
-               InsertMode(output,"G",4);
-        }
-
-
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if (modechar == 'G')
-               {
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
-       
        virtual ~ModuleCensor()
        {
+               ServerInstance->Modes->DelMode(cu);
+               ServerInstance->Modes->DelMode(cc);
+               DELETE(cu);
+               DELETE(cc);
        }
-       
+
        virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
        {
                if ((pattern != "") && (text != ""))
@@ -105,9 +159,8 @@ 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, char status)
        {
                bool active = false;
@@ -119,12 +172,12 @@ class ModuleCensor : public Module
                                if (target_type == TYPE_USER)
                                {
                                        userrec* t = (userrec*)dest;
-                                       active = (strchr(t->modes,'G') > 0);
+                                       active = t->IsModeSet('G');
                                }
                                else if (target_type == TYPE_CHANNEL)
                                {
                                        chanrec* t = (chanrec*)dest;
-                                       active = (t->IsModeSet('G'));
+                                       active = t->IsModeSet('G');
                                }
                                
                                if (active)
@@ -148,30 +201,30 @@ 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* Conf = new ConfigReader;
+               ConfigReader* Conf = new ConfigReader(ServerInstance);
                std::string Censorfile = Conf->ReadValue("censor","file",0);
                // this automatically re-reads the configuration file into the class
-               ConfigReader* MyConf = new ConfigReader(Censorfile);
+               ConfigReader* MyConf = new ConfigReader(ServerInstance, Censorfile);
                if ((Censorfile == "") || (!MyConf->Verify()))
                {
                        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();
+               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;
                }
-               delete Conf;
-               delete MyConf;
+               DELETE(Conf);
+               DELETE(MyConf);
        }
        
        virtual Version GetVersion()
        {
                // This is version 2 because version 1.x is the unreleased unrealircd module
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
        }
        
 };
@@ -189,7 +242,7 @@ class ModuleCensorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleCensor(Me);
        }
@@ -201,4 +254,3 @@ extern "C" void * init_module( void )
 {
        return new ModuleCensorFactory;
 }
-