updated changelog

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index df2931d1e767ccad9e13d052ac9d8823d8a9a73e..379f8b1f9932a0f0b30df0a4421a7201388dd7fd 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -46,6 +46,7 @@
        session_register('attachments');
    }
 
+
    // This function is used when not sending or adding attachments
    function newMail () {
       global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
@@ -178,7 +179,7 @@
 
               $newAttachment['localfilename'] = $localfilename;
              $newAttachment['remotefilename'] = $filename;
-             $newAttachment['type0'] = strtolower($message->header->type0 .
+             $newAttachment['type'] = strtolower($message->header->type0 .
                 '/' . $message->header->type1);
 
               // Write Attachment to file
@@ -203,7 +204,7 @@
          $passed_body, $color, $use_signature, $signature, $prefix_sig, 
          $editor_size, $attachments, $subject, $newmail, 
          $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox, 
-         $from_htmladdr_search, $location_of_buttons;
+         $from_htmladdr_search, $location_of_buttons, $attachment_dir;
 
       $subject = decodeHeader($subject);
       $reply_subj = decodeHeader($reply_subj);
@@ -319,7 +320,9 @@
          echo "</td><td align=left bgcolor=\"$color[0]\">";
         foreach ($attachments as $key => $info) {
             echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$key\">\n";
-           echo $info['remotefilename'] . "<br>\n";
+           echo $info['remotefilename'] . " - " . $info['type'] . " (";
+           echo show_readable_size(filesize($attachment_dir . 
+               $info['localfilename'])) . ")<br>\n";
          }
          
          echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";