X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=7d518e50f0d8cd3cb3bdbb28131acc13e278f1c2;hb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;hp=420e2e6e293c1ad0413b86142b6dd2c7f1f82425;hpb=f3abcf2bcfe36d3389b74caa9eef8582901fbe15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 420e2e6e2..7d518e50f 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -37,7 +37,7 @@ class ModuleStripColor : public Module
 	bool AllowChanOps;
 	ChannelStripColor *csc;
 	UserStripColor *usc;
- 
+
  public:
 	ModuleStripColor(InspIRCd* Me) : Module(Me)
 	{
@@ -46,11 +46,10 @@ class ModuleStripColor : public Module
 
 		if (!ServerInstance->Modes->AddMode(usc) || !ServerInstance->Modes->AddMode(csc))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-
 	virtual ~ModuleStripColor()
 	{
 		ServerInstance->Modes->DelMode(usc);
@@ -58,7 +57,12 @@ class ModuleStripColor : public Module
 		delete usc;
 		delete csc;
 	}
-	
+
+	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 */
@@ -68,7 +72,7 @@ class ModuleStripColor : public Module
 		{
 			if ((*i == 3))
 				seq = 1;
-			else if (seq && ( (*i >= '0') && (*i <= '9') || (*i == ',') ) )
+			else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
 			{
 				seq++;
 				if ( (seq <= 4) && (*i == ',') )
@@ -78,7 +82,7 @@ class ModuleStripColor : public Module
 			}
 			else
 				seq = 0;
-			
+
 			if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
 			{
 				if (i != sentence.begin())
@@ -121,7 +125,7 @@ class ModuleStripColor : public Module
 				return 0;
 			}
 
-			active = t->IsModeSet('S');
+			active = t->IsModeSet('S') || t->IsExtBanned(user, 'S');
 		}
 
 		if (active)
@@ -131,17 +135,17 @@ class ModuleStripColor : public Module
 
 		return 0;
 	}
-	
+
 	virtual int 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()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleStripColor)