summaryrefslogtreecommitdiffstats
path: root/lib/private/Settings/Manager.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-06-16 15:34:16 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-06-23 12:37:42 +0200
commit07cf046216fc420965191fdd3003cdf6029dbbac (patch)
treeb630eb4a1a23d04d2847498fcce12365dab6c2af /lib/private/Settings/Manager.php
parentd7a2290ce15c70b219ecae8f0076e38a2471070d (diff)
downloadnextcloud-server-07cf046216fc420965191fdd3003cdf6029dbbac.tar.gz
nextcloud-server-07cf046216fc420965191fdd3003cdf6029dbbac.zip
take over changes from #5166 and follow #5267
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib/private/Settings/Manager.php')
-rw-r--r--lib/private/Settings/Manager.php12
1 files changed, 3 insertions, 9 deletions
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'))],
];