|
@@ 722-722 (lines=1) @@
|
| 719 |
|
//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident)); |
| 720 |
|
$identity = Mail\Account::read_identity($ik,$resolve_placeholders); |
| 721 |
|
//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity)); |
| 722 |
|
if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$identity['ident_id'],'ident_email'=>$identity['ident_email'],'ident_org'=>$identity['ident_org'],'ident_realname'=>$identity['ident_realname'],'ident_signature'=>$identity['ident_signature'],'ident_name'=>$identity['ident_name']); |
| 723 |
|
} |
| 724 |
|
} |
| 725 |
|
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($userEMailAdresses)); |
|
@@ 748-757 (lines=10) @@
|
| 745 |
|
//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity)); |
| 746 |
|
// standardIdentity has ident_id==acc_id (as it is done within account->identities) |
| 747 |
|
if (empty($identity['ident_id'])) $identity['ident_id'] = $identity['acc_id']; |
| 748 |
|
if (!isset($userEMailAdresses[$identity['ident_id']])) |
| 749 |
|
{ |
| 750 |
|
$userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$identity['acc_id'], |
| 751 |
|
'ident_id'=>$identity['ident_id'], |
| 752 |
|
'ident_email'=>$identity['ident_email'], |
| 753 |
|
'ident_org'=>$identity['ident_org'], |
| 754 |
|
'ident_realname'=>$identity['ident_realname'], |
| 755 |
|
'ident_signature'=>$identity['ident_signature'], |
| 756 |
|
'ident_name'=>$identity['ident_name']); |
| 757 |
|
} |
| 758 |
|
} |
| 759 |
|
|
| 760 |
|
return $userEMailAdresses; |