- fixed open_basedir issues, fixes #227

This commit is contained in:
Michael Kaufmann (d00p)
2010-05-12 06:52:11 +00:00
parent a5cf1a0ac9
commit 65e0962111
8 changed files with 104 additions and 24 deletions

View File

@@ -270,23 +270,17 @@ class apache
if($domain['openbasedir'] == '1')
{
if($this->settings['system']['phpappendopenbasedir'] != '')
if($domain['openbasedir_path'] == '1' || strstr($domain['documentroot'], ":") !== false)
{
$_phpappendopenbasedir = ':' . $this->settings['system']['phpappendopenbasedir'];
$_phpappendopenbasedir = appendOpenBasedirPath($domain['customerroot'], true);
}
else
{
$_phpappendopenbasedir = '';
}
if($domain['openbasedir_path'] == '1')
{
$php_options_text.= ' php_admin_value open_basedir "' . $domain['customerroot'] . $_phpappendopenbasedir . "\"\n";
}
else
{
$php_options_text.= ' php_admin_value open_basedir "' . $domain['documentroot'] . $_phpappendopenbasedir . "\"\n";
$_phpappendopenbasedir = appendOpenBasedirPath($domain['documentroot'], true);
}
$_phpappendopenbasedir .= appendOpenBasedirPath($this->settings['system']['phpappendopenbasedir']);
$php_options_text.= ' php_admin_value open_basedir "' . $_phpappendopenbasedir . '"'."\n";
}
if($domain['safemode'] == '0')