summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2013-01-06 22:44:24 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2013-01-06 22:44:24 +0800
commit4681867e93000818c8ab32b4cd2669f97583fdda (patch)
treee89b449d830a022a7b15ab741b6e098df467251d
parentb88f5bcf5f23f6c84a87a7f6907b61b8de09c578 (diff)
downloadpttbbs-4681867e93000818c8ab32b4cd2669f97583fdda.tar
pttbbs-4681867e93000818c8ab32b4cd2669f97583fdda.tar.gz
pttbbs-4681867e93000818c8ab32b4cd2669f97583fdda.tar.bz2
pttbbs-4681867e93000818c8ab32b4cd2669f97583fdda.tar.lz
pttbbs-4681867e93000818c8ab32b4cd2669f97583fdda.tar.xz
pttbbs-4681867e93000818c8ab32b4cd2669f97583fdda.tar.zst
pttbbs-4681867e93000818c8ab32b4cd2669f97583fdda.zip
Enable fast check for angel song.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5760 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--pttbbs/mbbsd/angel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pttbbs/mbbsd/angel.c b/pttbbs/mbbsd/angel.c
index 6612b909..578de474 100644
--- a/pttbbs/mbbsd/angel.c
+++ b/pttbbs/mbbsd/angel.c
@@ -350,11 +350,6 @@ angel_order_song(char *receiver, size_t sz_receiver) {
if (!*cuser.myangel)
return NULL;
- // ensure if my angel is still valid.
- if (passwd_load_user(cuser.myangel, &udata) <= 0 ||
- !(udata.userlevel & PERM_ANGEL))
- return NULL;
-
#ifdef ANGEL_ORDER_SONG_DAY
// check day
{
@@ -365,6 +360,11 @@ angel_order_song(char *receiver, size_t sz_receiver) {
}
#endif
+ // ensure if my angel is still valid.
+ if (passwd_load_user(cuser.myangel, &udata) <= 0 ||
+ !(udata.userlevel & PERM_ANGEL))
+ return NULL;
+
angel_nick = angel_get_nick();
snprintf(prompt, sizeof(prompt), "要留言給你的%s小天使嗎? [y/N]: ",
angel_nick);