From 95d1ce371c5c07d1026179cb114f19bfa71364f1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 30 Sep 2015 11:18:15 +0200
Subject: [PATCH] Navigation: Add static method getItemTypeConfiguration()

refs #10246
---
 .../controllers/NavigationController.php      | 57 +++----------------
 library/Icinga/Web/Navigation/Navigation.php  | 33 +++++++++++
 2 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/application/controllers/NavigationController.php b/application/controllers/NavigationController.php
index daba47a11..2a360220c 100644
--- a/application/controllers/NavigationController.php
+++ b/application/controllers/NavigationController.php
@@ -5,14 +5,13 @@ namespace Icinga\Controllers;
 
 use Exception;
 use Icinga\Application\Config;
-use Icinga\Application\Icinga;
-use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotFoundError;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Forms\Navigation\NavigationConfigForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
+use Icinga\Web\Navigation\Navigation;
 use Icinga\Web\Notification;
 use Icinga\Web\Url;
 
@@ -22,18 +21,11 @@ use Icinga\Web\Url;
 class NavigationController extends Controller
 {
     /**
-     * The default item types provided by Icinga Web 2
+     * The global navigation item type configuration
      *
      * @var array
      */
-    protected $defaultItemTypes;
-
-    /**
-     * The item types provided by Icinga Web 2's modules
-     *
-     * @var array
-     */
-    protected $moduleItemTypes;
+    protected $itemTypeConfig;
 
     /**
      * {@inheritdoc}
@@ -41,30 +33,7 @@ class NavigationController extends Controller
     public function init()
     {
         parent::init();
-        $this->defaultItemTypes = array(
-            'menu-item' => array(
-                'label'     => $this->translate('Menu Entry'),
-                'config'    => 'menu'
-            ),
-            'dashlet'   => array(
-                'label'     => 'Dashlet',
-                'config'    => 'dashboard'
-            )
-        );
-
-        $moduleItemTypes = array();
-        $moduleManager = Icinga::app()->getModuleManager();
-        foreach ($moduleManager->getLoadedModules() as $module) {
-            if ($this->hasPermission($moduleManager::MODULE_PERMISSION_NS . $module->getName())) {
-                foreach ($module->getNavigationItems() as $type => $options) {
-                    if (! isset($moduleItemTypes[$type])) {
-                        $moduleItemTypes[$type] = $options;
-                    }
-                }
-            }
-        }
-
-        $this->moduleItemTypes = $moduleItemTypes;
+        $this->itemTypeConfig = Navigation::getItemTypeConfiguration();
     }
 
     /**
@@ -72,19 +41,11 @@ class NavigationController extends Controller
      *
      * @param   string  $type
      *
-     * @return  string          It's $type if no label can be found
+     * @return  string          $type if no label can be found
      */
     protected function getItemLabel($type)
     {
-        if (isset($this->moduleItemTypes[$type]['label'])) {
-            return $this->moduleItemTypes[$type]['label'];
-        }
-
-        if (isset($this->defaultItemTypes[$type]['label'])) {
-            return $this->defaultItemTypes[$type]['label'];
-        }
-
-        return $type;
+        return isset($this->itemTypeConfig[$type]['label']) ? $this->itemTypeConfig[$type]['label'] : $type;
     }
 
     /**
@@ -95,11 +56,7 @@ class NavigationController extends Controller
     protected function listItemTypes()
     {
         $types = array();
-        foreach ($this->defaultItemTypes as $type => $options) {
-            $types[$type] = isset($options['label']) ? $options['label'] : $type;
-        }
-
-        foreach ($this->moduleItemTypes as $type => $options) {
+        foreach ($this->itemTypeConfig as $type => $options) {
             $types[$type] = isset($options['label']) ? $options['label'] : $type;
         }
 
diff --git a/library/Icinga/Web/Navigation/Navigation.php b/library/Icinga/Web/Navigation/Navigation.php
index 9cd3423a3..55101edce 100644
--- a/library/Icinga/Web/Navigation/Navigation.php
+++ b/library/Icinga/Web/Navigation/Navigation.php
@@ -451,6 +451,39 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
         return $this;
     }
 
+    /**
+     * Return the global navigation item type configuration
+     *
+     * @return  array
+     */
+    public static function getItemTypeConfiguration()
+    {
+        $defaultItemTypes = array(
+            'menu-item' => array(
+                'label'     => t('Menu Entry'),
+                'config'    => 'menu'
+            ),
+            'dashlet'   => array(
+                'label'     => 'Dashlet',
+                'config'    => 'dashboard'
+            )
+        );
+
+        $moduleItemTypes = array();
+        $moduleManager = Icinga::app()->getModuleManager();
+        foreach ($moduleManager->getLoadedModules() as $module) {
+            if (Auth::getInstance()->hasPermission($moduleManager::MODULE_PERMISSION_NS . $module->getName())) {
+                foreach ($module->getNavigationItems() as $type => $options) {
+                    if (! isset($moduleItemTypes[$type])) {
+                        $moduleItemTypes[$type] = $options;
+                    }
+                }
+            }
+        }
+
+        return array_merge($defaultItemTypes, $moduleItemTypes);
+    }
+
     /**
      * Create and return a new set of navigation items for the given configuration
      *