Initialize $output

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 1842480792fc67d4aa7b3abc23581fbaeda9148c..ef50b070b5e69f717af3b3a483d277e8a9ba8a4e 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -163,7 +163,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message) {
     global $username, $attachment_dir, $SERVER_NAME,
            $version, $attachments;
 
-    $header = $message->header;
+    $header = $message->rfc822_header;
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
     
     $recipient_o = $header->dnt;
@@ -311,18 +311,19 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
   global $msn_user_support, $default_use_mdn, $draft_folder, $sent_folder,
          $default_use_priority, $show_xmailer_default, 
         $mdn_user_support, $PHP_SELF, $javascript_on;
-  
-   $header = $message->header;
+
+   $header = $message->rfc822_header;
    $env = array();
-   $env[_("Subject")] = getLongDateString($header->date);
-   $from_o = $header->from;
-   if (is_object($from_o)) {
-       $from_name = $from_o->getAddress();
-   } else {
-       $from_name = _("Unknown sender");
+   $env[_("Subject")] = htmlspecialchars($header->subject);   
+   $from_name = $header->getAddr_s('from');
+   if (!$from_name) {
+     $from_name = $header->getAddr_s('sender');
+     if (!$from_name) {
+         $from_name = _("Unknown sender");
+     }
    }
    $env[_("From")] = htmlspecialchars($from_name);
-   $env[_("Date")] = htmlspecialchars($header->subject);
+   $env[_("Date")] = getLongDateString($header->date);
    $env[_("To")] = formatRecipientString($header->to, "to");
    $env[_("Cc")] = formatRecipientString($header->cc, "cc");
    $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc");
@@ -382,23 +383,21 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
           $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft;
 
    $topbar_delimiter = ' | ';
-   $urlMailbox = encodeHeader($mailbox);
-
+   $urlMailbox = urlencode($mailbox);
    $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
          ' border="0" bgcolor="'.$color[9].'"><tr><td align="left" width="33%"><small>';
 
    $msgs_url = $base_uri . 'src/';
    if (isset($where) && isset($what)) {
-      if ($pos == '') {
-          $pos=0;
-      }
-      $msgs_url .= 'search.php?where='.urlencode($where).'&amp;pos='.$pos.
+      $msgs_url .= 'search.php?where='.urlencode($where).
                    '&amp;what='.urlencode($what).'&amp;mailbox='.$urlMailbox;
+      $msgs_str = _("Search results");            
    } else {
       $msgs_url .= 'right_main.php?sort='.$sort.'&amp;startMessage='.
                   $startMessage.'&amp;mailbox='.$urlMailbox;
+      $msgs_str = _("Message List");
    }
-   $s .= '<a href="'. $msgs_url.'">'._("Message List").'</a>';
+   $s .= '<a href="'. $msgs_url.'">'.$msgs_str.'</a>';
    $s .= $topbar_delimiter;
    
    $delete_url = $base_uri . 'src/delete_message.php?mailbox='.$urlMailbox.
@@ -503,7 +502,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
 function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
    global $QUERY_STRING, $base_uri;
    
-   $urlMailbox = encodeHeader($mailbox);
+   $urlMailbox = urlencode($mailbox);
    $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
          ' border="0" bgcolor="'.$color[9].'">'. "\n".
         '<tr align="right"><td valign="top" align="right"><small>';
@@ -514,7 +513,8 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
          printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color);
    echo $s;
    do_hook("read_body_header_right");
-   echo '</small></td></tr></table>'."\n";
+   echo '</small></td></tr>';
+   echo '</table>'."\n";
 }
 
 
@@ -558,8 +558,8 @@ if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) {
    $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
    $messages[$uidvalidity][$passed_id] = $message;
 } else {
-//   $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
-   $message = $messages[$uidvalidity][$passed_id];
+   $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+//   $message = $messages[$uidvalidity][$passed_id];
 }
 $FirstTimeSee = !$message->is_seen;
 $message->is_seen = true;
@@ -614,12 +614,14 @@ $messagebody = '';
 $ent_ar = $message->findDisplayEntity(array());
 for ($i = 0; $i < count($ent_ar); $i++) {
    $messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
+   $messagebody .= '<hr noshade size=1>';
 }
 
 displayPageHeader($color, $mailbox);
 do_hook('read_body_top');
 formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
 formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
+do_hook("read_body_header");   
 formatToolbar($mailbox,$passed_id,$passed_ent_id,$message, $color);
 echo '<table width="100%" cellpadding="3" cellspacing="3" align="center"'.
       ' border="0" bgcolor="'.$color[4].'">';
@@ -649,6 +651,7 @@ if (($attachment_common_show_images) &&
 
 do_hook('read_body_bottom');
 do_hook('html_bottom');
+//$message->clean_up();
 sqimap_logout($imapConnection);
 ?>
 </body>