X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c88096b7e2fbcc33dd8a66a3235ff4e9d42df715..refs/pull/60/head:/app/Http/Controllers/ImageController.php diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index 7e7fedfde..3fff28d3b 100644 --- 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,23 +34,35 @@ class ImageController extends Controller /** - * Get all images, Paginated + * Get all images for a specific type, Paginated * @param int $page * @return \Illuminate\Http\JsonResponse */ - public function getAllGallery($page = 0) + public function getAllByType($type, $page = 0) { - $imgData = $this->imageRepo->getAllGallery($page); + $imgData = $this->imageRepo->getPaginatedByType($type, $page); + 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. + * @param string $type * @param Request $request * @return \Illuminate\Http\JsonResponse */ - public function uploadGallery(Request $request) + public function uploadByType($type, Request $request) { $this->checkPermission('image-create'); $this->validate($request, [ @@ -57,10 +70,31 @@ class ImageController extends Controller ]); $imageUpload = $request->file('file'); - $image = $this->imageRepo->saveNew($imageUpload, 'gallery'); + + try { + $image = $this->imageRepo->saveNew($imageUpload, $type); + } catch (ImageUploadException $e) { + return response($e->getMessage(), 500); + } + return response()->json($image); } + /** + * Generate a sized thumbnail for an image. + * @param $id + * @param $width + * @param $height + * @param $crop + * @return \Illuminate\Http\JsonResponse + */ + public function getThumbnail($id, $width, $height, $crop) + { + $this->checkPermission('image-create'); + $image = $this->imageRepo->getById($id); + $thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false'); + return response()->json(['url' => $thumbnailUrl]); + } /** * Update image details