holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure distributionlist is resolved in mail compose after submit action

Browse Source
This commit is contained in:
Hadi Nategh 2015-03-19 13:20:05 +00:00
parent 002f886ca7
commit 1f1790d2bb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/inc/class.mail_compose.inc.php
View File

@ -1289,7 +1289,14 @@ class mail_compose
$etpl->setElementAttribute('folder','autocomplete_params',array('mailaccount'=>$content['mailaccount'])); $etpl->setElementAttribute('folder','autocomplete_params',array('mailaccount'=>$content['mailaccount']));
// join again mailaccount and identity // join again mailaccount and identity
$content['mailaccount'] .= ':'.$content['mailidentity']; $content['mailaccount'] .= ':'.$content['mailidentity'];
// Resolve distribution list before send content to client
foreach(array('to', 'cc', 'bcc', 'replyto') as $f)
{
if (is_array($content[$f])) $content[$f]= self::resolveEmailAddressList ($content[$f]);
}
$content['to'] = self::resolveEmailAddressList($content['to']);
//error_log(__METHOD__.__LINE__.array2string($content)); //error_log(__METHOD__.__LINE__.array2string($content));
$etpl->exec('mail.mail_compose.compose',$content,$sel_options,$readonlys,$preserv,2); $etpl->exec('mail.mail_compose.compose',$content,$sel_options,$readonlys,$preserv,2);
} }
@ -2562,7 +2569,7 @@ class mail_compose
if (!empty($addr)) $_emailAddressList[]=$addr; if (!empty($addr)) $_emailAddressList[]=$addr;
} }
} }
return $_emailAddressList; return array_values($_emailAddressList);
} }
/** /**