Bug #8050: Fix folder list generation.

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 0ebbc76..143189c 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -250,7 +250,7 @@ class IMP
         }
 
         /* Add the list of mailboxes to the lists. */
-        $filter = empty($options['filter']) ? array() : array_flip($filter);
+        $filter = empty($options['filter']) ? array() : array_flip($options['filter']);
         foreach ($mailboxes as $mbox) {
             if (isset($filter[$mbox['val']])) {
                 continue;

diff --git a/imp/templates/prefs/draftsselect.inc b/imp/templates/prefs/draftsselect.inc
index df405df..c13f8a3 100644 (file)
--- a/imp/templates/prefs/draftsselect.inc
+++ b/imp/templates/prefs/draftsselect.inc
@@ -21,7 +21,7 @@ function newDraftsFolderName()
 <input type="hidden" name="drafts_new" value="" />
 <select id="drafts" name="drafts" onchange="newDraftsFolderName();">
  <option value="<?php echo IMP_PREF_NO_FOLDER ?>"><?php echo _("None") ?></option>
- <?php echo IMP::flistSelect(array('heading' => _("Create a new drafts folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('drafts_folder')), 'new_folder' => true)) ?>
+ <?php echo IMP::flistSelect(array('heading' => _("Create a new drafts folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('drafts_folder'), true), 'new_folder' => true)) ?>
 </select>
 <br />
 <?php endif; ?>

diff --git a/imp/templates/prefs/spamselect.inc b/imp/templates/prefs/spamselect.inc
index 38c1bb0..a8e46e1 100644 (file)
--- a/imp/templates/prefs/spamselect.inc
+++ b/imp/templates/prefs/spamselect.inc
@@ -18,6 +18,6 @@ function newSpamFolderName()
 </script>
 
 <?php echo Horde::label('spam', _("Spam folder:")) ?><br />
-<select id="spam" name="spam" onchange="newSpamFolderName();"><option value="<?php echo IMP_PREF_NO_FOLDER ?>"><?php echo _("None") ?></option><?php echo IMP::flistSelect(array('heading' => _("Create a new Spam folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('spam_folder')), 'new_folder' => true)) ?></select>
+<select id="spam" name="spam" onchange="newSpamFolderName();"><option value="<?php echo IMP_PREF_NO_FOLDER ?>"><?php echo _("None") ?></option><?php echo IMP::flistSelect(array('heading' => _("Create a new Spam folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('spam_folder'), true), 'new_folder' => true)) ?></select>
 <input type="hidden" name="spam_new" value="" />
 <?php endif; ?>

diff --git a/imp/templates/prefs/trashselect.inc b/imp/templates/prefs/trashselect.inc
index e0c11c8..5b9beed 100644 (file)
--- a/imp/templates/prefs/trashselect.inc
+++ b/imp/templates/prefs/trashselect.inc
@@ -22,7 +22,7 @@ function newTrashFolderName()
     $use_vtrash = $prefs->getValue('use_vtrash');
     echo '<option value="' . IMP_PREF_NO_FOLDER . '">' . _("None") . '</option>' .
     '<option value="' . IMP_PREF_VTRASH . '"' . (($use_vtrash) ? ' selected="selected"' : '') . '>' . _("Use Virtual Trash") . '</option>' .
-    IMP::flistSelect(array('heading' => _("Create a new trash folder"), 'filter' => array('INBOX'), 'selected' => ($use_vtrash ? null : IMP::folderPref($prefs->getValue('trash_folder'))), 'new_folder' => true));
+    IMP::flistSelect(array('heading' => _("Create a new trash folder"), 'filter' => array('INBOX'), 'selected' => ($use_vtrash ? null : IMP::folderPref($prefs->getValue('trash_folder'), true)), 'new_folder' => true));
 ?>
 </select>
 <br />