Socket engine tweaks to fix a glitch, and improvements to new m_ident

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

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 65dd4e21a598711fb70c86b56730e04082c6ac29..4711c612c36876968468d73124b7a8a606c8b5df 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -12,26 +12,24 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for an SAQUIT command, exits user with a reason */
 
 /** Handle /SAQUIT
  */
-class cmd_saquit : public command_t
+class cmd_saquit : public Command
 {
  public:
- cmd_saquit (InspIRCd* Instance) : command_t(Instance,"SAQUIT",'o',2)
+ cmd_saquit (InspIRCd* Instance) : Command(Instance,"SAQUIT",'o',2)
        {
                this->source = "m_saquit.so";
                syntax = "<nick> <reason>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
                if (dest)
                {
                        if (ServerInstance->ULine(dest->server))
@@ -39,12 +37,16 @@ class cmd_saquit : public command_t
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
                                return CMD_FAILURE;
                        }
+                       
                        irc::stringjoiner reason_join(" ", parameters, 1, pcnt - 1);
                        std::string line = reason_join.GetJoined();
-
                        ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
-                       userrec::QuitUser(ServerInstance, dest, line);
-
+                       
+                       // Pass the command on, so the client's server can quit it properly.
+                       if (!IS_LOCAL(dest))
+                               return CMD_SUCCESS;
+                       
+                       User::QuitUser(ServerInstance, dest, line);
                        return CMD_SUCCESS;
                }
                else