From 187833dff94146a9b176a1ca4a5c9996809fd4a7 Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 2 Jun 2011 12:36:32 +0000 Subject: - Apply fixes from trunk --- CHANGELOG | 1 + installer/config.php | 4 ++-- program/include/main.inc | 4 ++++ program/lib/washtml.php | 2 +- program/steps/mail/func.inc | 2 +- program/steps/settings/save_identity.inc | 11 +++++++---- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 972c94caf..0e163fd79 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#1487943) - Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900) - Fix some CSS issues in Settings for Internet Explorer - Fixed handling of folder with name "0" in folder selector diff --git a/installer/config.php b/installer/config.php index 5250782f9..6b524079f 100644 --- a/installer/config.php +++ b/installer/config.php @@ -81,7 +81,7 @@ echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1) ?>
-

This increases security but can cause sudden logouts when someone uses a proxy with changeing IPs.

+

This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.

des_key
@@ -93,7 +93,7 @@ echo $input_deskey->show($RCI->getprop('des_key')); ?>
This key is used to encrypt the users imap password before storing in the session record
-

It's a random generated string to ensure that every installation has it's own key. +

It's a random generated string to ensure that every installation has its own key. If you enter it manually please provide a string of exactly 24 chars.

diff --git a/program/include/main.inc b/program/include/main.inc index 72a190595..3c04e20bf 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1916,6 +1916,10 @@ function rcube_idn_convert($input, $is_utf=false) $domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain); + if ($domain === false) { + return ''; + } + return $at ? $user . '@' . $domain : $domain; } diff --git a/program/lib/washtml.php b/program/lib/washtml.php index e8befe835..a5eeb841b 100644 --- a/program/lib/washtml.php +++ b/program/lib/washtml.php @@ -274,7 +274,7 @@ class washtml // Remove invalid HTML comments (#1487759) // Don't remove valid conditional comments - $html = preg_replace('/