From 73e7a692a99655b3efbda1e3cd44c25cd1dff535 Mon Sep 17 00:00:00 2001 From: piaip Date: Fri, 21 Oct 2011 09:28:12 +0000 Subject: always use current username for forward author git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5444 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- pttbbs/mbbsd/bbs.c | 15 ++------------- pttbbs/mbbsd/mail.c | 14 +------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c index c867b52e..0ad53058 100644 --- a/pttbbs/mbbsd/bbs.c +++ b/pttbbs/mbbsd/bbs.c @@ -1921,7 +1921,7 @@ cross_post(int ent, fileheader_t * fhdr, const char *direct) char genbuf[200], genbuf2[4]; fileheader_t xfile; FILE *xptr; - int author, xbid, hashPost; + int xbid, hashPost; boardheader_t *bp, *xbp; assert(0<=currbid-1 && currbid-1title, str_forward, xtitle, sizeof(xtitle)); // FIXME 這裡可能會有人偷偷生出保留標題(如[公告]) // 不過算了，直接劣退這種人比較方便 @@ -2068,10 +2060,7 @@ cross_post(int ent, fileheader_t * fhdr, const char *direct) currmode = 0; setbpath(xfpath, xboard); stampfile(xfpath, &xfile); - if (author) - strlcpy(xfile.owner, fhdr->owner, sizeof(xfile.owner)); - else - strlcpy(xfile.owner, cuser.userid, sizeof(xfile.owner)); + strlcpy(xfile.owner, cuser.userid, sizeof(xfile.owner)); strlcpy(xfile.title, xtitle, sizeof(xfile.title)); if (genbuf[0] == 'l') { xfile.filemode = FILE_LOCAL; diff --git a/pttbbs/mbbsd/mail.c b/pttbbs/mbbsd/mail.c index bbc7e40d..977fbf60 100644 --- a/pttbbs/mbbsd/mail.c +++ b/pttbbs/mbbsd/mail.c @@ -1509,7 +1509,6 @@ mail_cross_post(int unused_arg, fileheader_t * fhdr, const char *direct) char xboard[20], fname[80], xfpath[80], xtitle[80]; fileheader_t xfile; FILE *xptr; - int author = 0; char genbuf[200]; char genbuf2[4]; int xbid, ans; @@ -1579,14 +1578,6 @@ mail_cross_post(int unused_arg, fileheader_t * fhdr, const char *direct) return READ_REDRAW; #endif - // TODO reuse the code in bbs.c cross_post - author = 0; - if (HasUserPerm(PERM_SYSOP)) { - char ans[4]; - getdata(2, 0, "保留原作者名稱嗎?[y/N] ", ans, 3, LCECHO); - if (ans[0] == 'y') - author = '1'; - } do_reply_title(2, fhdr->title, str_forward, xtitle, sizeof(xtitle)); strip_ansi(xtitle, xtitle, STRIP_ALL); @@ -1597,10 +1588,7 @@ mail_cross_post(int unused_arg, fileheader_t * fhdr, const char *direct) currmode = 0; setbpath(xfpath, xboard); stampfile(xfpath, &xfile); - if (author) - strlcpy(xfile.owner, fhdr->owner, sizeof(xfile.owner)); - else - strlcpy(xfile.owner, cuser.userid, sizeof(xfile.owner)); + strlcpy(xfile.owner, cuser.userid, sizeof(xfile.owner)); strlcpy(xfile.title, xtitle, sizeof(xfile.title)); if (genbuf[0] == 'l') { xfile.filemode = FILE_LOCAL; -- cgit v1.2.3