extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 09:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set the right value for action_folder_text/taglist in sieve->edit popup window

Browse Source
This commit is contained in:
Hadi Nategh 2013-10-10 14:07:50 +00:00
parent 046aab4000
commit c58716b64d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/inc/class.mail_sieve.inc.php
View File

@ -248,8 +248,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':
@ -304,7 +303,7 @@ class mail_sieve
break; break;
case 'address': case 'address':
$newRule['action_arg'] = implode($content['action_address_text']); $newRule['action_arg'] = implode($content['action_address_text']);
error_log(__METHOD__. '() newRules_address '. array2string($newRule['action_arg'])); //error_log(__METHOD__. '() newRules_address '. array2string($newRule['action_arg']));
break; break;
case 'reject': case 'reject':
$newRule['action_arg'] = $content['action_reject_text']; $newRule['action_arg'] = $content['action_reject_text'];
@ -377,6 +376,9 @@ class mail_sieve
); );
//$preserv = $sel_options; //$preserv = $sel_options;
error_log(__METHOD__.'() content'. array2string($content)); error_log(__METHOD__.'() content'. array2string($content));
//Set the preselect_options for mail/folders as we are not allow free entry for folder taglist
$mailCompose = new mail_compose();
$sel_options['action_folder_text'] = $mailCompose->ajax_searchFolder(0,true);
return $etmpl->exec('mail.mail_sieve.edit',$content,$sel_options,$readonlys,$preserv,2); return $etmpl->exec('mail.mail_sieve.edit',$content,$sel_options,$readonlys,$preserv,2);