fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
This commit is contained in:
parent
c0c4fe5fd3
commit
c651950a17
|
@ -231,8 +231,9 @@ class Hooks {
|
||||||
$util = new Util($view, $userId);
|
$util = new Util($view, $userId);
|
||||||
$path = $util->fileIdToPath($params['itemSource']);
|
$path = $util->fileIdToPath($params['itemSource']);
|
||||||
|
|
||||||
|
$share = $util->getParentFromShare($params['id']);
|
||||||
//if parent is set, then this is a re-share action
|
//if parent is set, then this is a re-share action
|
||||||
if ($params['parent']) {
|
if ($share['parent'] != null) {
|
||||||
|
|
||||||
// get the parent from current share
|
// get the parent from current share
|
||||||
$parent = $util->getShareParent($params['parent']);
|
$parent = $util->getShareParent($params['parent']);
|
||||||
|
|
|
@ -1133,19 +1133,7 @@ class Util {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make path relative for use by $view
|
return array ( $fileOwnerUid, $filename );
|
||||||
$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;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -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.
|
* @brief get owner of the shared files.
|
||||||
* @param int $Id of a share
|
* @param int $Id of a share
|
||||||
|
|
Loading…
Reference in New Issue