mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10166 from owncloud/sharing_dont_display_share_permission 

[sharing] respect "sharing allowed" setting in the share dialog
This commit is contained in:
Tom Needham 2014-08-05 14:45:09 +01:00
parent 892d824804 41cca70a63
commit 61c6864ca1
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/js/config.php
View File

@ -83,6 +83,7 @@ $array = array(
'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
'resharingAllowed' => \OCP\Share::isResharingAllowed(),
)
)
),

4
core/js/share.js
View File

@ -488,7 +488,7 @@ OC.Share={
if (possiblePermissions & OC.PERMISSION_DELETE) {
permissions = permissions | OC.PERMISSION_DELETE;
}
if (possiblePermissions & OC.PERMISSION_SHARE) {
if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) {
permissions = permissions | OC.PERMISSION_SHARE;
}
@ -620,7 +620,7 @@ OC.Share={
}
html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify by email')+'</label> ';
}
if (possiblePermissions & OC.PERMISSION_SHARE) {
if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) {
html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'can share')+'</label>';
}
if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {

2
lib/private/share/share.php
View File

@ -1114,7 +1114,7 @@ class Share extends \OC\Share\Constants {
*
* Resharing is allowed by default if not configured
*/
private static function isResharingAllowed() {
public static function isResharingAllowed() {
if (!isset(self::$isResharingAllowed)) {
if (\OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes') == 'yes') {
self::$isResharingAllowed = true;

9
lib/public/share.php
View File

@ -330,6 +330,15 @@ class Share extends \OC\Share\Constants {
public static function checkPasswordProtectedShare(array $linkItem) {
return \OC\Share\Share::checkPasswordProtectedShare($linkItem);
}
/**
* Check if resharing is allowed
*
* @return boolean true if allowed or false
*/
public static function isResharingAllowed() {
return \OC\Share\Share::isResharingAllowed();
}
}
/**