Resolve /STATS S conflict between SVSHOLD and SHUN

[user/henk/code/inspircd.git] / src / commands / cmd_quit.cpp

diff --git a/src/commands/cmd_quit.cpp b/src/commands/cmd_quit.cpp
index e29382e848561386dd06d7d8694fbf1814f5d24f..b5d71d877170576a554f8da001e6726515e9f344 100644 (file)
--- a/src/commands/cmd_quit.cpp
+++ b/src/commands/cmd_quit.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,14 +12,27 @@
  */
 
 #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 std::vector<std::string>& parameters, User *user)
 {
@@ -28,7 +41,7 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User
 
        if (IS_LOCAL(user))
        {
-               if (*ServerInstance->Config->FixedQuit)
+               if (!ServerInstance->Config->FixedQuit.empty())
                        quitmsg = ServerInstance->Config->FixedQuit;
                else
                        quitmsg = parameters.size() ?
@@ -38,11 +51,10 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User
        else
                quitmsg = parameters.size() ? parameters[0] : "Client exited";
 
-       std::string* operquit;
-       if (user->GetExt("operquit", operquit))
+       std::string* operquit = ServerInstance->OperQuit.get(user);
+       if (operquit)
        {
                ServerInstance->Users->QuitUser(user, quitmsg, operquit->c_str());
-               delete operquit;
        }
        else
        {
@@ -52,3 +64,5 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User
        return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandQuit)