fix some unitialised vectors and tidy up a bit.

[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 0164590bef6cad81a9b0c5a746664dfd11f4643e..17aad007ff7df6a36d40659f75b8a621719170d6 100644 (file)
--- 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
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
 
 /* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
 
@@ -48,17 +44,13 @@ class ModuleBlockAmsg : public Module
        BlockAction action;
        
  public:
-       ModuleBlockAmsg(InspIRCd* Me)
-       : Module(Me)
+       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()
        {
@@ -66,10 +58,10 @@ class ModuleBlockAmsg : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version(1,2,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(ServerInstance);
                
@@ -92,7 +84,7 @@ class ModuleBlockAmsg : public Module
                        action = IBLOCK_KILLOPERS;
        }
 
-       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 std::vector<std::string> &parameters, 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))
@@ -102,7 +94,7 @@ class ModuleBlockAmsg : public Module
                // Add std::string contructor for irc::string :x
                irc::string cmd = command.c_str();
                
-               if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (pcnt >= 2))
+               if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (parameters.size() >= 2))
                {
                        // parameters[0] should have the target(s) in it.
                        // I think it will be faster to first check if there are any commas, and if there are then try and parse it out.
@@ -111,13 +103,13 @@ class ModuleBlockAmsg : public Module
                        int targets = 1;
                        int userchans = 0;
                
-                       if(*parameters[0] != '#')
+                       if(*parameters[0].c_str() != '#')
                        {
                                // Decrement if the first target wasn't a channel.
                                targets--;
                        }
                        
-                       for(const char* c = parameters[0]; *c; c++)
+                       for(const char* c = parameters[0].c_str(); *c; c++)
                                if((*c == ',') && *(c+1) && (*(c+1) == '#'))
                                        targets++;
                                
@@ -145,10 +137,10 @@ class ModuleBlockAmsg : public Module
                        {
                                // 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");
+                                       ServerInstance->Users->QuitUser(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);
                                                                        
@@ -159,12 +151,12 @@ class ModuleBlockAmsg : public Module
                        {
                                // If there's already a BlockedMessage allocated, use it.
                                m->message = parameters[1];
-                               m->target = parameters[0];
+                               m->target = parameters[0].c_str();
                                m->sent = ServerInstance->Time();
                        }
                        else
                        {
-                               m = new BlockedMessage(parameters[1], parameters[0], ServerInstance->Time());
+                               m = new BlockedMessage(parameters[1], parameters[0].c_str(), ServerInstance->Time());
                                user->Extend("amsgblock", (char*)m);
                        }
                }                                       
@@ -175,12 +167,12 @@ class ModuleBlockAmsg : public Module
        {
                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");
                        }
                }
@@ -188,4 +180,4 @@ class ModuleBlockAmsg : public Module
 };
 
 
-MODULE_INIT(ModuleBlockAmsg);
+MODULE_INIT(ModuleBlockAmsg)