Replace std::deque with std::vector in spanningtree and related modules

[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 37f5cb33310616b812b061e610d44de9cf060186..feceeee993f8cd6b9aa429a94ec2f29e7e688017 100644 (file)
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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()