X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=09d4e619d4aaa35e64004607f0db019f11fbeaaf;hb=f62fb75d9dbec40974eb757983791404a8bf8695;hp=e360d391735ed2775ad208388aa66ee8e9d941f5;hpb=c79475caa82104e82f9a914b7673bd61f7a1f01f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index e360d3917..09d4e619d 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -102,21 +102,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
@@ -545,7 +530,7 @@ class CoreExport ServerConfig
 
 	/** Get server ID as string with required leading zeroes
 	 */
-	std::string GetSID();
+	const std::string& GetSID();
 
 	/** Update the 005 vector
 	 */
@@ -568,10 +553,6 @@ class CoreExport ServerConfig
 
 	void Fill();
 
-	/** Parses color codes from string values to actual color codes
-	 */
-	void ProcessColors(ConfigFileCache::iterator &file);
-
 	/** Returns true if the given string starts with a windows drive letter
 	 */
 	bool StartsWithWindowsDriveLetter(const std::string &path);
@@ -598,6 +579,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