From e8d5bdc84ecfdf6fe5008655215a258bbdf0c521 Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 3 Feb 2011 13:58:07 +0000 Subject: - Fix IDNA support when IDN/INTL modules are in use (#1487742) --- program/steps/addressbook/import.inc | 2 +- program/steps/addressbook/save.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'program/steps/addressbook') diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc index 532afdbcd..af6f67dd8 100644 --- a/program/steps/addressbook/import.inc +++ b/program/steps/addressbook/import.inc @@ -136,7 +136,7 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name' } // We're using UTF8 internally - $email = idn_to_utf8($email); + $email = rcube_idn_to_utf8($email); if (!$replace) { // compare e-mail address diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index 4eb24fe82..934db4c73 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -142,7 +142,7 @@ if (empty($a_record['name'])/* || empty($a_record['email'])*/) { // Validity checks foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) { if (strlen($email)) { - $_email = idn_to_ascii($email); + $_email = rcube_idn_to_ascii($email); if (!check_email($_email, false)) { $OUTPUT->show_message('emailformaterror', 'warning', array('email' => $email)); rcmail_overwrite_action($return_action); -- cgit v1.2.3