Making sure MyISAM is set for the tables that need it for new installtions that are...

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

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 2014b360487ae12e1ed2e7efc98e38b71f979839..2e5d5f3034180dd3b2d6f40483a664ff677f6f6c 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -1,133 +1,175 @@
-<?php
-
-namespace Oxbow\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 

+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Repos\ImageRepo;

 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;

-
-use Intervention\Image\Facades\Image as ImageTool;
-use Illuminate\Support\Facades\DB;
-use Oxbow\Http\Requests;
-use Oxbow\Image;
+use BookStack\Image;
+use BookStack\Repos\PageRepo;

 
 class ImageController extends Controller
 {
     protected $image;
     protected $file;
 
 class ImageController extends Controller
 {
     protected $image;
     protected $file;

+    protected $imageRepo;

 
     /**
      * ImageController constructor.
      * @param Image $image
      * @param File $file
 
     /**
      * ImageController constructor.
      * @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->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 string $type
+     * @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);
+    /**
+     * Search through images within a particular type.
+     * @param $type
+     * @param int $page
+     * @param Request $request
+     * @return mixed
+     */
+    public function searchByType($type, $page = 0, Request $request)
+    {
+        $this->validate($request, [
+            'term' => 'required|string'
+        ]);
+        
+        $searchTerm = $request->get('term');
+        $imgData = $this->imageRepo->searchPaginatedByType($type, $page,24, $searchTerm);
+        return response()->json($imgData);

     }
 
     /**
     }
 
     /**

-     * Get all images, Paginated
+     * Get all images for a user.

      * @param int $page
      * @return \Illuminate\Http\JsonResponse
      */
      * @param int $page
      * @return \Illuminate\Http\JsonResponse
      */

-    public function getAll($page = 0)
+    public function getAllForUserType($page = 0)

     {
     {

-        $pageSize = 25;
-        $images = DB::table('images')->orderBy('created_at', 'desc')
-            ->skip($page*$pageSize)->take($pageSize)->get();
-        foreach($images as $image) {
-            $image->thumbnail = $this->getThumbnail($image, 150, 150);
-        }
-        return response()->json($images);
+        $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $this->currentUser->id);
+        return response()->json($imgData);

     }
 
     /**
     }
 
     /**

-     * Get the thumbnail for an image.
-     * @param $image
-     * @param int $width
-     * @param int $height
-     * @return string
+     * Get gallery images with a specific filter such as book or page
+     * @param $filter
+     * @param int $page
+     * @param Request $request

      */
      */

-    public function getThumbnail($image, $width = 220, $height = 220)
+    public function getGalleryFiltered($filter, $page = 0, Request $request)

     {
     {

-        $explodedPath = explode('/', $image->url);
-        array_splice($explodedPath, 3, 0, ['thumbs-' . $width . '-' . $height]);
-        $thumbPath = implode('/', $explodedPath);
-        $thumbFilePath = storage_path() . $thumbPath;
-        if(file_exists($thumbFilePath)) {
-            return $thumbPath;
-        }
+        $this->validate($request, [
+            'page_id' => 'required|integer'
+        ]);

 
 

-        //dd($thumbFilePath);
-        $thumb = ImageTool::make(storage_path() . $image->url);
-        $thumb->fit($width, $height);
-        if(!file_exists(dirname($thumbFilePath))) {
-            mkdir(dirname($thumbFilePath), 0775, true);
-        }
-        $thumb->save($thumbFilePath);
-        return $thumbFilePath;
+        $validFilters = collect(['page', 'book']);
+        if (!$validFilters->contains($filter)) return response('Invalid filter', 500);
+
+        $pageId = $request->get('page_id');
+        $imgData = $this->imageRepo->getGalleryFiltered($page, 24, strtolower($filter), $pageId);
+
+        return response()->json($imgData);

     }
 
     /**
      * Handles image uploads for use on pages.
     }
 
     /**
      * Handles image uploads for use on pages.

+     * @param string $type

      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */

-    public function upload(Request $request)
+    public function uploadByType($type, Request $request)

     {
     {

+        $this->checkPermission('image-create-all');
+        $this->validate($request, [
+            'file' => 'image|mimes:jpeg,gif,png'
+        ]);
+

         $imageUpload = $request->file('file');
         $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;
+
+        try {
+            $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);
+        }
+
+        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-all');
+        $image = $this->imageRepo->getById($id);
+        $thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false');
+        return response()->json(['url' => $thumbnailUrl]);
+    }
+
+    /**
+     * Update image details
+     * @param integer $imageId
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function update($imageId, Request $request)
+    {
+        $this->validate($request, [
+            'name' => 'required|min:2|string'
+        ]);
+        $image = $this->imageRepo->getById($imageId);
+        $this->checkOwnablePermission('image-update', $image);
+        $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)
+    {
+        $image = $this->imageRepo->getById($id);
+        $this->checkOwnablePermission('image-delete', $image);
+
+        // 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($this->image);
+
+        $this->imageRepo->destroyImage($image);
+        return response()->json('Image Deleted');

     }
 
 
     }