tonyair
/
silverstripe-userforms
mirror of https://github.com/silverstripe/silverstripe-userforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX: The EditableFileField crashed when user uploads a not allowed filetype

This commit is contained in:
Stig Lindqvist 2012-05-11 11:39:24 +12:00
parent 89c7cf8a15
commit 20e3f3c8cd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/model/UserDefinedForm.php
View File

@ -660,7 +660,7 @@ JS
}
if(Session::get("FormInfo.{$form->FormName()}.errors")){
Director::redirectBack();
Controller::curr()->redirectBack();
return;
}
@ -701,8 +701,14 @@ JS
$upload = new Upload();
$file = new File();
$file->ShowInSearch = 0;
$upload->loadIntoFile($_FILES[$field->Name], $file);
try {
$upload->loadIntoFile($_FILES[$field->Name], $file);
} catch( ValidationException $e ) {
$validationResult = $e->getResult();
$form->addErrorMessage($field->Name, $validationResult->message(), 'bad');
Controller::curr()->redirectBack();
return;
}
// write file to form field
$submittedField->UploadedFileID = $file->ID;
@ -734,7 +740,7 @@ JS
if($attachments){
foreach($attachments as $file){
if($file->ID != 0) {
$email->attachFile($file->Filename,$file->Filename, HTTP::getMimeType($file->Filename));
$email->attachFile($file->Filename, $file->Filename, HTTP::get_mime_type($file->Filename));
}
}
}