X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_user%2Fcmd_quit.cpp;h=c4e127dd80c64ceb860c147d2c3bf03900c9711c;hb=43b5073d6f80a8dcb7044ecd127fd5893da033ab;hp=15dc07d6c786e40f2c8da788ec86af7d26cb9006;hpb=c67d3103e9f7397f0ab9631bf07a5e5547deb2c3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_user/cmd_quit.cpp b/src/coremods/core_user/cmd_quit.cpp
index 15dc07d6c..c4e127dd8 100644
--- a/src/coremods/core_user/cmd_quit.cpp
+++ b/src/coremods/core_user/cmd_quit.cpp
@@ -19,44 +19,24 @@
 
 
 #include "inspircd.h"
+#include "core_user.h"
 
-/** Handle /QUIT.
- */
-class CommandQuit : public Command
+CommandQuit::CommandQuit(Module* parent)
+	: Command(parent, "QUIT", 0, 1)
 {
- 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 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);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
-	{
-		return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
-	}
-};
-
+	works_before_reg = true;
+	syntax = "[<message>]";
+}
 
 CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User *user)
 {
-
 	std::string quitmsg;
-
-	if (IS_LOCAL(user))
-	{
-		if (!ServerInstance->Config->FixedQuit.empty())
-			quitmsg = ServerInstance->Config->FixedQuit;
-		else
-			quitmsg = parameters.size() ?
-				ServerInstance->Config->PrefixQuit + parameters[0] + ServerInstance->Config->SuffixQuit
-				: "Client exited";
-	}
+	if (parameters.empty())
+		quitmsg = "Client exited";
+	else if (IS_LOCAL(user))
+		msgwrap.Wrap(parameters[0], quitmsg);
 	else
-		quitmsg = parameters.size() ? parameters[0] : "Client exited";
+		quitmsg = parameters[0];
 
 	std::string* operquit = ServerInstance->OperQuit.get(user);
 	ServerInstance->Users->QuitUser(user, quitmsg, operquit);
@@ -64,5 +44,7 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User
 	return CMD_SUCCESS;
 }
 
-
-COMMAND_INIT(CommandQuit)
+RouteDescriptor CommandQuit::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+	return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
+}