[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.67,1.68

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11579

Modified Files:
	privmsg.php 
Log Message:
Fix bug #496014 and fixed a problem with the Inbox size limit not being adhered to.

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** privmsg.php	2001/12/21 22:59:21	1.67
--- privmsg.php	2001/12/24 16:01:49	1.68
***************
*** 57,61 ****
  $mark_list = ( !empty($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : 0;
  
! $folder = ( !empty($HTTP_POST_VARS['folder']) ) ? $HTTP_POST_VARS['folder'] : ( (!empty($HTTP_GET_VARS['folder'])) ? $HTTP_GET_VARS['folder'] : "inbox" );
  
  //
--- 57,73 ----
  $mark_list = ( !empty($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : 0;
  
! if( isset($HTTP_POST_VARS['folder']) || isset($HTTP_GET_VARS['folder']) )
! {
! 	$folder = ( isset($HTTP_POST_VARS['folder']) ) ? $HTTP_POST_VARS['folder'] : $HTTP_GET_VARS['folder'];
! 
! 	if( $folder != "inbox" && $folder != "outbox" && $folder != "sentbox" && $folder != "savebox" )
! 	{
! 		$folder = "inbox";
! 	}
! }
! else
! {
! 	$folder = "inbox";
! }
  
  //
***************
*** 291,295 ****
  				$sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " 
  					WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . " 
! 						AND privmsgs_date <= " . $sent_info['oldest_post_time'] . " 
  						AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid'];
  				if( !$result = $db->sql_query($sql) )
--- 303,307 ----
  				$sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " 
  					WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . " 
! 						AND privmsgs_date = " . $sent_info['oldest_post_time'] . " 
  						AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid'];
  				if( !$result = $db->sql_query($sql) )
***************
*** 748,754 ****
  			$sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " 
  				WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . " 
! 						AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
! 					OR ( privmsgs_from_userid = " . $userdata['user_id'] . " 
! 						AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") ) 
  					AND privmsgs_date = " . $saved_info['oldest_post_time'];
  			if( !$result = $db->sql_query($sql) )
--- 760,766 ----
  			$sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " 
  				WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . " 
! 							AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
! 						OR ( privmsgs_from_userid = " . $userdata['user_id'] . " 
! 							AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") ) 
  					AND privmsgs_date = " . $saved_info['oldest_post_time'];
  			if( !$result = $db->sql_query($sql) )
***************
*** 968,972 ****
  				WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
  						OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " ) 
! 					AND privmsgs_from_userid = " . $to_userdata['user_id'];
  			if( !$result = $db->sql_query($sql) )
  			{
--- 980,984 ----
  				WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
  						OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " ) 
! 					AND privmsgs_to_userid = " . $to_userdata['user_id'];
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 983,987 ****
  				{
  					$sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " 
! 						WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
  							AND privmsgs_date = " . $inbox_info['oldest_post_time'] . " 
  							AND privmsgs_to_userid = " . $to_userdata['user_id'];
--- 995,1000 ----
  				{
  					$sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " 
! 						WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 								OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " ) 
  							AND privmsgs_date = " . $inbox_info['oldest_post_time'] . " 
  							AND privmsgs_to_userid = " . $to_userdata['user_id'];