X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=4a697d05c314a1edbe5de12ec9240978f2cb3b43;hb=548def58600a5841792504bfdb117c1077482a0d;hp=509ff9c0cbaad88327edf48e05078775cf5ff00f;hpb=808a0a09577009c2d6e494979c2189426b332aef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 509ff9c0c..4a697d05c 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -64,8 +64,7 @@ class CoreExport ConfigTag : public refcountbase
 	inline const std::vector<KeyVal>& getItems() const { return items; }
 
 	/** Create a new ConfigTag, giving access to the private KeyVal item list */
-	static ConfigTag* create(const std::string& Tag, const std::string& file, int line,
-		std::vector<KeyVal>*&items);
+	static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items);
  private:
 	ConfigTag(const std::string& Tag, const std::string& file, int line);
 };
@@ -102,21 +101,6 @@ class ServerLimits
 	ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12), MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200)
 	{
 	}
-
-	/** Finalises the settings by adding one. This allows for them to be used as-is
-	 * without a 'value+1' when using the std::string assignment methods etc.
-	 */
-	void Finalise()
-	{
-		NickMax++;
-		ChanMax++;
-		IdentMax++;
-		MaxQuit++;
-		MaxTopic++;
-		MaxKick++;
-		MaxGecos++;
-		MaxAway++;
-	}
 };
 
 struct CommandLineConf
@@ -213,6 +197,9 @@ class CoreExport ServerConfig
 
 	ConfigTagList ConfTags(const std::string& tag);
 
+	/** An empty configuration tag. */
+	ConfigTag* EmptyTag;
+
 	/** Error stream, contains error output from any failed configuration parsing.
 	 */
 	std::stringstream errstr;
@@ -451,6 +438,10 @@ class CoreExport ServerConfig
 	 */
 	std::string HideKillsServer;
 
+	/** Set to hide kills from clients of ulined servers in snotices.
+	 */
+	bool HideULineKills;
+
 	/** The full pathname and filename of the PID
 	 * file as defined in the configuration.
 	 */
@@ -543,9 +534,11 @@ class CoreExport ServerConfig
 	 */
 	ServerConfig();
 
+	~ServerConfig();
+
 	/** Get server ID as string with required leading zeroes
 	 */
-	std::string GetSID();
+	const std::string& GetSID();
 
 	/** Update the 005 vector
 	 */
@@ -568,7 +561,7 @@ class CoreExport ServerConfig
 
 	void Fill();
 
-	/* Returns true if the given string starts with a windows drive letter
+	/** Returns true if the given string starts with a windows drive letter
 	 */
 	bool StartsWithWindowsDriveLetter(const std::string &path);
 
@@ -594,6 +587,10 @@ class CoreExport ServerConfig
 	 */
 	bool NoSnoticeStack;
 
+	/** If true, a "Welcome to <networkname>!" NOTICE will be sent to
+	 * connecting users
+	 */
+	bool WelcomeNotice;
 };
 
 /** The background thread for config reading, so that reading from executable includes