added: user first and last login time to export data

ColdTrick · Aug 21, 2024 · e83136c · e83136c
1 parent 272cf25
commit e83136c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/classes/ColdTrick/CSVExporter/ExportableValues.php b/classes/ColdTrick/CSVExporter/ExportableValues.php
@@ -106,6 +106,10 @@ protected static function getUserExportableValues(): array {
 		$result[elgg_echo('email')] = 'email';
 		$result[elgg_echo('csv_exporter:exportable_value:user:last_action')] = 'csv_exporter_user_last_action';
 		$result[elgg_echo('csv_exporter:exportable_value:user:last_action_readable')] = 'csv_exporter_user_last_action_readable';
+		$result[elgg_echo('csv_exporter:exportable_value:user:first_login')] = 'csv_exporter_user_first_login';
+		$result[elgg_echo('csv_exporter:exportable_value:user:first_login_readable')] = 'csv_exporter_user_first_login_readable';
+		$result[elgg_echo('csv_exporter:exportable_value:user:last_login')] = 'csv_exporter_user_last_login';
+		$result[elgg_echo('csv_exporter:exportable_value:user:last_login_readable')] = 'csv_exporter_user_last_login_readable';
 		$result[elgg_echo('csv_exporter:exportable_value:user:groups_owned_name')] = 'csv_exporter_user_groups_owned_name';
 		$result[elgg_echo('csv_exporter:exportable_value:user:groups_owned_url')] = 'csv_exporter_user_groups_owned_url';
 		$result[elgg_echo('csv_exporter:exportable_value:user:friends')] = 'csv_exporter_user_friends';
@@ -303,14 +307,20 @@ public static function exportUserValue(\Elgg\Event $event) {
 		];
 
 		$exportable_value = $event->getParam('exportable_value');
+		$exportable_value = substr($exportable_value, strlen('csv_exporter_user_'));
 		switch ($exportable_value) {
-			case 'csv_exporter_user_last_action':
-				return (int) $entity->last_action;
+			case 'first_login':
+			case 'last_action':
+			case 'last_login':
+				return (int) $entity->{$exportable_value};
 
-			case 'csv_exporter_user_last_action_readable':
-				return csv_exported_get_readable_timestamp($entity->last_action);
+			case 'first_login_readable':
+			case 'last_action_readable':
+			case 'last_login_readable':
+				$exportable_value = substr($exportable_value, 0, -strlen('_readable'));
+				return $entity->{$exportable_value} ? csv_exported_get_readable_timestamp((int) $entity->{$exportable_value}) : '';
 
-			case 'csv_exporter_user_groups_owned_name':
+			case 'groups_owned_name':
 				$result = [];
 
 				$batch = elgg_get_entities($group_options);
@@ -320,7 +330,7 @@ public static function exportUserValue(\Elgg\Event $event) {
 				}
 				return $result;
 
-			case 'csv_exporter_user_groups_owned_url':
+			case 'groups_owned_url':
 				$result = [];
 
 				$batch = elgg_get_entities($group_options);
@@ -330,14 +340,14 @@ public static function exportUserValue(\Elgg\Event $event) {
 				}
 				return $result;
 
-			case 'csv_exporter_user_friends':
+			case 'friends':
 				return (int) $entity->getEntitiesFromRelationship([
 					'type' => 'user',
 					'relationship' => 'friend',
 					'count' => true,
 				]);
 
-			case 'csv_exporter_user_friends_of':
+			case 'friends_of':
 				return (int) $entity->getEntitiesFromRelationship([
 					'type' => 'user',
 					'relationship' => 'friend',

diff --git a/languages/en.php b/languages/en.php
@@ -60,6 +60,10 @@
 
 	'csv_exporter:exportable_value:user:last_action' => "Last action",
 	'csv_exporter:exportable_value:user:last_action_readable' => "Last action (readable)",
+	'csv_exporter:exportable_value:user:first_login' => "First login",
+	'csv_exporter:exportable_value:user:first_login_readable' => "First login (readable)",
+	'csv_exporter:exportable_value:user:last_login' => "Last login",
+	'csv_exporter:exportable_value:user:last_login_readable' => "Last login (readable)",
 	'csv_exporter:exportable_value:user:groups_owned_name' => "Groups owned name",
 	'csv_exporter:exportable_value:user:groups_owned_url' => "Groups owned url",
 	'csv_exporter:exportable_value:user:banned' => "Banned",

diff --git a/languages/nl.php b/languages/nl.php
@@ -1,10 +1,14 @@
 <?php
 /**
- * This file was created by Translation Editor v11.1
- * On 2023-05-17 14:29
+ * This file was created by Translation Editor v14.0
+ * On 2024-08-21 12:59
  */
 
 return array (
+  'csv_exporter:exportable_value:user:first_login' => 'Eerste aanmelding',
+  'csv_exporter:exportable_value:user:first_login_readable' => 'Eerste aanmelding (leesbaar)',
+  'csv_exporter:exportable_value:user:last_login' => 'Laatste aanmelding',
+  'csv_exporter:exportable_value:user:last_login_readable' => 'Laatste aanmelding (leesbaar)',
   'csv_exporter:exportable_value:group:postfix' => ' (alleen gedurende groep export)',
   'csv_exporter:exportable_value:user:group:member:unix' => 'Lid sinds (UNIX)',
   'csv_exporter:exportable_value:user:group:member:readable' => 'Lid sinds',