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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index ddba6ee2a..6ed27d810 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,92 +2,60 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <sstream>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
-
-
-class BlockColor : public ModeHandler
+/** Handles the +c channel mode
+ */
+class BlockColor : public SimpleChannelModeHandler
 {
  public:
-	BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* 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;
 	BlockColor *bc;
  public:
- 
-	ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
-	{
-		
-		bc = new BlockColor(ServerInstance);
-		ServerInstance->AddMode(bc, 'c');
-	}
 
-	void Implements(char* List)
+	ModuleBlockColour(InspIRCd* Me) : Module(Me)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		bc = new BlockColor(ServerInstance);
+		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);
 	}
 
 	virtual void On005Numeric(std::string &output)
 	{
-		ServerInstance->ModeGrok->InsertMode(output,"c",4);
+		ServerInstance->AddExtBanChar('c');
 	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+
+	virtual int OnUserPreMessage(User* 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'))
+			Channel* c = (Channel*)dest;
+
+			if (CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) == STATUS_OP)
+			{
+				return 0;
+			}
+
+			if(c->IsModeSet('c') || c->GetExtBanStatus(user, 'c') < 0)
 			{
-				/* 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++)
 				{
 					switch (*i)
@@ -98,7 +66,7 @@ class ModuleBlockColour : public Module
 						case 21:
 						case 22:
 						case 31:
-							user->WriteServ("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;
 					}
@@ -107,44 +75,22 @@ class ModuleBlockColour : public Module
 		}
 		return 0;
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+
+	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);
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 
 	virtual ~ModuleBlockColour()
 	{
-		DELETE(bc);
+		ServerInstance->Modes->DelMode(bc);
+		delete bc;
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-	}
-};
 
-
-class ModuleBlockColourFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColourFactory()
-	{
-	}
-	
-	~ModuleBlockColourFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+	virtual Version GetVersion()
 	{
-		return new ModuleBlockColour(Me);
+		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColourFactory;
-}
+MODULE_INIT(ModuleBlockColour)