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 e3a1c39da362ce4d4af73de347ddc64342b1c647..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)
@@ -90,10 +90,8 @@ class ModuleStripColor : public Module
        UserStripColor *usc;
  
  public:
-       ModuleStripColor(InspIRCd* Me) : Module::Module(Me)
+       ModuleStripColor(InspIRCd* Me) : Module(Me)
        {
-               OnRehash(NULL, "");
-
                usc = new UserStripColor(ServerInstance);
                csc = new ChannelStripColor(ServerInstance);
 
@@ -103,7 +101,7 @@ class ModuleStripColor : public Module
 
        void Implements(char* List)
        {
-               List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
        virtual ~ModuleStripColor()
@@ -144,7 +142,7 @@ class ModuleStripColor : public Module
                                                remove++;
 
                                        if (sentence[i + remove] == ',')
-                                       {
+                                       {
                                                remove += 2;
 
                                                if (isdigit(sentence[i + remove]))
@@ -164,13 +162,6 @@ class ModuleStripColor : public Module
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
-       {
-               ConfigReader Conf(ServerInstance);
-
-               AllowChanOps = Conf.ReadFlag("stripcolor", "allowchanops", 0);
-       }
-       
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (!IS_LOCAL(user))
@@ -188,7 +179,7 @@ class ModuleStripColor : public Module
 
                        // 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 (!AllowChanOps || AllowChanOps && t->GetStatus(user) != STATUS_OP)
+                       if (!CHANOPS_EXEMPT(ServerInstance, 'S') || CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) != STATUS_OP)
                                active = t->IsModeSet('S');
                }
 
@@ -233,7 +224,7 @@ class ModuleStripColorFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleStripColorFactory;
 }