From ed107f94968c7600afb629829afd49a9adb6312d Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 10 Oct 2013 11:41:59 +0000 Subject: [PATCH] Fix encoded mail folder-names by utf7-imap used by sieve rules->action->folder, and replace it with utf-8 --- mail/inc/class.mail_sieve.inc.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php index 319d6e7aa8..a8a212d492 100644 --- a/mail/inc/class.mail_sieve.inc.php +++ b/mail/inc/class.mail_sieve.inc.php @@ -300,12 +300,10 @@ class mail_sieve switch ($content['action']) { case 'folder': - $newRule['action_arg'] = implode($content['action_folder_text']); - //$sel_options['action_folder_text'] = $content['action_folder_text']; + $newRule['action_arg'] = translation::convert(implode($content['action_folder_text']), 'utf7-imap', 'utf-8'); break; case 'address': - //preg_match('/(?<=\<)[^<]+(?=\>)/', implode(array_values($content['action_address_text'])),$tagmail); - $newRule['action_arg'] = implode($content['action_address_text']);//implode($tagmail); + $newRule['action_arg'] = implode($content['action_address_text']); error_log(__METHOD__. '() newRules_address '. array2string($newRule['action_arg'])); break; case 'reject':