colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue where page export contain system would miss images

This commit is contained in:
Dan Brown 2020-12-06 22:23:21 +00:00
parent 65b2c90522
commit 6c09334ba0
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Entities/Tools/ExportFormatter.php
View File

@ -143,7 +143,7 @@ class ExportFormatter
protected function containHtml(string $htmlContent): string protected function containHtml(string $htmlContent): string
{ {
$imageTagsOutput = []; $imageTagsOutput = [];
preg_match_all("/\<img.*src\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $imageTagsOutput); preg_match_all("/\<img.*?src\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $imageTagsOutput);
// Replace image src with base64 encoded image strings // Replace image src with base64 encoded image strings
if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) { if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) {

20
tests/Entity/ExportTest.php
View File

@ -167,12 +167,28 @@ class ExportTest extends TestCase
$resp->assertSee('<img src="data:image/svg+xml;base64'); $resp->assertSee('<img src="data:image/svg+xml;base64');
} }
public function test_page_image_containment_works_on_multiple_images_within_a_single_line()
{
$page = Page::first();
Storage::disk('local')->makeDirectory('uploads/images/gallery');
Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '<svg></svg>');
Storage::disk('local')->put('uploads/images/gallery/svg_test2.svg', '<svg></svg>');
$page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg" class="a"><img src="http://localhost/uploads/images/gallery/svg_test2.svg" class="b">';
$page->save();
$resp = $this->asEditor()->get($page->getUrl('/export/html'));
Storage::disk('local')->delete('uploads/images/gallery/svg_test.svg');
Storage::disk('local')->delete('uploads/images/gallery/svg_test2.svg');
$resp->assertDontSee('http://localhost/uploads/images/gallery/svg_test');
}
public function test_page_export_contained_html_image_fetches_only_run_when_url_points_to_image_upload_folder() public function test_page_export_contained_html_image_fetches_only_run_when_url_points_to_image_upload_folder()
{ {
$page = Page::first(); $page = Page::first();
$page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg"/>' $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg"/>'
."\n".'<img src="http://localhost/uploads/svg_test.svg"/>' .'<img src="http://localhost/uploads/svg_test.svg"/>'
."\n".'<img src="/uploads/svg_test.svg"/>'; .'<img src="/uploads/svg_test.svg"/>';
$storageDisk = Storage::disk('local'); $storageDisk = Storage::disk('local');
$storageDisk->makeDirectory('uploads/images/gallery'); $storageDisk->makeDirectory('uploads/images/gallery');
$storageDisk->put('uploads/images/gallery/svg_test.svg', '<svg>good</svg>'); $storageDisk->put('uploads/images/gallery/svg_test.svg', '<svg>good</svg>');