Get correct details in v-list-user-auth-log

Author: Kristan Kenney

bin/v-list-user-auth-log

@@ -23,19 +23,21 @@ json_list() {
     objects=$(echo "$logs" |wc -l)
     echo "{"
     for str in $logs; do
-        IP=$(echo "$str" |cut -f 2 -d \')
-        FINGERPRINT=$(echo "$str" |cut -f 4 -d \')
-        STATUS=$(echo "$str" |cut -f 6 -d \')
-        DATE=$(echo "$str" |cut -f 8 -d \')
-        TIME=$(echo "$str" |cut -f 10 -d \')
-        ACTIVE=$(echo "$str" |cut -f 12 -d \')
+        DATE=$(echo "$str" |cut -f 2 -d \')
+        TIME=$(echo "$str" |cut -f 4 -d \')
+        IP=$(echo "$str" |cut -f 6 -d \')
+        ACTION=$(echo "$str" |cut -f 8 -d \')
+        STATUS=$(echo "$str" |cut -f 10 -d \')
+        SESSION=$(echo "$str" |cut -f 12 -d \')
+        ACTIVE=$(echo "$str" |cut -f 14 -d \')
         echo -n '    "'$i'": {
-            "IP": "'$IP'",
-            "FINGERPRINT": "'$FINGERPRINT'",
-            "TIME": "'$TIME'",
             "DATE": "'$DATE'",
-            "ACTIVE": "'$ACTIVE'",
-            "STATUS": "'$STATUS'"
+            "TIME": "'$TIME'",
+            "IP": "'$IP'",
+            "ACTION": "'$ACTION'",
+            "STATUS": "'$STATUS'",
+            "SESSION": "'$SESSION'",
+            "ACTIVE": "'$ACTIVE'"
         }'
         if [ "$i" -lt "$objects" ]; then
             echo ','
@@ -49,45 +51,48 @@ json_list() {
 
 shell_list() {
     IFS=$'\n'
-    echo "DATE~TIME~IP~FINGERPRINT~ACTIVE~STATUS"
+    echo "DATE~TIME~IP~SESSION~ACTIVE~STATUS"
     echo "----~----~--~-----------~------"
     for str in $logs; do
-        IP=$(echo "$str" |cut -f 2 -d \')
-        FINGERPRINT=$(echo "$str" |cut -f 4 -d \')
-        STATUS=$(echo "$str" |cut -f 6 -d \')
-        DATE=$(echo "$str" |cut -f 8 -d \')
-        TIME=$(echo "$str" |cut -f 10 -d \')
-        ACTIVE=$(echo "$str" |cut -f 12 -d \')
-        echo "$DATE~$TIME~$IP~$FINGERPRINT~$ACTIVE~$STATUS"
+        DATE=$(echo "$str" |cut -f 2 -d \')
+        TIME=$(echo "$str" |cut -f 4 -d \')
+        IP=$(echo "$str" |cut -f 6 -d \')
+        ACTION=$(echo "$str" |cut -f 8 -d \')
+        STATUS=$(echo "$str" |cut -f 10 -d \')
+        SESSION=$(echo "$str" |cut -f 12 -d \')
+        ACTIVE=$(echo "$str" |cut -f 14 -d \')
+        echo "$DATE~$TIME~$IP~$ACTION~$STATUS~$SESSION~$ACTIVE"
     done
 }
 
 # PLAIN list function
 plain_list() {
     IFS=$'\n'
     for str in $logs; do
-        IP=$(echo "$str" |cut -f 2 -d \')
-        FINGERPRINT=$(echo "$str" |cut -f 4 -d \')
-        STATUS=$(echo "$str" |cut -f 6 -d \')
-        DATE=$(echo "$str" |cut -f 8 -d \')
-        TIME=$(echo "$str" |cut -f 10 -d \')
-        ACTIVE=$(echo "$str" |cut -f 12 -d \')
-        echo -e "$DATE\t$TIME\t$IP\t$FINGERPRINT\t$ACTIVE\t$STATUS"
+        DATE=$(echo "$str" |cut -f 2 -d \')
+        TIME=$(echo "$str" |cut -f 4 -d \')
+        IP=$(echo "$str" |cut -f 6 -d \')
+        ACTION=$(echo "$str" |cut -f 8 -d \')
+        STATUS=$(echo "$str" |cut -f 10 -d \')
+        SESSION=$(echo "$str" |cut -f 12 -d \')
+        ACTIVE=$(echo "$str" |cut -f 14 -d \')
+        echo -e "$DATE\t$TIME\t$IP\t$ACTION\t$STATUS\t$SESSION\t$ACTIVE"
     done
 }
 
 # CSV list function
 csv_list() {
     IFS=$'\n'
-    echo "DATE,TIME,IP,FINGERPRINT,ACTIVE,STATUS"
+    echo "DATE,TIME,IP,ACTION,STATUS,SESSION,ACTIVE"
     for str in $logs; do
-        IP=$(echo "$str" |cut -f 2 -d \')
-        FINGERPRINT=$(echo "$str" |cut -f 4 -d \')
-        STATUS=$(echo "$str" |cut -f 6 -d \')
-        DATE=$(echo "$str" |cut -f 8 -d \')
-        TIME=$(echo "$str" |cut -f 10 -d \')
-        ACTIVE=$(echo "$str" |cut -f 12 -d \')
-        echo "$DATE,$TIME,$IP,$FINGERPRINT,$ACTIVE,$STATUS"
+        DATE=$(echo "$str" |cut -f 2 -d \')
+        TIME=$(echo "$str" |cut -f 4 -d \')
+        IP=$(echo "$str" |cut -f 6 -d \')
+        ACTION=$(echo "$str" |cut -f 8 -d \')
+        STATUS=$(echo "$str" |cut -f 10 -d \')
+        SESSION=$(echo "$str" |cut -f 12 -d \')
+        ACTIVE=$(echo "$str" |cut -f 14 -d \')
+        echo "$DATE,$TIME,$IP,$SESSION,$ACTIVE,$STATUS"
 
     done
 }

web/templates/admin/list_log_auth.html

@@ -5,6 +5,15 @@
     </div>
     <div class="l-unit-toolbar__buttonstrip float-right">
       <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-redo status-icon green"></i><?=_('Refresh')?></a>
+      <div class="actions-panel display-inline-block" key-action="js">
+        <a class="data-controls do_delete ui-button danger cancel">
+          <i class="do_delete fas fa-times-circle status-icon red"></i><?=_('Delete')?>
+          <input type="hidden" name="delete_url" value="/delete/log/auth/?token=<?=$_SESSION['token']?>" />
+            <div class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
+              <p class="confirmation"><?=_('DELETE_LOGS_CONFIRMATION')?></p>
+            </div>
+        </a>
+      </div>
     </div>
   </div>
 </div>