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

optimize stats-folder-decision in Customers-ApiCommand

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-04-01 09:59:25 +02:00
parent d15e4a8270
commit 85407abfb4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/classes/api/commands/class.Customers.php
View File

@@ -431,7 +431,7 @@ class Customers extends ApiCommand implements ResourceEntity
// Using filesystem - quota, insert a task which cleans the filesystem - quota // Using filesystem - quota, insert a task which cleans the filesystem - quota
inserttask('10'); inserttask('10');
// Add htpasswd for the webalizer stats // Add htpasswd for the stats-pages
if (CRYPT_STD_DES == 1) { if (CRYPT_STD_DES == 1) {
$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2); $saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
$htpasswdPassword = crypt($password, $saltfordescrypt); $htpasswdPassword = crypt($password, $saltfordescrypt);
@@ -452,13 +452,12 @@ class Customers extends ApiCommand implements ResourceEntity
'passwd' => $htpasswdPassword 'passwd' => $htpasswdPassword
); );
$stats_folder = 'webalizer';
if (Settings::Get('system.awstats_enabled') == '1') { if (Settings::Get('system.awstats_enabled') == '1') {
$ins_data['path'] = makeCorrectDir($documentroot . '/awstats/'); $stats_folder = 'awstats';
$this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] automatically added awstats htpasswd for user '" . $loginname . "'");
} else {
$ins_data['path'] = makeCorrectDir($documentroot . '/webalizer/');
$this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] automatically added webalizer htpasswd for user '" . $loginname . "'");
} }
$ins_data['path'] = makeCorrectDir($documentroot . '/' . $stats_folder . '/');
$this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] automatically added ".$stats_folder." htpasswd for user '" . $loginname . "'");
Database::pexecute($ins_stmt, $ins_data, true, true); Database::pexecute($ins_stmt, $ins_data, true, true);
inserttask('1'); inserttask('1');