Only output the 'AES on' message if the socket state isnt I_ERROR when its reached

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

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 102d9adc5a8fb5a925250c09e4241ae7478fa7f8..26502c3857fb1cf8a47d068f125cae8c583a4947 100644 (file)
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -27,10 +27,11 @@ extern "C" command_t* init_command(InspIRCd* Instance)
        return new cmd_quit(Instance);
 }
 
-void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
 {
        user_hash::iterator iter = ServerInstance->clientlist.find(user->nick);
        char reason[MAXBUF];
+       std::string quitmsg = "Client exited";
 
        if (user->registered == REG_ALL)
        {
@@ -47,9 +48,11 @@ void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
                         */
                        if (IS_LOCAL(user))
                        {
-                               user->Write("ERROR :Closing link (%s@%s) [%s%s]",user->ident,user->host,ServerInstance->Config->PrefixQuit,parameters[0]);
-                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s%s]",user->nick,user->ident,user->host,ServerInstance->Config->PrefixQuit,parameters[0]);
-                               user->WriteCommonExcept("QUIT :%s%s",ServerInstance->Config->PrefixQuit,parameters[0]);
+                               quitmsg = ServerInstance->Config->PrefixQuit;
+                               quitmsg.append(parameters[0]);
+                               user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,quitmsg.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,quitmsg.c_str());
+                               user->WriteCommonExcept("QUIT :%s", quitmsg.c_str());
                        }
                        else
                        {
@@ -63,7 +66,7 @@ void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
                {
                        if (IS_LOCAL(user))
                        {
-                               user->Write("ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host);
+                               user->Write("ERROR :Closing link (%s@%s) []",user->ident,user->host);
                                ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
                        }
                        else
@@ -99,6 +102,14 @@ void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
        if (user->registered == REG_ALL) {
                user->PurgeEmptyChannels();
        }
+
+       if (IS_LOCAL(user))
+       {
+               std::string original_command = "QUIT :" + quitmsg;
+               FOREACH_MOD(I_OnPostCommand,OnPostCommand("QUIT", parameters, pcnt, user, CMD_SUCCESS, original_command));
+       }
+
        DELETE(user);
+       return CMD_USER_DELETED;
 }