X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_quit.cpp;h=5db7ada40507a281d7edcf97f2c8f2a4c04978d7;hb=26cd5393c9308fabe73c41870f06f73a5b001cd7;hp=c74f868ba3276c82a6ba9b30fb7eb6295918e5d2;hpb=5d5285f24b1fe306faa2a6d0565ba1cff0f17f11;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_quit.cpp b/src/commands/cmd_quit.cpp
index c74f868ba..5db7ada40 100644
--- a/src/commands/cmd_quit.cpp
+++ b/src/commands/cmd_quit.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.
@@ -12,34 +12,57 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_quit.h"
 
-
-
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /QUIT. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandQuit : public Command
 {
-	return new CommandQuit(Instance);
-}
+ public:
+	/** Constructor for quit.
+	 */
+	CommandQuit ( Module* parent) : Command(parent,"QUIT",0,1) { works_before_reg = true; syntax = "[<message>]"; }
+	/** Handle command.
+	 * @param parameters The parameters to the comamnd
+	 * @param pcnt The number of parameters passed to teh command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
+
 
-CmdResult CommandQuit::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User *user)
 {
 
 	std::string quitmsg;
 
 	if (IS_LOCAL(user))
 	{
-		if (*ServerInstance->Config->FixedQuit)
+		if (!ServerInstance->Config->FixedQuit.empty())
 			quitmsg = ServerInstance->Config->FixedQuit;
 		else
-			quitmsg = pcnt ?
+			quitmsg = parameters.size() ?
 				ServerInstance->Config->PrefixQuit + std::string(parameters[0]) + ServerInstance->Config->SuffixQuit
 				: "Client exited";
 	}
 	else
-		quitmsg = pcnt ? parameters[0] : "Client exited";
+		quitmsg = parameters.size() ? parameters[0] : "Client exited";
 
-	User::QuitUser(ServerInstance, user, quitmsg);
+	std::string* operquit = User::OperQuit.get(user);
+	if (operquit)
+	{
+		ServerInstance->Users->QuitUser(user, quitmsg, operquit->c_str());
+	}
+	else
+	{
+		ServerInstance->Users->QuitUser(user, quitmsg);
+	}
 
 	return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandQuit)