Improve support for wildcards in <link:name>.

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

diff --git a/include/configreader.h b/include/configreader.h
index 81ec014a029e60c9919f92ecc5bf4bb13c07186c..511bedbee2618ecfb42977844d4455aed4096939 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -150,12 +150,12 @@ struct CommandLineConf
 
        /** If this is true, a PID file will be written
         * to the file given in the "file" variable of
-        * the <pid> tag in the config file. This is
+        * the \<pid> tag in the config file. This is
         * the default.
         * Passing --nopid as a command line argument
         * sets this to false; in this case, a PID file
         * will not be written, even the default PID
-        * file that is usually written when the <pid>
+        * file that is usually written when the \<pid>
         * tag is not defined in the config file.
         */
        bool writepid;
@@ -256,11 +256,16 @@ class CoreExport ServerConfig
         */
        typedef insp::flat_map<std::string, reference<OperInfo> > OperIndex;
 
-       /** Get a configuration tag
-        * @param tag The name of the tag to get
+       /** Get a configuration tag by name. If one or more tags are present then the first is returned.
+        * @param tag The name of the tag to get.
+        * @returns Either a tag from the config or EmptyTag.
         */
        ConfigTag* ConfValue(const std::string& tag);
 
+       /** Get a list of configuration tags by name.
+        * @param tag The name of the tags to get.
+        * @returns Either a list of tags from the config or an empty ConfigTagList.
+        */
        ConfigTagList ConfTags(const std::string& tag);
 
        /** An empty configuration tag. */
@@ -327,24 +332,6 @@ class CoreExport ServerConfig
         */
        std::string ServerDesc;
 
-       /** Pretend disabled commands don't exist.
-        */
-       bool DisabledDontExist;
-
-       /** This variable identifies which usermodes have been diabled.
-        */
-       std::bitset<64> DisabledUModes;
-
-       /** This variable identifies which chanmodes have been disabled.
-        */
-       std::bitset<64> DisabledCModes;
-
-       /** 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.
-        */
-       bool GenericOper;
-
        /** How to treat a user in a channel who is banned. */
        BannedUserTreatment RestrictBannedUsers;
 
@@ -377,12 +364,11 @@ class CoreExport ServerConfig
         */
        unsigned int MaxTargets;
 
-       /** True if we're going to hide netsplits as *.net *.split for non-opers
-        */
-       bool HideSplits;
+       /** The number of seconds that the server clock can skip by before server operators are warned. */
+       time_t TimeSkipWarn;
 
-       /** True if we're going to hide ban reasons for non-opers (e.g. G-Lines,
-        * K-Lines, Z-Lines)
+       /** True if we're going to hide ban reasons for non-opers (e.g. G-lines,
+        * K-lines, Z-lines)
         */
        bool HideBans;
 
@@ -392,14 +378,6 @@ class CoreExport ServerConfig
        /** Set to a non-empty string to obfuscate server names. */
        std::string HideServer;
 
-       /** Set to a non empty string to obfuscate nicknames prepended to a KILL.
-        */
-       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.
         */
@@ -409,11 +387,6 @@ class CoreExport ServerConfig
         */
        ClassVector Classes;
 
-       /** STATS characters in this list are available
-        * only to operators.
-        */
-       std::string UserStats;
-
        /** Default channel modes
         */
        std::string DefaultModes;
@@ -430,11 +403,6 @@ class CoreExport ServerConfig
         */
        std::string CaseMapping;
 
-       /** If set to true, the CycleHosts mode change will be sourced from the user,
-        * rather than the server
-        */
-       bool CycleHostsFromUser;
-
        /** 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.
         */
@@ -486,9 +454,6 @@ class CoreExport ServerConfig
 
        void Fill();
 
-       /** Disables the commands specified in <disabled:commands>. */
-       bool ApplyDisabledCommands();
-
        /** Escapes a value for storage in a configuration key.
         * @param str The string to escape.
         * @param xml Are we using the XML config format?