OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR.

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

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index c4ee2f94f766dabca883a0353997299ff23a0b0e..34789b0eaca8f0d6b46a8b4771f122d125830650 100644 (file)
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -2,18 +2,16 @@
  *       | 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.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -21,23 +19,38 @@
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport 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));
-       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
        {
-               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();
        }
-       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;
 }
+