X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=0fbf234c330b5c0a41856eb45d886c7eb266f9e7;hb=d349f981fbe70fb11e3db4c486f59749ffe74c2b;hp=0d514e41d3d12a37013bf8e5d07d5d41fd17f834;hpb=4509cbcc0b57f9f397af26f5e8dbe629499c2b24;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 0d514e41d..0fbf234c3 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -50,6 +50,16 @@ class CoreExport ConfigTag : public refcountbase
 	/** Get the value of an option, using def if it does not exist */
 	bool getBool(const std::string& key, bool def = false);
 
+	/** Get the value in seconds of a duration that is in the user-friendly "1h2m3s" format,
+	 * using a default value if it does not exist or is out of bounds.
+	 * @param key The config key name
+	 * @param def Default value (optional)
+	 * @param min Minimum acceptable value (optional)
+	 * @param max Maximum acceptable value (optional)
+	 * @return The duration in seconds
+	 */
+	long getDuration(const std::string& key, long def = 0, long min = LONG_MIN, long max = LONG_MAX);
+
 	/** Get the value of an option
 	 * @param key The option to get
 	 * @param value The location to store the value (unmodified if does not exist)
@@ -58,6 +68,16 @@ class CoreExport ConfigTag : public refcountbase
 	 */
 	bool readString(const std::string& key, std::string& value, bool allow_newline = false);
 
+	/** Check for an out of range value. If the value falls outside the boundaries a warning is
+	 * logged and the value is corrected (set to def).
+	 * @param key The key name, used in the warning message
+	 * @param res The value to verify and modify if needed
+	 * @param def The default value, res will be set to this if (min <= res <= max) doesn't hold true
+	 * @param min Minimum accepted value for res
+	 * @param max Maximum accepted value for res
+	 */
+	void CheckRange(const std::string& key, long& res, long def, long min, long max);
+
 	std::string getTagLocation();
 
 	inline const std::vector<KeyVal>& getItems() const { return items; }
@@ -184,6 +204,32 @@ class CoreExport ServerConfig
 	void CrossCheckConnectBlocks(ServerConfig* current);
 
  public:
+	class ServerPaths
+	{
+	 public:
+		/** Config path */
+		std::string Config;
+
+		/** Data path */
+		std::string Data;
+
+		/** Log path */
+		std::string Log;
+
+		/** Module path */
+		std::string Module;
+
+		ServerPaths()
+			: Config(CONFIG_PATH)
+			, Data(DATA_PATH)
+			, Log(LOG_PATH)
+			, Module(MOD_PATH) { }
+
+		std::string PrependConfig(const std::string& fn) const { return ServerConfig::ExpandPath(Config, fn); }
+		std::string PrependData(const std::string& fn) const { return ServerConfig::ExpandPath(Data, fn); }
+		std::string PrependLog(const std::string& fn) const { return ServerConfig::ExpandPath(Log, fn); }
+		std::string PrependModule(const std::string& fn) const { return ServerConfig::ExpandPath(Module, fn); }
+	};
 
 	/** Get a configuration tag
 	 * @param tag The name of the tag to get
@@ -220,6 +266,9 @@ class CoreExport ServerConfig
 	 */
 	ServerLimits Limits;
 
+	/** Locations of various types of file (config, module, etc). */
+	ServerPaths Paths;
+
 	/** Configuration parsed from the command line.
 	 */
 	CommandLineConf cmdline;
@@ -333,13 +382,6 @@ class CoreExport ServerConfig
 	 */
 	char DisabledCModes[64];
 
-	/** The full path to the modules directory.
-	 * This is either set at compile time, or
-	 * overridden in the configuration file via
-	 * the \<path> tag.
-	 */
-	std::string ModPath;
-
 	/** If set to true, then all opers on this server are
 	 * shown with a generic 'is an IRC operator' line rather
 	 * than the oper type. Oper types are still used internally.
@@ -465,11 +507,14 @@ class CoreExport ServerConfig
 	 */
 	bool FullHostInTopic;
 
-	/** Oper block and type index.
-	 * For anonymous oper blocks (type only), prefix with a space.
+	/** Oper blocks keyed by their name
 	 */
 	OperIndex oper_blocks;
 
+	/** Oper types keyed by their name
+	 */
+	OperIndex OperTypes;
+
 	/** Max channels per user
 	 */
 	unsigned int MaxChans;
@@ -508,7 +553,7 @@ class CoreExport ServerConfig
 
 	/** Returns true if the given string starts with a windows drive letter
 	 */
-	bool StartsWithWindowsDriveLetter(const std::string &path);
+	static bool StartsWithWindowsDriveLetter(const std::string& path);
 
 	bool ApplyDisabledCommands(const std::string& data);
 
@@ -523,7 +568,13 @@ class CoreExport ServerConfig
 	 * @return True if the file exists and is readable.
 	 */
 	static bool FileExists(const char* file);
-	
+
+	/** Expands a path fragment to a full path.
+	 * @param base The base path to expand from
+	 * @param fragment The path fragment to expand on top of base.
+	 */
+	static std::string ExpandPath(const std::string& base, const std::string& fragment);
+
 	/** Escapes a value for storage in a configuration key.
 	 * @param str The string to escape.
 	 * @param xml Are we using the XML config format?
@@ -563,3 +614,14 @@ class CoreExport ConfigReaderThread : public Thread
 	void Finish();
 	bool IsDone() { return done; }
 };
+
+class CoreExport ConfigStatus
+{
+ public:
+	User* const srcuser;
+
+	ConfigStatus(User* user = NULL)
+		: srcuser(user)
+	{
+	}
+};