- Changed version numbers from 0.6pre1 to 1.0pre1

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 4925d8769b4f02ab926e72ca9b769b5bb67174c2..3aa9bdb43385b94a9506b270986776e299f3d32b 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -27,6 +27,7 @@
    include("../src/load_prefs.php");
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
    sqimap_mailbox_select($imapConnection, $mailbox);
+   do_hook("html_top");
    displayPageHeader($color, $mailbox);
 
    if ($view_hdr) {
@@ -58,6 +59,7 @@
       }
       echo "</pre></td></tr></table>\n";
       echo "</body></html>";
+      sqimap_mailbox_close($imapConnection);
       sqimap_logout($imapConnection);
       exit;
    }
@@ -283,7 +285,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
@@ -297,7 +299,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 **/
@@ -305,7 +307,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 **/
@@ -313,7 +315,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 **/
@@ -322,7 +324,7 @@
       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";
    }
@@ -336,12 +338,13 @@
    
    $body = formatBody($imapConnection, $message, $color, $wrap_at);
 
-   echo "$body";
-
+   echo $body;
+   
    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");
+   do_hook("html_bottom");
    sqimap_logout($imapConnection);
 ?>