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

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index ac986b1ec..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-2008 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.
@@ -20,10 +20,9 @@
 class CommandSaquit : public Command
 {
  public:
-	CommandSaquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", "o", 2, false, 0)
+	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);
 	}
 
@@ -34,50 +33,54 @@ class CommandSaquit : public Command
 		{
 			if (ServerInstance->ULine(dest->server))
 			{
-				user->WriteNumeric(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;
 			}
-			
-			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+parameters[1]);
-			
+
 			// 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_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0].c_str());
+			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
 {
-	CommandSaquit*	mycommand;
+	CommandSaquit cmd;
  public:
-	ModuleSaquit(InspIRCd* Me)
-		: Module(Me)
+	ModuleSaquit()
+		: cmd(this)
 	{
-		
-		mycommand = new CommandSaquit(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleSaquit()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleSaquit)