lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

If the move of the uploaded import file fails, return a message. Fixes an issue reported on gitter today where bad permissions on the upload directory didn't provide any feedback.

Browse source
This commit is contained in:
Daniel Meltzer 2016-06-27 23:37:15 -04:00
parent e9bb0e948b
commit ee1f983114
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/AssetsController.php
View file

@ -836,7 +836,12 @@ class AssetsController extends Controller
$date = date('Y-m-d-his'); $date = date('Y-m-d-his');
$fixed_filename = str_replace(' ', '-', $file->getClientOriginalName()); $fixed_filename = str_replace(' ', '-', $file->getClientOriginalName());
try {
$file->move($path, $date.'-'.$fixed_filename); $file->move($path, $date.'-'.$fixed_filename);
} catch (\Symfony\Component\HttpFoundation\File\Exception\FileException $exception) {
$results['error']=trans('admin/hardware/message.upload.error');
return $results;
}
$name = date('Y-m-d-his').'-'.$fixed_filename; $name = date('Y-m-d-his').'-'.$fixed_filename;
$filesize = Setting::fileSizeConvert(filesize($path.'/'.$name)); $filesize = Setting::fileSizeConvert(filesize($path.'/'.$name));
$results[] = compact('name', 'filesize'); $results[] = compact('name', 'filesize');
@ -850,7 +855,6 @@ class AssetsController extends Controller
} else { } else {
$results['error']=trans('general.feature_disabled'); $results['error']=trans('general.feature_disabled');
return $results; return $results;
} }