Merge pull request #984 from Renegade334/modules-exempt-uline

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

diff --git a/src/coremods/core_user/cmd_quit.cpp b/src/coremods/core_user/cmd_quit.cpp
index 40653745ca050cdba7494eaf37ac42a73f58282a..c4e127dd80c64ceb860c147d2c3bf03900c9711c 100644 (file)
--- a/src/coremods/core_user/cmd_quit.cpp
+++ b/src/coremods/core_user/cmd_quit.cpp
@@ -30,20 +30,13 @@ CommandQuit::CommandQuit(Module* parent)
 
 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);