mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-21 00:07:42 -07:00
64d649be7f
* Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods. * Use same image upload/layout in accessories as consum+components. * Monster: Cleanup/Refactor http controllers. This cleans up docblocks, pulls most non-crudy actions into their own controllers, and does general cleanup/logic refactoring. There /should/ be no functional changes, but we all know how should works.. Extract checkin/checkout functions to a separate controller for accessories. Move controllers to subdirectory. Cleanup AssetModelsController Extract component checkin/checkout Assorted cleanups/doc/formatting in controllers. Refactor LicenseController. Refactor UsersController Update viewassetscontroller. * Codacy cleanups * More codacy cleanups. Extract a LicenseCheckout Form request as well. * A bit more refactor/cleaning of the license checkout method. * Review Related Cleanups * Fix most of the item_not_found translations. In many cases, the string being generated did not even use the id parameter. Where it does, pass it as id instead of as a different value. * Remove some old $data arrays from when we manually sent emails from the controllers. This has been superseeded by the notification system (yay!) * Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.
79 lines
2.4 KiB
PHP
79 lines
2.4 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Requests;
|
|
|
|
use App\Models\SnipeModel;
|
|
use Intervention\Image\Facades\Image;
|
|
|
|
class ImageUploadRequest extends Request
|
|
{
|
|
/**
|
|
* Determine if the user is authorized to make this request.
|
|
*
|
|
* @return bool
|
|
*/
|
|
public function authorize()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Get the validation rules that apply to the request.
|
|
*
|
|
* @return array
|
|
*/
|
|
public function rules()
|
|
{
|
|
return [
|
|
'image' => 'mimes:png,gif,jpg,jpeg,svg',
|
|
'avatar' => 'mimes:png,gif,jpg,jpeg,svg',
|
|
];
|
|
}
|
|
|
|
public function response(array $errors)
|
|
{
|
|
return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
|
|
}
|
|
|
|
/**
|
|
* Handle and store any images attached to request
|
|
* @param SnipeModel $item Item the image is associated with
|
|
* @param String $path location for uploaded images, defaults to uploads/plural of item type.
|
|
* @return SnipeModel Target asset is being checked out to.
|
|
*/
|
|
public function handleImages($item, $path = null)
|
|
{
|
|
|
|
if ($this->hasFile('image')) {
|
|
if (!config('app.lock_passwords')) {
|
|
if(is_null($path)) {
|
|
$type = strtolower(class_basename(get_class($item)));
|
|
$plural = str_plural($type);
|
|
$path = public_path('/uploads/'.$plural);
|
|
}
|
|
$image = $this->file('image');
|
|
$ext = $image->getClientOriginalExtension();
|
|
$file_name = $type.'-'.str_random(18).'.'.$ext;
|
|
if ($image->getClientOriginalExtension()!='svg') {
|
|
Image::make($image->getRealPath())->resize(null, 250, function ($constraint) {
|
|
$constraint->aspectRatio();
|
|
$constraint->upsize();
|
|
})->save($path.'/'.$file_name);
|
|
} else {
|
|
$image->move($path, $file_name);
|
|
}
|
|
|
|
// Remove Current image if exists.
|
|
if (($item->image) && (file_exists($path.'/'.$item->image))) {
|
|
unlink($path.'/'.$item->image);
|
|
}
|
|
|
|
$item->image = $file_name;
|
|
}
|
|
} elseif ($this->input('image_delete')=='1') {
|
|
$item->image = null;
|
|
}
|
|
return $item;
|
|
}
|
|
}
|