From 11be9330dee677a25653dcb83adc343b8bf95a88 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 20 Sep 2010 11:07:56 +0000
Subject: - Support %z variable in host configuration options (#1487003)

---
 program/include/main.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'program/include')

diff --git a/program/include/main.inc b/program/include/main.inc
index 7492f6c0e..00fd0830f 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1588,8 +1588,10 @@ function rcube_parse_host($name)
   $d = preg_replace('/^[^\.]+\./', '', $n);
   // %h - IMAP host
   $h = $_SESSION['imap_host'];
+  // %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'), array($n, $d, $h), $name);
+  $name = str_replace(array('%n', '%d', '%h', '%z'), array($n, $d, $h, $z), $name);
   return $name;
 }
 
-- 
cgit v1.2.3