[telaen-cvs] telaen process.php,1.13,1.14

[Jim J. <ji...@us...>]

Update of /cvsroot/telaen/telaen
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21826

Modified Files:
	process.php 
Log Message:
We only expunge when we move/delete.


Index: process.php
===================================================================
RCS file: /cvsroot/telaen/telaen/process.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** process.php	13 Apr 2006 15:22:16 -0000	1.13
--- process.php	30 Aug 2006 15:04:51 -0000	1.14
***************
*** 69,77 ****
  				 * Fill the deleted mails into an array. We rebuild the
  				 * internal list later.
! 				 */	
! 				$expunge = true;			
! 				$delarray[$i]["del"] = 1;
! 				$deletecount++;
! 				
  			} else
  				$delarray[$i]["del"] = 0;
--- 69,81 ----
  				 * Fill the deleted mails into an array. We rebuild the
  				 * internal list later.
! 				 */
! 				if ($decision == "delete" || $decision == "move") {
!         				$expunge = true;			
!         				$delarray[$i]["del"] = 1;
!         				$deletecount++;
! 				        
! 				} else {
! 				        $delarray[$i]["del"] = 0;
! 				}
  			} else
  				$delarray[$i]["del"] = 0;
***************
*** 114,123 ****
  
  			
- 			/**
- 			*  Skip these if we have mark/unmark operation on msg list 
- 			*/
  			$num = 20;
  			
! 			if ($decision != "mark" && $decision != "unmark" && ($messagecount > $num || (count($delarray) - $deletecount > $num))) {
  
  				/*
--- 118,124 ----
  
  			
  			$num = 20;
  			
! 			if ($messagecount > $num || (count($delarray) - $deletecount > $num)) {
  
  				/*