upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Only check for existence of shared files when doing shared storage setup

Browse source 
The getItemsSharedWith function also retrieves related information,
resulting in work that isn't used here.
This commit is contained in:
Bart Visscher 2014-02-21 22:58:29 +01:00
parent f4f72e77d8
commit 1d7564dc2f
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_sharing/lib/sharedstorage.php
View file

@ -394,7 +394,7 @@ class Shared extends \OC\Files\Storage\Common {
public static function setup($options) {
if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user']
|| \OCP\Share::getItemsSharedWith('file')
|| \OCP\Share::hasFilesSharedWith()
) {
$user_dir = $options['user_dir'];
\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared',

23
lib/public/share.php
View file

@ -243,6 +243,29 @@ class Share {
return array("users" => array_unique($shares), "public" => $publicShare);
}
public static function hasFilesSharedWith() {
if (!self::isEnabled()) {
return false;
}
$shareWith = \OC_User::getUser();
$where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid`';
$where .= ' WHERE `file_target` IS NOT NULL';
$queryArgs = array();
$where .= ' AND `share_type` IN (?,?,?)';
$queryArgs[] = self::SHARE_TYPE_USER;
$queryArgs[] = self::SHARE_TYPE_GROUP;
$queryArgs[] = self::$shareTypeGroupUserUnique;
$userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith));
$placeholders = join(',', array_fill(0, count($userAndGroups), '?'));
$where .= ' AND `share_with` IN ('.$placeholders.')';
$queryArgs = array_merge($queryArgs, $userAndGroups);
// Don't include own group shares
$where .= ' AND `uid_owner` != ?';
$queryArgs[] = $shareWith;
$result = \OC_DB::executeAudited('SELECT COUNT(*) FROM `*PREFIX*share` '.$where, $queryArgs);
return $result->fetchOne() > 0;
}
/**
* Get the items of item type shared with the current user
* @param string Item type