aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar equinoxmatt <me@mattbutterworth.co.uk> 2020-05-09 11:49:49 +0100
committerGravatar GitHub <noreply@github.com> 2020-05-09 12:49:49 +0200
commitbe10486f5e45148c78ab0c0a57a4056d5fc2889a (patch)
tree0cedad1658d91c0aea5e776e48dc3bb06bc4b435
parent17539668eac84b9f7b86de036c9e23fa226054d6 (diff)
2914 show last login date (#2936)
* Add new last_login param to default user config * Add English translation strings for last login feature * Update last_login when user successfully logs in. * Add last_login column to manage users screen * Add last_login to user details screen * Remove accidental docker-compose.yml * Fix whitespace * Use last modified time for config file * Remove last_login field from default user config * Touch user configuration file upon succesful login * Add translations with todos * Fix whitespace * Use last_user_activity * Semi-colomn Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Diffstat
-rw-r--r--app/Controllers/userController.php1
-rw-r--r--app/i18n/cz/admin.php1
-rw-r--r--app/i18n/de/admin.php1
-rw-r--r--app/i18n/en/admin.php1
-rwxr-xr-xapp/i18n/es/admin.php1
-rw-r--r--app/i18n/fr/admin.php1
-rw-r--r--app/i18n/he/admin.php1
-rw-r--r--app/i18n/it/admin.php1
-rw-r--r--app/i18n/kr/admin.php1
-rw-r--r--app/i18n/nl/admin.php3
-rw-r--r--app/i18n/oc/admin.php1
-rw-r--r--app/i18n/pt-br/admin.php1
-rw-r--r--app/i18n/ru/admin.php1
-rw-r--r--app/i18n/sk/admin.php1
-rw-r--r--app/i18n/tr/admin.php1
-rw-r--r--app/i18n/zh-cn/admin.php1
-rw-r--r--app/views/user/details.phtml7
-rw-r--r--app/views/user/manage.phtml6
18 files changed, 27 insertions, 4 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 5da42f5a4..491350ef3 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -616,6 +616,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
'language' => $userConfiguration->language,
'mail_login' => $userConfiguration->mail_login,
'is_admin' => $userConfiguration->is_admin,
+ 'last_user_activity' => date('c', FreshRSS_UserDAO::mtime($username)),
);
}
}
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index ebf8b1a90..56af9244b 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'Jazyk',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => 'Zatím je vytvořen %d účet',
'numbers' => 'Zatím je vytvořeno %d účtů',
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 058661602..4881846a7 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'Sprache',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => 'Es wurde bis jetzt %d Account erstellt',
'numbers' => 'Es wurden bis jetzt %d Accounts erstellt',
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 02a8a8b58..e8bab3a75 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds',
'is_admin' => 'Is admin',
'language' => 'Language',
+ 'last_user_activity' => 'Last user activity',
'list' => 'User list',
'number' => 'There is %d account created',
'numbers' => 'There are %d accounts created',
diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php
index d036f2362..02b556c13 100755
--- a/app/i18n/es/admin.php
+++ b/app/i18n/es/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'Idioma',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => 'Hay %d cuenta creada',
'numbers' => 'Hay %d cuentas creadas',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index abc67110e..6eda83656 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Flux',
'is_admin' => 'Admin ?',
'language' => 'Langue',
+ 'last_user_activity' => 'Dernière activité utilisateur',
'list' => 'Liste des utilisateurs',
'number' => '%d compte a déjà été créé',
'numbers' => '%d comptes ont déjà été créés',
diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php
index bc679bf60..ea4884d4d 100644
--- a/app/i18n/he/admin.php
+++ b/app/i18n/he/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'שפה',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => 'There is %d account created', // TODO - Translation
'numbers' => 'There are %d accounts created', // TODO - Translation
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index 78253d756..7ed60d8dd 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'Lingua',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => ' %d profilo utente creato',
'numbers' => 'Sono presenti %d profili utente',
diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php
index 9980a5335..321860d93 100644
--- a/app/i18n/kr/admin.php
+++ b/app/i18n/kr/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => '언어',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => '%d 개의 계정이 생성되었습니다',
'numbers' => '%d 개의 계정이 생성되었습니다',
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index 34524e566..1675db61f 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'Taal',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => 'Er is %d accounts gemaakt',
'numbers' => 'Er zijn %d accounts gemaakt',
@@ -203,6 +204,6 @@ return array(
'update_users' => 'Gebruiker bijwerken',
'username' => 'Gebruikersnaam',
'users' => 'Gebruikers',
- 'user_list' => 'Lijst van gebruikers ',
+ 'user_list' => 'Lijst van gebruikers',
),
);
diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php
index e1e8b5f34..1899bb5f9 100644
--- a/app/i18n/oc/admin.php
+++ b/app/i18n/oc/admin.php
@@ -194,6 +194,7 @@ return array(
'is_admin' => 'Es admin',
'language' => 'Lenga',
'list' => 'Lista dels utilizaires',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'number' => '%d compte ja creat',
'numbers' => '%d comptes ja creats',
'password_form' => 'Senhal <br /><small>(ex. : per la connexion via formulari)</small>',
diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php
index b89e446cb..b9f9911dc 100644
--- a/app/i18n/pt-br/admin.php
+++ b/app/i18n/pt-br/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds',
'is_admin' => 'É administrador',
'language' => 'Idioma',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'Lista de usuários',
'number' => 'Há %d conta criada',
'numbers' => 'Há %d contas criadas',
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index ffb0b662c..993a90cca 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'Язык',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => 'На данный момент создан %d аккаунт',
'numbers' => 'На данный момент аккаунтов создано: %d',
diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php
index eeb2fd3d4..64d972d00 100644
--- a/app/i18n/sk/admin.php
+++ b/app/i18n/sk/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'Jazyk',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => 'Je vytvorený používateľ: %d',
'numbers' => 'Je vytvorených používateľov: %d',
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index de30a0d50..72b7661aa 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => 'Feeds', // TODO - Translation
'is_admin' => 'Is admin', // TODO - Translation
'language' => 'Dil',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => 'User list', // TODO - Translation
'number' => 'Oluşturulmuş %d hesap var',
'numbers' => 'Oluşturulmuş %d hesap var',
diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php
index 6905b1547..9a83c0a75 100644
--- a/app/i18n/zh-cn/admin.php
+++ b/app/i18n/zh-cn/admin.php
@@ -193,6 +193,7 @@ return array(
'feed_count' => '订阅源数',
'is_admin' => '管理员',
'language' => '语言',
+ 'last_user_activity' => 'Last user activity', // TODO - Translation
'list' => '用户列表',
'number' => '已有 %d 个用户',
'numbers' => '已有 %d 个用户',
diff --git a/app/views/user/details.phtml b/app/views/user/details.phtml
index ee5e381fd..8b3cc3a44 100644
--- a/app/views/user/details.phtml
+++ b/app/views/user/details.phtml
@@ -45,6 +45,13 @@
</div>
<div class="form-group">
+ <label class="group-name"><?= _t('admin.user.last_user_activity') ?></label>
+ <div class="group-controls">
+ <?= $this->details['last_user_activity'] ?>
+ </div>
+ </div>
+
+ <div class="form-group">
<label class="group-name" for="newPasswordPlain"><?= _t('admin.user.password_form') ?></label>
<div class="group-controls">
<div class="stick">
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 627d229d2..5c4e1e128 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -77,20 +77,20 @@
<th><?= _t('admin.user.feed_count') ?></th>
<th><?= _t('admin.user.article_count') ?></th>
<th><?= _t('admin.user.database_size') ?></th>
- <th>&nbsp;</th>
+ <th><?= _t('admin.user.last_user_activity') ?></th>
</tr>
</thead>
<tbody>
<?php foreach ($this->users as $username => $values) : ?>
<tr>
- <td><?= $username ?></td>
+ <td><a href="<?= _url('user', 'details', 'username', $username) ?>"><?= $username ?></a></td>
<td><?= $values['is_admin'] ? '✔' : ' ' ?></td>
<td><?= $values['mail_login'] ?></td>
<td><?= _t("gen.lang.{$values['language']}") ?></td>
<td><?= format_number($values['feed_count']) ?></td>
<td><?= format_number($values['article_count']) ?></td>
<td><?= format_bytes($values['database_size']) ?></td>
- <td><a href="<?= _url('user', 'details', 'username', $username) ?>">Details</a></td>
+ <td><?= $values['last_user_activity'] ?></td>
</tr>
<?php endforeach ?>
</tbody>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 09:20:44 +0000