diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index d97740d27..3258f4369 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -110,15 +110,16 @@ class HomeController extends Controller /** * Show the view for /robots.txt - * @return $this */ public function getRobots() { $sitePublic = setting('app-public', false); $allowRobots = config('app.allow_robots'); + if ($allowRobots === null) { $allowRobots = $sitePublic; } + return response() ->view('common.robots', ['allowRobots' => $allowRobots]) ->header('Content-Type', 'text/plain'); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 532942f23..075c98ec7 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -29,7 +29,6 @@ class Kernel extends HttpKernel \Illuminate\View\Middleware\ShareErrorsFromSession::class, \BookStack\Http\Middleware\VerifyCsrfToken::class, \BookStack\Http\Middleware\Localization::class, - \BookStack\Http\Middleware\GlobalViewData::class, ], 'api' => [ \BookStack\Http\Middleware\ThrottleApiRequests::class, diff --git a/app/Http/Middleware/GlobalViewData.php b/app/Http/Middleware/GlobalViewData.php deleted file mode 100644 index bc132dfc3..000000000 --- a/app/Http/Middleware/GlobalViewData.php +++ /dev/null @@ -1,27 +0,0 @@ -share('signedIn', auth()->check()); - view()->share('currentUser', user()); - - return $next($request); - } -} diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php index 6a8ec237d..597d28365 100644 --- a/app/Http/Middleware/Localization.php +++ b/app/Http/Middleware/Localization.php @@ -57,12 +57,7 @@ class Localization $defaultLang = config('app.locale'); config()->set('app.default_locale', $defaultLang); - if (user()->isDefault() && config('app.auto_detect_locale')) { - $locale = $this->autoDetectLocale($request, $defaultLang); - } else { - $locale = setting()->getUser(user(), 'language', $defaultLang); - } - + $locale = $this->getUserLocale($request, $defaultLang); config()->set('app.lang', str_replace('_', '-', $this->getLocaleIso($locale))); // Set text direction @@ -76,14 +71,29 @@ class Localization return $next($request); } + /** + * Get the locale specifically for the currently logged in user if available. + */ + protected function getUserLocale(Request $request, string $default): string + { + try { + $user = user(); + } catch (\Exception $exception) { + return $default; + } + + if ($user->isDefault() && config('app.auto_detect_locale')) { + return $this->autoDetectLocale($request, $default); + } + + return setting()->getUser($user, 'language', $default); + } + /** * Autodetect the visitors locale by matching locales in their headers * against the locales supported by BookStack. - * @param Request $request - * @param string $default - * @return string */ - protected function autoDetectLocale(Request $request, string $default) + protected function autoDetectLocale(Request $request, string $default): string { $availableLocales = config('app.locales'); foreach ($request->getLanguages() as $lang) { @@ -96,10 +106,8 @@ class Localization /** * Get the ISO version of a BookStack language name - * @param string $locale - * @return string */ - public function getLocaleIso(string $locale) + public function getLocaleIso(string $locale): string { return $this->localeMap[$locale] ?? $locale; } @@ -107,7 +115,6 @@ class Localization /** * Set the system date locale for localized date formatting. * Will try both the standard locale name and the UTF8 variant. - * @param string $locale */ protected function setSystemDateLocale(string $locale) { diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php index f3c3ee34b..81fb66cfc 100644 --- a/resources/views/books/index.blade.php +++ b/resources/views/books/index.blade.php @@ -36,7 +36,7 @@