Merge pull request #43 from shaarli/hotfix/sanatizing-improvements

Improve sanitizing regexp

Author: ArthurHoaro

NetscapeBookmarkParser.php

@@ -262,7 +262,7 @@ public static function sanitizeString($bookmarkString)
         $sanitized = $bookmarkString;
 
         // trim comments
-        $sanitized = preg_replace('@<!--.*-->@mis', '', $sanitized);
+        $sanitized = preg_replace('@<!--.*?-->@mis', '', $sanitized);
 
         // keep one XML element per line to prepare for linear parsing
         $sanitized = preg_replace('@>(\s*?)<@mis', ">\n<", $sanitized);
@@ -279,9 +279,9 @@ public static function sanitizeString($bookmarkString)
         // convert multiline descriptions to one-line descriptions
         // line feeds are converted to <br>
         $sanitized = preg_replace_callback(
-            '@<DD>(.*?)<@mis',
+            '@<DD>(.*?)(</?(:?DT|DD|DL))@mis',
             function($match) {
-                return '<DD>'.str_replace("\n", '<br>', trim($match[1])).PHP_EOL.'<';
+                return '<DD>'.str_replace("\n", '<br>', trim($match[1])).PHP_EOL. $match[2];
             },
             $sanitized
         );

tests/ParseDeliciousBookmarksTest.php

@@ -59,4 +59,43 @@ public function testParse()
         );
         $this->assertEquals('1412085559', $bkm[4]['time']);
     }
+
+    /**
+     * Make sure that the sanitizing function doesn't strip content
+     */
+    public function testParseStrictSanitizing()
+    {
+        $parser = new NetscapeBookmarkParser();
+        $bkm = $parser->parseFile('tests/input/delicious_sanitize.htm');
+        $this->assertEquals(2, sizeof($bkm));
+
+        $this->assertEquals(
+            'Text
+<li>#CLE ---> #VALEUR</li>
+</BOUCLE_exploiter>
+</code>',
+            $bkm[0]['note']
+        );
+        $this->assertEquals('1', $bkm[0]['pub']);
+        $this->assertEquals('1380651656', $bkm[0]['time']);
+        $this->assertEquals('http://spip.pastebin.fr/28921', $bkm[0]['uri']);
+        $this->assertEquals(
+            'spip pastebin - outil de debug collaboratif - Bonjour les écureuils !',
+            $bkm[0]['title']
+        );
+        $this->assertEquals('spip3   astuces ', $bkm[0]['tags']);
+
+        $this->assertEquals('1', $bkm[1]['pub']);
+        $this->assertEquals('1380651611', $bkm[1]['time']);
+        $this->assertEquals(
+            'http://www.la-grange.net/2013/09/07/changement',
+            $bkm[1]['uri']
+        );
+        $this->assertEquals('Changer le monde - Carnets Web de La Grange', $bkm[1]['title']);
+        $this->assertEquals(
+            'La juxtaposition des mots propriétés et intellectuel (du monde des idées) '
+           .'est une aberration dans un contexte de l\'échange et de la culture.',
+            $bkm[1]['note']
+        );
+    }
 }