alecpl
2010-10-12 937e26a541e3144f6df812d7e8eb6de3d35f596d
- Fix links handling


1 files modified
7 ■■■■■ changed files
program/include/rcube_string_replacer.php 7 ●●●●● patch | view | raw | blame | history
program/include/rcube_string_replacer.php
@@ -36,13 +36,14 @@
  function __construct()
  {
    // Simplified domain expression for UTF8 characters handling
    $utf_domain = '[^&@"\'\\/\s\r\t\n]+\\.[a-z]{2,5}';
    $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.[a-z]{2,5}';
    $url = '[a-z0-9%=#+?.:&\\/_-]+';
    $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain(\S+)?)/i";
    $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain($url)?)/i";
    $this->mailto_pattern = "/("
        ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
        ."@$utf_domain"                                                 // domain-part
        ."(\?\S+)?"                                                     // e.g. ?subject=test...
        ."(\?$url)?"                                                     // e.g. ?subject=test...
        .")/i";
  }