Add `ja` locale to config

[bookstack] / app / Http / Controllers / Controller.php

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 2db96ccf7a60fab8cdc49017db4635ba88e57674..733d5416b774b8bbd7e02935c790d85fd0e4d098 100644 (file)
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -1,15 +1,14 @@
 <?php
 
 <?php
 

-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;

 
 

-use HttpRequestException;
+use BookStack\Ownable;

 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Bus\DispatchesJobs;

-use Illuminate\Http\Exception\HttpResponseException;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Http\Request;

 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;

-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
-use Oxbow\User;
+use BookStack\User;

 
 abstract class Controller extends BaseController
 {
 
 abstract class Controller extends BaseController
 {


@@ -29,37 +28,88 @@ abstract class Controller extends BaseController
      */
     public function __construct()
     {
      */
     public function __construct()
     {

-        // Get a user instance for the current user
-        $user = Auth::user();
-        if (!$user) {
-            $user = User::getDefault();
+        $this->middleware(function ($request, $next) {
+
+            // Get a user instance for the current user
+            $user = user();
+
+            // Share variables with controllers
+            $this->currentUser = $user;
+            $this->signedIn = auth()->check();
+
+            // Share variables with views
+            view()->share('signedIn', $this->signedIn);
+            view()->share('currentUser', $user);
+
+            return $next($request);
+        });
+    }
+
+    /**
+     * Stops the application and shows a permission error if
+     * the application is in demo mode.
+     */
+    protected function preventAccessForDemoUsers()
+    {
+        if (config('app.env') === 'demo') $this->showPermissionError();
+    }
+
+    /**
+     * Adds the page title into the view.
+     * @param $title
+     */
+    public function setPageTitle($title)
+    {
+        view()->share('pageTitle', $title);
+    }
+
+    /**
+     * On a permission error redirect to home and display.
+     * the error as a notification.
+     */
+    protected function showPermissionError()
+    {
+        if (request()->wantsJson()) {
+            $response = response()->json(['error' => trans('errors.permissionJson')], 403);
+        } else {
+            $response = redirect('/');
+            session()->flash('error', trans('errors.permission'));

         }
         }

-        // Share variables with views
-        view()->share('signedIn', Auth::check());
-        view()->share('currentUser', $user);
-        // Share variables with controllers
-        $this->currentUser = $user;
-        $this->signedIn = Auth::check();
+
+        throw new HttpResponseException($response);

     }
 
     /**
      * Checks for a permission.
     }
 
     /**
      * Checks for a permission.

-     *
-     * @param $permissionName
+     * @param string $permissionName

      * @return bool|\Illuminate\Http\RedirectResponse
      */
     protected function checkPermission($permissionName)
     {
      * @return bool|\Illuminate\Http\RedirectResponse
      */
     protected function checkPermission($permissionName)
     {

-        if (!$this->currentUser || !$this->currentUser->can($permissionName)) {
-            Session::flash('error', trans('errors.permission'));
-            throw new HttpResponseException(
-                redirect()->back()
-            );
+        if (!user() || !user()->can($permissionName)) {
+            $this->showPermissionError();

         }
         }

-

         return true;
     }
 
         return true;
     }
 

+    /**
+     * Check the current user's permissions against an ownable item.
+     * @param $permission
+     * @param Ownable $ownable
+     * @return bool
+     */
+    protected function checkOwnablePermission($permission, Ownable $ownable)
+    {
+        if (userCan($permission, $ownable)) return true;
+        return $this->showPermissionError();
+    }
+
+    /**
+     * Check if a user has a permission or bypass if the callback is true.
+     * @param $permissionName
+     * @param $callback
+     * @return bool
+     */

     protected function checkPermissionOr($permissionName, $callback)
     {
         $callbackResult = $callback();
     protected function checkPermissionOr($permissionName, $callback)
     {
         $callbackResult = $callback();


@@ -67,4 +117,33 @@ abstract class Controller extends BaseController
         return true;
     }
 
         return true;
     }
 

+    /**
+     * Send back a json error message.
+     * @param string $messageText
+     * @param int $statusCode
+     * @return mixed
+     */
+    protected function jsonError($messageText = "", $statusCode = 500)
+    {
+        return response()->json(['message' => $messageText], $statusCode);
+    }
+
+    /**
+     * Create the response for when a request fails validation.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  array  $errors
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function buildFailedValidationResponse(Request $request, array $errors)
+    {
+        if ($request->expectsJson()) {
+            return response()->json(['validation' => $errors], 422);
+        }
+
+        return redirect()->to($this->getRedirectUrl())
+            ->withInput($request->input())
+            ->withErrors($errors, $this->errorBag());
+    }
+

 }
 }