From 4437613ef12703f941ec8eb626c9eb9d154044b0 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 24 Jul 2023 09:16:42 +0200 Subject: [PATCH] wip #5393 @0:10 --- .../Operations/FluidbookPublication/PreviewOperation.php | 3 +++ app/Jobs/Maintenance/CheckPublicationsHashAndCid.php | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php index 6c1d8cee9..825105149 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php @@ -100,6 +100,9 @@ trait PreviewOperation PHP::neverStop(false); self::_getFluidbookAndTheme($id, $hash, $fluidbook, $theme); + if (null === $theme || null === $fluidbook) { + abort(404); + } $res = $this->_loadingCompile($theme, $fluidbook->title, $url); return response($res); } diff --git a/app/Jobs/Maintenance/CheckPublicationsHashAndCid.php b/app/Jobs/Maintenance/CheckPublicationsHashAndCid.php index 1e2b0054f..2bfe24931 100644 --- a/app/Jobs/Maintenance/CheckPublicationsHashAndCid.php +++ b/app/Jobs/Maintenance/CheckPublicationsHashAndCid.php @@ -11,7 +11,9 @@ class CheckPublicationsHashAndCid extends Base public function handle() { /** @var FluidbookPublication $fluidbook */ - foreach (FluidbookPublication::withoutGlobalScopes()->where('created_ok', '1')->whereNull('hash')->orWhere('hash', '')->orWhereNull('cid')->orWhere('cid', '')->get() as $fluidbook) { + foreach (FluidbookPublication::withoutGlobalScopes()->where('created_ok', '1')->where(function ($query) { + $query->whereNull('hash')->orWhere('hash', '')->orWhereNull('cid')->orWhere('cid', ''); + })->get() as $fluidbook) { Log::warning('Fluidbook #' . $fluidbook->id . ' had empty hash or cid (hash: hash , cid: :cid)', ['hash' => $fluidbook->hash, 'cid' => $fluidbook->cid]); $fluidbook->save(); } -- 2.39.5