BookStack Code Mirror - bookstack/blobdiff

index 449e3aa7d91c10171c7825a432875c82c44bcd42..c2899b136ad341137642f30bb0e85605d5639e91 100644 (file)

--- a/app/Repos/EntityRepo.php

+++ b/app/Repos/EntityRepo.php

@@ -137,10 +137,15 @@ class EntityRepo

* @param string $type

* @param integer $id

* @param bool $allowDrafts

+ * @param bool $ignorePermissions

* @return Entity

- public function getById($type, $id, $allowDrafts = false)

+ public function getById($type, $id, $allowDrafts = false, $ignorePermissions = false)

{

+ if ($ignorePermissions) {

+ $entity = $this->getEntity($type);

+ return $entity->newQuery()->find($id);

+ }

return $this->entityQuery($type, $allowDrafts)->find($id);

}

@@ -348,6 +353,10 @@ class EntityRepo

foreach ($entities as $entity) {

if ($entity->chapter_id === 0 || $entity->chapter_id === '0') continue;

$parentKey = 'BookStack\\Chapter:' . $entity->chapter_id;

+ if (!isset($parents[$parentKey])) {

+ $tree[] = $entity;

+ continue;

+ }

$chapter = $parents[$parentKey];

$chapter->pages->push($entity);

}

@@ -529,11 +538,11 @@ class EntityRepo

/**

* Alias method to update the book jointPermissions in the PermissionService.

- * @param Collection $collection collection on entities

+ * @param Book $book

- public function buildJointPermissions(Collection $collection)

+ public function buildJointPermissionsForBook(Book $book)

{

- $this->permissionService->buildJointPermissionsForEntities($collection);

+ $this->permissionService->buildJointPermissionsForEntity($book);

}

/**

@@ -567,8 +576,9 @@ class EntityRepo

$draftPage->slug = $this->findSuitableSlug('page', $draftPage->name, false, $draftPage->book->id);

$draftPage->html = $this->formatHtml($input['html']);

- $draftPage->text = strip_tags($draftPage->html);

+ $draftPage->text = $this->pageToPlainText($draftPage);

$draftPage->draft = false;

+ $draftPage->revision_count = 1;

$draftPage->save();

$this->savePageRevision($draftPage, trans('entities.pages_initial_revision'));

@@ -593,6 +603,7 @@ class EntityRepo

$revision->created_at = $page->updated_at;

$revision->type = 'version';

$revision->summary = $summary;

+ $revision->revision_number = $page->revision_count;

$revision->save();

// Clear old revisions

@@ -665,9 +676,10 @@ class EntityRepo

/**

* Render the page for viewing, Parsing and performing features such as page transclusion.

* @param Page $page

+ * @param bool $ignorePermissions

* @return mixed|string

- public function renderPage(Page $page)

+ public function renderPage(Page $page, $ignorePermissions = false)

{

$content = $page->html;

$matches = [];

@@ -679,19 +691,19 @@ class EntityRepo

$pageId = intval($splitInclude[0]);

if (is_nan($pageId)) continue;

- $page = $this->getById('page', $pageId);

- if ($page === null) {

+ $matchedPage = $this->getById('page', $pageId, false, $ignorePermissions);

+ if ($matchedPage === null) {

$content = str_replace($matches[0][$index], '', $content);

continue;

}

if (count($splitInclude) === 1) {

- $content = str_replace($matches[0][$index], $page->html, $content);

+ $content = str_replace($matches[0][$index], $matchedPage->html, $content);

continue;

}

$doc = new DOMDocument();

- $doc->loadHTML(mb_convert_encoding('<body>'.$page->html.'</body>', 'HTML-ENTITIES', 'UTF-8'));

+ $doc->loadHTML(mb_convert_encoding('<body>'.$matchedPage->html.'</body>', 'HTML-ENTITIES', 'UTF-8'));

$matchingElem = $doc->getElementById($splitInclude[1]);

if ($matchingElem === null) {

$content = str_replace($matches[0][$index], '', $content);

@@ -707,6 +719,17 @@ class EntityRepo

return $content;

}

+ /**

+ * Get the plain text version of a page's content.

+ * @param Page $page

+ * @return string

+ */

+ public function pageToPlainText(Page $page)

+ {

+ $html = $this->renderPage($page);

+ return strip_tags($html);

+ }

/**

* Get a new draft page instance.

* @param Book $book

@@ -724,6 +747,7 @@ class EntityRepo

if ($chapter) $page->chapter_id = $chapter->id;

$book->pages()->save($page);

+ $page = $this->page->find($page->id);

$this->permissionService->buildJointPermissionsForEntity($page);

return $page;

}

@@ -809,9 +833,10 @@ class EntityRepo

$userId = user()->id;

$page->fill($input);

$page->html = $this->formatHtml($input['html']);

- $page->text = strip_tags($page->html);

+ $page->text = $this->pageToPlainText($page);

if (setting('app-editor') !== 'markdown') $page->markdown = '';

$page->updated_by = $userId;

+ $page->revision_count++;

$page->save();

// Remove all update drafts for this user & page.

@@ -920,11 +945,12 @@ class EntityRepo

public function restorePageRevision(Page $page, Book $book, $revisionId)

{

+ $page->revision_count++;

$this->savePageRevision($page);

$revision = $page->revisions()->where('id', '=', $revisionId)->first();

$page->fill($revision->toArray());

$page->slug = $this->findSuitableSlug('page', $page->name, $page->id, $book->id);

- $page->text = strip_tags($page->html);

+ $page->text = $this->pageToPlainText($page);

$page->updated_by = user()->id;

$page->save();

$this->searchService->indexEntity($page);

@@ -944,7 +970,7 @@ class EntityRepo

if ($page->draft) {

$page->fill($data);

if (isset($data['html'])) {

- $page->text = strip_tags($data['html']);

+ $page->text = $this->pageToPlainText($page);

}

$page->save();

return $page;