Commit Graph

63 Commits

Author SHA1 Message Date
Steve Boyd
3c7fb05cb4 Merge branch '5' into 6.0 2023-06-07 16:03:46 +12:00
Steve Boyd
a06b3ca9cb Merge branch '5.13' into 5.14 2023-06-07 15:37:24 +12:00
Michal Kleiner
0dfd2990dd
Use window.ss.config provided adminUrl (#1211)
Co-authored-by: Michal Kleiner <michal.kleiner@cub3.com>
2023-06-07 15:27:20 +12:00
Sabina Talipova
7af0009321
FIX Passing array to setReplyTo method instead of string (#1208) 2023-05-17 15:54:29 +12:00
Steve Boyd
b6fbd374ea MNT Remove legacy upgrader config 2023-01-20 16:21:49 +13:00
Sabina Talipova
2b9d9833b3 DEP PHP Support in CMS5 2023-01-09 15:24:33 +13:00
Dylan Wagstaff
0ff72734dd NEW Maximum email attachment size can be configured
Previously hard coded size of 1MB meant any file larger was excluded
from recipient emails - often confusing for CMS admins configuring an
advanced use case for a userform, expecting to recieve files to begin a
business process external to the website.

The configuration has been made to support PHP 'shorthand byte values'
https://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes
in the configuration option. This give flexibility around oddly
specific limits, but can also be used to set as 0, disabling attachments

Tests are updated to set up a known state before testing, as to be able
to accurately assert the results. One should test the class they intend,
not an Injector service of some unknown element.
2022-10-24 20:12:58 +13:00
Sabina Talipova
92aded3016 Protect uploads if folder for EditableFileField was removed 2022-05-25 14:07:35 +12:00
Steve Boyd
792d61fded ENH PHP 8.1 compatibility 2022-04-13 13:52:56 +12:00
Rens
6f34d27c48 Fix hardcoded admin urls 2022-03-24 08:29:29 +01:00
Florian Thoma
33e9a25688 ENH Add config to hide invisible fields from email output 2022-03-15 11:46:18 +11:00
Marco Hermo
c762835d4f
API Additional data passed to updateAfterProcess hook (#1130)
Passing $emailData and $attachments array to the existing hook, updateAfterProcess
In this case it will give more flexibility for the extension to do
additional cleanup process after the emails has been sent.
2022-01-14 11:08:22 +13:00
Michal Kleiner
2691ac354e
ENH Provide submitted form info to submission email data (#1113) 2021-10-19 12:58:23 +13:00
Will Rossiter
18eccb65d4
FIX Log any email exceptions gracefully
If an email send() generates any errors such as invalid template or API exceptions then capture the error in the logs rather than displaying the error to the user.
2021-06-22 21:54:06 +12:00
Dan Hensby
ce18179d49
Merge pull request #1049 from hamaka/fix/attachments_respecting_hideformdata 2021-05-14 21:32:09 +01:00
Daniel Hensby
bc5689b55a
Merge pull request #1056 from purplespider/patch-1
Stops reply-to address being set to empty, if reply-to field value is empty
2021-05-14 21:21:52 +01:00
Steve Boyd
52e678c6e7 FIX Include merge fields in plain text emails 2021-04-13 19:05:29 +12:00
James Cocker
b01d296c42
Avoids reply to address being set to empty, if reply to field value is empty 2021-04-12 21:27:25 +01:00
Bauke Zwaan
fad372d4ba Only add attachments when HideFormData-setting is not set for this recipient 2021-03-12 09:30:11 +01:00
Steve Boyd
79259b593a FIX Visibility of subsequent form fields and step buttons 2021-03-10 16:06:01 +13:00
Steve Boyd
9eaee41282 ENH Use yarn and webpack to upgrade jquery 2021-03-04 17:05:55 +13:00
Dylan Wagstaff
e7f51d227a
ENH Move jQuery include away from CDN (#1019)
- Move jQuery include away from CDN
2021-01-17 14:37:01 +13:00
Steve Boyd
42df67fe76 Merge branch '5.6' into 5.7 2020-09-22 10:29:09 +12:00
Steve Boyd
f09691f9cb FIX Vertically align confirm folder icon 2020-09-15 15:24:16 +12:00
Steve Boyd
dd9618e768 Merge branch '5.6' into 5 2020-09-03 09:35:15 +12:00
Steve Boyd
8d09cb171f FIX Use translation string that belongs to UserDefinedFormAdmin
This is to for the benefit of cow translate which did not like the use of _t(CMSMain::class
2020-08-18 12:20:10 +12:00
3Dgoo
6ca8ce2596
FIX Fixing plain email blank file field value (#940)
* Fixing plain email blank file field value
2020-07-01 09:00:31 +12:00
Maxime Rainville
25978d3c58 Clean up tests 2020-06-12 00:55:12 +12:00
Maxime Rainville
df120133ab Move confirm folder logic to a dedicated controller 2020-06-11 19:53:46 +12:00
Maxime Rainville
dc5ce0000a BUG Fix confirm upload form modal on Elemental block 2020-06-11 15:17:13 +12:00
Andre Kiste
3b40be3b8f
NEW Add folder confirmation modal when adding a new EditableFileField to a userform. (#972) 2020-06-10 16:59:01 +12:00
Steve Boyd
ed53709631 NEW DB column showing if file is userform upload
- UserFormUpload used by File::isTrackedFormUpload()
2020-05-28 13:14:34 +12:00
Steve Boyd
c3d990f70f
FIX Create image thumbnails for asset-admin for images uploaded through userforms (#969) 2020-05-27 12:26:14 +12:00
Garion Herman
4e0f0e903d Update jQuery to 3.4.1 2020-01-24 10:06:59 +13:00
Charlie Bergthaler
dfeb922818
FIX Add missing import statement for SilverStripe\ORM\ValidationResult in UserDefinedFormController and EditableFileField. 2019-10-07 21:56:22 +13:00
Garion Herman
2f0aea847a Add presence validation for EmailRecipient recipient, add error handling 2019-05-03 16:46:32 +12:00
Robbie Averill
a4cd982637 Merge branch '5.3' 2019-03-26 14:46:22 +13:00
Robbie Averill
b1a04d6563
Merge pull request #871 from quantum-dragons/pulls/fix-form-vallidation-exception-message
Fix exception error message fails when error in upload file.
2019-03-26 14:44:57 +13:00
Ishan Jayamanne
3615f416e3 Fix exception error message fails when error in upload file. 2019-03-26 01:28:36 +00:00
Robbie Averill
bf142eb6ef FIX Display rules for page breaks/editable form steps now works again
This was previously broken in a regression from https://github.com/silverstripe/silverstripe-userforms/pull/575
where the fields themselves could still be toggled, but the jQuery event dispatches for the form steps
were removed. This pull request re-introduces those jQuery event triggers when hiding and showing
editable form fields via display rules.
2019-03-25 15:09:38 +13:00
3Dgoo
a8e21b193f
Allow form fields in email subjects
Allows form fields in email subjects using merge field the same as body insertion functionality.
2019-01-28 09:06:12 +10:30
Alexandre Saelens
6acee54596 Avoid calling getter twice 2019-01-17 12:47:09 +13:00
Alexandre Saelens
2e60a79e40 Check recipient alternate from/to fields exists 2019-01-17 12:40:50 +13:00
Luke Amos
1efeeca6db FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail'
following peer feedback.  Updated respective code and unit test
2019-01-17 10:30:05 +13:00
Luke Amos
490d05a3e8 FIX: Fixes #814 Changed code referencing email template. 2019-01-16 11:02:04 +13:00
Stephen McMahon
01520c22bd Fix(shortcode) re-order if block check $UserDefinedForm in $this->Content. Rename config value to be clearer 2018-07-09 15:20:30 +10:00
Stephen McMahon
a3a2c3d286 Fix(UserDefinedFormController) change return type of index() when not using shortcode 2018-07-06 09:27:28 +10:00
Stephen McMahon
94192f4b66 Add(config) create disable_form_content_interpolation option for ignoring $UserDefinedForm in $this->Content 2018-07-05 16:10:43 +10:00
Andrew Aitken-Fincham
0f6efea12a add proper fallbacks to cover tests 2018-02-14 11:30:35 +00:00
Andrew Aitken-Fincham
8c34519644 adds logic for presence of email recipient fields 2018-02-13 16:24:53 +00:00