X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=180e4ba810c043b29bbf15586731993e8130aa9d;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=3f7affa8ee8253c8f209549f20aad81d57f38b62;hpb=25c8c8ba0247236f660bbbbfc665ae735f88fc31;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 3f7affa8e..180e4ba81 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,77 +20,83 @@
 class CommandSanick : public Command
 {
  public:
-	CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", 'o', 2, false, 0)
+	CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", "o", 2, false, 0)
 	{
 		this->source = "m_sanick.so";
 		syntax = "<nick> <new-nick>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		User* target = ServerInstance->FindNick(parameters[0]);
-		if (target)
+
+		/* Do local sanity checks and bails */
+		if (IS_LOCAL(user))
 		{
-			if (ServerInstance->ULine(target->server))
+			if (target && 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 (!target)
 			{
-				if (target->ForceNickChange(parameters[1]))
-				{
-					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" used SANICK to change "+std::string(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]+")");
-					return CMD_FAILURE;
-				}
+				user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+				return CMD_FAILURE;
 			}
-			else
+
+			if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
 			{
-				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
+				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+				return CMD_FAILURE;
 			}
-
-			return CMD_FAILURE;
 		}
-		else
+
+		/* Have we hit target's server yet? */
+		if (target && IS_LOCAL(target))
 		{
-			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick, parameters[0]);
+			std::string oldnick = user->nick;
+			std::string newnick = target->nick;
+			if (target->ForceNickChange(parameters[1].c_str()))
+			{
+				ServerInstance->SNO->WriteToSnoMask('a', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
+				ServerInstance->PI->SendSNONotice("A", oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
+			}
+			else
+			{
+				ServerInstance->SNO->WriteToSnoMask('a', oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")");
+				ServerInstance->PI->SendSNONotice("A", oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")");
+			}
+			/* Yes, hit target and we have sent our NICK out, we can now bail */
+			return CMD_LOCALONLY;
 		}
 
-		return CMD_FAILURE;
+		/* No, route it on */
+		return CMD_SUCCESS;
 	}
 };
 
 
 class ModuleSanick : public Module
 {
-	CommandSanick*	mycommand;
+	CommandSanick cmd;
  public:
 	ModuleSanick(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), cmd(Me)
 	{
-		
-		mycommand = new CommandSanick(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	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)