Fixes typo causing the message not to be displayed

[bookstack] / app / Services / ExportService.php

diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php
index 0497681e9ac695204ea7952af02b2ae5e81958fa..50ba75c17a93a22f7dc8b16d7820fed26338e24d 100644 (file)
--- a/app/Services/ExportService.php
+++ b/app/Services/ExportService.php
@@ -1,6 +1,5 @@
 <?php namespace BookStack\Services;
 
 <?php namespace BookStack\Services;
 

-

 use BookStack\Page;
 
 class ExportService
 use BookStack\Page;
 
 class ExportService


@@ -28,8 +27,13 @@ class ExportService
     {
         $cssContent = file_get_contents(public_path('/css/export-styles.css'));
         $pageHtml = view('pages/pdf', ['page' => $page, 'css' => $cssContent])->render();
     {
         $cssContent = file_get_contents(public_path('/css/export-styles.css'));
         $pageHtml = view('pages/pdf', ['page' => $page, 'css' => $cssContent])->render();

+        $useWKHTML = config('snappy.pdf.binary') !== false;

         $containedHtml = $this->containHtml($pageHtml);
         $containedHtml = $this->containHtml($pageHtml);

-        $pdf = \PDF::loadHTML($containedHtml);
+        if ($useWKHTML) {
+            $pdf = \SnappyPDF::loadHTML($containedHtml);
+        } else {
+            $pdf = \PDF::loadHTML($containedHtml);
+        }

         return $pdf->output();
     }
 
         return $pdf->output();
     }
 


@@ -48,11 +52,13 @@ class ExportService
             foreach ($imageTagsOutput[0] as $index => $imgMatch) {
                 $oldImgString = $imgMatch;
                 $srcString = $imageTagsOutput[2][$index];
             foreach ($imageTagsOutput[0] as $index => $imgMatch) {
                 $oldImgString = $imgMatch;
                 $srcString = $imageTagsOutput[2][$index];

-                if (strpos(trim($srcString), 'http') !== 0) {
-                    $pathString = public_path($srcString);
+                $isLocal = strpos(trim($srcString), 'http') !== 0;
+                if ($isLocal) {
+                    $pathString = public_path(trim($srcString, '/'));

                 } else {
                     $pathString = $srcString;
                 }
                 } else {
                     $pathString = $srcString;
                 }

+                if ($isLocal && !file_exists($pathString)) continue;

                 $imageContent = file_get_contents($pathString);
                 $imageEncoded = 'data:image/' . pathinfo($pathString, PATHINFO_EXTENSION) . ';base64,' . base64_encode($imageContent);
                 $newImageString = str_replace($srcString, $imageEncoded, $oldImgString);
                 $imageContent = file_get_contents($pathString);
                 $imageEncoded = 'data:image/' . pathinfo($pathString, PATHINFO_EXTENSION) . ';base64,' . base64_encode($imageContent);
                 $newImageString = str_replace($srcString, $imageEncoded, $oldImgString);