Changeset 4580 in subversion

Timestamp:

Feb 28, 2011 12:33:26 PM (2 years ago)

Author:

alec

Message:

• Fix parsing links with non-printable characters inside (#1487805)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/html2text.php (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix parsing links with non-printable characters inside (#1487805)
 - Force IE to send referers (#1487806)
 - Fixed de_CH Localization bugs (#1487773)

trunk/roundcubemail/program/lib/html2text.php

@@ -653 +653 @@
             return $this->_strtoupper("\n\n". $matches[2] ."\n\n");
         case 'a':
-            return $this->_build_link_list($matches[3], $matches[4]);
-        }
-    }
-    
+            // Remove spaces in URL (#1487805)
+            $url = str_replace(' ', '', $matches[3]);
+            return $this->_build_link_list($url, $matches[4]);
+        }
+    }
+
     /**
      *  Strtoupper multibyte wrapper function

trunk/roundcubemail/program/steps/mail/func.inc

@@ -1201 +1201 @@
   $end = '>';
 
+  // Remove non-printable characters in URL (#1487805)
+  $attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);
+
   if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
     $tempurl = 'tmp-' . md5($attrib['href']) . '.css';