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

convert html-related functions

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-21 18:31:06 +01:00
parent def3d6d19e
commit 7563907df5
30 changed files with 241 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Froxlor/Cron/CronConfig.php
View File

@@ -25,7 +25,7 @@ class CronConfig
if ($num_results > 0) {
// get all crons and their intervals
if (isFreeBSD()) {
if (\Froxlor\FileDir::isFreeBSD()) {
// FreeBSD does not need a header as we are writing directly to the crontab
$cronfile = "\n";
} else {
@@ -88,7 +88,7 @@ class CronConfig
}
}
if (isFreeBSD()) {
if (\Froxlor\FileDir::isFreeBSD()) {
// FreeBSD handles the cron-stuff in another way. We need to directly
// write to the crontab file as there is not cron.d/froxlor file
// (settings for system.cronconfig should be set correctly of course)

2
lib/Froxlor/Cron/System/TasksCron.php
View File

@@ -158,7 +158,7 @@ class TasksCron extends \Froxlor\Cron\FroxlorCron
// check group members
if (isset($groupinfo['members']) && ! in_array(Settings::Get('system.httpuser'), $groupinfo['members'])) {
// webserver has no access, add it
if (isFreeBSD()) {
if (\Froxlor\FileDir::isFreeBSD()) {
\Froxlor\FileDir::safe_exec('pw usermod ' . escapeshellarg(Settings::Get('system.httpuser')) . ' -G ' . escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup')));
} else {
\Froxlor\FileDir::safe_exec('usermod -a -G ' . escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup')) . ' ' . escapeshellarg(Settings::Get('system.httpuser')));