X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=8338745bae319113ff60ccac5320a198db7832d7;hb=eacd707421be4f2612df9bde4517649061bb062e;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..8338745ba 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,20 +25,23 @@ class BlockColor : public SimpleChannelModeHandler
 
 class ModuleBlockColour : public Module
 {
-	bool AllowChanOps;	
+	bool AllowChanOps;
 	BlockColor *bc;
  public:
- 
+
 	ModuleBlockColour(InspIRCd* Me) : Module(Me)
 	{
 		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);
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-
+	virtual void On005Numeric(std::string &output)
+	{
+		ServerInstance->AddExtBanChar('c');
+	}
 
 	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
@@ -50,8 +53,8 @@ class ModuleBlockColour : public Module
 			{
 				return 0;
 			}
-			
-			if(c->IsModeSet('c'))
+
+			if(c->IsModeSet('c') || c->IsExtBanned(user, 'c'))
 			{
 				for (std::string::iterator i = text.begin(); i != text.end(); i++)
 				{
@@ -63,7 +66,7 @@ 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);
+							user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick.c_str(), c->name.c_str());
 							return 1;
 						break;
 					}
@@ -72,7 +75,7 @@ class ModuleBlockColour : public Module
 		}
 		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);
@@ -83,10 +86,10 @@ class ModuleBlockColour : public Module
 		ServerInstance->Modes->DelMode(bc);
 		delete bc;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };