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

fix PHP Warning array_values expects parameter 1 to be an array line 3635

Browse Source
This commit is contained in:
Ralf Becker 2020-12-02 09:07:09 +01:00
parent c3ae524ed6
commit e717daa467
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3630,11 +3630,18 @@ class mail_compose
} }
} }
if(is_array($contacts)) { if (is_array($contacts))
foreach($contacts as $contact) { {
$cfs = $contacts_obj->read_customfields($contact['id'], $cfs_type_email); foreach($contacts as $contact)
$cf_emails = $cfs ? (array)array_values(array_values($cfs)[0]) : array(); {
foreach(array_merge(array($contact['email'],$contact['email_home']), $cf_emails) as $email) { $cf_emails = [];
if ($cfs_type_email && ($cf_emails = $contacts_obj->read_customfields($contact['id'], $cfs_type_email)))
{
// cf_emails: [$contact['id'] => ['cf1'=>'email','cf2'=>'email2',...]]
$cf_emails = array_values(reset($cf_emails));
}
foreach(array_merge(array($contact['email'],$contact['email_home']), $cf_emails) as $email)
{
// avoid wrong addresses, if an rfc822 encoded address is in addressbook // avoid wrong addresses, if an rfc822 encoded address is in addressbook
//$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email); //$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
$rfcAddr = Mail::parseAddressList($email); $rfcAddr = Mail::parseAddressList($email);