summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-06-03 08:09:46 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-06-03 08:09:46 +0000
commita43d760ff43a38475367adf1f151d80cf17e61e0 (patch)
treeeb7bc1178957d4fe827c87ee8aabdd6297e79212
parentd40dd8eed2e09c83c92be8428b3d3db7901f1979 (diff)
- support dynamic hostname variables in config
git-svn-id: https://svn.roundcube.net/trunk@3702 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/installer/rcube_install.php2
-rw-r--r--roundcubemail/installer/test.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index 580aba858..afd422433 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/installer/rcube_install.php
@@ -466,7 +466,7 @@ class rcube_install
foreach ($default_hosts as $key => $name) {
if (!empty($name))
- $out[] = is_numeric($key) ? $name : $key;
+ $out[] = rcube_parse_host(is_numeric($key) ? $name : $key);
}
return $out;
diff --git a/roundcubemail/installer/test.php b/roundcubemail/installer/test.php
index e75ef2770..5fb2c41f0 100644
--- a/roundcubemail/installer/test.php
+++ b/roundcubemail/installer/test.php
@@ -214,7 +214,7 @@ if ($db_working) {
<h3>Test SMTP config</h3>
<p>
-Server: <?php echo $RCI->getprop('smtp_server', 'PHP mail()'); ?><br />
+Server: <?php echo rcube_parse_host($RCI->getprop('smtp_server', 'PHP mail()')); ?><br />
Port: <?php echo $RCI->getprop('smtp_port'); ?><br />
<?php