* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
*
- * Written by Craig Edwards, Craig McLure, and others.
* This program is free but copyrighted software; see
* the file COPYING for details.
*
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);
+ user_hash::iterator iter = ServerInstance->clientlist->find(user->nick);
char reason[MAXBUF];
+ std::string quitmsg = "Client exited";
if (user->registered == REG_ALL)
{
*/
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
{
- ServerInstance->SNO->WriteToSnoMask('q',"Client exiting at %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %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])));
{
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
{
- ServerInstance->SNO->WriteToSnoMask('q',"Client exiting at %s: %s!%s@%s [Client exited]",user->server,user->nick,user->ident,user->host);
+ ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %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 (IS_LOCAL(user))
{
ServerInstance->SE->DelFd(user);
- if (find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user) != ServerInstance->local_users.end())
+ std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user);
+ if (x != ServerInstance->local_users.end())
{
ServerInstance->Log(DEBUG,"Delete local user");
- ServerInstance->local_users.erase(find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user));
+ ServerInstance->local_users.erase(x);
}
user->CloseSocket();
}
- if (iter != ServerInstance->clientlist.end())
+ if (iter != ServerInstance->clientlist->end())
{
- ServerInstance->clientlist.erase(iter);
+ ServerInstance->clientlist->erase(iter);
}
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;
}