X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=8338745bae319113ff60ccac5320a198db7832d7;hb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;hp=0db05a7c3d503a6fb581f1e2997569c75605da66;hpb=e5c42c2a136440942148d03abdc8db71e080e988;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 0db05a7c3..8338745ba 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,94 +1,96 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.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 SimpleChannelModeHandler
 {
-	Server *Srv;
-	
  public:
- 
-	ModuleBlockColor()
+	BlockColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'c') { }
+};
+
+class ModuleBlockColour : public Module
+{
+	bool AllowChanOps;
+	BlockColor *bc;
+ public:
+
+	ModuleBlockColour(InspIRCd* Me) : Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
+		bc = new BlockColor(ServerInstance);
+		if (!ServerInstance->Modes->AddMode(bc))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+
+	virtual void On005Numeric(std::string &output)
 	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			snprintf(ctext,MAXBUF,"%s",text.c_str());
-			if (c->IsCustomModeSet('c'))
-			{
-				if (strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31))
-				{
-					WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-					return 1;
-				}
-			}
-		}
-		return 0;
+		ServerInstance->AddExtBanChar('c');
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		if (target_type == TYPE_CHANNEL)
+		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			snprintf(ctext,MAXBUF,"%s",text.c_str());
-			if (c->IsCustomModeSet('c'))
+			Channel* c = (Channel*)dest;
+
+			if (CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) == STATUS_OP)
 			{
-				if (strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31))
+				return 0;
+			}
+
+			if(c->IsModeSet('c') || c->IsExtBanned(user, 'c'))
+			{
+				for (std::string::iterator i = text.begin(); i != text.end(); i++)
 				{
-					WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-					return 1;
+					switch (*i)
+					{
+						case 2:
+						case 3:
+						case 15:
+						case 21:
+						case 22:
+						case 31:
+							user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick.c_str(), c->name.c_str());
+							return 1;
+						break;
+					}
 				}
 			}
 		}
 		return 0;
 	}
-	
-	virtual ~ModuleBlockColor()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-};
-
 
-class ModuleBlockColorFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColorFactory()
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
-	
-	~ModuleBlockColorFactory()
+
+	virtual ~ModuleBlockColour()
 	{
+		ServerInstance->Modes->DelMode(bc);
+		delete bc;
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual Version GetVersion()
 	{
-		return new ModuleBlockColor;
+		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColorFactory;
-}
-
+MODULE_INIT(ModuleBlockColour)