1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00

Apply fixes from StyleCI

This commit is contained in:
Dan Brown
2021-06-26 15:23:15 +00:00
committed by StyleCI Bot
parent 3a402f6adc
commit 934a833818
349 changed files with 3655 additions and 2625 deletions

View File

@ -3,10 +3,10 @@
namespace BookStack\Http\Controllers\Images;
use BookStack\Exceptions\ImageUploadException;
use BookStack\Http\Controllers\Controller;
use BookStack\Uploads\ImageRepo;
use Exception;
use Illuminate\Http\Request;
use BookStack\Http\Controllers\Controller;
class DrawioImageController extends Controller
{
@ -29,21 +29,23 @@ class DrawioImageController extends Controller
$parentTypeFilter = $request->get('filter_type', null);
$imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
return view('components.image-manager-list', [
'images' => $imgData['images'],
'images' => $imgData['images'],
'hasMore' => $imgData['has_more'],
]);
}
/**
* Store a new gallery image in the system.
*
* @throws Exception
*/
public function create(Request $request)
{
$this->validate($request, [
'image' => 'required|string',
'uploaded_to' => 'required|integer'
'image' => 'required|string',
'uploaded_to' => 'required|integer',
]);
$this->checkPermission('image-create-all');
@ -67,16 +69,16 @@ class DrawioImageController extends Controller
$image = $this->imageRepo->getById($id);
$page = $image->getPage();
if ($image === null || $image->type !== 'drawio' || !userCan('page-view', $page)) {
return $this->jsonError("Image data could not be found");
return $this->jsonError('Image data could not be found');
}
$imageData = $this->imageRepo->getImageData($image);
if ($imageData === null) {
return $this->jsonError("Image data could not be found");
return $this->jsonError('Image data could not be found');
}
return response()->json([
'content' => base64_encode($imageData)
'content' => base64_encode($imageData),
]);
}
}

View File

@ -3,9 +3,9 @@
namespace BookStack\Http\Controllers\Images;
use BookStack\Exceptions\ImageUploadException;
use BookStack\Http\Controllers\Controller;
use BookStack\Uploads\ImageRepo;
use Illuminate\Http\Request;
use BookStack\Http\Controllers\Controller;
use Illuminate\Validation\ValidationException;
class GalleryImageController extends Controller
@ -32,21 +32,23 @@ class GalleryImageController extends Controller
$parentTypeFilter = $request->get('filter_type', null);
$imgData = $this->imageRepo->getEntityFiltered('gallery', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
return view('components.image-manager-list', [
'images' => $imgData['images'],
'images' => $imgData['images'],
'hasMore' => $imgData['has_more'],
]);
}
/**
* Store a new gallery image in the system.
*
* @throws ValidationException
*/
public function create(Request $request)
{
$this->checkPermission('image-create-all');
$this->validate($request, [
'file' => $this->getImageValidationRules()
'file' => $this->getImageValidationRules(),
]);
try {

View File

@ -1,4 +1,6 @@
<?php namespace BookStack\Http\Controllers\Images;
<?php
namespace BookStack\Http\Controllers\Images;
use BookStack\Exceptions\ImageUploadException;
use BookStack\Exceptions\NotFoundException;
@ -28,6 +30,7 @@ class ImageController extends Controller
/**
* Provide an image file from storage.
*
* @throws NotFoundException
*/
public function showImage(string $path)
@ -42,16 +45,16 @@ class ImageController extends Controller
return response()->file($path);
}
/**
* Update image details
* Update image details.
*
* @throws ImageUploadException
* @throws ValidationException
*/
public function update(Request $request, string $id)
{
$this->validate($request, [
'name' => 'required|min:2|string'
'name' => 'required|min:2|string',
]);
$image = $this->imageRepo->getById($id);
@ -61,14 +64,16 @@ class ImageController extends Controller
$image = $this->imageRepo->updateImageDetails($image, $request->all());
$this->imageRepo->loadThumbs($image);
return view('components.image-manager-form', [
'image' => $image,
'image' => $image,
'dependantPages' => null,
]);
}
/**
* Get the form for editing the given image.
*
* @throws Exception
*/
public function edit(Request $request, string $id)
@ -81,14 +86,16 @@ class ImageController extends Controller
}
$this->imageRepo->loadThumbs($image);
return view('components.image-manager-form', [
'image' => $image,
'image' => $image,
'dependantPages' => $dependantPages ?? null,
]);
}
/**
* Deletes an image and all thumbnail/image files
* Deletes an image and all thumbnail/image files.
*
* @throws Exception
*/
public function destroy(string $id)
@ -98,6 +105,7 @@ class ImageController extends Controller
$this->checkImagePermission($image);
$this->imageRepo->destroyImage($image);
return response('');
}