upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-19 02:38:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

chore: Remove deprecated Share_Helper::generateTarget $exclude parameter

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2024-09-19 23:53:43 +02:00
parent a8f46af20f
commit e243cb8b7d
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/files_sharing/lib/Helper.php
View file

@ -22,17 +22,16 @@ class Helper {
* check if file name already exists and generate unique target
*
* @param string $path
* @param array $excludeList
* @param View $view
* @return string $path
*/
public static function generateUniqueTarget($path, $excludeList, $view) {
public static function generateUniqueTarget($path, $view) {
$pathinfo = pathinfo($path);
$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
$name = $pathinfo['filename'];
$dir = $pathinfo['dirname'];
$i = 2;
while ($view->file_exists($path) || in_array($path, $excludeList)) {
while ($view->file_exists($path)) {
$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
$i++;
}

12
apps/files_sharing/lib/ShareBackend/File.php
View file

@ -65,18 +65,12 @@ class File implements \OCP\Share_Backend_File_Dependent {
*
* @param string $itemSource
* @param string $shareWith
* @param array $exclude (optional)
* @return string
*/
public function generateTarget($itemSource, $shareWith, $exclude = null) {
public function generateTarget($itemSource, $shareWith) {
$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($itemSource));
// for group shares we return the target right away
if ($shareWith === false) {
return $target;
}
\OC\Files\Filesystem::initMountPoints($shareWith);
$view = new \OC\Files\View('/' . $shareWith . '/files');
@ -91,9 +85,7 @@ class File implements \OCP\Share_Backend_File_Dependent {
}
}
$excludeList = is_array($exclude) ? $exclude : [];
return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $view);
}
public function formatItems($items, $format, $parameters = null) {

4
lib/public/Share_Backend.php
View file

@ -30,14 +30,14 @@ interface Share_Backend {
* Get a unique name of the item for the specified user
* @param string $itemSource
* @param string|false $shareWith User the item is being shared with
* @param array|null $exclude List of similar item names already existing as shared items @deprecated 7.0.0
* @return string Target name
*
* This function needs to verify that the user does not already have an item with this name.
* If it does generate a new name e.g. name_#
* @since 5.0.0
* @deprecated 31.0.0
*/
public function generateTarget($itemSource, $shareWith, $exclude = null);
public function generateTarget($itemSource, $shareWith);
/**
* Converts the shared item sources back into the item in the specified format