extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 19:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for bug #2086 Trunk/1.6 Users cant define their own identities...

Browse Source
This commit is contained in:
Klaus Leithoff 2009-05-22 08:57:00 +00:00
parent a63bba2e4d
commit bdcbce7f68
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
felamimail/inc/class.bopreferences.inc.php
View File

@ -149,7 +149,7 @@
if(!is_a($profileData, 'ea_preferences') || !is_a($profileData->ic_server[0], 'defaultimap')) { if(!is_a($profileData, 'ea_preferences') || !is_a($profileData->ic_server[0], 'defaultimap')) {
return false; return false;
} }
if($profileData->userDefinedAccounts) { if($profileData->userDefinedAccounts || $profileData->userDefinedIdentities) {
// get user defined accounts // get user defined accounts
$allAccountData = $this->getAllAccountData($profileData); $allAccountData = $this->getAllAccountData($profileData);
if ($allAccountData) { if ($allAccountData) {
@ -169,7 +169,6 @@
$this->profileData = $this->sessionData['profileData']; $this->profileData = $this->sessionData['profileData'];
} }
if(!is_a($this->profileData,'ea_preferences')) { if(!is_a($this->profileData,'ea_preferences')) {
$imapServerTypes = $this->boemailadmin->getIMAPServerTypes(); $imapServerTypes = $this->boemailadmin->getIMAPServerTypes();
$profileData = $this->boemailadmin->getUserProfile('felamimail'); $profileData = $this->boemailadmin->getUserProfile('felamimail');
@ -196,6 +195,8 @@
$rememberID = $accountData['identity']->id; $rememberID = $accountData['identity']->id;
} }
} }
}
if($profileData->userDefinedIdentities && $GLOBALS['egw_info']['user']['apps']['felamimail']) {
$allUserIdentities = $this->getUserDefinedIdentities(); $allUserIdentities = $this->getUserDefinedIdentities();
if (is_array($allUserIdentities)) { if (is_array($allUserIdentities)) {
$i=count($allUserIdentities); $i=count($allUserIdentities);