X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_saquit.cpp;h=88b840b34fe86bca87ffbffccd6168825a96e337;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=d7151e5ec9cec77718793e4fb1a47f431404b1ef;hpb=632ca0fd6a2cfa3d06f87b77ccffcc2e5a835572;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index d7151e5ec..88b840b34 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -1,86 +1,94 @@
 /*
- * SAQUIT module for InspIRCd
- *  Author: w00t
- *  Version: 1.0.0.0
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Syntax: /SAQUIT <user> [reason]
- *  Makes it appear as though <user> has /quit with [reason]
- *  
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2005 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 */
 
-Server *Srv;
-	 
-void handle_saquit(char **parameters, int pcnt, userrec *user)
+/** Handle /SAQUIT
+ */
+class CommandSaquit : public Command
 {
-	userrec* dest = Srv->FindNick(std::string(parameters[0]));
-	if (dest)
+ public:
+	CommandSaquit(Module* Creator) : Command(Creator, "SAQUIT", 2, 2)
 	{
+		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <reason>";
+		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+	}
 
-	std::string line = "";
-	for (int i = 1; i < pcnt - 1; i++)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		line = line + std::string(parameters[i]) + " ";
-	}
-	line = line + std::string(parameters[pcnt-1])
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if ((dest) && (!IS_SERVER(dest)))
+		{
+			if (ServerInstance->ULine(dest->server))
+			{
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+				return CMD_FAILURE;
+			}
 
-		Srv->SendOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
-		Srv->QuitUser(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', user->nick+" used SAQUIT to make "+dest->nick+" quit with a reason of "+parameters[1]);
 
-class ModuleSaquit : public Module
-{
- public:
-	ModuleSaquit()
-	{
-		Srv = new Server;
-		Srv->AddCommand("SAQUIT",handle_saquit,'o',2);
-	}
-	
-	virtual ~ModuleSaquit()
-	{
-		delete Srv;
+			ServerInstance->Users->QuitUser(dest, parameters[1]);
+			return CMD_SUCCESS;
+		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[0].c_str());
+			return CMD_FAILURE;
+		}
 	}
-	
-	virtual Version GetVersion()
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return Version(1,0,0,0);
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
 	}
-	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSaquitFactory : public ModuleFactory
+class ModuleSaquit : public Module
 {
+	CommandSaquit cmd;
  public:
-	ModuleSaquitFactory()
+	ModuleSaquit()
+		: cmd(this)
 	{
 	}
-	
-	~ModuleSaquitFactory()
+
+	void init()
 	{
+		ServerInstance->Modules->AddService(cmd);
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual Version GetVersion()
 	{
-		return new ModuleSaquit;
+		return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSaquitFactory;
-}
+MODULE_INIT(ModuleSaquit)