From d359dcb6b39b05c34046a9ba7848d818556f5d72 Mon Sep 17 00:00:00 2001 From: "bes.internal" Date: Thu, 26 Jul 2012 17:54:12 +0300 Subject: use in parse_host HTTP_HOST for %d Use in parse_host function for domain resolve HTTP_HOST not hostname. add %t for hostname without first part For example roundcube box backend (rc.somedomain.tld) for reverse proxy on real domain (mail.example.com) --- config/main.inc.php.dist | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'config') diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 7c22b8fd3..bbf345a41 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -68,10 +68,11 @@ $rcmail_config['smtp_debug'] = false; // to display a pulldown menu or set one host as string. // To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// // Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] 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 +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['default_host'] = ''; // TCP port used for IMAP connections @@ -135,10 +136,11 @@ $rcmail_config['messages_cache'] = false; // If left blank, the PHP mail() function is used // Supported replacement variables: // %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['smtp_server'] = ''; // SMTP port (default is 25; use 587 for STARTTLS or 465 for the @@ -267,10 +269,11 @@ $rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str'; // Specify an array with 'host' => 'domain' values to support multiple hosts // Supported replacement variables: // %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['username_domain'] = ''; // This domain will be used to form e-mail addresses of new users @@ -280,7 +283,7 @@ $rcmail_config['username_domain'] = ''; // %n - http hostname ($_SERVER['SERVER_NAME']) // %d - domain (http hostname without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['mail_domain'] = ''; // Password charset. @@ -532,10 +535,11 @@ $rcmail_config['ldap_public']['Verisign'] = array( 'name' => 'Verisign.com', // Replacement variables supported in host names: // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) + // %n - hostname ($_SERVER['SERVER_NAME']) + // %t - hostname without the first part + // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld + // For example %n = mail.domain.tld, %t = domain.tld 'hosts' => array('directory.verisign.com'), 'port' => 389, 'use_tls' => false, -- cgit v1.2.3