nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-28 11:00:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into oasis

Browse Source 
# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json
This commit is contained in:
Peter Papp
2021-06-29 18:38:53 +02:00
parent 1a63f3aa07 5215d7d38d
commit c52c576f7c
28 changed files with 1407 additions and 1821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/helpers.js
Vendored
+6 -5
View File
@@ -215,13 +215,13 @@ const Helpers = {
isNotGeneralError = true,
striped_name = item.file.name
.replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
striped_spaces = item.file.name.replace(/\s/g, '-'),
striped_to_safe_characters = striped_spaces.match(/^[A-Za-z0-9._~()'!*:@,;+?-\W]*$/g),
filename = Array(16)
source_name = Array(16)
.fill(0)
.map(x => Math.random().toString(36).charAt(2))
.join('') + '-' + striped_name + '.part'
.join('') + '-' + striped_to_safe_characters + '.part'
do {
let isLast = chunks.length === 1,
@@ -229,7 +229,8 @@ const Helpers = {
attempts = 0
// Set form data
formData.set('file', chunk, filename);
formData.set('filename', item.file.name);
formData.set('file', chunk, source_name);
formData.set('folder_id', item.folder_id)
formData.set('is_last', isLast);