Merge branch 'main' of github.com:Froxlor/Froxlor

customer_mysql.php

@@ -40,7 +40,7 @@ use Froxlor\UI\Response;
 use Froxlor\CurrentUser;
 
 // redirect if this customer page is hidden via settings or no resources given
-if (Settings::IsInList('panel.customer_hide_options', 'mysql') || $userinfo['mysqls'] == 0)
+if (Settings::IsInList('panel.customer_hide_options', 'mysql') || $userinfo['mysqls'] == 0) {
 	Response::redirectTo('customer_index.php');
 }
 

lib/Froxlor/UI/Panel/UI.php

@@ -274,11 +274,12 @@ class UI
 			if (Froxlor::versionCompare2(Settings::Get('panel.version'), '2.0.0-beta1') == -1) {
 				// pre 2.0
 				Settings::Set('panel.default_theme', 'Froxlor');
-			}
-			$theme = (Settings::Get('panel.default_theme') !== null) ? Settings::Get('panel.default_theme') : $theme;
-			// customer theme
-			if (CurrentUser::hasSession() && CurrentUser::getField('theme') != $theme) {
-				$theme = CurrentUser::getField('theme');
+			} else {
+				$theme = (Settings::Get('panel.default_theme') !== null) ? Settings::Get('panel.default_theme') : $theme;
+				// customer theme
+				if (CurrentUser::hasSession() && CurrentUser::getField('theme') != $theme) {
+					$theme = CurrentUser::getField('theme');
+				}
 			}
 		}
 		if (!file_exists(Froxlor::getInstallDir() . '/templates/' . $theme)) {

lng/en.lng.php

@@ -1328,6 +1328,7 @@ Yours sincerely, your administrator',
 			'description' => 'Select the field you want to search in'
 		],
 		'upload_import' => 'Upload and import',
+		'dashboard' => 'Dashboard',
 	],
 	'phpfpm' => [
 		'vhost_httpuser' => 'Local user to use for PHP-FPM (Froxlor vHost)',

templates/Froxlor/user/index.html.twig

@@ -1,7 +1,7 @@
 {% extends "Froxlor/userarea.html.twig" %}
 
 {% block content %}
-	<h3 class="page-header">Dashboard</h3>
+	<h3 class="page-header">{{ lng('panel.dashboard') }}</h3>
 
 	{% if get_setting('panel.is_configured') == 0 and userinfo.adminsession == 1 and userinfo.change_serversettings == 1 %}
 		<div class="alert alert-info position-relative p-5">