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

use generatePassword() for generating passwords as it respects the settings; fix user-modification under freebsd as there is no 'usermod'

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-01-12 20:24:55 +01:00
parent b78729319c
commit 3ee8f6ac25
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_customers.php
View File

@@ -632,7 +632,7 @@ if ($page == 'customers'
} }
if ($password == '') { if ($password == '') {
$password = substr(md5(uniqid(microtime(), 1)), 12, 6); $password = generatePassword();
} }
$_theme = Settings::Get('panel.default_theme'); $_theme = Settings::Get('panel.default_theme');

6
scripts/jobs/cron_tasks.php
View File

@@ -98,7 +98,11 @@ while ($row = $result_tasks_stmt->fetch(PDO::FETCH_ASSOC)) {
&& !in_array(Settings::Get('system.httpuser'), $groupinfo['members']) && !in_array(Settings::Get('system.httpuser'), $groupinfo['members'])
) { ) {
// webserver has no access, add it // webserver has no access, add it
safe_exec('usermod -a -G ' . escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup'))." ".escapeshellarg(Settings::Get('system.httpuser'))); if (isFreeBSD()) {
safe_exec('pw user mod '.escapeshellarg(Settings::Get('system.httpuser')).' -G '.escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup')));
} else {
safe_exec('usermod -a -G ' . escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup')).' '.escapeshellarg(Settings::Get('system.httpuser')));
}
} }
} }