1 files changed, 14 insertions, 11 deletions

diff --git a/apps/files_sharing/lib/Helper.php b/apps/files_sharing/lib/Helper.php
index f2f92679e2f..92e874b73db 100644
--- a/apps/files_sharing/lib/Helper.php
+++ b/apps/files_sharing/lib/Helper.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -9,31 +10,33 @@ namespace OCA\Files_Sharing;
 use OC\Files\Filesystem;
 use OC\Files\View;
 use OCA\Files_Sharing\AppInfo\Application;
+use OCP\IConfig;
+use OCP\Server;
+use OCP\Util;
 
 class Helper {
 	public static function registerHooks() {
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
+		Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
+		Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
 
-		\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
+		Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
 	}
 
 	/**
 	 * 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'] : '';
+		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
 		$name = $pathinfo['filename'];
 		$dir = $pathinfo['dirname'];
 		$i = 2;
-		while ($view->file_exists($path) || in_array($path, $excludeList)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+		while ($view->file_exists($path)) {
+			$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
 			$i++;
 		}
 
@@ -43,7 +46,7 @@ class Helper {
 	/**
 	 * get default share folder
 	 *
-	 * @param \OC\Files\View|null $view
+	 * @param View|null $view
 	 * @param string|null $userId
 	 * @return string
 	 */
@@ -52,7 +55,7 @@ class Helper {
 			$view = Filesystem::getView();
 		}
 
-		$config = \OC::$server->getConfig();
+		$config = Server::get(IConfig::class);
 		$systemDefault = $config->getSystemValue('share_folder', '/');
 		$allowCustomShareFolder = $config->getSystemValueBool('sharing.allow_custom_share_folder', true);
 
@@ -86,6 +89,6 @@ class Helper {
 	 * @param string $shareFolder
 	 */
 	public static function setShareFolder($shareFolder) {
-		\OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
+		Server::get(IConfig::class)->setSystemValue('share_folder', $shareFolder);
 	}
 }