X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/9bd5d6a4224afb95fe2a5e1827d587b82dc23b29..refs/pull/711/head:/app/Services/ExportService.php

diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php
index 40402dbce..ada2261e4 100644
--- a/app/Services/ExportService.php
+++ b/app/Services/ExportService.php
@@ -42,7 +42,7 @@ class ExportService
     public function chapterToContainedHtml(Chapter $chapter)
     {
         $pages = $this->entityRepo->getChapterChildren($chapter);
-        $pages->each(function($page) {
+        $pages->each(function ($page) {
             $page->html = $this->entityRepo->renderPage($page);
         });
         $html = view('chapters/export', [
@@ -89,7 +89,7 @@ class ExportService
     public function chapterToPdf(Chapter $chapter)
     {
         $pages = $this->entityRepo->getChapterChildren($chapter);
-        $pages->each(function($page) {
+        $pages->each(function ($page) {
             $page->html = $this->entityRepo->renderPage($page);
         });
         $html = view('chapters/export', [
@@ -127,7 +127,7 @@ class ExportService
             $pdf = \SnappyPDF::loadHTML($containedHtml);
             $pdf->setOption('print-media-type', true);
         } else {
-            $pdf = \PDF::loadHTML($containedHtml);
+            $pdf = \DomPDF::loadHTML($containedHtml);
         }
         return $pdf->output();
     }
@@ -136,6 +136,7 @@ class ExportService
      * Bundle of the contents of a html file to be self-contained.
      * @param $htmlContent
      * @return mixed|string
+     * @throws \Exception
      */
     protected function containHtml($htmlContent)
     {
@@ -153,9 +154,31 @@ class ExportService
                 } else {
                     $pathString = $srcString;
                 }
-                if ($isLocal && !file_exists($pathString)) continue;
+
+                // Attempt to find local files even if url not absolute
+                $base = baseUrl('/');
+                if (strpos($srcString, $base) === 0) {
+                    $isLocal = true;
+                    $relString = str_replace($base, '', $srcString);
+                    $pathString = public_path(trim($relString, '/'));
+                }
+
+                if ($isLocal && !file_exists($pathString)) {
+                    continue;
+                }
                 try {
-                    $imageContent = file_get_contents($pathString);
+                    if ($isLocal) {
+                        $imageContent = file_get_contents($pathString);
+                    } else {
+                        $ch = curl_init();
+                        curl_setopt_array($ch, [CURLOPT_URL => $pathString, CURLOPT_RETURNTRANSFER => 1, CURLOPT_CONNECTTIMEOUT => 5]);
+                        $imageContent = curl_exec($ch);
+                        $err = curl_error($ch);
+                        curl_close($ch);
+                        if ($err) {
+                            throw new \Exception("Image fetch failed, Received error: " . $err);
+                        }
+                    }
                     $imageEncoded = 'data:image/' . pathinfo($pathString, PATHINFO_EXTENSION) . ';base64,' . base64_encode($imageContent);
                     $newImageString = str_replace($srcString, $imageEncoded, $oldImgString);
                 } catch (\ErrorException $e) {
@@ -238,17 +261,4 @@ class ExportService
         }
         return $text;
     }
-
 }
-
-
-
-
-
-
-
-
-
-
-
-