Move options vlaues netbuffersize, maxwho, maxconn, softlimit, quietbursts, nouserdns...

[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 94891af7cadf14068c6f01b5e87a042f1d29338e..160de332729956b0a7ee29a3f5914eb4cfe0a7c6 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
@@ -78,6 +78,7 @@ class ModuleAlias : public Module
 
                Me->Modules->Attach(I_OnPreCommand, this);
                Me->Modules->Attach(I_OnRehash, this);
+
        }
 
        virtual ~ModuleAlias()
@@ -86,7 +87,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)
@@ -125,7 +126,7 @@ class ModuleAlias : public Module
                }
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
                User *u = NULL;
 
@@ -170,7 +171,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;
                                        }
                                }
@@ -178,8 +179,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;
                                        }
                                }
@@ -196,10 +197,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;
                                }