Provide ability to select mutliply files during upload for browsers that support it.

1 files changed, 14 insertions, 8 deletions

diff --git a/files/ajax/upload.php b/files/ajax/upload.php
index effee0c03c1..f47f9b3d282 100644
--- a/files/ajax/upload.php
+++ b/files/ajax/upload.php
@@ -14,20 +14,26 @@ if( !OC_USER::isLoggedIn()){
 	exit();
 }
 
-$fileName=$_FILES['file']['name'];
-$source=$_FILES['file']['tmp_name'];
+$files=$_FILES['files'];
+
 $dir = $_POST['dir'];
 if(!empty($dir)) $dir .= '/';
-$target='/' . stripslashes($dir) . $fileName;
+$error='';
+$result=array();
 if(strpos($dir,'..') === false){
-	if(OC_FILESYSTEM::fromUploadedFile($source,$target)){
-		echo json_encode(array( "status" => "success", 'mime'=>OC_FILESYSTEM::getMimeType($target),'size'=>OC_FILESYSTEM::filesize($target)));
-		exit();
+	$fileCount=count($files['name']);
+	for($i=0;$i<$fileCount;$i++){
+		$target='/' . stripslashes($dir) . $files['name'][$i];
+		if(OC_FILESYSTEM::fromUploadedFile($files['tmp_name'][$i],$target)){
+			$result[]=array( "status" => "success", 'mime'=>OC_FILESYSTEM::getMimeType($target),'size'=>OC_FILESYSTEM::filesize($target),'name'=>$files['name'][$i]);
+		}
 	}
+	echo json_encode($result);
+	exit();
+}else{
+	$error='invalid dir';
 }
 
-$error = $_FILES['file']['error'];
-
 echo json_encode(array( 'status' => 'error', 'data' => array('error' => $error, "file" => $fileName)));
 
 ?>