Added migration file.

[bookstack] / app / Repos / EntityRepo.php

diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php
index 7bc5fc4fc159f2a2984e8b2fe62eda5593416b44..a682e696bae5d1c4e633d649ef260433480e8426 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 string $type
      * @param integer $id
      * @param bool $allowDrafts

+     * @param bool $ignorePermissions

      * @return Entity
      */
      * @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);
     }
 
         return $this->entityQuery($type, $allowDrafts)->find($id);
     }
 


@@ -571,7 +576,7 @@ class EntityRepo
 
         $draftPage->slug = $this->findSuitableSlug('page', $draftPage->name, false, $draftPage->book->id);
         $draftPage->html = $this->formatHtml($input['html']);
 
         $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->draft = false;
         $draftPage->revision_count = 1;
 


@@ -671,9 +676,10 @@ class EntityRepo
     /**
      * Render the page for viewing, Parsing and performing features such as page transclusion.
      * @param Page $page
     /**
      * Render the page for viewing, Parsing and performing features such as page transclusion.
      * @param Page $page

+     * @param bool $ignorePermissions

      * @return mixed|string
      */
      * @return mixed|string
      */

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

     {
         $content = $page->html;
         $matches = [];
     {
         $content = $page->html;
         $matches = [];


@@ -685,7 +691,7 @@ class EntityRepo
             $pageId = intval($splitInclude[0]);
             if (is_nan($pageId)) continue;
 
             $pageId = intval($splitInclude[0]);
             if (is_nan($pageId)) continue;
 

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

             if ($page === null) {
                 $content = str_replace($matches[0][$index], '', $content);
                 continue;
             if ($page === null) {
                 $content = str_replace($matches[0][$index], '', $content);
                 continue;


@@ -710,9 +716,21 @@ class EntityRepo
             $content = str_replace($matches[0][$index], trim($innerContent), $content);
         }
 
             $content = str_replace($matches[0][$index], trim($innerContent), $content);
         }
 

+        $page->renderedHTML = $content;

         return $content;
     }
 
         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
     /**
      * Get a new draft page instance.
      * @param Book $book


@@ -816,7 +834,7 @@ class EntityRepo
         $userId = user()->id;
         $page->fill($input);
         $page->html = $this->formatHtml($input['html']);
         $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++;
         if (setting('app-editor') !== 'markdown') $page->markdown = '';
         $page->updated_by = $userId;
         $page->revision_count++;


@@ -933,7 +951,7 @@ class EntityRepo
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         $page->fill($revision->toArray());
         $page->slug = $this->findSuitableSlug('page', $page->name, $page->id, $book->id);
         $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);
         $page->updated_by = user()->id;
         $page->save();
         $this->searchService->indexEntity($page);


@@ -953,7 +971,7 @@ class EntityRepo
         if ($page->draft) {
             $page->fill($data);
             if (isset($data['html'])) {
         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;
             }
             $page->save();
             return $page;