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

minor ui/lang adjustments; add security question for backup-abort action

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-05-13 11:22:14 +02:00
parent cc11e2de51
commit 7e14e9edd7
8 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Froxlor/UI/HTML.php
View File

@@ -53,6 +53,9 @@ class HTML
if ((!isset($box['show_element']) || $box['show_element'] === true) && (!isset($box['required_resources']) || $box['required_resources'] == '' || (isset($userinfo[$box['required_resources']]) && ((int)$userinfo[$box['required_resources']] > 0 || $userinfo[$box['required_resources']] == '-1')))) {
$navigation_links = [];
$box_active = false;
if (isset($box['url']) && $box['url'] == basename($_SERVER["SCRIPT_FILENAME"])) {
$box_active = true;
}
foreach ($box['elements'] as $element) {
if ((!isset($element['show_element']) || $element['show_element'] === true) && (!isset($element['required_resources']) || $element['required_resources'] == '' || (isset($userinfo[$element['required_resources']]) && ((int)$userinfo[$element['required_resources']] > 0 || $userinfo[$element['required_resources']] == '-1')))) {
$target = '';
@@ -63,7 +66,10 @@ class HTML
$target = ' target="_blank"';
}
if (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0 && substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0) {
if (
((empty($_GET['page']) && substr_count($element['url'], "page=") == 0) || (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0))
&& substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0
) {
$active = true;
$box_active = true;
}

4
lib/navigation/00.froxlor.main.php
View File

@@ -143,6 +143,10 @@ return [
[
'url' => 'customer_traffic.php?page=current',
'label' => lng('menue.traffic.current')
],
[
'url' => 'customer_traffic.php',
'label' => lng('menue.traffic.overview')
]
]
]

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

@@ -111,7 +111,7 @@ return [
'visible' => [Domain::class, 'canEditAlias']
],
'isassigned' => [
'icon' => 'fa-check-to-slot',
'icon' => 'fa fa-check-to-slot',
'title' => lng('domains.isassigneddomain'),
'visible' => [Domain::class, 'isAssigned']
],