X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=fd149e5f2a30eae8886678a354ff435185cd53c9;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=0875399b8d8ff2aec6bf0ddc1e5e96c105f716c9;hpb=271d82a33e316e9d1f1cc33466bbd7f7b20dfdb4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 0875399b8..fd149e5f2 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -5,7 +5,7 @@
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *                <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -16,55 +16,111 @@
 
 using namespace std;
 
-#include <stdio.h>
-#include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
 
-class ModuleStripColor : public Module
+/** Handles channel mode +S
+ */
+class ChannelStripColor : public ModeHandler
 {
- Server *Srv;
- ConfigReader *Conf, *MyConf;
- 
  public:
-	ModuleStripColor(Server* Me)
-		: Module::Module(Me)
+	ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		Srv = Me;
+		/* Only opers can change other users modes */
+		if ((source != dest) && (!*source->oper))
+			return MODEACTION_DENY;
 
-		Srv->AddExtendedMode('S',MT_CHANNEL,false,0,0);
-		Srv->AddExtendedMode('S',MT_CLIENT,false,0,0);
-	}
+		if (adding)
+		{
+			if (!channel->IsModeSet('S'))
+			{
+				channel->SetMode('S',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
+		{
+			if (channel->IsModeSet('S'))
+			{
+				channel->SetMode('S',false);
+				return MODEACTION_ALLOW;
+			}
+		}
 
-	void Implements(char* List)
-	{
-		List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		return MODEACTION_DENY;
 	}
+};
+
+class UserStripColor : public ModeHandler
+{
+ public:
+	UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
 
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		// check if this is our mode character...
-		if (modechar == 'S')
-  		{
-			return 1;
+		/* Only opers can change other users modes */
+		if ((source != dest) && (!*source->oper))
+			return MODEACTION_DENY;
+
+		if (adding)
+		{
+			if (!dest->IsModeSet('S'))
+			{
+				dest->SetMode('S',true);
+				return MODEACTION_ALLOW;
+			}
 		}
 		else
 		{
-			return 0;
+			if (dest->IsModeSet('S'))
+			{
+				dest->SetMode('S',false);
+				return MODEACTION_ALLOW;
+			}
 		}
+
+		return MODEACTION_DENY;
 	}
+};
+
 
-	virtual void On005Numeric(std::string &output)
+class ModuleStripColor : public Module
+{
+ 
+ ConfigReader *Conf, *MyConf;
+ ChannelStripColor *csc;
+ UserStripColor *usc;
+ 
+ public:
+	ModuleStripColor(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		InsertMode(output,"S",4);
+		
+
+		usc = new UserStripColor(ServerInstance);
+		csc = new ChannelStripColor(ServerInstance);
+
+		ServerInstance->AddMode(usc, 'S');
+		ServerInstance->AddMode(csc, 'S');
 	}
- 	
+
+	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);
 	}
 	
 	// ANSI colour stripping by Doc (Peter Wood)
@@ -74,7 +130,7 @@ class ModuleStripColor : public Module
 		char sentence[MAXBUF];
 		strlcpy(sentence,text.c_str(),MAXBUF);
   
-		len = strlen(sentence);
+		len = text.length();
 
 		for (i = 0; i < len; i++)
   		{
@@ -128,7 +184,7 @@ class ModuleStripColor : public Module
 		if (target_type == TYPE_USER)
 		{
 			userrec* t = (userrec*)dest;
-			active = (strchr(t->modes,'S') > 0);
+			active = t->modes['S'-65];
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
@@ -150,7 +206,7 @@ class ModuleStripColor : public Module
 	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, 0, 0, 0, VF_COMMON | VF_VENDOR);
 	}
 	
 };
@@ -168,7 +224,7 @@ class ModuleStripColorFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleStripColor(Me);
 	}