X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=ce03f1d9eb62d0faf85d7ee703cdeb42b9e7136d;hb=aea67c2520b9abbd3be702914b025e1b2a37e046;hp=52217722cc5b07f16cf9fdd63aa0dde659f0427b;hpb=ea7eb543cbbc9d42def708f271ff00e524094a59;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 52217722c..ce03f1d9e 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -373,6 +373,7 @@ void ServerConfig::Fill() SoftLimit = ConfValue("performance")->getUInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10); CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true); MaxConn = ConfValue("performance")->getUInt("somaxconn", SOMAXCONN); + TimeSkipWarn = ConfValue("performance")->getDuration("timeskipwarn", 2, 0, 30); XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!")); ServerDesc = server->getString("description", "Configure Me"); Network = server->getString("network", "Network"); @@ -565,16 +566,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) errstr.clear(); errstr.str(std::string()); - // Re-parse our MOTD and RULES files for colors -- Justasic - for (ClassVector::const_iterator it = this->Classes.begin(), it_end = this->Classes.end(); it != it_end; ++it) - { - ConfigTag *tag = (*it)->config; - - ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd")); - if (file != this->Files.end()) - InspIRCd::ProcessColors(file->second); - } - /* No old configuration -> initial boot, nothing more to do here */ if (!old) {