X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=b50c22297255a40bca75e93c42951f0ae8d82cda;hb=b14ebbccf08ec34a73e1ba271e67da80d9fe805c;hp=cd4f35c4b11899982a5805b2689f460120f31bde;hpb=d68981362628e6c67edcac2b5ea65d4ca18bed7b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index cd4f35c4b..b50c22297 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel +S mode (strip ansi color) */
-
 /** Handles channel mode +S
  */
 class ChannelStripColor : public SimpleChannelModeHandler
@@ -42,7 +40,6 @@ class UserStripColor : public SimpleUserModeHandler
 
 class ModuleStripColor : public Module
 {
-	bool AllowChanOps;
 	ChannelStripColor csc;
 	UserStripColor usc;
 
@@ -51,64 +48,18 @@ class ModuleStripColor : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(usc);
 		ServerInstance->Modules->AddService(csc);
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
-	}
-
-	virtual ~ModuleStripColor()
-	{
-	}
-
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->AddExtBanChar('S');
 	}
 
-	virtual void ReplaceLine(std::string &sentence)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		/* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */
-		int seq = 0;
-		std::string::iterator i,safei;
- 		for (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)))
-			{
-				if (i != sentence.begin())
-				{
-					safei = i;
-					--i;
-					sentence.erase(safei);
-					++i;
-				}
-				else
-				{
-					sentence.erase(i);
-					i = sentence.begin();
-				}
-			}
-			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)
+	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
 	{
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
@@ -117,7 +68,7 @@ class ModuleStripColor : public Module
 		if (target_type == TYPE_USER)
 		{
 			User* t = (User*)dest;
-			active = t->IsModeSet('S');
+			active = t->IsModeSet(usc);
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
@@ -127,23 +78,18 @@ class ModuleStripColor : public Module
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
 
-			active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S'));
+			active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc));
 		}
 
 		if (active)
 		{
-			this->ReplaceLine(text);
+			InspIRCd::StripColor(text);
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR);
 	}