Add HiroP to contributors for being such a helpful little gubbins ;>. Congradulations. :)

[user/henk/code/inspircd.git] / include / configreader.h

diff --git a/include/configreader.h b/include/configreader.h
index 3c8a58e64e57c3968fa88edb179598c291cf4230..eefa359c9e523567a90d3643a05afce4350620a4 100644 (file)
--- 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.
         */
@@ -402,6 +422,10 @@ class ServerConfig : public Extensible
         */
        char HideWhoisServer[MAXBUF];
 
+       /** Set to a non empty string to obfuscate nicknames prepended to a KILL.
+        */
+       char HideKillsServer[MAXBUF];
+
        /** A list of IP addresses the server is listening
         * on.
         */
@@ -473,7 +497,7 @@ 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)
         */
@@ -501,6 +525,11 @@ class ServerConfig : public Extensible
         */
        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;
@@ -517,6 +546,14 @@ class ServerConfig : public Extensible
         */
        int argc;
 
+       /** Max channels per user
+        */
+       unsigned int MaxChans;
+
+       /** Oper max channels per user
+        */
+       unsigned int OperMaxChans;
+
        /** Construct a new ServerConfig
         */
        ServerConfig(InspIRCd* Instance);
@@ -570,23 +607,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
         */