[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.322,1.323 functions_privmsgs.php,1.16,1.17

[Meik S. <acy...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25436/includes

Modified Files:
	functions.php functions_privmsgs.php 
Log Message:
hidden fields adjustments

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.322
retrieving revision 1.323
diff -C2 -r1.322 -r1.323
*** functions.php	18 Aug 2005 12:48:39 -0000	1.322
--- functions.php	19 Aug 2005 10:55:29 -0000	1.323
***************
*** 1269,1275 ****
  	}
  
! 	$s_hidden_fields = '<input type="hidden" name="user_id" value="' . $user->data['user_id'] . '" />';
! 	$s_hidden_fields .= '<input type="hidden" name="sess" value="' . $user->session_id . '" />';
! 	$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $SID . '" />';
  
  	// generate activation key
--- 1269,1277 ----
  	}
  
! 	$s_hidden_fields = build_hidden_fields(array(
! 		'user_id'	=> $user->data['user_id'],
! 		'sess'		=> $user->session_id,
! 		'sid'		=> $SID)
! 	);
  
  	// generate activation key
***************
*** 1373,1378 ****
  	}
  
! 	$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $redirect . '" />';
! 	$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $SID . '" />';
  
  	$template->assign_vars(array(
--- 1375,1379 ----
  	}
  
! 	$s_hidden_fields = build_hidden_fields(array('redirect' => $redirect, 'sid' => $SID));
  
  	$template->assign_vars(array(

Index: functions_privmsgs.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_privmsgs.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** functions_privmsgs.php	15 May 2005 20:08:05 -0000	1.16
--- functions_privmsgs.php	19 Aug 2005 10:55:30 -0000	1.17
***************
*** 718,741 ****
  
  		case 'delete_marked':
- 			$hidden_fields = array('cur_folder_id' => $cur_folder_id, 'mark_option' => 'delete_marked', 'submit_mark' => true);
- 			$hidden_fields['marked_msg_id'] = $msg_ids;
- 			$s_hidden_fields = '';
  
- 			foreach ($hidden_fields as $key => $var)
- 			{
- 				if (is_array($var))
- 				{
- 					foreach ($var as $_key => $_var)
- 					{
- 						$s_hidden_fields .= '<input type="hidden" name="' . $key . '[' . $_key . ']" value="' . $_var . '" />';
- 					}
- 				}
- 				else
- 				{
- 					$s_hidden_fields .= '<input type="hidden" name="' . $key . '" value="' . $var . '" />';
- 				}
- 			}
- 			unset($hidden_fields);
- 			
  			if (confirm_box(true))
  			{
--- 718,722 ----
***************
*** 750,754 ****
  			else
  			{
! 				confirm_box(false, 'DELETE_MARKED_PM', $s_hidden_fields);
  			}
  
--- 731,742 ----
  			else
  			{
! 				$s_hidden_fields = array(
! 					'cur_folder_id'	=> $cur_folder_id, 
! 					'mark_option'	=> 'delete_marked',
! 					'submit_mark'	=> true,
! 					'marked_msg_id'	=> $msg_ids
! 				);
! 
! 				confirm_box(false, 'DELETE_MARKED_PM', build_hidden_fields($s_hidden_fields));
  			}