Changeset 4010 in subversion

Timestamp:

Sep 29, 2010 8:36:53 AM (3 years ago)

Author:

alec

Message:

• Add Internationalized Domain Name (IDNA) support (#1483894)

Location:

trunk/plugins

Files:

• managesieve/managesieve.php (modified) (1 diff)
• new_user_dialog/new_user_dialog.php (modified) (2 diffs)
• new_user_identity/new_user_identity.php (modified) (1 diff)
• virtuser_file/virtuser_file.php (modified) (1 diff)
• virtuser_query/virtuser_query.php (modified) (1 diff)

trunk/plugins/managesieve/managesieve.php

@@ -65 +65 @@
         $host = rcube_parse_host($this->rc->config->get('managesieve_host', 'localhost'));
         $port = $this->rc->config->get('managesieve_port', 2000);
+
+        $host = idn_to_ascii($host);
 
         // try to connect to managesieve server and to fetch the script

trunk/plugins/new_user_dialog/new_user_dialog.php

@@ -63 +63 @@
         'type' => 'text',
         'name' => '_email',
-        'value' => $identity['email'],
+        'value' => idn_to_utf8($identity['email']),
         'disabled' => ($identities_level == 1 || $identities_level == 3)
       )));
@@ -112 +112 @@
     if ($identities_level == 1 || $identities_level == 3)
       $save_data['email'] = $identity['email'];
+    else
+      $save_data['email'] = idn_to_ascii($save_data['email']);
 
     // save data if not empty

trunk/plugins/new_user_identity/new_user_identity.php

@@ -41 +41 @@
                 $args['user_name'] = $results->records[0]['name'];
                 if (!$args['user_email'] && strpos($results->records[0]['email'], '@')) {
-                    $args['user_email'] = $results->records[0]['email'];
+                    $args['user_email'] = idn_to_ascii($results->records[0]['email']);
                 }
             }

trunk/plugins/virtuser_file/virtuser_file.php

@@ -41 +41 @@
 
                 if (count($arr) > 0 && strpos($arr[0], '@')) {
-                        $result[] = trim(str_replace('\\@', '@', $arr[0]));
+                        $result[] = idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));
 
                         if ($p['first']) {

trunk/plugins/virtuser_query/virtuser_query.php

@@ -45 +45 @@
                         if ($p['extended'] && count($sql_arr) > 1) {
                             $result[] = array(
-                                    'email'         => $sql_arr[0],
+                                    'email'         => idn_to_ascii($sql_arr[0]),
                                 'name'              => $sql_arr[1],
                                     'organization'  => $sql_arr[2],
-                                'reply-to'          => $sql_arr[3],
-                                    'bcc'                   => $sql_arr[4],
+                                'reply-to'          => idn_to_ascii($sql_arr[3]),
+                                    'bcc'                   => idn_to_ascii($sql_arr[4]),
                                     'signature'         => $sql_arr[5],
                                 'html_signature' => (int)$sql_arr[6],