From 5f6c71ae36b73e5f94543eec2f61874cf46e9c62 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 16 Oct 2012 18:03:58 +0200 Subject: Fix return value of storage_connect() --- program/include/rcmail.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'program') diff --git a/program/include/rcmail.php b/program/include/rcmail.php index ee144faca..ec3d537ec 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -2118,10 +2118,9 @@ class rcmail extends rcube } else { $this->set_storage_prop(); - return $storage->is_connected(); } } - return false; + return $storage->is_connected(); } } -- cgit v1.2.3 From 5fbfde8fdf53d54dbaf7883c10ed275ebe3a921c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 17 Oct 2012 10:35:10 +0200 Subject: Fix the fix for empty text parts handling (#1488757) --- program/include/rcube_message.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'program') diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index 7bf95d1c5..4e1b5a0c2 100644 --- a/program/include/rcube_message.php +++ b/program/include/rcube_message.php @@ -371,9 +371,10 @@ class rcube_message foreach ($structure->parts as $p => $sub_part) { $sub_mimetype = $sub_part->mimetype; - // skip empty parts - if (!$sub_part->size) + // skip empty text parts + if (!$sub_part->size && preg_match('#^text/(plain|html|enriched)$#', $sub_mimetype)) { continue; + } // check if sub part is if ($sub_mimetype == 'text/plain') -- cgit v1.2.3 From 38b6aac6042311bbf95c0492f4083eb25b12b72e Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 17 Oct 2012 11:31:45 +0200 Subject: s/rcmail/rcube/ --- program/include/rcube_output.php | 2 +- program/include/rcube_plugin.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'program') diff --git a/program/include/rcube_output.php b/program/include/rcube_output.php index 9aa7c9eba..5c582e67c 100644 --- a/program/include/rcube_output.php +++ b/program/include/rcube_output.php @@ -44,7 +44,7 @@ abstract class rcube_output */ public function __construct($task = null, $framed = false) { - $this->app = rcmail::get_instance(); + $this->app = rcube::get_instance(); $this->config = $this->app->config; $this->browser = new rcube_browser(); } diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php index c1035733b..45088850a 100644 --- a/program/include/rcube_plugin.php +++ b/program/include/rcube_plugin.php @@ -202,7 +202,7 @@ abstract class rcube_plugin foreach ($texts as $key => $value) $add[$domain.'.'.$key] = $value; - $rcmail = rcmail::get_instance(); + $rcmail = rcube::get_instance(); $rcmail->load_language($lang, $add); // add labels to client -- cgit v1.2.3 From 53f4b981206c4decc10a5716b97ad0727f49f478 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 17 Oct 2012 12:36:29 +0200 Subject: Make possible rcube_plugin_api class extending --- program/include/rcube_plugin_api.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'program') diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php index 9ef68cab9..107c81026 100644 --- a/program/include/rcube_plugin_api.php +++ b/program/include/rcube_plugin_api.php @@ -31,7 +31,7 @@ if (!defined('RCMAIL_PLUGINS_DIR')) */ class rcube_plugin_api { - static private $instance; + static protected $instance; public $dir; public $url = 'plugins/'; @@ -39,16 +39,16 @@ class rcube_plugin_api public $output; public $handlers = array(); - private $plugins = array(); - private $tasks = array(); - private $actions = array(); - private $actionmap = array(); - private $objectsmap = array(); - private $template_contents = array(); - private $active_hook = false; + protected $plugins = array(); + protected $tasks = array(); + protected $actions = array(); + protected $actionmap = array(); + protected $objectsmap = array(); + protected $template_contents = array(); + protected $active_hook = false; // Deprecated names of hooks, will be removed after 0.5-stable release - private $deprecated_hooks = array( + protected $deprecated_hooks = array( 'create_user' => 'user_create', 'kill_session' => 'session_destroy', 'upload_attachment' => 'attachment_upload', @@ -98,7 +98,7 @@ class rcube_plugin_api /** * Private constructor */ - private function __construct() + protected function __construct() { $this->dir = slashify(RCMAIL_PLUGINS_DIR); } @@ -470,7 +470,7 @@ class rcube_plugin_api * @param array $attrib * @return array */ - private function template_container_hook($attrib) + protected function template_container_hook($attrib) { $container = $attrib['name']; return array('content' => $attrib['content'] . $this->template_contents[$container]); @@ -483,7 +483,7 @@ class rcube_plugin_api * @param string $fn Filename * @return string */ - private function resource_url($fn) + protected function resource_url($fn) { if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn)) return $this->url . $fn; -- cgit v1.2.3 From df95e790ba49464dd6b093f0c45777288f738d7d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 18 Oct 2012 09:52:45 +0200 Subject: Remove automatic to-lowercase conversion of usernames (#1488715) --- CHANGELOG | 1 + config/main.inc.php.dist | 8 ++++---- program/include/rcmail.php | 20 +++++--------------- 3 files changed, 10 insertions(+), 19 deletions(-) (limited to 'program') diff --git a/CHANGELOG b/CHANGELOG index e54da0f7c..c23210d37 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Remove automatic to-lowercase conversion of usernames (#1488715) - Fix scrolling quirk in email preview frame using Opera 12 (#1488763) - Fix displaying of multipart/alternative messages with empty parts (#1488750) - Fix threaded list sorting on PHP < 5.2.9 (#1488748) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index a6661c323..371ccaf8c 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -226,10 +226,10 @@ $rcmail_config['login_autocomplete'] = 0; // Forces conversion of logins to lower case. // 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; +// If users authentication is case-insensitive this must be enabled. +// Note: After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 2; // Includes should be interpreted as PHP files $rcmail_config['skin_include_php'] = false; diff --git a/program/include/rcmail.php b/program/include/rcmail.php index ec3d537ec..0c2bf64b4 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -452,6 +452,10 @@ class rcmail extends rcube $username .= '@'.rcube_utils::parse_host($config['username_domain'], $host); } + if (!isset($config['login_lc'])) { + $config['login_lc'] = 2; // default + } + // Convert username to lowercase. If storage backend // is case-insensitive we need to store always the same username (#1487113) if ($config['login_lc']) { @@ -483,21 +487,7 @@ class rcmail extends rcube $storage = $this->get_storage(); // try to log in - if (!($login = $storage->connect($host, $username, $pass, $port, $ssl))) { - // try with lowercase - $username_lc = mb_strtolower($username); - if ($username_lc != $username) { - // try to find user record again -> overwrite username - if (!$user && ($user = rcube_user::query($username_lc, $host))) - $username_lc = $user->data['username']; - - if ($login = $storage->connect($host, $username_lc, $pass, $port, $ssl)) - $username = $username_lc; - } - } - - // exit if login failed - if (!$login) { + if (!$storage->connect($host, $username, $pass, $port, $ssl)) { return false; } -- cgit v1.2.3 From 043880738ae1489b87eb63b94729fa6112e3c67f Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 18 Oct 2012 09:53:03 +0200 Subject: Ignore htmlspecialchars() warnings --- program/include/html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program') diff --git a/program/include/html.php b/program/include/html.php index 234985241..880873ddc 100644 --- a/program/include/html.php +++ b/program/include/html.php @@ -334,7 +334,7 @@ class html */ public static function quote($str) { - return htmlspecialchars($str, ENT_COMPAT, RCMAIL_CHARSET); + return @htmlspecialchars($str, ENT_COMPAT, RCMAIL_CHARSET); } } -- cgit v1.2.3 From 22c67d0ec28f4c9488d26aa35151392a18c74c45 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 18 Oct 2012 10:49:58 +0200 Subject: Fix handling of URLs with asterisk characters (#1488759) --- CHANGELOG | 1 + program/include/rcube_string_replacer.php | 30 +++++++++++++++++++++++------- program/steps/mail/func.inc | 5 ++--- tests/Framework/StringReplacer.php | 24 ++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 10 deletions(-) (limited to 'program') diff --git a/CHANGELOG b/CHANGELOG index c23210d37..b3c33b3b5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix handling of URLs with asterisk characters (#1488759) - Remove automatic to-lowercase conversion of usernames (#1488715) - Fix scrolling quirk in email preview frame using Opera 12 (#1488763) - Fix displaying of multipart/alternative messages with empty parts (#1488750) diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php index c29f0e476..ad55dd87b 100644 --- a/program/include/rcube_string_replacer.php +++ b/program/include/rcube_string_replacer.php @@ -37,16 +37,16 @@ class rcube_string_replacer { // Simplified domain expression for UTF8 characters handling // Support unicode/punycode in top-level domain part - $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})'; + $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})'; $url1 = '.:;,'; - $url2 = 'a-z0-9%=#@+?!&\\/_~\\[\\]{}-'; + $url2 = 'a-zA-Z0-9%=#$@+?!&\\/_~\\[\\]{}\*-'; - $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain([$url1]?[$url2]+)*)/i"; + $this->link_pattern = "/([\w]+:\/\/|\W[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)($utf_domain([$url1]?[$url2]+)*)/"; $this->mailto_pattern = "/(" ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*" // local-part ."@$utf_domain" // domain-part ."(\?[$url1$url2]+)?" // e.g. ?subject=test... - .")/i"; + .")/"; } /** @@ -81,11 +81,11 @@ class rcube_string_replacer $i = -1; $scheme = strtolower($matches[1]); - if (preg_match('!^(http|ftp|file)s?://!', $scheme)) { + if (preg_match('!^(http|ftp|file)s?://!i', $scheme)) { $url = $matches[1] . $matches[2]; } - else if (preg_match('/^(\W)www\.$/', $matches[1], $m)) { - $url = 'www.' . $matches[2]; + else if (preg_match('/^(\W*)(www\.)$/i', $matches[1], $m)) { + $url = $m[2] . $matches[2]; $url_prefix = 'http://'; $prefix = $m[1]; } @@ -133,6 +133,22 @@ class rcube_string_replacer return $this->values[$matches[1]]; } + /** + * Replace all defined (link|mailto) patterns with replacement string + * + * @param string $str Text + * + * @return string Text + */ + public function replace($str) + { + // search for patterns like links and e-mail addresses + $str = preg_replace_callback($this->link_pattern, array($this, 'link_callback'), $str); + $str = preg_replace_callback($this->mailto_pattern, array($this, 'mailto_callback'), $str); + + return $str; + } + /** * Replace substituted strings with original values */ diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index c21202588..39bccac16 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -786,9 +786,8 @@ function rcmail_plain_body($body, $flowed=false) // make links and email-addresses clickable $replacer = new rcube_string_replacer; - // search for patterns like links and e-mail addresses - $body = preg_replace_callback($replacer->link_pattern, array($replacer, 'link_callback'), $body); - $body = preg_replace_callback($replacer->mailto_pattern, array($replacer, 'mailto_callback'), $body); + // search for patterns like links and e-mail addresses and replace with tokens + $body = $replacer->replace($body); // split body into single lines $body = preg_split('/\r?\n/', $body); diff --git a/tests/Framework/StringReplacer.php b/tests/Framework/StringReplacer.php index 11210c0da..6081e5377 100644 --- a/tests/Framework/StringReplacer.php +++ b/tests/Framework/StringReplacer.php @@ -17,4 +17,28 @@ class Framework_StringReplacer extends PHPUnit_Framework_TestCase $this->assertInstanceOf('rcube_string_replacer', $sr, "Class constructor"); } + + /** + * Data for test_replace() + */ + function data_replace() + { + return array( + array('http://domain.tld/path*path2', 'http://domain.tld/path*path2'), + array('www.domain.tld', 'www.domain.tld'), + array('WWW.DOMAIN.TLD', 'WWW.DOMAIN.TLD'), + ); + } + + /** + * @dataProvider data_replace + */ + function test_replace($input, $output) + { + $replacer = new rcube_string_replacer; + $result = $replacer->replace($input); + $result = $replacer->resolve($result); + + $this->assertEquals($output, $result); + } } -- cgit v1.2.3