From 2bbc579d726af1c2a68524933117c65aa4d7ea91 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 11 May 2020 17:45:08 +0200
Subject: Add lang and mail in CLI user-info (#2958)

* Add lang and mail in CLI user-info

Anf update documentation after
https://github.com/FreshRSS/FreshRSS/pull/2296

* iff and language
---
 cli/user-info.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'cli/user-info.php')

diff --git a/cli/user-info.php b/cli/user-info.php
index f56bd9aa5..2123c1b99 100755
--- a/cli/user-info.php
+++ b/cli/user-info.php
@@ -2,7 +2,7 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
-const DATA_FORMAT = "%-7s | %-20s | %-25s | %-15s | %-10s | %-10s | %-10s | %-10s | %-10s | %-10s\n";
+const DATA_FORMAT = "%-7s | %-20s | %-25s | %-15s | %-10s | %-10s | %-10s | %-10s | %-10s | %-10s | %-5s | %-10s\n";
 
 $params = array(
 	'user:',
@@ -29,20 +29,23 @@ if (array_key_exists('header', $options)) {
 		DATA_FORMAT,
 		'default',
 		'user',
-		'last update',
+		'last user activity',
 		'space used',
 		'categories',
 		'feeds',
 		'reads',
 		'unreads',
 		'favourites',
-		'tags'
+		'tags',
+		'lang',
+		'email'
 	);
 }
 
 foreach ($users as $username) {
 	$username = cliInitUser($username);
 
+	$userConfiguration = get_user_configuration($username);
 	$catDAO = FreshRSS_Factory::createCategoryDao($username);
 	$feedDAO = FreshRSS_Factory::createFeedDao($username);
 	$entryDAO = FreshRSS_Factory::createEntryDao($username);
@@ -55,18 +58,20 @@ foreach ($users as $username) {
 	$data = array(
 		'default' => $username === FreshRSS_Context::$system_conf->default_user ? '*' : '',
 		'user' => $username,
-		'lastUpdate' => FreshRSS_UserDAO::mtime($username),
-		'spaceUsed' => $databaseDAO->size(),
+		'last_user_activity' => FreshRSS_UserDAO::mtime($username),
+		'database_size' => $databaseDAO->size(),
 		'categories' => $catDAO->count(),
 		'feeds' => count($feedDAO->listFeedsIds()),
 		'reads' => $nbEntries['read'],
 		'unreads' => $nbEntries['unread'],
 		'favourites' => $nbFavorites['all'],
 		'tags' => $tagDAO->count(),
+		'lang' => $userConfiguration->language,
+		'mail_login' => $userConfiguration->mail_login,
 	);
 	if (isset($options['h'])) {	//Human format
-		$data['lastUpdate'] = date('c', $data['lastUpdate']);
-		$data['spaceUsed'] = format_bytes($data['spaceUsed']);
+		$data['last_user_activity'] = date('c', $data['last_user_activity']);
+		$data['database_size'] = format_bytes($data['database_size']);
 	}
 	vprintf(DATA_FORMAT, $data);
 }
-- 
cgit v1.2.3