Advanced mailbox (oldway and advancedtree) mode wasn't respecting the

default values in the config.php file for unseen notifications.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5935 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/left_main.php b/src/left_main.php
index 4e9eab76ea1283a5ddde5ca23a54cee8d37f0185..0f13c1d5ccf9c4d24559113cee1f04fcaaa8ee53 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -287,18 +287,13 @@ function is_parent_box($curbox_name, $parbox_name) {
 
 function ListBoxes ($boxes, $j=0 ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-    $move_to_trash, $trash_folder, $collapse_folders, $imapConnection;
+           $move_to_trash, $trash_folder, $collapse_folders, $imapConnection;
+
     $pre = '<nobr>';
     $end = '';
     $collapse = false;
-    $unseen_type = 1;
-    $unseen_notify = 0;
     $unseen = 0;
 
-    /* Get unseen/total display prefs */
-    $unseen_type = getPref( $data_dir , $username , 'unseen_type' );
-    $unseen_notify = getPref( $data_dir , $username , 'unseen_notify' );
-
     if (isset($boxes) && !empty($boxes)) {
         $mailbox = $boxes->mailboxname_full;
         $leader = '<tt>';
@@ -431,7 +426,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-    $move_to_trash, $trash_folder, $collapse_folders, $oldway, $advanced_tree;
+           $move_to_trash, $trash_folder, $collapse_folders;
 
     if (!$boxes)
        return;
@@ -991,6 +986,26 @@ if ( $collapse_folders ) {
     }
 }
 
+/* Get unseen/total display prefs */
+$unseen_type = getPref( $data_dir , $username , 'unseen_type' );
+$unseen_notify = getPref( $data_dir , $username , 'unseen_notify' );
+
+if (!isset($unseen_type) || empty($unseen_type)) {
+    if (isset($default_unseen_type) && !empty($default_unseen_type)) {
+        $unseen_type = $default_unseen_type;
+    } else {
+        $unseen_type = 1;
+    }
+}
+
+if (!isset($unseen_notify) || empty($unseen_notify)) {
+    if (isset($default_unseen_notify) && !empty($default_unseen_notify)) {
+        $unseen_notify = $default_unseen_notify;
+    } else {
+        $unseen_notify = 0;
+    }
+}
+
 if ($oldway) {  /* normal behaviour SM */
 
 $boxes = sqimap_mailbox_list($imapConnection);