X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=55a6aae941b8598cff8f882be4f7438ea2a5e297;hb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;hp=2f3281ba7b0a50e726314fcd0471fb0e3b5c820d;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 2f3281ba7..55a6aae94 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -27,41 +27,41 @@ class CommandSanick : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		User* target = ServerInstance->FindNick(parameters[0]);
 		if (target)
 		{
 			if (ServerInstance->ULine(target->server))
 			{
-				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
 				return CMD_FAILURE;
 			}
 			std::string oldnick = user->nick;
-			if (ServerInstance->IsNick(parameters[1]))
+			if (IS_LOCAL(user) && !ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
 			{
-				if (target->ForceNickChange(parameters[1]))
+				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+			}
+			else
+			{
+				if (target->ForceNickChange(parameters[1].c_str()))
 				{
-					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" used SANICK to change "+parameters[0]+" to "+parameters[1]);
 					return CMD_SUCCESS;
 				}
 				else
 				{
 					/* We couldnt change the nick */
-					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
+					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed SANICK (from "+parameters[0]+" to "+parameters[1]+")");
 					return CMD_FAILURE;
 				}
 			}
-			else
-			{
-				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
-			}
 
 			return CMD_FAILURE;
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick, parameters[0]);
+			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
 		}
 
 		return CMD_FAILURE;
@@ -76,21 +76,21 @@ class ModuleSanick : public Module
 	ModuleSanick(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		mycommand = new CommandSanick(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 
 	}
-	
+
 	virtual ~ModuleSanick()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleSanick)