From b910db0617b4ce62a66bef700c1a3cde7983e483 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 30 Jun 2022 21:01:58 -0700 Subject: [PATCH 1/2] Fixed #11393 - reject acceptance if no file is present Signed-off-by: snipe --- app/Http/Controllers/Account/AcceptanceController.php | 6 ++++++ resources/lang/en/general.php | 1 + resources/views/account/accept/create.blade.php | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index e81a0329d..4868602f0 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -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 supoer-deuper crapola browsers *cough* IE *cough* + } else { + return redirect()->back()->with('error', trans('general.shitty_browser')); + } diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index c4d279803..98610ac23 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -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.', ]; \ No newline at end of file diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php index 5c2843b45..e5725e489 100644 --- a/resources/views/account/accept/create.blade.php +++ b/resources/views/account/accept/create.blade.php @@ -40,7 +40,7 @@
-
+
@if ($acceptance->checkoutable->getEula()) From 4e547a36390559532111a926784d1e0e171f90ec Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 30 Jun 2022 21:06:36 -0700 Subject: [PATCH 2/2] Fixed typos :( Signed-off-by: snipe --- app/Http/Controllers/Account/AcceptanceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 4868602f0..bbb4590e9 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -135,7 +135,7 @@ class AcceptanceController extends Controller 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 supoer-deuper crapola browsers *cough* IE *cough* + // This mostly only applies to users on super-duper crapola browsers *cough* IE *cough* } else { return redirect()->back()->with('error', trans('general.shitty_browser'));