From 1d0bb9b26b7ad58ab0bf979ac046f4511b3bf12b Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 5 May 2013 01:55:04 -0400 Subject: Rework the config file reader to be much more flexible and move many configuration directives to the actual modules they are used in. --- modules/commands/os_chankill.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'modules/commands/os_chankill.cpp') diff --git a/modules/commands/os_chankill.cpp b/modules/commands/os_chankill.cpp index 8253742a6..713b5922f 100644 --- a/modules/commands/os_chankill.cpp +++ b/modules/commands/os_chankill.cpp @@ -30,7 +30,6 @@ class CommandOSChanKill : public Command return; Anope::string expiry, channel; - time_t expires; unsigned last_param = 1; Channel *c; @@ -42,7 +41,7 @@ class CommandOSChanKill : public Command last_param = 2; } - expires = !expiry.empty() ? Anope::DoTime(expiry) : Config->ChankillExpiry; + time_t expires = !expiry.empty() ? Anope::DoTime(expiry) : Config->GetModule("operserv")->Get("autokillexpiry", "30d"); if (!expiry.empty() && isdigit(expiry[expiry.length() - 1])) expires *= 86400; if (expires && expires < 60) @@ -65,7 +64,7 @@ class CommandOSChanKill : public Command if (!reason.empty()) { Anope::string realreason; - if (Config->AddAkiller) + if (Config->GetBlock("operserv")->Get("addakiller") && !source.GetNick().empty()) realreason = "[" + source.GetNick() + "] " + reason; else realreason = reason; -- cgit