X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/80865b30a5d6a82e86d21e272ae58977d4430a64..refs/pull/84/head:/app/Http/Controllers/ImageController.php diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index 48e89ee41..f9d65c48b 100644 --- a/app/Http/Controllers/ImageController.php +++ b/app/Http/Controllers/ImageController.php @@ -20,8 +20,8 @@ class ImageController extends Controller /** * ImageController constructor. - * @param Image $image - * @param File $file + * @param Image $image + * @param File $file * @param ImageRepo $imageRepo */ public function __construct(Image $image, File $file, ImageRepo $imageRepo) @@ -32,9 +32,9 @@ class ImageController extends Controller parent::__construct(); } - /** * Get all images for a specific type, Paginated + * @param string $type * @param int $page * @return \Illuminate\Http\JsonResponse */ @@ -55,10 +55,9 @@ class ImageController extends Controller return response()->json($imgData); } - /** * Handles image uploads for use on pages. - * @param string $type + * @param string $type * @param Request $request * @return \Illuminate\Http\JsonResponse */ @@ -72,7 +71,8 @@ class ImageController extends Controller $imageUpload = $request->file('file'); try { - $image = $this->imageRepo->saveNew($imageUpload, $type); + $uploadedTo = $request->has('uploaded_to') ? $request->get('uploaded_to') : 0; + $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo); } catch (ImageUploadException $e) { return response($e->getMessage(), 500); } @@ -98,7 +98,7 @@ class ImageController extends Controller /** * Update image details - * @param $imageId + * @param integer $imageId * @param Request $request * @return \Illuminate\Http\JsonResponse */ @@ -113,12 +113,11 @@ class ImageController extends Controller return response()->json($image); } - /** * Deletes an image and all thumbnail/image files * @param PageRepo $pageRepo - * @param Request $request - * @param int $id + * @param Request $request + * @param int $id * @return \Illuminate\Http\JsonResponse */ public function destroy(PageRepo $pageRepo, Request $request, $id)