X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_stripcolor.cpp;h=dd5e3caf07feef4ab5ea31c42a457bda8c82a749;hb=1afe959c7574b479e4a49a62885d2ac2757025ab;hp=485f05c14410845acf8b0babc19a0a84c4042083;hpb=6dfc98470938a932ddee0100f515658dffe94438;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 485f05c14..dd5e3caf0 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,120 +16,107 @@
 
 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 ChannelStripColor : public ModeHandler
 {
  public:
-        StripColor() : ModeHandler('S', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-        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'))
-                        {
-                                channel->SetMode('S',true);
-                                return MODEACTION_ALLOW;
-                        }
-                }
-                else
-                {
-                        if (channel->IsModeSet('S'))
-                        {
-                                channel->SetMode('S',false);
-                                return MODEACTION_ALLOW;
-                        }
-                }
-
-                return MODEACTION_DENY;
-        }
+	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)
+	{
+		/* Only opers can change other users modes */
+		if ((source != dest) && (!*source->oper))
+			return MODEACTION_DENY;
+
+		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;
+			}
+		}
+
+		return MODEACTION_DENY;
+	}
 };
 
 class UserStripColor : public ModeHandler
 {
  public:
-        StripColor() : ModeHandler('S', 0, 0, false, MODETYPE_USER, false) { }
-
-        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 (!dest->IsModeSet('S'))
-                        {
-                                dest->SetMode('S',true);
-                                return MODEACTION_ALLOW;
-                        }
-                }
-                else
-                {
-                        if (dest->IsModeSet('S'))
-                        {
-                                dest->SetMode('S',false);
-                                return MODEACTION_ALLOW;
-                        }
-                }
-
-                return MODEACTION_DENY;
-        }
+	UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
+
+	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 (!dest->IsModeSet('S'))
+			{
+				dest->SetMode('S',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
+		{
+			if (dest->IsModeSet('S'))
+			{
+				dest->SetMode('S',false);
+				return MODEACTION_ALLOW;
+			}
+		}
+
+		return MODEACTION_DENY;
+	}
 };
 
 
 class ModuleStripColor : public Module
 {
- Server *Srv;
+ 
  ConfigReader *Conf, *MyConf;
+ ChannelStripColor *csc;
+ UserStripColor *usc;
  
  public:
-	ModuleStripColor(Server* Me)
+	ModuleStripColor(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 
-		Srv->AddExtendedMode('S',MT_CHANNEL,false,0,0);
-		Srv->AddExtendedMode('S',MT_CLIENT,false,0,0);
-	}
+		usc = new UserStripColor(ServerInstance);
+		csc = new ChannelStripColor(ServerInstance);
 
-	void Implements(char* List)
-	{
-		List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		ServerInstance->AddMode(usc, 'S');
+		ServerInstance->AddMode(csc, 'S');
 	}
 
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+	void Implements(char* List)
 	{
-		// check if this is our mode character...
-		if (modechar == 'S')
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output,"S",4);
-	}
- 	
 	virtual ~ModuleStripColor()
 	{
+		DELETE(usc);
+		DELETE(csc);
 	}
 	
 	// ANSI colour stripping by Doc (Peter Wood)
@@ -139,7 +126,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++)
   		{
@@ -233,7 +220,7 @@ class ModuleStripColorFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleStripColor(Me);
 	}