None of the modules use an extern InspIRCd* any more

[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 6a5acb54cb275db09c6a197bbaefb05e75289b13..796224890138ae3eaec432972421fbfa66c99a8d 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -22,11 +22,14 @@ using namespace std;
 #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:
@@ -36,14 +39,76 @@ class CensorException : public ModuleException
        }
 };
 
+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;
+       }
+};
+
+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,39 +123,29 @@ 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_On005Numeric] = 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;
-               }
+               ServerInstance->ModeGrok->InsertMode(output,"G",4);
        }
-       
+ 
        virtual ~ModuleCensor()
        {
+               DELETE(cu);
+               DELETE(cc);
        }
        
        virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
@@ -119,12 +174,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)
@@ -189,7 +244,7 @@ class ModuleCensorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleCensor(Me);
        }
@@ -201,4 +256,3 @@ extern "C" void * init_module( void )
 {
        return new ModuleCensorFactory;
 }
-