X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=6ed27d8109ec75d2269c7e121d7a61fed2c73131;hb=97c0e6b4c4e304a1c4e764fc06a7e2663a41743d;hp=0cbb3e8d8e7dddd30dd0604819aa5cd36c4da461;hpb=ece985ccb3210a132d67381511642edfb359f5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 0cbb3e8d8..6ed27d810 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.
@@ -17,82 +17,65 @@
 
 /** 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(User* source, User* dest, Channel* 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(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'c') { }
 };
 
 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)
 	{
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
 			Channel* c = (Channel*)dest;
-			
-			if(c->IsModeSet('c'))
+
+			if (CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) == STATUS_OP)
 			{
-				if (!CHANOPS_EXEMPT(ServerInstance, 'c') || CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) != STATUS_OP)
+				return 0;
+			}
+
+			if(c->IsModeSet('c') || c->GetExtBanStatus(user, 'c') < 0)
+			{
+				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 colours to channel (+c set)",user->nick.c_str(), c->name.c_str());
+							return 1;
+						break;
 					}
 				}
 			}
 		}
 		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);
@@ -103,10 +86,10 @@ class ModuleBlockColour : public Module
 		ServerInstance->Modes->DelMode(bc);
 		delete bc;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };