alecpl
2010-10-27 d21a05b48117ce7dbef4ad7997ed15c26bccf481
- Fix handling of URLs with semicolon (;) character (#1487088)


2 files modified
6 ■■■■ changed files
CHANGELOG 2 ●●● patch | view | raw | blame | history
program/include/rcube_string_replacer.php 4 ●●●● patch | view | raw | blame | history
CHANGELOG
@@ -51,7 +51,7 @@
- Add basic IMAP LIST's \Noselect option support
- Add support for selection options from LIST-EXTENDED extension (RFC 5258)
- Don't list subscribed but non-existent folders (#1486225)
- Fix handling of URLs with tilde (~) character (#1487087)
- Fix handling of URLs with tilde (~) or semicolon (;) character (#1487087, #1487088)
RELEASE 0.4.2
-------------
program/include/rcube_string_replacer.php
@@ -37,13 +37,13 @@
  {
    // Simplified domain expression for UTF8 characters handling
    $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.[a-z]{2,5}';
    $url = '[a-z0-9%=#+?.:&\\/_~-]+';
    $url = '[a-z0-9%=#@+?.:;&\\/_~-]+';
    $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain($url)?)/i";
    $this->mailto_pattern = "/("
        ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
        ."@$utf_domain"                                                 // domain-part
        ."(\?$url)?"                                                     // e.g. ?subject=test...
        ."(\?$url)?"                                                    // e.g. ?subject=test...
        .")/i";
  }