maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- respect admins open_basedir path settings (if more than one path), fixes #238

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-05-18 11:48:58 +00:00
parent 2ce7e9728f
commit 264bc50451
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -278,8 +278,13 @@ class apache
{ {
$_phpappendopenbasedir = appendOpenBasedirPath($domain['documentroot'], true); $_phpappendopenbasedir = appendOpenBasedirPath($domain['documentroot'], true);
} }
$_phpappendopenbasedir .= appendOpenBasedirPath($this->settings['system']['phpappendopenbasedir']);
$_custom_openbasedir = explode(':', $this->settings['system']['phpappendopenbasedir']);
foreach($_custom_openbasedir as $cobd)
{
$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
}
$php_options_text.= ' php_admin_value open_basedir "' . $_phpappendopenbasedir . '"'."\n"; $php_options_text.= ' php_admin_value open_basedir "' . $_phpappendopenbasedir . '"'."\n";
} }

15
scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
View File

@@ -166,9 +166,20 @@ class apache_fcgid extends apache
if($domain['openbasedir'] == '1') if($domain['openbasedir'] == '1')
{ {
$openbasedirc = ''; $openbasedirc = '';
$_phpappendopenbasedir = appendOpenBasedirPath($this->settings['system']['mod_fcgid_peardir']); $_phpappendopenbasedir = '';
$_phpappendopenbasedir .= appendOpenBasedirPath($this->settings['system']['phpappendopenbasedir']);
$_custom_openbasedir = explode(':', $this->settings['system']['mod_fcgid_peardir']);
foreach($_custom_openbasedir as $cobd)
{
$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
}
$_custom_openbasedir = explode(':', $this->settings['system']['phpappendopenbasedir']);
foreach($_custom_openbasedir as $cobd)
{
$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
}
if($domain['openbasedir_path'] == '0' && strstr($domain['documentroot'], ":") === false) if($domain['openbasedir_path'] == '0' && strstr($domain['documentroot'], ":") === false)
{ {
$openbasedir = appendOpenBasedirPath($domain['documentroot'], true); $openbasedir = appendOpenBasedirPath($domain['documentroot'], true);

15
scripts/jobs/cron_tasks.inc.http.25.lighttpd_fcgid.php
View File

@@ -190,8 +190,19 @@ class lighttpd_fcgid extends lighttpd
if($domain['openbasedir'] == '1') if($domain['openbasedir'] == '1')
{ {
$openbasedirc = ''; $openbasedirc = '';
$_phpappendopenbasedir = appendOpenBasedirPath($this->settings['system']['mod_fcgid_peardir']); $_phpappendopenbasedir = '';
$_phpappendopenbasedir .= appendOpenBasedirPath($this->settings['system']['phpappendopenbasedir']);
$_custom_openbasedir = explode(':', $this->settings['system']['mod_fcgid_peardir']);
foreach($_custom_openbasedir as $cobd)
{
$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
}
$_custom_openbasedir = explode(':', $this->settings['system']['phpappendopenbasedir']);
foreach($_custom_openbasedir as $cobd)
{
$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
}
if($domain['openbasedir_path'] == '0' && strstr($domain['documentroot'], ":") === false) if($domain['openbasedir_path'] == '0' && strstr($domain['documentroot'], ":") === false)
{ {