A ton more clear() and empty() stuff thats been lingering on the long term todo for...

[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 634358a6cb483632af1691ab55fde08ac894c7c7..f8130336d711fff2eaabb2ae15a6412619f53778 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -6,15 +6,15 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
 
@@ -58,7 +58,7 @@ class UserStripColor : public ModeHandler
        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))
+               if (source != dest)
                        return MODEACTION_DENY;
 
                if (adding)
@@ -85,17 +85,13 @@ class UserStripColor : public ModeHandler
 
 class ModuleStripColor : public Module
 {
- 
- ConfigReader *Conf, *MyConf;
- ChannelStripColor *csc;
- UserStripColor *usc;
+       bool AllowChanOps;
+       ChannelStripColor *csc;
+       UserStripColor *usc;
  
  public:
-       ModuleStripColor(InspIRCd* Me)
-               : Module::Module(Me)
+       ModuleStripColor(InspIRCd* Me) : Module(Me)
        {
-               
-
                usc = new UserStripColor(ServerInstance);
                csc = new ChannelStripColor(ServerInstance);
 
@@ -116,14 +112,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++)
                {
@@ -149,7 +142,7 @@ class ModuleStripColor : public Module
                                                remove++;
 
                                        if (sentence[i + remove] == ',')
-                                       {
+                                       {
                                                remove += 2;
 
                                                if (isdigit(sentence[i + remove]))
@@ -167,10 +160,8 @@ class ModuleStripColor : public Module
                                i--;
                        }
                }
-               
-               text = sentence;
        }
-       
+
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (!IS_LOCAL(user))
@@ -180,17 +171,23 @@ class ModuleStripColor : public Module
                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'));
+
+                       // check if we allow ops to bypass filtering, if we do, check if they're opped accordingly.
+                       // note: short circut logic here, don't wreck it. -- w00t
+                       if (!CHANOPS_EXEMPT(ServerInstance, 'S') || CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) != STATUS_OP)
+                               active = t->IsModeSet('S');
                }
+
                if (active)
                {
                        this->ReplaceLine(text);
                }
+
                return 0;
        }
        
@@ -227,7 +224,7 @@ class ModuleStripColorFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleStripColorFactory;
 }