From 338831dec1ce98ec5f7762b8fe01d775cfe3a0a2 Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 23 Aug 2009 08:45:52 +0000 Subject: * enable nuser>30 condition again, because even on Ptt, many boards are below 30. git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4763 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/bbs.c | 6 +++--- mbbsd/read.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mbbsd') diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index 43b32a2d..07d46c86 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -760,7 +760,7 @@ do_deleteCrossPost(const fileheader_t *fh, char bname[]) if( (i=getindex(bdir, &newfh, 0))>0) { #ifdef SAFE_ARTICLE_DELETE - if(bp && !(currmode & MODE_DIGEST)) + if(bp && !(currmode & MODE_DIGEST) && bp->nuser > 30 ) safe_article_delete(i, &newfh, bdir, NULL); else #endif @@ -2885,7 +2885,7 @@ del_range(int ent, const fileheader_t *fhdr, const char *direct) outmsg("處理中,請稍後..."); refresh(); #ifdef SAFE_ARTICLE_DELETE - if(bp && !(currmode & MODE_DIGEST)) + if(bp && !(currmode & MODE_DIGEST) && bp->nuser > 30) ret = safe_article_delete_range(direct, inum1, inum2); else #endif @@ -3025,7 +3025,7 @@ del_post(int ent, fileheader_t * fhdr, char *direct) if (genbuf[0] == 'y') { if( #ifdef SAFE_ARTICLE_DELETE - (!(currmode & MODE_DIGEST) && + ((reason[0] || bp->nuser > 30) && !(currmode & MODE_DIGEST) && !safe_article_delete(ent, fhdr, direct, reason[0] ? reason : NULL)) || #endif // XXX TODO delete_record is really really dangerous - diff --git a/mbbsd/read.c b/mbbsd/read.c index 4d73dcd9..4dca75c4 100644 --- a/mbbsd/read.c +++ b/mbbsd/read.c @@ -187,7 +187,7 @@ TagPruner(int bid) if (vans("刪除所有標記[N]?") != 'y') return READ_REDRAW; #ifdef SAFE_ARTICLE_DELETE - if(bp && !(currmode & MODE_DIGEST)) + if(bp && !(currmode & MODE_DIGEST) && bp->nuser > 30) safe_delete_range(currdirect, 0, 0); else #endif -- cgit v1.2.3