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

Mail tree phase2 W.I.P.: Set the initial counters for opened folders

Browse Source
This commit is contained in:
Hadi Nategh 2015-08-05 10:22:29 +00:00
parent 18b9ff23f5
commit 1d264a8b64
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,7 +239,7 @@ class mail_tree
} }
//List of folders //List of folders
$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly); $foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly, true);
foreach ($foldersList as &$folder) foreach ($foldersList as &$folder)
{ {
$path = $parent = $parts = explode($folder['delimiter'], $folder['MAILBOX']); $path = $parent = $parts = explode($folder['delimiter'], $folder['MAILBOX']);
@ -379,7 +379,7 @@ class mail_tree
{ {
$path = explode($data['folderarray']['delimiter'], $data['folderarray']['MAILBOX']); $path = explode($data['folderarray']['delimiter'], $data['folderarray']['MAILBOX']);
$folderName = array_pop($path); $folderName = array_pop($path);
if ($data['folderarray']['MAILBOX'] === "INBOX") if ($data['folderarray']['MAILBOX'] === "INBOX")
{ {
$data[tree::IMAGE_LEAF] = self::$leafImages['folderHome']; $data[tree::IMAGE_LEAF] = self::$leafImages['folderHome'];
@ -413,6 +413,17 @@ class mail_tree
$data[tree::IMAGE_FOLDER_OPEN] = self::$leafImages['folderOpen']; $data[tree::IMAGE_FOLDER_OPEN] = self::$leafImages['folderOpen'];
$data[tree::IMAGE_FOLDER_CLOSED] = self::$leafImages['folderClose']; $data[tree::IMAGE_FOLDER_CLOSED] = self::$leafImages['folderClose'];
} }
// Contains unseen mails for the folder
$unseen = $data['folderarray']['counter']['UNSEEN'];
// if there's unseen mails then change the label and style
// accordingly to indicate useen mails
if ($unseen > 0)
{
$data[tree::LABEL] = $data[tree::LABEL].'('.$unseen.')';
$data['style'] = 'font-weight: bold';
}
} }
//Remove extra data from tree structure //Remove extra data from tree structure
unset($data['folderarray']); unset($data['folderarray']);