diff options
Diffstat (limited to 'modules/commands')
| -rw-r--r-- | modules/commands/ns_group.cpp | 15 | ||||
| -rw-r--r-- | modules/commands/ns_resetpass.cpp | 4 | ||||
| -rw-r--r-- | modules/commands/os_session.cpp | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp index 9c54ab815..04842b3e3 100644 --- a/modules/commands/ns_group.cpp +++ b/modules/commands/ns_group.cpp @@ -313,14 +313,25 @@ class CommandNSGList : public Command ListFormatter list(source.GetAccount()); list.AddColumn(_("Nick")).AddColumn(_("Expires")); - time_t nickserv_expire = Config->GetModule("nickserv")->Get<time_t>("expire"); + time_t nickserv_expire = Config->GetModule("nickserv")->Get<time_t>("expire", "21d"), + unconfirmed_expire = Config->GetModule("nickserv")->Get<time_t>("unconfirmedexpire", "1d"); for (unsigned i = 0; i < nc->aliases->size(); ++i) { const NickAlias *na2 = nc->aliases->at(i); + Anope::string expires; + if (na2->HasExt("NS_NO_EXPIRE")) + expires = "Does not expire"; + else if (!nickserv_expire || Anope::NoExpire) + ; + else if (na2->nc->HasExt("UNCONFIRMED") && unconfirmed_expire) + expires = Anope::strftime(na2->time_registered + unconfirmed_expire, source.GetAccount()); + else + expires = Anope::strftime(na2->last_seen + nickserv_expire, source.GetAccount()); + ListFormatter::ListEntry entry; entry["Nick"] = na2->nick; - entry["Expires"] = (na2->HasExt("NS_NO_EXPIRE") || !nickserv_expire || Anope::NoExpire) ? "Does not expire" : Anope::strftime(na2->last_seen + nickserv_expire, source.GetAccount()); + entry["Expires"] = expires; list.AddEntry(entry); } diff --git a/modules/commands/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp index a7d92b98e..c7c0302e7 100644 --- a/modules/commands/ns_resetpass.cpp +++ b/modules/commands/ns_resetpass.cpp @@ -27,9 +27,7 @@ class CommandNSResetPass : public Command { const NickAlias *na; - if (Config->GetBlock("mail")->Get<bool>("restrict") && !source.HasCommand("nickserv/resetpass")) - source.Reply(ACCESS_DENIED); - else if (!(na = NickAlias::Find(params[0]))) + if (!(na = NickAlias::Find(params[0]))) source.Reply(NICK_X_NOT_REGISTERED, params[0].c_str()); else if (!na->nc->email.equals_ci(params[1])) source.Reply(_("Incorrect email address.")); diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp index d3e82b04a..edf9458f8 100644 --- a/modules/commands/os_session.cpp +++ b/modules/commands/os_session.cpp @@ -767,7 +767,7 @@ class OSSession : public Module if (!e->expires || e->expires > Anope::CurTime) continue; BotInfo *OperServ = Config->GetClient("OperServ"); - Log(OperServ, "expire/exception") << "Session exception for " << e->mask << "has expired."; + Log(OperServ, "expire/exception") << "Session exception for " << e->mask << " has expired."; this->ss.DelException(e); delete e; } |