tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed error in php with acl enterprise. Tiquet: #3457

Browse Source
This commit is contained in:
m-lopez-f 2016-03-10 10:47:02 +01:00
parent 663afaeae3
commit 2502c26077
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_menu.php
View File

@ -330,7 +330,7 @@ function menu_print_menu (&$menu) {
$count_sub2 = 0; $count_sub2 = 0;
foreach ($sub['sub2'] as $key => $sub2) { foreach ($sub['sub2'] as $key => $sub2) {
if (enterprise_hook ('enterprise_acl', array ($config['id_user'], $mainsec, $subsec2, false,$key)) == false) { if (enterprise_hook ('enterprise_acl', array ($config['id_user'], $mainsec, $subsec2, false, $key)) == false) {
continue; continue;
} }
@ -387,17 +387,15 @@ function menu_print_menu (&$menu) {
} }
} }
if ($menu_selected) if ($menu_selected)
$seleccionado = 'selected'; $seleccionado = 'selected';
else else
$seleccionado = ''; $seleccionado = '';
//Print out the first level //Print out the first level
$output .= '<li class="'.implode (" ", $classes).' ' . $seleccionado . '" id="icon_'.$id.'">'; $output .= '<li class="'.implode (" ", $classes).' ' . $seleccionado . '" id="icon_'.$id.'">';
//onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">'; //onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">';
$length = strlen(__($main["text"])); $length = strlen(__($main["text"]));
$padding_top = ( $length >= 18) ? 6 : 12; $padding_top = ( $length >= 18) ? 6 : 12;
@ -663,7 +661,7 @@ function menu_get_sec2_pages($sec, $sec2, $menu_hash = false) {
$sec3_array = array(); $sec3_array = array();
if (isset($sec2)) { if (isset($menu[$sec]['sub']) AND isset($menu[$sec]['sub'][$sec2]['sub2'])) {
// Get the sec2 of the subsections // Get the sec2 of the subsections
foreach ($menu[$sec]['sub'][$sec2]['sub2'] as $k => $v) { foreach ($menu[$sec]['sub'][$sec2]['sub2'] as $k => $v) {
$sec3_array[$k] = $v['text']; $sec3_array[$k] = $v['text'];