X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_stripcolor.cpp;h=4c5e7c0282641cc018b2176746dcfe0b60ee1774;hb=219993bc9018d9f0d9568330d7a972b68b785d27;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..4c5e7c028 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -35,30 +35,29 @@ class UserStripColor : public SimpleUserModeHandler
 class ModuleStripColor : public Module
 {
 	bool AllowChanOps;
-	ChannelStripColor *csc;
-	UserStripColor *usc;
- 
+	ChannelStripColor csc;
+	UserStripColor usc;
+
  public:
-	ModuleStripColor(InspIRCd* Me) : Module(Me)
+	ModuleStripColor(InspIRCd* Me) : Module(Me), csc(Me), usc(Me)
 	{
-		usc = new UserStripColor(ServerInstance);
-		csc = new ChannelStripColor(ServerInstance);
-
-		if (!ServerInstance->Modes->AddMode(usc) || !ServerInstance->Modes->AddMode(csc))
+		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);
-		ServerInstance->Modes->DelMode(csc);
-		delete usc;
-		delete csc;
+		ServerInstance->Modes->DelMode(&usc);
+		ServerInstance->Modes->DelMode(&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 +67,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 +77,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 +120,7 @@ class ModuleStripColor : public Module
 				return 0;
 			}
 
-			active = t->IsModeSet('S');
+			active = t->IsModeSet('S') || t->GetExtBanStatus(user, 'S') < 0;
 		}
 
 		if (active)
@@ -131,17 +130,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)