Enable option to set the file_target of a new share via api.

Signed-off-by: Jacqueline Lüken <j.lueken@mhq-services.com>
mhq-services · Nov 23, 2018 · a9ae3d9 · a9ae3d9
1 parent eadfa90
commit a9ae3d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -366,6 +366,7 @@ public function deleteShare(string $id): DataResponse {
 	 * @param string $sendPasswordByTalk
 	 * @param string $expireDate
 	 * @param string $label
+	 * @param string $target
 	 *
 	 * @return DataResponse
 	 * @throws NotFoundException
@@ -385,7 +386,8 @@ public function createShare(
 		string $password = '',
 		string $sendPasswordByTalk = null,
 		string $expireDate = '',
-		string $label = ''
+		string $label = '',
+            string $target = ''
 	): DataResponse {
 		$share = $this->shareManager->newShare();
 
@@ -562,6 +564,9 @@ public function createShare(
 
 		$share->setShareType($shareType);
 		$share->setSharedBy($this->currentUser);
+            if (!empty($target)) {
+                $share->setTarget($target);
+            }
 
 		try {
 			$share = $this->shareManager->createShare($share);

diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -654,9 +654,11 @@ public function createShare(\OCP\Share\IShare $share) {
 		}
 
 		// Generate the target
-		$target = $this->config->getSystemValue('share_folder', '/') .'/'. $share->getNode()->getName();
-		$target = \OC\Files\Filesystem::normalizePath($target);
-		$share->setTarget($target);
+            if (empty($share->getTarget())) {
+                $target = $this->config->getSystemValue('share_folder', '/') . '/' . $share->getNode()->getName();
+                $target = \OC\Files\Filesystem::normalizePath($target);
+                $share->setTarget($target);
+            }
 
 		// Pre share event
 		$event = new GenericEvent($share);