diff options
Diffstat (limited to 'apps/sharebymail/lib/Settings')
-rw-r--r-- | apps/sharebymail/lib/Settings/Admin.php | 51 | ||||
-rw-r--r-- | apps/sharebymail/lib/Settings/SettingsManager.php | 33 |
2 files changed, 19 insertions, 65 deletions
diff --git a/apps/sharebymail/lib/Settings/Admin.php b/apps/sharebymail/lib/Settings/Admin.php index f1733b73bc0..8f27bbff6d6 100644 --- a/apps/sharebymail/lib/Settings/Admin.php +++ b/apps/sharebymail/lib/Settings/Admin.php @@ -1,55 +1,32 @@ <?php + /** - * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org> - * - * @author Bjoern Schiessle <bjoern@schiessle.org> - * @author Nicolas SIMIDE <2083596+dems54@users.noreply.github.com> - * - * @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\ShareByMail\Settings; use OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Services\IInitialState; use OCP\IL10N; use OCP\Settings\IDelegatedSettings; class Admin implements IDelegatedSettings { - - /** @var SettingsManager */ - private $settingsManager; - - /** @var IL10N */ - private $l; - - public function __construct(SettingsManager $settingsManager, IL10N $l) { - $this->settingsManager = $settingsManager; - $this->l = $l; + public function __construct( + private SettingsManager $settingsManager, + private IL10N $l, + private IInitialState $initialState, + ) { } /** * @return TemplateResponse */ public function getForm() { - $parameters = [ - 'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(), - 'replyToInitiator' => $this->settingsManager->replyToInitiator() - ]; + $this->initialState->provideInitialState('sendPasswordMail', $this->settingsManager->sendPasswordByMail()); + $this->initialState->provideInitialState('replyToInitiator', $this->settingsManager->replyToInitiator()); - return new TemplateResponse('sharebymail', 'settings-admin', $parameters, ''); + return new TemplateResponse('sharebymail', 'settings-admin', [], ''); } /** @@ -61,8 +38,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 */ diff --git a/apps/sharebymail/lib/Settings/SettingsManager.php b/apps/sharebymail/lib/Settings/SettingsManager.php index 0a22e7400f3..d487bd2ac43 100644 --- a/apps/sharebymail/lib/Settings/SettingsManager.php +++ b/apps/sharebymail/lib/Settings/SettingsManager.php @@ -3,29 +3,8 @@ declare(strict_types=1); /** - * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org> - * - * @author Bjoern Schiessle <bjoern@schiessle.org> - * @author dems54 <2083596+dems54@users.noreply.github.com> - * @author Nicolas SIMIDE <2083596+dems54@users.noreply.github.com> - * @author noiob <8197071+noiob@users.noreply.github.com> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * - * @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\ShareByMail\Settings; @@ -33,15 +12,13 @@ use OCP\IConfig; class SettingsManager { - /** @var IConfig */ - private $config; - private $sendPasswordByMailDefault = 'yes'; private $replyToInitiatorDefault = 'yes'; - public function __construct(IConfig $config) { - $this->config = $config; + public function __construct( + private IConfig $config, + ) { } /** |