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

minor bugfixes for data export / UI

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-06-07 11:49:57 +02:00
parent eb9dded947
commit 5afe5a8c46
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
customer_index.php
View File

@@ -41,7 +41,7 @@ use Froxlor\System\Cronjob;
use Froxlor\Cron\TaskId;
if ($action == 'logout') {
$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, 'logged out');
$log->logAction(FroxlorLogger::USR_ACTION, LOG_INFO, 'logged out');
unset($_SESSION['userinfo']);
CurrentUser::setData();
@@ -65,7 +65,7 @@ if ($action == 'logout') {
}
if ($page == 'overview') {
$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_index");
$log->logAction(FroxlorLogger::USR_ACTION, LOG_INFO, "viewed customer_index");
$domain_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
WHERE `customerid` = :customerid

2
lib/Froxlor/Api/Commands/DataDump.php
View File

@@ -132,7 +132,7 @@ class DataDump extends ApiCommand implements ResourceEntity
// schedule export job
Cronjob::inserttask(TaskId::CREATE_CUSTOMER_DATADUMP, $task_data);
$this->logger()->logAction($this->isAdmin() ? FroxlorLogger::ADM_ACTION : FroxlorLogger::USR_ACTION, LOG_NOTICE, "[API] added customer data-dump job for '" . $customer['loginname'] . "'. Target directory: " . $userpath);
$this->logger()->logAction($this->isAdmin() ? FroxlorLogger::ADM_ACTION : FroxlorLogger::USR_ACTION, LOG_NOTICE, "[API] added customer data export job for '" . $customer['loginname'] . "'. Target directory: " . $userpath);
return $this->response($task_data);
}

2
lib/tablelisting/customer/tablelisting.export.php
View File

@@ -74,7 +74,7 @@ return [
'class' => 'btn-warning',
'href' => [
'section' => 'extras',
'page' => 'backup',
'page' => 'export',
'action' => 'abort',
'id' => ':id'
],

1
lng/es.lng.php
View File

@@ -956,7 +956,6 @@ return [
'autoupdate_10' => 'La versión mínima soportada de PHP es 7.4.0',
'autoupdate_11' => 'Webupdate está desactivado',
'mailaccistobedeleted' => 'Otra cuenta con el mismo nombre (%s) está siendo eliminada y por lo tanto no puede ser añadida en este momento.',
'customerhasongoingbackupjob' => 'Ya hay un trabajo de copia de seguridad esperando a ser procesado, por favor sea paciente.',
'dns_domain_nodns' => 'DNS no está habilitado para este dominio',
'dns_content_empty' => 'No hay contenido',
'dns_content_invalid' => 'El contenido DNS no es válido',

2
templates/Froxlor/user/form-datatable.html.twig
View File

@@ -4,7 +4,7 @@
{% if tabledata.table.tr is not empty and tabledata.table.tr is iterable %}
<div class="row mb-2">
{% set type = 'warning' %}
{% set alert_msg = lng('error.customerhasongoingbackupjob') %}
{% set alert_msg = lng('error.customerhasongoingexportjob') %}
{% include 'Froxlor/misc/alertbox.html.twig' %}
</div>
{% import "Froxlor/table/table.html.twig" as table %}