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

Mail tree phase 2 WIP: Fix checkedSubscribed checkboxes

Browse Source
This commit is contained in:
Hadi Nategh 2015-08-10 14:54:38 +00:00
parent dab7ab0bdd
commit a9a246c727
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,10 +168,11 @@ class mail_tree
* @param $_noCheckboxNS = false no checkbox for namesapaces makes sure to not put checkbox for namespaces node * @param $_noCheckboxNS = false no checkbox for namesapaces makes sure to not put checkbox for namespaces node
* @param boolean $_subscribedOnly = false get only subscribed folders * @param boolean $_subscribedOnly = false get only subscribed folders
* @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go
* @param boolean $_checkSubscribed = true, pre-check checkboxes of subscribed folders
* *
* @return array returns an array of mail tree structure according to provided node * @return array returns an array of mail tree structure according to provided node
*/ */
function getTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly= false, $_allInOneGo = false) function getTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly= false, $_allInOneGo = false, $_checkSubscribed = true)
{ {
//Init mail folders //Init mail folders
$tree = array(tree::ID=> $_parent?$_parent:0,tree::CHILDREN => array()); $tree = array(tree::ID=> $_parent?$_parent:0,tree::CHILDREN => array());
@ -219,7 +220,7 @@ class mail_tree
tree::IMAGE_LEAF => self::$leafImages['folderLeaf'], tree::IMAGE_LEAF => self::$leafImages['folderLeaf'],
tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderOpen'], tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderOpen'],
tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderClose'], tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderClose'],
tree::CHECKED => $node['SUBSCRIBED'], tree::CHECKED => $_checkSubscribed?$node['SUBSCRIBED']:false,
'parent' => $_parent 'parent' => $_parent
); );
} }
@ -254,7 +255,7 @@ class mail_tree
tree::LABEL =>lang($folder['MAILBOX']), tree::LABEL =>lang($folder['MAILBOX']),
tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel?1:0, tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel?1:0,
tree::TOOLTIP => lang($folder['MAILBOX']), tree::TOOLTIP => lang($folder['MAILBOX']),
tree::CHECKED => $folder['SUBSCRIBED'], tree::CHECKED => $_checkSubscribed?$folder['SUBSCRIBED']:false,
tree::NOCHECKBOX => 0, tree::NOCHECKBOX => 0,
'parent' => $parent?$_profileID.self::$delimiter.implode($folder['delimiter'], $parent):$_profileID, 'parent' => $parent?$_profileID.self::$delimiter.implode($folder['delimiter'], $parent):$_profileID,
'path' => $path, 'path' => $path,
@ -264,6 +265,7 @@ class mail_tree
if ($folder['MAILBOX'] === "INBOX") if ($folder['MAILBOX'] === "INBOX")
{ {
$data['data'] = array('acl' => $this->ui->mail_bo->icServer->queryCapability('ACL')); $data['data'] = array('acl' => $this->ui->mail_bo->icServer->queryCapability('ACL'));
$data[tree::NOCHECKBOX] = $_noCheckboxNS;
} }
else else
{ {