Changeset 4420 in subversion

Timestamp:

Jan 17, 2011 7:21:08 AM (2 years ago)

Author:

alec

Message:

• Fix %h/%z variables in username_domain option (#1487701)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (2 diffs)
• program/include/rcmail.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -4 +4 @@
 - Fix login redirect issues (#1487686)
 - Require PHP 5.2.1 or greater
+- Fix %h/%z variables in username_domain option (#1487701)
 
 RELEASE 0.5

trunk/roundcubemail/program/include/main.inc

@@ -1772 +1772 @@
  *
  * @param string $name Hostname
+ * @param string $host Optional IMAP hostname
  * @return string
  */
-function rcube_parse_host($name)
+function rcube_parse_host($name, $host='')
 {
   // %n - host
@@ -1781 +1782 @@
   $d = preg_replace('/^[^\.]+\./', '', $n);
   // %h - IMAP host
-  $h = $_SESSION['imap_host'];
+  $h = $_SESSION['imap_host'] ? $_SESSION['imap_host'] : $host;
   // %z - IMAP domain without first part, e.g. %h=imap.domain.tld, %z=domain.tld
   $z = preg_replace('/^[^\.]+\./', '', $h);

trunk/roundcubemail/program/include/rcmail.php

@@ -675 +675 @@
     if (!empty($config['username_domain']) && strpos($username, '@') === false) {
       if (is_array($config['username_domain']) && isset($config['username_domain'][$host]))
-        $username .= '@'.rcube_parse_host($config['username_domain'][$host]);
+        $username .= '@'.rcube_parse_host($config['username_domain'][$host], $host);
       else if (is_string($config['username_domain']))
-        $username .= '@'.rcube_parse_host($config['username_domain']);
+        $username .= '@'.rcube_parse_host($config['username_domain'], $host);
     }