Add support for blacklists and whitelists, just http password auth to go (the most...

[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 e1600e9c61317055a2273e5183beada0889de97d..e0e4e647797aba3e1d8f2b5902f8094fd342bb28 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -74,8 +74,6 @@ class ModuleAlias : public Module
                : Module(Me)
        {
                ReadAliases();
-               pars.resize(MAXPARAMETERS);
-
                Me->Modules->Attach(I_OnPreCommand, this);
                Me->Modules->Attach(I_OnRehash, this);
 
@@ -87,7 +85,7 @@ class ModuleAlias : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
 
        std::string GetVar(std::string varname, const std::string &original_line)
@@ -126,7 +124,7 @@ class ModuleAlias : public Module
                }
        }
 
-       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *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)
        {
                User *u = NULL;
 
@@ -171,7 +169,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,7 +178,7 @@ class ModuleAlias : public Module
                                        if (!ServerInstance->ULine(u->server))
                                        {
                                                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.");
+                                               user->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
                                                return 1;
                                        }
                                }
@@ -247,16 +245,15 @@ 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(User* user, const std::string &parameter)