Annotations

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

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index c1e73bc842ae954dcf7ff2663261e9842a67f314..41cc48c8e587cec71dff886143fd7b056bb7324d 100644 (file)
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -14,27 +14,20 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include <string>
-#include <vector>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-
-#include "hashcomp.h"
-#include "socketengine.h"
 #include "commands/cmd_quit.h"
 
-void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_quit(Instance);
+}
+
+CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
 {
        user_hash::iterator iter = ServerInstance->clientlist.find(user->nick);
        char reason[MAXBUF];
@@ -55,12 +48,12 @@ 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->WriteOpers("*** Client exiting: %s!%s@%s [%s%s]",user->nick,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]);
                        }
                        else
                        {
-                               ServerInstance->WriteOpers("*** Client exiting at %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]);
+                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting at %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]);
                                user->WriteCommonExcept("QUIT :%s",parameters[0]);
                        }
                        FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(ServerInstance->Config->PrefixQuit)+std::string(parameters[0])));
@@ -68,8 +61,15 @@ void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
                }
                else
                {
-                       user->Write("ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host);
-                       ServerInstance->WriteOpers("*** Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
+                       if (IS_LOCAL(user))
+                       {
+                               user->Write("ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host);
+                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
+                       }
+                       else
+                       {
+                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting at %s: %s!%s@%s [Client exited]",user->server,user->nick,user->ident,user->host);
+                       }
                        user->WriteCommonExcept("QUIT :Client exited");
                        FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,"Client exited"));
 
@@ -99,6 +99,9 @@ void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
        if (user->registered == REG_ALL) {
                user->PurgeEmptyChannels();
        }
+
+       FOREACH_MOD(I_OnPostCommand,OnPostCommand("QUIT", parameters, pcnt, user, CMD_SUCCESS));
        DELETE(user);
+       return CMD_USER_DELETED;
 }