diff options
| author | alecpl <alec@alec.pl> | 2011-02-03 13:58:07 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-02-03 13:58:07 +0000 |
| commit | e8d5bdc84ecfdf6fe5008655215a258bbdf0c521 (patch) | |
| tree | 24e98fca92b72bcc0ba4b5519f5d2c9265a7c8d5 /program/steps/settings/save_identity.inc | |
| parent | 9ebac6616d32d7672ea59da67321380037e2324c (diff) | |
- Fix IDNA support when IDN/INTL modules are in use (#1487742)
Diffstat (limited to 'program/steps/settings/save_identity.inc')
| -rw-r--r-- | program/steps/settings/save_identity.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc index e3bbce979..f0d25f35a 100644 --- a/program/steps/settings/save_identity.inc +++ b/program/steps/settings/save_identity.inc @@ -59,7 +59,7 @@ if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3) // Validate e-mail addresses foreach (array('email', 'reply-to', 'bcc') as $item) { if ($email = $save_data[$item]) { - $ascii_email = idn_to_ascii($email); + $ascii_email = rcube_idn_to_ascii($email); if (!check_email($ascii_email, false)) { // show error message $OUTPUT->show_message('emailformaterror', 'error', array('email' => $email), false); @@ -77,11 +77,11 @@ if ($_POST['_iid']) $save_data = $plugin['record']; if ($save_data['email']) - $save_data['email'] = idn_to_ascii($save_data['email']); + $save_data['email'] = rcube_idn_to_ascii($save_data['email']); if ($save_data['bcc']) - $save_data['bcc'] = idn_to_ascii($save_data['bcc']); + $save_data['bcc'] = rcube_idn_to_ascii($save_data['bcc']); if ($save_data['reply-to']) - $save_data['reply-to'] = idn_to_ascii($save_data['reply-to']); + $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']); if (!$plugin['abort']) $updated = $USER->update_identity($iid, $save_data); @@ -116,9 +116,9 @@ else if (IDENTITIES_LEVEL < 2) $plugin = $RCMAIL->plugins->exec_hook('identity_create', array('record' => $save_data)); $save_data = $plugin['record']; - $save_data['email'] = idn_to_ascii($save_data['email']); - $save_data['bcc'] = idn_to_ascii($save_data['bcc']); - $save_data['reply-to'] = idn_to_ascii($save_data['reply-to']); + $save_data['email'] = rcube_idn_to_ascii($save_data['email']); + $save_data['bcc'] = rcube_idn_to_ascii($save_data['bcc']); + $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']); if (!$plugin['abort']) $insert_id = $save_data['email'] ? $USER->insert_identity($save_data) : null; |