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 968374dec77dba78b5f748dee229d770c9f1038b..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
@@ -13,14 +13,6 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_QUIT_H__
-#define __CMD_QUIT_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** 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
@@ -31,7 +23,7 @@ class CommandQuit : public Command
  public:
        /** Constructor for quit.
         */
-       CommandQuit (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"QUIT",0,0,true) { syntax = "[<message>]"; }
+       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
@@ -41,10 +33,6 @@ class CommandQuit : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
-
 
 CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User *user)
 {
@@ -53,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() ?
@@ -63,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
        {