X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=020627d01a280f5900f4a7441127faabf1741e68;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=d48fab5bac10bf74014813fcca365cd5490b4b31;hpb=fd355973486299b3db37a4ec46125476f59db0ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index d48fab5ba..020627d01 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-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -25,20 +25,22 @@ class BlockColor : public SimpleChannelModeHandler
 
 class ModuleBlockColour : public Module
 {
-	bool AllowChanOps;	
-	BlockColor *bc;
+	bool AllowChanOps;
+	BlockColor bc;
  public:
- 
-	ModuleBlockColour(InspIRCd* Me) : Module(Me)
+
+	ModuleBlockColour(InspIRCd* Me) : Module(Me), bc(Me)
 	{
-		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 };
-		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 +52,8 @@ class ModuleBlockColour : public Module
 			{
 				return 0;
 			}
-			
-			if(c->IsModeSet('c'))
+
+			if(c->IsModeSet('c') || c->GetExtBanStatus(user, 'c') < 0)
 			{
 				for (std::string::iterator i = text.begin(); i != text.end(); i++)
 				{
@@ -63,7 +65,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_str(), 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 +74,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);
@@ -80,13 +82,12 @@ class ModuleBlockColour : public Module
 
 	virtual ~ModuleBlockColour()
 	{
-		ServerInstance->Modes->DelMode(bc);
-		delete bc;
+		ServerInstance->Modes->DelMode(&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);
 	}
 };