Add formatting to InspIRCd::TimeString; switch all code to use it.

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

diff --git a/include/configreader.h b/include/configreader.h
index e10f361d7bd38b8975344e9b9b83c8f47c4c77a4..f3b1f8b741dc27ba58aea1591c832dd72a5b787a 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -114,6 +114,8 @@ class ServerLimits
        size_t MaxAway;
        /** Maximum line length */
        size_t MaxLine;
+       /** Maximum hostname length */
+       size_t MaxHost;
 
        /** Creating the class initialises it to the defaults
         * as in 1.1's ./configure script. Reading other values
@@ -121,7 +123,7 @@ class ServerLimits
         */
        ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
                MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
-               MaxLine(512) { }
+               MaxLine(512), MaxHost(64) { }
 };
 
 struct CommandLineConf
@@ -214,10 +216,10 @@ class CoreExport ServerConfig
                std::string Module;
 
                ServerPaths()
-                       : Config(CONFIG_PATH)
-                       , Data(DATA_PATH)
-                       , Log(LOG_PATH)
-                       , Module(MOD_PATH) { }
+                       : Config(INSPIRCD_CONFIG_PATH)
+                       , Data(INSPIRCD_DATA_PATH)
+                       , Log(INSPIRCD_LOG_PATH)
+                       , Module(INSPIRCD_MODULE_PATH) { }
 
                std::string PrependConfig(const std::string& fn) const { return FileSystem::ExpandPath(Config, fn); }
                std::string PrependData(const std::string& fn) const { return FileSystem::ExpandPath(Data, fn); }
@@ -297,57 +299,6 @@ class CoreExport ServerConfig
         */
        std::string ServerDesc;
 
-       /** Holds the admin's name, for output in
-        * the /ADMIN command.
-        */
-       std::string AdminName;
-
-       /** Holds the email address of the admin,
-        * for output in the /ADMIN command.
-        */
-       std::string AdminEmail;
-
-       /** Holds the admin's nickname, for output
-        * in the /ADMIN command
-        */
-       std::string AdminNick;
-
-       /** The admin-configured /DIE password
-        */
-       std::string diepass;
-
-       /** The admin-configured /RESTART password
-        */
-       std::string restartpass;
-
-       /** The hash method for *BOTH* the die and restart passwords.
-        */
-       std::string powerhash;
-
-       /** The quit prefix in use, or an empty string
-        */
-       std::string PrefixQuit;
-
-       /** The quit suffix in use, or an empty string
-        */
-       std::string SuffixQuit;
-
-       /** The fixed quit message in use, or an empty string
-        */
-       std::string FixedQuit;
-
-       /** The part prefix in use, or an empty string
-        */
-       std::string PrefixPart;
-
-       /** The part suffix in use, or an empty string
-        */
-       std::string SuffixPart;
-
-       /** The fixed part message in use, or an empty string
-        */
-       std::string FixedPart;
-
        /** Pretend disabled commands don't exist.
         */
        bool DisabledDontExist;
@@ -495,11 +446,11 @@ class CoreExport ServerConfig
         */
        OperIndex OperTypes;
 
-       /** Max channels per user
+       /** Default value for <connect:maxchans>, deprecated in 2.2
         */
        unsigned int MaxChans;
 
-       /** Oper max channels per user
+       /** Default value for <oper:maxchans>, deprecated in 2.2
         */
        unsigned int OperMaxChans;