Merge pull request #15165 from nextcloud/techdebt/noid/cleanup-legacy-share-code

Deprecate legacy share code and cleanup some unused methods

2 files changed, 11 insertions, 78 deletions

diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index a09dd2b565f..424fe8a2382 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -257,49 +257,6 @@ class Share extends Constants {
 	}
 
 	/**
-	 * Based on the given token the share information will be returned - password protected shares will be verified
-	 * @param string $token
-	 * @param bool $checkPasswordProtection
-	 * @return array|boolean false will be returned in case the token is unknown or unauthorized
-	 */
-	public static function getShareByToken($token, $checkPasswordProtection = true) {
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);
-		$result = $query->execute(array($token));
-		if ($result === false) {
-			\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage() . ', token=' . $token, ILogger::ERROR);
-		}
-		$row = $result->fetchRow();
-		if ($row === false) {
-			return false;
-		}
-		if (is_array($row) and self::expireItem($row)) {
-			return false;
-		}
-
-		// password protected shares need to be authenticated
-		if ($checkPasswordProtection && !\OC\Share\Share::checkPasswordProtectedShare($row)) {
-			return false;
-		}
-
-		return $row;
-	}
-
-	/**
-	 * Get the shared items of item type owned by the current user
-	 * @param string $itemType
-	 * @param int $format (optional) Format type must be defined by the backend
-	 * @param mixed $parameters
-	 * @param int $limit Number of items to return (optional) Returns all by default
-	 * @param boolean $includeCollections
-	 * @return mixed Return depends on format
-	 */
-	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null,
-										  $limit = -1, $includeCollections = false) {
-		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format,
-			$parameters, $limit, $includeCollections);
-	}
-
-	/**
 	 * Get the shared item of item type owned by the current user
 	 * @param string $itemType
 	 * @param string $itemSource
@@ -421,29 +378,6 @@ class Share extends Constants {
 	}
 
 	/**
-	 * sent status if users got informed by mail about share
-	 * @param string $itemType
-	 * @param string $itemSource
-	 * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
-	 * @param string $recipient with whom was the file shared
-	 * @param boolean $status
-	 */
-	public static function setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status) {
-		$status = $status ? 1 : 0;
-
-		$query = \OC_DB::prepare(
-			'UPDATE `*PREFIX*share`
-					SET `mail_send` = ?
-					WHERE `item_type` = ? AND `item_source` = ? AND `share_type` = ? AND `share_with` = ?');
-
-		$result = $query->execute(array($status, $itemType, $itemSource, $shareType, $recipient));
-
-		if($result === false) {
-			\OCP\Util::writeLog('OCP\Share', 'Couldn\'t set send mail status', ILogger::ERROR);
-		}
-	}
-
-	/**
 	 * Checks whether a share has expired, calls unshareItem() if yes.
 	 * @param array $item Share data (usually database row)
 	 * @return boolean True if item was expired, false otherwise.
@@ -1617,14 +1551,6 @@ class Share extends Constants {
 	}
 
 	/**
-	 * @return bool
-	 */
-	public static function isDefaultExpireDateEnabled() {
-		$defaultExpireDateEnabled = \OC::$server->getConfig()->getAppValue('core', 'shareapi_default_expire_date', 'no');
-		return $defaultExpireDateEnabled === 'yes';
-	}
-
-	/**
 	 * @return int
 	 */
 	public static function getExpireInterval() {
diff --git a/lib/public/Share.php b/lib/public/Share.php
index 011d56ab5af..f433a35f17a 100644
--- a/lib/public/Share.php
+++ b/lib/public/Share.php
@@ -43,6 +43,7 @@ namespace OCP;
  * It provides the following hooks:
  *  - post_shared
  * @since 5.0.0
+ * @deprecated 17.0.0
  */
 class Share extends \OC\Share\Constants {
 
@@ -54,6 +55,7 @@ class Share extends \OC\Share\Constants {
 	 * @param string $owner Owner of the share
 	 * @return array Return list of items with file_target, permissions and expiration
 	 * @since 6.0.0 - parameter $owner was added in 8.0.0
+	 * @deprecated 17.0.0
 	 */
 	public static function getItemSharedWithUser($itemType, $itemSource, $user, $owner = null) {
 		return \OC\Share\Share::getItemSharedWithUser($itemType, $itemSource, $user, $owner);
@@ -68,10 +70,11 @@ class Share extends \OC\Share\Constants {
 	 * @param bool $includeCollections
 	 * @return array
 	 * @since 5.0.0
+	 * @deprecated 17.0.0
 	 */
 	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
 		$parameters = null, $includeCollections = false) {
-		return \OC\Share\Share::getItemSharedWithBySource($itemType, $itemSource, $format, $parameters, $includeCollections);
+		// not used by any app - only here to not break apps syntax
 	}
 
 	/**
@@ -80,9 +83,10 @@ class Share extends \OC\Share\Constants {
 	 * @param bool $checkPasswordProtection
 	 * @return array|bool false will be returned in case the token is unknown or unauthorized
 	 * @since 5.0.0 - parameter $checkPasswordProtection was added in 7.0.0
+	 * @deprecated 17.0.0
 	 */
 	public static function getShareByToken($token, $checkPasswordProtection = true) {
-		return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection);
+		// not used by any app - only here to not break apps syntax
 	}
 
 
@@ -95,11 +99,12 @@ class Share extends \OC\Share\Constants {
 	 * @param bool $includeCollections
 	 * @return mixed Return depends on format
 	 * @since 5.0.0
+	 * @deprecated 17.0.0
 	 */
 	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null,
 		$limit = -1, $includeCollections = false) {
 
-		return \OC\Share\Share::getItemsShared($itemType, $format, $parameters, $limit, $includeCollections);
+		// only used by AppVNCSafe app (https://github.com/vnc-biz/nextcloud-appvncsafe/issues/2) - only here to not break apps syntax
 	}
 
 	/**
@@ -111,6 +116,7 @@ class Share extends \OC\Share\Constants {
 	 * @param bool $includeCollections
 	 * @return mixed Return depends on format
 	 * @since 5.0.0
+	 * @deprecated 17.0.0
 	 */
 	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
 	                                     $parameters = null, $includeCollections = false) {
@@ -126,8 +132,9 @@ class Share extends \OC\Share\Constants {
 	 * @param string $recipient with whom was the item shared
 	 * @param bool $status
 	 * @since 6.0.0 - parameter $originIsSource was added in 8.0.0
+	 * @deprecated 17.0.0
 	 */
 	public static function setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status) {
-		return \OC\Share\Share::setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status);
+		// not used by any app - only here to not break apps syntax
 	}
 }