github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-14 18:49:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FM updates

Browse source
This commit is contained in:
Serghey Rodin 2015-09-18 17:45:03 +03:00
commit 6e193e0852
5 changed files with 135 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

13
web/upload/UploadHandler.php
View file

@ -210,7 +210,7 @@ class UploadHandler
protected function get_upload_path($file_name = null, $version = null) {
$relocate_directory = $_GET['dir'];
if (empty($relocate_directory)) {
$relocate_directory = '/home/admin/';
$relocate_directory = '/home/admin/'; // fallback dir
}
if ($relocate_directory[strlen($relocate_directory) -1] != '/') {
$relocate_directory .= '/';
@ -1041,7 +1041,7 @@ class UploadHandler
}
protected function handle_file_upload($uploaded_file, $name, $size, $type, $error,
$index = null, $content_range = null) {
$index = null, $content_range = null) {
$file = new \stdClass();
$file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error,
$index, $content_range);
@ -1076,12 +1076,13 @@ class UploadHandler
);
}
$file_size = $this->get_file_size($file_path, $append_file);
//var_dump($file_size);die();
if ($file_size === $file->size) {
$file->url = $this->get_download_url($file->name);
if ($this->is_valid_image_file($file_path)) {
$this->handle_image_file($file_path, $file);
}
// uncomment if images also need to be resized
//if ($this->is_valid_image_file($file_path)) {
// $this->handle_image_file($file_path, $file);
//}
} else {
$file->size = $file_size;
if (!$content_range && $this->options['discard_aborted_uploads']) {