Use session setting for Prefs_UI nomenu

diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php
index f2d901d..a0b3864 100644 (file)
--- a/imp/lib/Auth.php
+++ b/imp/lib/Auth.php
@@ -474,6 +474,11 @@ class IMP_Auth
                   $conf['cookie']['path'],
                   $conf['cookie']['domain']);
 
+        /* Suppress menus in options screen. */
+        if ($sess['view'] == 'dimp') {
+            $_SESSION['horde_prefs']['nomenu'] = true;
+        }
+
         /* Set up search information for the session. */
         $GLOBALS['imp_search']->initialize();
 

diff --git a/imp/templates/javascript_defs_dimp.php b/imp/templates/javascript_defs_dimp.php
index eda96a7..2e0ff86 100644 (file)
--- a/imp/templates/javascript_defs_dimp.php
+++ b/imp/templates/javascript_defs_dimp.php
@@ -48,7 +48,7 @@ $code['conf'] = array_filter(array(
     'URI_DIMP' => Horde::applicationUrl('index-dimp.php', true, -1),
     'URI_MESSAGE' => Horde::applicationUrl('message-dimp.php'),
     'URI_PREFS' => Horde::url($horde_webroot . '/services/prefs/', true, -1),
-    'URI_PREFS_IMP' => str_replace('&', '&', Horde_Util::addParameter(Horde::getServiceLink('options', 'imp'), array('nomenu' => 1))),
+    'URI_PREFS_IMP' => str_replace('&', '&', Horde::getServiceLink('options', 'imp')),
     'URI_TIMEOUT' => Horde_Auth::getLogoutUrl(array('reason' => Horde_Auth::REASON_SESSION)),
     'URI_VIEW' => Horde::applicationUrl('view.php', true, -1),