X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=69b0e468699d5195b44fcfaefed33b64daef15c5;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=df28f1807a59c726876b551998ad0ef2fad8008b;hpb=67878d628c15f2adec41b6d3b266830a636c2ed0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index df28f1807..69b0e4686 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <sstream>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
@@ -52,13 +50,12 @@ class BlockColor : public ModeHandler
 
 class ModuleBlockColour : public Module
 {
-	
+	bool AllowChanOps;	
 	BlockColor *bc;
  public:
  
-	ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
+	ModuleBlockColour(InspIRCd* Me) : Module(Me)
 	{
-		
 		bc = new BlockColor(ServerInstance);
 		if (!ServerInstance->AddMode(bc, 'c'))
 			throw ModuleException("Could not add new modes!");
@@ -69,28 +66,31 @@ class ModuleBlockColour : public Module
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
+
 	virtual int OnUserPreMessage(userrec* 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;
 			
 			if(c->IsModeSet('c'))
 			{
-				/* Replace a strlcpy(), which ran even when +c wasn't set, with this (no copies at all) -- Om */
-				for (std::string::iterator i = text.begin(); i != text.end(); i++)
+				if (!CHANOPS_EXEMPT(ServerInstance, 'c') || CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) != STATUS_OP)
 				{
-					switch (*i)
+					for (std::string::iterator i = text.begin(); i != text.end(); 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;
+						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;
+						}
 					}
 				}
 			}
@@ -115,27 +115,4 @@ class ModuleBlockColour : public Module
 	}
 };
 
-
-class ModuleBlockColourFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColourFactory()
-	{
-	}
-	
-	~ModuleBlockColourFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBlockColour(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColourFactory;
-}
+MODULE_INIT(ModuleBlockColour)