X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fread_body.php;h=ef50b070b5e69f717af3b3a483d277e8a9ba8a4e;hb=ff5d07191b97e40f412c228ec1fbeaf8136b06fd;hp=d3dc5f0ceca60b3f7d12445ca7cf9bfa79472a1b;hpb=c8e1425b8bc67eefde50972d45c674c8395d2d19;p=squirrelmail.git

diff --git a/src/read_body.php b/src/read_body.php
index d3dc5f0c..ef50b070 100644
--- 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,8 +383,7 @@ 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>';
 
@@ -502,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>';
@@ -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;
@@ -651,6 +651,7 @@ if (($attachment_common_show_images) &&
 
 do_hook('read_body_bottom');
 do_hook('html_bottom');
+//$message->clean_up();
 sqimap_logout($imapConnection);
 ?>
 </body>