Imported Upstream version 0.7

[roundcube.git] / program / include / rcube_string_replacer.php

diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index fe082a583c98b1e57a0f1658058dafab72dd917d..b69e9cf50b8814afd6ebe3a5ec06777666957eaf 100644 (file)
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/include/rcube_string_replacer.php                             |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2009, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2009, The Roundcube Dev Team                            |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id:  $
+ $Id: rcube_string_replacer.php 5481 2011-11-24 07:53:00Z alec $
 
 */
 
@@ -28,10 +28,27 @@
 class rcube_string_replacer
 {
   public static $pattern = '/##str_replacement\[([0-9]+)\]##/';
-
+  public $mailto_pattern;
+  public $link_pattern;
   private $values = array();
 
 
+  function __construct()
+  {
+    // 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,})';
+    $url1 = '.:;,';
+    $url2 = 'a-z0-9%=#@+?!&\\/_~\\[\\]{}-';
+
+    $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain([$url1]?[$url2]+)*)/i";
+    $this->mailto_pattern = "/("
+        ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
+        ."@$utf_domain"                                                 // domain-part
+        ."(\?[$url1$url2]+)?"                                           // e.g. ?subject=test...
+        .")/i";
+  }
+
   /**
    * Add a string to the internal list
    *
@@ -64,16 +81,25 @@ class rcube_string_replacer
     $i = -1;
     $scheme = strtolower($matches[1]);
 
-    if ($scheme == 'http' || $scheme == 'https' || $scheme == 'ftp') {
-      $url = $matches[1] . '://' . $matches[2];
-      $i = $this->add(html::a(array('href' => $url, 'target' => "_blank"), Q($url)));
+    if (preg_match('!^(http|ftp|file)s?://!', $scheme)) {
+      $url = $matches[1] . $matches[2];
     }
-    else if ($matches[2] == 'www.') {
-      $url = $matches[2] . $matches[3];
-      $i = $this->add($matches[1] . html::a(array('href' => 'http://' . $url, 'target' => "_blank"), Q($url)));
+    else if (preg_match('/^(\W)www\.$/', $matches[1], $m)) {
+      $url        = 'www.' . $matches[2];
+      $url_prefix = 'http://';
+      $prefix     = $m[1];
     }
 
-    return $i >= 0 ? $this->get_replacement($i) : '';
+    if ($url) {
+      $suffix = $this->parse_url_brackets($url);
+      $i = $this->add($prefix . html::a(array(
+          'href' => $url_prefix . $url,
+          'target' => '_blank'
+        ), Q($url)) . $suffix);
+    }
+
+    // Return valid link for recognized schemes, otherwise, return the unmodified string for unrecognized schemes.
+    return $i >= 0 ? $this->get_replacement($i) : $matches[0];
   }
 
   /**
@@ -84,11 +110,13 @@ class rcube_string_replacer
    */
   public function mailto_callback($matches)
   {
+    $href   = $matches[1];
+    $suffix = $this->parse_url_brackets($href);
+
     $i = $this->add(html::a(array(
-        'href' => 'mailto:' . $matches[1],
-        'onclick' => "return ".JS_OBJECT_NAME.".command('compose','".JQ($matches[1])."',this)",
-      ),
-      Q($matches[1])));
+        'href' => 'mailto:' . $href,
+        'onclick' => "return ".JS_OBJECT_NAME.".command('compose','".JQ($href)."',this)",
+      ), Q($href)) . $suffix);
 
     return $i >= 0 ? $this->get_replacement($i) : '';
   }
@@ -113,4 +141,38 @@ class rcube_string_replacer
     return preg_replace_callback(self::$pattern, array($this, 'replace_callback'), $str);
   }
 
-}
\ No newline at end of file
+  /**
+   * Fixes bracket characters in URL handling
+   */
+  public static function parse_url_brackets(&$url)
+  {
+    // #1487672: special handling of square brackets,
+    // URL regexp allows [] characters in URL, for example:
+    // "http://example.com/?a[b]=c". However we need to handle
+    // properly situation when a bracket is placed at the end
+    // of the link e.g. "[http://example.com]"
+    if (preg_match('/(\\[|\\])/', $url)) {
+      $in = false;
+      for ($i=0, $len=strlen($url); $i<$len; $i++) {
+        if ($url[$i] == '[') {
+          if ($in)
+            break;
+          $in = true;
+        }
+        else if ($url[$i] == ']') {
+          if (!$in)
+            break;
+          $in = false;
+        }
+      }
+
+      if ($i<$len) {
+        $suffix = substr($url, $i);
+        $url    = substr($url, 0, $i);
+      }
+    }
+
+    return $suffix;
+  }
+
+}