From ff7bf98bea9fd67956b4c02e0b9d5058b5f7e4e7 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 29 Jul 2009 19:33:13 -0600 Subject: [PATCH] Use session setting for Prefs_UI nomenu --- imp/lib/Auth.php | 5 +++++ imp/templates/javascript_defs_dimp.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php index f2d901d77..a0b38641a 100644 --- 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 eda96a704..2e0ff8665 100644 --- 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), -- 2.11.0