sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2173 from owncloud/fix-shared-storage 

Fix fetching source path of shared files
remotes/origin/stable5
Bernhard Posselt 2013-03-07 09:37:36 +07:00
parent 99914a44a5 ef2eb10ea4
commit d6bb627a62
6 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/files_sharing/lib/share/file.php
Unescape Escape View File

@ -73,7 +73,9 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
if ($format == self::FORMAT_SHARED_STORAGE) {
// Only 1 item should come through for this format call
return array(
'parent' => $items[key($items)]['parent'],
'path' => $items[key($items)]['path'],
'storage' => $items[key($items)]['storage'],
'permissions' => $items[key($items)]['permissions'],
'uid_owner' => $items[key($items)]['uid_owner']
);
@ -139,13 +141,28 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
$source = \OCP\Share::getItemSharedWith('folder', $folder, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
if ($source) {
$source['path'] = $source['path'].substr($target, strlen($folder));
return $source;
}
} else {
$source = \OCP\Share::getItemSharedWith('file', $target, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
if ($source) {
return $source;
}
if ($source) {
if (isset($source['parent'])) {
$parent = $source['parent'];
while (isset($parent)) {
$query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
$item = $query->execute(array($parent))->fetchRow();
if (isset($item['parent'])) {
$parent = $item['parent'];
} else {
$fileOwner = $item['uid_owner'];
break;
}
}
} else {
$fileOwner = $source['uid_owner'];
}
$source['fileOwner'] = $fileOwner;
return $source;
}
\OCP\Util::writeLog('files_sharing', 'File source not found for: '.$target, \OCP\Util::ERROR);
return false;

20
apps/files_sharing/lib/sharedstorage.php
Unescape Escape View File

@ -45,11 +45,7 @@ class Shared extends \OC\Files\Storage\Common {
*/
private function getFile($target) {
if (!isset($this->files[$target])) {
$source = \OC_Share_Backend_File::getSource($target);
if ($source) {
$source['path'] = '/'.$source['uid_owner'].'/'.$source['path'];
}
$this->files[$target] = $source;
$this->files[$target] = \OC_Share_Backend_File::getSource($target);
}
return $this->files[$target];
}
@ -62,8 +58,16 @@ class Shared extends \OC\Files\Storage\Common {
private function getSourcePath($target) {
$source = $this->getFile($target);
if ($source) {
\OC\Files\Filesystem::initMountPoints($source['uid_owner']);
return $source['path'];
if (!isset($source['fullPath'])) {
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
$mount = \OC\Files\Mount::findByNumericId($source['storage']);
if ($mount) {
$this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path'];
} else {
$this->files[$target]['fullPath'] = false;
}
}
return $this->files[$target]['fullPath'];
}
return false;
}
@ -430,7 +434,7 @@ class Shared extends \OC\Files\Storage\Common {
}
$source = $this->getFile($path);
if ($source) {
return $source['uid_owner'];
return $source['fileOwner'];
}
return false;
}

26
lib/files/mount.php
Unescape Escape View File

@ -176,10 +176,12 @@ class Mount {
}
/**
* Find mounts by storage id
*
* @param string $id
* @return \OC\Files\Storage\Storage[]
* @return Mount[]
*/
public static function findById($id) {
public static function findByStorageId($id) {
if (strlen($id) > 64) {
$id = md5($id);
}
@ -191,4 +193,24 @@ class Mount {
}
return $result;
}
/**
* Find mounts by numeric storage id
*
* @param string $id
* @return Mount
*/
public static function findByNumericId($id) {
$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
$result = $query->execute(array($id))->fetchOne();
if ($result) {
$id = $result;
foreach (self::$mounts as $mount) {
if ($mount->getStorageId() === $id) {
return $mount;
}
}
}
return false;
}
}

2
lib/files/view.php
Unescape Escape View File

@ -960,7 +960,7 @@ class View {
*/
public function getPath($id) {
list($storage, $internalPath) = Cache\Cache::getById($id);
$mounts = Mount::findById($storage);
$mounts = Mount::findByStorageId($storage);
foreach ($mounts as $mount) {
/**
* @var \OC\Files\Mount $mount

2
lib/public/share.php
Unescape Escape View File

@ -786,7 +786,7 @@ class Share {
} else {
$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`,
`*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`,
`file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`';
`file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`';
}
} else {
$select = '*';

10
tests/lib/files/mount.php
Unescape Escape View File

@ -39,10 +39,10 @@ class Mount extends \PHPUnit_Framework_TestCase {
$this->assertEquals(2, count(\OC\Files\Mount::findIn('/')));
$id = $mount->getStorageId();
$this->assertEquals(array($mount), \OC\Files\Mount::findById($id));
$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($id));
$mount2 = new \OC\Files\Mount($storage, '/foo/bar');
$this->assertEquals(array($mount, $mount2), \OC\Files\Mount::findById($id));
$this->assertEquals(array($mount, $mount2), \OC\Files\Mount::findByStorageId($id));
}
public function testLong() {
@ -51,8 +51,8 @@ class Mount extends \PHPUnit_Framework_TestCase {
$id = $mount->getStorageId();
$storageId = $storage->getId();
$this->assertEquals(array($mount), \OC\Files\Mount::findById($id));
$this->assertEquals(array($mount), \OC\Files\Mount::findById($storageId));
$this->assertEquals(array($mount), \OC\Files\Mount::findById(md5($storageId)));
$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($id));
$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($storageId));
$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId(md5($storageId)));
}
}