@@ -476,22 +476,44 @@ function get_user_data($from, $number_of_items, $column, $direction)
476476 $ user [7 ] = '-1 ' ;
477477 }
478478 }
479-
480- // forget about the expiration date field
481- $ users [] = [
482- $ user [0 ], // id
483- $ photo ,
484- $ user [1 ],
485- $ user [2 ],
486- $ user [3 ],
487- $ user [4 ], // username
488- $ user [5 ], // email
489- $ user [6 ],
490- $ user [7 ], // active
491- api_get_local_time ($ user [8 ]),
492- api_get_local_time ($ user [9 ], null , null , true ),
493- $ user [0 ],
494- ];
479+ if (api_get_configuration_value ('admin_user_list_add_first_connexion_column ' )) {
480+ $ firstConnectionDate = Tracking::get_first_connection_date ($ user [0 ]);
481+ if ($ firstConnectionDate == '' ) {
482+ $ firstConnectionDate = get_lang ('NoConnexion ' );
483+ }
484+ // forget about the expiration date field
485+ $ users [] = [
486+ $ user [0 ], // id
487+ $ photo ,
488+ $ user [1 ],
489+ $ user [2 ],
490+ $ user [3 ],
491+ $ user [4 ], // username
492+ $ user [5 ], // email
493+ $ user [6 ],
494+ $ user [7 ], // active
495+ api_get_local_time ($ user [8 ]),
496+ api_get_local_time ($ user [9 ], null , null , true ),
497+ $ firstConnectionDate ,
498+ $ user [0 ],
499+ ];
500+ } else {
501+ // forget about the expiration date field
502+ $ users [] = [
503+ $ user [0 ], // id
504+ $ photo ,
505+ $ user [1 ],
506+ $ user [2 ],
507+ $ user [3 ],
508+ $ user [4 ], // username
509+ $ user [5 ], // email
510+ $ user [6 ],
511+ $ user [7 ], // active
512+ api_get_local_time ($ user [8 ]),
513+ api_get_local_time ($ user [9 ], null , null , true ),
514+ $ user [0 ],
515+ ];
516+ }
495517 }
496518
497519 return $ users ;
@@ -1077,14 +1099,20 @@ class="btn btn-default advanced_options" onclick="display_advanced_search_form()
10771099$ table ->set_header (8 , get_lang ('Active ' ));
10781100$ table ->set_header (9 , get_lang ('RegistrationDate ' ));
10791101$ table ->set_header (10 , get_lang ('LatestLogin ' ));
1080- $ table ->set_header (11 , get_lang ('Action ' ), false );
1102+ if (api_get_configuration_value ('admin_user_list_add_first_connexion_column ' )) {
1103+ $ table ->set_header (11 , get_lang ('FirstLoginInPlatform ' ), false );
1104+ $ table ->set_header (12 , get_lang ('Action ' ), false );
1105+ $ table ->set_column_filter (12 , 'modify_filter ' );
1106+ } else {
1107+ $ table ->set_header (11 , get_lang ('Action ' ), false );
1108+ $ table ->set_column_filter (11 , 'modify_filter ' );
1109+ }
10811110
10821111$ table ->set_column_filter (3 , 'user_filter ' );
10831112$ table ->set_column_filter (4 , 'user_filter ' );
10841113$ table ->set_column_filter (6 , 'email_filter ' );
10851114$ table ->set_column_filter (7 , 'status_filter ' );
10861115$ table ->set_column_filter (8 , [UserManager::class, 'getActiveFilterForTable ' ]);
1087- $ table ->set_column_filter (11 , 'modify_filter ' );
10881116
10891117// Hide email column if login is email, to avoid column with same data
10901118if (api_get_setting ('login_is_email ' ) === 'true ' ) {
0 commit comments