mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Simplified extension event logic

Browse Source
This commit is contained in:
Jack Wilkinson 2022-08-19 19:23:08 +01:00
parent 2508376f09
commit 7aa1b7a859
1 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
modules/backend/formwidgets/FileUpload.php
View File

@ -408,9 +408,6 @@ class FileUpload extends FormWidgetBase
{
$this->addCss('css/fileupload.css', 'core');
$this->addJs('js/fileupload.js', 'core');
// Allow for custom assets to be injected
Event::fire('fileUpload.loadAssets', [$this]);
}
/**
@ -427,24 +424,36 @@ class FileUpload extends FormWidgetBase
public function onUpload()
{
try {
if (!Input::hasFile('file_data') && !Event::fire('fileUploadWidget.validateInput', [Input::all()], true)) {
throw new ApplicationException('File missing from request');
}
$fileModel = $this->getRelationModel();
$validationRules = ['max:'.$fileModel::getMaxFilesize()];
if (!($data = Event::fire('fileUploadWidget.onUpload', [$this], true))) {
if (!Input::hasFile('file_data')) {
throw new ApplicationException('File missing from request');
}
if (!($validation = Event::fire('fileUploadWidget.makeValidate', [$this, $validationRules], true))) {
$validation = $this->makeValidatorForUploadedFile($validationRules);
}
if ($validation->fails()) {
throw new ValidationException($validation);
}
if (!($data = Event::fire('fileUploadWidget.getFileData', [], true))) {
$validationRules = ['max:'.$fileModel::getMaxFilesize()];
$data = Input::file('file_data');
if (!$data->isValid()) {
throw new ApplicationException('File is not valid');
}
if ($fileTypes = $this->getAcceptedFileTypes()) {
$validationRules[] = 'extensions:'.$fileTypes;
}
if ($this->mimeTypes) {
$validationRules[] = 'mimes:'.$this->mimeTypes;
}
$validation = Validator::make(
['file_data' => $data],
['file_data' => $validationRules]
);
if ($validation->fails()) {
throw new ValidationException($validation);
}
}
$fileRelation = $this->getRelationObject();
@ -484,28 +493,6 @@ class FileUpload extends FormWidgetBase
return $response;
}
protected function makeValidatorForUploadedFile($validationRules)
{
$uploadedFile = Input::file('file_data');
if (!$uploadedFile->isValid()) {
throw new ApplicationException('File is not valid');
}
if ($fileTypes = $this->getAcceptedFileTypes()) {
$validationRules[] = 'extensions:'.$fileTypes;
}
if ($this->mimeTypes) {
$validationRules[] = 'mimes:'.$this->mimeTypes;
}
return Validator::make(
['file_data' => $uploadedFile],
['file_data' => $validationRules]
);
}
/**
* Adds the bespoke attributes used internally by this widget.
* - thumbUrl