[Phpbb-checkins] CVS: phpBB2/admin admin_db_utilities.php,1.35,1.36 admin_board.php,1.47,1.48 admin_users.php,1.45,1.46

[Jonathan H. <the...@us...>]

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

Modified Files:
	admin_db_utilities.php admin_board.php admin_users.php 
Log Message:
Workarounds for file_uploads disabled...


Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** admin_db_utilities.php	15 Feb 2002 21:38:57 -0000	1.35
--- admin_db_utilities.php	1 Mar 2002 17:40:20 -0000	1.36
***************
*** 33,37 ****
  	$filename = basename(__FILE__);
  	$module['General']['Backup_DB'] = $filename . "?perform=backup";
! 	$module['General']['Restore_DB'] = $filename . "?perform=restore";
  
  	return;
--- 33,40 ----
  	$filename = basename(__FILE__);
  	$module['General']['Backup_DB'] = $filename . "?perform=backup";
! 	if( (get_cfg_var('file_uploads') != 0) && (strtolower(get_cfg_var('file_uploads')) != 'off') && (phpversion() != '4.0.4pl1') )
! 	{
! 		$module['General']['Restore_DB'] = $filename . "?perform=restore";
! 	}
  
  	return;
***************
*** 732,736 ****
  					"body" => "admin/db_utils_backup_body.tpl")
  				);
! 
  				$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";
  
--- 735,739 ----
  					"body" => "admin/db_utils_backup_body.tpl")
  				);
! 				
  				$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";
  

Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** admin_board.php	17 Feb 2002 16:10:41 -0000	1.47
--- admin_board.php	1 Mar 2002 17:40:21 -0000	1.48
***************
*** 124,127 ****
--- 124,136 ----
  );
  //
+ // Check to see if file uploads are possible before displaying 
+ // avatar upload option.
+ //
+ if( (get_cfg_var('file_uploads') != 0) && (strtolower(get_cfg_var('file_uploads')) != 'off') && (phpversion() != '4.0.4pl1') )
+ {
+ 	$template->assign_block_vars('switch_uploads_possible', array());
+ }
+ 
+ //
  // Escape any quotes in the site description for proper display in the text
  // box on the admin page 

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** admin_users.php	14 Feb 2002 16:09:09 -0000	1.45
--- admin_users.php	1 Mar 2002 17:40:21 -0000	1.46
***************
*** 128,131 ****
--- 128,132 ----
  // Begin program
  //
+ 
  if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) ) )
  {
***************
*** 978,982 ****
  			"body" => "admin/user_edit_body.tpl")
  		);
! 
  		$template->assign_vars(array(
  			"USERNAME" => $username,
--- 979,995 ----
  			"body" => "admin/user_edit_body.tpl")
  		);
! 		
! 		//
! 		// Let's do an overall check for settings/versions which would prevent
! 		// us from doing file uploads....
! 		//
! 		if( (get_cfg_var('file_uploads') == 0) || (strtolower(get_cfg_var('file_uploads')) == 'off') || (phpversion() == '4.0.4pl1') ||  (!$board_config['allow_avatar_upload']) )
! 		{
! 			$form_enctype = '';
! 		}
! 		else
! 		{
! 			$form_enctype = 'enctype="multipart/form-data"';
! 		}
  		$template->assign_vars(array(
  			"USERNAME" => $username,
***************
*** 1078,1081 ****
--- 1091,1095 ----
  			"L_CONFIRM" => $lang['Confirm'],
  			"L_EMAIL_ADDRESS" => $lang['Email_address'],
+ 			"S_FORM_ENCTYPE" => $form_enctype,
  
  			"HTML_STATUS" => $html_status,
***************
*** 1145,1147 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 1159,1161 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>