Added ability to configure email sender name

[bookstack] / app / Services / ExportService.php

diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php
index 3ac69871885853f166d5fa2cd67034d0d0225c0d..ada2261e454455a6a4f81d2e8896bf619caf9210 100644 (file)
--- a/app/Services/ExportService.php
+++ b/app/Services/ExportService.php
@@ -1,6 +1,7 @@
 <?php namespace BookStack\Services;
 
 use BookStack\Book;
+use BookStack\Chapter;
 use BookStack\Page;
 use BookStack\Repos\EntityRepo;
 
@@ -26,13 +27,31 @@ class ExportService
      */
     public function pageToContainedHtml(Page $page)
     {
+        $this->entityRepo->renderPage($page);
         $pageHtml = view('pages/export', [
-            'page' => $page,
-            'pageContent' => $this->entityRepo->renderPage($page)
+            'page' => $page
         ])->render();
         return $this->containHtml($pageHtml);
     }
 
+    /**
+     * Convert a chapter to a self-contained HTML file.
+     * @param Chapter $chapter
+     * @return mixed|string
+     */
+    public function chapterToContainedHtml(Chapter $chapter)
+    {
+        $pages = $this->entityRepo->getChapterChildren($chapter);
+        $pages->each(function ($page) {
+            $page->html = $this->entityRepo->renderPage($page);
+        });
+        $html = view('chapters/export', [
+            'chapter' => $chapter,
+            'pages' => $pages
+        ])->render();
+        return $this->containHtml($html);
+    }
+
     /**
      * Convert a book to a self-contained HTML file.
      * @param Book $book
@@ -55,9 +74,27 @@ class ExportService
      */
     public function pageToPdf(Page $page)
     {
+        $this->entityRepo->renderPage($page);
         $html = view('pages/pdf', [
-            'page' => $page,
-            'pageContent' => $this->entityRepo->renderPage($page)
+            'page' => $page
+        ])->render();
+        return $this->htmlToPdf($html);
+    }
+
+    /**
+     * Convert a chapter to a PDF file.
+     * @param Chapter $chapter
+     * @return mixed|string
+     */
+    public function chapterToPdf(Chapter $chapter)
+    {
+        $pages = $this->entityRepo->getChapterChildren($chapter);
+        $pages->each(function ($page) {
+            $page->html = $this->entityRepo->renderPage($page);
+        });
+        $html = view('chapters/export', [
+            'chapter' => $chapter,
+            'pages' => $pages
         ])->render();
         return $this->htmlToPdf($html);
     }
@@ -90,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();
     }
@@ -99,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)
     {
@@ -116,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) {
@@ -168,6 +228,21 @@ class ExportService
         return $text;
     }
 
+    /**
+     * Convert a chapter into a plain text string.
+     * @param Chapter $chapter
+     * @return string
+     */
+    public function chapterToPlainText(Chapter $chapter)
+    {
+        $text = $chapter->name . "\n\n";
+        $text .= $chapter->description . "\n\n";
+        foreach ($chapter->pages as $page) {
+            $text .= $this->pageToPlainText($page);
+        }
+        return $text;
+    }
+
     /**
      * Convert a book into a plain text string.
      * @param Book $book
@@ -179,28 +254,11 @@ class ExportService
         $text = $book->name . "\n\n";
         foreach ($bookTree as $bookChild) {
             if ($bookChild->isA('chapter')) {
-                $text .= $bookChild->name . "\n\n";
-                $text .= $bookChild->description . "\n\n";
-                foreach ($bookChild->pages as $page) {
-                    $text .= $this->pageToPlainText($page);
-                }
+                $text .= $this->chapterToPlainText($bookChild);
             } else {
                 $text .= $this->pageToPlainText($bookChild);
             }
         }
         return $text;
     }
-
 }
-
-
-
-
-
-
-
-
-
-
-
-