Implement support for banning users from channels by country code.

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index ff9d5bd141dafa02a3d9cf0085b0fc00104fda21..58a932981a402a8213c7386c30a9fd083e9372da 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -431,7 +431,7 @@ void ServerConfig::Fill()
        CustomVersion = security->getString("customversion");
        HideSplits = security->getBool("hidesplits");
        HideBans = security->getBool("hidebans");
-       HideWhoisServer = security->getString("hidewhois");
+       HideServer = security->getString("hideserver", security->getString("hidewhois"));
        HideKillsServer = security->getString("hidekills");
        HideULineKills = security->getBool("hideulinekills");
        RestrictBannedUsers = security->getBool("restrictbannedusers", true);
@@ -492,25 +492,6 @@ void ServerConfig::Fill()
                        throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found.");
                DisabledCModes.set(*p - 'A');
        }
-
-       std::string v = security->getString("announceinvites");
-
-       if (v == "ops")
-               AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS;
-       else if (v == "all")
-               AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL;
-       else if (v == "dynamic")
-               AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC;
-       else
-               AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE;
-
-       v = security->getString("operspywhois");
-       if (v == "splitmsg")
-               OperSpyWhois = SPYWHOIS_SPLITMSG;
-       else if (v == "on" || v == "yes")
-               OperSpyWhois = SPYWHOIS_SINGLEMSG;
-       else
-               OperSpyWhois = SPYWHOIS_NONE;
 }
 
 // WARNING: it is not safe to use most of the codebase in this function, as it