fix(HtmlExporter)

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

lib/Service/HtmlExporter.php

@@ -71,7 +71,7 @@ public function exportFolder(string $userId, int $folderId): string {
 <TITLE>Bookmarks</TITLE>';
 
 		$file .= "<DL><p>\n";
-		$file .= $this->serializeFolder($userId, $folderId, true);
+		$file .= $this->serializeFolder($userId, $folderId);
 		$file .= "</DL><p>\n";
 
 		return $file;
@@ -87,11 +87,12 @@ public function exportFolder(string $userId, int $folderId): string {
 	 * @throws UnauthorizedAccessError
 	 */
 	protected function serializeFolder(string $userId, int $id, string $indent = ''): string {
+		$output = '';
 		$nextIndent = $indent . '  ';
 		$childFolders = $this->treeMapper->findChildren(TreeMapper::TYPE_FOLDER, $id);
 		foreach ($childFolders as $childFolder) {
-			$folder = $this->folderMapper->find($id);
-			$output = $indent . '<DT><H3>' . htmlspecialchars($folder->getTitle()) . '</H3>' . "\n";
+			$folder = $this->folderMapper->find($childFolder);
+			$output .= $indent . '<DT><H3>' . htmlspecialchars($folder->getTitle()) . '</H3>' . "\n";
 			$output .= $indent . '<DL><p>' . "\n" . $this->serializeFolder($userId, $childFolder->getId(), $nextIndent) . '</DL><p>' . "\n";
 		}
 
@@ -108,9 +109,6 @@ protected function serializeFolder(string $userId, int $id, string $indent = '')
 			$tags = Util::sanitizeHTML(implode(',', $tags));
 			$title = trim($bookmark->getTitle());
 			$url = Util::sanitizeHTML($bookmark->getUrl());
-			if ($title === '') {
-				$title = $url;
-			}
 			$title = Util::sanitizeHTML($title);
 			$description = Util::sanitizeHTML($bookmark->getDescription());
 

tests/HtmlImportExportTest.php

@@ -145,9 +145,9 @@ public function testExport(...$bookmarks): void {
 
 		$exportedRootFolders = $this->treeMapper->findChildren(Db\TreeMapper::TYPE_FOLDER, $rootFolder->getId());
 		$this->assertCount(4, $exportedRootFolders);
-		foreach ($exportedRootFolders as $rootFolder) {
-			foreach ($this->treeMapper->findChildren(Db\TreeMapper::TYPE_BOOKMARK, $rootFolder->getId()) as $bookmark) {
-				$this->assertStringContainsString($rootFolder->getTitle(), $exported);
+		foreach ($exportedRootFolders as $exportedRootFolder) {
+			foreach ($this->treeMapper->findChildren(Db\TreeMapper::TYPE_BOOKMARK, $exportedRootFolder->getId()) as $bookmark) {
+				$this->assertStringContainsString($exportedRootFolder->getTitle(), $exported);
 				$this->assertStringContainsString($bookmark->getUrl(), $exported);
 			}
 		}
@@ -160,7 +160,7 @@ public function testExport(...$bookmarks): void {
 		$importedRootFolders = $this->treeMapper->findChildren(Db\TreeMapper::TYPE_FOLDER, $f->getId());
 		foreach ($importedRootFolders as $i => $importedRootFolder) {
 			$exportedRootFolder = $exportedRootFolders[$i];
-			$this->assertEquals($exportedRootFolder->getTitle(), $importedRootFolder->getTitle());
+			$this->assertEquals($importedRootFolder->getTitle(), $exportedRootFolder->getTitle());
 			$exportedBookmarks = $this->treeMapper->findChildren(Db\TreeMapper::TYPE_BOOKMARK, $exportedRootFolder->getId());
 			foreach ($this->treeMapper->findChildren(Db\TreeMapper::TYPE_BOOKMARK, $importedRootFolder->getId()) as $j => $bookmark) {
 				$this->assertEquals($bookmark->getUrl(), $exportedBookmarks[$j]->getUrl());