X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=39ba84b9a47537b2c59fa30b992c6e273d7ac988;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=6e0100b46ecdd796144a6b5a5600ade44b937b9d;hpb=2e1f86fd0c9911210b79e6ac346672441eef18c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 6e0100b46..39ba84b9a 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,7 +22,7 @@ class ChannelStripColor : public ModeHandler
  public:
 	ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
 	{
 		if (adding)
 		{
@@ -52,7 +52,7 @@ class UserStripColor : public ModeHandler
  public:
 	UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
 	{
 		/* Only opers can change other users modes */
 		if (source != dest)
@@ -92,21 +92,19 @@ class ModuleStripColor : public Module
 		usc = new UserStripColor(ServerInstance);
 		csc = new ChannelStripColor(ServerInstance);
 
-		if (!ServerInstance->AddMode(usc) || !ServerInstance->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);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-	}
 
 	virtual ~ModuleStripColor()
 	{
 		ServerInstance->Modes->DelMode(usc);
 		ServerInstance->Modes->DelMode(csc);
-		DELETE(usc);
-		DELETE(csc);
+		delete usc;
+		delete csc;
 	}
 	
 	virtual void ReplaceLine(std::string &sentence)
@@ -155,8 +153,12 @@ class ModuleStripColor : public Module
 
 			// check if we allow ops to bypass filtering, if we do, check if they're opped accordingly.
 			// note: short circut logic here, don't wreck it. -- w00t
-			if (!CHANOPS_EXEMPT(ServerInstance, 'S') || CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) != STATUS_OP)
-				active = t->IsModeSet('S');
+			if (CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) == STATUS_OP)
+			{
+				return 0;
+			}
+
+			active = t->IsModeSet('S');
 		}
 
 		if (active)
@@ -174,7 +176,7 @@ class ModuleStripColor : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };