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

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 136f33d85..dd5e3caf0 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  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,63 +16,107 @@
 
 using namespace std;
 
-#include <stdio.h>
-#include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
 
-class ModuleStripColor : public Module
+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;
+
+		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;
+			}
+		}
 
-		Srv->AddExtendedMode('S',MT_CHANNEL,false,0,0);
-		Srv->AddExtendedMode('S',MT_CLIENT,false,0,0);
+		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;
+	}
+};
+
+
+class ModuleStripColor : public Module
+{
+ 
+ ConfigReader *Conf, *MyConf;
+ ChannelStripColor *csc;
+ UserStripColor *usc;
+ 
+ public:
+	ModuleStripColor(InspIRCd* Me)
+		: Module::Module(Me)
+	{
+		
+
+		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 void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "S";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
-        }
- 	
 	virtual ~ModuleStripColor()
 	{
+		DELETE(usc);
+		DELETE(csc);
 	}
 	
 	// ANSI colour stripping by Doc (Peter Wood)
@@ -80,9 +124,9 @@ class ModuleStripColor : public Module
 	{
 		int i, a, len, remove;
 		char sentence[MAXBUF];
-		strncpy(sentence,text.c_str(),MAXBUF);
+		strlcpy(sentence,text.c_str(),MAXBUF);
   
-		len = strlen(sentence);
+		len = text.length();
 
 		for (i = 0; i < len; i++)
   		{
@@ -130,18 +174,18 @@ class ModuleStripColor : public Module
 		text = sentence;
 	}
 	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
 		bool active = false;
 		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)
 		{
 			chanrec* t = (chanrec*)dest;
-			active = (t->IsCustomModeSet('S'));
+			active = (t->IsModeSet('S'));
 		}
 		if (active)
 		{
@@ -150,24 +194,9 @@ class ModuleStripColor : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
-		bool active = false;
-		if (target_type == TYPE_USER)
-		{
-			userrec* t = (userrec*)dest;
-			active = (strchr(t->modes,'S') > 0);
-		}
-		else if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* t = (chanrec*)dest;
-			active = (t->IsCustomModeSet('S'));
-		}
-		if (active)
-		{
-			this->ReplaceLine(text);
-		}
-		return 0;
+		return OnUserPreMessage(user,dest,target_type,text,status);
 	}
 	
 	virtual Version GetVersion()
@@ -191,7 +220,7 @@ class ModuleStripColorFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleStripColor(Me);
 	}