From 7b58c08bb62ec632c1c5aae32f818bedeac4f206 Mon Sep 17 00:00:00 2001 From: ptt Date: Fri, 14 May 2004 14:32:49 +0000 Subject: 1.add [BC] when broadcasting message 2.change default of recommend git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1981 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/bbs.c | 21 +++++++++------------ mbbsd/talk.c | 5 +++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index b20b6267..06bed32e 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -1526,22 +1526,19 @@ recommend(int ent, fileheader_t * fhdr, char *direct) } setdirpath(path, direct, fhdr->filename); - type = vmsg_lines(b_lines-2, "您要對這篇文章 1.推薦 2.噓聲 3.加註 [3]?") - '1'; - if(type > 2 || type < 0) type = 2; + type = vmsg_lines(b_lines-2, "您要對這篇文章 1.推薦 2.噓聲 [1]?") - '1'; - if (type < 2) - { - if (fhdr->recommend == 0 && strcmp(cuser.userid, fhdr->owner) == 0){ - vmsg("警告! 本人不能推薦或噓第一次!"); - return FULLUPDATE; + if (fhdr->recommend == 0 && strcmp(cuser.userid, fhdr->owner) == 0){ + vmsg("本人不能推薦或噓第一次! 自動改以加註方式不計分."); + type = 2; } #ifndef DEBUG - if (!(currmode & MODE_BOARD)&& now - lastrecommend < 40) { - vmsg("離上次時間太近囉, 請多花點時間仔細閱\讀文章!"); - return FULLUPDATE; - } + if (!(currmode & MODE_BOARD)&& now - lastrecommend < 40) { + vmsg("時間太近, 請仔細閱\讀文章! 自動改以加註方式不計分."); + type = 2; + } #endif - } + if(type > 1 || type < 0) type = 0; if (!getdata(b_lines - 2, 0, "要說的話:", path, 40, DOECHO) || path == NULL || getans("確定要\033[%s\033[m嗎? 請仔細考慮(Y/N)?[n]", ctype[type])!='y') diff --git a/mbbsd/talk.c b/mbbsd/talk.c index bea9480d..2fadd2de 100644 --- a/mbbsd/talk.c +++ b/mbbsd/talk.c @@ -2150,11 +2150,12 @@ userlist(void) case 'b': /* broadcast */ if (cuser.uflag & FRIEND_FLAG || HAS_PERM(PERM_SYSOP)) { - char genbuf[60]; + char genbuf[60]="[廣播]"; char ans[4]; - if (!getdata(0, 0, "廣播訊息:", genbuf, sizeof(genbuf), DOECHO)) + if (!getdata(0, 0, "廣播訊息:", genbuf+6, 54, DOECHO)) break; + if (getdata(0, 0, "確定廣播? [Y]", ans, sizeof(ans), LCECHO) && *ans == 'n') -- cgit v1.2.3