X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_rehash.cpp;h=ed972007d61d7a1c83e763352faf8748bfb878fd;hb=bcf2e57d8125fceb2f573fe77ac122158aa75a13;hp=b452a8d0c12354572659d3c77f9f9e54b17851c9;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index b452a8d0c..ed972007d 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -2,43 +2,53 @@
  *       | 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 "inspircd_config.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 #include "commands/cmd_rehash.h"
 
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
 
-void cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_rehash(Instance);
+}
+
+CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	user->WriteServ("382 %s %s :Rehashing",user->nick,CleanFilename(CONFIG_FILE));
-	std::string parameter = "";
+	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+	std::string parameter;
+	std::string old_disabled = ServerInstance->Config->DisabledCommands;
 	if (pcnt)
 	{
 		parameter = parameters[0];
 	}
 	else
 	{
-		WriteOpers("%s is rehashing config file %s",user->nick,CleanFilename(CONFIG_FILE));
+		ServerInstance->WriteOpers("*** %s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+		ServerInstance->CloseLog();
+		if (!ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc))
+			user->WriteServ("*** NOTICE %s :ERROR: Could not open logfile %s: %s", user->nick, ServerInstance->Config->logpath.c_str(), strerror(errno));
+		ServerInstance->RehashUsersAndChans();
+		FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 		ServerInstance->Config->Read(false,user);
+		ServerInstance->Res->Rehash();
+		ServerInstance->ResetMaxBans();
 	}
-	FOREACH_MOD(I_OnRehash,OnRehash(parameter));
+	if (old_disabled != ServerInstance->Config->DisabledCommands)
+		InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
+
+	FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
+
+	ServerInstance->BuildISupport();
+
+	return CMD_SUCCESS;
 }
+