X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=11dc50ddcd69da3ed463f9183f8471ac5041e5e7;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=2d8e3cb1fb8cfae4c540c5ad8098953e2c6685e6;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 2d8e3cb1f..11dc50ddc 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for SANICK command */
-
 /** Handle /SANICK
  */
 class CommandSanick : public Command
@@ -30,32 +28,33 @@ class CommandSanick : public Command
  public:
 	CommandSanick(Module* Creator) : Command(Creator,"SANICK", 2)
 	{
-		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <new-nick>";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+		allow_empty_last_param = false;
+		flags_needed = 'o'; syntax = "<nick> <newnick>";
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		User* target = ServerInstance->FindNick(parameters[0]);
 
 		/* Do local sanity checks and bails */
 		if (IS_LOCAL(user))
 		{
-			if (target && ServerInstance->ULine(target->server))
+			if (target && target->server->IsULine())
 			{
-				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
 				return CMD_FAILURE;
 			}
 
-			if (!target)
+			if ((!target) || (target->registered != REG_ALL))
 			{
-				user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+				user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
 				return CMD_FAILURE;
 			}
 
-			if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+			if (!ServerInstance->IsNick(parameters[1]))
 			{
-				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+				user->WriteNotice("*** Invalid nickname: '" + parameters[1] + "'");
 				return CMD_FAILURE;
 			}
 		}
@@ -65,7 +64,7 @@ class CommandSanick : public Command
 		{
 			std::string oldnick = user->nick;
 			std::string newnick = target->nick;
-			if (target->ChangeNick(parameters[1], true))
+			if (target->ChangeNick(parameters[1]))
 			{
 				ServerInstance->SNO->WriteGlobalSno('a', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
 			}
@@ -78,12 +77,9 @@ class CommandSanick : public Command
 		return CMD_SUCCESS;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		User* dest = ServerInstance->FindNick(parameters[0]);
-		if (dest)
-			return ROUTE_OPT_UCAST(dest->server);
-		return ROUTE_LOCALONLY;
+		return ROUTE_OPT_UCAST(parameters[0]);
 	}
 };
 
@@ -95,18 +91,12 @@ class ModuleSanick : public Module
 	ModuleSanick()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
 	}
 
-	virtual ~ModuleSanick()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides the SANICK command, allows opers to change the nicknames of users", VF_OPTCOMMON | VF_VENDOR);
 	}
-
-	virtual Version GetVersion()
-	{
-		return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR);
-	}
-
 };
 
 MODULE_INIT(ModuleSanick)