adapt /userLastLogins (GLPI UP1#153277)

UnivParis1 · Sep 26, 2023 · ef8f1c8 · ef8f1c8
1 parent 84bedcc
commit ef8f1c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/userLastLogins.php b/userLastLogins.php
@@ -21,7 +21,7 @@
     if (preg_match('/^#/', $line)) break;
     $e = json_decode($line, true);
     $action = getAndUnset($e, 'action');
-    if ($action !== 'TICKET_GRANTING_TICKET_CREATED') {
+    if ($action === 'AUTHENTICATION_FAILED') {
         $e['error'] = $action;
     }
     $list[] = $e;
@@ -30,7 +30,7 @@
 # all remaining $lines are "similar login failures"
 $fuzzy_failed = array_map(json_decode, $lines);
 
-$since = compute_since_from_audit_boundary_dates($audit_boundary_dates);
+$since = [ $audit_boundary_dates[0] ];
 
 
 # sort by date (needed since it is an aggregation of login logs + mail logs)
@@ -40,14 +40,4 @@
 echoJson(array("since" => $since, "list" => $list, "fuzzy_failed" => $fuzzy_failed));
 
 
-function compute_since_from_audit_boundary_dates($l) {
-    $start1 = $l[0][0]; $end1 = $l[0][1];
-    $start2 = $l[1][0]; $end2 = $l[1][1];
-    if (strcmp($end1, $start2) <= 0 || strcmp($end2, $start1) <= 0) {
-        return [$start1, $start2];
-    } else {
-        return [min($start1, $start2)];
-    }
-}
-
 ?>
diff --git a/web-widget/userinfo/userinfo.js b/web-widget/userinfo/userinfo.js
@@ -684,14 +684,14 @@ function formatLastLogins(info, data, div) {
     if (data.list.length) {
 	var details = $("<div class='vertical-scroll hidden'>");
 	$.each(data.list, function (v, e) {
-	    var t = formatDateTime(e.when) + " : " + (e.error || "SUCCESS") + " <small>(login = " + e.who + ", ip = " + e.ip + " )</small>";
+	    var t = formatDateTime(e.when) + " : " + (e.error || "SUCCESS") + " <small>(login = " + e.login + ", ip = " + e.ip + " )</small>";
 	    details.append(t + '<br>');
 	})
 	if (data.fuzzy_failed.length) {
 	    details.append("<br>Logins en échec avec login légèrement différent :<br>");
 	}
 	$.each(data.fuzzy_failed, function (v, e) {
-	    var t = formatDateTime(e.when) + " : " + e.who + " FAILED <small>(ip = " + e.ip + " )</small>";
+	    var t = formatDateTime(e.when) + " : " + e.login + " FAILED <small>(ip = " + e.ip + " )</small>";
 	    details.append(t + '<br>');
 	})
 	div.append($("<span class='clickable'>").append(" <small>details</small>").click(function () { details.toggleClass("hidden") }));