Show users link in top nav if user is signed in and only manages users

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

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 77c320e07db7989203f87284914ba39e68803672..4bd1b479c9316f8ac732cec7ff0a565b5082ba5a 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -1,12 +1,12 @@
 <?php namespace BookStack\Http\Controllers;
 
 <?php namespace BookStack\Http\Controllers;
 

+use BookStack\Entities\Repos\EntityRepo;

 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\ImageUploadException;

-use BookStack\Repos\EntityRepo;
-use BookStack\Repos\ImageRepo;
+use BookStack\Repos\PageRepo;
+use BookStack\Uploads\Image;
+use BookStack\Uploads\ImageRepo;

 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;

-use BookStack\Image;
-use BookStack\Repos\PageRepo;

 
 class ImageController extends Controller
 {
 
 class ImageController extends Controller
 {


@@ -28,6 +28,21 @@ class ImageController extends Controller
         parent::__construct();
     }
 
         parent::__construct();
     }
 

+    /**
+     * Provide an image file from storage.
+     * @param string $path
+     * @return mixed
+     */
+    public function showImage(string $path)
+    {
+        $path = storage_path('uploads/images/' . $path);
+        if (!file_exists($path)) {
+            abort(404);
+        }
+
+        return response()->file($path);
+    }
+

     /**
      * Get all images for a specific type, Paginated
      * @param string $type
     /**
      * Get all images for a specific type, Paginated
      * @param string $type


@@ -47,14 +62,14 @@ class ImageController extends Controller
      * @param Request $request
      * @return mixed
      */
      * @param Request $request
      * @return mixed
      */

-    public function searchByType($type, $page = 0, Request $request)
+    public function searchByType(Request $request, $type, $page = 0)

     {
         $this->validate($request, [
             'term' => 'required|string'
         ]);
 
         $searchTerm = $request->get('term');
     {
         $this->validate($request, [
             'term' => 'required|string'
         ]);
 
         $searchTerm = $request->get('term');

-        $imgData = $this->imageRepo->searchPaginatedByType($type, $page, 24, $searchTerm);
+        $imgData = $this->imageRepo->searchPaginatedByType($type, $searchTerm, $page, 24);

         return response()->json($imgData);
     }
 
         return response()->json($imgData);
     }
 


@@ -76,17 +91,19 @@ class ImageController extends Controller
      * @param Request $request
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
      * @param Request $request
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */

-    public function getGalleryFiltered($filter, $page = 0, Request $request)
+    public function getGalleryFiltered(Request $request, $filter, $page = 0)

     {
         $this->validate($request, [
             'page_id' => 'required|integer'
         ]);
 
         $validFilters = collect(['page', 'book']);
     {
         $this->validate($request, [
             'page_id' => 'required|integer'
         ]);
 
         $validFilters = collect(['page', 'book']);

-        if (!$validFilters->contains($filter)) return response('Invalid filter', 500);
+        if (!$validFilters->contains($filter)) {
+            return response('Invalid filter', 500);
+        }

 
         $pageId = $request->get('page_id');
 
         $pageId = $request->get('page_id');

-        $imgData = $this->imageRepo->getGalleryFiltered($page, 24, strtolower($filter), $pageId);
+        $imgData = $this->imageRepo->getGalleryFiltered(strtolower($filter), $pageId, $page, 24);

 
         return response()->json($imgData);
     }
 
         return response()->json($imgData);
     }


@@ -96,6 +113,7 @@ class ImageController extends Controller
      * @param string $type
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @param string $type
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse

+     * @throws \Exception

      */
     public function uploadByType($type, Request $request)
     {
      */
     public function uploadByType($type, Request $request)
     {


@@ -104,18 +122,64 @@ class ImageController extends Controller
             'file' => 'is_image'
         ]);
 
             'file' => 'is_image'
         ]);
 

+        if (!$this->imageRepo->isValidType($type)) {
+            return $this->jsonError(trans('errors.image_upload_type_error'));
+        }
+

         $imageUpload = $request->file('file');
 
         try {
         $imageUpload = $request->file('file');
 
         try {

-            $uploadedTo = $request->has('uploaded_to') ? $request->get('uploaded_to') : 0;
+            $uploadedTo = $request->get('uploaded_to', 0);

             $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
         }
 
             $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
         }
 

+

         return response()->json($image);
     }
 
         return response()->json($image);
     }
 

+    /**
+     * Upload a drawing to the system.
+     * @param Request $request
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
+     */
+    public function uploadDrawing(Request $request)
+    {
+        $this->validate($request, [
+            'image' => 'required|string',
+            'uploaded_to' => 'required|integer'
+        ]);
+        $this->checkPermission('image-create-all');
+        $imageBase64Data = $request->get('image');
+
+        try {
+            $uploadedTo = $request->get('uploaded_to', 0);
+            $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
+        return response()->json($image);
+    }
+
+    /**
+     * Get the content of an image based64 encoded.
+     * @param $id
+     * @return \Illuminate\Http\JsonResponse|mixed
+     */
+    public function getBase64Image($id)
+    {
+        $image = $this->imageRepo->getById($id);
+        $imageData = $this->imageRepo->getImageData($image);
+        if ($imageData === null) {
+            return $this->jsonError("Image data could not be found");
+        }
+        return response()->json([
+            'content' => base64_encode($imageData)
+        ]);
+    }
+

     /**
      * Generate a sized thumbnail for an image.
      * @param $id
     /**
      * Generate a sized thumbnail for an image.
      * @param $id


@@ -123,6 +187,8 @@ class ImageController extends Controller
      * @param $height
      * @param $crop
      * @return \Illuminate\Http\JsonResponse
      * @param $height
      * @param $crop
      * @return \Illuminate\Http\JsonResponse

+     * @throws ImageUploadException
+     * @throws \Exception

      */
     public function getThumbnail($id, $width, $height, $crop)
     {
      */
     public function getThumbnail($id, $width, $height, $crop)
     {


@@ -137,6 +203,8 @@ class ImageController extends Controller
      * @param integer $imageId
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @param integer $imageId
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse

+     * @throws ImageUploadException
+     * @throws \Exception

      */
     public function update($imageId, Request $request)
     {
      */
     public function update($imageId, Request $request)
     {


@@ -149,30 +217,31 @@ class ImageController extends Controller
         return response()->json($image);
     }
 
         return response()->json($image);
     }
 

+    /**
+     * Show the usage of an image on pages.
+     * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
+     * @param $id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function usage(EntityRepo $entityRepo, $id)
+    {
+        $image = $this->imageRepo->getById($id);
+        $pageSearch = $entityRepo->searchForImage($image->url);
+        return response()->json($pageSearch);
+    }
+

     /**
      * Deletes an image and all thumbnail/image files
     /**
      * Deletes an image and all thumbnail/image files

-     * @param EntityRepo $entityRepo
-     * @param Request $request

      * @param int $id
      * @return \Illuminate\Http\JsonResponse
      * @param int $id
      * @return \Illuminate\Http\JsonResponse

+     * @throws \Exception

      */
      */

-    public function destroy(EntityRepo $entityRepo, Request $request, $id)
+    public function destroy($id)

     {
         $image = $this->imageRepo->getById($id);
         $this->checkOwnablePermission('image-delete', $image);
 
     {
         $image = $this->imageRepo->getById($id);
         $this->checkOwnablePermission('image-delete', $image);
 

-        // Check if this image is used on any pages
-        $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
-        if (!$isForced) {
-            $pageSearch = $entityRepo->searchForImage($image->url);
-            if ($pageSearch !== false) {
-                return response()->json($pageSearch, 400);
-            }
-        }
-

         $this->imageRepo->destroyImage($image);
         return response()->json(trans('components.images_deleted'));
     }
         $this->imageRepo->destroyImage($image);
         return response()->json(trans('components.images_deleted'));
     }

-
-

 }
 }