Repair beforeSubmit for Upload form & make file also required

The previous pull request prevents user from uploading files.
Also originalFile is now required.