Changeset 3977 in subversion for trunk/roundcubemail/program/include/main.inc

Timestamp:

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

Author:

alec

Message:

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

File:

• trunk/roundcubemail/program/include/main.inc (modified) (1 diff)

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;
 }