Use Utils->ServerUser instead of ServerInstance->FakeClient in m_spanningtree

[user/henk/code/inspircd.git] / src / modules / m_sakick.cpp

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index af70c58002f671a1ba39aee68982c75775bc8089..d171abe57cfa037ff6d4f295cf5f65b017959374 100644 (file)
--- 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;
                        }
 
@@ -60,29 +60,19 @@ class CommandSakick : public Command
                                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->WriteGlobalSno('a', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]);
-                                       return CMD_SUCCESS;
-                               }
-                               else
-                               {
-                                       if (!n->HasUser(dest))
-                                       {
-                                               ServerInstance->SNO->WriteGlobalSno('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->WriteGlobalSno('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;