mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
* Mail: fix sieve rules for moving mails into folder containing non-ascii chars (Dovecot requires sieve rules in utf8, while Cyrus needs utf7-imap)
This commit is contained in:
parent
4318bd4070
commit
666bdd82df
@ -236,7 +236,7 @@ class mail_sieve
|
|||||||
switch ($rules['action'])
|
switch ($rules['action'])
|
||||||
{
|
{
|
||||||
case 'folder':
|
case 'folder':
|
||||||
$content['action_folder_text'][] = translation::convert($rules['action_arg'],'utf-8','utf7-imap');
|
$content['action_folder_text'][] = $rules['action_arg'];
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 'address':
|
case 'address':
|
||||||
@ -285,7 +285,7 @@ class mail_sieve
|
|||||||
switch ($content['action'])
|
switch ($content['action'])
|
||||||
{
|
{
|
||||||
case 'folder':
|
case 'folder':
|
||||||
$newRule['action_arg'] = translation::convert(implode($content['action_folder_text']), 'utf7-imap', 'utf-8');
|
$newRule['action_arg'] = implode($content['action_folder_text']);
|
||||||
break;
|
break;
|
||||||
case 'address':
|
case 'address':
|
||||||
$newRule['action_arg'] = implode(',',$content['action_address_text']);
|
$newRule['action_arg'] = implode(',',$content['action_address_text']);
|
||||||
|
Loading…
Reference in New Issue
Block a user