From ecc1f92bb6c7ac3121c35affad607a344a79ef52 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 23 Jul 2014 16:42:33 +0200
Subject: add OCS api call to set expire date for link shares

---
 lib/public/share.php | 5 +++--
 lib/public/util.php  | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'lib/public')

diff --git a/lib/public/share.php b/lib/public/share.php
index 8566a38c61e..c0939dce53f 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -298,10 +298,11 @@ class Share extends \OC\Share\Constants {
 	 * @param string $itemType
 	 * @param string $itemSource
 	 * @param string $date expiration date
+	 * @param int $shareTime timestamp from when the file was shared
 	 * @return boolean
 	 */
-	public static function setExpirationDate($itemType, $itemSource, $date) {
-		return \OC\Share\Share::setExpirationDate($itemType, $itemSource, $date);
+	public static function setExpirationDate($itemType, $itemSource, $date, $shareTime = null) {
+		return \OC\Share\Share::setExpirationDate($itemType, $itemSource, $date, $shareTime);
 	}
 
 	/**
diff --git a/lib/public/util.php b/lib/public/util.php
index ff8c743c0df..87b7a4f19db 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -518,6 +518,15 @@ class Util {
 		return \OC_Util::isPublicLinkPasswordRequired();
 	}
 
+	/**
+	 * check if share API enforces a default expire date
+	 * @return boolean
+	 */
+	public static function isDefaultExpireDateEnforced() {
+		return \OC_Util::isDefaultExpireDateEnforced();
+	}
+
+
 	/**
 	 * Checks whether the current version needs upgrade.
 	 *
-- 
cgit v1.2.3