Of course, it DOES help to actually initialise the Mutex objects, and delete them...

[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 7f09de134225838044e07703fe142b72b205894d..8c04a4dadd3fe0742ce67116f02f4abfd65b3f7f 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
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides aliases of commands. */
 
@@ -69,17 +68,14 @@ class ModuleAlias : public Module
        }
 
  public:
-       
+
        ModuleAlias(InspIRCd* Me)
                : Module(Me)
        {
                ReadAliases();
-               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()
@@ -88,7 +84,7 @@ class ModuleAlias : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_VENDOR,API_VERSION);
        }
 
        std::string GetVar(std::string varname, const std::string &original_line)
@@ -127,9 +123,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(std::string &command, std::vector<std::string> &parameters, 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.
@@ -160,8 +156,16 @@ class ModuleAlias : public Module
                                /* Does it match the pattern? */
                                if (!Aliases[i].format.empty())
                                {
-                                       if (!match(Aliases[i].case_sensitive, compare.c_str(), Aliases[i].format.c_str()))
-                                               continue;
+                                       if (Aliases[i].case_sensitive)
+                                       {
+                                               if (InspIRCd::Match(compare, Aliases[i].format, case_sensitive_map))
+                                                       continue;
+                                       }
+                                       else
+                                       {
+                                               if (InspIRCd::Match(compare, Aliases[i].format))
+                                                       continue;
+                                       }
                                }
 
                                if ((Aliases[i].operonly) && (!IS_OPER(user)))
@@ -172,7 +176,7 @@ class ModuleAlias : public Module
                                        u = ServerInstance->FindNick(Aliases[i].requires);
                                        if (!u)
                                        {
-                                               user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
+                                               user->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
                                                return 1;
                                        }
                                }
@@ -180,8 +184,8 @@ class ModuleAlias : public Module
                                {
                                        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!"); 
-                                               user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
+                                               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->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
                                                return 1;
                                        }
                                }
@@ -198,10 +202,10 @@ class ModuleAlias : public Module
                                else
                                {
                                        irc::sepstream commands(Aliases[i].replace_with, '\n');
-                                       std::string command;
-                                       while (commands.GetToken(command))
+                                       std::string scommand;
+                                       while (commands.GetToken(scommand))
                                        {
-                                               DoCommand(command, user, safe);
+                                               DoCommand(scommand, user, safe);
                                        }
                                        return 1;
                                }
@@ -210,7 +214,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++)
                {
@@ -248,19 +252,18 @@ class ModuleAlias : public Module
                SearchAndReplace(newline, "\r", "$");
 
                irc::tokenstream ss(newline);
-               const char* parv[MAXPARAMETERS];
-               int x = 0;
+               pars.clear();
+               std::string command, token;
 
-               while (ss.GetToken(pars[x]) && x < MAXPARAMETERS)
+               ss.GetToken(command);
+               while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS))
                {
-                       parv[x] = pars[x].c_str();
-                       x++;
+                       pars.push_back(token);
                }
-
-               ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user);
+               ServerInstance->Parser->CallHandler(command, pars, user);
        }
- 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ReadAliases();
        }