Move InspIRCd::IsValidMask() to helperfuncs.cpp

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

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 5c5abf7ba44379c28cd2d1c9506c0edcfc75a1d8..c74f868ba3276c82a6ba9b30fb7eb6295918e5d2 100644 (file)
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -12,29 +12,33 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_quit.h"
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-       return new cmd_quit(Instance);
+       return new CommandQuit(Instance);
 }
 
-CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandQuit::Handle (const char** parameters, int pcnt, User *user)
 {
 
        std::string quitmsg;
 
        if (IS_LOCAL(user))
-               quitmsg = pcnt ? ServerInstance->Config->PrefixQuit + std::string(parameters[0]) : "Client exited";
+       {
+               if (*ServerInstance->Config->FixedQuit)
+                       quitmsg = ServerInstance->Config->FixedQuit;
+               else
+                       quitmsg = pcnt ?
+                               ServerInstance->Config->PrefixQuit + std::string(parameters[0]) + ServerInstance->Config->SuffixQuit
+                               : "Client exited";
+       }
        else
                quitmsg = pcnt ? parameters[0] : "Client exited";
 
-       userrec::QuitUser(ServerInstance, user, quitmsg);
+       User::QuitUser(ServerInstance, user, quitmsg);
 
        return CMD_SUCCESS;
 }