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

fix for imap_rfc822_write_address from imap extension

Browse Source
This commit is contained in:
Ralf Becker 2015-06-09 08:54:47 +00:00
parent 4c19e714bb
commit 968869e65d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -1487,7 +1487,9 @@ class addressbook_bo extends addressbook_so
// make sure to return a correctly quoted rfc822 address, if requested
if ($options['type'] === 'email')
{
$result[$contact['id']] = imap_rfc822_write_address($contact['email'], '', $result[$contact['id']]);
$args = explode('@', $contact['email']);
$args[] = $result[$contact['id']];
$result[$contact['id']] = call_user_func_array('imap_rfc822_write_address', $args);
}
// show category color
if ($contact['cat_id'] && ($color = etemplate::cats2color($contact['cat_id'])))

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

@ -3294,7 +3294,9 @@ class mail_compose
{
$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
}
$completeMailString = imap_rfc822_write_address(trim($email), '', trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']));
$args = explode('@', trim($email));
$args[] = trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']);
$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
if(!empty($email) && in_array($completeMailString ,$results) === false) {
$results[] = array(
'id'=>$completeMailString,
@ -3315,7 +3317,9 @@ class mail_compose
{
$group = $GLOBALS['egw']->accounts->read($g_id);
if(!$group['account_email']) continue;
$completeMailString = imap_rfc822_write_address(trim($group['account_email']), '', $name);
$args = explode('@', trim($group['account_email']));
$args[] = $name;
$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
$results[] = array(
'id' => $completeMailString,
'label' => $completeMailString,