Fixes #58

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

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 23f5446d65982ff0acfc8b1b5c2b6039ed75b5b9..3fff28d3ba493cd31ef4acc06ac32f91ab78ae11 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Controllers;
 
+use BookStack\Exceptions\ImageUploadException;
 use BookStack\Repos\ImageRepo;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
@@ -33,7 +34,7 @@ class ImageController extends Controller
 
 
     /**
-     * Get all gallery images, Paginated
+     * Get all images for a specific type, Paginated
      * @param int $page
      * @return \Illuminate\Http\JsonResponse
      */
@@ -43,6 +44,17 @@ class ImageController extends Controller
         return response()->json($imgData);
     }
 
+    /**
+     * Get all images for a user.
+     * @param int $page
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getAllForUserType($page = 0)
+    {
+        $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $this->currentUser->id);
+        return response()->json($imgData);
+    }
+
 
     /**
      * Handles image uploads for use on pages.
@@ -58,7 +70,13 @@ class ImageController extends Controller
         ]);
 
         $imageUpload = $request->file('file');
-        $image = $this->imageRepo->saveNew($imageUpload, $type);
+
+        try {
+            $image = $this->imageRepo->saveNew($imageUpload, $type);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
         return response()->json($image);
     }