X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=f62e546136485ee142ec6d4061ee90af01d0f28f;hb=5a88424dbb33ac825aa0b9b6525179329ee75519;hp=1e7f213535e8e0f6d475644e6cc0e22d59e1edac;hpb=7820d50612c31484ba94b079c127d4cb02526c41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 1e7f21353..f62e54613 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,7 +2,7 @@
  *       | 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>
@@ -21,145 +21,119 @@ using namespace std;
 #include "users.h"
 #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
+/** Handles the +c channel mode
+ */
+class BlockColor : public ModeHandler
 {
-	Server *Srv;
  public:
- 
-	ModuleBlockColor(Server* Me)
-		: Module::Module(Me)
-	{
-		Srv = Me;
-		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
-	}
+	BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-        virtual void On005Numeric(std::string &output)
-        {
-                // we don't really have a limit...
-		std::stringstream line(output);
-		std::string temp1, temp2;
-		while (!line.eof())
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		if (adding)
 		{
-			line >> temp1;
-			if (temp1.substr(0,10) == "CHANMODES=")
+			if (!channel->IsModeSet('c'))
 			{
-				// append the chanmode to the end
-				temp1 = temp1.substr(10,temp1.length());
-				temp1 = "CHANMODES=" + temp1 + "c";
+				channel->SetMode('c',true);
+				return MODEACTION_ALLOW;
 			}
-			temp2 = temp2 + temp1 + " ";
 		}
-		if (temp2.length())
-			output = temp2.substr(0,temp2.length()-1);
-        }
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
-	{
-		if (target_type == TYPE_CHANNEL)
+		else
 		{
-			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			char *ctptr = ctext;
-			snprintf(ctext,MAXBUF,"%s",text.c_str());
-
-
-			if (c->IsCustomModeSet('c'))
+			if (channel->IsModeSet('c'))
 			{
-				/* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
-				while (ctptr && *ctptr)
-				{
-					switch (*ctptr)
-					{
-						case 2:
-						case 3:
-						case 31:
-							WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-							return 1;
-							break;
-					}
-
-					*ctptr++;
-				}
+				channel->SetMode('c',false);
+				return MODEACTION_ALLOW;
 			}
 		}
-		return 0;
+
+		return MODEACTION_DENY;
 	}
+};
+
+class ModuleBlockColour : public Module
+{
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+	BlockColor *bc;
+ public:
+ 
+	ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
+	{
+		
+		bc = new BlockColor(ServerInstance);
+		ServerInstance->AddMode(bc, 'c');
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+	}
+
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
 			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			char *ctptr = ctext;
-			snprintf(ctext,MAXBUF,"%s",text.c_str());
-
-
-			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:
+						case 15:
+						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;
+						break;
 					}
-
-					ctptr++;
 				}
 			}
 		}
 		return 0;
 	}
 	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		// check if this is our mode character...
-		if ((modechar == 'c') && (type == MT_CHANNEL))
-  		{
-  			log(DEBUG,"Allowing c change");
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 
-	virtual ~ModuleBlockColor()
+	virtual ~ModuleBlockColour()
 	{
+		ServerInstance->Modes->DelMode(bc);
+		DELETE(bc);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
 
-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);
 	}
 	
 };
@@ -167,6 +141,5 @@ class ModuleBlockColorFactory : public ModuleFactory
 
 extern "C" void * init_module( void )
 {
-	return new ModuleBlockColorFactory;
+	return new ModuleBlockColourFactory;
 }
-