Merge branch 'master' into release, Updated version

diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php
index 40402dbce461e73b3c0b81e7bb7b3a5b515c9805..a78b133eec454325ebcfd47e0e5457df9d6abc60 100644 (file)
--- a/app/Services/ExportService.php
+++ b/app/Services/ExportService.php
@@ -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,27 @@ class ExportService
                 } else {
                     $pathString = $srcString;
                 }
+
+                // 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) {

diff --git a/version b/version
index c3990df253d95643653840888bf86a3105f00675..131c55b2ca2d41e41d13daed53d5734ad6da47dd 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-v0.18.2
\ No newline at end of file
+v0.18.3
\ No newline at end of file