X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=ce8325e454702f53bad4e241dd1009e69ffddc88;hb=9336468f5bfa60318cb57db5126047147b7a21cb;hp=c53520adbfc3315393ddcecc46e272ca9f0e34df;hpb=235a0a2035bda6dd214719107083266207f39883;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index c53520adb..ce8325e45 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,67 +2,62 @@
  *       | 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 ModuleBlockColor : public Module
+/** Handles the +c channel mode
+ */
+class BlockColor : public SimpleChannelModeHandler
 {
-	Server *Srv;
  public:
- 
-	ModuleBlockColor(Server* Me)
-		: Module::Module(Me)
+	BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, 'c') { }
+};
+
+class ModuleBlockColour : public Module
+{
+	bool AllowChanOps;
+	BlockColor bc;
+ public:
+
+	ModuleBlockColour() : bc(this)
 	{
-		Srv = Me;
-		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
+		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);
 	}
 
-	void Implements(char* List)
-        {
-                List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
-        }
+	virtual void On005Numeric(std::string &output)
+	{
+		ServerInstance->AddExtBanChar('c');
+	}
 
-        virtual void On005Numeric(std::string &output)
-        {
-		InsertMode(output,"c",4);
-        }
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual ModResult 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;
-			char ctext[MAXBUF];
-			char *ctptr = ctext;
-			strlcpy(ctext,text.c_str(),MAXBUF);
+			Channel* c = (Channel*)dest;
 
+			if (CHANOPS_EXEMPT('c') && c->GetPrefixValue(user) == OP_VALUE)
+			{
+				return MOD_RES_PASSTHRU;
+			}
 
-			if (c->IsCustomModeSet('c'))
+			if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet('c')))
 			{
-				/* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
-				while (ctptr && *ctptr)
+				for (std::string::iterator i = text.begin(); i != text.end(); i++)
 				{
-					switch (*ctptr++)
+					switch (*i)
 					{
 						case 2:
 						case 3:
@@ -70,67 +65,29 @@ class ModuleBlockColor : public Module
 						case 21:
 						case 22:
 						case 31:
-							WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-							return 1;
+							user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick.c_str(), c->name.c_str());
+							return MOD_RES_DENY;
 						break;
 					}
 				}
 			}
 		}
-		return 0;
-	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
-	{
-		return OnUserPreMessage(user,dest,target_type,text,status);
-	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'c') && (type == MT_CHANNEL))
-  		{
-  			log(DEBUG,"Allowing c change");
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleBlockColor()
-	{
-	}
-	
-	virtual Version GetVersion()
+	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
-};
 
-
-class ModuleBlockColorFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColorFactory()
-	{
-	}
-	
-	~ModuleBlockColorFactory()
+	virtual ~ModuleBlockColour()
 	{
 	}
-	
-	virtual Module * CreateModule(Server* Me)
+
+	virtual Version GetVersion()
 	{
-		return new ModuleBlockColor(Me);
+		return Version("Provides support for unreal-style channel mode +c",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColorFactory;
-}
-
+MODULE_INIT(ModuleBlockColour)