Merge pull request dokuwiki#4428 from dokuwiki/menucontext

Menu: check context visibility after assembling items

Author: splitbrain

inc/Menu/AbstractMenu.php

@@ -43,6 +43,12 @@ public function getItems()
     {
         $data = ['view' => $this->view, 'items' => []];
         Event::createAndTrigger('MENU_ITEMS_ASSEMBLY', $data, [$this, 'loadItems']);
+
+        $data['items'] = array_filter(
+            $data['items'],
+            fn($item) => $item instanceof AbstractItem && $item->visibleInContext($this->context)
+        );
+
         return $data['items'];
     }
 
@@ -59,7 +65,6 @@ public function loadItems(&$data)
                 $class = "\\dokuwiki\\Menu\\Item\\$class";
                 /** @var AbstractItem $item */
                 $item = new $class();
-                if (!$item->visibleInContext($this->context)) continue;
                 $data['items'][] = $item;
             } catch (\RuntimeException $ignored) {
                 // item not available

inc/Menu/Item/Admin.php

@@ -12,17 +12,19 @@ class Admin extends AbstractItem
     /** @inheritdoc */
     public function __construct()
     {
+        global $INPUT;
+        global $INFO;
+
         parent::__construct();
 
-        $this->svg = DOKU_INC . 'lib/images/menu/settings.svg';
-    }
+        if (!$INPUT->server->str('REMOTE_USER')) {
+            throw new \RuntimeException("admin is only for logged in users");
+        }
 
-    /** @inheritdoc */
-    public function visibleInContext($ctx)
-    {
-        global $INFO;
-        if (!$INFO['ismanager']) return false;
+        if (!isset($INFO) || !$INFO['ismanager']) {
+            throw new \RuntimeException("admin is only for managers and above");
+        }
 
-        return parent::visibleInContext($ctx);
+        $this->svg = DOKU_INC . 'lib/images/menu/settings.svg';
     }
 }

lib/exe/detail.php

@@ -6,7 +6,7 @@
 if (!defined('DOKU_MEDIADETAIL')) define('DOKU_MEDIADETAIL', 1);
 
 // define all DokuWiki globals here (needed within test requests but also helps to keep track)
-global $INPUT, $IMG, $ID, $REV, $SRC, $ERROR, $AUTH;
+global $INPUT, $INFO, $IMG, $ID, $REV, $SRC, $ERROR, $AUTH;
 
 require_once(DOKU_INC . 'inc/init.php');