diff options
Diffstat (limited to 'apps/federatedfilesharing/lib/Settings')
| -rw-r--r-- | apps/federatedfilesharing/lib/Settings/Admin.php | 51 | ||||
| -rw-r--r-- | apps/federatedfilesharing/lib/Settings/Personal.php | 54 | ||||
| -rw-r--r-- | apps/federatedfilesharing/lib/Settings/PersonalSection.php | 38 |
3 files changed, 32 insertions, 111 deletions
diff --git a/apps/federatedfilesharing/lib/Settings/Admin.php b/apps/federatedfilesharing/lib/Settings/Admin.php index aec5d23fdf4..fc685f952c7 100644 --- a/apps/federatedfilesharing/lib/Settings/Admin.php +++ b/apps/federatedfilesharing/lib/Settings/Admin.php @@ -1,26 +1,8 @@ <?php + /** - * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de> - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Bjoern Schiessle <bjoern@schiessle.org> - * @author Lukas Reschke <lukas@statuscode.ch> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\FederatedFileSharing\Settings; @@ -33,27 +15,16 @@ use OCP\IURLGenerator; use OCP\Settings\IDelegatedSettings; class Admin implements IDelegatedSettings { - private FederatedShareProvider $fedShareProvider; - private IConfig $gsConfig; - private IL10N $l; - private IURLGenerator $urlGenerator; - private IInitialState $initialState; - /** * Admin constructor. */ public function __construct( - FederatedShareProvider $fedShareProvider, - IConfig $globalScaleConfig, - IL10N $l, - IURLGenerator $urlGenerator, - IInitialState $initialState + private FederatedShareProvider $fedShareProvider, + private IConfig $gsConfig, + private IL10N $l, + private IURLGenerator $urlGenerator, + private IInitialState $initialState, ) { - $this->fedShareProvider = $fedShareProvider; - $this->gsConfig = $globalScaleConfig; - $this->l = $l; - $this->urlGenerator = $urlGenerator; - $this->initialState = $initialState; } /** @@ -70,6 +41,7 @@ class Admin implements IDelegatedSettings { $this->initialState->provideInitialState('incomingServer2serverGroupShareEnabled', $this->fedShareProvider->isIncomingServer2serverGroupShareEnabled()); $this->initialState->provideInitialState('lookupServerEnabled', $this->fedShareProvider->isLookupServerQueriesEnabled()); $this->initialState->provideInitialState('lookupServerUploadEnabled', $this->fedShareProvider->isLookupServerUploadEnabled()); + $this->initialState->provideInitialState('federatedTrustedShareAutoAccept', $this->fedShareProvider->isFederatedTrustedShareAutoAccept()); return new TemplateResponse('federatedfilesharing', 'settings-admin', [], ''); } @@ -83,8 +55,8 @@ class Admin implements IDelegatedSettings { /** * @return int whether the form should be rather on the top or bottom of - * the admin section. The forms are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. + * the admin section. The forms are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. * * E.g.: 70 */ @@ -106,6 +78,7 @@ class Admin implements IDelegatedSettings { 'incomingServer2serverGroupShareEnabled', 'lookupServerEnabled', 'lookupServerUploadEnabled', + 'federatedTrustedShareAutoAccept', ], ]; } diff --git a/apps/federatedfilesharing/lib/Settings/Personal.php b/apps/federatedfilesharing/lib/Settings/Personal.php index 944b2f84ab1..2889fb77c1f 100644 --- a/apps/federatedfilesharing/lib/Settings/Personal.php +++ b/apps/federatedfilesharing/lib/Settings/Personal.php @@ -3,29 +3,8 @@ declare(strict_types=1); /** - * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de> - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Jos Poortvliet <jos@opensuse.org> - * @author Julius Härtl <jus@bitgrid.net> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Carl Schwan <carl@carlschwan.eu> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\FederatedFileSharing\Settings; @@ -38,24 +17,13 @@ use OCP\IUserSession; use OCP\Settings\ISettings; class Personal implements ISettings { - private FederatedShareProvider $federatedShareProvider; - private IUserSession $userSession; - private Defaults $defaults; - private IInitialState $initialState; - private IURLGenerator $urlGenerator; - public function __construct( - FederatedShareProvider $federatedShareProvider, - IUserSession $userSession, - Defaults $defaults, - IInitialState $initialState, - IURLGenerator $urlGenerator + private FederatedShareProvider $federatedShareProvider, + private IUserSession $userSession, + private Defaults $defaults, + private IInitialState $initialState, + private IURLGenerator $urlGenerator, ) { - $this->federatedShareProvider = $federatedShareProvider; - $this->userSession = $userSession; - $this->defaults = $defaults; - $this->initialState = $initialState; - $this->urlGenerator = $urlGenerator; } /** @@ -81,8 +49,8 @@ class Personal implements ISettings { * @since 9.1 */ public function getSection(): ?string { - if ($this->federatedShareProvider->isIncomingServer2serverShareEnabled() || - $this->federatedShareProvider->isIncomingServer2serverGroupShareEnabled()) { + if ($this->federatedShareProvider->isIncomingServer2serverShareEnabled() + || $this->federatedShareProvider->isIncomingServer2serverGroupShareEnabled()) { return 'sharing'; } return null; @@ -90,8 +58,8 @@ class Personal implements ISettings { /** * @return int whether the form should be rather on the top or bottom of - * the admin section. The forms are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. + * the admin section. The forms are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. * * E.g.: 70 * @since 9.1 diff --git a/apps/federatedfilesharing/lib/Settings/PersonalSection.php b/apps/federatedfilesharing/lib/Settings/PersonalSection.php index 43ec8f21c22..eea10e39393 100644 --- a/apps/federatedfilesharing/lib/Settings/PersonalSection.php +++ b/apps/federatedfilesharing/lib/Settings/PersonalSection.php @@ -1,24 +1,8 @@ <?php + /** - * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de> - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\FederatedFileSharing\Settings; @@ -27,14 +11,10 @@ use OCP\IURLGenerator; use OCP\Settings\IIconSection; class PersonalSection implements IIconSection { - /** @var IURLGenerator */ - private $urlGenerator; - /** @var IL10N */ - private $l; - - public function __construct(IURLGenerator $urlGenerator, IL10N $l) { - $this->urlGenerator = $urlGenerator; - $this->l = $l; + public function __construct( + private IURLGenerator $urlGenerator, + private IL10N $l, + ) { } /** @@ -72,8 +52,8 @@ class PersonalSection implements IIconSection { /** * @return int whether the form should be rather on the top or bottom of - * the settings navigation. The sections are arranged in ascending order of - * the priority values. It is required to return a value between 0 and 99. + * the settings navigation. The sections are arranged in ascending order of + * the priority values. It is required to return a value between 0 and 99. * * E.g.: 70 * @since 9.1 |