All modules which implement simplemodes (no parameters, not a list mode) can now...

[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 d1e864419aeaac48caa381583256a92fa34a3ce6..50315997f629eb66de9c3cea7ecc7888adf3219e 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -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 */
 
+
+
 class CensorException : public ModuleException
 {
  public:
@@ -39,10 +41,14 @@ class CensorException : public ModuleException
 class CensorUser : public ModeHandler
 {
  public:
-       CensorUser() : ModeHandler('G', 0, 0, false, MODETYPE_USER, false) { }
+       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'))
@@ -67,7 +73,7 @@ class CensorUser : public ModeHandler
 class CensorChannel : public ModeHandler
 {
  public:
-       CensorChannel() : ModeHandler('G', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       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)
        {
@@ -95,13 +101,13 @@ class CensorChannel : public ModeHandler
 class ModuleCensor : public Module
 {
 
-       Server *Srv;
+       
        censor_t censors;
        CensorUser *cu;
        CensorChannel *cc;
  
  public:
-       ModuleCensor(Server* Me)
+       ModuleCensor(InspIRCd* Me)
                : Module::Module(Me)
        {
                /*
@@ -116,31 +122,27 @@ class ModuleCensor : public Module
                 *
                 * XXX - These module pre-date the include directive which exists since beta 5 -- Brain
                 */
-               Srv = Me;
+               
                OnRehash("");
-               cu = new CensorUser;
-               cc = new CensorChannel;
-               Srv->AddMode(cu, 'G');
-               Srv->AddMode(cc, 'G');
+               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] = 1;
+               List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output,"G",4);
-       }
- 
        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 != ""))
@@ -153,9 +155,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;
@@ -196,10 +197,10 @@ 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;
@@ -219,7 +220,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,VF_STATIC|VF_VENDOR);
+               return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
        }
        
 };
@@ -237,7 +238,7 @@ class ModuleCensorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleCensor(Me);
        }