From 5afe5a8c466a9100b9492fbc9eedee5cf56707b9 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Wed, 7 Jun 2023 11:49:57 +0200 Subject: [PATCH] minor bugfixes for data export / UI Signed-off-by: Michael Kaufmann --- customer_index.php | 4 ++-- lib/Froxlor/Api/Commands/DataDump.php | 2 +- lib/tablelisting/customer/tablelisting.export.php | 2 +- lng/es.lng.php | 1 - templates/Froxlor/user/form-datatable.html.twig | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/customer_index.php b/customer_index.php index 02b65683..4d0d2a6f 100644 --- a/customer_index.php +++ b/customer_index.php @@ -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 diff --git a/lib/Froxlor/Api/Commands/DataDump.php b/lib/Froxlor/Api/Commands/DataDump.php index 00579733..fef7099d 100644 --- a/lib/Froxlor/Api/Commands/DataDump.php +++ b/lib/Froxlor/Api/Commands/DataDump.php @@ -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); } diff --git a/lib/tablelisting/customer/tablelisting.export.php b/lib/tablelisting/customer/tablelisting.export.php index fe37c571..d485bb4c 100644 --- a/lib/tablelisting/customer/tablelisting.export.php +++ b/lib/tablelisting/customer/tablelisting.export.php @@ -74,7 +74,7 @@ return [ 'class' => 'btn-warning', 'href' => [ 'section' => 'extras', - 'page' => 'backup', + 'page' => 'export', 'action' => 'abort', 'id' => ':id' ], diff --git a/lng/es.lng.php b/lng/es.lng.php index 29973803..ab50024e 100644 --- a/lng/es.lng.php +++ b/lng/es.lng.php @@ -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', diff --git a/templates/Froxlor/user/form-datatable.html.twig b/templates/Froxlor/user/form-datatable.html.twig index e04ebd2d..9343c9b9 100644 --- a/templates/Froxlor/user/form-datatable.html.twig +++ b/templates/Froxlor/user/form-datatable.html.twig @@ -4,7 +4,7 @@ {% if tabledata.table.tr is not empty and tabledata.table.tr is iterable %}
{% set type = 'warning' %} - {% set alert_msg = lng('error.customerhasongoingbackupjob') %} + {% set alert_msg = lng('error.customerhasongoingexportjob') %} {% include 'Froxlor/misc/alertbox.html.twig' %}
{% import "Froxlor/table/table.html.twig" as table %}