kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7429 from firefly-iii/error-rate-bills

Browse Source 
Add rule for notes and better escaping in errors.
This commit is contained in:
James Cole
2023-04-26 05:30:06 +02:00
committed by GitHub
parent c2f5fbe7d3 d8eb084240
commit 98b5ed9e5b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Requests/BillUpdateRequest.php
View File

@@ -81,6 +81,7 @@ class BillUpdateRequest extends FormRequest
'repeat_freq' => sprintf('required|in:%s', join(',', config('firefly.bill_periods'))), 'repeat_freq' => sprintf('required|in:%s', join(',', config('firefly.bill_periods'))),
'skip' => 'required|integer|gte:0|lte:31', 'skip' => 'required|integer|gte:0|lte:31',
'active' => 'boolean', 'active' => 'boolean',
'notes' => 'between:1,65536|nullable',
]; ];
} }
} }

2
resources/views/emails/error-html.twig
View File

@@ -1,6 +1,6 @@
{% include 'emails.header-html' %} {% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }} {{ trans('email.error_intro', { version: version, errorMessage: errorMessage|escape })|raw }}
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">