diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/chanserv.c | 22 | ||||
| -rw-r--r-- | src/nickserv.c | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/chanserv.c b/src/chanserv.c index fbbbecd6e..c58b14633 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -5048,19 +5048,19 @@ static int do_info(User * u) get_mlock_modes(ci, 1)); } - - if ((ci->flags & CI_NO_EXPIRE) && show_all) { - notice_lang(s_ChanServ, u, CHAN_INFO_NO_EXPIRE); - } else { - if (is_servadmin) { - expt = ci->last_used + CSExpire; - tm = localtime(&expt); - strftime_lang(buf, sizeof(buf), u, - STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_ChanServ, u, CHAN_INFO_EXPIRE, buf); + if (show_all) { + if (ci->flags & CI_NO_EXPIRE) { + notice_lang(s_ChanServ, u, CHAN_INFO_NO_EXPIRE); + } else { + if (is_servadmin) { + expt = ci->last_used + CSExpire; + tm = localtime(&expt); + strftime_lang(buf, sizeof(buf), u, + STRFTIME_DATE_TIME_FORMAT, tm); + notice_lang(s_ChanServ, u, CHAN_INFO_EXPIRE, buf); + } } } - if (ci->flags & CI_SUSPENDED) { notice_lang(s_ChanServ, u, CHAN_X_SUSPENDED, ci->forbidby, (ci->forbidreason ? ci-> diff --git a/src/nickserv.c b/src/nickserv.c index 57973387d..8e3974ef8 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -2486,6 +2486,8 @@ static int do_identify(User * u) } } else if (na->status & NS_VERBOTEN) { notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + } else if (nick_identified(u)) { + notice_lang(s_NickServ, u, NICK_ALREADY_IDENTIFIED); } else if (!(res = check_password(pass, na->nc->pass))) { alog("%s: Failed IDENTIFY for %s!%s@%s", s_NickServ, u->nick, u->username, common_get_vhost(u)); @@ -2493,8 +2495,6 @@ static int do_identify(User * u) bad_password(u); } else if (res == -1) { notice_lang(s_NickServ, u, NICK_IDENTIFY_FAILED); - } else if (nick_identified(u)) { - notice_lang(s_NickServ, u, NICK_ALREADY_IDENTIFIED); } else { if (!(na->status & NS_IDENTIFIED) && !(na->status & NS_RECOGNIZED)) { if (na->last_usermask) |