Merge branch 'master' of github.com:roundcube/roundcubemail

8 files changed, 49 insertions, 44 deletions

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);
     }
 }
 
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 3b6c6cf15..7a49095f7 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;
     }
 
@@ -2117,10 +2107,9 @@ class rcmail extends rcube
             }
             else {
                 $this->set_storage_prop();
-                return $storage->is_connected();
             }
         }
 
-        return false;
+        return $storage->is_connected();
     }
 }
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')
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
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;
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];
     }
@@ -134,6 +134,22 @@ class rcube_string_replacer
   }
 
   /**
+   * 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
    */
   public function resolve($str)
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);