@@ -828,14 +828,15 @@ public function usersItems(){
828828 //FIXME This needs some more work in terms of components which should be listed per Access Provider
829829
830830 $ cloudId = (int )$ this ->request ->getQuery ('cloud_id ' );
831- $ comps = [];
832- $ right = false ;
831+ $ comps = [];
832+ $ right = false ;
833+
833834 if ($ cloudId ){
834835 $ r_and_c = $ this ->Aa ->rights_and_components_on_cloud ();
835- if ($ r_and_c && isset ($ r_and_c ['rights ' ])){
836- $ right = $ r_and_c ['rights ' ];
837- $ comps = $ r_and_c ['components ' ];
838- }
836+ if ($ r_and_c && isset ($ r_and_c ['rights ' ])){
837+ $ right = $ r_and_c ['rights ' ];
838+ $ comps = isset ( $ r_and_c ['components ' ]) ? $ r_and_c [ ' components ' ] : [ ];
839+ }
839840 }
840841
841842 $ firstRow = [];
@@ -1446,8 +1447,8 @@ private function _get_user_detail($user,$auto_compact=false){
14461447
14471448 private function _nav_tree ($ rc ){
14481449
1449- $ rights = $ rc ['rights ' ];
1450- $ components = $ rc ['components ' ];
1450+ $ rights = isset ( $ rc ['rights ' ]) ? $ rc [ ' rights ' ] : false ;
1451+ $ components = isset ( $ rc ['components ' ]) ? $ rc [ ' components ' ] : [ ];
14511452 $ items = [
14521453 [
14531454 'text ' => 'OVERVIEW ' ,
@@ -1459,7 +1460,7 @@ private function _nav_tree($rc){
14591460 ]
14601461 ];
14611462
1462- if ($ components ['cmp_permanent_users ' ] || $ components ['cmp_vouchers ' ]){
1463+ if (isset ( $ components ['cmp_permanent_users ' ]) && isset ( $ components [ ' cmp_vouchers ' ]) && ( $ components [ ' cmp_permanent_users ' ] || $ components ['cmp_vouchers ' ]) ){
14631464 $ items [] = [
14641465 'text ' => 'USERS ' ,
14651466 'leaf ' => true ,
@@ -1470,7 +1471,10 @@ private function _nav_tree($rc){
14701471 ];
14711472 }
14721473
1473- if ($ components ['cmp_dynamic_clients ' ] || $ components ['cmp_nas ' ] || $ components ['cmp_profiles ' ] || $ components ['cmp_realms ' ] ){
1474+ if ((isset ($ components ['cmp_dynamic_clients ' ]) && $ components ['cmp_dynamic_clients ' ]) ||
1475+ (isset ($ components ['cmp_nas ' ]) && $ components ['cmp_nas ' ]) ||
1476+ (isset ($ components ['cmp_profiles ' ]) && $ components ['cmp_profiles ' ]) ||
1477+ (isset ($ components ['cmp_realms ' ]) && $ components ['cmp_realms ' ])){
14741478 $ items [] = [
14751479 'text ' => 'RADIUS ' ,
14761480 'leaf ' => true ,
@@ -1481,7 +1485,8 @@ private function _nav_tree($rc){
14811485 ];
14821486 }
14831487
1484- if ($ components ['cmp_meshes ' ] || $ components ['cmp_ap_profiles ' ]){
1488+ if ((isset ($ components ['cmp_meshes ' ]) && $ components ['cmp_meshes ' ]) ||
1489+ (isset ($ components ['cmp_ap_profiles ' ]) && $ components ['cmp_ap_profiles ' ])){
14851490 $ items [] = [
14861491 'text ' => 'NETWORK ' ,
14871492 'leaf ' => true ,
@@ -1492,7 +1497,7 @@ private function _nav_tree($rc){
14921497 ];
14931498 }
14941499
1495- if ($ components ['cmp_other ' ]){
1500+ if (isset ( $ components [ ' cmp_other ' ]) && $ components ['cmp_other ' ]){
14961501 $ items [] = [
14971502 'text ' => 'OTHER ' ,
14981503 'leaf ' => true ,
0 commit comments