extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-15 11:11:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

missed one avatar and did not remove the no longer used method

Browse Source
This commit is contained in:
ralf 2023-05-10 09:54:03 +02:00
parent 3930c7a917
commit ee053952c9
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mail/inc/class.mail_ui.inc.php
View File

@ -2342,36 +2342,11 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
}
// send configured image proxy to client-side
$content['image_proxy'] = self::image_proxy();
$contact = self::getContactFromAddress($content['from'][0]);
if (!empty($contact))
{
$content['avatar'] = $contact[0]['photo'];
}
$content['avatar'] = Api\Mail\Avatar::getAvatar($content['from'][0]);
$etpl->exec('mail.mail_ui.displayMessage', $content, $sel_options, $readonlys, $preserv, 2);
}
/**
* Retrieve contact info from a given address
*
* @param string|null $address
* @return array
*/
static function getContactFromAddress($address)
{
if (empty($address)) return [];
$email = Mail::stripRFC822Addresses([$address]);
return $GLOBALS['egw']->contacts->search(
array('contact_email' => $email[0], 'contact_email_home' => $email[0]),
array('contact_id', 'email', 'email_home', 'n_fn', 'n_given', 'n_family'),
'', '', '', false, 'OR', false
);
}
/**
* This is a helper function to trigger Push method
* faster than normal 60 sec cycle.