mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 12:16:07 +00:00
parent
4d6df37963
commit
2bb06463d5
@ -7,6 +7,7 @@ use BookStack\Entities\Page;
|
|||||||
use BookStack\Entities\PageRevision;
|
use BookStack\Entities\PageRevision;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use DOMDocument;
|
use DOMDocument;
|
||||||
|
use DOMElement;
|
||||||
use DOMXPath;
|
use DOMXPath;
|
||||||
|
|
||||||
class PageRepo extends EntityRepo
|
class PageRepo extends EntityRepo
|
||||||
@ -129,8 +130,7 @@ class PageRepo extends EntityRepo
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Formats a page's html to be tagged correctly
|
* Formats a page's html to be tagged correctly within the system.
|
||||||
* within the system.
|
|
||||||
* @param string $htmlText
|
* @param string $htmlText
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
@ -148,37 +148,17 @@ class PageRepo extends EntityRepo
|
|||||||
$body = $container->childNodes->item(0);
|
$body = $container->childNodes->item(0);
|
||||||
$childNodes = $body->childNodes;
|
$childNodes = $body->childNodes;
|
||||||
|
|
||||||
// Ensure no duplicate ids are used
|
// Set ids on top-level nodes
|
||||||
$idArray = [];
|
$idMap = [];
|
||||||
|
|
||||||
foreach ($childNodes as $index => $childNode) {
|
foreach ($childNodes as $index => $childNode) {
|
||||||
/** @var \DOMElement $childNode */
|
$this->setUniqueId($childNode, $idMap);
|
||||||
if (get_class($childNode) !== 'DOMElement') {
|
}
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Overwrite id if not a BookStack custom id
|
// Ensure no duplicate ids within child items
|
||||||
if ($childNode->hasAttribute('id')) {
|
$xPath = new DOMXPath($doc);
|
||||||
$id = $childNode->getAttribute('id');
|
$idElems = $xPath->query('//body//*//*[@id]');
|
||||||
if (strpos($id, 'bkmrk') === 0 && array_search($id, $idArray) === false) {
|
foreach ($idElems as $domElem) {
|
||||||
$idArray[] = $id;
|
$this->setUniqueId($domElem, $idMap);
|
||||||
continue;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create an unique id for the element
|
|
||||||
// Uses the content as a basis to ensure output is the same every time
|
|
||||||
// the same content is passed through.
|
|
||||||
$contentId = 'bkmrk-' . substr(strtolower(preg_replace('/\s+/', '-', trim($childNode->nodeValue))), 0, 20);
|
|
||||||
$newId = urlencode($contentId);
|
|
||||||
$loopIndex = 0;
|
|
||||||
while (in_array($newId, $idArray)) {
|
|
||||||
$newId = urlencode($contentId . '-' . $loopIndex);
|
|
||||||
$loopIndex++;
|
|
||||||
}
|
|
||||||
|
|
||||||
$childNode->setAttribute('id', $newId);
|
|
||||||
$idArray[] = $newId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate inner html as a string
|
// Generate inner html as a string
|
||||||
@ -190,6 +170,41 @@ class PageRepo extends EntityRepo
|
|||||||
return $html;
|
return $html;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set a unique id on the given DOMElement.
|
||||||
|
* A map for existing ID's should be passed in to check for current existence.
|
||||||
|
* @param DOMElement $element
|
||||||
|
* @param array $idMap
|
||||||
|
*/
|
||||||
|
protected function setUniqueId($element, array &$idMap)
|
||||||
|
{
|
||||||
|
if (get_class($element) !== 'DOMElement') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overwrite id if not a BookStack custom id
|
||||||
|
$existingId = $element->getAttribute('id');
|
||||||
|
if (strpos($existingId, 'bkmrk') === 0 && !isset($idMap[$existingId])) {
|
||||||
|
$idMap[$existingId] = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create an unique id for the element
|
||||||
|
// Uses the content as a basis to ensure output is the same every time
|
||||||
|
// the same content is passed through.
|
||||||
|
$contentId = 'bkmrk-' . substr(strtolower(preg_replace('/\s+/', '-', trim($element->nodeValue))), 0, 20);
|
||||||
|
$newId = urlencode($contentId);
|
||||||
|
$loopIndex = 0;
|
||||||
|
|
||||||
|
while (isset($idMap[$newId])) {
|
||||||
|
$newId = urlencode($contentId . '-' . $loopIndex);
|
||||||
|
$loopIndex++;
|
||||||
|
}
|
||||||
|
|
||||||
|
$element->setAttribute('id', $newId);
|
||||||
|
$idMap[$newId] = true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the plain text version of a page's content.
|
* Get the plain text version of a page's content.
|
||||||
* @param \BookStack\Entities\Page $page
|
* @param \BookStack\Entities\Page $page
|
||||||
|
@ -120,7 +120,7 @@ class PageContentTest extends TestCase
|
|||||||
$this->asEditor();
|
$this->asEditor();
|
||||||
$page = Page::first();
|
$page = Page::first();
|
||||||
|
|
||||||
$content = '<p id="bkmrk-test">test a</p>'."\n".'<p id="bkmrk-test">test b</p>';
|
$content = '<ul id="bkmrk-test"><li>test a</li><li><ul id="bkmrk-test"><li>test b</li></ul></li></ul>';
|
||||||
$pageSave = $this->put($page->getUrl(), [
|
$pageSave = $this->put($page->getUrl(), [
|
||||||
'name' => $page->name,
|
'name' => $page->name,
|
||||||
'html' => $content,
|
'html' => $content,
|
||||||
|
Loading…
Reference in New Issue
Block a user