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

Merge pull request #15282 from owncloud/keepsharerelationshipondelete 

Keep shares when deleting shared folders
This commit is contained in:
Vincent Petry 2015-04-09 18:10:17 +02:00
parent b60d5d3d6f 5803a1f5f7
commit 2865f09984
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files_sharing/lib/helper.php
View File

@ -33,7 +33,6 @@ class Helper {
\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OCA\Files_Sharing\External\Manager', 'setup');
\OCP\Util::connectHook('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook');
\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'postDeleteHook');
\OCP\Util::connectHook('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');

35
apps/files_sharing/lib/updater.php
View File

@ -27,9 +27,6 @@ namespace OC\Files\Cache;
class Shared_Updater {
// shares which can be removed from oc_share after the delete operation was successful
static private $toRemove = array();
/**
* walk up the users file tree and update the etags
* @param string $user
@ -81,25 +78,6 @@ class Shared_Updater {
}
}
/**
* remove all shares for a given file if the file was deleted
*
* @param string $path
*/
private static function removeShare($path) {
$fileSource = self::$toRemove[$path];
if (!\OC\Files\Filesystem::file_exists($path)) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `file_source`=?');
try {
\OC_DB::executeAudited($query, array($fileSource));
} catch (\Exception $e) {
\OCP\Util::writeLog('files_sharing', "can't remove share: " . $e->getMessage(), \OCP\Util::WARN);
}
}
unset(self::$toRemove[$path]);
}
/**
* @param array $params
*/
@ -122,19 +100,6 @@ class Shared_Updater {
static public function deleteHook($params) {
$path = $params['path'];
self::correctFolders($path);
$fileInfo = \OC\Files\Filesystem::getFileInfo($path);
// mark file as deleted so that we can clean up the share table if
// the file was deleted successfully
self::$toRemove[$path] = $fileInfo['fileid'];
}
/**
* @param array $params
*/
static public function postDeleteHook($params) {
self::removeShare($params['path']);
}
/**

3
apps/files_sharing/tests/deleteorphanedsharesjobtest.php
View File

@ -55,6 +55,9 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase {
$appManager = \OC::$server->getAppManager();
self::$trashBinStatus = $appManager->isEnabledForUser('files_trashbin');
$appManager->disableApp('files_trashbin');
// just in case...
\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
}
public static function tearDownAfterClass() {