A free open source IT asset/license management system
Nicer max limit messaging
snipeac72b9007ad0
diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.phpindex 743302371f..9cad08f0f1 100644--- a/app/Http/Requests/ImageUploadRequest.php+++ b/app/Http/Requests/ImageUploadRequest.php@@ -58,9 +58,28 @@ class ImageUploadRequest extends Request$max_kib = (int) ceil(Helper::file_upload_max_size() / 1024);return [- 'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif|max:' . $max_kib . '|dimensions:max_width=4096,max_height=4096',- 'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif|max:' . $max_kib . '|dimensions:max_width=4096,max_height=4096',- 'favicon' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,image/x-icon,image/vnd.microsoft.icon,ico|max:' . $max_kib . '|dimensions:max_width=1024,max_height=1024',+ 'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif|max:'.$max_kib.'|dimensions:max_width=4096,max_height=4096',+ 'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif|max:'.$max_kib.'|dimensions:max_width=4096,max_height=4096',+ 'favicon' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,image/x-icon,image/vnd.microsoft.icon,ico|max:'.$max_kib.'|dimensions:max_width=1024,max_height=1024',+ ];+ }++ /**+ * Per-field overrides for the `max:` rule's validation message. The+ * default Laravel message interpolates the rule argument raw, which+ * reads as "greater than 2048 kilobytes" with our byte-to-KiB+ * conversion. Swap in `file_upload_max_size_readable()` output+ * ("2M", "20M", "2G") so the user-facing message matches the+ * configured PHP limit without exposing the raw KiB value.+ */+ public function messages(): array+ {+ $max = Helper::file_upload_max_size_readable();++ return [+ 'image.max' => trans('validation.image_file_too_large', ['max' => $max]),+ 'avatar.max' => trans('validation.image_file_too_large', ['max' => $max]),+ 'favicon.max' => trans('validation.image_file_too_large', ['max' => $max]),];}diff --git a/resources/lang/en-US/validation.php b/resources/lang/en-US/validation.phpindex 5d8e339835..d2c360caf8 100644--- a/resources/lang/en-US/validation.php+++ b/resources/lang/en-US/validation.php@@ -203,6 +203,7 @@ return ['email_array' => 'One or more email addresses is invalid.','checkboxes' => ':attribute contains invalid options.','radio_buttons' => ':attribute is invalid.',+ 'image_file_too_large' => 'The :attribute may not be larger than :max.','custom' => ['alpha_space' => 'The :attribute field contains a character that is not allowed.',