Skip to content
Snippets Groups Projects
Commit c651950a authored by Florin Peter's avatar Florin Peter
Browse files

fix for re-share and removed check if file exists because we are sometime into...

fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
parent c0c4fe5f
No related branches found
No related tags found
No related merge requests found
......@@ -231,8 +231,9 @@ class Hooks {
$util = new Util($view, $userId);
$path = $util->fileIdToPath($params['itemSource']);
$share = $util->getParentFromShare($params['id']);
//if parent is set, then this is a re-share action
if ($params['parent']) {
if ($share['parent'] != null) {
// get the parent from current share
$parent = $util->getShareParent($params['parent']);
......
......@@ -1133,19 +1133,7 @@ class Util {
}
// Make path relative for use by $view
$relpath = \OC\Files\Filesystem::normalizePath($fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename);
// Check that the filename we're using is working
if ( $this->view->file_exists( $relpath ) ) {
return array ( $fileOwnerUid, $filename );
} else {
return false;
}
return array ( $fileOwnerUid, $filename );
}
......@@ -1230,6 +1218,25 @@ class Util {
}
/**
* @brief get shares parent.
* @param int $id of the current share
* @return array of the parent
*/
public static function getParentFromShare( $id ) {
$query = \OC_DB::prepare( 'SELECT `parent`'
.' FROM `*PREFIX*share`'
.' WHERE `id` = ?' );
$result = $query->execute( array( $id ) );
$row = $result->fetchRow();
return $row;
}
/**
* @brief get owner of the shared files.
* @param int $Id of a share
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment