Update PageRepo.php

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

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 941f2ad39986c3062ae047306dabd957c542b066..3fff28d3ba493cd31ef4acc06ac32f91ab78ae11 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -1,88 +1,142 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Repos\ImageRepo;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
-
-use Oxbow\Http\Requests;
-use Oxbow\Image;
+use Illuminate\Support\Facades\Auth;
+use Intervention\Image\Facades\Image as ImageTool;
+use Illuminate\Support\Facades\DB;
+use BookStack\Image;
+use BookStack\Repos\PageRepo;
 
 class ImageController extends Controller
 {
     protected $image;
     protected $file;
+    protected $imageRepo;
 
     /**
      * ImageController constructor.
-     * @param Image $image
-     * @param File $file
+     * @param Image     $image
+     * @param File      $file
+     * @param ImageRepo $imageRepo
      */
-    public function __construct(Image $image, File $file)
+    public function __construct(Image $image, File $file, ImageRepo $imageRepo)
     {
         $this->image = $image;
         $this->file = $file;
+        $this->imageRepo = $imageRepo;
+        parent::__construct();
     }
 
+
     /**
-     * Returns an image from behind the public-facing application.
-     * @param Request $request
-     * @return \Illuminate\Http\Response
+     * Get all images for a specific type, Paginated
+     * @param int $page
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function getImage(Request $request)
+    public function getAllByType($type, $page = 0)
     {
-        $cacheTime = 60*60*24;
-        $path = storage_path() . '/' . $request->path();
-        $modifiedTime = $this->file->lastModified($path);
-        $eTag = md5($modifiedTime . $path);
-        $headerLastModified = gmdate('r', $modifiedTime);
-        $headerExpires = gmdate('r', $modifiedTime + $cacheTime);
-
-        $headers = [
-            'Last-Modified' => $headerLastModified,
-            'Cache-Control' => 'must-revalidate',
-            'Pragma' => 'public',
-            'Expires' => $headerExpires,
-            'Etag' => $eTag
-        ];
-
-        $browserModifiedSince = $request->header('If-Modified-Since');
-        $browserNoneMatch = $request->header('If-None-Match');
-        if($browserModifiedSince !== null && file_exists($path) && ($browserModifiedSince == $headerLastModified || $browserNoneMatch == $eTag)) {
-            return response()->make('', 304, $headers);
-        }
+        $imgData = $this->imageRepo->getPaginatedByType($type, $page);
+        return response()->json($imgData);
+    }
 
-        if(file_exists($path)) {
-            return response()->make(file_get_contents($path), 200, array_merge($headers, [
-                'Content-Type' => $this->file->mimeType($path),
-                'Content-Length' => filesize($path),
-            ]));
-        }
-        abort(404);
+    /**
+     * 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 upload(Request $request)
+    public function uploadByType($type, Request $request)
     {
+        $this->checkPermission('image-create');
+        $this->validate($request, [
+            'file' => 'image|mimes:jpeg,gif,png'
+        ]);
+
         $imageUpload = $request->file('file');
-        $name = $imageUpload->getClientOriginalName();
-        $imagePath = '/images/' . Date('Y-m-M') . '/';
-        $storagePath = storage_path(). $imagePath;
-        $fullPath = $storagePath . $name;
-        while(file_exists($fullPath)) {
-            $name = substr(sha1(rand()), 0, 3) . $name;
-            $fullPath = $storagePath . $name;
+
+        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
+     * @param         $imageId
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function update($imageId, Request $request)
+    {
+        $this->checkPermission('image-update');
+        $this->validate($request, [
+            'name' => 'required|min:2|string'
+        ]);
+        $image = $this->imageRepo->getById($imageId);
+        $image = $this->imageRepo->updateImageDetails($image, $request->all());
+        return response()->json($image);
+    }
+
+
+    /**
+     * Deletes an image and all thumbnail/image files
+     * @param PageRepo $pageRepo
+     * @param Request  $request
+     * @param int      $id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function destroy(PageRepo $pageRepo, Request $request, $id)
+    {
+        $this->checkPermission('image-delete');
+        $image = $this->imageRepo->getById($id);
+
+        // Check if this image is used on any pages
+        $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
+        if (!$isForced) {
+            $pageSearch = $pageRepo->searchForImage($image->url);
+            if ($pageSearch !== false) {
+                return response()->json($pageSearch, 400);
+            }
         }
-        $imageUpload->move($storagePath, $name);
-        // Create and save image object
-        $this->image->name = $name;
-        $this->image->url = $imagePath . $name;
-        $this->image->save();
-        return response()->json(['link' => $this->image->url]);
+
+        $this->imageRepo->destroyImage($image);
+        return response()->json('Image Deleted');
     }