Merge pull request #18651 from owncloud/ocs_share_create_with_expire

Allow to directly set the expireDate on a new (link)share

1 files changed, 15 insertions, 0 deletions

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index c245f0f88a9..d0c69badb46 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -649,6 +649,21 @@ class Share extends Constants {
 			$permissions = (int)$permissions & ~\OCP\Constants::PERMISSION_DELETE;
 		}
 
+		//Validate expirationDate
+		if ($expirationDate !== null) {
+			try {
+				/*
+				 * Reuse the validateExpireDate.
+				 * We have to pass time() since the second arg is the time
+				 * the file was shared, since it is not shared yet we just use
+				 * the current time.
+				 */
+				$expirationDate = self::validateExpireDate($expirationDate->format('Y-m-d'), time(), $itemType, $itemSource);
+			} catch (\Exception $e) {
+				throw new \OC\HintException($e->getMessage(), $e->getMessage(), 404);
+			}
+		}
+
 		// Verify share type and sharing conditions are met
 		if ($shareType === self::SHARE_TYPE_USER) {
 			if ($shareWith == $uidOwner) {