X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=f8130336d711fff2eaabb2ae15a6412619f53778;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=46e577779d9152bf85406db147e249d8885f712e;hpb=cfb2c2fff47d99f43434de7db339c2f2237c6bad;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 46e577779..f8130336d 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -2,32 +2,24 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
 
-
-
+/** Handles channel mode +S
+ */
 class ChannelStripColor : public ModeHandler
 {
  public:
@@ -35,10 +27,6 @@ class ChannelStripColor : public ModeHandler
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
-			return MODEACTION_DENY;
-
 		if (adding)
 		{
 			if (!channel->IsModeSet('S'))
@@ -60,6 +48,8 @@ class ChannelStripColor : public ModeHandler
 	}
 };
 
+/** Handles user mode +S
+ */
 class UserStripColor : public ModeHandler
 {
  public:
@@ -68,7 +58,7 @@ class UserStripColor : public ModeHandler
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
 		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
+		if (source != dest)
 			return MODEACTION_DENY;
 
 		if (adding)
@@ -95,48 +85,38 @@ class UserStripColor : public ModeHandler
 
 class ModuleStripColor : public Module
 {
- 
- ConfigReader *Conf, *MyConf;
- ChannelStripColor *csc;
- UserStripColor *usc;
+	bool AllowChanOps;
+	ChannelStripColor *csc;
+	UserStripColor *usc;
  
  public:
-	ModuleStripColor(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleStripColor(InspIRCd* Me) : Module(Me)
 	{
-		
-
 		usc = new UserStripColor(ServerInstance);
 		csc = new ChannelStripColor(ServerInstance);
 
-		ServerInstance->AddMode(usc, 'S');
-		ServerInstance->AddMode(csc, 'S');
+		if (!ServerInstance->AddMode(usc, 'S') || !ServerInstance->AddMode(csc, 'S'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->Modes->InsertMode(output,"S",4);
-	}
- 	
 	virtual ~ModuleStripColor()
 	{
+		ServerInstance->Modes->DelMode(usc);
+		ServerInstance->Modes->DelMode(csc);
 		DELETE(usc);
 		DELETE(csc);
 	}
 	
-	// ANSI colour stripping by Doc (Peter Wood)
-	virtual void ReplaceLine(std::string &text)
+	// ANSI colour stripping based on C example by Doc (Peter Wood)
+	virtual void ReplaceLine(std::string &sentence)
 	{
 		int i, a, len, remove;
-		char sentence[MAXBUF];
-		strlcpy(sentence,text.c_str(),MAXBUF);
-  
-		len = text.length();
+		len = sentence.length();
 
 		for (i = 0; i < len; i++)
   		{
@@ -162,7 +142,7 @@ class ModuleStripColor : public Module
 						remove++;
 
 					if (sentence[i + remove] == ',')
-     					{
+					{
 						remove += 2;
 
 						if (isdigit(sentence[i + remove]))
@@ -180,39 +160,45 @@ class ModuleStripColor : public Module
 				i--;
 			}
 		}
-		
-		text = sentence;
 	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
+		if (!IS_LOCAL(user))
+			return 0;
+
 		bool active = false;
 		if (target_type == TYPE_USER)
 		{
 			userrec* t = (userrec*)dest;
-			active = t->modes['S'-65];
+			active = t->IsModeSet('S');
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
 			chanrec* t = (chanrec*)dest;
-			active = (t->IsModeSet('S'));
+
+			// 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 (active)
 		{
 			this->ReplaceLine(text);
 		}
+
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return OnUserPreMessage(user,dest,target_type,text,status);
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 	
 	virtual Version GetVersion()
 	{
-		// This is version 2 because version 1.x is the unreleased unrealircd module
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
@@ -238,7 +224,7 @@ class ModuleStripColorFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleStripColorFactory;
 }