Request 2836 (accepted)

Overview

Request 2836 (accepted)

Release 1.4.11.18

Created by vanmeeuwen over 2 years ago
In state accepted

Submit roundcubemail

Submit package Kolab:Winterfell / roundcubemail to package Kolab:16 / roundcubemail

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.4.11.8.tar.gz/CHANGELOG -> roundcubemail-1.4.11.18.tar.gz/CHANGELOG Changed

@@ -1,11 +1,17 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
-- Fix bug where contacts search didn't work with addressbook_search_mods set to an empty array (#7974)
+- Disable the default spellchecker option using spell.roundcube.net (#8182)
 - Enigma: Fix bug where signature verification could fail for non-ascii bodies (#7919)
+- Fix bug where contacts search didn't work with addressbook_search_mods set to an empty array (#7974)
 - Fix bug causing some HTML message content to be not centered in Elastic skin (#7911)
 - Fix bug where consecutive LDAP searches could return wrong results (#8064)
 - Fix bug where plus characters in attachment filename could have been ignored (#8074)
+- Fix displaying HTML body with inline images encapsulated using TNEF format (winmail.dat)
+- Fix handling of custom sender addresses with names (#8106)
+- Fix shift + drag'n'drop menu not working in Elastic skin with Chrome browser (#8107)
+- Fix Firefox infinate loading display on mail screen (#8128)
+- Fix XSS issue in handling attachment filename extension in mimetype mismatch warning (#8193)
 
 RELEASE 1.4.11
 --------------

roundcubemail-1.4.11.8.tar.gz/config/defaults.inc.php -> roundcubemail-1.4.11.18.tar.gz/config/defaults.inc.php Changed

@@ -785,27 +785,24 @@
 $config['quota_zero_as_unlimited'] = false;
 
 // Make use of the built-in spell checker. It is based on GoogieSpell.
-$config['enable_spellcheck'] = true;
+$config['enable_spellcheck'] = false;
 
 // Enables spellchecker exceptions dictionary.
 // Setting it to 'shared' will make the dictionary shared by all users.
 $config['spellcheck_dictionary'] = false;
 
 // Set the spell checking engine. Possible values:
-// - 'googie'  - the default (also used for connecting to Nox Spell Server, see 'spellcheck_uri' setting)
+// - 'googie'  - requires 'spellcheck_uri' option to be set (also used for connecting to Nox Spell Server)
 // - 'pspell'  - requires the PHP Pspell module and aspell installed
 // - 'enchant' - requires the PHP Enchant module
 // - 'atd'     - install your own After the Deadline server or check with the people at http://www.afterthedeadline.com before using their API
-// Since Google shut down their public spell checking service, the default settings
-// connect to http://spell.roundcube.net which is a hosted service provided by Roundcube.
 // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
 $config['spellcheck_engine'] = 'googie';
 
 // For locally installed Nox Spell Server or After the Deadline services,
 // please specify the URI to call it.
-// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 or
-// the After the Deadline package from http://www.afterthedeadline.com.
-// Leave empty to use the public API of service.afterthedeadline.com
+// Get Nox Spell Server from https://github.com/handwritingio/nox_spell_server or
+// the After the Deadline package from http://www.afterthedeadline.com
 $config['spellcheck_uri'] = '';
 
 // These languages can be selected for spell checking.

roundcubemail-1.4.11.8.tar.gz/plugins/password/localization/nl_NL.inc -> roundcubemail-1.4.11.18.tar.gz/plugins/password/localization/nl_NL.inc Changed

roundcubemail-1.4.11.8.tar.gz/program/include/rcmail_sendmail.php -> roundcubemail-1.4.11.18.tar.gz/program/include/rcmail_sendmail.php Changed

roundcubemail-1.4.11.8.tar.gz/program/js/app.js -> roundcubemail-1.4.11.18.tar.gz/program/js/app.js Changed

roundcubemail-1.4.11.8.tar.gz/program/lib/Roundcube/rcube_message.php -> roundcubemail-1.4.11.18.tar.gz/program/lib/Roundcube/rcube_message.php Changed

@@ -381,7 +381,13 @@
                     $last      = $parent->real_mimetype ?: $parent->mimetype;
 
                     if (!preg_match('/^multipart\/(alternative|related|signed|encrypted|mixed)$/', $last)
-                        || ($last == 'multipart/mixed' && $parent_depth < $max_delta)) {
+                        || ($last == 'multipart/mixed' && $parent_depth < $max_delta)
+                    ) {
+                        // The HTML body part extracted from a winmail.dat attachment part
+                        if (strpos($part->mime_id, 'winmail.') === 0) {
+                            return true;
+                        }
+
                         continue 2;
                     }
                 }
@@ -822,9 +828,33 @@
                 // part is Microsoft Outlook TNEF (winmail.dat)
                 else if ($part_mimetype == 'application/ms-tnef' && $this->tnef_decode) {
                     $tnef_parts = (array) $this->tnef_decode($mail_part);
+                    $tnef_body  = '';
+
                     foreach ($tnef_parts as $tpart) {
                         $this->mime_parts[$tpart->mime_id] = $tpart;
-                        $this->add_part($tpart, 'attachment');
+
+                        if (strpos($tpart->mime_id, '.html')) {
+                            $tnef_body = $tpart->body;
+                            if ($this->opt['prefer_html']) {
+                                $tpart->type = 'content';
+
+                                // Reset type on the plain text part that usually is added to winmail.dat messages
+                                // (on the same level in the structure as the attachment itself)
+                                $level = count(explode('.', $mail_part->mime_id));
+                                foreach ($this->parts as $p) {
+                                    if ($p->type == 'content' && $p->mimetype == 'text/plain'
+                                        && count(explode('.', $p->mime_id)) == $level
+                                    ) {
+                                        $p->type = null;
+                                    }
+                                }
+                            }
+                            $this->add_part($tpart);
+                        }
+                        else {
+                            $inline = !empty($tpart->content_id) && strpos($tnef_body, "cid:{$tpart->content_id}") !== false;
+                            $this->add_part($tpart, $inline ? 'inline' : 'attachment');
+                        }
                     }
 
                     // add winmail.dat to the list if it's content is unknown
@@ -1005,6 +1035,26 @@
 
         unset($body);
 
+        // HTML body
+        if (
+            !empty($tnef_arr['message'])
+            && !empty($tnef_arr['message']['size'])
+            && $tnef_arr['message']['subtype'] == 'html'
+        ) {
+            $tpart = new rcube_message_part;
+
+            $tpart->encoding        = 'stream';
+            $tpart->ctype_primary   = 'text';
+            $tpart->ctype_secondary = 'html';
+            $tpart->mimetype        = 'text/html';
+            $tpart->mime_id         = 'winmail.' . $part->mime_id . '.html';
+            $tpart->size            = $tnef_arr['message']['size'];
+            $tpart->body            = $tnef_arr['message']['stream'];
+
+            $parts[] = $tpart;
+        }
+
+        // Attachments
         foreach ($tnef_arr['attachments'] as $pid => $winatt) {
             $tpart = new rcube_message_part;
 
@@ -1017,6 +1067,10 @@
             $tpart->size            = $winatt['size'];
             $tpart->body            = $winatt['stream'];
 
+            if (!empty($winatt['content-id'])) {
+                $tpart->content_id = $winatt['content-id'];
+            }
+
             $parts[] = $tpart;
             unset($tnef_arr[$pid]);
         }

roundcubemail-1.4.11.8.tar.gz/program/lib/Roundcube/rcube_tnef_decoder.php -> roundcubemail-1.4.11.18.tar.gz/program/lib/Roundcube/rcube_tnef_decoder.php Changed

roundcubemail-1.4.11.8.tar.gz/program/lib/Roundcube/spellchecker/googie.php -> roundcubemail-1.4.11.18.tar.gz/program/lib/Roundcube/spellchecker/googie.php Changed

roundcubemail-1.4.11.8.tar.gz/program/steps/mail/get.inc -> roundcubemail-1.4.11.18.tar.gz/program/steps/mail/get.inc Changed

roundcubemail-1.4.11.8.tar.gz/skins/elastic/ui.js -> roundcubemail-1.4.11.18.tar.gz/skins/elastic/ui.js Changed

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2836 0

Request History

vanmeeuwen created request over 2 years ago

Release 1.4.11.18

vanmeeuwen accepted review over 2 years ago

vanmeeuwen approved review over 2 years ago

vanmeeuwen accepted request over 2 years ago