Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant getImageValidationRules method

Browse Source
This commit is contained in:
TBK 2020-03-04 00:06:30 +01:00
parent 5cd56f63ff
commit d3737d5a87
No known key found for this signature in database
GPG Key ID: 6D4FD19CB66C95EA
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BookshelfController.php
View File

@ -146,7 +146,7 @@ class BookshelfController extends Controller
$this->validate($request, [ $this->validate($request, [
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'description' => 'string|max:1000', 'description' => 'string|max:1000',
'image' => $this->imageRepo->getImageValidationRules(), 'image' => $this->getImageValidationRules(),
]); ]);

2
app/Http/Controllers/Images/GalleryImageController.php
View File

@ -48,7 +48,7 @@ class GalleryImageController extends Controller
{ {
$this->checkPermission('image-create-all'); $this->checkPermission('image-create-all');
$this->validate($request, [ $this->validate($request, [
'file' => $this->imageRepo->getImageValidationRules() 'file' => $this->getImageValidationRules()
]); ]);
try { try {

2
app/Http/Controllers/SettingController.php
View File

@ -44,7 +44,7 @@ class SettingController extends Controller
$this->preventAccessInDemoMode(); $this->preventAccessInDemoMode();
$this->checkPermission('settings-manage'); $this->checkPermission('settings-manage');
$this->validate($request, [ $this->validate($request, [
'app_logo' => $this->imageRepo->getImageValidationRules(), 'app_logo' => $this->getImageValidationRules(),
]); ]);
// Cycles through posted settings and update them // Cycles through posted settings and update them

2
app/Http/Controllers/UserController.php
View File

@ -155,7 +155,7 @@ class UserController extends Controller
'password' => 'min:6|required_with:password_confirm', 'password' => 'min:6|required_with:password_confirm',
'password-confirm' => 'same:password|required_with:password', 'password-confirm' => 'same:password|required_with:password',
'setting' => 'array', 'setting' => 'array',
'profile_image' => $this->imageRepo->getImageValidationRules(), 'profile_image' => $this->getImageValidationRules(),
]); ]);
$user = $this->userRepo->getById($id); $user = $this->userRepo->getById($id);

8
app/Uploads/ImageRepo.php
View File

@ -219,12 +219,4 @@ class ImageRepo
return null; return null;
} }
} }
/**
* Get the validation rules for image files.
*/
public function getImageValidationRules(): string
{
return 'image_extension|no_double_extension|mimes:jpeg,png,gif,bmp,webp,tiff';
}
} }