summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorThomas B. <thomas@roundcube.net>2012-07-30 02:13:40 -0700
committerThomas B. <thomas@roundcube.net>2012-07-30 02:13:40 -0700
commit6d1253681547343dcffb398a7e485bfb70087b57 (patch)
tree20a9b35eadb28f6eebd0b9ab3ce279c77c10026a /program/include
parentcfc27c9b764985f707e8ca8d5ba663b6e4b01ecc (diff)
parentd359dcb6b39b05c34046a9ba7848d818556f5d72 (diff)
Merge pull request #14 from bes-internal/master
Use HTTP_HOST for %d in parse_host. Add %t for host name from SERVER_NAME
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_utils.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php
index dfd2026cc..9344a929b 100644
--- a/program/include/rcube_utils.php
+++ b/program/include/rcube_utils.php
@@ -616,8 +616,10 @@ class rcube_utils
{
// %n - host
$n = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
- // %d - domain name without first part, e.g. %n=mail.domain.tld, %d=domain.tld
- $d = preg_replace('/^[^\.]+\./', '', $n);
+ // %t - host name without first part, e.g. %n=mail.domain.tld, %t=domain.tld
+ $t = preg_replace('/^[^\.]+\./', '', $n);
+ // %d - domain name without first part
+ $d = preg_replace('/^[^\.]+\./', '', $_SERVER['HTTP_HOST']);
// %h - IMAP host
$h = $_SESSION['storage_host'] ? $_SESSION['storage_host'] : $host;
// %z - IMAP domain without first part, e.g. %h=imap.domain.tld, %z=domain.tld
@@ -632,7 +634,7 @@ class rcube_utils
}
}
- $name = str_replace(array('%n', '%d', '%h', '%z', '%s'), array($n, $d, $h, $z, $s[2]), $name);
+ $name = str_replace(array('%n', '%t', '%d', '%h', '%z', '%s'), array($n, $t, $d, $h, $z, $s[2]), $name);
return $name;
}