diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-11-02 22:36:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 22:36:05 +0100 |
commit | 39573e602d5e38e4b71b3d197d08798dd9558659 (patch) | |
tree | 1a4045bda8e05ad3537a9bf974834e1731a1e2cd /apps/files_sharing/lib | |
parent | 178d7f5bfa49bcf54d85ce788268ba592608627a (diff) | |
parent | 7d17b42f4df2322c1078c99840a9d35415ffd7aa (diff) | |
download | nextcloud-server-39573e602d5e38e4b71b3d197d08798dd9558659.tar.gz nextcloud-server-39573e602d5e38e4b71b3d197d08798dd9558659.zip |
Merge pull request #1978 from nextcloud/remove-send-mail-option
Remove send mail option
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r-- | apps/files_sharing/lib/Capabilities.php | 4 | ||||
-rw-r--r-- | apps/files_sharing/lib/Migration.php | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php index 9da6dbbc995..bfbd15c1122 100644 --- a/apps/files_sharing/lib/Capabilities.php +++ b/apps/files_sharing/lib/Capabilities.php @@ -73,10 +73,10 @@ class Capabilities implements ICapability { } $res["public"] = $public; - $res['user']['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no') === 'yes'; - $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes'; + $res['user']['send_mail'] = false; + $res['group_sharing'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes'; } diff --git a/apps/files_sharing/lib/Migration.php b/apps/files_sharing/lib/Migration.php index 9c971bf7f49..605a11fd22c 100644 --- a/apps/files_sharing/lib/Migration.php +++ b/apps/files_sharing/lib/Migration.php @@ -27,6 +27,7 @@ namespace OCA\Files_Sharing; use Doctrine\DBAL\Connection; use OCP\ICache; +use OCP\IConfig; use OCP\IDBConnection; use OC\Cache\CappedMemoryCache; @@ -41,14 +42,18 @@ class Migration { /** @var IDBConnection */ private $connection; + /** @var IConfig */ + private $config; + /** @var ICache with all shares we already saw */ private $shareCache; /** @var string */ private $table = 'share'; - public function __construct(IDBConnection $connection) { + public function __construct(IDBConnection $connection, IConfig $config) { $this->connection = $connection; + $this->config = $config; // We cache up to 10k share items (~20MB) $this->shareCache = new CappedMemoryCache(10000); @@ -111,6 +116,14 @@ class Migration { } /** + * this was dropped for Nextcloud 11 in favour of share by mail + */ + public function removeSendMailOption() { + $this->config->deleteAppValue('core', 'shareapi_allow_mail_notification'); + $this->config->deleteAppValue('core', 'shareapi_allow_public_notification'); + } + + /** * find the owner of a re-shared file/folder * * @param array $share |