From 28057d583a9c8f39634ec57e4e17ed0ad8cfd271 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 22 Jul 2015 12:43:10 +0000 Subject: [PATCH] W.I.P. mail tree -Add Checked option to mail tree structure --- mail/inc/class.mail_tree.inc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mail/inc/class.mail_tree.inc.php b/mail/inc/class.mail_tree.inc.php index cfbeef506c..c50b84e580 100644 --- a/mail/inc/class.mail_tree.inc.php +++ b/mail/inc/class.mail_tree.inc.php @@ -132,7 +132,7 @@ class mail_tree return $hasChildren; }; - if ($_parent) $_profileID = $this->ui->mail_bo->icServerID; + if ($_parent) $_profileID = $this->ui->mail_bo->profileID; if (is_numeric($_profileID) && $_profileID != $this->ui->mail_bo->profileID) { @@ -167,7 +167,8 @@ class mail_tree tree::TOOLTIP => $nodeData['tooltip'], tree::IMAGE_LEAF => self::$leafImages['folderLeaf'], 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[tree::CHILDREN][0] = $childrenNode; @@ -213,7 +214,8 @@ class mail_tree tree::CHILDREN =>array(), tree::LABEL =>lang($foldersList[$index]['MAILBOX']), tree::OPEN => 1, - tree::TOOLTIP => lang($foldersList[$index]['MAILBOX']) + tree::TOOLTIP => lang($foldersList[$index]['MAILBOX']), + tree::CHECKED => $node['SUBSCRIBED'] ); if ($index === "INBOX") { @@ -255,7 +257,8 @@ class mail_tree tree::AUTOLOAD_CHILDREN => $fn_nodeHasChildren($node), tree::CHILDREN => array(), tree::LABEL => lang($folderName), - 'parent' => $parentPath + 'parent' => $parentPath, + tree::CHECKED => $node['SUBSCRIBED'] ); if (array_search($node['MAILBOX'], $definedFolders) !== false)