diff options
| author | trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-10-16 05:36:26 +0000 |
|---|---|---|
| committer | trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-10-16 05:36:26 +0000 |
| commit | 659525324ba4d9d5643ef982936b6d1a9763e5ba (patch) | |
| tree | 4c7724f8f85933c9d849723715087ae89d10e6b3 | |
| parent | ec2b8ac54923878349b76ffa72f9f1e6184e8a70 (diff) | |
BUILD : 1.7.5 (402) BUGS : N/A NOTES : Forgot to get chanserv.c and nickserv.c in the last commit
git-svn-id: svn://svn.anope.org/anope/trunk@402 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@266 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | src/chanserv.c | 22 | ||||
| -rw-r--r-- | src/nickserv.c | 4 | ||||
| -rw-r--r-- | version.log | 6 |
3 files changed, 18 insertions, 14 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) diff --git a/version.log b/version.log index 9b163f49a..30391fcd3 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="5" -VERSION_BUILD="401" +VERSION_BUILD="402" # $Log$ # +# BUILD : 1.7.5 (402) +# BUGS : N/A +# NOTES : Forgot to get chanserv.c and nickserv.c in the last commit +# # BUILD : 1.7.5 (401) # BUGS : 147, 179, 181, 183, 184, 186 # NOTES : Lots of little fixes, should fix OS JUPE issues |