Bugfix, remove bcc and cc display when empty

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index fd546af207251ac2c5e0ec64090526d6716dbb6f..42bfada00a38b7090e9974582463c538da1e89c5 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -548,11 +548,11 @@ function mail_message_listing_beginning
     echo '</TD></TR>'.
 
         "<TR><TD BGCOLOR=\"$color[0]\">".
-        "<TABLE WIDTH=\"100%\" BORDER=0 CELLPADDING=2 CELLSPACING=";
+        '<TABLE WIDTH="100%" BORDER=0 CELLPADDING=2 CELLSPACING=';
     if ($GLOBALS['alt_index_colors']) {
-        echo "0";
+        echo '0';
     } else {
-        echo "1";
+        echo '1';
     }
     echo " BGCOLOR=\"$color[0]\">".
         "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
@@ -943,4 +943,4 @@ function handleAsSent($mailbox) {
     return ($handleAsSent_result);
 }
 
-?>
+?>
\ No newline at end of file

diff --git a/src/read_body.php b/src/read_body.php
index 165b6429bb0d9cc4ca2db10537c07c3b8a00abbd..fc08e01c9992679a421c5e37bb3cbf18aee81d8d 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -755,7 +755,7 @@ echo       "<TR>\n" .
              '</TD>' . "\n" .
           '</TR>' . "\n";
 /** cc **/
-if (isset($cc_string)) {
+if (isset($cc_string) && $cc_string <> '') {
     echo       '<TR>' .
                  "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
                     'Cc:' .
@@ -766,7 +766,7 @@ if (isset($cc_string)) {
 }
 
 /** bcc **/
-if (isset($bcc_string)) {
+if (isset($bcc_string) && $bcc_string <> '') {
     echo       '<TR>'.
                  "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
                     'Bcc:' .
@@ -775,16 +775,14 @@ if (isset($bcc_string)) {
                  '</TD>' .
               '</TR>' . "\n";
 }
-if ($default_use_priority) {
-    if (isset($priority_string)) {
-        echo       '<TR>' .
-                     "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
-                           _("Priority") . ': '.
-                     "</TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>" .
-                        "<B>$priority_string</B>&nbsp;" .
-                     '</TD>' .
-                  "</TR>" . "\n";
-    }
+if ($default_use_priority && isset($priority_string) && $priority_string <> '' ) {
+    echo       '<TR>' .
+                 "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
+                       _("Priority") . ': '.
+                 "</TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>" .
+                    "<B>$priority_string</B>&nbsp;" .
+                 '</TD>' .
+              "</TR>" . "\n";
 }
 
 if ($show_xmailer_default) {