Changeset 5419 in subversion

Timestamp:

Nov 13, 2011 7:02:18 AM (19 months ago)

Author:

alec

Message:

• Added option to use punycode or unicode for domain names (#1488103)

Location:

trunk/plugins/password

Files:

• config.inc.php.dist (modified) (1 diff)
• drivers/sql.php (modified) (1 diff)
• package.xml (modified) (3 diffs)
• password.php (modified) (3 diffs)

trunk/plugins/password/config.inc.php.dist

@@ -48 +48 @@
 $rcmail_config['password_query'] = 'SELECT update_passwd(%c, %u)';
 
+// By default domains in variables are using unicode.
+// Enable this option to use punycoded names
+$rcmail_config['password_idn_ascii'] = false;
+
 // Path for dovecotpw (if not in $PATH)
 // $rcmail_config['password_dovecotpw'] = '/usr/local/sbin/dovecotpw';

trunk/plugins/password/drivers/sql.php

@@ -131 +131 @@
     }
 
+    $local_part  = $rcmail->user->get_username('local');
+    $domain_part = $rcmail->user->get_username('domain');
+    $username    = $_SESSION['username'];
+    $host        = $_SESSION['imap_host'];
+
+    // convert domains to/from punnycode
+    if ($rcmail->config->get('password_idn_ascii')) {
+        $domain_part = rcube_idn_to_ascii($domain_part);
+        $username    = rcube_idn_to_ascii($username);
+        $host        = rcube_idn_to_ascii($host);
+    }
+    else {
+        $domain_part = rcube_idn_to_utf8($domain_part);
+        $username    = rcube_idn_to_utf8($username);
+        $host        = rcube_idn_to_utf8($host);
+    }
+
     // at least we should always have the local part
-    $sql = str_replace('%l', $db->quote($rcmail->user->get_username('local'), 'text'), $sql);
-    $sql = str_replace('%d', $db->quote($rcmail->user->get_username('domain'), 'text'), $sql);
-    $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);
-    $sql = str_replace('%h', $db->quote($_SESSION['imap_host'],'text'), $sql);
+    $sql = str_replace('%l', $db->quote($local_part, 'text'), $sql);
+    $sql = str_replace('%d', $db->quote($domain_part, 'text'), $sql);
+    $sql = str_replace('%u', $db->quote($username, 'text'), $sql);
+    $sql = str_replace('%h', $db->quote($host, 'text'), $sql);
 
     $res = $db->query($sql, $sql_vars);

trunk/plugins/password/package.xml

@@ -16 +16 @@
                 <active>yes</active>
         </lead>
-        <date>2011-10-26</date>
-        <time>12:00</time>
+        <date></date>
+        <time></time>
         <version>
-                <release>2.3</release>
+                <release></release>
                 <api>1.6</api>
         </version>
@@ -28 +28 @@
         <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
         <notes>
-- When old and new passwords are the same, do nothing, return success (#1487823)
-- Fixed Samba password hashing in 'ldap' driver
-- Added 'password_change' hook for plugin actions after successful password change
-- Fixed bug where 'doveadm pw' command was used as dovecotpw utility
-- Improve generated crypt() passwords (#1488136)
+- Added option to use punycode or unicode for domain names (#1488103)
     </notes>
         <contents>
@@ -266 +262 @@
             </notes>
         </release>
+        <release>
+                <date>2011-10-26</date>
+                <time>12:00</time>
+                <version>
+                        <release>2.3</release>
+                        <api>1.6</api>
+                </version>
+                <stability>
+                        <release>stable</release>
+                        <api>stable</api>
+                </stability>
+                <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+                <notes>
+- When old and new passwords are the same, do nothing, return success (#1487823)
+- Fixed Samba password hashing in 'ldap' driver
+- Added 'password_change' hook for plugin actions after successful password change
+- Fixed bug where 'doveadm pw' command was used as dovecotpw utility
+- Improve generated crypt() passwords (#1488136)
+            </notes>
+        </release>
     </changelog>
 </package>

trunk/plugins/password/password.php

@@ -224 +224 @@
         $config = rcmail::get_instance()->config;
         $driver = $this->home.'/drivers/'.$config->get('password_driver', 'sql').'.php';
-    
+
         if (!is_readable($driver)) {
             raise_error(array(
@@ -234 +234 @@
             return $this->gettext('internalerror');
         }
-    
+
         include($driver);
 
@@ -271 +271 @@
 
         return $reason;
-    }                                     
+    }
 }