Swap around ERROR and SNONOTICE in SendError() so that the server doesnt try and...

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index c8195a41c371f097eff5f7fb02583bdbfbb675c0..6025ea2b573a8d00dcdf22ec8c002bfc91ba92a9 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -1 +1,45 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd.h"\r#include "configreader.h"\r#include "users.h"\r#include "commands/cmd_die.h"\r#include "exitcodes.h"\r\rextern "C" DllExport command_t* init_command(InspIRCd* Instance)\r{\r       return new cmd_die(Instance);\r}\r\r/** Handle /DIE\r */\rCmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)\r{\r    if (!strcmp(parameters[0],ServerInstance->Config->diepass))\r    {\r              std::string diebuf = std::string("*** DIE command from ") + user->nick + "!" + user->ident + "@" + user->dhost + ". Terminating in " + ConvToStr(ServerInstance->Config->DieDelay) + " seconds.";\r              ServerInstance->Log(SPARSE, diebuf);\r           ServerInstance->SendError(diebuf);\r             \r               if (ServerInstance->Config->DieDelay)\r                  sleep(ServerInstance->Config->DieDelay);\r\r              InspIRCd::Exit(EXIT_STATUS_DIE);\r       }\r      else\r   {\r              ServerInstance->Log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);\r         ServerInstance->WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);\r         return CMD_FAILURE;\r    }\r      return CMD_SUCCESS;\r}\r
\ No newline at end of file
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "commands/cmd_die.h"
+#include "exitcodes.h"
+
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_die(Instance);
+}
+
+/** Handle /DIE
+ */
+CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
+{
+       if (!strcmp(parameters[0],ServerInstance->Config->diepass))
+       {
+               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);
+               
+               if (ServerInstance->Config->DieDelay)
+                       sleep(ServerInstance->Config->DieDelay);
+
+               ServerInstance->Exit(EXIT_STATUS_DIE);
+       }
+       else
+       {
+               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;
+}