Improved empty lists. Fixes #10.

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

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 2ef5b1228e9fc8498fe3f2a18f40112eee370c0c..6d01fe2ccc423c15062ebeec1a48f93e88e236f0 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -4,7 +4,6 @@ namespace Oxbow\Http\Controllers;
 
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
 
 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 Illuminate\Support\Facades\Auth;
 use Intervention\Image\Facades\Image as ImageTool;
 use Illuminate\Support\Facades\DB;


@@ -19,12 +18,13 @@ class ImageController extends Controller
     /**
      * ImageController constructor.
      * @param Image $image
     /**
      * ImageController constructor.
      * @param Image $image

-     * @param File $file
+     * @param File  $file

      */
     public function __construct(Image $image, File $file)
     {
         $this->image = $image;
         $this->file = $file;
      */
     public function __construct(Image $image, File $file)
     {
         $this->image = $image;
         $this->file = $file;

+        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -34,7 +34,7 @@ class ImageController extends Controller
      */
     public function getImage(Request $request)
     {
      */
     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);
         $path = storage_path() . '/' . $request->path();
         $modifiedTime = $this->file->lastModified($path);
         $eTag = md5($modifiedTime . $path);


@@ -44,20 +44,20 @@ class ImageController extends Controller
         $headers = [
             'Last-Modified' => $headerLastModified,
             'Cache-Control' => 'must-revalidate',
         $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');
         ];
 
         $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);
         }
 
             return response()->make('', 304, $headers);
         }
 

-        if(file_exists($path)) {
+        if (file_exists($path)) {

             return response()->make(file_get_contents($path), 200, array_merge($headers, [
             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),
             ]));
         }
                 'Content-Length' => filesize($path),
             ]));
         }


@@ -71,23 +71,23 @@ class ImageController extends Controller
      */
     public function getAll($page = 0)
     {
      */
     public function getAll($page = 0)
     {

-        $pageSize = 25;
+        $pageSize = 30;

         $images = DB::table('images')->orderBy('created_at', 'desc')
         $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);
         }
         $hasMore = count(DB::table('images')->orderBy('created_at', 'desc')
             $image->thumbnail = $this->getThumbnail($image, 150, 150);
         }
         $hasMore = count(DB::table('images')->orderBy('created_at', 'desc')

-            ->skip(($page+1)*$pageSize)->take($pageSize)->get()) > 0;
+                ->skip(($page + 1) * $pageSize)->take($pageSize)->get()) > 0;

         return response()->json([
         return response()->json([

-            'images' => $images,
+            'images'  => $images,

             'hasMore' => $hasMore
         ]);
     }
 
     /**
      * Get the thumbnail for an image.
             'hasMore' => $hasMore
         ]);
     }
 
     /**
      * Get the thumbnail for an image.

-     * @param $image
+     * @param     $image

      * @param int $width
      * @param int $height
      * @return string
      * @param int $width
      * @param int $height
      * @return string


@@ -100,7 +100,7 @@ class ImageController extends Controller
         $thumbFilePath = public_path() . $thumbPath;
 
         // Return the thumbnail url path if already exists
         $thumbFilePath = public_path() . $thumbPath;
 
         // Return the thumbnail url path if already exists

-        if(file_exists($thumbFilePath)) {
+        if (file_exists($thumbFilePath)) {

             return $thumbPath;
         }
 
             return $thumbPath;
         }
 


@@ -109,7 +109,7 @@ class ImageController extends Controller
         $thumb->fit($width, $height);
 
         // Create thumbnail folder if it does not exist
         $thumb->fit($width, $height);
 
         // Create thumbnail folder if it does not exist

-        if(!file_exists(dirname($thumbFilePath))) {
+        if (!file_exists(dirname($thumbFilePath))) {

             mkdir(dirname($thumbFilePath), 0775, true);
         }
 
             mkdir(dirname($thumbFilePath), 0775, true);
         }
 


@@ -125,13 +125,14 @@ class ImageController extends Controller
      */
     public function upload(Request $request)
     {
      */
     public function upload(Request $request)
     {

+        $this->checkPermission('image-create');

         $imageUpload = $request->file('file');
         $name = str_replace(' ', '-', $imageUpload->getClientOriginalName());
         $storageName = substr(sha1(time()), 0, 10) . '-' . $name;
         $imageUpload = $request->file('file');
         $name = str_replace(' ', '-', $imageUpload->getClientOriginalName());
         $storageName = substr(sha1(time()), 0, 10) . '-' . $name;

-        $imagePath = '/uploads/images/'.Date('Y-m-M').'/';
-        $storagePath = public_path(). $imagePath;
+        $imagePath = '/uploads/images/' . Date('Y-m-M') . '/';
+        $storagePath = public_path() . $imagePath;

         $fullPath = $storagePath . $storageName;
         $fullPath = $storagePath . $storageName;

-        while(file_exists($fullPath)) {
+        while (file_exists($fullPath)) {

             $storageName = substr(sha1(rand()), 0, 3) . $storageName;
             $fullPath = $storagePath . $storageName;
         }
             $storageName = substr(sha1(rand()), 0, 3) . $storageName;
             $fullPath = $storagePath . $storageName;
         }


@@ -146,5 +147,62 @@ class ImageController extends Controller
         return response()->json($this->image);
     }
 
         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');
+    }
+

 
 }
 
 }