From d80bd153a4ad57c243ed1349c6fb5ef2d968f206 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 04 Feb 2011 08:44:47 -0500
Subject: [PATCH] - Fix email_dns_check setting not used for identities/contacts (#1487740)
---
CHANGELOG | 1 +
program/steps/addressbook/save.inc | 2 +-
program/steps/settings/save_identity.inc | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 3745622..2a7cdfb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix email_dns_check setting not used for identities/contacts (#1487740)
- Fix ICANN example addresses doesn't validate (#1487742)
- Security: protect login form submission from CSRF
- Security: prevent from relaying malicious requests through modcss.inc
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 934db4c..3d55d95 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -143,7 +143,7 @@
foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
if (strlen($email)) {
$_email = rcube_idn_to_ascii($email);
- if (!check_email($_email, false)) {
+ if (!check_email($_email)) {
$OUTPUT->show_message('emailformaterror', 'warning', array('email' => $email));
rcmail_overwrite_action($return_action);
return;
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index f0d25f3..4fb6a2a 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -60,7 +60,7 @@
foreach (array('email', 'reply-to', 'bcc') as $item) {
if ($email = $save_data[$item]) {
$ascii_email = rcube_idn_to_ascii($email);
- if (!check_email($ascii_email, false)) {
+ if (!check_email($ascii_email)) {
// show error message
$OUTPUT->show_message('emailformaterror', 'error', array('email' => $email), false);
rcmail_overwrite_action('edit-identity');
--
Gitblit v1.9.1