webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-10-29 16:09:29 +03:00
Code Activity

Merge branch 'validation_fixes' of git://github.com/TBK/BookStack into TBK-validation_fixes

Browse Source
This commit is contained in:
Dan Brown
2020-03-14 12:42:59 +00:00
parent d7760b1b25 57f587a78b
commit 200772da72
6 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/BookController.php
View File

@@ -86,7 +86,7 @@ class BookController 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->getImageValidationRules(), 'image' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
$bookshelf = null; $bookshelf = null;
@@ -153,7 +153,7 @@ class BookController 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->getImageValidationRules(), 'image' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
$book = $this->bookRepo->update($book, $request->all()); $book = $this->bookRepo->update($book, $request->all());

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

@@ -85,7 +85,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->getImageValidationRules(), 'image' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
$bookIds = explode(',', $request->get('books', '')); $bookIds = explode(',', $request->get('books', ''));
@@ -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' => 'nullable|' . $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 {

4
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' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
// Cycles through posted settings and update them // Cycles through posted settings and update them
@@ -57,7 +57,7 @@ class SettingController extends Controller
} }
// Update logo image if set // Update logo image if set
if ($request->has('app_logo')) { if ($request->hasFile('app_logo')) {
$logoFile = $request->file('app_logo'); $logoFile = $request->file('app_logo');
$this->imageRepo->destroyByType('system'); $this->imageRepo->destroyByType('system');
$image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86); $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);

4
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' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
$user = $this->userRepo->getById($id); $user = $this->userRepo->getById($id);
@@ -191,7 +191,7 @@ class UserController extends Controller
} }
// Save profile image if in request // Save profile image if in request
if ($request->has('profile_image')) { if ($request->hasFile('profile_image')) {
$imageUpload = $request->file('profile_image'); $imageUpload = $request->file('profile_image');
$this->imageRepo->destroyImage($user->avatar); $this->imageRepo->destroyImage($user->avatar);
$image = $this->imageRepo->saveNew($imageUpload, 'user', $user->id); $image = $this->imageRepo->saveNew($imageUpload, 'user', $user->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';
}
} }