diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-08-05 10:57:13 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-08-05 10:57:51 +0200 |
| commit | 41cca70a63eea6bb07565f2e4f3e68f8218eac78 (patch) | |
| tree | 3d0032ec5565f2957165b1863ab4ac66ff39b970 | |
| parent | c0e78d984140ecd6a49ac615214b4a68fab0557e (diff) | |
| download | nextcloud-server-41cca70a63eea6bb07565f2e4f3e68f8218eac78.tar.gz nextcloud-server-41cca70a63eea6bb07565f2e4f3e68f8218eac78.zip | |
don't display share permission if resharing was disabled by the admin
| -rw-r--r-- | core/js/config.php | 1 | ||||
| -rw-r--r-- | core/js/share.js | 4 | ||||
| -rw-r--r-- | lib/private/share/share.php | 2 | ||||
| -rw-r--r-- | lib/public/share.php | 9 |
4 files changed, 13 insertions, 3 deletions
diff --git a/core/js/config.php b/core/js/config.php index 0ab74d2949e..b61694522db 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -83,6 +83,7 @@ $array = array( 'defaultExpireDateEnforced' => $enforceDefaultExpireDate, 'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(), 'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(), + 'resharingAllowed' => \OCP\Share::isResharingAllowed(), ) ) ), diff --git a/core/js/share.js b/core/js/share.js index 14abdf18ade..1b4e519f201 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -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) { diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 450c71cf8a2..b8e7ffa4536 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -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; diff --git a/lib/public/share.php b/lib/public/share.php index c0939dce53f..e6519dd3e3a 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -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(); + } } /** |