X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdownload.php;h=bdd2a23c3b45448b5bebc8d64ef4735eceb0715a;hb=3cd52f38c5e51e948d935cd9e9e1f480b685ac3d;hp=501421a44e3bae6b8168c2bfabcb8cbf00ccaf2d;hpb=f740c049d91feb836dd9633be9e8ff52c00d066f;p=squirrelmail.git
diff --git a/src/download.php b/src/download.php
index 501421a4..bdd2a23c 100644
--- a/src/download.php
+++ b/src/download.php
@@ -1,166 +1,142 @@
rfc822_header->subject;
+if ($ent_id) {
+ $message = &$message->getEntity($ent_id);
+ $header = $message->header;
+
+ if ($message->rfc822_header) {
+ $subject = $message->rfc822_header->subject;
+ } else {
+ $header = $message->header;
+ }
+ $type0 = $header->type0;
+ $type1 = $header->type1;
+ $encoding = strtolower($header->encoding);
+} else {
+ /* raw message */
+ $type0 = 'message';
+ $type1 = 'rfc822';
+ $encoding = 'US-ASCII';
+ $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.
+ */
+
+if (isset($override_type0)) {
+ $type0 = $override_type0;
+}
+if (isset($override_type1)) {
+ $type1 = $override_type1;
+}
+$filename = '';
+if (is_object($message->header->disposition)) {
+ $filename = $header->disposition->getProperty('filename');
+ if (!$filename) {
+ $filename = $header->disposition->getProperty('name');
+ }
+ if (!$filename) {
+ $filename = $header->getParameter('name');
+ }
+} else {
+ $filename = $header->getParameter('name');
+}
+
+//$filename = decodeHeader($filename, false, false); //Don't want html output nor utf8 because it will return html output
+$filename = decodeHeader($filename, true, false); //Don't want html output
+if (strlen($filename) < 1) {
+ //$filename = decodeHeader($subject, false, false); //Don't want html output nor utf8 because it will return html output
+ $filename = decodeHeader($subject, true, false); //Don't want html output
+ 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 == 'rfc822' && $type0 == 'message')
+ $suffix = 'msg';
+ else
+ $suffix = $type1;
+
+ if ($filename == '')
+ $filename = 'untitled' . strip_tags($ent_id);
+ $filename = $filename . '.' . $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 (isset($absolute_dl) && $absolute_dl) {
+ SendDownloadHeaders($type0, $type1, $filename, 1);
+} else {
+ SendDownloadHeaders($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, $ent_id, $encoding);
- include('../src/validate.php');
- include("../functions/strings.php");
- include("../config/config.php");
- include("../functions/imap.php");
- include("../functions/mime.php");
- include("../functions/date.php");
- include("../functions/i18n.php");
- include("../src/load_prefs.php");
-
- header("Pragma: ");
- header("Cache-Control: cache");
-
- function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
- global $where, $what, $charset;
- global $startMessage;
-
- displayPageHeader($color, "None");
-
- echo "
";
- echo " |
"; - echo ""; - echo " |
"; - echo " |
"; - - if ($type1 != "html") - translateText($body, $wrap_at, $charset); - - echo $body; - - echo " |