diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
| commit | 00bb246a0d90ddbcc1016fdedb5cf629bfbca70a (patch) | |
| tree | f5d69cf10ef3fd157a21990a38515c03b74035a1 /apps/files/ajax/upload.php | |
| parent | df8c67721df1358eab7aa5794ef223a5bc8f0b59 (diff) | |
| parent | 8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (diff) | |
| download | nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.tar.gz nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.zip | |
merge from master
Diffstat (limited to 'apps/files/ajax/upload.php')
| -rw-r--r-- | apps/files/ajax/upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index dc830570403..4ed0bbc5b0f 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -38,7 +38,7 @@ $totalSize=0; foreach($files['size'] as $size) { $totalSize+=$size; } -if($totalSize>OC_Filesystem::free_space($dir)){ +if($totalSize>OC_Filesystem::free_space($dir)) { OCP\JSON::error(array("data" => array( "message" => "Not enough space available" ))); exit(); } @@ -51,7 +51,7 @@ if(strpos($dir, '..') === false) { if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) { $meta = OC_FileCache::get($target); $id = OC_FileCache::getId($target); - $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target)); + $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'], 'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target)); } } OCP\JSON::encodedPrint($result); |