Add support for CAP to this via multi-prefix. NOTE, the OnNamesList for this and...

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

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 85df9193076c69b79e17b58228e069b7b2f41715..53d19765a8ead1d8dfb44822c0d86438f21fc36f 100644 (file)
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -41,35 +41,20 @@ CmdResult CommandRehash::Handle (const char* const* parameters, int pcnt, User *
                FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
                if (!ServerInstance->ConfigThread)
                {
-                       ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance);
+                       ServerInstance->Config->RehashUser = user;
+                       ServerInstance->Config->RehashParameter = parameter;
+
+                       ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, user);
                        ServerInstance->Threads->Create(ServerInstance->ConfigThread);
                }
                else
                {
                        /* A rehash is already in progress! ahh shit. */
-                       user->WriteServ("*** NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick);
+                       user->WriteServ("NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick);
                        return CMD_FAILURE;
                }
-               /* TODO:
-                * ALL THIS STUFF HERE NEEDS TO BE HOOKED TO THE 'DEATH' OF THE REHASH THREAD
-                * VIA SOME NOTIFICATION EVENT. WE CANT JUST CALL IT ALL HERE.
-                * -- B
-                */
-               // Get XLine to do it's thing.
-               /*ServerInstance->XLines->CheckELines();
-               ServerInstance->XLines->ApplyLines();
-               ServerInstance->Res->Rehash();
-               ServerInstance->ResetMaxBans();*/
        }
 
-       /* TODO: Same as above for all this stuff, really */
-       if (old_disabled != ServerInstance->Config->DisabledCommands)
-               InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
-
-       FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
-
-       ServerInstance->BuildISupport();
-
        return CMD_SUCCESS;
 }