From 2b2b2f976d1dd61ef1d16e77889b7eef6c8d574a Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 17 Feb 2009 23:01:49 -0700
Subject: [PATCH] Bug #7866: Fix folder list accesskey

---
 imp/lib/IMP.php         | 11 ++++++-----
 imp/templates/menu.html |  8 +++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 1ace89137..f517f6ab5 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -690,13 +690,14 @@ class IMP
         $t->set('forminput', Util::formInput());
         $t->set('use_folders', ($_SESSION['imp']['protocol'] != 'pop') && $GLOBALS['conf']['user']['allow_folders'], true);
         if ($t->get('use_folders')) {
-            $t->set('accesskey', $GLOBALS['prefs']->getValue('widget_accesskey') ? Horde::getAccessKey(_("Open Fo_lder")) : '', true);
-            $t->set('flist', self::flistSelect(array('selected' => $GLOBALS['imp_mbox']['mailbox'], 'inc_vfolder' => true)));
-
             Horde::addScriptFile('imp.js', 'imp', true);
-
             $menu_view = $GLOBALS['prefs']->getValue('menu_view');
-            $t->set('flink', sprintf('<ul><li class="rightFloat" id="openfoldericon">%s%s<br />%s</a></li></ul>', Horde::link('#'), ($menu_view != 'text') ? Horde::img('folders/folder_open.png', _("Open Folder"), ($menu_view == 'icon') ? array('title' => _("Open Folder")) : array()) : '', ($menu_view != 'icon') ? Horde::highlightAccessKey(_("Open Fo_lder"), $t->get('accesskey')) : ''));
+            $ak = $GLOBALS['prefs']->getValue('widget_accesskey')
+                ? Horde::getAccessKey(_("Open Fo_lder"))
+                : '';
+
+            $t->set('flist', self::flistSelect(array('selected' => $GLOBALS['imp_mbox']['mailbox'], 'inc_vfolder' => true)));
+            $t->set('flink', sprintf('%s%s<br />%s</a>', Horde::link('#', '', '', '', '', '', $ak), ($menu_view != 'text') ? Horde::img('folders/folder_open.png', _("Open Folder"), ($menu_view == 'icon') ? array('title' => _("Open Folder")) : array()) : '', ($menu_view != 'icon') ? Horde::highlightAccessKey(_("Open Fo_lder"), $ak) : ''));
         }
         $t->set('menu_string', self::getMenu('string'));
 
diff --git a/imp/templates/menu.html b/imp/templates/menu.html
index 9532c6475..9179586a9 100644
--- a/imp/templates/menu.html
+++ b/imp/templates/menu.html
@@ -4,12 +4,14 @@
 <if:use_folders>
  <div class="rightFloat">
   <input type="hidden" name="no_newmail_popup" value="1" />
-  <label for="mailbox"<if:accesskey> accesskey="<tag:accesskey />"</if:accesskey>>
-  <select name="mailbox"><tag:flist /></select>
+  <label for="mailbox">
+   <select name="mailbox"><tag:flist /></select>
   </label>
  </div>
  <div class="rightFloat">
-  <tag:flink />
+  <ul>
+   <li class="rightFloat" id="openfoldericon"><tag:flink /></li>
+  </ul>
  </div>
 </if:use_folders>
  <div class="leftFloat">
-- 
2.11.0