cvs: pear /LiveUser LiveUser.php

lsmith Sat Aug 19 15:23:41 2006 UTC Modified files: /pear/LiveUser LiveUser.php Log: - check if safe_mode is enabled in fileExists() to determine what algo to use (Bug #8296) http://cvs.php.net/viewvc.cgi/pear/LiveUser/LiveUser.php?r1=1.166&r2=1.167&diff_format=u Index: pear/LiveUser/LiveUser.php diff -u pear/LiveUser/LiveUser.php:1.166 pear/LiveUser/LiveUser.php:1.167 --- pear/LiveUser/LiveUser.php:1.166 Tue Aug 15 06:43:20 2006 +++ pear/LiveUser/LiveUser.php Sat Aug 19 15:23:41 2006 @@ -40,7 +40,7 @@ * @author Bjoern Kraus <krausbn@php.net> * @copyright 2002-2006 Markus Wolff * @license http://www.gnu.org/licenses/lgpl.txt - * @version CVS: $Id: LiveUser.php,v 1.166 2006/08/15 06:43:20 mahono Exp $ + * @version CVS: $Id: LiveUser.php,v 1.167 2006/08/19 15:23:41 lsmith Exp $ * @link http://pear.php.net/LiveUser */ @@ -685,12 +685,22 @@ * * @access public */ - function fileExists($filename) + function fileExists($file) { - $fp = @fopen($filename, 'r', true); - if (is_resource($fp)) { - @fclose($fp); - return true; + // safe_mode does notwork with is_readable() + if (ini_get('safe_mode')) { + $fp = @fopen($file, 'r', true); + if (is_resource($fp)) { + @fclose($fp); + return true; + } + } else { + $dirs = explode(PATH_SEPARATOR, ini_get('include_path')); + foreach ($dirs as $dir) { + if (is_readable($dir . DIRECTORY_SEPARATOR . $file)) { + return true; + } + } } return false; }