diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube.php | 16 | ||||
| -rw-r--r-- | skins/classic/print.css | 2 | ||||
| -rw-r--r-- | skins/larry/mail.css | 1 | ||||
| -rw-r--r-- | skins/larry/print.css | 2 |
5 files changed, 13 insertions, 10 deletions
@@ -51,6 +51,8 @@ CHANGELOG Roundcube Webmail - Fix mbox files import - Fix setting flags on servers with no PERMANENTFLAGS response (#1490087) - Fix regression in SHAA password generation in ldap driver of password plugin (#1490094) +- Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#1490103) +- Fix font style display issue in HTML messages with styled <span> elements (#1490101) RELEASE 1.0.3 ------------- diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index 3ab650cb1..03f49637c 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -842,6 +842,7 @@ class rcube * upon decryption; see http://php.net/mcrypt_generic#68082 */ $clear = pack("a*H2", $clear, "80"); + $ckey = $this->config->get_crypto_key($key); if (function_exists('openssl_encrypt')) { $method = 'DES-EDE3-CBC'; @@ -853,7 +854,7 @@ class rcube ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, "")) ) { $iv = $this->create_iv(mcrypt_enc_get_iv_size($td)); - mcrypt_generic_init($td, $this->config->get_crypto_key($key), $iv); + mcrypt_generic_init($td, $ckey, $iv); $cipher = $iv . mcrypt_generic($td, $clear); mcrypt_generic_deinit($td); mcrypt_module_close($td); @@ -864,7 +865,7 @@ class rcube if (function_exists('des')) { $des_iv_size = 8; $iv = $this->create_iv($des_iv_size); - $cipher = $iv . des($this->config->get_crypto_key($key), $clear, 1, 1, $iv); + $cipher = $iv . des($ckey, $clear, 1, 1, $iv); } else { self::raise_error(array( @@ -895,6 +896,7 @@ class rcube } $cipher = $base64 ? base64_decode($cipher) : $cipher; + $ckey = $this->config->get_crypto_key($key); if (function_exists('openssl_decrypt')) { $method = 'DES-EDE3-CBC'; @@ -914,7 +916,7 @@ class rcube ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, "")) ) { $iv_size = mcrypt_enc_get_iv_size($td); - $iv = substr($cipher, 0, $iv_size); + $iv = substr($cipher, 0, $iv_size); // session corruption? (#1485970) if (strlen($iv) < $iv_size) { @@ -922,7 +924,7 @@ class rcube } $cipher = substr($cipher, $iv_size); - mcrypt_generic_init($td, $this->config->get_crypto_key($key), $iv); + mcrypt_generic_init($td, $ckey, $iv); $clear = mdecrypt_generic($td, $cipher); mcrypt_generic_deinit($td); mcrypt_module_close($td); @@ -932,15 +934,15 @@ class rcube if (function_exists('des')) { $des_iv_size = 8; - $iv = substr($cipher, 0, $des_iv_size); + $iv = substr($cipher, 0, $des_iv_size); $cipher = substr($cipher, $des_iv_size); - $clear = des($this->config->get_crypto_key($key), $cipher, 0, 1, $iv); + $clear = des($ckey, $cipher, 0, 1, $iv); } else { self::raise_error(array( 'code' => 500, 'type' => 'php', 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Could not perform decryption; make sure Mcrypt is installed or lib/des.inc is available" + 'message' => "Could not perform decryption; make sure OpenSSL or Mcrypt or lib/des.inc is available" ), true, true); } } diff --git a/skins/classic/print.css b/skins/classic/print.css index 8eac41f53..349b224cb 100644 --- a/skins/classic/print.css +++ b/skins/classic/print.css @@ -8,7 +8,7 @@ body margin: 2mm; } -body, td, th, span, div, p +body, td, th, div, p { font-size: 9pt; color: #000000; diff --git a/skins/larry/mail.css b/skins/larry/mail.css index 4ec258552..0f1eaa8a7 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -857,7 +857,6 @@ div.hide-headers { #messagecontent .leftcol, #messagepreview .leftcol { margin-right: 252px; - overflow-x: auto; } #messagecontent .rightcol, diff --git a/skins/larry/print.css b/skins/larry/print.css index 22d6c5288..d3a6cd802 100644 --- a/skins/larry/print.css +++ b/skins/larry/print.css @@ -15,7 +15,7 @@ body { margin: 2mm; } -body, td, th, span, div, p { +body, td, th, div, p { font-size: 9pt; color: #000; } |