summaryrefslogtreecommitdiff
path: root/program/steps/addressbook
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-02-03 13:58:07 +0000
committeralecpl <alec@alec.pl>2011-02-03 13:58:07 +0000
commite8d5bdc84ecfdf6fe5008655215a258bbdf0c521 (patch)
tree24e98fca92b72bcc0ba4b5519f5d2c9265a7c8d5 /program/steps/addressbook
parent9ebac6616d32d7672ea59da67321380037e2324c (diff)
- Fix IDNA support when IDN/INTL modules are in use (#1487742)
Diffstat (limited to 'program/steps/addressbook')
-rw-r--r--program/steps/addressbook/import.inc2
-rw-r--r--program/steps/addressbook/save.inc2
2 files changed, 2 insertions, 2 deletions
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);