Changeset b5a29fe in github

Timestamp:

Oct 26, 2011 9:53:30 AM (19 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

335b042

Parents:

ea66cef

Message:

• Fix IDN address validation issue (#1488137)

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix IDN address validation issue (#1488137)
+- Fix JS error when dst_active checkbox doesn't exist (#1488133)
 - Autocomplete LDAP records when adding contacts from mail (#1488073)
 - Plugin API: added 'ready' hook (#1488063)

program/steps/mail/sendmail.inc

@@ -160 +160 @@
     // address in brackets without name (do nothing)
     if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
-      $item = rcube_idn_to_ascii($item);
-      $result[] = $item;
+      $item = rcube_idn_to_ascii(trim($item, '<>'));
+      $result[] = '<' . $item . '>';
     // address without brackets and without name (add brackets)
     } else if (preg_match('/^'.$email_regexp.'$/', $item)) {
       $item = rcube_idn_to_ascii($item);
-      $result[] = '<'.$item.'>';
+      $result[] = '<' . $item . '>';
     // address with name (handle name)
-    } else if (preg_match('/'.$email_regexp.'>*$/', $item, $matches)) {
+    } else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) {
       $address = $matches[0];
       $name = str_replace($address, '', $item);
@@ -175 +175 @@
             $name = '"'.addcslashes($name, '"').'"';
       }
-      $address = rcube_idn_to_ascii($address);
-      if (!preg_match('/^<'.$email_regexp.'>$/', $address))
-        $address = '<'.$address.'>';
+      $address = rcube_idn_to_ascii(trim($address, '<>'));
+      $address = '<' . $address . '>';
 
       $result[] = $name.' '.$address;