X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=73bfb76069c32ac4213877282908c9eb09f3e697;hb=4ab15e865571f78cd8ea22c47a1a3b7d3372a786;hp=f63caf6c5e95e45881d32ab09826262719a30418;hpb=2d821f2980825be73e3f90b47ffff365b0ec5ecb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index f63caf6c5..73bfb7606 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,145 +2,92 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <sstream>
-#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 SimpleChannelModeHandler
+{
+ public:
+	BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
+};
+
+class ModuleBlockColour : public Module
 {
-	Server *Srv;
+	bool AllowChanOps;
+	BlockColor bc;
  public:
- 
-	ModuleBlockColor(Server* Me)
-		: Module::Module(Me)
+
+	ModuleBlockColour() : bc(this)
 	{
-		Srv = Me;
-		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
+		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 void On005Numeric(std::string &output)
-        {
-                // we don't really have a limit...
-		std::stringstream line(output);
-		std::string temp1, temp2;
-		while (!line.eof())
-		{
-			line >> temp1;
-			if (temp1.substr(0,10) == "CHANMODES=")
-			{
-				// append the chanmode to the end
-				temp1 = temp1.substr(10,temp1.length());
-				temp1 = "CHANMODES=" + temp1 + "c";
-			}
-			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)
+	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 ModResult 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;
+			ModResult res;
+			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"blockcolor"));
+
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
+
+			if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet('c')))
 			{
-				if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31)))
+				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 MOD_RES_DENY;
+						break;
+					}
 				}
 			}
 		}
-		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))
-  		{
-  			log(DEBUG,"Allowing c change");
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleBlockColor()
+	virtual ModResult 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 Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-	}
-};
 
-
-class ModuleBlockColorFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColorFactory()
-	{
-	}
-	
-	~ModuleBlockColorFactory()
+	virtual ~ModuleBlockColour()
 	{
 	}
-	
-	virtual Module * CreateModule(Server* Me)
+
+	virtual Version GetVersion()
 	{
-		return new ModuleBlockColor(Me);
+		return Version("Provides support for unreal-style channel mode +c",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColorFactory;
-}
-
+MODULE_INIT(ModuleBlockColour)