Update common.php

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

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 2b6c88fe0b73748ab5cbdf61a64138dcdc4d5c49..5bc62c601a73bcf63913a2bac3bd63c25dbab2e1 100644 (file)
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,13 +2,13 @@
 
 namespace BookStack\Http\Controllers;
 
 
 namespace BookStack\Http\Controllers;
 

+use BookStack\Auth\User;

 use BookStack\Ownable;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use BookStack\Ownable;
 use Illuminate\Foundation\Bus\DispatchesJobs;

-use Illuminate\Http\Exception\HttpResponseException;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Exceptions\HttpResponseException;

 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;

-use Illuminate\Foundation\Validation\ValidatesRequests;
-use BookStack\User;

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


@@ -51,7 +51,9 @@ abstract class Controller extends BaseController
      */
     protected function preventAccessForDemoUsers()
     {
      */
     protected function preventAccessForDemoUsers()
     {

-        if (config('app.env') === 'demo') $this->showPermissionError();
+        if (config('app.env') === 'demo') {
+            $this->showPermissionError();
+        }

     }
 
     /**
     }
 
     /**


@@ -100,7 +102,9 @@ abstract class Controller extends BaseController
      */
     protected function checkOwnablePermission($permission, Ownable $ownable)
     {
      */
     protected function checkOwnablePermission($permission, Ownable $ownable)
     {

-        if (userCan($permission, $ownable)) return true;
+        if (userCan($permission, $ownable)) {
+            return true;
+        }

         return $this->showPermissionError();
     }
 
         return $this->showPermissionError();
     }
 


@@ -113,10 +117,26 @@ abstract class Controller extends BaseController
     protected function checkPermissionOr($permissionName, $callback)
     {
         $callbackResult = $callback();
     protected function checkPermissionOr($permissionName, $callback)
     {
         $callbackResult = $callback();

-        if ($callbackResult === false) $this->checkPermission($permissionName);
+        if ($callbackResult === false) {
+            $this->checkPermission($permissionName);
+        }

         return true;
     }
 
         return true;
     }
 

+    /**
+     * Check if the current user has a permission or bypass if the provided user
+     * id matches the current user.
+     * @param string $permissionName
+     * @param int $userId
+     * @return bool
+     */
+    protected function checkPermissionOrCurrentUser(string $permissionName, int $userId)
+    {
+        return $this->checkPermissionOr($permissionName, function () use ($userId) {
+            return $userId === $this->currentUser->id;
+        });
+    }
+

     /**
      * Send back a json error message.
      * @param string $messageText
     /**
      * Send back a json error message.
      * @param string $messageText


@@ -130,7 +150,6 @@ abstract class Controller extends BaseController
 
     /**
      * Create the response for when a request fails validation.
 
     /**
      * Create the response for when a request fails validation.

-     *

      * @param  \Illuminate\Http\Request  $request
      * @param  array  $errors
      * @return \Symfony\Component\HttpFoundation\Response
      * @param  \Illuminate\Http\Request  $request
      * @param  array  $errors
      * @return \Symfony\Component\HttpFoundation\Response


@@ -146,4 +165,17 @@ abstract class Controller extends BaseController
             ->withErrors($errors, $this->errorBag());
     }
 
             ->withErrors($errors, $this->errorBag());
     }
 

+    /**
+     * Create a response that forces a download in the browser.
+     * @param string $content
+     * @param string $fileName
+     * @return \Illuminate\Http\Response
+     */
+    protected function downloadResponse(string $content, string $fileName)
+    {
+        return response()->make($content, 200, [
+            'Content-Type'        => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="' . $fileName . '"'
+        ]);
+    }

 }
 }