<?php
-namespace Oxbow\Http\Controllers;
+namespace BookStack\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;
-use Oxbow\Image;
+use BookStack\Image;
+use BookStack\Repos\PageRepo;
class ImageController extends Controller
{
parent::__construct();
}
- /**
- * Returns an image from behind the public-facing application.
- * @param Request $request
- * @return \Illuminate\Http\Response
- */
- public function getImage(Request $request)
- {
- $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);
- }
-
- 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);
- }
/**
* Get all images, Paginated
public function getAll($page = 0)
{
$pageSize = 30;
- $images = DB::table('images')->orderBy('created_at', 'desc')
+ $images = $this->image->orderBy('created_at', 'desc')
->skip($page * $pageSize)->take($pageSize)->get();
foreach ($images as $image) {
- $image->thumbnail = $this->getThumbnail($image, 150, 150);
+ $this->loadSizes($image);
}
- $hasMore = count(DB::table('images')->orderBy('created_at', 'desc')
- ->skip(($page + 1) * $pageSize)->take($pageSize)->get()) > 0;
+ $hasMore = $this->image->orderBy('created_at', 'desc')
+ ->skip(($page + 1) * $pageSize)->take($pageSize)->count() > 0;
return response()->json([
- 'images' => $images,
+ 'images' => $images,
'hasMore' => $hasMore
]);
}
+ /**
+ * Loads the standard thumbnail sizes for an image.
+ * @param Image $image
+ */
+ private function loadSizes(Image $image)
+ {
+ $image->thumbnail = $this->getThumbnail($image, 150, 150);
+ $image->display = $this->getThumbnail($image, 840, 0, true);
+ }
+
/**
* Get the thumbnail for an image.
- * @param $image
- * @param int $width
- * @param int $height
+ * If $keepRatio is true only the width will be used.
+ * @param $image
+ * @param int $width
+ * @param int $height
+ * @param bool $keepRatio
* @return string
*/
- public function getThumbnail($image, $width = 220, $height = 220)
+ public function getThumbnail($image, $width = 220, $height = 220, $keepRatio = false)
{
$explodedPath = explode('/', $image->url);
- array_splice($explodedPath, 4, 0, ['thumbs-' . $width . '-' . $height]);
+ $dirPrefix = $keepRatio ? 'scaled-' : 'thumbs-';
+ array_splice($explodedPath, 4, 0, [$dirPrefix . $width . '-' . $height]);
$thumbPath = implode('/', $explodedPath);
$thumbFilePath = public_path() . $thumbPath;
// Otherwise create the thumbnail
$thumb = ImageTool::make(public_path() . $image->url);
- $thumb->fit($width, $height);
+ if($keepRatio) {
+ $thumb->resize($width, null, function ($constraint) {
+ $constraint->aspectRatio();
+ $constraint->upsize();
+ });
+ } else {
+ $thumb->fit($width, $height);
+ }
// Create thumbnail folder if it does not exist
if (!file_exists(dirname($thumbFilePath))) {
public function upload(Request $request)
{
$this->checkPermission('image-create');
+ $this->validate($request, [
+ 'file' => 'image|mimes:jpeg,gif,png'
+ ]);
$imageUpload = $request->file('file');
+
$name = str_replace(' ', '-', $imageUpload->getClientOriginalName());
$storageName = substr(sha1(time()), 0, 10) . '-' . $name;
$imagePath = '/uploads/images/' . Date('Y-m-M') . '/';
// 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->created_by = auth()->user()->id;
+ $this->image->updated_by = auth()->user()->id;
$this->image->save();
- $this->image->thumbnail = $this->getThumbnail($this->image, 150, 150);
+ $this->loadSizes($this->image);
return response()->json($this->image);
}
$image = $this->image->findOrFail($imageId);
$image->fill($request->all());
$image->save();
+ $this->loadSizes($image);
return response()->json($this->image);
}
/**
* Deletes an image and all thumbnail/image files
- * @param $id
+ * @param PageRepo $pageRepo
+ * @param Request $request
+ * @param int $id
* @return \Illuminate\Http\JsonResponse
*/
- public function destroy($id)
+ public function destroy(PageRepo $pageRepo, Request $request, $id)
{
$this->checkPermission('image-delete');
$image = $this->image->findOrFail($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);
projects / bookstack / blobdiff