diff --git a/apps/settings/lib/Settings/Admin/Sharing.php b/apps/settings/lib/Settings/Admin/Sharing.php index ffc40790a0f..d4ebf1fedd0 100644 --- a/apps/settings/lib/Settings/Admin/Sharing.php +++ b/apps/settings/lib/Settings/Admin/Sharing.php @@ -59,7 +59,7 @@ class Sharing implements IDelegatedSettings { 'restrictUserEnumerationFullMatchDisplayname' => $this->shareManager->matchDisplayName(), 'restrictUserEnumerationFullMatchEmail' => $this->shareManager->matchEmail(), 'restrictUserEnumerationFullMatchIgnoreSecondDN' => $this->shareManager->ignoreSecondDisplayName(), - 'enforceLinksPassword' => Util::isPublicLinkPasswordRequired(false), + 'enforceLinksPassword' => $this->shareManager->shareApiLinkEnforcePassword(false), 'enforceLinksPasswordExcludedGroups' => json_decode($excludedPasswordGroups) ?? [], 'enforceLinksPasswordExcludedGroupsEnabled' => $this->config->getSystemValueBool('sharing.allow_disabled_password_enforcement_groups', false), 'onlyShareWithGroupMembers' => $this->shareManager->shareWithGroupMembersOnly(), diff --git a/lib/public/Util.php b/lib/public/Util.php index 7cb22368c1e..c175ca42567 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -547,15 +547,18 @@ class Util { * @param bool $checkGroupMembership Check group membership exclusion * @return boolean * @since 7.0.0 + * @deprecated 34.0.0 use OCP\Share\IManager's shareApiLinkEnforcePassword directly */ public static function isPublicLinkPasswordRequired(bool $checkGroupMembership = true) { return \OC_Util::isPublicLinkPasswordRequired($checkGroupMembership); } /** - * check if share API enforces a default expire date + * Check if share API enforces a default expire date + * * @return boolean * @since 8.0.0 + * @deprecated 34.0.0 use OCP\Share\IManager's shareApiLinkDefaultExpireDateEnforced directly */ public static function isDefaultExpireDateEnforced() { return \OC_Util::isDefaultExpireDateEnforced();