X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=ef26e746b45ce20070a9b3cdcc318a772379c543;hb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;hp=dc86d6e1539c4d6948ade0ffa8988afaa9eb31a6;hpb=aea30280acf0a8faaca910815cad4e9530565685;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index dc86d6e15..ef26e746b 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -14,11 +14,14 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <sstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
@@ -27,12 +30,18 @@ class ModuleBlockColor : public Module
 	Server *Srv;
  public:
  
-	ModuleBlockColor()
+	ModuleBlockColor(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
+		Srv = Me;
 		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
 	}
 
+	void Implements(char* List)
+        {
+                List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
+        }
+
         virtual void On005Numeric(std::string &output)
         {
                 // we don't really have a limit...
@@ -49,7 +58,8 @@ class ModuleBlockColor : public Module
 			}
 			temp2 = temp2 + temp1 + " ";
 		}
-		output = temp2.substr(0,temp2.length()-1);
+		if (temp2.length())
+			output = temp2.substr(0,temp2.length()-1);
         }
 	
 	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
@@ -58,13 +68,26 @@ class ModuleBlockColor : public Module
 		{
 			chanrec* c = (chanrec*)dest;
 			char ctext[MAXBUF];
+			char *ctptr = ctext;
 			snprintf(ctext,MAXBUF,"%s",text.c_str());
+
+
 			if (c->IsCustomModeSet('c'))
 			{
-				if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31)))
+				/* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
+				while (ctptr && *ctptr)
 				{
-					WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-					return 1;
+					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++;
 				}
 			}
 		}
@@ -77,13 +100,26 @@ class ModuleBlockColor : public Module
 		{
 			chanrec* c = (chanrec*)dest;
 			char ctext[MAXBUF];
+			char *ctptr = ctext;
 			snprintf(ctext,MAXBUF,"%s",text.c_str());
+
+
 			if (c->IsCustomModeSet('c'))
 			{
-				if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31)))
+				/* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
+				while (ctptr && *ctptr)
 				{
-					WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-					return 1;
+					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++;
 				}
 			}
 		}
@@ -106,12 +142,11 @@ class ModuleBlockColor : public Module
 
 	virtual ~ModuleBlockColor()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
 	}
 };
 
@@ -127,9 +162,9 @@ class ModuleBlockColorFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleBlockColor;
+		return new ModuleBlockColor(Me);
 	}
 	
 };