From 39dd4ecc8b4a2b3b98a7ffe7056ae64240b22d56 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 11 May 2014 17:39:37 -0400
Subject: [PATCH] - Added functions client_get_emailcontact and client_login_get to remote api. - Add option to _get functions of the remote-api to return all records when primaryID = -1 - Fixed permission problem in _get functions of remote api. - Fixed typo in german dashboard language file.
---
install/lib/install.lib.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 5a2737a..379ae78 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -836,20 +836,20 @@
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 @@
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();
}
--
Gitblit v1.9.1