Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

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

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index 5ea852ba85aaa552766afcc086f9da83636adecb..f53f810a49544ef94acfb3c2611a999af804940a 100644 (file)
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -14,22 +14,21 @@
  * ---------------------------------------------------
  */
 
-#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 (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)
 {
-       WriteServ(user->fd,"382 %s %s :Rehashing",user->nick,CleanFilename(CONFIG_FILE));
+       user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
        std::string parameter = "";
        if (pcnt)
        {
@@ -37,8 +36,11 @@ void cmd_rehash::Handle (char **parameters, int pcnt, userrec *user)
        }
        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->Config->Read(false,user);
        }
        FOREACH_MOD(I_OnRehash,OnRehash(parameter));
+
+       return CMD_SUCCESS;
 }
+