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

fix undefined variables introduced in commit #b1acc9a8efc01a5139b042f8f9e97881e4a52b83

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-01-27 11:23:03 +01:00
parent 7b8341d826
commit bdfbe4947a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/functions/output/function.buildNavigation.php
View File

@@ -45,7 +45,11 @@ function buildNavigation($navigation, $userinfo) {
$navigation_links = ''; $navigation_links = '';
foreach ($box['elements'] as $element_id => $element) { foreach ($box['elements'] as $element_id => $element) {
if ((!isset($element['show_element']) || $element['show_element'] === true) && 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')))) { (!isset($element['required_resources']) || $element['required_resources'] == '' || (isset($userinfo[$element['required_resources']]) && ((int)$userinfo[$element['required_resources']] > 0 || $userinfo[$element['required_resources']] == '-1')))
) {
$target = '';
$active = '';
$navurl = '#';
if (isset($element['url']) && trim($element['url']) != '') { if (isset($element['url']) && trim($element['url']) != '') {
// append sid only to local // append sid only to local
@@ -60,22 +64,19 @@ function buildNavigation($navigation, $userinfo) {
} }
} }
$target = '';
if (isset($element['new_window']) && $element['new_window'] == true) { if (isset($element['new_window']) && $element['new_window'] == true) {
$target = ' target="_blank"'; $target = ' target="_blank"';
} }
$active = '';
if (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0 && substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0 && isset($_GET['action']) && substr_count($element['url'], "action=" . $_GET['action']) > 0) { if (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0 && substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0 && isset($_GET['action']) && substr_count($element['url'], "action=" . $_GET['action']) > 0) {
$active = ' active'; $active = ' active';
} elseif (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0 && substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0 && substr_count($element['url'], "action=") == 0 && !isset($_GET['action'])) { } elseif (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0 && substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0 && substr_count($element['url'], "action=") == 0 && !isset($_GET['action'])) {
$active = ' active'; $active = ' active';
} }
$navurl = htmlspecialchars($element['url']); $navurl = htmlspecialchars($element['url']);
$navlabel = $element['label']; $navlabel = $element['label'];
} else { } else {
$navurl = htmlspecialchars($element['url']);
$navlabel = $element['label']; $navlabel = $element['label'];
} }