X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=567bdb24951e961f1ee304a9062ed6706faace86;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=3e97f82877b6c7b85d4e65f69ef18a37a3c96acb;hpb=f3abcf2bcfe36d3389b74caa9eef8582901fbe15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 3e97f8287..567bdb249 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,57 +1,61 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +c */
+#include "inspircd.h"
 
 /** Handles the +c channel mode
  */
 class BlockColor : public SimpleChannelModeHandler
 {
  public:
-	BlockColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'c') { }
+	BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
 };
 
-class ModuleBlockColour : public Module
+class ModuleBlockColor : public Module
 {
-	bool AllowChanOps;	
-	BlockColor *bc;
+	BlockColor bc;
  public:
- 
-	ModuleBlockColour(InspIRCd* Me) : Module(Me)
+
+	ModuleBlockColor() : bc(this)
 	{
-		bc = new BlockColor(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(bc))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+	{
+		tokens["EXTBAN"].push_back('c');
+	}
 
-
-	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	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) && (IS_LOCAL(user)))
 		{
 			Channel* c = (Channel*)dest;
+			ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcolor");
 
-			if (CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) == STATUS_OP)
-			{
-				return 0;
-			}
-			
-			if(c->IsModeSet('c'))
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
+
+			if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet(bc)))
 			{
 				for (std::string::iterator i = text.begin(); i != text.end(); i++)
 				{
@@ -63,31 +67,20 @@ class ModuleBlockColour : public Module
 						case 21:
 						case 22:
 						case 31:
-							user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick, c->name);
-							return 1;
+							user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c set)");
+							return MOD_RES_DENY;
 						break;
 					}
 				}
 			}
 		}
-		return 0;
-	}
-	
-	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);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleBlockColour()
-	{
-		ServerInstance->Modes->DelMode(bc);
-		delete bc;
-	}
-	
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides channel mode +c to block color",VF_VENDOR);
 	}
 };
 
-MODULE_INIT(ModuleBlockColour)
+MODULE_INIT(ModuleBlockColor)