X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_die.cpp;h=fc2cc473efa0de48cd20f36c77ee558ddd352735;hb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;hp=bc8f5809984f2551971bbfc3522d0f43f36799df;hpb=39d2c7c6dfdc88097e5e06d63f7d906e28054469;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index bc8f58099..fc2cc473e 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -14,55 +14,44 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cmd_die.h"
+#include "commands/cmd_die.h"
+
+
 
-extern ServerConfig* Config;
-extern std::vector<userrec*> all_opers;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_die(Instance);
+}
 
-void cmd_die::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	if (!strcmp(parameters[0],Config->diepass))
+	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, Config->DieDelay);
+		ServerInstance->Log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, ServerInstance->Config->DieDelay);
 		
 		/* 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++)
+		for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
 		{
 			userrec* a = *i;
 			
-			if (IS_LOCAL(a) && (a->modebits & UM_SERVERNOTICE))
+			if (IS_LOCAL(a) && (a->modes[UM_SERVERNOTICE]))
 			{
-				WriteServ(a->fd, "NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
+				a->WriteServ("NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
 				a->FlushWriteBuf();
 			}
 		}
 		
-		sleep(Config->DieDelay);
-		Exit(ERROR);
+		sleep(ServerInstance->Config->DieDelay);
+		InspIRCd::Exit(ERROR);
 	}
 	else
 	{
-		log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
-		WriteOpers("*** 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);
 	}
 }