Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
Conflicts: apps/files/js/file-upload.js
This commit is contained in:
commit
3587c88fe9
|
@ -111,23 +111,33 @@ if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
|
|||
}
|
||||
|
||||
$result = array();
|
||||
$directory = '';
|
||||
if (strpos($dir, '..') === false) {
|
||||
$fileCount = count($files['name']);
|
||||
for ($i = 0; $i < $fileCount; $i++) {
|
||||
|
||||
// Get the files directory
|
||||
if(isset($_POST['file_directory']) === true) {
|
||||
$directory = '/'.$_POST['file_directory'];
|
||||
}
|
||||
|
||||
// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
|
||||
if (isset($_POST['resolution']) && $_POST['resolution']==='autorename') {
|
||||
// append a number in brackets like 'filename (2).ext'
|
||||
$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
|
||||
$target = OCP\Files::buildNotExistingFileName(stripslashes($dir.$directory), $files['name'][$i]);
|
||||
} else {
|
||||
$target = \OC\Files\Filesystem::normalizePath(stripslashes($dir).'/'.$files['name'][$i]);
|
||||
$target = \OC\Files\Filesystem::normalizePath(stripslashes($dir.$directory).'/'.$files['name'][$i]);
|
||||
}
|
||||
|
||||
if(empty($directory) === true)
|
||||
{
|
||||
$directory = \OC\Files\Filesystem::normalizePath(stripslashes($dir));
|
||||
if (isset($public_directory)) {
|
||||
// If we are uploading from the public app,
|
||||
// we want to send the relative path in the ajax request.
|
||||
$directory = $public_directory;
|
||||
}
|
||||
}
|
||||
|
||||
if ( ! \OC\Files\Filesystem::file_exists($target)
|
||||
|| (isset($_POST['resolution']) && $_POST['resolution']==='replace')
|
||||
|
|
|
@ -329,7 +329,8 @@ OC.Upload = {
|
|||
// noone set update parameters, we set the minimum
|
||||
data.formData = {
|
||||
requesttoken: oc_requesttoken,
|
||||
dir: $('#dir').val()
|
||||
dir: $('#dir').val(),
|
||||
file_directory: data.files[0]['relativePath']
|
||||
};
|
||||
}
|
||||
},
|
||||
|
@ -683,3 +684,4 @@ $(document).ready(function() {
|
|||
OC.Upload.init();
|
||||
});
|
||||
|
||||
|
||||
|
|
|
@ -1020,7 +1020,8 @@ $(document).ready(function() {
|
|||
data.formData = function(form) {
|
||||
return [
|
||||
{name: 'dir', value: dir},
|
||||
{name: 'requesttoken', value: oc_requesttoken}
|
||||
{name: 'requesttoken', value: oc_requesttoken},
|
||||
{name: 'file_directory', value: data.files[0]['relativePath']}
|
||||
];
|
||||
};
|
||||
} else {
|
||||
|
@ -1102,10 +1103,34 @@ $(document).ready(function() {
|
|||
size += parseInt(file.size);
|
||||
data.context.attr('data-size', size);
|
||||
data.context.find('td.filesize').text(humanFileSize(size));
|
||||
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
// only append new file if uploaded into the current folder
|
||||
if (file.directory !== FileList.getCurrentDirectory()) {
|
||||
if (file.directory != '/' && file.directory !== FileList.getCurrentDirectory()) {
|
||||
|
||||
file_directory = file.directory.replace('/','').replace(/\/$/, "").split('/');
|
||||
|
||||
if (file_directory.length == 1) {
|
||||
file_directory = file_directory[0];
|
||||
|
||||
// Get the directory
|
||||
if ($('tr[data-file="'+file_directory+'"]').length == 0)
|
||||
{
|
||||
FileList.addDir(file_directory, 0, new Date(), false);
|
||||
}
|
||||
}
|
||||
else {
|
||||
file_directory = file_directory[0];
|
||||
}
|
||||
|
||||
file_directory = FileList.findFileEl(file_directory);
|
||||
|
||||
// update folder size
|
||||
var size = parseInt(file_directory.attr('data-size'));
|
||||
size += parseInt(file.size);
|
||||
file_directory.attr('data-size', size);
|
||||
file_directory.find('td.filesize').text(humanFileSize(size));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -629,10 +629,21 @@ class View {
|
|||
}
|
||||
|
||||
public function fromTmpFile($tmpFile, $path) {
|
||||
|
||||
if (Filesystem::isValidPath($path)) {
|
||||
|
||||
// Get directory that the file is going into
|
||||
$file_path = \OC_User::getHome(\OC_User::getUser()) . '/files'.substr($path, 0, strrpos($path,'/'));
|
||||
|
||||
// Create the directories if any
|
||||
if(empty($file_path) === false) {
|
||||
mkdir($file_path, 0770, true);
|
||||
}
|
||||
|
||||
if (!$tmpFile) {
|
||||
debug_print_backtrace();
|
||||
}
|
||||
|
||||
$source = fopen($tmpFile, 'r');
|
||||
if ($source) {
|
||||
$this->file_put_contents($path, $source);
|
||||
|
|
Loading…
Reference in New Issue