Move ServerConfig::InvBypassModes into core_channel

diff --git a/include/configreader.h b/include/configreader.h
index 57d7ab069741a1f68869183005b705a1a1ffabba..9b73dd3c630a095fdc5e3e59889a25e86fcff670 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -495,10 +495,6 @@ class CoreExport ServerConfig
         */
        static std::string Escape(const std::string& str, bool xml = true);
 
         */
        static std::string Escape(const std::string& str, bool xml = true);
 

-       /** If this value is true, invites will bypass more than just +i
-        */
-       bool InvBypassModes;
-

        /** If this value is true, snotices will not stack when repeats are sent
         */
        bool NoSnoticeStack;
        /** If this value is true, snotices will not stack when repeats are sent
         */
        bool NoSnoticeStack;

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 974e52abf137cd3488023463db85a88dcf6bd3b8..a81a1b646f8ea81cc911eae6f2ad2835e21b911f 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -56,7 +56,7 @@ ServerConfig::ServerConfig()
        , NoSnoticeStack(false)
 {
        RawLog = HideBans = HideSplits = UndernetMsgPrefix = false;
        , NoSnoticeStack(false)
 {
        RawLog = HideBans = HideSplits = UndernetMsgPrefix = false;

-       WildcardIPv6 = InvBypassModes = true;
+       WildcardIPv6 = true;

        dns_timeout = 5;
        MaxTargets = 20;
        NetBufferSize = 10240;
        dns_timeout = 5;
        MaxTargets = 20;
        NetBufferSize = 10240;


@@ -427,7 +427,6 @@ void ServerConfig::Fill()
        Paths.Data = ConfValue("path")->getString("datadir", INSPIRCD_DATA_PATH);
        Paths.Log = ConfValue("path")->getString("logdir", INSPIRCD_LOG_PATH);
        Paths.Module = ConfValue("path")->getString("moduledir", INSPIRCD_MODULE_PATH);
        Paths.Data = ConfValue("path")->getString("datadir", INSPIRCD_DATA_PATH);
        Paths.Log = ConfValue("path")->getString("logdir", INSPIRCD_LOG_PATH);
        Paths.Module = ConfValue("path")->getString("moduledir", INSPIRCD_MODULE_PATH);

-       InvBypassModes = options->getBool("invitebypassmodes", true);

        NoSnoticeStack = options->getBool("nosnoticestack", false);
 
        if (Network.find(' ') != std::string::npos)
        NoSnoticeStack = options->getBool("nosnoticestack", false);
 
        if (Network.find(' ') != std::string::npos)

diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp
index ec617af134d9a1676110e6412bb6851811ea75b5..9febdf1e75c6fb65bb3b9bf188fe4dcf3b3b64ce 100644 (file)
--- a/src/coremods/core_channel/core_channel.cpp
+++ b/src/coremods/core_channel/core_channel.cpp
@@ -44,8 +44,9 @@ class CoreModChannel : public Module
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {

+               ConfigTag* optionstag = ServerInstance->Config->ConfValue("options");

                Implementation events[] = { I_OnCheckKey, I_OnCheckLimit, I_OnCheckChannelBan };
                Implementation events[] = { I_OnCheckKey, I_OnCheckLimit, I_OnCheckChannelBan };

-               if (ServerInstance->Config->InvBypassModes)
+               if (optionstag->getBool("invitebypassmodes", true))

                        ServerInstance->Modules.Attach(events, this, sizeof(events)/sizeof(Implementation));
                else
                {
                        ServerInstance->Modules.Attach(events, this, sizeof(events)/sizeof(Implementation));
                else
                {