Merge pull request #4193 from BookStackApp/custom_dropzone

[bookstack] / app / Http / Controllers / Images / DrawioImageController.php

diff --git a/app/Http/Controllers/Images/DrawioImageController.php b/app/Http/Controllers/Images/DrawioImageController.php
index 462ab68f6f32f66ee44ef4439d2448ff62e2c12e..ce857cf52f07b59b238709cfb47c0fae0efb2c6c 100644 (file)
--- a/app/Http/Controllers/Images/DrawioImageController.php
+++ b/app/Http/Controllers/Images/DrawioImageController.php
@@ -3,10 +3,10 @@
 namespace BookStack\Http\Controllers\Images;
 
 use BookStack\Exceptions\ImageUploadException;
 namespace BookStack\Http\Controllers\Images;
 
 use BookStack\Exceptions\ImageUploadException;

+use BookStack\Http\Controllers\Controller;

 use BookStack\Uploads\ImageRepo;
 use Exception;
 use Illuminate\Http\Request;
 use BookStack\Uploads\ImageRepo;
 use Exception;
 use Illuminate\Http\Request;

-use BookStack\Http\Controllers\Controller;

 
 class DrawioImageController extends Controller
 {
 
 class DrawioImageController extends Controller
 {


@@ -29,21 +29,23 @@ class DrawioImageController extends Controller
         $parentTypeFilter = $request->get('filter_type', null);
 
         $imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
         $parentTypeFilter = $request->get('filter_type', null);
 
         $imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);

-        return view('components.image-manager-list', [
-            'images' => $imgData['images'],
+
+        return view('pages.parts.image-manager-list', [
+            'images'  => $imgData['images'],

             'hasMore' => $imgData['has_more'],
         ]);
     }
 
     /**
      * Store a new gallery image in the system.
             'hasMore' => $imgData['has_more'],
         ]);
     }
 
     /**
      * Store a new gallery image in the system.

+     *

      * @throws Exception
      */
     public function create(Request $request)
     {
         $this->validate($request, [
      * @throws Exception
      */
     public function create(Request $request)
     {
         $this->validate($request, [

-            'image' => 'required|string',
-            'uploaded_to' => 'required|integer'
+            'image'       => ['required', 'string'],
+            'uploaded_to' => ['required', 'integer'],

         ]);
 
         $this->checkPermission('image-create-all');
         ]);
 
         $this->checkPermission('image-create-all');


@@ -64,19 +66,23 @@ class DrawioImageController extends Controller
      */
     public function getAsBase64($id)
     {
      */
     public function getAsBase64($id)
     {

-        $image = $this->imageRepo->getById($id);
-        $page = $image->getPage();
-        if ($image === null || $image->type !== 'drawio' || !userCan('page-view', $page)) {
-            return $this->jsonError("Image data could not be found");
+        try {
+            $image = $this->imageRepo->getById($id);
+        } catch (Exception $exception) {
+            return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
+        }
+
+        if ($image->type !== 'drawio' || !userCan('page-view', $image->getPage())) {
+            return $this->jsonError(trans('errors.drawing_data_not_found'), 404);

         }
 
         $imageData = $this->imageRepo->getImageData($image);
         }
 
         $imageData = $this->imageRepo->getImageData($image);

-        if ($imageData === null) {
-            return $this->jsonError("Image data could not be found");
+        if (is_null($imageData)) {
+            return $this->jsonError(trans('errors.drawing_data_not_found'), 404);

         }
 
         return response()->json([
         }
 
         return response()->json([

-            'content' => base64_encode($imageData)
+            'content' => base64_encode($imageData),

         ]);
     }
 }
         ]);
     }
 }