m_spanningtree Remove unneeded #includes

[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 86f307bae2ed4e494bccb87555cf75ef3f2f6e1e..d63750a575eaec89006bf2a0f35705d5b339333a 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -42,7 +42,6 @@ class UserStripColor : public SimpleUserModeHandler
 
 class ModuleStripColor : public Module
 {
-       bool AllowChanOps;
        ChannelStripColor csc;
        UserStripColor usc;
 
@@ -56,43 +55,12 @@ class ModuleStripColor : public Module
                ServerInstance->Modules->AddService(usc);
                ServerInstance->Modules->AddService(csc);
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual ~ModuleStripColor()
+       virtual void On005Numeric(std::map<std::string, std::string>& tokens)
        {
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->AddExtBanChar('S');
-       }
-
-       virtual void ReplaceLine(std::string &sentence)
-       {
-               /* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */
-               int seq = 0;
-
-               for (std::string::iterator i = sentence.begin(); i != sentence.end();)
-               {
-                       if (*i == 3)
-                               seq = 1;
-                       else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
-                       {
-                               seq++;
-                               if ( (seq <= 4) && (*i == ',') )
-                                       seq = 1;
-                               else if (seq > 3)
-                                       seq = 0;
-                       }
-                       else
-                               seq = 0;
-
-                       if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
-                               i = sentence.erase(i);
-                       else
-                               ++i;
-               }
+               tokens["EXTBAN"].push_back('S');
        }
 
        virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
@@ -119,7 +87,7 @@ class ModuleStripColor : public Module
 
                if (active)
                {
-                       this->ReplaceLine(text);
+                       InspIRCd::StripColor(text);
                }
 
                return MOD_RES_PASSTHRU;