Changeset 3977 in subversion

Timestamp:

Sep 20, 2010 7:07:56 AM (3 years ago)

Author:

alec

Message:

• Support %z variable in host configuration options (#1487003)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (4 diffs)
• program/include/main.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -26 +26 @@
 - Fix when IMAP connection fails in 'get' action session shouldn't be destroyed (#1486995)
 - Fix list_cols is not updated after column dragging (#1486999)
+- Support %z variable in host configuration options (#1487003)
 
 RELEASE 0.4

trunk/roundcubemail/config/main.inc.php.dist

@@ -99 +99 @@
 // %n - http hostname ($_SERVER['SERVER_NAME'])
 // %d - domain (http hostname without the first part)
+// %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %d = domain.tld
 $rcmail_config['smtp_server'] = '';
@@ -185 +186 @@
 // %n - http hostname ($_SERVER['SERVER_NAME'])
 // %d - domain (http hostname without the first part)
+// %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %d = domain.tld
 $rcmail_config['username_domain'] = '';
@@ -194 +196 @@
 // %n - http hostname ($_SERVER['SERVER_NAME'])
 // %d - domain (http hostname without the first part)
+// %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %d = domain.tld
 $rcmail_config['mail_domain'] = '';
@@ -401 +404 @@
   // %n - http hostname ($_SERVER['SERVER_NAME'])
   // %d - domain (http hostname without the first part)
+  // %z - IMAP domain (IMAP hostname without the first part)
   // For example %n = mail.domain.tld, %d = domain.tld
   'hosts'         => array('directory.verisign.com'),

trunk/roundcubemail/program/include/main.inc

@@ -1589 +1589 @@
   // %h - IMAP host
   $h = $_SESSION['imap_host'];
-
-  $name = str_replace(array('%n', '%d', '%h'), array($n, $d, $h), $name);
+  // %z - IMAP domain without first part, e.g. %h=imap.domain.tld, %z=domain.tld
+  $z = preg_replace('/^[^\.]+\./', '', $h);
+
+  $name = str_replace(array('%n', '%d', '%h', '%z'), array($n, $d, $h, $z), $name);
   return $name;
 }