From e8ab3d96bd4340fb262e5d83a2e5988f47bba3b0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 12 Apr 2016 05:53:04 -0400
Subject: [PATCH] Fix converting mail addresses with @www. into mailto links (#5197)

---
 program/lib/Roundcube/rcube_string_replacer.php |   66 +++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php
index d1f1f4d..284d585 100644
--- a/program/lib/Roundcube/rcube_string_replacer.php
+++ b/program/lib/Roundcube/rcube_string_replacer.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2009-2012, The Roundcube Dev Team                       |
@@ -24,11 +24,17 @@
  */
 class rcube_string_replacer
 {
-    public static $pattern = '/##str_replacement\[([0-9]+)\]##/';
+    public static $pattern = '/##str_replacement_(\d+)##/';
     public $mailto_pattern;
     public $link_pattern;
-    private $values = array();
-    private $options = array();
+    public $linkref_index;
+    public $linkref_pattern;
+
+    protected $values   = array();
+    protected $options  = array();
+    protected $linkrefs = array();
+    protected $urls     = array();
+    protected $noword   = '[^\w@.#-]';
 
 
     function __construct($options = array())
@@ -37,22 +43,27 @@
         // 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-zA-Z0-9]{2,})';
         $url1       = '.:;,';
-        $url2       = 'a-zA-Z0-9%=#$@+?!&\\/_~\\[\\]\\(\\){}\*-';
+        $url2       = 'a-zA-Z0-9%=#$@+?|!&\\/_~\\[\\]\\(\\){}\*\x80-\xFE-';
 
-        $this->link_pattern = "/([\w]+:\/\/|\W[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)($utf_domain([$url1]*[$url2]+)*)/";
-        $this->mailto_pattern = "/("
+        // Supported link prefixes
+        $link_prefix = "([\w]+:\/\/|{$this->noword}[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)";
+
+        $this->options         = $options;
+        $this->linkref_index   = '/\[([^\]#]+)\](:?\s*##str_replacement_(\d+)##)/';
+        $this->linkref_pattern = '/\[([^\]#]+)\]/';
+        $this->link_pattern    = "/$link_prefix($utf_domain([$url1]*[$url2]+)*)/";
+        $this->mailto_pattern  = "/("
             ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
             ."@$utf_domain"                                                 // domain-part
             ."(\?[$url1$url2]+)?"                                           // e.g. ?subject=test...
             .")/";
-
-        $this->options = $options;
     }
 
     /**
      * Add a string to the internal list
      *
-     * @param string String value 
+     * @param string String value
+     *
      * @return int Index of value for retrieval
      */
     public function add($str)
@@ -67,7 +78,7 @@
      */
     public function get_replacement($i)
     {
-        return '##str_replacement['.$i.']##';
+        return '##str_replacement_' . $i . '##';
     }
 
     /**
@@ -84,7 +95,7 @@
         if (preg_match('!^(http|ftp|file)s?://!i', $scheme)) {
             $url = $matches[1] . $matches[2];
         }
-        else if (preg_match('/^(\W*)(www\.)$/i', $matches[1], $m)) {
+        else if (preg_match("/^({$this->noword}*)(www\.)$/i", $matches[1], $m)) {
             $url        = $m[2] . $matches[2];
             $url_prefix = 'http://';
             $prefix     = $m[1];
@@ -96,6 +107,7 @@
             $attrib['href'] = $url_prefix . $url;
 
             $i = $this->add(html::a($attrib, rcube::Q($url)) . $suffix);
+            $this->urls[$i] = $attrib['href'];
         }
 
         // Return valid link for recognized schemes, otherwise
@@ -104,9 +116,36 @@
     }
 
     /**
+     * Callback to add an entry to the link index
+     */
+    public function linkref_addindex($matches)
+    {
+        $key = $matches[1];
+        $this->linkrefs[$key] = $this->urls[$matches[3]];
+
+        return $this->get_replacement($this->add('['.$key.']')) . $matches[2];
+    }
+
+    /**
+     * Callback to replace link references with real links
+     */
+    public function linkref_callback($matches)
+    {
+        $i = 0;
+        if ($url = $this->linkrefs[$matches[1]]) {
+            $attrib = (array)$this->options['link_attribs'];
+            $attrib['href'] = $url;
+            $i = $this->add(html::a($attrib, rcube::Q($matches[1])));
+        }
+
+        return $i > 0 ? '['.$this->get_replacement($i).']' : $matches[0];
+    }
+
+    /**
      * Callback function used to build mailto: links around e-mail strings
      *
      * @param array Matches result from preg_replace_callback
+     *
      * @return int Index of saved string value
      */
     public function mailto_callback($matches)
@@ -142,6 +181,9 @@
         // 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);
+        // resolve link references
+        $str = preg_replace_callback($this->linkref_index, array($this, 'linkref_addindex'), $str);
+        $str = preg_replace_callback($this->linkref_pattern, array($this, 'linkref_callback'), $str);
 
         return $str;
     }

--
Gitblit v1.9.1