added a bunch more hooks

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 59e6f0d32a288c2561c95135e86e562d0d1e7c02..b1041c612bedf52249a4588f307e42d0f50d3e22 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -58,6 +58,7 @@
       }
       echo "</pre></td></tr></table>\n";
       echo "</body></html>";
+      sqimap_logout($imapConnection);
       exit;
    }
 
@@ -121,7 +122,20 @@
    $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);
@@ -203,6 +217,7 @@
    $from_name = decodeHeader(htmlspecialchars($message->header->from));
    $subject = decodeHeader(htmlspecialchars(stripslashes($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%>";
@@ -314,19 +329,19 @@
    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);
 ?>