X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=d193170741e2f5e6db0ce9898827c763a59b8c3a;hb=1bfa48143c04504181d1b194af151fae2dac1eb1;hp=65ef0e82546659cc5ce1e7740028dcaf7eca04ea;hpb=bd12e3a4e6501496f6eeb7aeb5245162020d6e6c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 65ef0e825..d19317074 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-2009 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.
@@ -20,19 +20,18 @@
 class BlockColor : public SimpleChannelModeHandler
 {
  public:
-	BlockColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'c') { }
+	BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
 };
 
 class ModuleBlockColour : public Module
 {
 	bool AllowChanOps;
-	BlockColor *bc;
+	BlockColor bc;
  public:
 
-	ModuleBlockColour(InspIRCd* Me) : Module(Me)
+	ModuleBlockColour() : bc(this)
 	{
-		bc = new BlockColor(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(bc))
+		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);
@@ -43,18 +42,17 @@ class ModuleBlockColour : public Module
 		ServerInstance->AddExtBanChar('c');
 	}
 
-	virtual int OnUserPreMessage(User* 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)))
 		{
 			Channel* c = (Channel*)dest;
+			ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcolor");
 
-			if (CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) == STATUS_OP)
-			{
-				return 0;
-			}
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
 
-			if(c->IsModeSet('c') || c->GetExtBanStatus(user, 'c') < 0)
+			if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet('c')))
 			{
 				for (std::string::iterator i = text.begin(); i != text.end(); i++)
 				{
@@ -67,29 +65,27 @@ class ModuleBlockColour : public Module
 						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 1;
+							return MOD_RES_DENY;
 						break;
 					}
 				}
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreNotice(User* 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()
 	{
-		ServerInstance->Modes->DelMode(bc);
-		delete bc;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for unreal-style channel mode +c",VF_VENDOR);
 	}
 };