diff options
| author | Adam <Adam@anope.org> | 2011-08-13 14:24:08 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-09-10 00:58:35 -0400 |
| commit | 4a7ba7ef4cd92263d8187b1385d8bf46102ef7b3 (patch) | |
| tree | d03e1e17d7a736b6369a59b0418c5f468a040838 /src/config.cpp | |
| parent | 2b5d9f349f0990f664e1e6a685dd2ef983b388c8 (diff) | |
Removed SZLine. Instead, have AKILL determine whether or not a ZLINE should be set.
Diffstat (limited to 'src/config.cpp')
| -rw-r--r-- | src/config.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/config.cpp b/src/config.cpp index fc3fd3db1..4a1f02f64 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -141,7 +141,7 @@ ServerConfig::ServerConfig() : config_data(), NSDefFlags(NickCoreFlagStrings), C } this->WallOper = this->WallBadOS = this->WallAkillExpire = this->WallSNLineExpire = this->WallSQLineExpire = - this->WallSZLineExpire = this->WallExceptionExpire = false; + this->WallExceptionExpire = false; if (!OSNotifications.empty()) { spacesepstream notifications(OSNotifications); @@ -158,8 +158,6 @@ ServerConfig::ServerConfig() : config_data(), NSDefFlags(NickCoreFlagStrings), C this->WallSNLineExpire = true; else if (notice.equals_ci("sqlineexpire")) this->WallSQLineExpire = true; - else if (notice.equals_ci("szlineexpire")) - this->WallSZLineExpire = true; else if (notice.equals_ci("exceptionexpire")) this->WallExceptionExpire = true; } @@ -477,7 +475,7 @@ bool ValidateOperServ(ServerConfig *config, const Anope::string &tag, const Anop { if (value.equals_ci("description") && data.GetValue().empty()) throw ConfigException("The value for <" + tag + ":" + value + "> cannot be empty when OperServ is enabled!"); - else if (value.equals_ci("autokillexpiry") || value.equals_ci("chankillexpiry") || value.equals_ci("snlineexpiry") || value.equals_ci("szlineexpiry") || value.equals_ci("sqlineexpiry")) + else if (value.equals_ci("autokillexpiry") || value.equals_ci("chankillexpiry") || value.equals_ci("snlineexpiry") || value.equals_ci("sqlineexpiry")) return ValidateNotZero(config, tag, value, data); else if (value.equals_ci("maxsessionlimit") || value.equals_ci("exceptionexpiry")) return ValidateLimitSessions(config, tag, value, data); @@ -1211,7 +1209,6 @@ ConfigItems::ConfigItems(ServerConfig *conf) {"operserv", "chankillexpiry", "0", new ValueContainerTime(&conf->ChankillExpiry), DT_TIME, ValidateOperServ}, {"operserv", "snlineexpiry", "0", new ValueContainerTime(&conf->SNLineExpiry), DT_TIME, ValidateOperServ}, {"operserv", "sqlineexpiry", "0", new ValueContainerTime(&conf->SQLineExpiry), DT_TIME, ValidateOperServ}, - {"operserv", "szlineexpiry", "0", new ValueContainerTime(&conf->SZLineExpiry), DT_TIME, ValidateOperServ}, {"operserv", "akillonadd", "no", new ValueContainerBool(&conf->AkillOnAdd), DT_BOOLEAN, NoValidation}, {"operserv", "killonsnline", "no", new ValueContainerBool(&conf->KillonSNline), DT_BOOLEAN, NoValidation}, {"operserv", "killonsqline", "no", new ValueContainerBool(&conf->KillonSQline), DT_BOOLEAN, NoValidation}, |