Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[user/henk/code/inspircd.git] / src / modules / m_stripcolor.cpp

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 6015005867441596c8b8aee046676aea7a31cb16..3254d98951495fcdc146f2778f6cfe71978f204a 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -2,40 +2,31 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
 
+/** Handles channel mode +S
+ */
 class ChannelStripColor : public ModeHandler
 {
  public:
-       StripColor() : ModeHandler('S', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, 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 (!channel->IsModeSet('S'))
@@ -57,10 +48,12 @@ class ChannelStripColor : public ModeHandler
        }
 };
 
+/** Handles user mode +S
+ */
 class UserStripColor : public ModeHandler
 {
  public:
-       StripColor() : ModeHandler('S', 0, 0, false, MODETYPE_USER, false) { }
+       UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -92,48 +85,42 @@ class UserStripColor : public ModeHandler
 
 class ModuleStripColor : public Module
 {
- Server *Srv;
+ 
  ConfigReader *Conf, *MyConf;
  ChannelStripColor *csc;
  UserStripColor *usc;
  
  public:
-       ModuleStripColor(Server* Me)
+       ModuleStripColor(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
+               
 
-               usc = new UserStripColor();
-               csc = new ChannelStripColor();
+               usc = new UserStripColor(ServerInstance);
+               csc = new ChannelStripColor(ServerInstance);
 
-               Srv->AddMode(usc, 'S');
-               Srv->AddMode(csc, 'S');
+               if (!ServerInstance->AddMode(usc, 'S') || !ServerInstance->AddMode(csc, 'S'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output,"S",4);
-       }
-       
        virtual ~ModuleStripColor()
        {
+               ServerInstance->Modes->DelMode(usc);
+               ServerInstance->Modes->DelMode(csc);
                DELETE(usc);
                DELETE(csc);
        }
        
-       // ANSI colour stripping by Doc (Peter Wood)
-       virtual void ReplaceLine(std::string &text)
+       // ANSI colour stripping based on C example by Doc (Peter Wood)
+       virtual void ReplaceLine(std::string &sentence)
        {
                int i, a, len, remove;
-               char sentence[MAXBUF];
-               strlcpy(sentence,text.c_str(),MAXBUF);
-  
-               len = text.length();
+               len = sentence.length();
 
                for (i = 0; i < len; i++)
                {
@@ -177,22 +164,23 @@ class ModuleStripColor : public Module
                                i--;
                        }
                }
-               
-               text = sentence;
        }
        
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
+               if (!IS_LOCAL(user))
+                       return 0;
+
                bool active = false;
                if (target_type == TYPE_USER)
                {
                        userrec* t = (userrec*)dest;
-                       active = t->modes['S'-65];
+                       active = t->IsModeSet('S');
                }
                else if (target_type == TYPE_CHANNEL)
                {
                        chanrec* t = (chanrec*)dest;
-                       active = (t->IsModeSet('S'));
+                       active = t->IsModeSet('S');
                }
                if (active)
                {
@@ -201,15 +189,14 @@ class ModuleStripColor : public Module
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return OnUserPreMessage(user,dest,target_type,text,status);
+               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
        
        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, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
@@ -227,7 +214,7 @@ class ModuleStripColorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleStripColor(Me);
        }