X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdownload.php;h=7c92975b79016db4216da3cd6333ce85675d742a;hb=a037624df01cf9f452f19b93565107926b69d66c;hp=8009c0288222a3a7d2eff64155d89d259e052c02;hpb=e146912692c921160f93dcb6da97dc6246bf95d2;p=squirrelmail.git diff --git a/src/download.php b/src/download.php index 8009c028..7c92975b 100644 --- a/src/download.php +++ b/src/download.php @@ -1,4 +1,14 @@ -\n"; + global $where, $what, $charset; + global $startMessage; displayPageHeader($color, "None"); - echo "
"; + echo "
"; echo "
"; - echo _("Viewing a plain text attachment"); - echo "
"; - echo "
"; + echo _("Viewing a text attachment") . " - "; + if ($where && $what) { + // from a search + echo "". _("View message") . ""; + } else { + echo "". _("View message") . ""; + } + $urlmailbox = urlencode($mailbox); - echo "
"; + echo "
"; echo _("Download this as a file"); - echo "


"; + echo "
"; + echo ""; + echo "
"; + + echo "
"; + echo "
"; + if ($type1 == "html") echo $body; else - echo translateText($body, $wrap_at); + echo translateText($body, $wrap_at, $charset); echo "
"; } @@ -41,44 +63,80 @@ // $message contains all information about the message // including header and body $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + $top_header = $message->header; + + // lets redefine message as this particular entity that we wish to display. + // it should hold only the header for this entity. We need to fetch the body + // yet before we can display anything. + $message = getEntity($message, $passed_ent_id); - $type0 = $message["ENTITIES"][$passed_ent_id]["TYPE0"]; - $type1 = $message["ENTITIES"][$passed_ent_id]["TYPE1"]; - $filename = $message["ENTITIES"][$passed_ent_id]["FILENAME"]; + $header = $message->header; + $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); + + $charset = $header->charset; + $type0 = $header->type0; + $type1 = $header->type1; + $filename = decodeHeader($header->filename); if (strlen($filename) < 1) { - $filename = "untitled$passed_ent_id"; + if ($type1 == "plain" && $type0 == "text") $suffix = "txt"; + else if ($type1 == "richtext" && $type0 == "text") $suffix = "rtf"; + else if ($type1 == "postscript" && $type0 == "application") $suffix = "ps"; + else if ($type1 == "message" && $type0 == "rfc822") $suffix = "msg"; + else $suffix = $type1; + + $filename = "untitled$passed_ent_id.$suffix"; } + // Note: + // The following sections display the attachment in different + // ways depending on how they choose. The first way will download + // under any circumstance. This sets the Content-type to be + // applicatin/octet-stream, which should be interpreted by the + // browser as "download me". + // The second method (view) is used for images or other formats + // that should be able to be handled by the browser. It will + // most likely display the attachment inline inside the browser. + // And finally, the third one will be used by default. If it + // is displayable (text or html), it will load them up in a text + // viewer (built in to squirrelmail). Otherwise, it sets the + // content-type as application/octet-stream + if ($absolute_dl == "true") { switch($type0) { case "text": - $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]); - header("Content-type: $type0/$type1; name=\"$filename\""); + $body = decodeBody($body, $header->encoding); header("Content-Disposition: attachment; filename=\"$filename\""); + header("Content-type: application/octet-stream; name=\"$filename\""); + if ($type1 == "plain") { + echo _("Subject") . ": " . decodeHeader(stripslashes($top_header->subject)) . "\n"; + echo " " . _("From") . ": " . decodeHeader(stripslashes($top_header->from)) . "\n"; + echo " " . _("To") . ": " . decodeHeader(stripslashes(getLineOfAddrs($top_header->to))) . "\n"; + echo " " . _("Date") . ": " . getLongDateString($top_header->date) . "\n\n"; + } echo trim($body); break; default: - $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]); - header("Content-type: $type0/$type1; name=\"$filename\""); + $body = decodeBody($body, $header->encoding); header("Content-Disposition: attachment; filename=\"$filename\""); + header("Content-type: application/octet-stream; name=\"$filename\""); echo $body; break; } } else { switch ($type0) { case "text": - $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]); + $body = decodeBody($body, $header->encoding); viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); break; case "message": - $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]); + $body = decodeBody($body, $header->encoding); viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); break; default: - $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]); - header("Content-type: $type0/$type1; name=\"$filename\""); + $body = decodeBody($body, $header->encoding); header("Content-Disposition: attachment; filename=\"$filename\""); + header("Content-type: $type0/$type1; name=\"$filename\""); echo $body; break; }