From 1330a63c19555b37f5bde02adbdafcc07d76c8db Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sat, 15 Aug 2009 13:47:30 -0600
Subject: [PATCH] Have a single menu->apps definition for IMP

---
 imp/config/conf.xml | 10 ----------
 imp/lib/Dimp.php    | 12 +++++-------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/imp/config/conf.xml b/imp/config/conf.xml
index 1b2894ee6..5b8a82696 100644
--- a/imp/config/conf.xml
+++ b/imp/config/conf.xml
@@ -297,16 +297,6 @@
     before displaying an informational message to users that the message list is
     still being built. Set to 0 to disable messages.">12</configinteger>
    </configsection>
-
-   <configsection name="menu" desc="Menu Settings">
-    <configheader>Menu Settings</configheader>
-    <configmultienum name="apps" desc="Select any applications that should be
-    linked in DIMP's menu">
-     <values>
-      <configspecial name="list-horde-apps" />
-     </values>
-    </configmultienum>
-   </configsection>
   </configsection>
  </configtab>
 
diff --git a/imp/lib/Dimp.php b/imp/lib/Dimp.php
index 5ba80b913..0b20303df 100644
--- a/imp/lib/Dimp.php
+++ b/imp/lib/Dimp.php
@@ -287,13 +287,11 @@ class IMP_Dimp
      */
     static public function menuList()
     {
-        if (isset($GLOBALS['conf']['dimp']['menu']['apps'])) {
-            $apps = $GLOBALS['conf']['dimp']['menu']['apps'];
-            if (is_array($apps) && count($apps)) {
-                return $apps;
-            }
-        }
-        return array();
+        return (isset($GLOBALS['conf']['menu']['apps']) &&
+                is_array($GLOBALS['conf']['menu']['apps']) &&
+                count($GLOBALS['conf']['menu']['apps']))
+            ? $GLOBALS['conf']['menu']['apps']
+            : array();
     }
 
     /**
-- 
2.11.0