DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11440 from snipe/fixes/check_for_image_on_signing

Browse source 
Fixed #11393 - reject acceptance if no file is present
This commit is contained in:
snipe 2022-06-30 21:09:16 -07:00 committed by GitHub
parent 25cb32ca6a 4e547a3639
commit acbd4deb1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Account/AcceptanceController.php
View file

@ -133,6 +133,12 @@ class AcceptanceController extends Controller
$encoded_image = explode(',', $data_uri);
$decoded_image = base64_decode($encoded_image[1]);
Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image);
// No image data is present, kick them back.
// This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*
} else {
return redirect()->back()->with('error', trans('general.shitty_browser'));
}

1
resources/lang/en/general.php
View file

@ -363,5 +363,6 @@ return [
'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
'additional_files' => 'Additional Files',
'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
];

2
resources/views/account/accept/create.blade.php
View file

@ -40,7 +40,7 @@
<div class="row">
<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
<div class="col-sm-12 col-sm-offset-1 col-md-10 col-md-offset-1">
<div class="panel box box-default">
<div class="box-body">
@if ($acceptance->checkoutable->getEula())