X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_rehash.cpp;h=4d4b97c8ed245299d2a05a8b3656dfbb76128aa7;hb=187ece1bab24da3e9fda31053aaa04c5e4c401f9;hp=c4ee2f94f766dabca883a0353997299ff23a0b0e;hpb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index c4ee2f94f..4d4b97c8e 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.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.
  *
@@ -26,18 +23,32 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 	return new cmd_rehash(Instance);
 }
 
-void cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
+	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
 	{
-		ServerInstance->WriteOpers("%s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
+		ServerInstance->WriteOpers("*** %s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+		ServerInstance->CloseLog();
+		ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc);
+		ServerInstance->RehashUsersAndChans();
+		FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 		ServerInstance->Config->Read(false,user);
+		ServerInstance->Res->Rehash();
+		ServerInstance->ResetMaxBans();
+		ServerInstance->BuildISupport();
 	}
-	FOREACH_MOD(I_OnRehash,OnRehash(parameter));
+	if (old_disabled != ServerInstance->Config->DisabledCommands)
+		InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
+
+	FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
+
+	return CMD_SUCCESS;
 }
+