X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=28190cec994b45a7077a85bd4973562f9f0e2955;hb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;hp=ffe2946a5fc12604ebfad0e0c3393169fd6a3eff;hpb=6b10fa52627058111ad55531c8a97ae3de2d0b7d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index ffe2946a5..28190cec9 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -69,13 +69,11 @@ 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);
 
@@ -126,7 +124,7 @@ class ModuleAlias : public Module
 		}
 	}
 
-	virtual int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *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)
 	{
 		User *u = NULL;
 
@@ -159,7 +157,7 @@ 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()))
+					if (!match(Aliases[i].case_sensitive, compare, Aliases[i].format))
 						continue;
 				}
 
@@ -179,7 +177,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!"); 
+						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;
 					}
@@ -247,17 +245,17 @@ class ModuleAlias : public Module
 		SearchAndReplace(newline, "\r", "$");
 
 		irc::tokenstream ss(newline);
+		pars.clear();
+		std::string command, token;
 
-		std::vector<std::string> parms;
-		int x = 1;
-		while (ss.GetToken(pars[x]) && parms.size() <= MAXPARAMETERS)
+		ss.GetToken(command);
+		while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS))
 		{
-			parms.push_back(pars[x]);
-			x++;
+			pars.push_back(token);
 		}
-		ServerInstance->Parser->CallHandler(pars[0], parms, user);
+		ServerInstance->Parser->CallHandler(command, pars, user);
 	}
- 
+
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadAliases();