- Added the %s variable in 'default_host' and 'smtp_server' option (%s variable is the domain name after the '@' from e-mail address provided at login screen). The %s just returns a value if the provided e-mail is valid to avoid unnecessary lookups and reduce the possibility of connections to undesirable hosts.

 - Small fix to the code comment of rcube_parse_host()

git-svn-id: https://svn.roundcube.net/trunk@4705 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 2 insertions, 0 deletions

diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist
index 6f92c6ee5..d74c82dc9 100644
--- a/roundcubemail/config/main.inc.php.dist
+++ b/roundcubemail/config/main.inc.php.dist
@@ -64,6 +64,7 @@ $rcmail_config['smtp_debug'] = false;
 // Supported replacement variables:
 // %n - http hostname ($_SERVER['SERVER_NAME'])
 // %d - domain (http hostname without the first part)
+// %s - domain name after the '@' from e-mail address provided at login screen
 // For example %n = mail.domain.tld, %d = domain.tld
 $rcmail_config['default_host'] = '';
 
@@ -119,6 +120,7 @@ $rcmail_config['imap_auth_pw'] = null;
 // %h - user's IMAP hostname
 // %n - http hostname ($_SERVER['SERVER_NAME'])
 // %d - domain (http hostname without the first part)
+// %s - domain name after the '@' from e-mail address provided at login screen
 // %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %d = domain.tld
 $rcmail_config['smtp_server'] = '';