git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13443...

[squirrelmail.git] / src / download.php

diff --git a/src/download.php b/src/download.php
index 3661029267b354232fff54da5c81f81078d4fb3c..65a56dd88c24372df4a6a82ea9aeaaf190686778 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/** This is the download page */
+define('PAGE_NAME', 'download');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -44,9 +47,8 @@ sqgetGlobalVar('messages',   $messages,     SQ_SESSION);
 sqgetGlobalVar('mailbox',    $mailbox,      SQ_GET);
 sqgetGlobalVar('ent_id',     $ent_id,       SQ_GET);
 sqgetGlobalVar('absolute_dl',$absolute_dl,  SQ_GET);
-if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
-    $passed_id = (int) $temp;
-}
+sqgetGlobalVar('force_crlf', $force_crlf,   SQ_GET);
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET, NULL, SQ_TYPE_BIGINT);
 if (!sqgetGlobalVar('account', $account, SQ_GET) ) {
     $account = 0;
 }
@@ -128,7 +130,7 @@ if (strlen($filename) < 1) {
     else if ($type1 == 'postscript' && $type0 == 'application')
         $suffix = 'ps';
     else if ($type1 == 'rfc822' && $type0 == 'message')
-        $suffix = 'msg';
+        $suffix = 'eml';
     else
         $suffix = $type1;
 
@@ -171,5 +173,5 @@ if (isset($absolute_dl) && $absolute_dl) {
 }
 /* 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);
+mime_print_body_lines ($imapConnection, $passed_id, $ent_id, $encoding, 'php://stdout', $force_crlf);