X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=08bdcba33a7fa63ba9a02d5a1646033c7f06fcc3;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=39e3c16b1128b3cefbf384fe482639b8900cfa77;hpb=42d5b9571eff06b0c33093dc9118c29f9603fd2b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 39e3c16b1..08bdcba33 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,19 +11,17 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <time.h>
-#include "inspircd_config.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-#include "hashcomp.h"
 #include "inspircd.h"
 
 /* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
 
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
+/*	IBLOCK_NOTICE		- Send a notice to the user informing them of what happened.
+ *	IBLOCK_NOTICEOPERS	- Send a notice to the user informing them and send an oper notice.
+ *	IBLOCK_SILENT		- Generate no output, silently drop messages.
+ *	IBLOCK_KILL			- Kill the user with the reason "Global message (/amsg or /ame) detected".
+ *	IBLOCK_KILLOPERS	- As above, but send an oper notice as well. This is the default.
+ */
 
 /** Holds a blocked message's details
  */
@@ -34,27 +32,25 @@ public:
 	irc::string target;
 	time_t sent;
 
-	BlockedMessage(const std::string &msg, const irc::string &tgt, time_t when) : message(msg), target(tgt), sent(when)
+	BlockedMessage(const std::string &msg, const irc::string &tgt, time_t when)
+	: message(msg), target(tgt), sent(when)
 	{
 	}
 };
 
 class ModuleBlockAmsg : public Module
 {
-	
 	int ForgetDelay;
 	BlockAction action;
-public:
-	ModuleBlockAmsg(InspIRCd* Me) : Module::Module(Me)
+	
+ public:
+	ModuleBlockAmsg(InspIRCd* Me) : Module(Me)
 	{
-		
 		this->OnRehash(NULL,"");
+		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_OnCleanup };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = List[I_OnPreCommand] = List[I_OnCleanup] = 1;
-	}
 	
 	virtual ~ModuleBlockAmsg()
 	{
@@ -65,15 +61,16 @@ public:
 		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
-		ConfigReader* Conf = new ConfigReader(ServerInstance);
+		ConfigReader Conf(ServerInstance);
 		
-		ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false);
-		if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
+		ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
+		
+		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
 			ForgetDelay = -1;
 			
-		std::string act = Conf->ReadValue("blockamsg", "action", 0);
+		std::string act = Conf.ReadValue("blockamsg", "action", 0);
 		
 		if(act == "notice")
 			action = IBLOCK_NOTICE;
@@ -85,11 +82,9 @@ public:
 			action = IBLOCK_KILL;
 		else
 			action = IBLOCK_KILLOPERS;
-
-		DELETE(Conf);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		// Don't do anything with unregistered users, or remote ones.
 		if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user))
@@ -107,14 +102,25 @@ public:
 			
 			int targets = 1;
 			int userchans = 0;
-			
-			// Decrement if the first target wasn't a channel.
+		
 			if(*parameters[0] != '#')
+			{
+				// Decrement if the first target wasn't a channel.
 				targets--;
+			}
 			
 			for(const char* c = parameters[0]; *c; c++)
 				if((*c == ',') && *(c+1) && (*(c+1) == '#'))
 					targets++;
+				
+			/* targets should now contain the number of channel targets the msg/notice was pointed at.
+			 * If the msg/notice was a PM there should be no channel targets and 'targets' should = 0.
+			 * We don't want to block PMs so...
+			 */
+			if(targets == 0)
+			{
+				return 0;
+			}
 					
 			userchans = user->chans.size();
 
@@ -131,10 +137,10 @@ public:
 			{
 				// Block it...
 				if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
-					ServerInstance->WriteOpers("*** %s had an /amsg or /ame denied", user->nick);
+					ServerInstance->SNO->WriteToSnoMask('A', "%s had an /amsg or /ame denied", user->nick);
 
 				if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
-					userrec::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected");
+					User::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected");
 				else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
 					user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick);
 									
@@ -161,12 +167,12 @@ public:
 	{
 		if(target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			BlockedMessage* m;
 			user->GetExt("amsgblock", m);
 			if(m)
 			{
-				DELETE(m);
+				delete m;
 				user->Shrink("amsgblock");
 			}
 		}
@@ -174,25 +180,4 @@ public:
 };
 
 
-class ModuleBlockAmsgFactory : public ModuleFactory
-{
-	public:
-		ModuleBlockAmsgFactory()
-		{
-		}
-	
-		~ModuleBlockAmsgFactory()
-		{
-		}
-	
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleBlockAmsg(Me);
-		}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockAmsgFactory;
-}
+MODULE_INIT(ModuleBlockAmsg)