X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_die.cpp;h=95df4ab5657b370be8ad6e6c694f6f524dd5c0c3;hb=9bc8b2602426e187c4c5ba6ff0fad0641155357a;hp=b0a826b6db7bb7151990e35c7422763af0575699;hpb=23a4885701cba4a87a5ae027257fb4207c917572;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index b0a826b6d..95df4ab56 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -2,57 +2,45 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-#include <unistd.h>
-#include <string>
-#include <vector>
 #include "configreader.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_die.h"
+#include "exitcodes.h"
 
-extern InspIRCd* ServerInstance;
-extern std::vector<userrec*> all_opers;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_die(Instance);
+}
 
-void cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /DIE
+ */
+CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (!strcmp(parameters[0],ServerInstance->Config->diepass))
 	{
-		log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, ServerInstance->Config->DieDelay);
+		std::string diebuf = std::string("*** DIE command from ") + user->nick + "!" + user->ident + "@" + user->dhost + ". Terminating in " + ConvToStr(ServerInstance->Config->DieDelay) + " seconds.";
+		ServerInstance->Log(SPARSE, diebuf);
+		ServerInstance->SendError(diebuf);
 		
-		/* This would just be WriteOpers(), but as we just sleep() and then die then the write buffers never get flushed.
-		 * so we iterate the oper list, writing the message and immediately trying to flush their write buffer.
-		 */
-		
-		for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
-		{
-			userrec* a = *i;
-			
-			if (IS_LOCAL(a) && (a->modes[UM_SERVERNOTICE]))
-			{
-				a->WriteServ("NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
-				a->FlushWriteBuf();
-			}
-		}
-		
-		sleep(ServerInstance->Config->DieDelay);
-		InspIRCd::Exit(ERROR);
+		if (ServerInstance->Config->DieDelay)
+			sleep(ServerInstance->Config->DieDelay);
+
+		InspIRCd::Exit(EXIT_STATUS_DIE);
 	}
 	else
 	{
-		log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
+		ServerInstance->Log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
 		ServerInstance->WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		return CMD_FAILURE;
 	}
+	return CMD_SUCCESS;
 }