From 7c3aa3dcac7239f3f932d708e417263dc946b033 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 14 Apr 2010 12:30:49 -0600
Subject: [PATCH] Fix some IMP preferences UI issues

---
 imp/lib/Prefs/Ui.php            | 14 ++++++--------
 imp/templates/prefs/drafts.html |  1 -
 imp/templates/prefs/spam.html   |  1 -
 imp/templates/prefs/trash.html  |  1 -
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index fd4e442e2..915c52ced 100644
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -789,7 +789,6 @@ class IMP_Prefs_Ui
         $t->set('nofolder', IMP::PREF_NO_FOLDER);
         $t->set('flist', IMP::flistSelect(array(
             'filter' => array('INBOX'),
-            'heading' => _("Create a new drafts folder"),
             'new_folder' => true,
             'selected' => IMP::folderPref($GLOBALS['prefs']->getValue('drafts_folder'), true)
         )));
@@ -1439,7 +1438,6 @@ class IMP_Prefs_Ui
         $t->set('nofolder', IMP::PREF_NO_FOLDER);
         $t->set('flist', IMP::flistSelect(array(
             'filter' => array('INBOX'),
-            'heading' => _("Create a new Spam folder"),
             'new_folder' => true,
             'selected' => IMP::folderPref($GLOBALS['prefs']->getValue('spam_folder'), true)
         )));
@@ -1591,7 +1589,6 @@ class IMP_Prefs_Ui
         $t->set('vtrash_select', $use_vtrash);
         $t->set('flist', IMP::flistSelect(array(
             'filter' => array('INBOX'),
-            'heading' => _("Create a new trash folder"),
             'new_folder' => true,
             'selected' => ($use_vtrash ? null : IMP::folderPref($GLOBALS['prefs']->getValue('trash_folder'), true))
         )));
@@ -1657,18 +1654,19 @@ class IMP_Prefs_Ui
         if ($folder == IMP::PREF_NO_FOLDER) {
             $prefs->setValue($pref, '');
         } else {
-            if (empty($folder) && !empty($new)) {
+            if (!empty($new)) {
                 $folder = $GLOBALS['imp_imap']->appendNamespace($new);
-                if (!$GLOBALS['injector']->getInstance('IMP_Folder')->create($folder, $GLOBALS['prefs']->getValue('subscribe'))) {
+                if (!$GLOBALS['injector']->getInstance('IMP_Folder')->create($folder, $prefs->getValue('subscribe'))) {
                     $folder = null;
                 }
             }
 
-            if (!empty($folder)) {
-                $prefs->setValue($pref, IMP::folderPref($folder, false));
-                return true;
+            if (strlen($folder)) {
+                return $prefs->setValue($pref, IMP::folderPref($folder, false));
             }
         }
+
+        return false;
     }
 
 }
diff --git a/imp/templates/prefs/drafts.html b/imp/templates/prefs/drafts.html
index dc253dcc8..f47179912 100644
--- a/imp/templates/prefs/drafts.html
+++ b/imp/templates/prefs/drafts.html
@@ -3,7 +3,6 @@
   <tag:label />
  </div>
  <div>
-  <input type="hidden" name="drafts_new" id="drafts_new" value="" />
   <select id="drafts" name="drafts">
    <option value="<tag:nofolder />"><gettext>None</gettext></option>
    <tag:flist />
diff --git a/imp/templates/prefs/spam.html b/imp/templates/prefs/spam.html
index 963ea08f1..d3d9ae699 100644
--- a/imp/templates/prefs/spam.html
+++ b/imp/templates/prefs/spam.html
@@ -3,7 +3,6 @@
   <tag:label />
  </div>
  <div>
-  <input type="hidden" name="spam_new" id="spam_new" value="" />
   <select id="spam" name="spam">
    <option value="<tag:nofolder />"><gettext>None</gettext></option>
    <tag:flist />
diff --git a/imp/templates/prefs/trash.html b/imp/templates/prefs/trash.html
index b78db8cfa..3706418f5 100644
--- a/imp/templates/prefs/trash.html
+++ b/imp/templates/prefs/trash.html
@@ -3,7 +3,6 @@
   <tag:label />
  </div>
  <div>
-  <input type="hidden" name="trash_new" id="trash_new" value="" />
   <select id="trash" name="trash">
    <option value="<tag:nofolder />"><gettext>None</gettext></option>
    <option value="<tag:vtrash />"<if:vtrash_select> selected="selected"</if:vtrash_select>><gettext>Use Virtual Trash</gettext></option>
-- 
2.11.0