* ---------------------------------------------------
*/
-#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 "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
#include "commands/cmd_quit.h"
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
-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];
+ std::string quitmsg = "Client exited";
if (user->registered == REG_ALL)
{
/* We should only prefix the quit for a local user. Remote users have
* already been prefixed, where neccessary, by the upstream server.
*/
- if (user->fd > -1)
+ 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]);
- 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
{
- 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])));
}
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) []",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"));
FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
/* push the socket on a stack of sockets due to be closed at the next opportunity */
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
- ServerInstance->SE->DelFd(user->fd);
+ ServerInstance->SE->DelFd(user);
if (find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user) != ServerInstance->local_users.end())
{
- log(DEBUG,"Delete local user");
+ ServerInstance->Log(DEBUG,"Delete local user");
ServerInstance->local_users.erase(find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user));
}
user->CloseSocket();
if (user->registered == REG_ALL) {
user->PurgeEmptyChannels();
}
- if (user->fd > -1)
- ServerInstance->fd_ref_table[user->fd] = NULL;
+
+ 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;
}
+