X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=1b5fee40bfac3b1f8c6ee81fdc66585eedba65db;hb=bcac49dca78631687975771c6d0a76b595171664;hp=fdbc33839d112561421c060503cd05da222854b7;hpb=95840640cb374a0845c866bd1ad56a04dd833081;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index fdbc33839..1b5fee40b 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -23,36 +23,37 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
+#include "inspircd.h"
 
 /* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
 
-extern time_t TIME;
-
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
 
+/** Holds a blocked message's details
+ */
 class BlockedMessage : public classbase
 {
 public:
 	std::string message;
 	irc::string target;
 	time_t sent;
-	
-	BlockedMessage(std::string msg, 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
 {
-	Server* Srv;
+	
 	int ForgetDelay;
 	BlockAction action;
 public:
-	ModuleBlockAmsg(Server* Me) : Module::Module(Me)
+	ModuleBlockAmsg(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
+		
 		this->OnRehash("");
 	}
 
@@ -67,12 +68,12 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 	virtual void OnRehash(const std::string &parameter)
 	{
-		ConfigReader* Conf = new ConfigReader;
+		ConfigReader* Conf = new ConfigReader(ServerInstance);
 		
 		ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false);
 		if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
@@ -94,7 +95,7 @@ public:
 		DELETE(Conf);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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))
@@ -134,16 +135,16 @@ public:
 			// OR
 			// The number of target channels is equal to the number of channels the sender is on..a little suspicious.
 			// Check it's more than 1 too, or else users on one channel would have fun.
-			if((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= TIME-ForgetDelay)) || ((targets > 1) && (targets == userchans)))
+			if((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == userchans)))
 			{
 				// Block it...
 				if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
-					WriteOpers("*** %s had an /amsg or /ame denied", user->nick);
+					ServerInstance->WriteOpers("*** %s had an /amsg or /ame denied", user->nick);
 
 				if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
-					Srv->QuitUser(user, "Global message (/amsg or /ame) detected");
+					userrec::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected");
 				else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-					WriteServ(user->fd, "NOTICE %s :Global message (/amsg or /ame) detected", user->nick);
+					user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick);
 									
 				return 1;
 			}
@@ -153,11 +154,11 @@ public:
 				// If there's already a BlockedMessage allocated, use it.
 				m->message = parameters[1];
 				m->target = parameters[0];
-				m->sent = TIME;
+				m->sent = ServerInstance->Time();
 			}
 			else
 			{
-				m = new BlockedMessage(parameters[1], parameters[0], TIME);
+				m = new BlockedMessage(parameters[1], parameters[0], ServerInstance->Time());
 				user->Extend("amsgblock", (char*)m);
 			}
 		}					
@@ -192,7 +193,7 @@ class ModuleBlockAmsgFactory : public ModuleFactory
 		{
 		}
 	
-		virtual Module * CreateModule(Server* Me)
+		virtual Module * CreateModule(InspIRCd* Me)
 		{
 			return new ModuleBlockAmsg(Me);
 		}