tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed problems with acl enterprise in menu. Tiquet: #3001 

(cherry picked from commit 67edcde80b)
This commit is contained in:
m-lopez-f 2015-12-03 13:11:35 +01:00
parent 93c9c0c84e
commit 4fe734b783
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/functions_menu.php
View File

@ -309,7 +309,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, true,$key)) == false) { if (enterprise_hook ('enterprise_acl', array ($config['id_user'], $mainsec, $subsec2, false,$key)) == false) {
continue; continue;
} }
@ -671,4 +671,18 @@ function menu_sec2_in_sec($sec,$sec2) {
return false; return false;
} }
function menu_sec3_in_sec2($sec,$sec2,$sec3) {
$sec3_array = menu_get_sec2_pages($sec, $sec2, $menu_hash = false);
// If this value has various parameters, we only get the first
$sec3 = explode('&',$sec3);
$sec3 = $sec3[0];
if ($sec3_array != null && in_array($sec3,array_keys($sec3_array))) {
return true;
}
return false;
}
?> ?>