diff options
| author | ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-05-02 23:11:32 +0800 |
|---|---|---|
| committer | ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-05-02 23:11:32 +0800 |
| commit | 79890093f845d2c70ffec2e0699700380e623cd8 (patch) | |
| tree | b76370f72f8082571ae9ddd043757de3ff44adfb | |
| parent | 1bd5e9b55a1998899e6569b72fd3a6388b952f09 (diff) | |
| download | pttbbs-79890093f845d2c70ffec2e0699700380e623cd8.tar pttbbs-79890093f845d2c70ffec2e0699700380e623cd8.tar.gz pttbbs-79890093f845d2c70ffec2e0699700380e623cd8.tar.bz2 pttbbs-79890093f845d2c70ffec2e0699700380e623cd8.tar.lz pttbbs-79890093f845d2c70ffec2e0699700380e623cd8.tar.xz pttbbs-79890093f845d2c70ffec2e0699700380e623cd8.tar.zst pttbbs-79890093f845d2c70ffec2e0699700380e623cd8.zip | |
safe_delete won't happen when mode_digest
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1918 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | include/proto.h | 2 | ||||
| -rw-r--r-- | mbbsd/bbs.c | 5 | ||||
| -rw-r--r-- | mbbsd/read.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/proto.h b/include/proto.h index 9c9267fc..e9b46dc9 100644 --- a/include/proto.h +++ b/include/proto.h @@ -101,7 +101,7 @@ void brc_addlist(const char* fname); #define moneyof(uid) SHM->money[uid - 1] #define getbtotal(bid) SHM->total[bid - 1] #define getbottomtotal(bid) SHM->n_bottom[bid-1] - +void sort_bcache(void); int getuser(char *userid); void setuserid(int num, char *userid); int searchuser(char *userid); diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index a65e8a20..33bf74cd 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -1618,7 +1618,7 @@ del_range(int ent, fileheader_t *fhdr, char *direct) outmsg("處理中,請稍後..."); refresh(); #ifdef SAFE_ARTICLE_DELETE - if(bp && bp->nuser > 20 ) + if(bp && !(currmode & MODE_DIGEST) && bp->nuser > 20 ) safe_article_delete_range(direct, inum1, inum2); else delete_range(direct, inum1, inum2); @@ -1666,7 +1666,8 @@ del_post(int ent, fileheader_t * fhdr, char *direct) if (genbuf[0] == 'y') { if( #ifdef SAFE_ARTICLE_DELETE - (bp->nuser>20 && !safe_article_delete(ent, fhdr, direct)) || + (bp->nuser>20 && !(currmode & MODE_DIGEST) && + !safe_article_delete(ent, fhdr, direct)) || #endif !delete_record(direct, sizeof(fileheader_t), ent) ) { diff --git a/mbbsd/read.c b/mbbsd/read.c index ce6205cd..c2c33111 100644 --- a/mbbsd/read.c +++ b/mbbsd/read.c @@ -171,7 +171,7 @@ TagPruner(int bid) if (getans("刪除所有標記[N]?") != 'y') return READ_REDRAW; #ifdef SAFE_ARTICLE_DELETE - if(bp && bp->nuser>20) + if(bp && !(currmode & MODE_DIGEST) && bp->nuser>20 ) safe_delete_range(currdirect, 0, 0); else #endif |