Fix m_chanlog crashing.

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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 3893ad5bf3b22df33072b95a18000a3782669b9a..5a6850f617b2444bc9f76064e4189dc6aa28b58d 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.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
@@ -11,12 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 #include "wildcard.h"
-#include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
@@ -75,15 +71,14 @@ class ModuleAlias : public Module
  public:
        
        ModuleAlias(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                ReadAliases();
-               pars.resize(127);
-       }
+               pars.resize(MAXPARAMETERS);
+
+               Me->Modules->Attach(I_OnPreCommand, this);
+               Me->Modules->Attach(I_OnRehash, this);
 
-       void Implements(char* List)
-       {
-               List[I_OnPreCommand] = List[I_OnRehash] = 1;
        }
 
        virtual ~ModuleAlias()
@@ -102,15 +97,15 @@ class ModuleAlias : public Module
                int index = *(varname.begin()) - 48;
                varname.erase(varname.begin());
                bool everything_after = (varname == "-");
-               std::string word = "";
+               std::string word;
 
                for (int j = 0; j < index; j++)
-                       word = ss.GetToken();
+                       ss.GetToken(word);
 
                if (everything_after)
                {
-                       std::string more = "*";
-                       while ((more = ss.GetToken()) != "")
+                       std::string more;
+                       while (ss.GetToken(more))
                        {
                                word.append(" ");
                                word.append(more);
@@ -131,9 +126,9 @@ class ModuleAlias : public Module
                }
        }
 
-       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 char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
-               userrec *u = NULL;
+               User *u = NULL;
 
                /* If theyre not registered yet, we dont want
                 * to know.
@@ -168,10 +163,10 @@ class ModuleAlias : public Module
                                                continue;
                                }
 
-                               if ((Aliases[i].operonly) && (!*user->oper))
+                               if ((Aliases[i].operonly) && (!IS_OPER(user)))
                                        return 0;
 
-                               if (Aliases[i].requires != "")
+                               if (!Aliases[i].requires.empty())
                                {
                                        u = ServerInstance->FindNick(Aliases[i].requires);
                                        if (!u)
@@ -180,11 +175,11 @@ class ModuleAlias : public Module
                                                return 1;
                                        }
                                }
-                               if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
+                               if ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline))
                                {
                                        if (!ServerInstance->ULine(u->server))
                                        {
-                                               ServerInstance->WriteOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); 
+                                               ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); 
                                                user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
                                                return 1;
                                        }
@@ -202,8 +197,8 @@ class ModuleAlias : public Module
                                else
                                {
                                        irc::sepstream commands(Aliases[i].replace_with, '\n');
-                                       std::string command = "*";
-                                       while ((command = commands.GetToken()) != "")
+                                       std::string command;
+                                       while (commands.GetToken(command))
                                        {
                                                DoCommand(command, user, safe);
                                        }
@@ -214,7 +209,7 @@ class ModuleAlias : public Module
                return 0;
        }
 
-       void DoCommand(std::string newline, userrec* user, const std::string &original_line)
+       void DoCommand(std::string newline, User* user, const std::string &original_line)
        {
                for (int v = 1; v < 10; v++)
                {
@@ -252,10 +247,10 @@ class ModuleAlias : public Module
                SearchAndReplace(newline, "\r", "$");
 
                irc::tokenstream ss(newline);
-               const char* parv[127];
+               const char* parv[MAXPARAMETERS];
                int x = 0;
 
-               while (ss.GetToken(pars[x]))
+               while (ss.GetToken(pars[x]) && x < MAXPARAMETERS)
                {
                        parv[x] = pars[x].c_str();
                        x++;
@@ -264,33 +259,10 @@ class ModuleAlias : public Module
                ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user);
        }
  
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ReadAliases();
        }
 };
 
-
-class ModuleAliasFactory : public ModuleFactory
-{
- public:
-       ModuleAliasFactory()
-       {
-       }
-
-       ~ModuleAliasFactory()
-       {
-       }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAlias(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleAliasFactory;
-}
-
+MODULE_INIT(ModuleAlias)