Hash rehashing change

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

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index fa62b7c365a0b8715ad36f7737a207a9bbe5da4b..518b7fbf4f15a3560372312b5dc07386bb94969b 100644 (file)
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -2,43 +2,49 @@
  *       | 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 "commands/cmd_rehash.h"
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
 
-void cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" 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));
+       user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
        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));
-               Config->Read(false,user);
+               ServerInstance->WriteOpers("%s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
+               ServerInstance->CloseLog();
+               ServerInstance->OpenLog(NULL,0);
+               ServerInstance->RehashUsersAndChans();
+               ServerInstance->Config->Read(false,user);
        }
+       if (old_disabled != ServerInstance->Config->DisabledCommands)
+               InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
+
        FOREACH_MOD(I_OnRehash,OnRehash(parameter));
+
+       return CMD_SUCCESS;
 }
+