diff --git a/CHANGELOG b/CHANGELOG index 90f5124bd..52a6c1ff3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ CHANGELOG Roundcube Webmail =========================== +- Support connections to memcached socket file (#1488577) +- Enable TinyMCE inlinepopups plugin +- Update to TinyMCE 3.5.6 - Correctly escape localized labels in javascript variable (#1488567) - Update Net_SMTP/Auth_SASL packages to fix Digest-MD5/Cram-MD5 authentication (#1488571) - Don't add attachments content into reply/forward/draft message body (#1488557) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index ad37c1bee..740684be3 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 @@ -244,8 +246,8 @@ $rcmail_config['session_name'] = null; $rcmail_config['session_storage'] = 'db'; // Use these hosts for accessing memcached -// Define any number of hosts in the form hostname:port -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211' ); +// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); // check client IP in session athorization $rcmail_config['ip_check'] = false; @@ -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, diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php index 5901b58d9..9c32f2faf 100644 --- a/plugins/enigma/lib/enigma_ui.php +++ b/plugins/enigma/lib/enigma_ui.php @@ -129,7 +129,7 @@ class enigma_ui $this->rc->output->set_env('contentframe', $attrib['name']); $this->rc->output->set_env('blankpage', $attrib['src'] ? - $this->rc->output->abs_url($attrib['src']) : 'program/blank.gif'); + $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif'); return html::tag('iframe', $attrib); } diff --git a/plugins/enigma/skins/default/templates/keys.html b/plugins/enigma/skins/default/templates/keys.html index 810c4a211..4271eccb7 100644 --- a/plugins/enigma/skins/default/templates/keys.html +++ b/plugins/enigma/skins/default/templates/keys.html @@ -6,7 +6,7 @@ -