Mode +b stuff, probably wont work yet

[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 d51e7ca59ced00d10838dd7cff9b00250220e233..0875399b8d8ff2aec6bf0ddc1e5e96c105f716c9 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -21,6 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
 
@@ -57,10 +58,10 @@ class ModuleStripColor : public Module
                }
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
+       virtual void On005Numeric(std::string &output)
+       {
                InsertMode(output,"S",4);
-        }
+       }
        
        virtual ~ModuleStripColor()
        {
@@ -121,7 +122,7 @@ class ModuleStripColor : public Module
                text = sentence;
        }
        
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                bool active = false;
                if (target_type == TYPE_USER)
@@ -132,7 +133,7 @@ class ModuleStripColor : public Module
                else if (target_type == TYPE_CHANNEL)
                {
                        chanrec* t = (chanrec*)dest;
-                       active = (t->IsCustomModeSet('S'));
+                       active = (t->IsModeSet('S'));
                }
                if (active)
                {
@@ -141,24 +142,9 @@ class ModuleStripColor : public Module
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
-               bool active = false;
-               if (target_type == TYPE_USER)
-               {
-                       userrec* t = (userrec*)dest;
-                       active = (strchr(t->modes,'S') > 0);
-               }
-               else if (target_type == TYPE_CHANNEL)
-               {
-                       chanrec* t = (chanrec*)dest;
-                       active = (t->IsCustomModeSet('S'));
-               }
-               if (active)
-               {
-                       this->ReplaceLine(text);
-               }
-               return 0;
+               return OnUserPreMessage(user,dest,target_type,text,status);
        }
        
        virtual Version GetVersion()