Implement IRCv3 message tag support.

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

diff --git a/include/configreader.h b/include/configreader.h
index 9349813d6cf15eaf1d61cfbbb1e4a0dcec38751b..4cb051efff3d1e9f27928627306f55e19e713ec0 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -42,12 +42,16 @@ class CoreExport ConfigTag : public refcountbase
        const std::string src_name;
        const int src_line;
 
+       /** Get the value of an option, using def if it does not exist */
+       std::string getString(const std::string& key, const std::string& def, const TR1NS::function<bool(const std::string&)>& validator);
        /** Get the value of an option, using def if it does not exist */
        std::string getString(const std::string& key, const std::string& def = "", size_t minlen = 0, size_t maxlen = UINT32_MAX);
        /** Get the value of an option, using def if it does not exist */
-       long getInt(const std::string& key, long def = 0, long min = LONG_MIN, long max = LONG_MAX);
+       long getInt(const std::string& key, long def, long min = LONG_MIN, long max = LONG_MAX);
+       /** Get the value of an option, using def if it does not exist */
+       unsigned long getUInt(const std::string& key, unsigned long def, unsigned long min = 0, unsigned long max = ULONG_MAX);
        /** Get the value of an option, using def if it does not exist */
-       double getFloat(const std::string& key, double def = 0);
+       double getFloat(const std::string& key, double def, double min = DBL_MIN, double max = DBL_MAX);
        /** Get the value of an option, using def if it does not exist */
        bool getBool(const std::string& key, bool def = false);
 
@@ -59,7 +63,7 @@ class CoreExport ConfigTag : public refcountbase
         * @param max Maximum acceptable value (optional)
         * @return The duration in seconds
         */
-       long getDuration(const std::string& key, long def = 0, long min = LONG_MIN, long max = LONG_MAX);
+       unsigned long getDuration(const std::string& key, unsigned long def, unsigned long min = 0, unsigned long max = ULONG_MAX);
 
        /** Get the value of an option
         * @param key The option to get
@@ -69,16 +73,6 @@ class CoreExport ConfigTag : public refcountbase
         */
        bool readString(const std::string& key, std::string& value, bool allow_newline = false);
 
-       /** Check for an out of range value. If the value falls outside the boundaries a warning is
-        * logged and the value is corrected (set to def).
-        * @param key The key name, used in the warning message
-        * @param res The value to verify and modify if needed
-        * @param def The default value, res will be set to this if (min <= res <= max) doesn't hold true
-        * @param min Minimum accepted value for res
-        * @param max Maximum accepted value for res
-        */
-       void CheckRange(const std::string& key, long& res, long def, long min, long max);
-
        std::string getTagLocation();
 
        inline const ConfigItems& getItems() const { return items; }
@@ -109,8 +103,8 @@ class ServerLimits
        size_t MaxTopic;
        /** Maximum kick message length */
        size_t MaxKick;
-       /** Maximum GECOS (real name) length */
-       size_t MaxGecos;
+       /** Maximum real name length */
+       size_t MaxReal;
        /** Maximum away message length */
        size_t MaxAway;
        /** Maximum line length */
@@ -154,6 +148,18 @@ struct CommandLineConf
         */
        bool writelog;
 
+       /** 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 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>
+        * tag is not defined in the config file.
+        */
+       bool writepid;
+
        /** Saved argc from startup
         */
        int argc;
@@ -206,6 +212,19 @@ class CoreExport ServerConfig
        void CrossCheckConnectBlocks(ServerConfig* current);
 
  public:
+       /** How to treat a user in a channel who is banned. */
+       enum BannedUserTreatment
+       {
+               /** Don't treat a banned user any different to normal. */
+               BUT_NORMAL,
+
+               /** Restrict the actions of a banned user. */
+               BUT_RESTRICT_SILENT,
+
+               /** Restrict the actions of a banned user and notify them of their treatment. */
+               BUT_RESTRICT_NOTIFY
+       };
+
        class ServerPaths
        {
         public:
@@ -326,10 +345,8 @@ class CoreExport ServerConfig
         */
        bool GenericOper;
 
-       /** If this value is true, banned users (+b, not extbans) will not be able to change nick
-        * if banned on any channel, nor to message them.
-        */
-       bool RestrictBannedUsers;
+       /** How to treat a user in a channel who is banned. */
+       BannedUserTreatment RestrictBannedUsers;
 
        /** The size of the read() buffer in the user
         * handling code, used to read data into a user's
@@ -413,11 +430,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.
         */