-<?php
-
-namespace Oxbow\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Exceptions\NotFoundException;
+use BookStack\Repos\EntityRepo;
+use BookStack\Repos\ImageRepo;
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;
-use Oxbow\Image;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use RegexIterator;
+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 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
+ * Provide an image file from storage.
+ * @param string $path
+ * @return mixed
*/
- public function getImage(Request $request)
+ public function showImage(string $path)
{
- $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);
+ $path = storage_path('uploads/images/' . $path);
+ if (!file_exists($path)) {
+ abort(404);
}
- 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);
+ return response()->file($path);
}
/**
- * Get all images, Paginated
+ * Get all images for a specific type, Paginated
+ * @param string $type
* @param int $page
* @return \Illuminate\Http\JsonResponse
*/
- public function getAll($page = 0)
+ public function getAllByType($type, $page = 0)
{
- $pageSize = 30;
- $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);
- }
- $hasMore = count(DB::table('images')->orderBy('created_at', 'desc')
- ->skip(($page+1)*$pageSize)->take($pageSize)->get()) > 0;
- return response()->json([
- 'images' => $images,
- 'hasMore' => $hasMore
+ $imgData = $this->imageRepo->getPaginatedByType($type, $page);
+ return response()->json($imgData);
+ }
+
+ /**
+ * Search through images within a particular type.
+ * @param $type
+ * @param int $page
+ * @param Request $request
+ * @return mixed
+ */
+ public function searchByType(Request $request, $type, $page = 0)
+ {
+ $this->validate($request, [
+ 'term' => 'required|string'
]);
+
+ $searchTerm = $request->get('term');
+ $imgData = $this->imageRepo->searchPaginatedByType($type, $searchTerm, $page, 24);
+ return response()->json($imgData);
}
/**
- * Get the thumbnail for an image.
- * @param $image
- * @param int $width
- * @param int $height
- * @return string
+ * Get all images for a user.
+ * @param int $page
+ * @return \Illuminate\Http\JsonResponse
*/
- public function getThumbnail($image, $width = 220, $height = 220)
+ public function getAllForUserType($page = 0)
{
- $explodedPath = explode('/', $image->url);
- array_splice($explodedPath, 4, 0, ['thumbs-' . $width . '-' . $height]);
- $thumbPath = implode('/', $explodedPath);
- $thumbFilePath = public_path() . $thumbPath;
-
- // Return the thumbnail url path if already exists
- if(file_exists($thumbFilePath)) {
- return $thumbPath;
- }
+ $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $this->currentUser->id);
+ return response()->json($imgData);
+ }
- // Otherwise create the thumbnail
- $thumb = ImageTool::make(public_path() . $image->url);
- $thumb->fit($width, $height);
+ /**
+ * Get gallery images with a specific filter such as book or page
+ * @param $filter
+ * @param int $page
+ * @param Request $request
+ * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
+ */
+ public function getGalleryFiltered(Request $request, $filter, $page = 0)
+ {
+ $this->validate($request, [
+ 'page_id' => 'required|integer'
+ ]);
- // Create thumbnail folder if it does not exist
- if(!file_exists(dirname($thumbFilePath))) {
- mkdir(dirname($thumbFilePath), 0775, true);
+ $validFilters = collect(['page', 'book']);
+ if (!$validFilters->contains($filter)) {
+ return response('Invalid filter', 500);
}
- //Save Thumbnail
- $thumb->save($thumbFilePath);
- return $thumbPath;
+ $pageId = $request->get('page_id');
+ $imgData = $this->imageRepo->getGalleryFiltered(strtolower($filter), $pageId, $page, 24);
+
+ return response()->json($imgData);
}
/**
* Handles image uploads for use on pages.
+ * @param string $type
* @param Request $request
* @return \Illuminate\Http\JsonResponse
+ * @throws \Exception
*/
- public function upload(Request $request)
+ public function uploadByType($type, Request $request)
{
+ $this->checkPermission('image-create-all');
+ $this->validate($request, [
+ 'file' => 'is_image'
+ ]);
+
+ if (!$this->imageRepo->isValidType($type)) {
+ return $this->jsonError(trans('errors.image_upload_type_error'));
+ }
+
$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;
- $fullPath = $storagePath . $storageName;
- while(file_exists($fullPath)) {
- $storageName = substr(sha1(rand()), 0, 3) . $storageName;
- $fullPath = $storagePath . $storageName;
+
+ try {
+ $uploadedTo = $request->get('uploaded_to', 0);
+ $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
+ } catch (ImageUploadException $e) {
+ return response($e->getMessage(), 500);
+ }
+
+
+ return response()->json($image);
+ }
+
+ /**
+ * Upload a drawing to the system.
+ * @param Request $request
+ * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
+ */
+ public function uploadDrawing(Request $request)
+ {
+ $this->validate($request, [
+ 'image' => 'required|string',
+ 'uploaded_to' => 'required|integer'
+ ]);
+ $this->checkPermission('image-create-all');
+ $imageBase64Data = $request->get('image');
+
+ try {
+ $uploadedTo = $request->get('uploaded_to', 0);
+ $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
+ } catch (ImageUploadException $e) {
+ return response($e->getMessage(), 500);
+ }
+
+ return response()->json($image);
+ }
+
+ /**
+ * Get the content of an image based64 encoded.
+ * @param $id
+ * @return \Illuminate\Http\JsonResponse|mixed
+ */
+ public function getBase64Image($id)
+ {
+ $image = $this->imageRepo->getById($id);
+ $imageData = $this->imageRepo->getImageData($image);
+ if ($imageData === null) {
+ return $this->jsonError("Image data could not be found");
}
- $imageUpload->move($storagePath, $storageName);
- // Create and save image object
- $this->image->name = $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);
+ return response()->json([
+ 'content' => base64_encode($imageData)
+ ]);
+ }
+
+ /**
+ * Generate a sized thumbnail for an image.
+ * @param $id
+ * @param $width
+ * @param $height
+ * @param $crop
+ * @return \Illuminate\Http\JsonResponse
+ * @throws ImageUploadException
+ * @throws \Exception
+ */
+ 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 $imageId
+ * @param integer $imageId
* @param Request $request
* @return \Illuminate\Http\JsonResponse
+ * @throws ImageUploadException
+ * @throws \Exception
*/
public function update($imageId, Request $request)
{
$this->validate($request, [
'name' => 'required|min:2|string'
]);
- $image = $this->image->findOrFail($imageId);
- $image->fill($request->all());
- $image->save();
- return response()->json($this->image);
+ $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
+ * Show the usage of an image on pages.
+ * @param EntityRepo $entityRepo
* @param $id
* @return \Illuminate\Http\JsonResponse
*/
- public function destroy($id)
+ public function usage(EntityRepo $entityRepo, $id)
{
- $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');
+ $image = $this->imageRepo->getById($id);
+ $pageSearch = $entityRepo->searchForImage($image->url);
+ return response()->json($pageSearch);
}
+ /**
+ * Deletes an image and all thumbnail/image files
+ * @param int $id
+ * @return \Illuminate\Http\JsonResponse
+ * @throws \Exception
+ */
+ public function destroy($id)
+ {
+ $image = $this->imageRepo->getById($id);
+ $this->checkOwnablePermission('image-delete', $image);
+ $this->imageRepo->destroyImage($image);
+ return response()->json(trans('components.images_deleted'));
+ }
}
projects / bookstack / blobdiff