use_special_folder_color conf.pl setting works again, closes #931956.

This is definately something that should be done in a stylesheet, not like this.

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

diff --git a/ChangeLog b/ChangeLog
index f5b749a0e8f30a7514e6260e95f207e7d1c36633..33f88bf79d8bceb2080b7b50b11edfc355cec347 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,7 +51,8 @@ Version 1.5.1 -- CVS
     of long format. (only occures in the timeframe around 0:00 AM till
     timezone).
   - Added address book sorting options. Ascending/descending sorting code 
     of long format. (only occures in the timeframe around 0:00 AM till
     timezone).
   - Added address book sorting options. Ascending/descending sorting code 

-    written by Bryan Loniewski 
+    written by Bryan Loniewski.
+  - Use Special Folder Color config option works again (#931956).

 
 Version 1.5.0
 --------------------
 
 Version 1.5.0
 --------------------

diff --git a/src/left_main.php b/src/left_main.php
index 48640cbc04712ca7ee62b269fc46c44cf818692b..505d2bcd02461dfd96ae59c7358e5fd3b48a8bfd 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -298,7 +298,7 @@ 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, 
 function ListBoxes ($boxes, $j=0 ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
            $move_to_trash, $trash_folder, $collapse_folders, $imapConnection, 

-           $use_icons, $icon_theme;
+           $use_icons, $icon_theme, $use_special_folder_color;

 
     if (!isset($boxes) || empty($boxes))
         return;
 
     if (!isset($boxes) || empty($boxes))
         return;


@@ -421,7 +421,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
     $font = '';
     $fontend = '';
 
     $font = '';
     $fontend = '';

-    if ($boxes->is_special) {
+    if ($use_special_folder_color && $boxes->is_special) {

         $font = "<font color=\"$color[11]\">";
         $fontend = "</font>";
     }
         $font = "<font color=\"$color[11]\">";
         $fontend = "</font>";
     }


@@ -447,7 +447,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,

-           $move_to_trash, $trash_folder, $collapse_folders;
+           $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;

 
     if (!isset($boxes) || empty($boxes))
         return;
 
     if (!isset($boxes) || empty($boxes))
         return;


@@ -502,7 +502,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     if ($unseen > 0) { $pre .= '<b>'; }
 
     /* color special boxes */
     if ($unseen > 0) { $pre .= '<b>'; }
 
     /* color special boxes */

-    if ($boxes->is_special) {
+    if ($use_special_folder_color && $boxes->is_special) {

         $pre .= "<font color=\"$color[11]\">";
         $end .= '</font>';
     }
         $pre .= "<font color=\"$color[11]\">";
         $end .= '</font>';
     }