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

fixed last remaining function calls which are class-methods now

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-23 19:34:32 +01:00
parent e1987af34d
commit 4cd005051b
13 changed files with 128 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,7 +561,7 @@ class Apache extends HttpConfigBase
if ($domain['phpenabled_customer'] == 1 && $domain['phpenabled_vhost'] == '1') {
// This vHost has PHP enabled and we are using the regular mod_php
$cmail = getCustomerDetail($domain['customerid'], 'email');
$cmail = \Froxlor\Customer\Customer::getCustomerDetail($domain['customerid'], 'email');
$php_options_text .= ' php_admin_value sendmail_path "/usr/sbin/sendmail -t -f ' . $cmail . '"' . PHP_EOL;
if ($domain['openbasedir'] == '1') {
@@ -1220,7 +1220,7 @@ class Apache extends HttpConfigBase
// check for suexec-workaround, #319
if ((int) Settings::Get('perl.suexecworkaround') == 1) {
// symlink this directory to suexec-safe-path
$loginname = getCustomerDetail($row_diroptions['customerid'], 'loginname');
$loginname = \Froxlor\Customer\Customer::getCustomerDetail($row_diroptions['customerid'], 'loginname');
$suexecpath = \Froxlor\FileDir::makeCorrectDir(Settings::Get('perl.suexecpath') . '/' . $loginname . '/' . md5($row_diroptions['path']) . '/');
if (! file_exists($suexecpath)) {
@@ -1240,7 +1240,7 @@ class Apache extends HttpConfigBase
// if no perl-execution is enabled but the workaround is,
// we have to remove the symlink and folder in suexecpath
if ((int) Settings::Get('perl.suexecworkaround') == 1) {
$loginname = getCustomerDetail($row_diroptions['customerid'], 'loginname');
$loginname = \Froxlor\Customer\Customer::getCustomerDetail($row_diroptions['customerid'], 'loginname');
$suexecpath = \Froxlor\FileDir::makeCorrectDir(Settings::Get('perl.suexecpath') . '/' . $loginname . '/' . md5($row_diroptions['path']) . '/');
$perlsymlink = \Froxlor\FileDir::makeCorrectFile($row_diroptions['path'] . '/cgi-bin');

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

@@ -96,7 +96,7 @@ class Fcgid
// remove +i attibute, so starter can be overwritten
if (file_exists($this->getStarterFile())) {
removeImmutable($this->getStarterFile());
\Froxlor\FileDir::removeImmutable($this->getStarterFile());
}
$starter_file_handler = fopen($this->getStarterFile(), 'w');
@@ -104,7 +104,7 @@ class Fcgid
fclose($starter_file_handler);
\Froxlor\FileDir::safe_exec('chmod 750 ' . escapeshellarg($this->getStarterFile()));
\Froxlor\FileDir::safe_exec('chown ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($this->getStarterFile()));
setImmutable($this->getStarterFile());
\Froxlor\FileDir::setImmutable($this->getStarterFile());
}
/**