LDAP: Added TLS support

[bookstack] / app / Entities / Managers / TrashCan.php

diff --git a/app/Entities/Managers/TrashCan.php b/app/Entities/Managers/TrashCan.php
index f99c62801cab68a2066079205c5234b44a541449..48768ab9375ee81acb1a99e6ce19a60e3de112d2 100644 (file)
--- a/app/Entities/Managers/TrashCan.php
+++ b/app/Entities/Managers/TrashCan.php
@@ -13,6 +13,7 @@ use BookStack\Facades\Activity;
 use BookStack\Uploads\AttachmentService;
 use BookStack\Uploads\ImageService;
 use Exception;
+use Illuminate\Support\Carbon;
 
 class TrashCan
 {
@@ -90,7 +91,7 @@ class TrashCan
      * Remove a bookshelf from the system.
      * @throws Exception
      */
-    public function destroyShelf(Bookshelf $shelf): int
+    protected function destroyShelf(Bookshelf $shelf): int
     {
         $this->destroyCommonRelations($shelf);
         $shelf->forceDelete();
@@ -102,7 +103,7 @@ class TrashCan
      * Destroys any child chapters and pages.
      * @throws Exception
      */
-    public function destroyBook(Book $book): int
+    protected function destroyBook(Book $book): int
     {
         $count = 0;
         $pages = $book->pages()->withTrashed()->get();
@@ -127,7 +128,7 @@ class TrashCan
      * Destroys all pages within.
      * @throws Exception
      */
-    public function destroyChapter(Chapter $chapter): int
+    protected function destroyChapter(Chapter $chapter): int
     {
         $count = 0;
         $pages = $chapter->pages()->withTrashed()->get();
@@ -147,7 +148,7 @@ class TrashCan
      * Remove a page from the system.
      * @throws Exception
      */
-    public function destroyPage(Page $page): int
+    protected function destroyPage(Page $page): int
     {
         $this->destroyCommonRelations($page);
 
@@ -182,7 +183,7 @@ class TrashCan
      * Destroy all items that have pending deletions.
      * @throws Exception
      */
-    public function destroyFromAllDeletions(): int
+    public function empty(): int
     {
         $deletions = Deletion::all();
         $deleteCount = 0;
@@ -231,6 +232,30 @@ class TrashCan
         return $restoreCount;
     }
 
+    /**
+     * Automatically clear old content from the recycle bin
+     * depending on the configured lifetime.
+     * Returns the total number of deleted elements.
+     * @throws Exception
+     */
+    public function autoClearOld(): int
+    {
+        $lifetime = intval(config('app.recycle_bin_lifetime'));
+        if ($lifetime < 0) {
+            return 0;
+        }
+
+        $clearBeforeDate = Carbon::now()->addSeconds(10)->subDays($lifetime);
+        $deleteCount = 0;
+
+        $deletionsToRemove = Deletion::query()->where('created_at', '<', $clearBeforeDate)->get();
+        foreach ($deletionsToRemove as $deletion) {
+            $deleteCount += $this->destroyFromDeletion($deletion);
+        }
+
+        return $deleteCount;
+    }
+
     /**
      * Restore an entity so it is essentially un-deleted.
      * Deletions on restored child elements will be removed during this restoration.
@@ -240,26 +265,21 @@ class TrashCan
         $count = 1;
         $entity->restore();
 
-        if ($entity->isA('chapter') || $entity->isA('book')) {
-            foreach ($entity->pages()->withTrashed()->withCount('deletions')->get() as $page) {
-                if ($page->deletions_count > 0) {
-                    $page->deletions()->delete();
-                }
-
-                $page->restore();
-                $count++;
+        $restoreAction = function ($entity) use (&$count) {
+            if ($entity->deletions_count > 0) {
+                $entity->deletions()->delete();
             }
+
+            $entity->restore();
+            $count++;
+        };
+
+        if ($entity->isA('chapter') || $entity->isA('book')) {
+            $entity->pages()->withTrashed()->withCount('deletions')->get()->each($restoreAction);
         }
 
         if ($entity->isA('book')) {
-            foreach ($entity->chapters()->withTrashed()->withCount('deletions')->get() as $chapter) {
-                if ($chapter->deletions_count === 0) {
-                    $chapter->deletions()->delete();
-                }
-
-                $chapter->restore();
-                $count++;
-            }
+            $entity->chapters()->withTrashed()->withCount('deletions')->get()->each($restoreAction);
         }
 
         return $count;