X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_saquit.cpp;h=f96c19890f13505826963a73c4ff5fd611cca1e9;hb=2df56b811b362dbf5a05a0bc7b0eee5ee4d77a40;hp=9479509cce40c7682ac2ecde7e4e70001393317e;hpb=f90bbd3813bbad7c308a965cd97ff939e9e423c8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 9479509cc..f96c19890 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,41 +17,39 @@
 
 /** Handle /SAQUIT
  */
-class cmd_saquit : public Command
+class CommandSaquit : public Command
 {
  public:
-	cmd_saquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", 'o', 2, false, 0)
+	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, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		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);
-			
+
+			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;
-			
-			User::QuitUser(ServerInstance, dest, line);
-			return CMD_SUCCESS;
+
+			ServerInstance->Users->QuitUser(dest, parameters[1]);
+			return CMD_LOCALONLY;
 		}
 		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;
@@ -60,25 +58,26 @@ class cmd_saquit : public Command
 
 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);
+
 	}
-	
+
 	virtual ~ModuleSaquit()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleSaquit)