mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-09-13 04:52:38 +00:00
Updated image fetching in exporting
Added domain check to see if possibly local even when whole url found. Changed image fetch from file_get_contents to curl for external resources. Hopeful solution to #392
This commit is contained in:
parent
b711bc6816
commit
9758872baf
@ -136,6 +136,7 @@ class ExportService
|
|||||||
* Bundle of the contents of a html file to be self-contained.
|
* Bundle of the contents of a html file to be self-contained.
|
||||||
* @param $htmlContent
|
* @param $htmlContent
|
||||||
* @return mixed|string
|
* @return mixed|string
|
||||||
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
protected function containHtml($htmlContent)
|
protected function containHtml($htmlContent)
|
||||||
{
|
{
|
||||||
@ -153,9 +154,27 @@ class ExportService
|
|||||||
} else {
|
} else {
|
||||||
$pathString = $srcString;
|
$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;
|
if ($isLocal && !file_exists($pathString)) continue;
|
||||||
try {
|
try {
|
||||||
|
if ($isLocal) {
|
||||||
$imageContent = file_get_contents($pathString);
|
$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);
|
$imageEncoded = 'data:image/' . pathinfo($pathString, PATHINFO_EXTENSION) . ';base64,' . base64_encode($imageContent);
|
||||||
$newImageString = str_replace($srcString, $imageEncoded, $oldImgString);
|
$newImageString = str_replace($srcString, $imageEncoded, $oldImgString);
|
||||||
} catch (\ErrorException $e) {
|
} catch (\ErrorException $e) {
|
||||||
|
Loading…
Reference in New Issue
Block a user