Fixed role entity permissions ignoring inheritance

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

diff --git a/app/Http/Controllers/RecycleBinController.php b/app/Http/Controllers/RecycleBinController.php
index 3cbc99df3e3be533be8a4b73ef3be4d4d596a5bb..82e3f660bddb92475ee5f79f9cdcbd993b1550f3 100644 (file)
--- a/app/Http/Controllers/RecycleBinController.php
+++ b/app/Http/Controllers/RecycleBinController.php
@@ -1,37 +1,127 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use BookStack\Entities\Deletion;
-use BookStack\Entities\Managers\TrashCan;
-use Illuminate\Http\Request;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\ActivityType;
+use BookStack\Entities\Models\Deletion;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Repos\DeletionRepo;
+use BookStack\Entities\Tools\TrashCan;

 
 class RecycleBinController extends Controller
 {
 
 class RecycleBinController extends Controller
 {

+    protected $recycleBinBaseUrl = '/settings/recycle-bin';
+
+    /**
+     * On each request to a method of this controller check permissions
+     * using a middleware closure.
+     */
+    public function __construct()
+    {
+        $this->middleware(function ($request, $next) {
+            $this->checkPermission('settings-manage');
+            $this->checkPermission('restrictions-manage-all');
+
+            return $next($request);
+        });
+    }
+

     /**
      * Show the top-level listing for the recycle bin.
      */
     public function index()
     {
     /**
      * Show the top-level listing for the recycle bin.
      */
     public function index()
     {

-        $this->checkPermission('settings-manage');
-        $this->checkPermission('restrictions-manage-all');
-

         $deletions = Deletion::query()->with(['deletable', 'deleter'])->paginate(10);
 
         $deletions = Deletion::query()->with(['deletable', 'deleter'])->paginate(10);
 

-        return view('settings.recycle-bin', [
+        $this->setPageTitle(trans('settings.recycle_bin'));
+
+        return view('settings.recycle-bin.index', [

             'deletions' => $deletions,
         ]);
     }
 
             'deletions' => $deletions,
         ]);
     }
 

+    /**
+     * Show the page to confirm a restore of the deletion of the given id.
+     */
+    public function showRestore(string $id)
+    {
+        /** @var Deletion $deletion */
+        $deletion = Deletion::query()->findOrFail($id);
+
+        // Walk the parent chain to find any cascading parent deletions
+        $currentDeletable = $deletion->deletable;
+        $searching = true;
+        while ($searching && $currentDeletable instanceof Entity) {
+            $parent = $currentDeletable->getParent();
+            if ($parent && $parent->trashed()) {
+                $currentDeletable = $parent;
+            } else {
+                $searching = false;
+            }
+        }
+
+        /** @var ?Deletion $parentDeletion */
+        $parentDeletion = ($currentDeletable === $deletion->deletable) ? null : $currentDeletable->deletions()->first();
+
+        return view('settings.recycle-bin.restore', [
+            'deletion'       => $deletion,
+            'parentDeletion' => $parentDeletion,
+        ]);
+    }
+
+    /**
+     * Restore the element attached to the given deletion.
+     *
+     * @throws \Exception
+     */
+    public function restore(DeletionRepo $deletionRepo, string $id)
+    {
+        $restoreCount = $deletionRepo->restore((int) $id);
+
+        $this->showSuccessNotification(trans('settings.recycle_bin_restore_notification', ['count' => $restoreCount]));
+
+        return redirect($this->recycleBinBaseUrl);
+    }
+
+    /**
+     * Show the page to confirm a Permanent deletion of the element attached to the deletion of the given id.
+     */
+    public function showDestroy(string $id)
+    {
+        /** @var Deletion $deletion */
+        $deletion = Deletion::query()->findOrFail($id);
+
+        return view('settings.recycle-bin.destroy', [
+            'deletion' => $deletion,
+        ]);
+    }
+
+    /**
+     * Permanently delete the content associated with the given deletion.
+     *
+     * @throws \Exception
+     */
+    public function destroy(DeletionRepo $deletionRepo, string $id)
+    {
+        $deleteCount = $deletionRepo->destroy((int) $id);
+
+        $this->showSuccessNotification(trans('settings.recycle_bin_destroy_notification', ['count' => $deleteCount]));
+
+        return redirect($this->recycleBinBaseUrl);
+    }
+

     /**
      * Empty out the recycle bin.
     /**
      * Empty out the recycle bin.

+     *
+     * @throws \Exception

      */
     public function empty()
     {
      */
     public function empty()
     {

-        $this->checkPermission('settings-manage');
-        $this->checkPermission('restrictions-manage-all');
+        $deleteCount = (new TrashCan())->empty();

 
 

-        $deleteCount = (new TrashCan())->destroyFromAllDeletions();
+        $this->logActivity(ActivityType::RECYCLE_BIN_EMPTY);
+        $this->showSuccessNotification(trans('settings.recycle_bin_destroy_notification', ['count' => $deleteCount]));

 
 

-        $this->showSuccessNotification(trans('settings.recycle_bin_empty_notification', ['count' => $deleteCount]));
-        return redirect('/settings/recycle-bin');
+        return redirect($this->recycleBinBaseUrl);

     }
 }
     }
 }