X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=c4275ab5f03eebbb3b2a16511705bfa0a5c8ad56;hb=3ec7995bf4981119115d14ce2cfce0cb5795f803;hp=98a13034d22a88c3f25336f55a1e9bc4832104de;hpb=e65c1d261c26702dac82a6390be3fa757bbed6ec;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 98a13034d..c4275ab5f 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -139,6 +139,7 @@ struct InitialConfig
 {
 	char* tag;
 	char* value;
+	char* default_value;
 	ValueContainerBase* val;
 	ConfigDataType datatype;
 	Validator validation_function;
@@ -150,8 +151,9 @@ struct InitialConfig
 struct MultiConfig
 {
 	const char*	tag;
-	char*		items[12];
-	int		datatype[12];
+	char*		items[13];
+	char*		items_default[13];
+	int		datatype[13];
 	MultiNotify	init_function;
 	MultiValidator	validation_function;
 	MultiNotify	finish_function;
@@ -274,6 +276,14 @@ class ServerConfig : public Extensible
 	 */
 	char PrefixQuit[MAXBUF];
 
+	/** The quit suffix in use, or an empty string
+	 */
+	char SuffixQuit[MAXBUF];
+
+	/** The fixed quit message in use, or an empty string
+	 */
+	char FixedQuit[MAXBUF];
+
 	/** The last string found within a <die> tag, or
 	 * an empty string.
 	 */
@@ -339,6 +349,12 @@ class ServerConfig : public Extensible
 	 */
 	bool AllowHalfop;
 
+	/** If this is set to true, then mode lists (e.g
+	 * MODE #chan b) are hidden from unprivileged
+	 * users.
+	 */
+	bool HideModeLists[256];
+
 	/** The number of seconds the DNS subsystem
 	 * will wait before timing out any request.
 	 */
@@ -393,6 +409,10 @@ class ServerConfig : public Extensible
 	 */
 	bool HideBans;
 
+	/** Announce invites to the channel with a server notice
+	 */
+	bool AnnounceInvites;
+
 	/** If this is enabled then operators will
 	 * see invisible (+i) channels in /whois.
 	 */
@@ -473,12 +493,16 @@ class ServerConfig : public Extensible
 
 	/** List of u-lined servers
 	 */
-	std::vector<irc::string> ulines;
+	std::map<irc::string, bool> ulines;
 
 	/** Max banlist sizes for channels (the std::string is a glob)
 	 */
 	std::map<std::string,int> maxbans;
 
+	/** Directory where the inspircd binary resides
+	 */
+	std::string MyDir;
+
 	/** If set to true, no user DNS lookups are to be performed
 	 */
 	bool NoUserDns;
@@ -492,6 +516,16 @@ class ServerConfig : public Extensible
 	 */
 	bool CycleHosts;
 
+	/** If set to true, prefixed channel NOTICEs and PRIVMSGs will have the prefix
+	 *  added to the outgoing text for undernet style msg prefixing.
+	 */
+	bool UndernetMsgPrefix;
+
+	/** If set to true, the full nick!user@host will be shown in the TOPIC command
+	 * for who set the topic last. If false, only the nick is shown.
+	 */
+	bool FullHostInTopic;
+
 	/** All oper type definitions from the config file
 	 */
 	opertype_t opertypes;
@@ -500,6 +534,22 @@ class ServerConfig : public Extensible
 	 */
 	operclass_t operclass;
 
+	/** Saved argv from startup
+	 */
+	char** argv;
+
+	/** Saved argc from startup
+	 */
+	int argc;
+
+	/** Max channels per user
+	 */
+	unsigned int MaxChans;
+
+	/** Oper max channels per user
+	 */
+	unsigned int OperMaxChans;
+
 	/** Construct a new ServerConfig
 	 */
 	ServerConfig(InspIRCd* Instance);
@@ -553,23 +603,30 @@ class ServerConfig : public Extensible
 	/** Writes 'length' chars into 'result' as a string
 	 */
 	bool ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds = false);
+	bool ConfValue(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds = false);
+
 	/** Writes 'length' chars into 'result' as a string
 	 */
 	bool ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds = false);
+	bool ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds = false);
 	
 	/** 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
 	 */