X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=31c536dd527784b4700f7d62af7fc45757a54b15;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=62d744f9ab414f339fdc45ebd0df85768a60e736;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 62d744f9a..31c536dd5 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -2,60 +2,49 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *						<omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
- 
-/* <3's to Lauren for original info on mIRC's weird behaviour */
 
-#include <string>
-#include <time.h>
-#include "inspircd_config.h"
+#include "inspircd.h"
 #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;
-extern InspIRCd* ServerInstance;
-
 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(InspIRCd* Me) : Module::Module(Me)
+	ModuleBlockAmsg(InspIRCd* Me) : Module(Me)
 	{
 		
-		this->OnRehash("");
+		this->OnRehash(NULL,"");
 	}
 
 	void Implements(char* List)
@@ -69,12 +58,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)
+	virtual void OnRehash(userrec* user, 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)
@@ -96,7 +85,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))
@@ -123,9 +112,7 @@ public:
 				if((*c == ',') && *(c+1) && (*(c+1) == '#'))
 					targets++;
 					
-			for(std::vector<ucrec*>::iterator f = user->chans.begin(); f != user->chans.end(); f++)
-				if(((ucrec*)(*f))->channel)
-					userchans++;
+			userchans = user->chans.size();
 
 			// Check that this message wasn't already sent within a few seconds.
 			BlockedMessage* m;
@@ -136,7 +123,7 @@ 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)
@@ -155,11 +142,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);
 			}
 		}					
@@ -201,7 +188,7 @@ class ModuleBlockAmsgFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleBlockAmsgFactory;
 }