X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sakick.cpp;h=feceeee993f8cd6b9aa429a94ec2f29e7e688017;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=a9e7c3c0ee65e9b381e0045d3e6c2dea31b975ef;hpb=929cd28544c59d122a8d36b2b5e3a394aa03108b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index a9e7c3c0e..feceeee99 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -24,7 +24,7 @@ class CommandSakick : public Command
 	{
 		this->source = "m_sakick.so";
 		syntax = "<channel> <nick> [reason]";
-		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
+		TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END);
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -47,7 +47,7 @@ class CommandSakick : public Command
 
 			if (ServerInstance->ULine(dest->server))
 			{
-				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client", user->nick.c_str());
 				return CMD_FAILURE;
 			}
 
@@ -57,32 +57,22 @@ class CommandSakick : public Command
 			 */
 			if (IS_LOCAL(dest))
 			{
-				if (!channel->ServerKickUser(dest, reason, true, servername))
+				if (!channel->ServerKickUser(dest, reason, servername))
 					delete channel;
 
-				Channel* n = ServerInstance->FindChan(parameters[1]);
-				if (!n)
+				Channel *n = ServerInstance->FindChan(parameters[1]);
+				if (n && n->HasUser(dest))
 				{
-					ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]);
-					return CMD_SUCCESS;
-				}
-				else
-				{
-					if (!n->HasUser(dest))
-					{
-						ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]);
-						return CMD_SUCCESS;
-					}
-					else
-					{
-						user->WriteServ("NOTICE %s :*** Unable to kick %s from %s",user->nick.c_str(), dest->nick.c_str(), parameters[0].c_str());
-						return CMD_FAILURE;
-					}
+					/* Sort-of-bug: If the command was issued remotely, this message won't be sent */
+					user->WriteServ("NOTICE %s :*** Unable to kick %s from %s", user->nick.c_str(), dest->nick.c_str(), parameters[0].c_str());
+					return CMD_FAILURE;
 				}
 			}
-			else
+
+			if (IS_LOCAL(user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAKICK to kick "+dest->nick+" from "+parameters[0]);
+				/* Locally issued command; send the snomasks */
+				ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " SAKICKed " + dest->nick + " on " + parameters[0]);
 			}
 
 			return CMD_SUCCESS;
@@ -98,15 +88,12 @@ class CommandSakick : public Command
 
 class ModuleSakick : public Module
 {
-	CommandSakick*	mycommand;
+	CommandSakick cmd;
  public:
 	ModuleSakick(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), cmd(Me)
 	{
-
-		mycommand = new CommandSakick(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
 
 	virtual ~ModuleSakick()