X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sakick.cpp;h=81a74502bc2e7a5e2290ce4b8386a6c3b8d234c3;hb=97b5e92c3d1195c4e3b3dc8dea3183c06399414e;hp=3dd7ed3d1ca8654f6480e90b0972eb762d1b7af0;hpb=132c7a7c670764c677e34b6dbc1bf8590e5b4066;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 3dd7ed3d1..81a74502b 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -27,7 +27,7 @@ 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);
 	}
 
@@ -35,22 +35,14 @@ class CommandSakick : public Command
 	{
 		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
-			{
-				reason = dest->nick.c_str();
-			}
+			const std::string& reason = (parameters.size() > 2) ? parameters[2] : dest->nick;
 
-			if (ServerInstance->ULine(dest->server))
+			if (dest->server->IsULine())
 			{
-				user->WriteNumeric(ERR_NOPRIVILEGES, ":Cannot use an SA command on a u-lined client");
+				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a u-lined client");
 				return CMD_FAILURE;
 			}
 
@@ -83,10 +75,7 @@ class CommandSakick : public Command
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		User* dest = ServerInstance->FindNick(parameters[1]);
-		if (dest)
-			return ROUTE_OPT_UCAST(dest->server);
-		return ROUTE_LOCALONLY;
+		return ROUTE_OPT_UCAST(parameters[1]);
 	}
 };