DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11445 from snipe/fixes/11444

Browse source 
Replicates #11444
This commit is contained in:
snipe 2022-07-01 11:26:25 -07:00 committed by GitHub
parent acbd4deb1b 45c616639c
commit d4476cb10b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,12 +110,7 @@ class AcceptanceController extends Controller
Storage::makeDirectory('private_uploads/signatures', 775); Storage::makeDirectory('private_uploads/signatures', 775);
} }
/**
* Check for the eula-pdfs directory
*/
if (! Storage::exists('private_uploads/eula-pdfs')) {
Storage::makeDirectory('private_uploads/eula-pdfs', 775);
}
$item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id); $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);
$display_model = ''; $display_model = '';
@ -126,19 +121,33 @@ class AcceptanceController extends Controller
if ($request->input('asset_acceptance') == 'accepted') { if ($request->input('asset_acceptance') == 'accepted') {
/**
* Check for the eula-pdfs directory
*/
if (! Storage::exists('private_uploads/eula-pdfs')) {
Storage::makeDirectory('private_uploads/eula-pdfs', 775);
}
if (Setting::getSettings()->require_accept_signature == '1') {
// Check if the signature directory exists, if not create it
if (!Storage::exists('private_uploads/signatures')) {
Storage::makeDirectory('private_uploads/signatures', 775);
}
// The item was accepted, check for a signature // The item was accepted, check for a signature
if ($request->filled('signature_output')) { if ($request->filled('signature_output')) {
$sig_filename = 'siglog-'.Str::uuid().'-'.date('Y-m-d-his').'.png'; $sig_filename = 'siglog-' . Str::uuid() . '-' . date('Y-m-d-his') . '.png';
$data_uri = $request->input('signature_output'); $data_uri = $request->input('signature_output');
$encoded_image = explode(',', $data_uri); $encoded_image = explode(',', $data_uri);
$decoded_image = base64_decode($encoded_image[1]); $decoded_image = base64_decode($encoded_image[1]);
Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image); Storage::put('private_uploads/signatures/' . $sig_filename, (string)$decoded_image);
// No image data is present, kick them back. // No image data is present, kick them back.
// This mostly only applies to users on super-duper crapola browsers *cough* IE *cough* // This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*
} else { } else {
return redirect()->back()->with('error', trans('general.shitty_browser')); return redirect()->back()->with('error', trans('general.shitty_browser'));
}
} }