Merge pull request #244 from SaberUK/insp20-configure-fix

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

diff --git a/include/configreader.h b/include/configreader.h
index 1127364399f1f5be4f01e8c29ac876fe3e23ae2b..f42bf67fea6c1c5adf3bbe820fc84457b1b55b10 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #ifndef INSPIRCD_CONFIGREADER
 #define INSPIRCD_CONFIGREADER
 
@@ -211,8 +221,12 @@ class CoreExport ServerConfig
        /** True if this configuration is valid enough to run with */
        bool valid;
 
+       /** Bind to IPv6 by default */
+       bool WildcardIPv6;
+
        /** Used to indicate who we announce invites to on a channel */
        enum InviteAnnounceState { INVITE_ANNOUNCE_NONE, INVITE_ANNOUNCE_ALL, INVITE_ANNOUNCE_OPS, INVITE_ANNOUNCE_DYNAMIC };
+       enum OperSpyWhoisState { SPYWHOIS_NONE, SPYWHOIS_SINGLEMSG, SPYWHOIS_SPLITMSG };
 
        /** This holds all the information in the config file,
         * it's indexed by tag name to a vector of key/values.
@@ -336,11 +350,6 @@ class CoreExport ServerConfig
         */
        std::string FixedPart;
 
-       /** The last string found within a <die> tag, or
-        * an empty string.
-        */
-       std::string DieValue;
-
        /** The DNS server to use for DNS queries
         */
        std::string DNSServer;
@@ -430,7 +439,10 @@ class CoreExport ServerConfig
        /** If this is enabled then operators will
         * see invisible (+i) channels in /whois.
         */
-       bool OperSpyWhois;
+       OperSpyWhoisState OperSpyWhois;
+
+       /** True if raw I/O is being logged */
+       bool RawLog;
 
        /** Set to a non-empty string to obfuscate the server name of users in WHOIS
         */
@@ -493,6 +505,11 @@ class CoreExport ServerConfig
         */
        bool CycleHosts;
 
+       /** If set to true, the CycleHosts mode change will be sourced from the user,
+        * rather than the server
+        */
+       bool CycleHostsFromUser;
+
        /** If set to true, prefixed channel NOTICEs and PRIVMSGs will have the prefix
         *  added to the outgoing text for undernet style msg prefixing.
         */
@@ -574,6 +591,10 @@ class CoreExport ServerConfig
         */
        bool InvBypassModes;
 
+       /** If this value is true, snotices will not stack when repeats are sent
+        */
+       bool NoSnoticeStack;
+
 };
 
 /** The background thread for config reading, so that reading from executable includes