From 4cf328e3b941139f3a41a8a3631f3c74544eb094 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 1 May 2013 21:15:32 -0400 Subject: [PATCH 1/5] Don't return links for shared files if disabled --- lib/public/share.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/public/share.php b/lib/public/share.php index 1b6f5d05f1..2847f9e5ec 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -960,6 +960,10 @@ class Share { $queryArgs = array($itemType); } } + if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') { + $where .= ' AND `share_type` != ?'; + $queryArgs[] = self::SHARE_TYPE_LINK; + } if (isset($shareType)) { // Include all user and group items if ($shareType == self::$shareTypeUserAndGroups && isset($shareWith)) { From a2c80bbc687af788d8a5a3c520a24ac223ddc714 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Thu, 2 May 2013 11:45:12 -0400 Subject: [PATCH 2/5] Don't show links option in dropdown if disabled --- core/js/share.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/js/share.js b/core/js/share.js index 270eab356e..734bbbfe0b 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -203,7 +203,12 @@ OC.Share={ html += ''; html += ''; - if (link) { + var linksAllowed = false; + $.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'appconfig.php'), data: { action:'getValue', app:'core', key:'shareapi_allow_links', defaultValue:'yes' }, async: false, success: function(result) { + if (result && result.status === 'success' && result.data === 'yes') { + linksAllowed = true; + } + }}); html += '