diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2021-12-17 15:50:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 15:50:04 +0300 |
| commit | 0200e1c602466862aa1001dc550999d4f42b64b7 (patch) | |
| tree | 7706fd08e9c6bfdff284770faae203a0b88b8e98 | |
| parent | 967a6b54e96f4532c2e0ee110e22f2fc646cf346 (diff) | |
| parent | 79dcca4e66691eee28e1e2515f79b2e06057b4f9 (diff) | |
Merge pull request #217 from nextcloud/fix/api_break
Revert "Add admin delegation support"
| -rw-r--r-- | lib/Controller/SettingsController.php | 1 | ||||
| -rw-r--r-- | lib/Settings/Admin.php | 22 |
2 files changed, 3 insertions, 20 deletions
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 550b4a1..f252cc3 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -42,7 +42,6 @@ class SettingsController extends Controller { /** * Save Parameters * - * @AuthorizedAdminSetting(settings=OCA\Files_Antivirus\Settings\Admin) * @param string $avMode - antivirus mode * @param string $avSocket - path to socket (Socket mode) * @param string $avHost - antivirus url diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 084e6e1..6b51c4f 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -3,7 +3,6 @@ * @copyright Copyright (c) 2018 Roeland Jago Douma <roeland@famdouma.nl> * * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Carl Schwan <carl@carlschwan.eu> * * @license GNU AGPL version 3 or any later version * @@ -25,20 +24,15 @@ namespace OCA\Files_Antivirus\Settings; use OCA\Files_Antivirus\AppConfig; use OCP\AppFramework\Http\TemplateResponse; -use OCP\IL10N; -use OCP\Settings\IDelegatedSettings; +use OCP\Settings\ISettings; -class Admin implements IDelegatedSettings { +class Admin implements ISettings { /** @var AppConfig */ private $config; - /** @var IL10n */ - private $l; - - public function __construct(AppConfig $config, IL10n $l) { + public function __construct(AppConfig $config) { $this->config = $config; - $this->l = $l; } public function getForm() { @@ -53,14 +47,4 @@ class Admin implements IDelegatedSettings { public function getPriority() { return 90; } - - public function getName(): string { - return $this->l->t("Antivirus"); - } - - public function getAuthorizedAppConfig(): array { - return [ - 'files_antivirus' => ['.*'], - ]; - } } |