From 25acb1583b9a6b234a6d9c1ff223b4dba2dc900c Mon Sep 17 00:00:00 2001 From: rho Date: Wed, 7 Nov 2007 20:54:19 +0000 Subject: [PATCH] fix #136, annoying warnings when is enabled open_basedir or disabled url fopen Sign-off-by: Rolando Espinoza La Fuente git-svn-id: svn://svn.elgg.net/elgg/devel@1273 9cd68787-cb06-0410-8a26-e846cff1755a --- lib/elgglib.php | 4 ++-- mod/explodeping/lib.php | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/elgglib.php b/lib/elgglib.php index bb16439..cd15fb9 100644 --- a/lib/elgglib.php +++ b/lib/elgglib.php @@ -1265,10 +1265,10 @@ function get_performance_info() { // Grab the load average for the last minute // /proc will only work under some linux configurations // while uptime is there under MacOSX/Darwin and other unices - if (is_readable('/proc/loadavg') && $loadavg = @file('/proc/loadavg')) { + if (!ini_get('open_basedir') && is_readable('/proc/loadavg') && $loadavg = @file('/proc/loadavg')) { list($server_load) = explode(' ', $loadavg[0]); unset($loadavg); - } else if ( function_exists('is_executable') && is_executable('/usr/bin/uptime') && $loadavg = `/usr/bin/uptime` ) { + } else if (!ini_get('open_basedir') && function_exists('is_executable') && is_executable('/usr/bin/uptime') && $loadavg = `/usr/bin/uptime` ) { if (preg_match('/load averages?: (\d+[\.:]\d+)/', $loadavg, $matches)) { $server_load = $matches[1]; } else { diff --git a/mod/explodeping/lib.php b/mod/explodeping/lib.php index c548f43..ff5d242 100644 --- a/mod/explodeping/lib.php +++ b/mod/explodeping/lib.php @@ -20,6 +20,11 @@ */ function explodeping_init() { global $CFG, $messages; + + // FIXME: workaround to annoying warning when is enabled open_basedir + // restriction + if (ini_get('open_basedir') || !ini_get('allow_url_fopen')) { return;} + if (!$explodeservice = get_record('datalists', 'name', 'explodeservice')) { ini_set('default_socket_timeout', 20); -- 2.11.4.GIT