X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/d46186126335a0a4ea00e2702ddd6fc6d99f333d..1b29d44689bbcf40fc79ef9b4257fc387d4b64be:/app/Http/Controllers/ImageController.php

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 2014b3604..6d01fe2cc 100644
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -4,7 +4,7 @@ namespace Oxbow\Http\Controllers;
 
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
-
+use Illuminate\Support\Facades\Auth;
 use Intervention\Image\Facades\Image as ImageTool;
 use Illuminate\Support\Facades\DB;
 use Oxbow\Http\Requests;
@@ -18,12 +18,13 @@ class ImageController extends Controller
     /**
      * ImageController constructor.
      * @param Image $image
-     * @param File $file
+     * @param File  $file
      */
     public function __construct(Image $image, File $file)
     {
         $this->image = $image;
         $this->file = $file;
+        parent::__construct();
     }
 
     /**
@@ -33,7 +34,7 @@ class ImageController extends Controller
      */
     public function getImage(Request $request)
     {
-        $cacheTime = 60*60*24;
+        $cacheTime = 60 * 60 * 24;
         $path = storage_path() . '/' . $request->path();
         $modifiedTime = $this->file->lastModified($path);
         $eTag = md5($modifiedTime . $path);
@@ -43,20 +44,20 @@ class ImageController extends Controller
         $headers = [
             'Last-Modified' => $headerLastModified,
             'Cache-Control' => 'must-revalidate',
-            'Pragma' => 'public',
-            'Expires' => $headerExpires,
-            'Etag' => $eTag
+            '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)) {
+        if ($browserModifiedSince !== null && file_exists($path) && ($browserModifiedSince == $headerLastModified || $browserNoneMatch == $eTag)) {
             return response()->make('', 304, $headers);
         }
 
-        if(file_exists($path)) {
+        if (file_exists($path)) {
             return response()->make(file_get_contents($path), 200, array_merge($headers, [
-                'Content-Type' => $this->file->mimeType($path),
+                'Content-Type'   => $this->file->mimeType($path),
                 'Content-Length' => filesize($path),
             ]));
         }
@@ -70,18 +71,23 @@ class ImageController extends Controller
      */
     public function getAll($page = 0)
     {
-        $pageSize = 25;
+        $pageSize = 30;
         $images = DB::table('images')->orderBy('created_at', 'desc')
-            ->skip($page*$pageSize)->take($pageSize)->get();
-        foreach($images as $image) {
+            ->skip($page * $pageSize)->take($pageSize)->get();
+        foreach ($images as $image) {
             $image->thumbnail = $this->getThumbnail($image, 150, 150);
         }
-        return response()->json($images);
+        $hasMore = count(DB::table('images')->orderBy('created_at', 'desc')
+                ->skip(($page + 1) * $pageSize)->take($pageSize)->get()) > 0;
+        return response()->json([
+            'images'  => $images,
+            'hasMore' => $hasMore
+        ]);
     }
 
     /**
      * Get the thumbnail for an image.
-     * @param $image
+     * @param     $image
      * @param int $width
      * @param int $height
      * @return string
@@ -89,21 +95,27 @@ class ImageController extends Controller
     public function getThumbnail($image, $width = 220, $height = 220)
     {
         $explodedPath = explode('/', $image->url);
-        array_splice($explodedPath, 3, 0, ['thumbs-' . $width . '-' . $height]);
+        array_splice($explodedPath, 4, 0, ['thumbs-' . $width . '-' . $height]);
         $thumbPath = implode('/', $explodedPath);
-        $thumbFilePath = storage_path() . $thumbPath;
-        if(file_exists($thumbFilePath)) {
+        $thumbFilePath = public_path() . $thumbPath;
+
+        // Return the thumbnail url path if already exists
+        if (file_exists($thumbFilePath)) {
             return $thumbPath;
         }
 
-        //dd($thumbFilePath);
-        $thumb = ImageTool::make(storage_path() . $image->url);
+        // Otherwise create the thumbnail
+        $thumb = ImageTool::make(public_path() . $image->url);
         $thumb->fit($width, $height);
-        if(!file_exists(dirname($thumbFilePath))) {
+
+        // Create thumbnail folder if it does not exist
+        if (!file_exists(dirname($thumbFilePath))) {
             mkdir(dirname($thumbFilePath), 0775, true);
         }
+
+        //Save Thumbnail
         $thumb->save($thumbFilePath);
-        return $thumbFilePath;
+        return $thumbPath;
     }
 
     /**
@@ -113,22 +125,84 @@ class ImageController extends Controller
      */
     public function upload(Request $request)
     {
+        $this->checkPermission('image-create');
         $imageUpload = $request->file('file');
         $name = str_replace(' ', '-', $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;
+        $storageName = substr(sha1(time()), 0, 10) . '-' . $name;
+        $imagePath = '/uploads/images/' . Date('Y-m-M') . '/';
+        $storagePath = public_path() . $imagePath;
+        $fullPath = $storagePath . $storageName;
+        while (file_exists($fullPath)) {
+            $storageName = substr(sha1(rand()), 0, 3) . $storageName;
+            $fullPath = $storagePath . $storageName;
         }
-        $imageUpload->move($storagePath, $name);
+        $imageUpload->move($storagePath, $storageName);
         // Create and save image object
         $this->image->name = $name;
-        $this->image->url = $imagePath . $name;
+        $this->image->url = $imagePath . $storageName;
+        $this->image->created_by = Auth::user()->id;
+        $this->image->updated_by = Auth::user()->id;
         $this->image->save();
+        $this->image->thumbnail = $this->getThumbnail($this->image, 150, 150);
+        return response()->json($this->image);
+    }
+
+    /**
+     * 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->image->findOrFail($imageId);
+        $image->fill($request->all());
+        $image->save();
         return response()->json($this->image);
     }
 
+    /**
+     * Deletes an image and all thumbnail/image files
+     * @param $id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function destroy($id)
+    {
+        $this->checkPermission('image-delete');
+        $image = $this->image->findOrFail($id);
+
+        // Delete files
+        $folder = public_path() . dirname($image->url);
+        $fileName = basename($image->url);
+
+        // Delete thumbnails
+        foreach (glob($folder . '/*') as $file) {
+            if (is_dir($file)) {
+                $thumbName = $file . '/' . $fileName;
+                if (file_exists($file)) {
+                    unlink($thumbName);
+                }
+                // Remove thumb folder if empty
+                if (count(glob($file . '/*')) === 0) {
+                    rmdir($file);
+                }
+            }
+        }
+
+        // Delete file and database entry
+        unlink($folder . '/' . $fileName);
+        $image->delete();
+
+        // Delete parent folder if empty
+        if (count(glob($folder . '/*')) === 0) {
+            rmdir($folder);
+        }
+        return response()->json('Image Deleted');
+    }
+
 
 }