From 3ab4801982b7a47a12dd2e43266605bee3414a61 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 14 Apr 2010 04:02:59 -0600 Subject: [PATCH] Do namespace stripping for sent-mail inside of Identity object --- imp/lib/Prefs/Identity.php | 20 +++++++++++++++++--- imp/lib/Prefs/Ui.php | 4 +--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/imp/lib/Prefs/Identity.php b/imp/lib/Prefs/Identity.php index c6281fabd..838a16f1f 100644 --- a/imp/lib/Prefs/Identity.php +++ b/imp/lib/Prefs/Identity.php @@ -493,15 +493,29 @@ class Imp_Prefs_Identity extends Horde_Prefs_Identity } /** + * Returns a property from one of the identities. + * * @see Horde_Prefs_Identity::getValue() */ public function getValue($key, $identity = null) { + $val = parent::getValue($key, $identity); + return (($key == 'sent_mail_folder') && strlen($val)) + ? IMP::folderPref($val, true) + : $val; + } + + /** + * Sets a property with a specified value. + * + * @see Horde_Prefs_Identity::getValue() + */ + public function setValue($key, $val, $identity = null) + { if ($key == 'sent_mail_folder') { - $folder = parent::getValue('sent_mail_folder', $identity); - return strlen($folder) ? IMP::folderPref($folder, true) : ''; + $val = IMP::folderPrefs($val, false); } - return parent::getValue($key, $identity); + return parent::setValue($key, $val, $identity); } /** diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php index 061c31fb5..c4455d61b 100644 --- a/imp/lib/Prefs/Ui.php +++ b/imp/lib/Prefs/Ui.php @@ -1200,9 +1200,7 @@ class IMP_Prefs_Ui $imp_folder->create($sent_mail_folder, $prefs->getValue('subscribe')); } - $GLOBALS['injector']->getInstance('IMP_Identity')->setValue('sent_mail_folder', IMP::folderPref($sent_mail_folder, false)); - - return true; + return $GLOBALS['injector']->getInstance('IMP_Identity')->setValue('sent_mail_folder', $sent_mail_folder); } /* Personal S/MIME certificate management. */ -- 2.11.0