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

fix foldertree: initial display

Browse Source
This commit is contained in:
Klaus Leithoff 2013-10-30 09:59:05 +00:00
parent cabb1e8b8c
commit 6d4de6abb1
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,7 +306,7 @@ $_restoreSession=false;
//error_log(__METHOD__.__LINE__." ProfileID ".$this->profileID.' called from:'.function_backtrace()); //error_log(__METHOD__.__LINE__." ProfileID ".$this->profileID.' called from:'.function_backtrace());
$acc = emailadmin_account::read($this->profileID); $acc = emailadmin_account::read($this->profileID);
error_log(__METHOD__.__LINE__.array2string($acc->imapServer())); //error_log(__METHOD__.__LINE__.array2string($acc->imapServer()));
$this->icServer = $acc->imapServer(); $this->icServer = $acc->imapServer();
$this->ogServer = $acc->smtpServer(); $this->ogServer = $acc->smtpServer();
// TODO: merge mailprefs into userprefs, for easy treatment // TODO: merge mailprefs into userprefs, for easy treatment

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

@ -122,7 +122,8 @@ class mail_ui
$this->mail_bo = mail_bo::getInstance(false,self::$icServerID); $this->mail_bo = mail_bo::getInstance(false,self::$icServerID);
if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace()); if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer)); //error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
//error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer->ImapServerId));
// no icServer Object: something failed big time // no icServer Object: something failed big time
if (!isset($this->mail_bo->icServer)) exit; // ToDo: Exception or the dialog for setting up a server config if (!isset($this->mail_bo->icServer)) exit; // ToDo: Exception or the dialog for setting up a server config
$GLOBALS['egw']->session->commit_session(); $GLOBALS['egw']->session->commit_session();
@ -137,11 +138,6 @@ error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
{ {
if (self::$icServerID != $_icServerID) if (self::$icServerID != $_icServerID)
{ {
//$unsetCache = true;
if (self::$icServerID>0)
{
$this->mail_bo->bopreferences->setProfileActive(false,self::$icServerID);
}
} }
if (mail_bo::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID); if (mail_bo::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
self::$icServerID = $_icServerID; self::$icServerID = $_icServerID;
@ -149,21 +145,13 @@ error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
$this->mail_bo = mail_bo::getInstance(false,self::$icServerID); $this->mail_bo = mail_bo::getInstance(false,self::$icServerID);
if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace()); if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
// no icServer Object: something failed big time // no icServer Object: something failed big time
if (!isset($this->mail_bo->icServer)) exit; // ToDo: Exception or the dialog for setting up a server config if (!isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId<>$_icServerID) exit; // ToDo: Exception or the dialog for setting up a server config
/*if (!($this->mail_bo->icServer->_connected == 1))*/ $this->mail_bo->openConnection(self::$icServerID); /*if (!($this->mail_bo->icServer->_connected == 1))*/ $this->mail_bo->reopen('INBOX');
// save session varchar // save session varchar
$oldicServerID =& egw_cache::getSession('mail','activeProfileID'); $oldicServerID =& egw_cache::getSession('mail','activeProfileID');
$oldicServerID = self::$icServerID; $oldicServerID = self::$icServerID;
// save pref $GLOBALS['egw']->preferences->add('mail','ActiveProfileID',self::$icServerID,'user');
if (self::$icServerID>0) $GLOBALS['egw']->preferences->save_repository(true);
{
$this->mail_bo->bopreferences->setProfileActive(true,self::$icServerID);
}
else
{
$GLOBALS['egw']->preferences->add('mail','ActiveProfileID',self::$icServerID,'user');
$GLOBALS['egw']->preferences->save_repository(true);
}
$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = self::$icServerID; $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = self::$icServerID;
} }
@ -238,11 +226,7 @@ error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
$content[self::$nm_index]['foldertree'] = '/INBOX/sub'; $content[self::$nm_index]['foldertree'] = '/INBOX/sub';
*/ */
if($this->mail_bo->connectionStatus !== false) { $quota = $this->mail_bo->getQuotaRoot();
$quota = $this->mail_bo->getQuotaRoot();
} else {
$quota['limit'] = 'NOT SET';
}
if($quota !== false && $quota['limit'] != 'NOT SET') { if($quota !== false && $quota['limit'] != 'NOT SET') {
$quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']); $quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']);
@ -536,21 +520,19 @@ error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
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);
//_debug_array($this->mail_bo->mailPreferences);
//if($this->mail_bo->mailPreferences->userDefinedAccounts) $allAccountData = $this->mail_bo->bopreferences->getAllAccountData($this->mail_bo->mailPreferences);
//$starttime = microtime(true); //$starttime = microtime(true);
if (count($this->mail_bo->mailPreferences->ic_server)) { $availableProfiles = emailadmin_account::search($only_current_user=true, $just_name=false, $order_by=null,$offset=0);
foreach ($this->mail_bo->mailPreferences->ic_server as $tmpkey => $accountData) if (count($availableProfiles)) {
$identities=array();
foreach ($availableProfiles as $tmpkey => $accountData)
{ {
if ($tmpkey==0) continue; if ($tmpkey==0) continue;
$identity =& $this->mail_bo->mailPreferences->identities[$tmpkey]; $icServer = $accountData->imapServer();
$icServer =& $accountData; //_debug_array($accountData->ImapServerId);
//_debug_array($identity);
//_debug_array($icServer);
if ($_profileID && $icServer->ImapServerId<>$_profileID) continue; if ($_profileID && $icServer->ImapServerId<>$_profileID) continue;
//error_log(__METHOD__.__LINE__.' Userdefined Profiles ImapServerId:'.$icServer->ImapServerId); //error_log(__METHOD__.__LINE__.' Userdefined Profiles ImapServerId:'.$icServer->ImapServerId);
if (empty($icServer->host)) continue; //if (empty($icServer->acc_imap_host)) continue;
$identities[$icServer->ImapServerId]=$identity->realName.' '.$identity->organization.' &lt;'.$identity->emailAddress.'&gt;'; $identities[$icServer->ImapServerId]=(strlen(trim($accountData->ident_realname.$accountData->ident_org))?$accountData->ident_realname.' '.$accountData->ident_org:$accountData->acc_name).' &lt;'.($accountData->ident_email?$accountData->ident_email:$accountData->acc_imap_username).'&gt;';
$oA = array('id'=>$icServer->ImapServerId, $oA = array('id'=>$icServer->ImapServerId,
'text'=>$identities[$icServer->ImapServerId], //$this->mail_bo->profileID, 'text'=>$identities[$icServer->ImapServerId], //$this->mail_bo->profileID,
'tooltip'=>'('.$icServer->ImapServerId.') '.htmlspecialchars_decode($identities[$icServer->ImapServerId]), 'tooltip'=>'('.$icServer->ImapServerId.') '.htmlspecialchars_decode($identities[$icServer->ImapServerId]),