Fix bugs preventing file upload in shared folders with write permission

remotes/origin/stable
Michael Gapczynski 14 years ago
parent b05be2f26d
commit ceae4fa7b4
  1. 14
      apps/files_sharing/sharedstorage.php
  2. 2
      files/ajax/upload.php

@ -494,11 +494,15 @@ class OC_Filestorage_Shared extends OC_Filestorage {
}
}
public function fromUploadedFile($tmpPath, $path) {
$source = $this->getSource($tmpPath);
if ($source) {
$storage = OC_Filesystem::getStorage($source);
return $storage->fromUploadedFile($this->getInternalPath($source), $path);
public function fromUploadedFile($tmpFile, $path) {
if ($this->is_writeable($path)) {
$source = $this->getSource($path);
if ($source) {
$storage = OC_Filesystem::getStorage($source);
return $storage->fromUploadedFile($tmpFile, $this->getInternalPath($source));
}
} else {
return false;
}
}

@ -33,7 +33,7 @@ $result=array();
if(strpos($dir,'..') === false){
$fileCount=count($files['name']);
for($i=0;$i<$fileCount;$i++){
$target='/' . stripslashes($dir) . $files['name'][$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]);
}

Loading…
Cancel
Save