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 bb95127544b492c3a2790cd9afbdb504bd88ccd9..c0fb7651e8b4fdd4147eb3604424017effde690e 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -23,16 +23,17 @@
 #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 };
 
-class BlockedMessage
+/** Holds a blocked message's details
+ */
+class BlockedMessage : public classbase
 {
 public:
        std::string message;
@@ -46,13 +47,13 @@ public:
 
 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("");
        }
 
@@ -70,9 +71,9 @@ public:
                return Version(1,0,0,0,VF_VENDOR);
        }
        
-       virtual void OnRehash(std::string parameter)
+       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)
@@ -91,13 +92,13 @@ public:
                else
                        action = IBLOCK_KILLOPERS;
 
-               delete Conf;
+               DELETE(Conf);
        }
 
-       virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
        {
                // Don't do anything with unregistered users, or remote ones.
-               if(!user || (user->registered != 7) || !IS_LOCAL(user))
+               if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user))
                        return 0;
                        
                // We want case insensitive command comparison.
@@ -117,7 +118,7 @@ public:
                        if(*parameters[0] != '#')
                                targets--;
                        
-                       for(char* c = parameters[0]; *c; c++)
+                       for(const char* c = parameters[0]; *c; c++)
                                if((*c == ',') && *(c+1) && (*(c+1) == '#'))
                                        targets++;
                                        
@@ -126,23 +127,24 @@ public:
                                        userchans++;
 
                        // Check that this message wasn't already sent within a few seconds.
-                       BlockedMessage* m = (BlockedMessage*)user->GetExt("amsgblock");
+                       BlockedMessage* m;
+                       user->GetExt("amsgblock", m);
                        
                        // If the message is identical and within the time.
                        // We check the target is *not* identical, that'd straying into the realms of flood control. Which isn't what we're doing...
                        // 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;
                        }
@@ -152,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);
                        }
                }                                       
@@ -168,10 +170,11 @@ public:
                if(target_type == TYPE_USER)
                {
                        userrec* user = (userrec*)item;
-                       BlockedMessage* m = (BlockedMessage*)user->GetExt("amsgblock");
+                       BlockedMessage* m;
+                       user->GetExt("amsgblock", m);
                        if(m)
                        {
-                               delete m;
+                               DELETE(m);
                                user->Shrink("amsgblock");
                        }
                }
@@ -190,7 +193,7 @@ class ModuleBlockAmsgFactory : public ModuleFactory
                {
                }
        
-               virtual Module * CreateModule(Server* Me)
+               virtual Module * CreateModule(InspIRCd* Me)
                {
                        return new ModuleBlockAmsg(Me);
                }