Cleanup

CHANGELOG

@@ -27,6 +27,11 @@ CHANGELOG Roundcube Webmail
 - Templates: Add support for expressions in object attributes (#7237)
 - Templates: Add support for nested if conditions (#6818)
 - Templates: Make [space][slash] ending of condition objects optional (#6954)
+- Mailvelope: Fix size of iframe for PGP-inlined mail (#7348)
+- Mailvelope: Add config option to use Main Keyring (#7348)
+- Mailvelope: Add config option to set the size for new keys (#7348)
+- Mailvelope: Always ask before discarding email currently being composed (#7348)
+- Mailvelope: Fix unnecessary warning to re-add attachments when restoring a draft (#7348)
 - Archive: Added options to split archive by year or year+month and folder (#7216)
 - Enigma: Support ECC key generation - when using GnuPG >= 2.1.7 (#6853)
 - Managesieve: Add support for 'spamtest' extension - RFC3685 (#6950)
@@ -109,11 +114,6 @@ RELEASE 1.4.4
 - Security: Fix remote code execution via crafted 'im_convert_path' or 'im_identify_path' settings [CVE-2020-12641]
 - Security: Fix local file inclusion (and code execution) via crafted 'plugins' option [CVE-2020-12640]
 - Security: Fix CSRF bypass that could be used to log out an authenticated user [CVE-2020-12626] (#7302)
-- Mailvelope: Fix size of iframe for PGP-inlined mail (#7348)
-- Mailvelope: Add config option to use Main Keyring (#7348)
-- Mailvelope: Add config option to set the size for new keys (#7348)
-- Mailvelope: Always ask before discarding email currently being composed (#7348)
-- Mailvelope: Fix unnecessary warning to re-add attachments when restoring a draft (#7348)
 
 RELEASE 1.4.3
 -------------

config/config.inc.php.sample

@@ -86,7 +86,3 @@ $config['plugins'] = array(
 
 // skin name: folder from skins/
 $config['skin'] = 'elastic';
-
-// Use the Main Keyring in Mailvelope? If not, use (creating if required)
-// a per-site keyring. Most sites use the Main Keyring, so set this to true.
-$config['mailvelope_main_keyring'] = true;

config/defaults.inc.php

@@ -855,8 +855,8 @@ $config['compose_responses_static'] = array(
 // Note: Lookup is client-side, so the server must support Cross-Origin Resource Sharing
 $config['keyservers'] = array('keys.openpgp.org');
 
-// Use the Main Keyring in Mailvelope? If not, use (creating if required)
-// a per-site keyring. This is set to false for backwards compatibility.
+// Enables use of the Main Keyring in Mailvelope? If disabled, a per-site keyring
+// will be used. This is set to false for backwards compatibility.
 $config['mailvelope_main_keyring'] = false;
 
 // Mailvelope RSA bit size for newly generated keys, either 2048 or 4096.

program/js/app.js

@@ -3735,7 +3735,7 @@ function rcube_webmail()
   // check for mailvelope API
   this.check_mailvelope = function(action)
   {
-    if (typeof window.mailvelope !== 'undefined') {
+    if (window.mailvelope) {
       this.mailvelope_load(action);
     }
     else {
@@ -4068,7 +4068,7 @@ function rcube_webmail()
 
       ref.hide_message(msgid);
       $(selector).children().not('iframe').hide();
-      $('#messagebody').addClass('mailvelope');
+      $(this.gui_objects.messagebody).addClass('mailvelope');
 
       // on success we can remove encrypted part from the attachments list
       if (ref.env.pgp_mime_part)
@@ -10072,7 +10072,7 @@ function rcube_webmail()
   // check for mailvelope API
   this.pgpmime_support_check = function(action)
   {
-    if (typeof window.mailvelope !== 'undefined')
+    if (window.mailvelope)
       return 1;
 
     $(window).on('mailvelope', function() {

program/steps/mail/show.inc

@@ -793,6 +793,8 @@ function rcmail_message_body($attrib)
         $OUTPUT->set_env('blockedobjects', true);
     }
 
+    $OUTPUT->add_gui_object('messagebody', $attrib['id']);
+
     return html::div($attrib, $out);
 }
 

skins/elastic/styles/styles.less

@@ -304,8 +304,6 @@ body.task-error-login #layout {
 
 #messagebody {
     &.mailvelope {
-        margin: 0;
-
         iframe {
             min-height: 75vh;
         }