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

improving the identification of identities as user defined identities vs. identities provided as mailadresses/mailaliases assigned to the user (these mailadresses are returned by ogServer->getAccountEmailAddress)

Browse Source
This commit is contained in:
Klaus Leithoff 2011-07-28 10:29:19 +00:00
parent 4fc9ab1a66
commit f257ad06be
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emailadmin/inc/class.emailadmin_bo.inc.php
View File

@ -717,13 +717,19 @@ class emailadmin_bo extends so_sql
foreach($ogServer->getAccountEmailAddress($GLOBALS['egw_info']['user']['account_lid']) as $emailAddresses)
{
// as we map the identities to ids, and use the first one to idetify the identity of the mainProfile
// we should take care that our mapping index does not interfere with the profileID
if ($i==$data['profileID']) $i++;
$identity = CreateObject('emailadmin.ea_identity');
$identity->emailAddress = $emailAddresses['address'];
$identity->realName = $emailAddresses['name'];
$identity->default = ($emailAddresses['type'] == 'default');
$identity->organization = $data['organisationName'];
$eaPreferences->setIdentity($identity);
$identity->id = ($i==0?$data['profileID']*-1:$i*-1);
// first identity found will be associated with the profileID,
// others will be set to a negative value, to indicate that they belong to the account
$eaPreferences->setIdentity($identity,($i==0?$data['profileID']*-1:$i*-1));
$i++;
}
$eaPreferences->userDefinedAccounts = ($data['userDefinedAccounts'] == 'yes');