X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=e0e4e647797aba3e1d8f2b5902f8094fd342bb28;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=81ae04f8697acc8823206205ab52ebd55b21ee49;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 81ae04f86..e0e4e6477 100644
--- 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
@@ -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** 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;
 					}
 				}
@@ -179,8 +177,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;
 					}
 				}
@@ -197,10 +195,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;
 				}
@@ -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)