From 996b2e4a7809379768e1566a8a1903f25de003ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurice=20Preu=C3=9F=20=28envoyr=29?= Date: Tue, 20 Dec 2022 21:27:53 +0100 Subject: [PATCH] fix translation strings and update session lifetime to default panel sessiontimeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurice Preuß (envoyr) --- lib/Froxlor/Install/Install.php | 2 +- lib/Froxlor/UI/Panel/UI.php | 2 +- lng/de.lng.php | 2 +- lng/en.lng.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Froxlor/Install/Install.php b/lib/Froxlor/Install/Install.php index 2919c6ea..7f96507b 100644 --- a/lib/Froxlor/Install/Install.php +++ b/lib/Froxlor/Install/Install.php @@ -282,7 +282,7 @@ class Install { // TODO: do validations if (isset($field['mandatory']) && $field['mandatory'] && empty($attribute)) { - throw new Exception(lng('install.errors.mandatory_field_not_set', [htmlspecialchars($field['label'])])); + throw new Exception(lng('install.errors.mandatory_field_not_set', [$field['label']])); } return $attribute; } diff --git a/lib/Froxlor/UI/Panel/UI.php b/lib/Froxlor/UI/Panel/UI.php index dcda66e1..51028033 100644 --- a/lib/Froxlor/UI/Panel/UI.php +++ b/lib/Froxlor/UI/Panel/UI.php @@ -93,7 +93,7 @@ class UI public static function sendHeaders() { session_set_cookie_params([ - 'lifetime' => 60, // will be renewed based on settings in lib/init.php + 'lifetime' => 600, // will be renewed based on settings in lib/init.php 'path' => '/', 'domain' => $_SERVER['HTTP_HOST'], 'secure' => self::requestIsHttps(), diff --git a/lng/de.lng.php b/lng/de.lng.php index 6b3fa10e..7026c746 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -2223,7 +2223,7 @@ Vielen Dank, Ihr Administrator', 'websrvgrpdoesnotexist' => 'Die angegebene Webserver-Gruppe scheint auf dem System nicht zu existieren', 'notyetconfigured' => 'Es scheint als wären die Dienste (noch) nicht erfolgreich konfiguriert worden. Bitte den angezeigten Befehl ausführen oder überspringen (direkt zum Login)', 'mandatory_field_not_set' => 'Pflichtfeld "%s" ist nicht gesetzt!', - 'unexpected_database_error' => 'Eine unerwarteter Datenbankfehler ist aufgetreten.', + 'unexpected_database_error' => 'Eine unerwarteter Datenbankfehler ist aufgetreten. %s', 'sql_import_failed' => 'Der Import von SQL-Daten ist fehlgeschlagen!', 'unprivileged_sql_connection_failed' => 'Unprivilegierte SQL-Verbindung konnte nicht initialisiert werden!', 'privileged_sql_connection_failed' => 'Initialisierung der privilegierten SQL-Verbindung fehlgeschlagen!', diff --git a/lng/en.lng.php b/lng/en.lng.php index aa5f1611..11de60c3 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -2355,7 +2355,7 @@ Yours sincerely, your administrator', 'websrvgrpdoesnotexist' => 'Given webserver-group does not seem to exist on the system', 'notyetconfigured' => 'It seems that the services were not yet configured (successfully). Please either run the command shown below or check the box to do it later.', 'mandatory_field_not_set' => 'Mandatory field "%s" is not set!', - 'unexpected_database_error' => 'Unexpected database exception occurred.', + 'unexpected_database_error' => 'Unexpected database exception occurred. %s', 'sql_import_failed' => 'Failed to import SQL data!', 'unprivileged_sql_connection_failed' => 'Failed to initialize unprivileged SQL connection!', 'privileged_sql_connection_failed' => 'Failed to initialize privileged SQL connection!',