X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_quit.cpp;h=5c5abf7ba44379c28cd2d1c9506c0edcfc75a1d8;hb=22cd26d391895c0aae08dac390c5183ee93cadc8;hp=102d9adc5a8fb5a925250c09e4241ae7478fa7f8;hpb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 102d9adc5..5c5abf7ba 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -2,12 +2,9 @@
  *       | 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.
  *
@@ -27,78 +24,18 @@ 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];
 
-	if (user->registered == REG_ALL)
-	{
-		/* theres more to do here, but for now just close the socket */
-		if (pcnt == 1)
-		{
-			if (*parameters[0] == ':')
-				parameters[0]++;
+	std::string quitmsg;
 
-			strlcpy(reason, parameters[0],MAXQUIT-1);
-
-			/* We should only prefix the quit for a local user. Remote users have
-			 * already been prefixed, where neccessary, by the upstream server.
-			 */
-			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]);
-			}
-			else
-			{
-				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
-		{
-			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"));
-
-		}
-		user->AddToWhoWas();
-	}
-
-	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())
-		{
-			ServerInstance->Log(DEBUG,"Delete local user");
-			ServerInstance->local_users.erase(find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user));
-		}
-		user->CloseSocket();
-	}
-	
-	if (iter != ServerInstance->clientlist.end())
-	{
-		ServerInstance->clientlist.erase(iter);
-	}
+		quitmsg = pcnt ? ServerInstance->Config->PrefixQuit + std::string(parameters[0]) : "Client exited";
+	else
+		quitmsg = pcnt ? parameters[0] : "Client exited";
+
+	userrec::QuitUser(ServerInstance, user, quitmsg);
 
-	if (user->registered == REG_ALL) {
-		user->PurgeEmptyChannels();
-	}
-	DELETE(user);
+	return CMD_SUCCESS;
 }