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

change handling for numeric nodeid on getfolderTree when full tree is requested; use it in subscribe

Browse Source
This commit is contained in:
Klaus Leithoff 2014-02-14 08:30:03 +00:00
parent efbdc7f532
commit 420234cb46
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,7 @@ class mail_ui
$stmpl = new etemplate_new('mail.subscribe'); $stmpl = new etemplate_new('mail.subscribe');
$profileId = $_GET['acc_id']; $profileId = $_GET['acc_id'];
$sel_options['foldertree'] = $this->getFolderTree(false, null,false); $sel_options['foldertree'] = $this->getFolderTree(false, $profileId,false,false);
$unsubscribedFolders = $this->mail_bo->fetchUnSubscribedFolders(); $unsubscribedFolders = $this->mail_bo->fetchUnSubscribedFolders();
$allFolders = $this->mail_bo->getFolderObjects(); $allFolders = $this->mail_bo->getFolderObjects();
@ -832,16 +832,10 @@ class mail_ui
$this->setOutStructure($oA,$out,$obj->delimiter); $this->setOutStructure($oA,$out,$obj->delimiter);
$c++; $c++;
} }
if (!is_null($_nodeID) && $_nodeID !=0) if (!is_null($_nodeID) && $_nodeID !=0 && $_returnNodeOnly==true)
{ {
$node = self::findNode($out,$_nodeID); $node = self::findNode($out,$_nodeID);
//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.array2string($node)); //error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.array2string($node));
if (is_numeric($_nodeID) && $_returnNodeOnly==false)
{
$baseNode = array('id' => 0);
$this->setOutStructure($node, $baseNode, self::$delimiter);
return $baseNode;
}
return $node; return $node;
} }
return ($c?$out:array('id'=>0, 'item'=>array('text'=>'INBOX','tooltip'=>'INBOX'.' '.lang('(not connected)'),'im0'=>'kfm_home.png'))); return ($c?$out:array('id'=>0, 'item'=>array('text'=>'INBOX','tooltip'=>'INBOX'.' '.lang('(not connected)'),'im0'=>'kfm_home.png')));