webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Updated page include logic to use blade-style tags

Browse Source 
It will also snippets of a page if and id is provided in a tag
This commit is contained in:
Dan Brown
2017-01-21 13:53:00 +00:00
parent e4e3b25c22
commit a4f6bc63f0
7 changed files with 66 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
app/Repos/EntityRepo.php
View File

@ -13,7 +13,6 @@ use Carbon\Carbon;
use DOMDocument;
use DOMXPath;
use Illuminate\Support\Collection;
use Symfony\Component\DomCrawler\Crawler;
class EntityRepo
{
@ -140,7 +139,7 @@ class EntityRepo
*/
public function getById($type, $id, $allowDrafts = false)
{
return $this->entityQuery($type, $allowDrafts)->findOrFail($id);
return $this->entityQuery($type, $allowDrafts)->find($id);
}
/**
@ -805,34 +804,42 @@ class EntityRepo
*/
public function renderPage(Page $page)
{
libxml_use_internal_errors(true);
$doc = new DOMDocument();
$doc->loadHTML(mb_convert_encoding('<body>'.$page->html.'</body>', 'HTML-ENTITIES', 'UTF-8'));
$xpath = new DOMXpath($doc);
$content = $page->html;
$matches = [];
preg_match_all("/{{@\s?([0-9].*?)}}/", $content, $matches);
if (count($matches[0]) === 0) return $content;
$bsElems = $xpath->query('body/div[@bs-embed-page]');
if (is_null($bsElems)) return $page->html;
foreach ($bsElems as $bsElem) {
$pageId = intval($bsElem->getAttribute('bs-embed-page'));
$embeddedPage = $this->getById('page', $pageId);
if ($embeddedPage !== null) {
$innerPage = $doc->createDocumentFragment();
$innerPage->appendXML($embeddedPage->html);
// Empty div then append in child content
foreach ($bsElem->childNodes as $child) {
$bsElem->removeChild($child);
}
$bsElem->appendChild($innerPage);
foreach ($matches[1] as $index => $includeId) {
$splitInclude = explode('#', $includeId, 2);
$pageId = intval($splitInclude[0]);
if (is_nan($pageId)) continue;
$page = $this->getById('page', $pageId);
if ($page === null) {
$content = str_replace($matches[0][$index], '', $content);
continue;
}
if (count($splitInclude) === 1) {
$content = str_replace($matches[0][$index], $page->html, $content);
continue;
}
$doc = new DOMDocument();
$doc->loadHTML(mb_convert_encoding('<body>'.$page->html.'</body>', 'HTML-ENTITIES', 'UTF-8'));
$matchingElem = $doc->getElementById($splitInclude[1]);
if ($matchingElem === null) {
$content = str_replace($matches[0][$index], '', $content);
continue;
}
$innerContent = '';
foreach ($matchingElem->childNodes as $childNode) {
$innerContent .= $doc->saveHTML($childNode);
}
$content = str_replace($matches[0][$index], trim($innerContent), $content);
}
$body = $doc->getElementsByTagName('body')->item(0);
$html = '';
foreach ($body->childNodes as $node) {
$html .= $doc->saveHTML($node);
}
return $html;
return $content;
}
/**
@ -874,15 +881,15 @@ class EntityRepo
/**
* Parse the headers on the page to get a navigation menu
* @param Page $page
* @param String $pageContent
* @return array
*/
public function getPageNav(Page $page)
public function getPageNav($pageContent)
{
if ($page->html == '') return [];
if ($pageContent == '') return [];
libxml_use_internal_errors(true);
$doc = new DOMDocument();
$doc->loadHTML(mb_convert_encoding($page->html, 'HTML-ENTITIES', 'UTF-8'));
$doc->loadHTML(mb_convert_encoding($pageContent, 'HTML-ENTITIES', 'UTF-8'));
$xPath = new DOMXPath($doc);
$headers = $xPath->query("//h1|//h2|//h3|//h4|//h5|//h6");