auto-set +s when +n is set (as +n requires +s) - allow +n to be 'set twice' allowing...

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

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index eeb8958f9b6955f478178acff24fb6b71e472e46..0a535adc326bd58212eedcbdddf5aee635532b62 100644 (file)
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -19,17 +19,13 @@
 #include "users.h"
 #include "modules.h"
 #include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_rehash.h"
 
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
+
 
 void 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 = "";
        if (pcnt)
        {
@@ -37,7 +33,7 @@ void cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
        }
        else
        {
-               ServerInstance->WriteOpers("%s is rehashing config file %s",user->nick,CleanFilename(CONFIG_FILE));
+               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));