diff options
| author | Mario <mario@mariovavti.com> | 2019-11-10 12:49:51 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-11-10 14:10:03 +0100 |
| commit | 580c3f4ffe9608d2beb56d418c68b3b112420e76 (patch) | |
| tree | 82335d01179ac361d3f547a4b8e8c598d302e9f3 /vendor/blueimp/jquery-file-upload/server/php | |
| parent | d22766f458a8539a40a57f3946459a9be1f21cd6 (diff) | |
| download | volse-hubzilla-580c3f4ffe9608d2beb56d418c68b3b112420e76.tar.gz volse-hubzilla-580c3f4ffe9608d2beb56d418c68b3b112420e76.tar.bz2 volse-hubzilla-580c3f4ffe9608d2beb56d418c68b3b112420e76.zip | |
another bulk of composer updates
(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
Diffstat (limited to 'vendor/blueimp/jquery-file-upload/server/php')
| -rw-r--r-- | vendor/blueimp/jquery-file-upload/server/php/UploadHandler.php | 8 | ||||
| -rw-r--r-- | vendor/blueimp/jquery-file-upload/server/php/docker-compose.yml | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/vendor/blueimp/jquery-file-upload/server/php/UploadHandler.php b/vendor/blueimp/jquery-file-upload/server/php/UploadHandler.php index 1d79c893c..bc6f3a249 100644 --- a/vendor/blueimp/jquery-file-upload/server/php/UploadHandler.php +++ b/vendor/blueimp/jquery-file-upload/server/php/UploadHandler.php @@ -16,7 +16,7 @@ class UploadHandler protected $options; // PHP File Upload error message codes: - // http://php.net/manual/en/features.file-upload.errors.php + // https://php.net/manual/en/features.file-upload.errors.php protected $error_messages = array( 1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini', 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', @@ -324,7 +324,7 @@ class UploadHandler protected function is_valid_file_object($file_name) { $file_path = $this->get_upload_path($file_name); - if (is_file($file_path) && $file_name[0] !== '.') { + if (strlen($file_name) > 0 && $file_name[0] !== '.' && is_file($file_path)) { return true; } return false; @@ -1118,7 +1118,7 @@ class UploadHandler } if (count($failed_versions)) { $file->error = $this->get_error_message('image_resize') - .' ('.implode($failed_versions, ', ').')'; + .' ('.implode(', ', $failed_versions).')'; } // Free memory: $this->destroy_image_object($file_path); @@ -1440,7 +1440,7 @@ class UploadHandler $response = array(); foreach ($file_names as $file_name) { $file_path = $this->get_upload_path($file_name); - $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path); + $success = strlen($file_name) > 0 && $file_name[0] !== '.' && is_file($file_path) && unlink($file_path); if ($success) { foreach ($this->options['image_versions'] as $version => $options) { if (!empty($version)) { diff --git a/vendor/blueimp/jquery-file-upload/server/php/docker-compose.yml b/vendor/blueimp/jquery-file-upload/server/php/docker-compose.yml deleted file mode 100644 index 74eabf7dc..000000000 --- a/vendor/blueimp/jquery-file-upload/server/php/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '2.3' -services: - apache: - build: ./ - network_mode: bridge - ports: - - "80:80" - volumes: - - "../../:/var/www/html" |