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

fix for missing emailadmin profile

Browse Source
This commit is contained in:
Klaus Leithoff 2013-02-21 08:27:46 +00:00
parent 151b800a5a
commit e1241d80f1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mail/inc/class.mail_ui.inc.php
View File

@ -324,12 +324,11 @@ class mail_ui
// retrieve data for/from user defined accounts // retrieve data for/from user defined accounts
$selectedID = 0; $selectedID = 0;
if($preferences->userDefinedAccounts) $allAccountData = $this->mail_bo->bopreferences->getAllAccountData($preferences); if (count($preferences->ic_server)) {
if ($allAccountData) { foreach ($preferences->ic_server as $tmpkey => $accountData)
foreach ($allAccountData as $tmpkey => $accountData)
{ {
$identity =& $accountData['identity']; $identity =& $preferences->identities[$tmpkey];
$icServer =& $accountData['icServer']; $icServer =& $accountData;
//_debug_array($identity); //_debug_array($identity);
//_debug_array($icServer); //_debug_array($icServer);
//error_log(__METHOD__.__LINE__.' Userdefined Profiles ImapServerId:'.$icServer->ImapServerId); //error_log(__METHOD__.__LINE__.' Userdefined Profiles ImapServerId:'.$icServer->ImapServerId);
@ -412,12 +411,13 @@ class mail_ui
if (isset($draftFolder) && $draftFolder != 'none') $userDefinedFunctionFolders['Drafts'] = $draftFolder; if (isset($draftFolder) && $draftFolder != 'none') $userDefinedFunctionFolders['Drafts'] = $draftFolder;
if (isset($templateFolder) && $templateFolder != 'none') $userDefinedFunctionFolders['Templates'] = $templateFolder; if (isset($templateFolder) && $templateFolder != 'none') $userDefinedFunctionFolders['Templates'] = $templateFolder;
$out = array('id' => 0); $out = array('id' => 0);
if($this->mail_bo->mailPreferences->userDefinedAccounts) $allAccountData = $this->mail_bo->bopreferences->getAllAccountData($this->mail_bo->mailPreferences); //_debug_array($this->mail_bo->mailPreferences);
if ($allAccountData) { //if($this->mail_bo->mailPreferences->userDefinedAccounts) $allAccountData = $this->mail_bo->bopreferences->getAllAccountData($this->mail_bo->mailPreferences);
foreach ($allAccountData as $tmpkey => $accountData) if (count($this->mail_bo->mailPreferences->ic_server)) {
foreach ($this->mail_bo->mailPreferences->ic_server as $tmpkey => $accountData)
{ {
$identity =& $accountData['identity']; $identity =& $this->mail_bo->mailPreferences->identities[$tmpkey];
$icServer =& $accountData['icServer']; $icServer =& $accountData;
//_debug_array($identity); //_debug_array($identity);
//_debug_array($icServer); //_debug_array($icServer);
if ($_profileID && $icServer->ImapServerId<>$_profileID) continue; if ($_profileID && $icServer->ImapServerId<>$_profileID) continue;