Merge branch '0_9_34' of github.com:Froxlor/Froxlor into 0_9_34

This commit is contained in:
Roman Schmerold (BNoiZe)
2015-06-10 16:26:49 +02:00

View File

@@ -392,8 +392,16 @@ class apache {
if ($domain['phpenabled'] == '1') {
// This vHost has PHP enabled and we are using the regular mod_php
if ($domain['openbasedir'] == '1') {
$_phpappendopenbasedir = appendOpenBasedirPath($domain['customerroot'], true);
if ($domain['openbasedir'] == '1')
{
if ($domain['openbasedir_path'] == '1' || strstr($domain['documentroot'], ":") !== false)
{
$_phpappendopenbasedir = appendOpenBasedirPath($domain['customerroot'], true);
}
else
{
$_phpappendopenbasedir = appendOpenBasedirPath($domain['documentroot'], true);
}
$_custom_openbasedir = explode(':', Settings::Get('system.phpappendopenbasedir'));
foreach ($_custom_openbasedir as $cobd) {