French translation update

[bookstack] / app / Http / Middleware / Authenticate.php

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index b7801668882cd5726c2adad97312228d7c14913b..d840a9b2e05477c8fca1550dad9e9e81adaa8c2c 100644 (file)
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -30,15 +30,18 @@ class Authenticate
      */
     public function handle($request, Closure $next)
     {
      */
     public function handle($request, Closure $next)
     {

-        if ($this->auth->check() && setting('registration-confirmation') && !$this->auth->user()->email_confirmed) {
-            return redirect(baseUrl('/register/confirm/awaiting'));
+        if ($this->auth->check()) {
+            $requireConfirmation = (setting('registration-confirmation') || setting('registration-restrict'));
+            if ($requireConfirmation && !$this->auth->user()->email_confirmed) {
+                return redirect('/register/confirm/awaiting');
+            }

         }
 
         }
 

-        if ($this->auth->guest() && !setting('app-public')) {
+        if (!hasAppAccess()) {

             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
             } else {
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
             } else {

-                return redirect()->guest(baseUrl('/login'));
+                return redirect()->guest(url('/login'));

             }
         }
 
             }
         }