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 e675bff0c5b52bbaef6e13db509f287ddfb31a63..4bd1b479c9316f8ac732cec7ff0a565b5082ba5a 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -1,13 +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\Exceptions\NotFoundException;
-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
 {


@@ -63,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);
     }
 


@@ -92,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);
     }


@@ -134,6 +135,7 @@ class ImageController extends Controller
             return response($e->getMessage(), 500);
         }
 
             return response($e->getMessage(), 500);
         }
 

+

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


@@ -161,32 +163,6 @@ class ImageController extends Controller
         return response()->json($image);
     }
 
         return response()->json($image);
     }
 

-    /**
-     * Replace the data content of a drawing.
-     * @param string $id
-     * @param Request $request
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
-     */
-    public function replaceDrawing(string $id, Request $request)
-    {
-        $this->validate($request, [
-            'image' => 'required|string'
-        ]);
-        $this->checkPermission('image-create-all');
-
-        $imageBase64Data = $request->get('image');
-        $image = $this->imageRepo->getById($id);
-        $this->checkOwnablePermission('image-update', $image);
-
-        try {
-            $image = $this->imageRepo->replaceDrawingContent($image, $imageBase64Data);
-        } catch (ImageUploadException $e) {
-            return response($e->getMessage(), 500);
-        }
-
-        return response()->json($image);
-    }
-

     /**
      * Get the content of an image based64 encoded.
      * @param $id
     /**
      * Get the content of an image based64 encoded.
      * @param $id


@@ -241,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 = in_array($request->get('force', ''), [true, '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'));
     }

-
-

 }
 }