diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2015-11-02 12:38:14 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2015-11-02 12:38:14 +0100 |
| commit | a6b53dbc3629eb329b5b77d81e81ced837d4dc66 (patch) | |
| tree | a05b140a7e7713650baa8fd2a6b1f5a29c403f70 | |
| parent | a95853c96493bbf8609febfc4395a21ff0b711d5 (diff) | |
Move ServerConfig::InvBypassModes into core_channel
| -rw-r--r-- | include/configreader.h | 4 | ||||
| -rw-r--r-- | src/configreader.cpp | 3 | ||||
| -rw-r--r-- | src/coremods/core_channel/core_channel.cpp | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/include/configreader.h b/include/configreader.h index 57d7ab069..9b73dd3c6 100644 --- 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); - /** 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; diff --git a/src/configreader.cpp b/src/configreader.cpp index 974e52abf..a81a1b646 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -56,7 +56,7 @@ ServerConfig::ServerConfig() , NoSnoticeStack(false) { RawLog = HideBans = HideSplits = UndernetMsgPrefix = false; - WildcardIPv6 = InvBypassModes = true; + WildcardIPv6 = true; 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); - InvBypassModes = options->getBool("invitebypassmodes", true); 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 ec617af13..9febdf1e7 100644 --- 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 { + ConfigTag* optionstag = ServerInstance->Config->ConfValue("options"); 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 { |