diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-09-26 13:24:41 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-09-26 13:25:11 +0200 |
| commit | cfbca40fbee14812a69ceb5fda4db7c23645fa9c (patch) | |
| tree | 5679da072aef3cfaa52d3f7783c1dc7adc939471 /apps/files/ajax | |
| parent | 2c00f8c850e3b481d270f23e99d572271f2e6f73 (diff) | |
| download | nextcloud-server-cfbca40fbee14812a69ceb5fda4db7c23645fa9c.tar.gz nextcloud-server-cfbca40fbee14812a69ceb5fda4db7c23645fa9c.zip | |
fix sharing for newly uploaded or created files
Diffstat (limited to 'apps/files/ajax')
| -rw-r--r-- | apps/files/ajax/newfile.php | 14 | ||||
| -rw-r--r-- | apps/files/ajax/upload.php | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 495c8212163..c2d65d718c5 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -66,8 +66,10 @@ if($source) { $target=$dir.'/'.$filename; $result=OC_Filesystem::file_put_contents($target, $sourceStream); if($result) { - $mime=OC_Filesystem::getMimetype($target); - $eventSource->send('success', array('mime'=>$mime, 'size'=>OC_Filesystem::filesize($target))); + $meta = OC_FileCache::get($target); + $mime=$meta['mimetype']; + $id = OC_FileCache::getId($target); + $eventSource->send('success', array('mime'=>$mime, 'size'=>OC_Filesystem::filesize($target), 'id' => $id)); } else { $eventSource->send('error', "Error while downloading ".$source. ' to '.$target); } @@ -76,11 +78,15 @@ if($source) { } else { if($content) { if(OC_Filesystem::file_put_contents($dir.'/'.$filename, $content)) { - OCP\JSON::success(array("data" => array('content'=>$content))); + $meta = OC_FileCache::get($dir.'/'.$filename); + $id = OC_FileCache::getId($dir.'/'.$filename); + OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id))); exit(); } }elseif(OC_Files::newFile($dir, $filename, 'file')) { - OCP\JSON::success(array("data" => array('content'=>$content))); + $meta = OC_FileCache::get($dir.'/'.$filename); + $id = OC_FileCache::getId($dir.'/'.$filename); + OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id))); exit(); } } diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index fb3e277a215..a4dcd80a2e2 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -50,7 +50,8 @@ if(strpos($dir, '..') === false) { $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]); if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) { $meta = OC_FileCache::get($target); - $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target)); + $id = OC_FileCache::getId($target); + $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target)); } } OCP\JSON::encodedPrint($result); |