Skip to content

Commit 2f82ca2

Browse files
jaapmarcusjaapmarcus
committed
Fix auth user logs issues
1 parent 97c4d6c commit 2f82ca2

File tree

2 files changed

+45
-48
lines changed

2 files changed

+45
-48
lines changed

‎web/edit/user/log/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
exec(HESTIA_CMD."v-list-user-auth-log ".escapeshellarg($v_username)." json", $output, $return_var);
2525
check_return_code($return_var,$output);
2626
$data = json_decode(implode('', $output), true);
27-
array_reverse($data);
27+
$data = array_reverse($data);
2828
unset($output);
2929

3030
// Render page

‎web/templates/admin/list_auth.html‎

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,58 @@
11
<div class="l-center">
2-
<div class="l-sort clearfix noselect">
3-
<div class="l-unit-toolbar_buttonstrip">
4-
<a href="javascript:location.reload();" class="ui-button cancel" title="<?=_('Refresh')?>"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
5-
<div class="actions-panel display-inline-block" key-action="js">
6-
<a class="data-controls do_delete ui-button danger cancel" title="<?=_('Delete')?>">
7-
<i class="do_delete fas fa-times-circle status-icon red"></i>
8-
<?=_('Delete')?>
9-
<input type="hidden" name="delete_url" value="/delete/user/log/?token=<?=$_SESSION['token']?>" />
10-
<div class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
11-
<p class="confirmation"><?=_('Delete authentication logs?')?></p>
12-
</div>
13-
</a>
2+
<div class="l-sort clearfix noselect">
3+
<div class="l-unit-toolbar__buttonstrip">
4+
<a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
5+
<div class="actions-panel display-inline-block" key-action="js">
6+
<a class="data-controls do_delete ui-button danger cancel">
7+
<i class="do_delete fas fa-times-circle status-icon red"></i>
8+
<?=_('Delete')?>
9+
<input type="hidden" name="delete_url" value="/delete/user/log/?token=<?=$_SESSION['token']?>" />
10+
<div class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
11+
<p class="confirmation"><?=_('Delete authentication logs')?></p>
12+
</div>
13+
</a>
14+
</div>
15+
</div>
16+
<div class="l-sort-toolbar clearfix">
17+
</div>
1418
</div>
1519
</div>
16-
<div class="l-sort-toolbar clearfix">
17-
</div>
18-
</div>
19-
</div>
2020

2121
<div class="l-separator"></div>
2222

2323
<div class="l-center units animated fadeIn">
24-
25-
<div class="header table-header">
26-
<div class="l-unit_col l-unit_col--right">
27-
<div class="clearfix l-unit_stat-col--left super-compact">
24+
<div class="header table-header">
25+
<div class="l-unit__col l-unit__col--right">
26+
<div class="clearfix l-unit__stat-col--left super-compact">
2827
&nbsp;
2928
</div>
30-
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Date');?></b></div>
31-
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Time');?></b></div>
32-
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Ip adress');?></b></div>
33-
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Active');?></b></div>
34-
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Browser Fingerprint');?></b></div>
29+
<div class="clearfix l-unit__stat-col--left small"><b><?php print _('Date');?></b></div>
30+
<div class="clearfix l-unit__stat-col--left compact"><b><?php print _('Time');?></b></div>
31+
<div class="clearfix l-unit__stat-col--left "><b><?php print _('Ip adress');?></b></div>
32+
<div class="clearfix l-unit__stat-col--left "><b><?php print _('Active');?></b></div>
33+
<div class="clearfix l-unit__stat-col--left wide-4"><b><?php print _('Browser Fingerprint');?></b></div>
34+
</div>
35+
</div>
36+
<?php
37+
foreach ($data as $key => $value) {
38+
++$i;
39+
?>
40+
<div class="l-unit header">
41+
<div class="l-unit__col l-unit__col--right">
42+
<div class="clearfix l-unit__stat-col--left super-compact">
43+
<i class="fas fa-info-circle status-icon dim"></i>
44+
</div>
45+
<div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
46+
<div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
47+
<div class="clearfix l-unit__stat-col--left "><?=$data[$key]['IP']?></div>
48+
<div class="clearfix l-unit__stat-col--left "><?=$data[$key]['ACTIVE']?></div>
49+
<div class="clearfix l-unit__stat-col--left "><?=$data[$key]['FINGERPRINT']?></div>
50+
51+
3552
</div>
3653
</div>
54+
<?}?>
3755

38-
<?php
39-
foreach ($data as $key => $value) {
40-
++$i;
41-
?>
42-
<div class="l-unit header">
43-
<div class="l-unit_col l-unit_col--right">
44-
<div class="clearfix l-unit_stat-col--left super-compact">
45-
<i class="fas fa-info-circle status-icon dim"></i>
46-
</div>
47-
<div class="clearfix l-unit_stat-col--left "><b><?=translate_date($data[$key]['DATE'])?></b></div>
48-
<div class="clearfix l-unit_stat-col--left "><b><?=$data[$key]['TIME']?></b></div>
49-
<div class="clearfix l-unit_stat-col--left "><?=$data[$key]['IP']?></div>
50-
<div class="clearfix l-unit_stat-col--left small"><?=$data[$key]['ACTIVE']?></div>
51-
<div class="clearfix l-unit_stat-col--left "><?=$data[$key]['FINGERPRINT']?></div>
52-
</div>
53-
</div>
54-
<?}?>
5556
</div>
5657

5758
<div id="vstobjects">
@@ -61,11 +62,7 @@
6162
<table class='data'></table>
6263
<div class="data-count l-unit_col l-unit_col--right clearfix">
6364
<?
64-
if ( $i == 1) {
65-
echo _('1 log record');
66-
} else {
67-
echo _('%s log records',$i);
68-
}
65+
printf(ngettext('%d log record', '%d log records', $i),$i);
6966
?>
7067
</div>
7168
</div>

0 commit comments

Comments
 (0)