From 750fcf8ece50e8d3b34439723d3ed788808e94f6 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 30 Jul 2012 08:53:45 +0200 Subject: Update to TinyMCE 3.5.6 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 90f5124bd..bf47bbff6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- 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) -- cgit v1.2.3 From 5f8d59c054e1d69ce23ee00ac836195b795e5289 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 30 Jul 2012 08:59:51 +0200 Subject: Enable TinyMCE inlinepopups plugin --- CHANGELOG | 1 + program/js/editor.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index bf47bbff6..9f7b7868d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- 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) diff --git a/program/js/editor.js b/program/js/editor.js index 87ea1937f..b9fb6e20a 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -45,7 +45,7 @@ function rcmail_editor_init(config) }); else { // mail compose $.extend(conf, { - plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (config.spellcheck ? ',spellchecker' : ''), + plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,inlinepopups,tabfocus' + (config.spellcheck ? ',spellchecker' : ''), theme_advanced_buttons1: 'bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,|,forecolor,backcolor,fontselect,fontsizeselect', theme_advanced_buttons2: 'link,unlink,table,|,emotions,charmap,image,media,|,code,search,undo,redo', spellchecker_languages: (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'), -- cgit v1.2.3 From 71ee565dfc5b40bee5ed8f66d75b4ff9f78a3976 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 30 Jul 2012 09:10:04 +0200 Subject: Support connections to memcached socket file (#1488577) --- CHANGELOG | 1 + config/main.inc.php.dist | 4 ++-- program/include/rcube.php | 12 +++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 9f7b7868d..52a6c1ff3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ 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) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 7c22b8fd3..16557bd20 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -244,8 +244,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; diff --git a/program/include/rcube.php b/program/include/rcube.php index a39eab15c..ab5879dc5 100644 --- a/program/include/rcube.php +++ b/program/include/rcube.php @@ -193,11 +193,17 @@ class rcube $this->memcache = new Memcache; $this->mc_available = 0; - // add alll configured hosts to pool + // add all configured hosts to pool $pconnect = $this->config->get('memcache_pconnect', true); foreach ($this->config->get('memcache_hosts', array()) as $host) { - list($host, $port) = explode(':', $host); - if (!$port) $port = 11211; + if (substr($host, 0, 7) != 'unix://') { + list($host, $port) = explode(':', $host); + if (!$port) $port = 11211; + } + else { + $port = 0; + } + $this->mc_available += intval($this->memcache->addServer($host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure'))); } -- cgit v1.2.3