Fix issue where filesystem path was added to all-attachments (zip) file (#1...

Aleksander Machniak

2014-01-09 2eef77c6e349bc29d066068facd26b454d2392b6

Fix issue where filesystem path was added to all-attachments (zip) file (#1489507)

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix issues where filesystem path was added to all-attachments (zip) file (#1489507)
- Fix case-sensitivity of email addresses handling on compose (#1485499)
- Don't alter Message-ID of a draft when sending (#1489409)
- Fix issue where deprecated syntax for HTML lists was not handled properly (#1488768)

 plugins/zipdownload/CHANGELOG

File was deleted

 plugins/zipdownload/zipdownload.php

@@ -106,9 +106,20 @@
        $zip->open($tmpfname, ZIPARCHIVE::OVERWRITE);

        foreach ($message->attachments as $part) {
            $pid = $part->mime_id;
            $part = $message->mime_parts[$pid];
            $disp_name = $this->_convert_filename($part->filename);
            $pid      = $part->mime_id;
            $part     = $message->mime_parts[$pid];
            $filename = $part->filename;

            if ($filename === null || $filename === '') {
                $ext      = (array) rcube_mime::get_mime_extensions($part->mimetype);
                $ext      = array_shift($ext);
                $filename = $rcmail->gettext('messagepart') . ' ' . $pid;
                if ($ext) {
                    $filename .= '.' . $ext;
                }
            }

            $disp_name = $this->_convert_filename($filename);

            if ($part->body) {
                $orig_message_raw = $part->body;
@@ -205,11 +216,7 @@
            $subject = $this->_convert_filename($subject);
            $subject = substr($subject, 0, 16);

            if (isset($subject) && $subject !="")
                $disp_name = $subject . ".eml";
            else
                $disp_name = "message_rfc822.eml";

            $disp_name = ($subject ? $subject : 'message_rfc822') . ".eml";
            $disp_name = $uid . "_" . $disp_name;

            $tmpfn = tempnam($temp_dir, 'zipmessage');