tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Better checking of file validity (#6093) Thanks Pigeon (from r113419)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114533 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-12-05 08:34:42 +00:00
parent 100e50c700
commit c24ed58d2d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
forms/RequiredFields.php
View File

@ -10,7 +10,7 @@
* @subpackage validators * @subpackage validators
*/ */
class RequiredFields extends Validator { class RequiredFields extends Validator {
protected $required; protected $required;
protected $useLabels = true; protected $useLabels = true;
@ -98,14 +98,19 @@ JS;
$valid = ($field->validate($this) && $valid); $valid = ($field->validate($this) && $valid);
} }
if($this->required) { if($this->required) {
foreach($this->required as $fieldName) { foreach($this->required as $fieldName) {
$formField = $fields->dataFieldByName($fieldName); $formField = $fields->dataFieldByName($fieldName);
$error = true; $error = true;
// submitted data for file upload fields come back as an array // submitted data for file upload fields come back as an array
$value = isset($data[$fieldName]) ? $data[$fieldName] : null; $value = isset($data[$fieldName]) ? $data[$fieldName] : null;
if(is_array($value)) { if(is_array($value)) {
$error = ($value) ? false : true; if ($formField instanceof FileField && isset($value['error']) && $value['error']) {
$error = true;
}
else {
$error = (count($value)) ? false : true;
}
} else { } else {
// assume a string or integer // assume a string or integer
$error = (strlen($value)) ? false : true; $error = (strlen($value)) ? false : true;
@ -168,4 +173,4 @@ JS;
} }
} }
?> ?>