Commit Graph

767 Commits

Author SHA1 Message Date
Steve Boyd
ead1827aa1 Merge branch '5.6' into 5.7 2020-11-12 15:17:31 +13:00
Dylan Wagstaff
0ce94b75f5 FIX correctly calculate MaxFileSizeMB
The inputted value is intended to represent megabytes, but is only
multiplied by 1024 - meaning it'd represent kilobytes. This is then used
to compare with the PHP setting number, which is bytes in the range of
megabytes. Kilobytes are always under megabytes, meaning size
comparisons elsewhere in the code are always true.
We should ensure the calculation for validation is correct.
2020-11-01 11:31:23 +13:00
Maxime Rainville
d2bf27c847
MNT Fix broken merged up (#1013) 2020-10-22 15:47:17 +13:00
Maxime Rainville
4eb0fe25b9 Merge branch '5.5' into 5.6 2020-10-22 10:22:19 +13:00
Steve Boyd
42df67fe76 Merge branch '5.6' into 5.7 2020-09-22 10:29:09 +12:00
Maxime Rainville
24e770e00d BUG Remove old boostrap 3 CSS class 2020-09-16 11:38:33 +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
Steve Boyd
81fcd669a2 FIX Show custom validation message for checkbox and radio groups 2020-07-21 17:30:55 +12:00
Steve Boyd
46c6d93d9c Merge branch '5.6' into 5 2020-07-17 23:24:37 +12:00
Steve Boyd
59cd87d842 FIX Trim recipient email addresses before write 2020-07-14 16:41:36 +12:00
Maxime Rainville
27228d12af [CVE-2020-9309] Require MimeUploadValidator on userformis' File Upload field 2020-07-13 11:33:46 +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
Garion Herman
14ce51e517
NEW Improve Unrestricted Folder warning, bump core requirement to ^4.6 (#965) 2020-06-09 21:01:09 +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
e54a825ea3 Merge branch '5.5' into 5 2020-05-27 13:41:51 +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
Maxime Rainville
09ea65edc7 Merge branch '5.5' into 5 2020-05-26 15:13:09 +12:00
Maxime Rainville
319fa4734c Merge branch '5.4' into 5.5 2020-05-26 15:11:46 +12:00
Maxime Rainville
133e897ad3 Merge branch '5.4' into 5 2020-05-26 15:06:14 +12:00
Dan Hensby
ede2d93363
Linting fixes 2020-05-05 16:30:57 +01:00
Serge Latyntcev
23de5a85c2 [CVE-2020-9280] Task for shifting UserForm uploads into correct folders
A task helper for recovering UserForm uploads targeting incorrectly migrated folders (from Silverstripe CMS 3)
    If your project has not been migrated from Silverstripe CMS 3, you do not need this helper.
    Before running this task make sure you have repaired the migrated folders themselves.
    To do that you have to run the extra migration subtask (`migrate-folders`).

    This task is particularly looking at all UserForm file submissions and checks they are in the same
    folder where the particular version of its EditableFileField has been set up to upload it to.

    If it finds the file has been misplaced, it tries to move it to the correct folder, but only if
    the file has not had any manipulations since the uploading happened (the file Version=1).

    If an affected file has a draft, then only Live version will be moved, but the draft will be preserved as is.

    For more details see CVE-2020-9280
2020-04-15 12:19:23 +12:00
Serge Latyntcev
3bbad20442 [CVE-2020-9280] Task for shifting UserForm uploads into correct folders
A task helper for recovering UserForm uploads targeting incorrectly migrated folders (from Silverstripe CMS 3)
    If your project has not been migrated from Silverstripe CMS 3, you do not need this helper.
    Before running this task make sure you have repaired the migrated folders themselves.
    To do that you have to run the extra migration subtask (`migrate-folders`).

    This task is particularly looking at all UserForm file submissions and checks they are in the same
    folder where the particular version of its EditableFileField has been set up to upload it to.

    If it finds the file has been misplaced, it tries to move it to the correct folder, but only if
    the file has not had any manipulations since the uploading happened (the file Version=1).

    If an affected file has a draft, then only Live version will be moved, but the draft will be preserved as is.

    For more details see CVE-2020-9280
2020-04-14 15:58:23 +12:00
Steve Boyd
52ca4c8de9 Merge branch '5.5' into 5 2020-01-29 12:20:36 +13:00
Garion Herman
4e0f0e903d Update jQuery to 3.4.1 2020-01-24 10:06:59 +13:00
Maxime Rainville
e2c05d5a55 Minor linting adjustment. 2020-01-14 12:28:04 +13:00
Maxime Rainville
d280c54860 Patch and reorganise some test 2020-01-13 12:15:34 +13:00
Maxime Rainville
8d0a5dd093 Add some missing comments 2020-01-13 12:14:11 +13:00
Maxime Rainville
793f437289 API Mark EditableFormField::EffectiveDisplayRules() for deprecation 2020-01-13 12:12:14 +13:00
Maxime Rainville
a0cedaeb38 Move conditionalFieldEnabled to EditableFormField as isDisplayed 2020-01-10 17:36:04 +13:00
Maxime Rainville
b53619477c Revert the return type for UserForm::getRequiredFields 2020-01-10 17:34:43 +13:00
Jess Champion
25bfc9eaf5 Required fields can have display rules. Hidden required fields are dynamically excluded from server and client side validation. 2020-01-10 10:41: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
Marco (Valandur)
0348e5dd15 fix(submitted-form): Pass member to parent calls 2019-09-06 15:37:13 +02:00
Marco (Valandur)
696fa1d05e fix(submitted-form): canCreate not checking parent 2019-09-05 12:12:26 +02:00
Bram de Leeuw
8703ace32a validate that a classname had been set 2019-07-15 11:15:30 +02:00
Bram de Leeuw
e80795b52d
Add a comment for clarity 2019-07-12 10:48:59 +02:00
Remy Vaartjes
d489271197 Disable add action in Submissions detail form 2019-07-08 14:49:00 +02:00
Remy Vaartjes
f682e74f44 Enable 4.4 better button functionality 2019-07-08 14:26:58 +02:00
Guy Marriott
d7c76ecf80
FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context (#887)
FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context
2019-05-27 20:01:56 +12:00
Robbie Averill
483fbc8499 FIX Preview email link now handles cases where it's loaded in the browser, requested via AJAX and used in a trait or a page context 2019-05-17 15:51:11 +12:00
Robbie Averill
d0e937a588 FIX Allowed text length fields now align correctly with each other 2019-05-17 15:12:57 +12:00
Robbie Averill
d141c83e0a Import missing PHPDoc doc blocks, switch intval() for (int) casting 2019-05-17 14:56:00 +12:00
Garion Herman
2f0aea847a Add presence validation for EmailRecipient recipient, add error handling 2019-05-03 16:46:32 +12:00
Robbie Averill
b3dc50d253 Merge branch '5.3' into 5.4 2019-05-03 10:16:58 +12:00