|
@@ -21,8 +21,7 @@
|
|
* @author Steve Brown
|
|
* @author Steve Brown
|
|
* @since 1.5.2
|
|
* @since 1.5.2
|
|
*/
|
|
*/
|
|
-function getMessageCount ($boxes, $type='total')
|
|
|
|
-{
|
|
|
|
|
|
+function getMessageCount ($boxes, $type='total') {
|
|
// The Trash folder isn't counted...
|
|
// The Trash folder isn't counted...
|
|
if ($boxes->mailboxname_full == $GLOBALS['trash_folder'])
|
|
if ($boxes->mailboxname_full == $GLOBALS['trash_folder'])
|
|
return 0;
|
|
return 0;
|
|
@@ -49,8 +48,7 @@ function getMessageCount ($boxes, $type='total')
|
|
* @author Steve Brown
|
|
* @author Steve Brown
|
|
* @since 1.5.2
|
|
* @since 1.5.2
|
|
*/
|
|
*/
|
|
-function getBoxStructure ($boxes)
|
|
|
|
-{
|
|
|
|
|
|
+function getBoxStructure ($boxes) {
|
|
global $data_dir, $username, $icon_theme_path;
|
|
global $data_dir, $username, $icon_theme_path;
|
|
|
|
|
|
// Stop condition
|
|
// Stop condition
|
|
@@ -80,6 +78,12 @@ function getBoxStructure ($boxes)
|
|
$box['IsRoot'] = isset($boxes->is_root) && $boxes->is_root;
|
|
$box['IsRoot'] = isset($boxes->is_root) && $boxes->is_root;
|
|
$box['IsNoSelect'] = isset($boxes->is_noselect) && $boxes->is_noselect;
|
|
$box['IsNoSelect'] = isset($boxes->is_noselect) && $boxes->is_noselect;
|
|
|
|
|
|
|
|
+ $box['IsInbox'] = isset($boxes->is_inbox) && $boxes->is_inbox;
|
|
|
|
+ $box['IsSent'] = isset($boxes->is_sent) && $boxes->is_sent;
|
|
|
|
+ $box['IsTrash'] = isset($boxes->is_trash) && $boxes->is_trash;
|
|
|
|
+ $box['IsDraft'] = isset($boxes->is_draft) && $boxes->is_draft;
|
|
|
|
+ $box['IsNoInferiors'] = isset($boxes->is_noinferiors) && $boxes->is_noinferiors;
|
|
|
|
+
|
|
$collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
|
|
$collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
|
|
$collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
|
|
$collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
|
|
$collapse = (int)$collapse == SM_BOX_COLLAPSED;
|
|
$collapse = (int)$collapse == SM_BOX_COLLAPSED;
|