X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_saquit.cpp;h=485d03260e9adc44cb38f51ee379bcdef8ae19a1;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=615ba5934ad4f224f2d22a130c8584ebf6317dea;hpb=71ad308979d9c9129507fdf85d4305fd12e18bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 615ba5934..485d03260 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -2,73 +2,57 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *		       E-mail:
- *		<brain@chatspike.net>
- *	   	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-/*
- * SAQUIT module for InspIRCd
- *  Author: w00t
- *  Version: 1.0.0.0
- *
- *  Syntax: /SAQUIT <user> [reason]
- *  Makes it appear as though <user> has /quit with [reason]
- *  
- */
-
-#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 */
 
-
-
-
-class cmd_saquit : public command_t
+/** Handle /SAQUIT
+ */
+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 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(990, "%s :Cannot use an SA command on a u-lined client",user->nick);
 				return CMD_FAILURE;
 			}
-			std::string line = "";
-			for (int i = 1; i < pcnt - 1; i++)
-			{
-				line = line + std::string(parameters[i]) + " ";
-			}
-			line = line + std::string(parameters[pcnt-1]);
-		
-			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);
-
+			
+			irc::stringjoiner reason_join(" ", parameters, 1, parameters.size() - 1);
+			std::string line = reason_join.GetJoined();
+			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
+			
+			// Pass the command on, so the client's server can quit it properly.
+			if (!IS_LOCAL(dest))
+				return CMD_SUCCESS;
+			
+			ServerInstance->Users->QuitUser(dest, line);
 			return CMD_SUCCESS;
 		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0].c_str());
+		}
 
 		return CMD_FAILURE;
 	}
@@ -76,14 +60,15 @@ class cmd_saquit : public command_t
 
 class ModuleSaquit : public Module
 {
-	cmd_saquit*	mycommand;
+	CommandSaquit*	mycommand;
  public:
 	ModuleSaquit(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
-		mycommand = new cmd_saquit(ServerInstance);
+		mycommand = new CommandSaquit(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
 	
 	virtual ~ModuleSaquit()
@@ -92,34 +77,9 @@ class ModuleSaquit : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1, 2, 0, 0, VF_COMMON | 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)