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

Enterprise ACL step 2: Add options fix merge

This commit is contained in:
Calvo 2021-11-17 17:31:43 +01:00
parent b6e34a2697
commit 06fe1552bf
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/menu.php
View File

@ -60,7 +60,7 @@ if (check_acl($config['id_user'], 0, 'AR')
// Add to menu. // Add to menu.
$menu_godmode['discovery']['text'] = __('Discovery'); $menu_godmode['discovery']['text'] = __('Discovery');
$menu_godmode['discovery']['sec2'] = 'godmode/servers/discovery'; $menu_godmode['discovery']['sec2'] = '';
$menu_godmode['discovery']['id'] = 'god-discovery'; $menu_godmode['discovery']['id'] = 'god-discovery';
$menu_godmode['discovery']['sub'] = $sub; $menu_godmode['discovery']['sub'] = $sub;
} }

13
pandora_console/include/functions_menu.php
View File

@ -653,13 +653,6 @@ function menu_get_sec_pages($sec, $menu_hash=false)
} }
} }
// If this value has various parameters, we only get the first.
$k = explode('&', $k);
$k = $k[0];
if (is_array($v['text']) === true) {
$v['text'] = $v['text'][0];
}
$sec2_array[$k] = $v['text']; $sec2_array[$k] = $v['text'];
} }
} }
@ -755,12 +748,6 @@ function menu_pepare_acl_select_data($pages, $sec)
'gmodules' => 'godmode/modules/manage_network_templates', 'gmodules' => 'godmode/modules/manage_network_templates',
'geventos' => 'godmode/events/events&section=filter', 'geventos' => 'godmode/events/events&section=filter',
'gsetup' => 'godmode/setup/setup&section=general', 'gsetup' => 'godmode/setup/setup&section=general',
'messages' => [
'godmode/update_manager/update_manager&tab=online',
'godmode/update_manager/update_manager&tab=offline',
'godmode/update_manager/update_manager&tab=setup',
],
]; ];
foreach ($exclude_pages as $exclude_sec => $sec2) { foreach ($exclude_pages as $exclude_sec => $sec2) {