Also add support for default values for ConfValueBool and ConfValueInteger in configreader, and for ReadFlag and ReadInteger in modules.

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

2 files changed, 29 insertions, 5 deletions

diff --git a/include/configreader.h b/include/configreader.h
index d814a398e..5e8c62e06 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -152,6 +152,7 @@ struct MultiConfig
 {
 	const char*	tag;
 	char*		items[12];
+	char*		items_default[12];
 	int		datatype[12];
 	MultiNotify	init_function;
 	MultiValidator	validation_function;
@@ -581,16 +582,20 @@ class ServerConfig : public Extensible
 	/** Tries to convert the value to an integer and write it to 'result'
 	 */
 	bool ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result);
+	bool ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, int &result);
 	/** Tries to convert the value to an integer and write it to 'result'
 	 */
 	bool ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result);
+	bool ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, int &result);
 	
 	/** Returns true if the value exists and has a true value, false otherwise
 	 */
 	bool ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index);
+	bool ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index);
 	/** Returns true if the value exists and has a true value, false otherwise
 	 */
 	bool ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, int index);
+	bool ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index);
 	
 	/** Returns the number of occurences of tag in the config file
 	 */
diff --git a/include/modules.h b/include/modules.h
index 8f5462b3a..9928ad326 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1397,21 +1397,30 @@ class ConfigReader : public classbase
 
 	/** Retrieves a value from the config file.
 	 * This method retrieves a value from the config file. Where multiple copies of the tag
-	 * exist in the config file, index indicates which of the values to retrieve. If the
-	 * tag is not found the default value is returned instead.
+	 * exist in the config file, index indicates which of the values to retrieve.
 	 */
-	std::string ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds = false);
+	std::string ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds = false);
 	/** Retrieves a value from the config file.
 	 * This method retrieves a value from the config file. Where multiple copies of the tag
-	 * exist in the config file, index indicates which of the values to retrieve.
+	 * exist in the config file, index indicates which of the values to retrieve. If the
+	 * tag is not found the default value is returned instead.
 	 */
-	std::string ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds = false);
+	std::string ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds = false);
+
 	/** Retrieves a boolean value from the config file.
 	 * This method retrieves a boolean value from the config file. Where multiple copies of the tag
 	 * exist in the config file, index indicates which of the values to retrieve. The values "1", "yes"
 	 * and "true" in the config file count as true to ReadFlag, and any other value counts as false.
 	 */
 	bool ReadFlag(const std::string &tag, const std::string &name, int index);
+	/** Retrieves a boolean value from the config file.
+	 * This method retrieves a boolean value from the config file. Where multiple copies of the tag
+	 * exist in the config file, index indicates which of the values to retrieve. The values "1", "yes"
+	 * and "true" in the config file count as true to ReadFlag, and any other value counts as false.
+	 * If the tag is not found, the default value is used instead.
+	 */
+	bool ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index);
+
 	/** Retrieves an integer value from the config file.
 	 * This method retrieves an integer value from the config file. Where multiple copies of the tag
 	 * exist in the config file, index indicates which of the values to retrieve. Any invalid integer
@@ -1421,6 +1430,16 @@ class ConfigReader : public classbase
 	 * will return CONF_NOT_UNSIGNED
 	 */
 	long ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned);
+	/** Retrieves an integer value from the config file.
+	 * This method retrieves an integer value from the config file. Where multiple copies of the tag
+	 * exist in the config file, index indicates which of the values to retrieve. Any invalid integer
+	 * values in the tag will cause the objects error value to be set, and any call to GetError() will
+	 * return CONF_INVALID_NUMBER to be returned. needs_unsigned is set if the number must be unsigned.
+	 * If a signed number is placed into a tag which is specified unsigned, 0 will be returned and GetError()
+	 * will return CONF_NOT_UNSIGNED. If the tag is not found, the default value is used instead.
+	 */
+	long ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool needs_unsigned);
+
 	/** Returns the last error to occur.
 	 * Valid errors can be found by looking in modules.h. Any nonzero value indicates an error condition.
 	 * A call to GetError() resets the error flag back to 0.