download related fixes

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index f07d5760d111ea057d6bc2e956e13d7d440737c3..ac3b222a46837fca2436383b2899cfe0c447ab8a 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -393,7 +393,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
         $name = '';
         $Links['download link']['text'] = _("download");
         $Links['download link']['href'] =
         $name = '';
         $Links['download link']['text'] = _("download");
         $Links['download link']['href'] =

-                "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
+                "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&ent_id=$ent";

         $ImageURL = '';
         if ($type0 =='message' && $type1 == 'rfc822') {
             $default_page = '../src/read_body.php';
         $ImageURL = '';
         if ($type0 =='message' && $type1 == 'rfc822') {
             $default_page = '../src/read_body.php';


@@ -438,9 +438,14 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
         }
 
         $display_filename = $filename;
         }
 
         $display_filename = $filename;

+       if (isset($passed_ent_id)) {
+          $passed_ent_id_link = '&passed_ent_id='.$passed_ent_id;
+       } else {
+          $passed_ent_id_link = '';
+       }

         $DefaultLink = $default_page . "?startMessage=$startMessage"
                      . "&passed_id=$id&mailbox=$urlMailbox"
         $DefaultLink = $default_page . "?startMessage=$startMessage"
                      . "&passed_id=$id&mailbox=$urlMailbox"

-                     . "&passed_ent_id=$ent";
+                     . '&ent_id='.$ent.$passed_ent_id_link;

         if ($where && $what) {
            $DefaultLink = '&where='. urlencode($where).'&what='.urlencode($what);
         }
         if ($where && $what) {
            $DefaultLink = '&where='. urlencode($where).'&what='.urlencode($what);
         }