X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=369e719b018fefdebd460c7447a388a04b61d72a;hb=192ae99685903cfb71bbf70edc450c4a6314621e;hp=58ee4da8b221ca9392d52b3f7acec022ab517668;hpb=5b639d8e57e42922b51998085ffe368f4a9f9ff1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 58ee4da8b..369e719b0 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,106 +1,115 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 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 ModeHandler
 {
-	Server *Srv;
  public:
- 
-	ModuleBlockColor()
-	{
-		Srv = new Server;
-		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
-	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+	BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		if (target_type == TYPE_CHANNEL)
+		if (adding)
 		{
-			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			snprintf(ctext,MAXBUF,"%s",text.c_str());
-			if (c->IsCustomModeSet('c'))
+			if (!channel->IsModeSet('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;
-				}
+				channel->SetMode('c',true);
+				return MODEACTION_ALLOW;
 			}
 		}
-		return 0;
-	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
-	{
-		if (target_type == TYPE_CHANNEL)
+		else
 		{
-			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			snprintf(ctext,MAXBUF,"%s",text.c_str());
-			if (c->IsCustomModeSet('c'))
+			if (channel->IsModeSet('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;
-				}
+				channel->SetMode('c',false);
+				return MODEACTION_ALLOW;
 			}
 		}
-		return 0;
-	}
-	
-	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))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+
+		return MODEACTION_DENY;
 	}
+};
 
-	virtual ~ModuleBlockColor()
+class ModuleBlockColour : public Module
+{
+	bool AllowChanOps;	
+	BlockColor *bc;
+ public:
+ 
+	ModuleBlockColour(InspIRCd* Me) : Module(Me)
 	{
-		delete Srv;
+		bc = new BlockColor(ServerInstance);
+		if (!ServerInstance->AddMode(bc))
+			throw ModuleException("Could not add new modes!");
 	}
-	
-	virtual Version GetVersion()
+
+	void Implements(char* List)
 	{
-		return Version(1,0,0,0);
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
-};
 
 
-class ModuleBlockColorFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColorFactory()
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
+		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		{
+			Channel* c = (Channel*)dest;
+			
+			if(c->IsModeSet('c'))
+			{
+				if (!CHANOPS_EXEMPT(ServerInstance, 'c') || CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) != STATUS_OP)
+				{
+					for (std::string::iterator i = text.begin(); i != text.end(); i++)
+					{
+						switch (*i)
+						{
+							case 2:
+							case 3:
+							case 15:
+							case 21:
+							case 22:
+							case 31:
+								user->WriteServ("404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
+								return 1;
+							break;
+						}
+					}
+				}
+			}
+		}
+		return 0;
 	}
 	
-	~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);
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual ~ModuleBlockColour()
 	{
-		return new ModuleBlockColor;
+		ServerInstance->Modes->DelMode(bc);
+		DELETE(bc);
 	}
 	
+	virtual Version GetVersion()
+	{
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+	}
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColorFactory;
-}
-
+MODULE_INIT(ModuleBlockColour)