take over changes from #5166 and follow #5267

Signed-off-by: Arthur Schiwon <[email protected]>

lib/private/Settings/Manager.php

@@ -418,14 +418,9 @@ private function getBuiltInPersonalSettings($section) {
 				);
 				$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 @@ public function getAdminSettings($section) {
 	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'))],
 		];

lib/private/Settings/Personal/Sessions.php → lib/private/Settings/Personal/Security.php

@@ -27,22 +27,22 @@
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
 
-class Sessions implements 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/sessions');
+		return new TemplateResponse('settings', 'settings/personal/security');
 	}
 
 	/**
 	 * @return string the section ID, e.g. 'sharing'
 	 * @since 9.1
 	 */
 	public function getSection() {
-		return 'sessions';
+		return 'security';
 	}
 
 	/**

settings/templates/settings/personal/app-passwords.php → settings/templates/settings/personal/security.php

@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 script('settings', [
 	'authtoken',
 	'authtoken_collection',
@@ -29,16 +30,17 @@
 
 ?>
 
-<div id="apppasswords" class="section">
-	<h2><?php p($l->t('App passwords'));?></h2>
-	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
+
+<div id="security" class="section">
+	<h2><?php p($l->t('Security'));?></h2>
+	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></p>
 	<table class="icon-loading">
-		<thead class="hidden-when-empty">
-		<tr>
-			<th><?php p($l->t('Name'));?></th>
-			<th><?php p($l->t('Last activity'));?></th>
-			<th></th>
-		</tr>
+		<thead class="token-list-header">
+			<tr>
+				<th><?php p($l->t('Device'));?></th>
+				<th><?php p($l->t('Last activity'));?></th>
+				<th></th>
+			</tr>
 		</thead>
 		<tbody class="token-list">
 		</tbody>