extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

several fixes around jpgraph:

Browse Source 
- fixed wrongly reported jpgraph path "/jpgraph", if open_basedir is active and parent of EGroupware dir not accessible
- detect if jpgraph.php is direct in jpraph directory or in src subdirectory
- allow to specifiy arbitrary jpgraph path via defining EGW_JPGRAPH_PATH (eg. in header.inc.php)
--> should fix most jpgraph related issues
This commit is contained in:
Ralf Becker 2010-09-25 07:38:27 +00:00
parent 79bcb9e0fe
commit 83a9c7253c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup/check_install.php
View File

@ -9,7 +9,6 @@
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
$run_by_webserver = !!$_SERVER['PHP_SELF']; $run_by_webserver = !!$_SERVER['PHP_SELF'];
$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN'; $is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
@ -44,6 +43,7 @@ else
return is_null($arg1) ? $msg : str_replace(array('%1','%2','%3','%4'),array($arg1,$arg2,$arg3,$arg4),$msg); return is_null($arg1) ? $msg : str_replace(array('%1','%2','%3','%4'),array($arg1,$arg2,$arg3,$arg4),$msg);
} }
} }
$checks = array( $checks = array(
'phpversion' => array( 'phpversion' => array(
'func' => 'php_version', 'func' => 'php_version',
@ -270,7 +270,7 @@ foreach($setup_info as $app => $app_data)
} }
} }
$sorted_checks = array(); $sorted_checks = array();
foreach(array('php_version','php_ini_check','extension_check','pear_check','gd_check','permission_check','jpgraph_check') as $func) foreach(array('php_version','php_ini_check','extension_check','pear_check','gd_check','permission_check') as $func)
{ {
foreach($checks as $name => $data) foreach($checks as $name => $data)
{ {
@ -742,13 +742,17 @@ function jpgraph_check($name,array $args)
global $passed_icon, $error_icon, $warning_icon; global $passed_icon, $error_icon, $warning_icon;
$egw_path = defined(EGW_SERVER_ROOT) ? EGW_SERVER_ROOT : dirname(dirname(__FILE__)); $egw_path = defined(EGW_SERVER_ROOT) ? EGW_SERVER_ROOT : dirname(dirname(__FILE__));
$jpgraph_path = realpath($egw_path.'/..').SEP.'jpgraph'; if (!($jpgraph_path = realpath($egw_path.'/..')))
{
$jpgraph_path = dirname($egw_path); // realpath can fail because eg. open_basedir does NOT include ..
}
$jpgraph_path .= SEP.'jpgraph';
$min_version = isset($args['min_version']) ? $args['min_version'] : '1.13'; $min_version = isset($args['min_version']) ? $args['min_version'] : '1.13';
$available = false; $available = false;
if (($check = file_exists($jpgraph_path) && is_dir($jpgraph_path)) && if (($check = file_exists($jpgraph_path) && is_dir($jpgraph_path)) &&
file_exists($jpgraph_path.'/src/jpgraph.php')) (file_exists($jpgraph_path.'/src/jpgraph.php') || file_exists($jpgraph_path.'/jpgraph.php')))
{ {
if (file_exists($jpgraph_path.'/VERSION') && preg_match('/Version: v([0-9.]+)/',file_get_contents($jpgraph_path.'/VERSION'),$matches)) if (file_exists($jpgraph_path.'/VERSION') && preg_match('/Version: v([0-9.]+)/',file_get_contents($jpgraph_path.'/VERSION'),$matches))
{ {