From 17712d579d66d9ca51af5ad9c778742d484cdf93 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Fri, 25 Apr 2008 01:30:45 +0000
Subject: - fix safe del header rule: when deleteing 'already deleted' files,
 should not show current userid.

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4244 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/record.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mbbsd')

diff --git a/mbbsd/record.c b/mbbsd/record.c
index 2255f5e3..a5263e0e 100644
--- a/mbbsd/record.c
+++ b/mbbsd/record.c
@@ -386,16 +386,16 @@ delete_range(const char *fpath, int id1, int id2)
 void 
 set_safedel_fhdr(fileheader_t *fhdr)
 {
-    if (fhdr->filemode & FILE_ANONYMOUS)
+    if (fhdr->filemode & FILE_ANONYMOUS ||
+	!fhdr->owner[0] ||
+	(fhdr->owner[0] == '-' && fhdr->owner[1] == 0) )
     {
 	// not putting owner because we can't know
 	// if it is deleted by BM or owner.
 	snprintf(fhdr->title, sizeof(fhdr->title),
 		"%s", STR_SAFEDEL_TITLE);
-    } 
-    else if ( strcmp(fhdr->owner, cuser.userid) == 0 || 
-	!fhdr->owner[0] ||
-	(fhdr->owner[0] == '-' && fhdr->owner[1] == 0) )
+    }
+    else if ( strcmp(fhdr->owner, cuser.userid) == 0 )
     {
 	// i'm the one to delete it, or if the owner is corpse.
 	snprintf(fhdr->title, sizeof(fhdr->title),
-- 
cgit v1.2.3