From 4b75ea8ce582ea7b230124c3e9079c1eff883185 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Wed, 26 Mar 2014 10:38:04 +0100 Subject: [PATCH] Changed log functions in install.lib.php --- install/lib/install.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 5a2737a10..379ae786e 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -836,20 +836,20 @@ function getapacheversion($get_minor = false) { if(is_installed('apache2ctl')) $cmd = 'apache2ctl -v'; elseif(is_installed('apachectl')) $cmd = 'apachectl -v'; else { - $app->log("Could not check apache version, apachectl not found.", LOGLEVEL_WARN); + ilog("Could not check apache version, apachectl not found."); return '2.2'; } exec($cmd, $output, $return_var); if($return_var != 0 || !$output[0]) { - $app->log("Could not check apache version, apachectl did not return any data.", LOGLEVEL_WARN); + ilog("Could not check apache version, apachectl did not return any data."); return '2.2'; } if(preg_match('/version:\s*Apache\/(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) { return $matches[1] . (isset($matches[3]) ? '.' . $matches[3] : '') . (isset($matches[5]) && $get_minor == true ? '.' . $matches[5] : ''); } else { - $app->log("Could not check apache version, did not find version string in apachectl output.", LOGLEVEL_WARN); + ilog("Could not check apache version, did not find version string in apachectl output."); return '2.2'; } } @@ -861,13 +861,13 @@ function getapachemodules() { if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES'; elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES'; else { - $app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN); + ilog("Could not check apache modules, apachectl not found."); return array(); } exec($cmd . ' 2>/dev/null', $output, $return_var); if($return_var != 0 || !$output[0]) { - $app->log("Could not check apache modules, apachectl did not return any data.", LOGLEVEL_WARN); + ilog("Could not check apache modules, apachectl did not return any data."); return array(); } -- GitLab