phpbb-php5mod-cvs-checkins

[Josh <jel...@us...>]

Update of /cvsroot/phpbb-php5mod/phpbb-php5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21914

Modified Files:
	privmsg.php viewtopic.php 
Log Message:
2.0.17.5

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/privmsg.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** privmsg.php	8 May 2005 02:12:43 -0000	1.5
--- privmsg.php	19 Jul 2005 23:31:26 -0000	1.6
***************
*** 699,743 ****
  	else if ( $confirm )
  	{
! 		if ( $delete_all )
  		{
! 			switch($folder)
  			{
! 				case 'inbox':
! 					$delete_type = "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
  					privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
! 					break;
  
! 				case 'outbox':
! 					$delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
! 					break;
  
! 				case 'sentbox':
! 					$delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL;
! 					break;
  
! 				case 'savebox':
! 					$delete_type = "( ( privmsgs_from_userid = " . $userdata['user_id'] . " 
! 						AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) 
! 					OR ( privmsgs_to_userid = " . $userdata['user_id'] . " 
! 						AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )";
! 					break;
! 			}
  
! 			$sql = "SELECT privmsgs_id
! 				FROM " . PRIVMSGS_TABLE . "
! 				WHERE $delete_type";
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not obtain id list to delete all messages', '', __LINE__, __FILE__, $sql);
! 			}
  
! 			while ( $row = $db->sql_fetchrow($result) )
! 			{
! 				$mark_list[] = $row['privmsgs_id'];
! 			}
  
! 			unset($delete_type);
  		}
  
  		if ( count($mark_list) )
  		{
--- 699,753 ----
  	else if ( $confirm )
  	{
! 		$delete_sql_id = '';
! 
! 		if (!$delete_all)
  		{
! 			for ($i = 0; $i < count($mark_list); $i++)
  			{
! 				$delete_sql_id .= (($delete_sql_id != '') ? ', ' : '') . intval($mark_list[$i]);
! 			}
! 			$delete_sql_id = "AND privmsgs_id IN ($delete_sql_id)";
! 		}
! 
! 		switch($folder)
! 		{
! 			case 'inbox':
! 				$delete_type = "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
  					privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
! 				break;
  
! 			case 'outbox':
! 				$delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
! 				break;
  
! 			case 'sentbox':
! 				$delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL;
! 				break;
  
! 			case 'savebox':
! 				$delete_type = "( ( privmsgs_from_userid = " . $userdata['user_id'] . "
! 					AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " )
! 						OR ( privmsgs_to_userid = " . $userdata['user_id'] . "
! 					AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )";
! 				break;
! 		}
  
! 		$sql = "SELECT privmsgs_id
! 			FROM " . PRIVMSGS_TABLE . "
! 			WHERE $delete_type $delete_sql_id";
  
! 		if ( !($result = $db->sql_query($sql)) )
! 		{
! 			message_die(GENERAL_ERROR, 'Could not obtain id list to delete messages', '', __LINE__, __FILE__, $sql);
! 		}
  
! 		$mark_list = array();
! 		while ( $row = $db->sql_fetchrow($result) )
! 		{
! 			$mark_list[] = $row['privmsgs_id'];
  		}
  
+ 		unset($delete_type);
+ 
  		if ( count($mark_list) )
  		{
***************
*** 1494,1497 ****
--- 1504,1511 ----
  			}
  		}
+ 		else
+ 		{
+ 			$privmsg_message = $privmsg_subject = '';
+ 		}
  	}
  
***************
*** 2020,2023 ****
--- 2034,2041 ----
  	}
  }
+ else
+ {
+ 	$inbox_limit_img_length = $inbox_limit_pct = $l_box_size_status = '';
+ }
  
  //

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/viewtopic.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** viewtopic.php	27 Jun 2005 20:16:44 -0000	1.10
--- viewtopic.php	19 Jul 2005 23:31:26 -0000	1.11
***************
*** 990,995 ****
  
  	$temp_url = append_sid("search.$phpEx?search_author=" . urlencode($postrow[$i]['username']) . "&amp;showresults=posts");
! 	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
! 	$search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';
  
  	if ( ( $userdata['user_id'] == $poster_id && $is_auth['auth_edit'] ) || $is_auth['auth_mod'] )
--- 990,995 ----
  
  	$temp_url = append_sid("search.$phpEx?search_author=" . urlencode($postrow[$i]['username']) . "&amp;showresults=posts");
! 	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . sprintf($lang['Search_user_posts'], $postrow[$i]['username']) . '" border="0" /></a>';
! 	$search = '<a href="' . $temp_url . '">' . sprintf($lang['Search_user_posts'], $postrow[$i]['username']) . '</a>';
  
  	if ( ( $userdata['user_id'] == $poster_id && $is_auth['auth_edit'] ) || $is_auth['auth_mod'] )