X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_saquit.cpp;h=0d181aa65c68c2f43a4675aca8e94b3d750bb888;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=5806f43bf694982bc97745502443a05465f46471;hpb=8dba4b8122e228d6ba1ef1c475fc9500d06e1e56;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 5806f43bf..0d181aa65 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,99 +11,76 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.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(Module* Creator) : Command(Creator, "SAQUIT", 2, 2)
 	{
-		this->source = "m_saquit.so";
-		syntax = "<nick> <reason>";
+		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <reason>";
+		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 		if (dest)
 		{
 			if (ServerInstance->ULine(dest->server))
 			{
-				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
 				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;
+			
+			ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+parameters[1]);
 
+			ServerInstance->Users->QuitUser(dest, parameters[1]);
 			return CMD_SUCCESS;
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0]);
+			user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[0].c_str());
+			return CMD_FAILURE;
 		}
+	}
 
-		return CMD_FAILURE;
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
 	}
 };
 
 class ModuleSaquit : public Module
 {
-	cmd_saquit*	mycommand;
+	CommandSaquit cmd;
  public:
-	ModuleSaquit(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleSaquit()
+		: cmd(this)
 	{
-		
-		mycommand = new cmd_saquit(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleSaquit()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
-	
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleSaquitFactory : public ModuleFactory
-{
- public:
-	ModuleSaquitFactory()
-	{
-	}
-	
-	~ModuleSaquitFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSaquit(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaquitFactory;
-}
-
+MODULE_INIT(ModuleSaquit)