Comments: Added HTML filter test, fixed placeholder in dark mode

[bookstack] / app / Uploads / Controllers / GalleryImageController.php

diff --git a/app/Uploads/Controllers/GalleryImageController.php b/app/Uploads/Controllers/GalleryImageController.php
index 33d3dd74c671b323bc2c503d14d82d28998a137a..258f2bef6bda19c48e58a12b9d46280084d9997e 100644 (file)
--- a/app/Uploads/Controllers/GalleryImageController.php
+++ b/app/Uploads/Controllers/GalleryImageController.php
@@ -5,7 +5,11 @@ namespace BookStack\Uploads\Controllers;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Http\Controller;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Http\Controller;
 use BookStack\Uploads\ImageRepo;

+use BookStack\Uploads\ImageResizer;
+use BookStack\Util\OutOfMemoryHandler;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Log;

 use Illuminate\Validation\ValidationException;
 
 class GalleryImageController extends Controller
 use Illuminate\Validation\ValidationException;
 
 class GalleryImageController extends Controller


@@ -19,7 +23,7 @@ class GalleryImageController extends Controller
      * Get a list of gallery images, in a list.
      * Can be paged and filtered by entity.
      */
      * Get a list of gallery images, in a list.
      * Can be paged and filtered by entity.
      */

-    public function list(Request $request)
+    public function list(Request $request, ImageResizer $resizer)

     {
         $page = $request->get('page', 1);
         $searchTerm = $request->get('search', null);
     {
         $page = $request->get('page', 1);
         $searchTerm = $request->get('search', null);


@@ -27,11 +31,20 @@ class GalleryImageController extends Controller
         $parentTypeFilter = $request->get('filter_type', null);
 
         $imgData = $this->imageRepo->getEntityFiltered('gallery', $parentTypeFilter, $page, 30, $uploadedToFilter, $searchTerm);
         $parentTypeFilter = $request->get('filter_type', null);
 
         $imgData = $this->imageRepo->getEntityFiltered('gallery', $parentTypeFilter, $page, 30, $uploadedToFilter, $searchTerm);

-
-        return view('pages.parts.image-manager-list', [
+        $viewData = [
+            'warning' => '',

             'images'  => $imgData['images'],
             'hasMore' => $imgData['has_more'],
             'images'  => $imgData['images'],
             'hasMore' => $imgData['has_more'],

-        ]);
+        ];
+
+        new OutOfMemoryHandler(function () use ($viewData) {
+            $viewData['warning'] = trans('errors.image_gallery_thumbnail_memory_limit');
+            return response()->view('pages.parts.image-manager-list', $viewData, 200);
+        });
+
+        $resizer->loadGalleryThumbnailsForMany($imgData['images']);
+
+        return view('pages.parts.image-manager-list', $viewData);

     }
 
     /**
     }
 
     /**


@@ -51,6 +64,10 @@ class GalleryImageController extends Controller
             return $this->jsonError(implode("\n", $exception->errors()['file']));
         }
 
             return $this->jsonError(implode("\n", $exception->errors()['file']));
         }
 

+        new OutOfMemoryHandler(function () {
+            return $this->jsonError(trans('errors.image_upload_memory_limit'));
+        });
+

         try {
             $imageUpload = $request->file('file');
             $uploadedTo = $request->get('uploaded_to', 0);
         try {
             $imageUpload = $request->file('file');
             $uploadedTo = $request->get('uploaded_to', 0);