Annotations

[user/henk/code/inspircd.git] / src / modules / m_blockamsg.cpp

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 62d744f9ab414f339fdc45ebd0df85768a60e736..c0fb7651e8b4fdd4147eb3604424017effde690e 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -23,17 +23,16 @@
 #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:
@@ -48,7 +47,7 @@ public:
 
 class ModuleBlockAmsg : public Module
 {
-       Server* Srv;
+       
        int ForgetDelay;
        BlockAction action;
 public:
@@ -74,7 +73,7 @@ public:
        
        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)
@@ -136,7 +135,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 +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);
                        }
                }