<?php
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
+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 Oxbow\Repos\PageRepo;
+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();
}
/**
- * Get all images, Paginated
+ * Get all gallery images, Paginated
* @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);
}
+
/**
- * Get the thumbnail for an image.
- * @param $image
- * @param int $width
- * @param int $height
- * @return string
+ * Handles image uploads for use on pages.
+ * @param string $type
+ * @param Request $request
+ * @return \Illuminate\Http\JsonResponse
*/
- public function getThumbnail($image, $width = 220, $height = 220)
+ public function uploadByType($type, Request $request)
{
- $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;
- }
-
- // Otherwise create the thumbnail
- $thumb = ImageTool::make(public_path() . $image->url);
- $thumb->fit($width, $height);
-
- // Create thumbnail folder if it does not exist
- if (!file_exists(dirname($thumbFilePath))) {
- mkdir(dirname($thumbFilePath), 0775, true);
- }
+ $this->checkPermission('image-create');
+ $this->validate($request, [
+ 'file' => 'image|mimes:jpeg,gif,png'
+ ]);
- //Save Thumbnail
- $thumb->save($thumbFilePath);
- return $thumbPath;
+ $imageUpload = $request->file('file');
+ $image = $this->imageRepo->saveNew($imageUpload, $type);
+ return response()->json($image);
}
/**
- * Handles image uploads for use on pages.
- * @param Request $request
+ * Generate a sized thumbnail for an image.
+ * @param $id
+ * @param $width
+ * @param $height
+ * @param $crop
* @return \Illuminate\Http\JsonResponse
*/
- public function upload(Request $request)
+ public function getThumbnail($id, $width, $height, $crop)
{
$this->checkPermission('image-create');
- $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;
- }
- $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);
+ $image = $this->imageRepo->getById($id);
+ $thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false');
+ return response()->json(['url' => $thumbnailUrl]);
}
/**
$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);
+ $image = $this->imageRepo->updateImageDetails($image, $request->all());
+ return response()->json($image);
}
+
/**
* Deletes an image and all thumbnail/image files
* @param PageRepo $pageRepo
public function destroy(PageRepo $pageRepo, Request $request, $id)
{
$this->checkPermission('image-delete');
- $image = $this->image->findOrFail($id);
+ $image = $this->imageRepo->getById($id);
// Check if this image is used on any pages
- $pageSearch = $pageRepo->searchForImage($image->url);
$isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
- if ($pageSearch !== false && !$isForced) {
- return response()->json($pageSearch, 400);
- }
-
- // 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);
- }
+ if (!$isForced) {
+ $pageSearch = $pageRepo->searchForImage($image->url);
+ if ($pageSearch !== false) {
+ return response()->json($pageSearch, 400);
}
}
- // Delete file and database entry
- unlink($folder . '/' . $fileName);
- $image->delete();
-
- // Delete parent folder if empty
- if (count(glob($folder . '/*')) === 0) {
- rmdir($folder);
- }
+ $this->imageRepo->destroyImage($image);
return response()->json('Image Deleted');
}
projects / bookstack / blobdiff