github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-10 17:01:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Includes: Added ID de-duplicating and more thorough clean-up

Browse Source
This commit is contained in:
Dan Brown 2023-11-27 20:16:27 +00:00
parent 71c93c8878
commit b569827114
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Entities/Tools/PageContent.php
View File

@ -5,8 +5,6 @@ namespace BookStack\Entities\Tools;
use BookStack\Entities\Models\Page; use BookStack\Entities\Models\Page;
use BookStack\Entities\Tools\Markdown\MarkdownToHtml; use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
use BookStack\Exceptions\ImageUploadException; use BookStack\Exceptions\ImageUploadException;
use BookStack\Facades\Theme;
use BookStack\Theming\ThemeEvents;
use BookStack\Uploads\ImageRepo; use BookStack\Uploads\ImageRepo;
use BookStack\Uploads\ImageService; use BookStack\Uploads\ImageService;
use BookStack\Util\HtmlContentFilter; use BookStack\Util\HtmlContentFilter;
@ -293,10 +291,16 @@ class PageContent
$parser = new PageIncludeParser($doc, $contentProvider); $parser = new PageIncludeParser($doc, $contentProvider);
$nodesAdded = 1; $nodesAdded = 1;
for ($includeDepth = 0; $includeDepth < 3 && $nodesAdded !== 0; $includeDepth++) { for ($includeDepth = 0; $includeDepth < 1 && $nodesAdded !== 0; $includeDepth++) {
$nodesAdded = $parser->parse(); $nodesAdded = $parser->parse();
} }
if ($includeDepth > 1) {
$idMap = [];
$changeMap = [];
$this->updateIdsRecursively($doc->getBody(), 0, $idMap, $changeMap);
}
if (!config('app.allow_content_scripts')) { if (!config('app.allow_content_scripts')) {
HtmlContentFilter::removeScriptsFromDocument($doc); HtmlContentFilter::removeScriptsFromDocument($doc);
} }

7
app/Entities/Tools/PageIncludeParser.php
View File

@ -145,6 +145,7 @@ class PageIncludeParser
$parentText = $parent->textContent; $parentText = $parent->textContent;
$tagPos = strpos($parentText, $tag->tagContent); $tagPos = strpos($parentText, $tag->tagContent);
$before = $tagPos < (strlen($parentText) / 2); $before = $tagPos < (strlen($parentText) / 2);
$this->toCleanup[] = $tag->domNode->parentNode;
if ($before) { if ($before) {
$parent->parentNode->insertBefore($tag->domNode, $parent); $parent->parentNode->insertBefore($tag->domNode, $parent);
@ -206,8 +207,10 @@ class PageIncludeParser
{ {
foreach ($this->toCleanup as $element) { foreach ($this->toCleanup as $element) {
$element->normalize(); $element->normalize();
if ($element->parentNode && !$element->hasChildNodes()) { while ($element->parentNode && !$element->hasChildNodes()) {
$element->parentNode->removeChild($element); $parent = $element->parentNode;
$parent->removeChild($element);
$element = $parent;
} }
} }
} }

11
tests/Unit/PageIncludeParserTest.php
View File

@ -179,6 +179,15 @@ class PageIncludeParserTest extends TestCase
); );
} }
public function test_multi_source_elem_whole_document_with_nested_content_origin()
{
$this->runParserTest(
'<p><strong>{{@45}}</strong></p>',
['45' => '<p>Testing</p><blockquote>This</blockquote>'],
'<p>Testing</p><blockquote>This</blockquote>',
);
}
public function test_multiple_tags_in_same_origin_with_inline_content() public function test_multiple_tags_in_same_origin_with_inline_content()
{ {
$this->runParserTest( $this->runParserTest(
@ -202,7 +211,7 @@ class PageIncludeParserTest extends TestCase
$this->runParserTest( $this->runParserTest(
'<div><p>This <strong>{{@45#content}}</strong> content is {{@45#content}}</p>{{@45#content}}</div>', '<div><p>This <strong>{{@45#content}}</strong> content is {{@45#content}}</p>{{@45#content}}</div>',
['45' => '<pre id="content">block</pre>'], ['45' => '<pre id="content">block</pre>'],
'<div><pre id="content">block</pre><p>This <strong></strong> content is </p><pre id="content">block</pre><pre id="content">block</pre></div>', '<div><pre id="content">block</pre><p>This content is </p><pre id="content">block</pre><pre id="content">block</pre></div>',
); );
} }