Executable include for MOTD and more

This introduces an <execfiles> tag that reads files from the output of
a command, in the same way as executable includes. The files specified
here can also be used anywhere a file is used (opermotd, randquote, etc)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12354 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 5 insertions, 12 deletions

diff --git a/include/configreader.h b/include/configreader.h
index 3d01d7e91..112736439 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -219,6 +219,11 @@ class CoreExport ServerConfig
 	 */
 	ConfigDataHash config_data;
 
+	/** This holds all extra files that have been read in the configuration
+	 * (for example, MOTD and RULES files are stored here)
+	 */
+	ConfigFileCache Files;
+
 	/** Length limits, see definition of ServerLimits class
 	 */
 	ServerLimits Limits;
@@ -435,14 +440,6 @@ class CoreExport ServerConfig
 	 */
 	std::string HideKillsServer;
 
-	/** The MOTD file, cached in a file_cache type.
-	 */
-	file_cache MOTD;
-
-	/** The RULES file, cached in a file_cache type.
-	 */
-	file_cache RULES;
-
 	/** The full pathname and filename of the PID
 	 * file as defined in the configuration.
 	 */
@@ -555,10 +552,6 @@ class CoreExport ServerConfig
 
 	void Fill();
 
-	/** Read a file into a file_cache object
-	 */
-	bool ReadFile(file_cache &F, const std::string& fname);
-
 	/* Returns true if the given string starts with a windows drive letter
 	 */
 	bool StartsWithWindowsDriveLetter(const std::string &path);