Exclude punctuation from URLs within text; only link accepted url schemes

thomascube

2011-01-10 a1013c0372c244c3722b21fee1b6bc312651669e

Exclude punctuation from URLs within text; only link accepted url schemes

 program/include/rcube_string_replacer.php

@@ -37,13 +37,14 @@
  {
    // Simplified domain expression for UTF8 characters handling
    $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.[a-z]{2,5}';
    $url = '[a-z0-9%=#@+?.:;&\\/_~\\[\\]-]+';
    $url1 = '.:;';
    $url2 = 'a-z0-9%=#@+?&\\/_~\\[\\]-';

    $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain($url)?)/i";
    $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain([$url1]?[$url2]+)*)/i";
    $this->mailto_pattern = "/("
        ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
        ."@$utf_domain"                                                 // domain-part
        ."(\?$url)?"                                                    // e.g. ?subject=test...
        ."(\?[$url1$url2]+)?"                                           // e.g. ?subject=test...
        .")/i";
  }

@@ -88,11 +89,13 @@
      $prefix     = $m[1];
    }

    $suffix = $this->parse_url_brackets($url);
    $i = $this->add($prefix . html::a(array(
      'href' => $url_prefix . $url,
      'target' => '_blank'
      ), Q($url)) . $suffix);
    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];

 tests/mailfunc.php

@@ -112,7 +112,7 @@
    $html = rcmail_print_body($part, array('safe' => true));

    $this->assertPattern('/<a href="mailto:nobody@roundcube.net" onclick="return rcmail.command\(\'compose\',\'nobody@roundcube.net\',this\)">nobody@roundcube.net<\/a>/', $html, "Mailto links with onclick");
    $this->assertPattern('#<a href="http://www.apple.com/legal/privacy/" target="_blank">http://www.apple.com/legal/privacy/</a>#', $html, "Links with target=_blank");
    $this->assertPattern('#<a href="http://www.apple.com/legal/privacy" target="_blank">http://www.apple.com/legal/privacy</a>#', $html, "Links with target=_blank");
    $this->assertPattern('#\\[<a href="http://example.com/\\?tx\\[a\\]=5" target="_blank">http://example.com/\\?tx\\[a\\]=5</a>\\]#', $html, "Links with square brackets");
  }


 tests/src/plainbody.txt

@@ -30,7 +30,7 @@
http://www.apple.com/enews/subscribe/

Privacy Policy
http://www.apple.com/legal/privacy/
http://www.apple.com/legal/privacy.

My Info
https://myinfo.apple.com/cgi-bin/WebObjects/MyInfo