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

enhance listing of customer domains; add third openbasedir-option to make 'parentdirectory of domain-docroot' value possible (refs #515); corrected some formfield definitions

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-11-01 15:36:21 +01:00
parent 0f218914a2
commit a052333296
16 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Cron/Http/Apache.php
View File

@@ -994,6 +994,8 @@ class Apache extends HttpConfigBase
if ($domain['openbasedir'] == '1') {
if ($domain['openbasedir_path'] == '1' || strstr($domain['documentroot'], ":") !== false) {
$_phpappendopenbasedir = Domain::appendOpenBasedirPath($domain['customerroot'], true);
} else if ($domain['openbasedir_path'] == '2' && strpos(dirname($domain['documentroot']).'/', $domain['customerroot']) !== false) {
$_phpappendopenbasedir = Domain::appendOpenBasedirPath(dirname($domain['documentroot']).'/', true);
} else {
$_phpappendopenbasedir = Domain::appendOpenBasedirPath($domain['documentroot'], true);
}

2
lib/Froxlor/Cron/Http/Php/Fcgid.php
View File

@@ -172,6 +172,8 @@ class Fcgid
if ($this->domain['openbasedir_path'] == '0' && strstr($this->domain['documentroot'], ":") === false) {
$openbasedir = Domain::appendOpenBasedirPath($this->domain['documentroot'], true);
} else if ($this->domain['openbasedir_path'] == '2' && strpos(dirname($this->domain['documentroot']).'/', $this->domain['customerroot']) !== false) {
$openbasedir = Domain::appendOpenBasedirPath(dirname($this->domain['documentroot']).'/', true);
} else {
$openbasedir = Domain::appendOpenBasedirPath($this->domain['customerroot'], true);
}

2
lib/Froxlor/Cron/Http/Php/Fpm.php
View File

@@ -239,6 +239,8 @@ pm.max_children = 1
if ($this->domain['openbasedir_path'] == '0' && strstr($this->domain['documentroot'], ":") === false) {
$openbasedir = Domain::appendOpenBasedirPath($this->domain['documentroot'], true);
} else if ($this->domain['openbasedir_path'] == '2' && strpos(dirname($this->domain['documentroot']).'/', $this->domain['customerroot']) !== false) {
$openbasedir = Domain::appendOpenBasedirPath(dirname($this->domain['documentroot']).'/', true);
} else {
$openbasedir = Domain::appendOpenBasedirPath($this->domain['customerroot'], true);
}