From: Vincent Vanwaelscappel Date: Tue, 23 May 2023 11:08:48 +0000 (+0200) Subject: wait #5939 @0.75 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=82dda8f3536ed17f60919c55ccdf7c93c9b96a83;p=fluidbook-toolbox.git wait #5939 @0.75 --- diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php index 96f40e974..fa284fec5 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php @@ -109,9 +109,6 @@ trait PreviewOperation */ public function preview($version, $fluidbook, $theme, $path = 'index.html') { - $nointerface = !!request('nointerface', false); - $shortLoading = !!request('shortLoading', false); - $isScorm = $version === 'scorm'; $dest = $fluidbook->getFinalPath($theme, $isScorm); diff --git a/app/Models/AuthUser.php b/app/Models/AuthUser.php index 67afb7d3d..3650fc693 100644 --- a/app/Models/AuthUser.php +++ b/app/Models/AuthUser.php @@ -16,7 +16,9 @@ class AuthUser extends User public function avatar() { - return Gravatar::get($this->email); + + $res = Gravatar::get($this->email); + return str_replace('.jpg', '', $res); } diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php index d56bcc9d6..fcb9f95eb 100644 --- a/app/Models/FluidbookTheme.php +++ b/app/Models/FluidbookTheme.php @@ -800,7 +800,7 @@ class FluidbookTheme extends ToolboxSettingsModel public static function getThemePreviewURL($id, $params = [], $page = 2) { - $defaultParams = ['version' => 'online', 'id' => '20098-' . $id, 'hash' => 'f2e0452eed6dba9878016ce5603fdc54', 'time' => time(), 'nointerface' => 1, 'force' => 0, 'shortLoading' => 1, 'puppeteer' => 0]; + $defaultParams = ['version' => 'online', 'id' => '20098-' . $id, 'hash' => 'f2e0452eed6dba9878016ce5603fdc54', 'time' => time(), 'path' => 'index.html', 'nointerface' => 1, 'force' => 0, 'shortLoading' => 1, 'puppeteer' => 0]; return route('fluidbook_preview_with_time', array_merge($defaultParams, $params)); }