From 6c9588419d3cfe01d04d3c870eaac712bb6745b8 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 10 Aug 2006 18:28:37 +0000 Subject: Move FileExists, CleanFilename, DirValid, GetFullProgDir into class ServerConfig git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4848 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/configreader.h | 6 ++++++ include/globals.h | 3 --- include/helperfuncs.h | 4 ---- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/configreader.h b/include/configreader.h index 5bf26e695..b95cdede5 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -405,6 +405,12 @@ class ServerConfig : public Extensible Module* GetIOHook(int port); bool AddIOHook(int port, Module* iomod); bool DelIOHook(int port); + + static std::string GetFullProgDir(char** argv, int argc); + static bool DirValid(const char* dirandfile); + static char* CleanFilename(char* name); + static bool FileExists(const char* file); + }; bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance); diff --git a/include/globals.h b/include/globals.h index 4a5c1e1e4..253ca923b 100644 --- a/include/globals.h +++ b/include/globals.h @@ -19,12 +19,9 @@ // include the common header files -#include -#include #include #include #include "users.h" -#include "channels.h" typedef std::deque file_cache; typedef std::pair< std::string, std::string > KeyVal; diff --git a/include/helperfuncs.h b/include/helperfuncs.h index 9c3207a9e..ff43c4abe 100644 --- a/include/helperfuncs.h +++ b/include/helperfuncs.h @@ -53,10 +53,6 @@ void Error(int status); void ShowMOTD(userrec *user); void ShowRULES(userrec *user); bool AllModulesReportReady(userrec* user); -bool DirValid(char* dirandfile); -bool FileExists(const char* file); -char* CleanFilename(char* name); -std::string GetFullProgDir(char** argv, int argc); int InsertMode(std::string &output, const char* modes, unsigned short section); bool IsValidChannelName(const char *); -- cgit v1.2.3