rfc822_header stuff

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3267 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/download.php b/src/download.php
index 368f4f893b71a0aad46769c118285ad1bf7585c3..1bc5f4e5c86b996ef410737fffad42931d03f7ac 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -46,7 +46,7 @@ $message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"];
 $message = &$message->getEntity($passed_ent_id);
 
 $header = $message->header;
-$charset = $header->charset;
+$charset = $header->getParameter('charset');
 $type0 = $header->type0;
 $type1 = $header->type1;
 $encoding = strtolower($header->encoding);
@@ -86,10 +86,10 @@ if (isset($override_type1)) {
     $type1 = $override_type1;
 }
 
-$filename = decodeHeader($message->header->filename);
+$filename = decodeHeader($message->header->getParameter('filename'));
 
 if (!$filename) {
-    $filename = decodeHeader($message->header->name);
+    $filename = decodeHeader($message->header->getParameter('name'));
 }
 
 if (strlen($filename) < 1) {
@@ -136,6 +136,8 @@ if (isset($absolute_dl) && $absolute_dl == 'true') {
 } else {
     DumpHeaders($type0, $type1, $filename, 0);
 }
+/* be aware that any warning caused by download.php will corrupt the
+ * attachment in case of ERROR reporting = E_ALL and the output is the screen */
 mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $encoding);
 
 $message = &$message->getEntity('');

diff --git a/src/read_body.php b/src/read_body.php
index 38efa9fad49776535b9008fc2b2f0e519c4d01f8..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,15 +311,16 @@ 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")] = htmlspecialchars($header->subject);   
-   $from_o = $header->from;
-   if (is_object($from_o)) {
-       $from_name = $from_o->getAddress();
-   } else {
-       $from_name = _("Unknown sender");
+   $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")] = getLongDateString($header->date);
@@ -557,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;