Add extra /map info (connection uptime, and lag time) to /MAP for opers. Adds feature...

[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 723225cca7cf47311f22541b122fc561d002973c..3254d98951495fcdc146f2778f6cfe71978f204a 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -2,20 +2,15 @@
  *       | 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 "users.h"
 #include "channels.h"
 #include "modules.h"
@@ -104,8 +99,8 @@ class ModuleStripColor : public Module
                usc = new UserStripColor(ServerInstance);
                csc = new ChannelStripColor(ServerInstance);
 
-               ServerInstance->AddMode(usc, 'S');
-               ServerInstance->AddMode(csc, 'S');
+               if (!ServerInstance->AddMode(usc, 'S') || !ServerInstance->AddMode(csc, 'S'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
@@ -121,14 +116,11 @@ class ModuleStripColor : public Module
                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++)
                {
@@ -172,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)
                {
@@ -196,9 +189,9 @@ 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()