New translations entities.php (German Informal)

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

diff --git a/app/Http/Controllers/Images/DrawioImageController.php b/app/Http/Controllers/Images/DrawioImageController.php
index eb0e328277b9d1b75dd98eb0263ca8406a393e2d..cab1c925e414855a3a8be13b08e2c825dc101360 100644 (file)
--- a/app/Http/Controllers/Images/DrawioImageController.php
+++ b/app/Http/Controllers/Images/DrawioImageController.php
@@ -3,29 +3,23 @@
 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 BookStack\Uploads\ImageRepo;

+use Exception;

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

-use BookStack\Http\Controllers\Controller;

 
 class DrawioImageController extends Controller
 {
     protected $imageRepo;
 
 
 class DrawioImageController extends Controller
 {
     protected $imageRepo;
 

-    /**
-     * DrawioImageController constructor.
-     * @param ImageRepo $imageRepo
-     */

     public function __construct(ImageRepo $imageRepo)
     {
         $this->imageRepo = $imageRepo;
     public function __construct(ImageRepo $imageRepo)
     {
         $this->imageRepo = $imageRepo;

-        parent::__construct();

     }
 
     /**
      * 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.

-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse

      */
     public function list(Request $request)
     {
      */
     public function list(Request $request)
     {


@@ -35,20 +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 response()->json($imgData);
+
+        return view('pages.parts.image-manager-list', [
+            'images'  => $imgData['images'],
+            'hasMore' => $imgData['has_more'],
+        ]);

     }
 
     /**
      * Store a new gallery image in the system.
     }
 
     /**
      * Store a new gallery image in the system.

-     * @param Request $request
-     * @return Illuminate\Http\JsonResponse
-     * @throws \Exception
+     *
+     * @throws Exception

      */
     public function create(Request $request)
     {
         $this->validate($request, [
      */
     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,4 +61,23 @@ class DrawioImageController extends Controller
         return response()->json($image);
     }
 
         return response()->json($image);
     }
 

+    /**
+     * Get the content of an image based64 encoded.
+     */
+    public function getAsBase64($id)
+    {
+        $image = $this->imageRepo->getById($id);
+        if (is_null($image) || $image->type !== 'drawio' || !userCan('page-view', $image->getPage())) {
+            return $this->jsonError('Image data could not be found');
+        }
+
+        $imageData = $this->imageRepo->getImageData($image);
+        if (is_null($imageData)) {
+            return $this->jsonError('Image data could not be found');
+        }
+
+        return response()->json([
+            'content' => base64_encode($imageData),
+        ]);
+    }

 }
 }