X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=cbe4bc1faf1cfde7bb34594cac239f52976b18ba;hb=cbd32e195f5f574653550a3ed4954168ace30c55;hp=a40d4ebd3f11439d8c98de462e5fd8648d98afd7;hpb=a07e365fe1833a47de95a1390a0c37d0664d8cce;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index a40d4ebd3..cbe4bc1fa 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,142 +11,82 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <sstream>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
 /** Handles the +c channel mode
  */
-class BlockColor : public ModeHandler
+class BlockColor : public SimpleChannelModeHandler
 {
  public:
-	BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('c'))
-			{
-				channel->SetMode('c',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('c'))
-			{
-				channel->SetMode('c',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
 };
 
-class ModuleBlockColour : public Module
+class ModuleBlockColor : public Module
 {
-	bool AllowChanOps;	
-	BlockColor *bc;
+	bool AllowChanOps;
+	BlockColor bc;
  public:
- 
-	ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
-	{
-		bc = new BlockColor(ServerInstance);
-		if (!ServerInstance->AddMode(bc, 'c'))
-			throw ModuleException("Could not add new modes!");
 
-		OnRehash(NULL, "");
-	}
-
-	void Implements(char* List)
+	ModuleBlockColor() : bc(this)
 	{
-		List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		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 OnRehash(userrec* user, const std::string &parameter)
+	virtual void On005Numeric(std::string &output)
 	{
-		ConfigReader Conf(ServerInstance);
-
-		AllowChanOps = Conf.ReadFlag("blockcolor", "allowchanops", 0);
+		ServerInstance->AddExtBanChar('c');
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
-			
-			if(c->IsModeSet('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('c')))
 			{
-				if (!AllowChanOps || AllowChanOps && c->GetStatus(user) != STATUS_OP)
+				for (std::string::iterator i = text.begin(); i != text.end(); i++)
 				{
-					for (std::string::iterator i = text.begin(); i != text.end(); i++)
+					switch (*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;
-						}
+						case 2:
+						case 3:
+						case 15:
+						case 21:
+						case 22:
+						case 31:
+							user->WriteNumeric(404, "%s %s :Can't send colors to channel (+c set)",user->nick.c_str(), c->name.c_str());
+							return MOD_RES_DENY;
+						break;
 					}
 				}
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+
+	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 ~ModuleBlockColour()
+	virtual ~ModuleBlockColor()
 	{
-		ServerInstance->Modes->DelMode(bc);
-		DELETE(bc);
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
-	}
-};
-
 
-class ModuleBlockColourFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColourFactory()
-	{
-	}
-	
-	~ModuleBlockColourFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+	virtual Version GetVersion()
 	{
-		return new ModuleBlockColour(Me);
+		return Version("Provides support for unreal-style channel mode +c",VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColourFactory;
-}
+MODULE_INIT(ModuleBlockColor)