From eccd040318ae657b24aeb983e613c1b38cd34e45 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sat, 05 Apr 2014 08:02:51 -0400
Subject: [PATCH] Fixed: FS#3067 - open_basedir in vhost subdomain can not be changed
---
install/lib/install.lib.php | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index addd6cd..379ae78 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -830,29 +830,55 @@
}
function getapacheversion($get_minor = false) {
- global $app;
-
- $cmd = '';
- 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);
- 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);
- 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);
- return '2.2';
+ global $app;
+
+ $cmd = '';
+ if(is_installed('apache2ctl')) $cmd = 'apache2ctl -v';
+ elseif(is_installed('apachectl')) $cmd = 'apachectl -v';
+ else {
+ ilog("Could not check apache version, apachectl not found.");
+ return '2.2';
+ }
+
+ exec($cmd, $output, $return_var);
+ if($return_var != 0 || !$output[0]) {
+ 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 {
+ ilog("Could not check apache version, did not find version string in apachectl output.");
+ return '2.2';
+ }
+}
+
+function getapachemodules() {
+ global $app;
+
+ $cmd = '';
+ if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
+ elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
+ else {
+ 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]) {
+ ilog("Could not check apache modules, apachectl did not return any data.");
+ return array();
+ }
+
+ $modules = array();
+ for($i = 0; $i < count($output); $i++) {
+ if(preg_match('/^\s*(\w+)\s+\((shared|static)\)\s*$/', $output[$i], $matches)) {
+ $modules[] = $matches[1];
}
}
-
+
+ return $modules;
+}
?>
--
Gitblit v1.9.1