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

* Mail/SAML/SSO: show mail accounts requiring the session password as Error, but load the other accounts

Browse Source
This commit is contained in:
ralf 2022-09-15 15:57:29 +02:00
parent a050612165
commit 6b3b1a82e6
1 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
mail/inc/class.mail_tree.inc.php
View File

@ -479,33 +479,52 @@ class mail_tree
{ {
$roots = array(Tree::ID => 0, Tree::CHILDREN => array()); $roots = array(Tree::ID => 0, Tree::CHILDREN => array());
foreach(Mail\Account::search(true, false) as $acc_id => $accObj) foreach(Mail\Account::search(true, 'params') as $acc_id => $params)
{ {
if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue; try {
$identity = self::getIdentityName(Mail\Account::identity_name($accObj,true, $GLOBALS['egw_info']['user']['account_id'], true)); $accObj = new Mail\Account($params);
// Open top level folders for active account if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0; $identity = self::getIdentityName(Mail\Account::identity_name($accObj,true, $GLOBALS['egw_info']['user']['account_id'], true));
// Open top level folders for active account
$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;
$baseNode = array( $baseNode = array(
Tree::ID=> (string)$acc_id, Tree::ID => (string)$acc_id,
Tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity), Tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity),
Tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity), Tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity),
Tree::IMAGE_LEAF => self::$leafImages['folderAccount'], Tree::IMAGE_LEAF => self::$leafImages['folderAccount'],
Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderAccount'], Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderAccount'],
Tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderAccount'], Tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderAccount'],
'path'=> array($acc_id), 'path'=> array($acc_id),
Tree::CHILDREN => array(), // dynamic loading on unfold Tree::CHILDREN => array(), // dynamic loading on unfold
Tree::AUTOLOAD_CHILDREN => true, Tree::AUTOLOAD_CHILDREN => true,
'parent' => '', 'parent' => '',
Tree::OPEN => $_openTopLevel?$_openTopLevel:$openActiveAccount, Tree::OPEN => $_openTopLevel?:$openActiveAccount,
// mark on account if Sieve is enabled // mark on account if Sieve is enabled
'data' => array( 'data' => array(
'sieve' => $accObj->imapServer()->acc_sieve_enabled, 'sieve' => $accObj->imapServer()->acc_sieve_enabled,
'spamfolder'=> $accObj->imapServer()->acc_folder_junk&&(strtolower($accObj->imapServer()->acc_folder_junk)!='none')?true:false, 'spamfolder'=> $accObj->imapServer()->acc_folder_junk&&(strtolower($accObj->imapServer()->acc_folder_junk)!='none')?true:false,
'archivefolder'=> $accObj->imapServer()->acc_folder_archive&&(strtolower($accObj->imapServer()->acc_folder_archive)!='none')?true:false 'archivefolder'=> $accObj->imapServer()->acc_folder_archive&&(strtolower($accObj->imapServer()->acc_folder_archive)!='none')?true:false
), ),
Tree::NOCHECKBOX => $_noCheckbox Tree::NOCHECKBOX => $_noCheckbox
); );
}
catch (\Exception $ex) {
$baseNode = array(
Tree::ID => (string)$acc_id,
Tree::LABEL => lang('Error').': '.lang($ex->getMessage()),
Tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($params['acc_name']),
Tree::IMAGE_LEAF => self::$leafImages['folderAccount'],
Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderAccount'],
Tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderAccount'],
'path'=> array($acc_id),
Tree::CHILDREN => array(), // dynamic loading on unfold
Tree::AUTOLOAD_CHILDREN => false,
'parent' => '',
Tree::OPEN => false,
Tree::NOCHECKBOX => true
);
}
self::setOutStructure($baseNode, $roots,self::DELIMITER); self::setOutStructure($baseNode, $roots,self::DELIMITER);
} }
return $roots; return $roots;