Improve UserManager::QuitUser() and related code

[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 43483fa17c9ae271d1f8b2fe96330a40ec7cc3e8..144f4675b31a090f1f23bd79a5fb0d8743d99074 100644 (file)
--- a/src/commands/cmd_quit.cpp
+++ b/src/commands/cmd_quit.cpp
@@ -1,45 +1,72 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "commands/cmd_quit.h"
-
 
+#include "inspircd.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);
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
+       }
+};
 
-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 ?
-                               ServerInstance->Config->PrefixQuit + std::string(parameters[0]) + ServerInstance->Config->SuffixQuit
+                       quitmsg = parameters.size() ?
+                               ServerInstance->Config->PrefixQuit + 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 = ServerInstance->OperQuit.get(user);
+       ServerInstance->Users->QuitUser(user, quitmsg, operquit);
 
        return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandQuit)