diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-08-16 11:40:55 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-08-16 11:40:55 +0200 |
| commit | f94e6036980644bdd6312e75a8973f2633cf5ff2 (patch) | |
| tree | 33118fc20d11c98ec4df7ca3458da82657b00549 /apps/files/ajax | |
| parent | 4588efc44b1a8b45699b0137a798f9b84f8d35b1 (diff) | |
| download | nextcloud-server-f94e6036980644bdd6312e75a8973f2633cf5ff2.tar.gz nextcloud-server-f94e6036980644bdd6312e75a8973f2633cf5ff2.zip | |
progress fixes
Diffstat (limited to 'apps/files/ajax')
| -rw-r--r-- | apps/files/ajax/upload.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 8d183bd1f9c..619b5f6a04b 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -99,8 +99,8 @@ if (strpos($dir, '..') === false) { $fileCount = count($files['name']); for ($i = 0; $i < $fileCount; $i++) { // $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder - if (isset($_POST['new_name'])) { - $newName = $_POST['new_name']; + if (isset($_POST['newname'])) { + $newName = $_POST['newname']; } else { $newName = $files['name'][$i]; } @@ -109,11 +109,12 @@ if (strpos($dir, '..') === false) { } else { $replace = false; } - $target = \OC\Files\Filesystem::normalizePath(stripslashes($dir).$newName); + $target = \OC\Files\Filesystem::normalizePath(stripslashes($dir).'/'.$newName); if ( ! $replace && \OC\Files\Filesystem::file_exists($target)) { $meta = \OC\Files\Filesystem::getFileInfo($target); $result[] = array('status' => 'existserror', - 'mime' => $meta['mimetype'], + 'type' => $meta['mimetype'], + 'mtime' => $meta['mtime'], 'size' => $meta['size'], 'id' => $meta['fileid'], 'name' => basename($target), |