[Phpbb-checkins] CVS: phpBB2/admin admin_db_utilities.php,1.37,1.38 admin_users.php,1.48,1.49

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

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

Modified Files:
	admin_db_utilities.php admin_users.php 
Log Message:
Ok one last attempt on my part to fix file upload bugs.. Might actually work (Hey it could happen, even I get one right occasionally)


Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** admin_db_utilities.php	6 Mar 2002 21:23:51 -0000	1.37
--- admin_db_utilities.php	12 Mar 2002 21:11:59 -0000	1.38
***************
*** 33,37 ****
  	$filename = basename(__FILE__);
  	$module['General']['Backup_DB'] = $filename . "?perform=backup";
! 	$file_uploads = get_cfg_var('file_uploads');
  	if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (phpversion() != '4.0.4pl1') )
  	{
--- 33,44 ----
  	$filename = basename(__FILE__);
  	$module['General']['Backup_DB'] = $filename . "?perform=backup";
! 	if(phpversion() >= '4.0.0')
! 	{	
! 		$file_uploads = ini_get('file_uploads');
! 	}
! 	else
! 	{
! 		$file_uploads = get_cfg_var('file_uploads');
! 	}
  	if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (phpversion() != '4.0.4pl1') )
  	{

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** admin_users.php	6 Mar 2002 21:23:51 -0000	1.48
--- admin_users.php	12 Mar 2002 21:12:00 -0000	1.49
***************
*** 984,988 ****
  		// us from doing file uploads....
  		//
! 		$file_uploads = get_cfg_var('file_uploads');
  		if( ($file_uploads == 0 && !empty($file_uploads)) || (strtolower($file_uploads) == 'off') || (phpversion() == '4.0.4pl1') ||  (!$board_config['allow_avatar_upload']) )
  		{
--- 984,995 ----
  		// us from doing file uploads....
  		//
! 		if(phpversion() >= '4.0.0')
! 		{
! 			$file_uploads = ini_get('file_uploads');
! 		}
! 		else
! 		{
! 			$file_uploads = get_cfg_var('file_uploads');
! 		}
  		if( ($file_uploads == 0 && !empty($file_uploads)) || (strtolower($file_uploads) == 'off') || (phpversion() == '4.0.4pl1') ||  (!$board_config['allow_avatar_upload']) )
  		{