X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=a08ad7c6f0dabca419445a767703489070824139;hb=43b5073d6f80a8dcb7044ecd127fd5893da033ab;hp=13d1d451640dbe338ed261a20e75c9d664f656ef;hpb=103c58a8339c0cac95911ba83fd5adc98c17e17e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 13d1d4516..a08ad7c6f 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,94 +1,86 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2004-2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +c */
+#include "inspircd.h"
+
+/** Handles the +c channel mode
+ */
+class BlockColor : public SimpleChannelModeHandler
+{
+ public:
+	BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
+};
 
 class ModuleBlockColor : public Module
 {
-	Server *Srv;
-	
+	BlockColor bc;
  public:
- 
-	ModuleBlockColor()
+
+	ModuleBlockColor() : bc(this)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
 	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		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;
+		tokens["EXTBAN"].push_back('c');
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+
+	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
 	{
-		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 = ServerInstance->OnCheckExemption(user,c,"blockcolor");
+
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
+
+			if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet(bc)))
 			{
-				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(ERR_CANNOTSENDTOCHAN, "%s :Can't send colors to channel (+c set)", c->name.c_str());
+							return MOD_RES_DENY;
+						break;
+					}
 				}
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual ~ModuleBlockColor()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-};
-
 
-class ModuleBlockColorFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColorFactory()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides channel mode +c to block color",VF_VENDOR);
 	}
-	
-	~ModuleBlockColorFactory()
-	{
-	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleBlockColor;
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColorFactory;
-}
-
+MODULE_INIT(ModuleBlockColor)