Speaking of forgetting things, someone forgot to change the name of the function

[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 246079c10cd347d2f336a652b816c6a8a646d740..bbf14865758fcf2d4d1114e73d9b2ad1522c9c4b 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -21,12 +21,15 @@ 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 +42,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 +74,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 +102,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,12 +123,12 @@ 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)
@@ -132,13 +139,12 @@ class ModuleCensor : public Module
 
        virtual void On005Numeric(std::string &output)
        {
-               InsertMode(output,"G",4);
        }
  
        virtual ~ModuleCensor()
        {
-               delete cu;
-               delete cc;
+               DELETE(cu);
+               DELETE(cc);
        }
        
        virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
@@ -196,10 +202,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;
@@ -237,7 +243,7 @@ class ModuleCensorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleCensor(Me);
        }
@@ -249,4 +255,3 @@ extern "C" void * init_module( void )
 {
        return new ModuleCensorFactory;
 }
-