From 07cf046216fc420965191fdd3003cdf6029dbbac Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 16 Jun 2017 15:34:16 +0200 Subject: take over changes from #5166 and follow #5267 Signed-off-by: Arthur Schiwon --- lib/private/Settings/Manager.php | 12 ++---- lib/private/Settings/Personal/AppPasswords.php | 59 -------------------------- lib/private/Settings/Personal/Security.php | 59 ++++++++++++++++++++++++++ lib/private/Settings/Personal/Sessions.php | 59 -------------------------- 4 files changed, 62 insertions(+), 127 deletions(-) delete mode 100644 lib/private/Settings/Personal/AppPasswords.php create mode 100644 lib/private/Settings/Personal/Security.php delete mode 100644 lib/private/Settings/Personal/Sessions.php (limited to 'lib') diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index d04f4abdcd8..fe2932d9762 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -418,14 +418,9 @@ class Manager implements IManager { ); $forms[$form->getPriority()] = [$form]; } - if($section === 'sessions') { + if($section === 'security') { /** @var ISettings $form */ - $form = new Personal\Sessions(); - $forms[$form->getPriority()] = [$form]; - } - if($section === 'app-passwords') { - /** @var ISettings $form */ - $form = new Personal\AppPasswords(); + $form = new Personal\Security(); $forms[$form->getPriority()] = [$form]; } if($section === 'sync-clients') { @@ -472,8 +467,7 @@ class Manager implements IManager { public function getPersonalSections() { $sections = [ 0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))], - 5 => [new Section('sessions', $this->l->t('Sessions'), 0, $this->url->imagePath('settings', 'admin.svg'))], - 10 => [new Section('app-passwords', $this->l->t('App passwords'), 0, $this->url->imagePath('settings', 'password.svg'))], + 5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))], 15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))], 98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))], ]; diff --git a/lib/private/Settings/Personal/AppPasswords.php b/lib/private/Settings/Personal/AppPasswords.php deleted file mode 100644 index 3f2886326d4..00000000000 --- a/lib/private/Settings/Personal/AppPasswords.php +++ /dev/null @@ -1,59 +0,0 @@ - - * - * @author Arthur Schiwon - * - * @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 . - * - */ - -namespace OC\Settings\Personal; - - -use OCP\AppFramework\Http\TemplateResponse; -use OCP\Settings\ISettings; - -class AppPasswords implements ISettings { - - /** - * @return TemplateResponse returns the instance with all parameters set, ready to be rendered - * @since 9.1 - */ - public function getForm() { - return new TemplateResponse('settings', 'settings/personal/app-passwords'); - } - - /** - * @return string the section ID, e.g. 'sharing' - * @since 9.1 - */ - public function getSection() { - return 'app-passwords'; - } - - /** - * @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. - * - * E.g.: 70 - * @since 9.1 - */ - public function getPriority() { - return 5; - } -} diff --git a/lib/private/Settings/Personal/Security.php b/lib/private/Settings/Personal/Security.php new file mode 100644 index 00000000000..ecbd1199d11 --- /dev/null +++ b/lib/private/Settings/Personal/Security.php @@ -0,0 +1,59 @@ + + * + * @author Arthur Schiwon + * + * @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 . + * + */ + +namespace OC\Settings\Personal; + + +use OCP\AppFramework\Http\TemplateResponse; +use OCP\Settings\ISettings; + +class Security implements ISettings { + + /** + * @return TemplateResponse returns the instance with all parameters set, ready to be rendered + * @since 9.1 + */ + public function getForm() { + return new TemplateResponse('settings', 'settings/personal/security'); + } + + /** + * @return string the section ID, e.g. 'sharing' + * @since 9.1 + */ + public function getSection() { + return 'security'; + } + + /** + * @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. + * + * E.g.: 70 + * @since 9.1 + */ + public function getPriority() { + return 10; + } +} diff --git a/lib/private/Settings/Personal/Sessions.php b/lib/private/Settings/Personal/Sessions.php deleted file mode 100644 index 22f8a44b176..00000000000 --- a/lib/private/Settings/Personal/Sessions.php +++ /dev/null @@ -1,59 +0,0 @@ - - * - * @author Arthur Schiwon - * - * @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 . - * - */ - -namespace OC\Settings\Personal; - - -use OCP\AppFramework\Http\TemplateResponse; -use OCP\Settings\ISettings; - -class Sessions implements ISettings { - - /** - * @return TemplateResponse returns the instance with all parameters set, ready to be rendered - * @since 9.1 - */ - public function getForm() { - return new TemplateResponse('settings', 'settings/personal/sessions'); - } - - /** - * @return string the section ID, e.g. 'sharing' - * @since 9.1 - */ - public function getSection() { - return 'sessions'; - } - - /** - * @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. - * - * E.g.: 70 - * @since 9.1 - */ - public function getPriority() { - return 10; - } -} -- cgit v1.2.3