[mxbb-commits] core/install/includes functions_install.php, 1.21, 1.22

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/install/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv26211/install/includes

Modified Files:
	functions_install.php 
Log Message:
some updated for PHP 5.3.0 decapritated functions

Index: functions_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** functions_install.php	11 Oct 2010 23:00:13 -0000	1.21
--- functions_install.php	4 Mar 2011 09:30:27 -0000	1.22
***************
*** 17,21 ****
  function page_header_install($title, $instruction_text = '')
  {
! 	global $template, $lang, $mx_root_path, $mx_portal_name, $mx_portal_version, $tplEx;
  
  	$template->set_filenames(array('header' => 'mx_install_header.'.$tplEx));
--- 17,21 ----
  function page_header_install($title, $instruction_text = '')
  {
! 	global $template, $lang, $mx_root_path, $mx_portal_name, $mx_portal_version, $tplEx, $phpEx;
  
  	$template->set_filenames(array('header' => 'mx_install_header.'.$tplEx));
***************
*** 25,28 ****
--- 25,30 ----
  		'U_INSTALL_URL'			=> $mx_root_path . 'install/',
  		'L_INSTALLATION'		=> $title,
+ 		'U_INDEX'				=> $mx_root_path . 'install/mx_install.'.$phpEx,
+ 		'U_LOGO'				=> $mx_root_path . 'install/templates/logo.gif',		
  		'L_INSTRUCTION_TEXT'	=> $instruction_text,
  	));
***************
*** 229,233 ****
  		$available_dbms['ANY_DB_SUPPORT'] = $any_db_support;
  	}
! 	return $available_dbms;
  }
  
--- 231,235 ----
  		$available_dbms['ANY_DB_SUPPORT'] = $any_db_support;
  	}
! 	return $available_dbms;	
  }
  
***************
*** 646,650 ****
  	while ( $file = @readdir($dir) )
  	{
! 		if ( ereg("^lang_", $file) && !@is_file($dirname . '/' . $file) && !@is_link($dirname . '/' . $file) )
  		{
  			$filename = trim(str_replace('lang_', '', $file));
--- 648,652 ----
  	while ( $file = @readdir($dir) )
  	{
! 		if ( preg_match("#^lang_#", '', $file) && !@is_file($dirname . '/' . $file) && !@is_link($dirname . '/' . $file) )
  		{
  			$filename = trim(str_replace('lang_', '', $file));
***************
*** 905,909 ****
  }
  
- 
  //
  // Get the full phpBB URL by reading its config table.
--- 907,910 ----
***************
*** 1571,1576 ****
  // had documented the correct reason in their source code. ;-)
  //
! function mx_realpath($path)
  {
  	return ( @function_exists('realpath') && @realpath(__FILE__) ? realpath($path) : $path );
  }
--- 1572,1602 ----
  // had documented the correct reason in their source code. ;-)
  //
! function mx_realpath($path, $errstr = false)
  {
+ 	global $mx_root_path;
+ 	//set error handler if save mode
+ 	if ((int)@ini_get("safe_mode") !== 0)
+ 	{
+ 		//@set_error_handler("mx_realpath");
+ 		return $path;
+ 		
+ 	}
+ 	/*
+ 	if ($errstr)
+ 	{
+ 		$errpath = array();
+ 		if ($errpath = @explode("www/", __FILE__))
+ 		{
+ 			$dir = $errpath[0] . "www/";
+ 		}
+ 		else
+ 		{
+ 			@set_error_handler(false);
+ 			$dir = $mx_root_path;			
+ 		}
+ 		//die("$dir");		
+ 		return $dir;
+ 	}
+ 	*/
  	return ( @function_exists('realpath') && @realpath(__FILE__) ? realpath($path) : $path );
  }