Merge branch 'master' into 2019-design

[bookstack] / app / Entities / Repos / EntityRepo.php
diff --git a/app/Entities/Repos/EntityRepo.php b/app/Entities/Repos/EntityRepo.php

index 13a9d9a9c33ec3097a71560efb1df70e8bd97d73..15340c90693706340234ab7b959a1cfbaab41d1f 100644 (file)
--- a/app/Entities/Repos/EntityRepo.php
+++ b/app/Entities/Repos/EntityRepo.php
@@ -616,24 +616,48 @@ class EntityRepo
      }
  
      /**
      }
  
      /**
-     * Render the page for viewing, Parsing and performing features such as page transclusion.
+     * Render the page for viewing
       * @param Page $page
       * @param Page $page
-     * @param bool $ignorePermissions
-     * @return mixed|string
+     * @param bool $blankIncludes
+     * @return string
       */
       */
-    public function renderPage(Page $page, $ignorePermissions = false)
+    public function renderPage(Page $page, bool $blankIncludes = false) : string
      {
          $content = $page->html;
      {
          $content = $page->html;
+
          if (!config('app.allow_content_scripts')) {
              $content = $this->escapeScripts($content);
          }
  
          if (!config('app.allow_content_scripts')) {
              $content = $this->escapeScripts($content);
          }
  
-        $matches = [];
-        preg_match_all("/{{@\s?([0-9].*?)}}/", $content, $matches);
-        if (count($matches[0]) === 0) {
-            return $content;
+        if ($blankIncludes) {
+            $content = $this->blankPageIncludes($content);
+        } else {
+            $content = $this->parsePageIncludes($content);
          }
  
          }
  
+        return $content;
+    }
+
+    /**
+     * Remove any page include tags within the given HTML.
+     * @param string $html
+     * @return string
+     */
+    protected function blankPageIncludes(string $html) : string
+    {
+        return preg_replace("/{{@\s?([0-9].*?)}}/", '', $html);
+    }
+
+    /**
+     * Parse any include tags "{{@<page_id>#section}}" to be part of the page.
+     * @param string $html
+     * @return mixed|string
+     */
+    protected function parsePageIncludes(string $html) : string
+    {
+        $matches = [];
+        preg_match_all("/{{@\s?([0-9].*?)}}/", $html, $matches);
+
          $topLevelTags = ['table', 'ul', 'ol'];
          foreach ($matches[1] as $index => $includeId) {
              $splitInclude = explode('#', $includeId, 2);
          $topLevelTags = ['table', 'ul', 'ol'];
          foreach ($matches[1] as $index => $includeId) {
              $splitInclude = explode('#', $includeId, 2);
@@ -642,14 +666,14 @@ class EntityRepo
                  continue;
              }
  
                  continue;
              }
  
-            $matchedPage = $this->getById('page', $pageId, false, $ignorePermissions);
+            $matchedPage = $this->getById('page', $pageId);
              if ($matchedPage === null) {
              if ($matchedPage === null) {
-                $content = str_replace($matches[0][$index], '', $content);
+                $html = str_replace($matches[0][$index], '', $html);
                  continue;
              }
  
              if (count($splitInclude) === 1) {
                  continue;
              }
  
              if (count($splitInclude) === 1) {
-                $content = str_replace($matches[0][$index], $matchedPage->html, $content);
+                $html = str_replace($matches[0][$index], $matchedPage->html, $html);
                  continue;
              }
  
                  continue;
              }
  
@@ -657,7 +681,7 @@ class EntityRepo
              $doc->loadHTML(mb_convert_encoding('<body>'.$matchedPage->html.'</body>', 'HTML-ENTITIES', 'UTF-8'));
              $matchingElem = $doc->getElementById($splitInclude[1]);
              if ($matchingElem === null) {
              $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);
+                $html = str_replace($matches[0][$index], '', $html);
                  continue;
              }
              $innerContent = '';
                  continue;
              }
              $innerContent = '';
@@ -669,25 +693,22 @@ class EntityRepo
                      $innerContent .= $doc->saveHTML($childNode);
                  }
              }
                      $innerContent .= $doc->saveHTML($childNode);
                  }
              }
-            $content = str_replace($matches[0][$index], trim($innerContent), $content);
+            $html = str_replace($matches[0][$index], trim($innerContent), $html);
          }
  
          }
  
-        return $content;
+        return $html;
      }
  
      /**
       * Escape script tags within HTML content.
       * @param string $html
      }
  
      /**
       * Escape script tags within HTML content.
       * @param string $html
-     * @return mixed
+     * @return string
       */
       */
-    protected function escapeScripts(string $html)
+    protected function escapeScripts(string $html) : string
      {
          $scriptSearchRegex = '/<script.*?>.*?<\/script>/ms';
          $matches = [];
          preg_match_all($scriptSearchRegex, $html, $matches);
      {
          $scriptSearchRegex = '/<script.*?>.*?<\/script>/ms';
          $matches = [];
          preg_match_all($scriptSearchRegex, $html, $matches);
-        if (count($matches) === 0) {
-            return $html;
-        }
  
          foreach ($matches[0] as $match) {
              $html = str_replace($match, htmlentities($match), $html);
  
          foreach ($matches[0] as $match) {
              $html = str_replace($match, htmlentities($match), $html);