X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_saquit.cpp;h=215a099c65239240688557bc7cdfd1ed4ca30ba5;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=65dd4e21a598711fb70c86b56730e04082c6ac29;hpb=31e2d052252c4113ae9ea63844f60df7759a03be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 65dd4e21a..215a099c6 100644
--- 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 CommandSaquit : public Command
 {
  public:
- cmd_saquit (InspIRCd* Instance) : command_t(Instance,"SAQUIT",'o',2)
+	CommandSaquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", 'o', 2, false, 0)
 	{
 		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
@@ -58,13 +60,13 @@ class cmd_saquit : public command_t
 
 class ModuleSaquit : public Module
 {
-	cmd_saquit*	mycommand;
+	CommandSaquit*	mycommand;
  public:
 	ModuleSaquit(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_saquit(ServerInstance);
+		mycommand = new CommandSaquit(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}