mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

show "shared by ..." for share mount point

This commit is contained in:
Bjoern Schiessle 2014-04-08 16:37:34 +02:00
parent 6b19482f3e
commit 4967435237
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/lib/cache.php
View File

@ -86,7 +86,9 @@ class Shared_Cache extends Cache {
public function get($file) {
if (is_string($file)) {
if ($cache = $this->getSourceCache($file)) {
return $cache->get($this->files[$file]);
$data = $cache->get($this->files[$file]);
$data['displayname_owner'] = \OC_User::getDisplayName($this->storage->getSharedFrom());
return $data;
}
} else {
// if we are at the root of the mount point we want to return the

11
apps/files_sharing/lib/sharedstorage.php
View File

@ -32,6 +32,7 @@ class Shared extends \OC\Files\Storage\Common {
private $type; // can be "file" or "folder"
private $shareId; // share Id to identify the share in the database
private $fileSource; // file cache ID of the shared item
private $sharedFrom; // the user who shared the file
private $files = array();
public function __construct($arguments) {
@ -39,6 +40,7 @@ class Shared extends \OC\Files\Storage\Common {
$this->type = $arguments['shareType'];
$this->shareId = $arguments['shareId'];
$this->fileSource = $arguments['fileSource'];
$this->sharedFrom = $arguments['sharedFrom'];
}
/**
@ -498,6 +500,7 @@ class Shared extends \OC\Files\Storage\Common {
'shareType' => $share['item_type'],
'shareId' => $share['id'],
'fileSource' => $share['file_source'],
'sharedFrom' => $share['uid_owner'],
),
$options['user_dir'] . '/' . $share['file_target']);
}
@ -512,6 +515,14 @@ class Shared extends \OC\Files\Storage\Common {
return ltrim($this->mountPoint, '/');
}
/**
* @brief get the user who shared the file
* @return string
*/
public function getSharedFrom() {
return $this->sharedFrom;
}
/**
* @brief return share type, can be "file" or "folder"
* @return string