X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=160de332729956b0a7ee29a3f5914eb4cfe0a7c6;hb=05cc48f1894e40f8a34496bf54a60d8b911e6a5e;hp=9fcf5062daeadad12953c9e6d7bd84f9f867f5a3;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 9fcf5062d..160de3327 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -87,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)
@@ -126,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;
 
@@ -171,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;
 					}
 				}
@@ -179,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;
 					}
 				}
@@ -197,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;
 				}