diff options
Diffstat (limited to 'apps/sharebymail/lib')
| -rw-r--r-- | apps/sharebymail/lib/Activity.php | 1 | ||||
| -rw-r--r-- | apps/sharebymail/lib/Capabilities.php | 35 | ||||
| -rw-r--r-- | apps/sharebymail/lib/Settings/Admin.php | 1 | ||||
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 5 |
4 files changed, 22 insertions, 20 deletions
diff --git a/apps/sharebymail/lib/Activity.php b/apps/sharebymail/lib/Activity.php index 7e9389da060..2d8289affa4 100644 --- a/apps/sharebymail/lib/Activity.php +++ b/apps/sharebymail/lib/Activity.php @@ -1,4 +1,5 @@ <?php + /** * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/apps/sharebymail/lib/Capabilities.php b/apps/sharebymail/lib/Capabilities.php index 67a0ec7a9de..425a695ff36 100644 --- a/apps/sharebymail/lib/Capabilities.php +++ b/apps/sharebymail/lib/Capabilities.php @@ -48,24 +48,23 @@ class Capabilities implements ICapability { return []; } return [ - 'files_sharing' => - [ - 'sharebymail' => - [ - 'enabled' => $this->manager->shareApiAllowLinks(), - 'send_password_by_mail' => $this->settingsManager->sendPasswordByMail(), - 'upload_files_drop' => [ - 'enabled' => true, - ], - 'password' => [ - 'enabled' => true, - 'enforced' => $this->manager->shareApiLinkEnforcePassword(), - ], - 'expire_date' => [ - 'enabled' => true, - 'enforced' => $this->manager->shareApiLinkDefaultExpireDateEnforced(), - ], - ] + 'files_sharing' + => [ + 'sharebymail' => [ + 'enabled' => $this->manager->shareApiAllowLinks(), + 'send_password_by_mail' => $this->settingsManager->sendPasswordByMail(), + 'upload_files_drop' => [ + 'enabled' => true, + ], + 'password' => [ + 'enabled' => true, + 'enforced' => $this->manager->shareApiLinkEnforcePassword(), + ], + 'expire_date' => [ + 'enabled' => true, + 'enforced' => $this->manager->shareApiLinkDefaultExpireDateEnforced(), + ], + ] ] ]; } diff --git a/apps/sharebymail/lib/Settings/Admin.php b/apps/sharebymail/lib/Settings/Admin.php index 2bd58f7307f..8f27bbff6d6 100644 --- a/apps/sharebymail/lib/Settings/Admin.php +++ b/apps/sharebymail/lib/Settings/Admin.php @@ -1,4 +1,5 @@ <?php + /** * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 194a402848e..16a13786ea1 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -1,4 +1,5 @@ <?php + /** * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later @@ -722,8 +723,8 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider // a real password was given $validPassword = $plainTextPassword !== null && $plainTextPassword !== ''; - if ($validPassword && ($originalShare->getPassword() !== $share->getPassword() || - ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) { + if ($validPassword && ($originalShare->getPassword() !== $share->getPassword() + || ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) { $emails = $this->getSharedWithEmails($share); $validEmails = array_filter($emails, function ($email) { return $this->mailer->validateMailAddress($email); |