Fix error when user has no rights to use containers

pluginsGLPI · Sep 14, 2023 · 188c124 · 188c124
1 parent 772f0a6
commit 188c124
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/hook.php b/hook.php
@@ -170,7 +170,7 @@ function plugin_fields_getAddSearchOptions($itemtype)
         && count($_SESSION['glpiactiveentities']) > 0
     ) {
         $itemtypes = PluginFieldsContainer::getEntries('all');
-        if ($itemtypes !== false && in_array($itemtype, $itemtypes)) {
+        if (in_array($itemtype, $itemtypes)) {
             return PluginFieldsContainer::getAddSearchOptions($itemtype);
         }
     }

diff --git a/inc/container.class.php b/inc/container.class.php
@@ -997,7 +997,7 @@ public static function getTypes()
         ];
     }
 
-    public static function getEntries($type = 'tab', $full = false)
+    public static function getEntries($type = 'tab', $full = false): array
     {
         global $DB;
 
@@ -1009,7 +1009,7 @@ public static function getEntries($type = 'tab', $full = false)
         }
 
         if (!$DB->tableExists(self::getTable())) {
-            return false;
+            return [];
         }
 
         $itemtypes = [];
@@ -1031,19 +1031,17 @@ public static function getEntries($type = 'tab', $full = false)
             if (Session::isCron() || !isset($_SESSION['glpiactiveprofile']['id'])) {
                 continue;
             }
-            //profiles restriction
 
+            //profiles restriction
             if (isset($_SESSION['glpiactiveprofile']['id']) && $_SESSION['glpiactiveprofile']['id'] != null && $item['id'] > 0) {
                 $right = PluginFieldsProfile::getRightOnContainer($_SESSION['glpiactiveprofile']['id'], $item['id']);
                 if ($right < READ) {
-                    return false;
+                    continue;
                 }
             } else {
-                return false;
+                continue;
             }
 
-
-
             $jsonitemtypes = json_decode($item['itemtypes']);
             //show more info or not
             foreach ($jsonitemtypes as $v) {

diff --git a/setup.php b/setup.php
@@ -121,10 +121,13 @@ function plugin_init_fields()
             $PLUGIN_HOOKS["menu_toadd"]['fields'] = ['config' => 'PluginFieldsMenu'];
 
             // add tabs to itemtypes
-            Plugin::registerClass(
-                'PluginFieldsContainer',
-                ['addtabon' => array_unique(PluginFieldsContainer::getEntries())]
-            );
+            $itemtypes = array_unique(PluginFieldsContainer::getEntries());
+            if (count($itemtypes) > 0) {
+                Plugin::registerClass(
+                    'PluginFieldsContainer',
+                    ['addtabon' => $itemtypes]
+                );
+            }
 
             //include js and css
             $debug = (isset($_SESSION['glpi_use_mode'])