X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=92919d15360489128e1e057f538ea36b397a0b38;hb=66098d307c036997e51eaea21724615e27fdc3e9;hp=c53520adbfc3315393ddcecc46e272ca9f0e34df;hpb=235a0a2035bda6dd214719107083266207f39883;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index c53520adb..92919d153 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -22,47 +22,75 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
-class ModuleBlockColor : public Module
+extern InspIRCd* ServerInstance;
+
+class BlockColor : public ModeHandler
 {
-	Server *Srv;
+ public:
+	BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		if (adding)
+		{
+			if (!channel->IsModeSet('c'))
+			{
+				channel->SetMode('c',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
+		{
+			if (channel->IsModeSet('c'))
+			{
+				channel->SetMode('c',false);
+				return MODEACTION_ALLOW;
+			}
+		}
+
+		return MODEACTION_DENY;
+	}
+};
+
+class ModuleBlockColour : public Module
+{
+	
+	BlockColor *bc;
  public:
  
-	ModuleBlockColor(Server* Me)
-		: Module::Module(Me)
+	ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
+		
+		bc = new BlockColor(ServerInstance);
+		ServerInstance->AddMode(bc, 'c');
 	}
 
 	void Implements(char* List)
-        {
-                List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
-        }
+	{
+		List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+	}
 
-        virtual void On005Numeric(std::string &output)
-        {
-		InsertMode(output,"c",4);
-        }
+	virtual void On005Numeric(std::string &output)
+	{
+		ServerInstance->ModeGrok->InsertMode(output,"c",4);
+	}
 	
 	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
 			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			char *ctptr = ctext;
-			strlcpy(ctext,text.c_str(),MAXBUF);
-
-
-			if (c->IsCustomModeSet('c'))
+			
+			if(c->IsModeSet('c'))
 			{
-				/* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
-				while (ctptr && *ctptr)
+				/* Replace a strlcpy(), which ran even when +c wasn't set, with this (no copies at all) -- Om */
+				for (std::string::iterator i = text.begin(); i != text.end(); i++)
 				{
-					switch (*ctptr++)
+					switch (*i)
 					{
 						case 2:
 						case 3:
@@ -70,7 +98,7 @@ class ModuleBlockColor : public Module
 						case 21:
 						case 22:
 						case 31:
-							WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
+							user->WriteServ("404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
 							return 1;
 						break;
 					}
@@ -84,23 +112,10 @@ class ModuleBlockColor : public Module
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status);
 	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'c') && (type == MT_CHANNEL))
-  		{
-  			log(DEBUG,"Allowing c change");
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
 
-	virtual ~ModuleBlockColor()
+	virtual ~ModuleBlockColour()
 	{
+		DELETE(bc);
 	}
 	
 	virtual Version GetVersion()
@@ -110,20 +125,20 @@ class ModuleBlockColor : public Module
 };
 
 
-class ModuleBlockColorFactory : public ModuleFactory
+class ModuleBlockColourFactory : public ModuleFactory
 {
  public:
-	ModuleBlockColorFactory()
+	ModuleBlockColourFactory()
 	{
 	}
 	
-	~ModuleBlockColorFactory()
+	~ModuleBlockColourFactory()
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleBlockColor(Me);
+		return new ModuleBlockColour(Me);
 	}
 	
 };
@@ -131,6 +146,5 @@ class ModuleBlockColorFactory : public ModuleFactory
 
 extern "C" void * init_module( void )
 {
-	return new ModuleBlockColorFactory;
+	return new ModuleBlockColourFactory;
 }
-