X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_sakick.cpp;h=a323ed85c65cb0a6fda1952d0f72dff46fb48b07;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=92e56644a3bf70c006f27c7113b5d61c2b3dc6fa;hpb=992674362c5f64bdb8e1942eeaa7612524529cd6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 92e56644a..a323ed85c 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -27,30 +27,28 @@ class CommandSakick : public Command
  public:
 	CommandSakick(Module* Creator) : Command(Creator,"SAKICK", 2, 3)
 	{
-		flags_needed = 'o'; Penalty = 0; syntax = "<channel> <nick> [reason]";
+		flags_needed = 'o'; syntax = "<channel> <nick> [:<reason>]";
 		TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		User* dest = ServerInstance->FindNick(parameters[1]);
 		Channel* channel = ServerInstance->FindChan(parameters[0]);
-		const char* reason = "";
 
 		if ((dest) && (dest->registered == REG_ALL) && (channel))
 		{
-			if (parameters.size() > 2)
-			{
-				reason = parameters[2].c_str();
-			}
-			else
+			const std::string& reason = (parameters.size() > 2) ? parameters[2] : dest->nick;
+
+			if (dest->server->IsULine())
 			{
-				reason = dest->nick.c_str();
+				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
+				return CMD_FAILURE;
 			}
 
-			if (ServerInstance->ULine(dest->server))
+			if (!channel->HasUser(dest))
 			{
-				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client", user->nick.c_str());
+				user->WriteNotice("*** " + dest->nick + " is not on " + channel->name);
 				return CMD_FAILURE;
 			}
 
@@ -60,21 +58,9 @@ class CommandSakick : public Command
 			 */
 			if (IS_LOCAL(dest))
 			{
+				// Target is on this server, kick them and send the snotice
 				channel->KickUser(ServerInstance->FakeClient, dest, reason);
-
-				Channel *n = ServerInstance->FindChan(parameters[1]);
-				if (n && n->HasUser(dest))
-				{
-					/* Sort-of-bug: If the command was issued remotely, this message won't be sent */
-					user->WriteNotice("*** Unable to kick " + dest->nick + " from " + parameters[0]);
-					return CMD_FAILURE;
-				}
-			}
-
-			if (IS_LOCAL(user))
-			{
-				/* Locally issued command; send the snomasks */
-				ServerInstance->SNO->WriteGlobalSno('a', user->nick + " SAKICKed " + dest->nick + " on " + parameters[0]);
+				ServerInstance->SNO->WriteGlobalSno('a', user->nick + " SAKICKed " + dest->nick + " on " + channel->name);
 			}
 
 			return CMD_SUCCESS;
@@ -87,12 +73,9 @@ class CommandSakick : public Command
 		return CMD_FAILURE;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		User* dest = ServerInstance->FindNick(parameters[1]);
-		if (dest)
-			return ROUTE_OPT_UCAST(dest->server);
-		return ROUTE_LOCALONLY;
+		return ROUTE_OPT_UCAST(parameters[1]);
 	}
 };
 
@@ -107,7 +90,7 @@ class ModuleSakick : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides the SAKICK command", VF_OPTCOMMON|VF_VENDOR);
 	}
 };