Messages flagged for deletion should not be considered unvalidated/moderated

src/sbbs3/chksmb.c

@@ -647,7 +647,7 @@ int main(int argc, char **argv)
 						printf("MSGERR: Flagged 'in transit'\n");
 					intransit++;
 				}
-				if((msg.hdr.attr&(MSG_MODERATED|MSG_VALIDATED)) == MSG_MODERATED) {
+				if((msg.hdr.attr&(MSG_MODERATED|MSG_VALIDATED|MSG_DELETE)) == MSG_MODERATED) {
 					fprintf(stderr,"%sUnvalidated\n",beep);
 					msgerr=TRUE;
 					if(extinfo)

src/sbbs3/js_msgbase.c

@@ -1624,8 +1624,8 @@ static JSBool js_get_msg_header_resolve(JSContext *cx, JSObject *obj, jsid id)
 					break;
 			}
 
-			if((p->msg.idx.attr&MSG_MODERATED) && !(p->msg.idx.attr&MSG_VALIDATED)
-				&& (!is_user_subop(scfg, p->p->smb.subnum, user, client)))
+			if((p->msg.idx.attr&(MSG_MODERATED | MSG_VALIDATED | MSG_DELETE)) == MSG_MODERATED
+				&& !is_user_subop(scfg, p->p->smb.subnum, user, client))
 				break;
 
 			if(((p->p->smb.status.attr & SMB_EMAIL) == 0) && (p->msg.idx.attr&MSG_PRIVATE)) {

src/sbbs3/readmsgs.cpp

@@ -163,7 +163,7 @@ post_t * sbbs_t::loadposts(uint32_t *posts, int subnum, uint ptr, int mode, uint
 				continue; 
 		}
 
-		if(idx.attr&MSG_MODERATED && !(idx.attr&MSG_VALIDATED)) {
+		if((idx.attr&(MSG_MODERATED | MSG_VALIDATED | MSG_DELETE)) == MSG_MODERATED) {
 			if(mode&LP_REP || !sub_op(subnum))
 				break;
 		}
@@ -273,7 +273,7 @@ post_t * sbbs_t::loadposts(uint32_t *posts, int subnum, uint ptr, int mode, uint
 				continue; 
 		}
 
-		if(idx.attr&MSG_MODERATED && !(idx.attr&MSG_VALIDATED)) {
+		if((idx.attr&(MSG_MODERATED | MSG_VALIDATED | MSG_DELETE)) == MSG_MODERATED) {
 			if(unvalidated_num && *unvalidated_num > l)
 				*unvalidated_num=l;
 		}
@@ -710,8 +710,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find)
 				subscan[subnum].ptr=post[smb.curmsg].idx.number; 
 			} 
 
-			if(sub_op(subnum) && (msg.hdr.attr&(MSG_MODERATED|MSG_VALIDATED)) == MSG_MODERATED
-				&& !(msg.hdr.attr & MSG_DELETE)) {
+			if(sub_op(subnum) && (msg.hdr.attr&(MSG_MODERATED|MSG_VALIDATED|MSG_DELETE)) == MSG_MODERATED) {
 				uint16_t msg_attr = msg.hdr.attr;
 				SAFEPRINTF2(str,text[ValidatePostQ],smb.curmsg+1,msghdr_field(&msg, msg.subj));
 				if(!noyes(str))