if any of the standard headers are blank, read_body.php doesn't show

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 11829d6fe7d9ee831b8fc07509d8a4ac8731097b..a16372b1a8bc8ebd648dac36efd829c958579b2b 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -58,6 +58,8 @@
       }
       echo "</pre></td></tr></table>\n";
       echo "</body></html>";
+      sqimap_mailbox_close($imapConnection);
+      sqimap_logout($imapConnection);
       exit;
    }
 
@@ -116,12 +118,25 @@
    $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
 
    /** translate the subject and mailbox into url-able text **/
-   $url_subj = urlencode(trim(stripslashes($message->header->subject)));
+   $url_subj = urlencode(trim(sqStripSlashes($message->header->subject)));
    $urlMailbox = urlencode($mailbox);
    $url_replyto = urlencode($message->header->replyto);
 
    $url_replytoall   = urlencode($message->header->replyto);
-   $url_replytoallcc = urlencode(getLineOfAddrs($message->header->to) . ", " . getLineOfAddrs($message->header->cc));
+   $url_replytoallcc = getLineOfAddrs($message->header->to);
+   $url_replytoallcc_cc = getLineOfAddrs($message->header->cc);
+   if ($url_replytoallcc) {
+      if ($url_replytoallcc_cc) {
+         $url_replytoallcc .= ", " . $url_replytoallcc_cc;
+      }
+   } else {
+      if ($url_replytoallcc_cc) {
+         $url_replytoallcc = $url_replytoallcc_cc;
+      } else {
+         $url_replytoallcc = "";
+      }
+   } 
+   $url_replytoallcc = urlencode($url_replytoallcc);
 
    $dateString = getLongDateString($message->header->date);
    $ent_num = findDisplayEntity($message);
@@ -135,7 +150,7 @@
    $to_string = "";
    $to_ary = $message->header->to;
    while ($i < count($to_ary)) {
-      $to_ary[$i] = htmlspecialchars($to_ary[$i]);
+      $to_ary[$i] = htmlspecialchars(decodeHeader($to_ary[$i]));
 
       if ($to_string)
          $to_string = "$to_string<BR>$to_ary[$i]";
@@ -169,7 +184,7 @@
    $i = 0;
    $cc_string = "";
    $cc_ary = $message->header->cc;
-   while ($i < count($cc_ary)) {
+   while ($i < count(decodeHeader($cc_ary))) {
       $cc_ary[$i] = htmlspecialchars($cc_ary[$i]);
       if ($cc_string)
          $cc_string = "$cc_string<BR>$cc_ary[$i]";
@@ -201,8 +216,9 @@
 
    /** make sure everything will display in HTML format **/
    $from_name = decodeHeader(htmlspecialchars($message->header->from));
-   $subject = decodeHeader(htmlspecialchars(stripslashes($message->header->subject)));
+   $subject = decodeHeader(htmlspecialchars($message->header->subject));
 
+   do_hook("read_body_top");
    echo "<BR>";
    echo "<TABLE COLS=1 CELLSPACING=0 WIDTH=100% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n";
    echo "   <TR><TD BGCOLOR=\"$color[9]\" WIDTH=100%>";
@@ -218,7 +234,7 @@
    echo _("Message List");
    echo "</A>&nbsp;|&nbsp;";
    if ($where && $what) {
-      echo "               <A HREF=\"delete_message.php?mailbox=$urlMailbox&message=$passed_id&sort=$sort&startMessage=1&where=".urlencode($where)."&what=".urlencode($what)."\">";
+      echo "               <A HREF=\"delete_message.php?mailbox=$urlMailbox&message=$passed_id&where=".urlencode($where)."&what=".urlencode($what)."\">";
    } else {
       echo "               <A HREF=\"delete_message.php?mailbox=$urlMailbox&message=$passed_id&sort=$sort&startMessage=1\">";
    }
@@ -268,7 +284,7 @@
    echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT>\n";
    echo _("Subject:");
    echo "         </TD><TD BGCOLOR=\"$color[0]\" WIDTH=84%>\n";
-   echo "            <B>$subject</B>\n";
+   echo "            <B>$subject</B>&nbsp;\n";
    echo "         </TD>\n";
    if ($where && $what) {
       // Got here from a search
@@ -282,7 +298,7 @@
    echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT>\n";
    echo _("From:");
    echo "         </TD><TD BGCOLOR=\"$color[0]\" WIDTH=85% colspan=2>\n";
-   echo "            <B>$from_name</B>\n";
+   echo "            <B>$from_name</B>&nbsp;\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** date **/
@@ -290,7 +306,7 @@
    echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT>\n";
    echo _("Date:");
    echo "         </TD><TD BGCOLOR=\"$color[0]\" WIDTH=85% colspan=2>\n";
-   echo "            <B>$dateString</B>\n";
+   echo "            <B>$dateString</B>&nbsp;\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** to **/
@@ -298,7 +314,7 @@
    echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT VALIGN=TOP>\n";
    echo _("To:");
    echo "         </TD><TD BGCOLOR=\"$color[0]\" WIDTH=85% VALIGN=TOP colspan=2>\n";
-   echo "            <B>$to_string</B>\n";
+   echo "            <B>$to_string</B>&nbsp;\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** cc **/
@@ -307,26 +323,26 @@
       echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT VALIGN=TOP>\n";
       echo "            Cc:\n";
       echo "         </TD><TD BGCOLOR=\"$color[0]\" WIDTH=85% VALIGN=TOP colspan=2>\n";
-      echo "            <B>$cc_string</B>\n";
+      echo "            <B>$cc_string</B>&nbsp;\n";
       echo "         </TD>\n";
       echo "      </TR>\n";
    }
    echo "</TABLE>";
    echo "   </TD></TR>";
    echo "</table>";
-   echo "<TABLE COLS=1 CELLSPACING=0 WIDTH=100% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n";
+   echo "<TABLE COLS=1 CELLSPACING=0 WIDTH=97% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n";
 
    echo "   <TR><TD BGCOLOR=\"$color[4]\" WIDTH=100%>\n";
-   $body = formatBody($imapConnection, $message, $color, $wrap_at);
    echo "<BR>";
+   
+   $body = formatBody($imapConnection, $message, $color, $wrap_at);
 
    echo "$body";
 
-   echo "   </TD></TR>\n";
-   echo "</table>";
    echo "<TABLE COLS=1 CELLSPACING=0 WIDTH=100% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n";
    echo "   <TR><TD BGCOLOR=\"$color[9]\">&nbsp;</TD></TR>";
    echo "</TABLE>\n";
 
+   do_hook("read_body_bottom");
    sqimap_logout($imapConnection);
 ?>