wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7126 from nickvergessen/issue/6683

Browse source 
Only add files to file list when uploading to current directory
This commit is contained in:
Vincent Petry 2014-02-10 12:14:05 +01:00
commit 6b5a7035ee
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files/ajax/upload.php
View file

@ -139,7 +139,8 @@ if (strpos($dir, '..') === false) {
'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
'permissions' => $meta['permissions'] & $allowedPermissions
'permissions' => $meta['permissions'] & $allowedPermissions,
'directory' => \OC\Files\Filesystem::normalizePath(stripslashes($dir)),
);
}
@ -166,7 +167,8 @@ if (strpos($dir, '..') === false) {
'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
'permissions' => $meta['permissions'] & $allowedPermissions
'permissions' => $meta['permissions'] & $allowedPermissions,
'directory' => \OC\Files\Filesystem::normalizePath(stripslashes($dir)),
);
}
}

4
apps/files/js/filelist.js
View file

@ -922,8 +922,8 @@ $(document).ready(function() {
data.context.find('td.filesize').text(humanFileSize(size));
} else {
// only append new file if dragged onto current dir's crumb (last)
if (data.context && data.context.hasClass('crumb') && !data.context.hasClass('last')) {
// only append new file if uploaded into the current folder
if (file.directory !== FileList.getCurrentDirectory()) {
return;
}