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

avoid problems with not set identity infos on global/group profiles by using the account information first for the main identity connected to the account, and ignoring the regarding info (not properly seeded) on iterating over identities

Browse Source
This commit is contained in:
Klaus Leithoff 2014-02-10 08:20:23 +00:00
parent 43460891b0
commit 0e1d9ce607
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/inc/class.mail_bo.inc.php
View File

@ -529,13 +529,14 @@ class mail_bo
foreach(emailadmin_account::search($only_current_user=true, $just_name=true) as $acc_id => $identity_name) foreach(emailadmin_account::search($only_current_user=true, $just_name=true) as $acc_id => $identity_name)
{ {
$acc = emailadmin_account::read($acc_id); $acc = emailadmin_account::read($acc_id);
$userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature']);
$identities = $acc->identities($acc_id); $identities = $acc->identities($acc_id);
foreach($identities as $ik => $ident) { foreach($identities as $ik => $ident) {
//error_log(__METHOD__.__LINE__.':'.$ik.'->'.array2string($ident)); //error_log(__METHOD__.__LINE__.':'.$ik.'->'.array2string($ident));
$identity = emailadmin_account::read_identity($ik); $identity = emailadmin_account::read_identity($ik);
//error_log(__METHOD__.__LINE__.':'.$ik.'->'.array2string($identity)); //error_log(__METHOD__.__LINE__.':'.$ik.'->'.array2string($identity));
$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']); 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']);
} }
} }
//error_log(__METHOD__.__LINE__.array2string($userEMailAdresses)); //error_log(__METHOD__.__LINE__.array2string($userEMailAdresses));
@ -550,13 +551,14 @@ class mail_bo
function getAccountIdentities($acc_id) { function getAccountIdentities($acc_id) {
$userEMailAdresses = array(); $userEMailAdresses = array();
$acc = emailadmin_account::read($acc_id); $acc = emailadmin_account::read($acc_id);
$userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature']);
$identities = $acc->identities(); $identities = $acc->identities();
foreach($identities as $ik => $ident) { foreach($identities as $ik => $ident) {
//error_log(__METHOD__.__LINE__.':'.$ik.'->'.array2string($ident)); //error_log(__METHOD__.__LINE__.':'.$ik.'->'.array2string($ident));
$identity = emailadmin_account::read_identity($ik); $identity = emailadmin_account::read_identity($ik);
//error_log(__METHOD__.__LINE__.':'.$ik.'->'.array2string($identity)); //error_log(__METHOD__.__LINE__.':'.$ik.'->'.array2string($identity));
$userEMailAdresses[$identity['ident_id']] = array('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']); if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('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']);
} }
//error_log(__METHOD__.__LINE__.array2string($userEMailAdresses)); //error_log(__METHOD__.__LINE__.array2string($userEMailAdresses));
return $userEMailAdresses; return $userEMailAdresses;