diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcube.php | 12 | ||||
| -rw-r--r-- | program/include/rcube_utils.php | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/program/include/rcube.php b/program/include/rcube.php index a39eab15c..ab5879dc5 100644 --- a/program/include/rcube.php +++ b/program/include/rcube.php @@ -193,11 +193,17 @@ class rcube $this->memcache = new Memcache; $this->mc_available = 0; - // add alll configured hosts to pool + // add all configured hosts to pool $pconnect = $this->config->get('memcache_pconnect', true); foreach ($this->config->get('memcache_hosts', array()) as $host) { - list($host, $port) = explode(':', $host); - if (!$port) $port = 11211; + if (substr($host, 0, 7) != 'unix://') { + list($host, $port) = explode(':', $host); + if (!$port) $port = 11211; + } + else { + $port = 0; + } + $this->mc_available += intval($this->memcache->addServer($host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure'))); } 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; } |