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

removed ticketsystem; lots of work on cron stuff

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-19 13:09:14 +01:00
parent 903b775f79
commit 3ff20e327f
86 changed files with 3823 additions and 7421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cron_init.php
View File

@@ -144,7 +144,7 @@ while ($fName = readdir($lockDirHandle)) {
* whether the permission of the files are still correct
*/
fwrite($debugHandler, 'Checking froxlor file permissions' . "\n");
$_mypath = makeCorrectDir(\Froxlor\Froxlor::getInstallDir());
$_mypath = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir());
if (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 && (int) \Froxlor\Settings::Get('system.mod_fcgid_ownvhost') == 1) || ((int) \Froxlor\Settings::Get('phpfpm.enabled') == 1 && (int) \Froxlor\Settings::Get('phpfpm.enabled_ownvhost') == 1)) {
$user = \Froxlor\Settings::Get('system.mod_fcgid_httpuser');
@@ -156,12 +156,12 @@ if (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 && (int) \Froxlor\Set
}
// all the files and folders have to belong to the local user
// now because we also use fcgid for our own vhost
safe_exec('chown -R ' . $user . ':' . $group . ' ' . escapeshellarg($_mypath));
\Froxlor\FileDir::safe_exec('chown -R ' . $user . ':' . $group . ' ' . escapeshellarg($_mypath));
} else {
// back to webserver permission
$user = \Froxlor\Settings::Get('system.httpuser');
$group = \Froxlor\Settings::Get('system.httpgroup');
safe_exec('chown -R ' . $user . ':' . $group . ' ' . escapeshellarg($_mypath));
\Froxlor\FileDir::safe_exec('chown -R ' . $user . ':' . $group . ' ' . escapeshellarg($_mypath));
}
// Initialize logging