Skip to content

Commit a4cae59

Browse files
author
Kristan Kenney
committed
Fix string
1 parent 392cad5 commit a4cae59

File tree

3 files changed

+30
-14
lines changed

3 files changed

+30
-14
lines changed

‎bin/v-add-firewall-rule‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,13 @@ $BIN/v-update-firewall
100100
# Hestia #
101101
#----------------------------------------------------------#
102102

103+
# Fix missing port value in log if zero
103104
# Logging
104-
$BIN/v-log-action "system" "Info" "Firewall" "Added firewall rule (Action: $chain, Port: $port, Protocol: $protocol)."
105+
if [ -z "$port" ]; then
106+
port="0"
107+
fi
108+
109+
$BIN/v-log-action "system" "Info" "Firewall" "Added firewall rule (Action: $action, Port: $port, Protocol: $protocol)."
105110
log_event "$OK" "$ARGUMENTS"
106111

107112
exit

‎web/templates/admin/list_log.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
<div class="header table-header">
2828
<div class="l-unit__col l-unit__col--right">
29-
<div class="clearfix l-unit__stat-col--left compact text-center">&nbsp;</div>
29+
<div class="clearfix l-unit__stat-col--left super-compact text-center">&nbsp;</div>
3030
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Date');?></b></div>
31-
<div class="clearfix l-unit__stat-col--left compact"><b><?php print _('Time');?></b></div>
31+
<div class="clearfix l-unit__stat-col--left compact-2"><b><?php print _('Time');?></b></div>
3232

3333
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Category');?></b></div>
3434
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Message');?></b></div>
@@ -41,7 +41,7 @@
4141
?>
4242
<div class="l-unit header animated fadeIn">
4343
<div class="l-unit__col l-unit__col--right">
44-
<div class="clearfix l-unit__stat-col--left compact text-center">
44+
<div class="clearfix l-unit__stat-col--left super-compact text-center">
4545
<? if ($data[$key]['LEVEL'] === 'Info') {?>
4646
<i class="fas fa-info-circle status-icon blue"></i>
4747
<? } ?>
@@ -53,7 +53,7 @@
5353
<? } ?>
5454
</div>
5555
<div class="clearfix l-unit__stat-col--left"><b><?=translate_date($data[$key]['DATE'])?></b></div>
56-
<div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
56+
<div class="clearfix l-unit__stat-col--left compact-2"><b><?=$data[$key]['TIME']?></b></div>
5757

5858
<div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['CATEGORY']?></b></div>
5959
<div class="clearfix l-unit__stat-col--left wide-7"><?=htmlspecialchars($data[$key]['MESSAGE'], ENT_QUOTES)?></div>

‎web/templates/user/list_log.html‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<div class="l-unit-toolbar__buttonstrip">
44
<a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel" dir="ltr"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back')?></a>
55
<a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" dir="ltr" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
6+
67
</div>
78
<div class="l-unit-toolbar__buttonstrip float-right">
89
<a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-redo status-icon green"></i><?=_('Refresh')?></a>
@@ -16,12 +17,12 @@
1617

1718
<div class="header table-header">
1819
<div class="l-unit__col l-unit__col--right">
19-
<div class="clearfix l-unit__stat-col--left super-compact">
20-
&nbsp;
21-
</div>
20+
<div class="clearfix l-unit__stat-col--left super-compact text-center">&nbsp;</div>
2221
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Date');?></b></div>
23-
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Time');?></b></div>
24-
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Value');?></b></div>
22+
<div class="clearfix l-unit__stat-col--left compact-2"><b><?php print _('Time');?></b></div>
23+
24+
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Category');?></b></div>
25+
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Message');?></b></div>
2526
</div>
2627
</div>
2728

@@ -31,12 +32,22 @@
3132
?>
3233
<div class="l-unit header animated fadeIn">
3334
<div class="l-unit__col l-unit__col--right">
34-
<div class="clearfix l-unit__stat-col--left super-compact">
35-
<i class="fas fa-info-circle status-icon dim"></i>
35+
<div class="clearfix l-unit__stat-col--left super-compact text-center">
36+
<? if ($data[$key]['LEVEL'] === 'Info') {?>
37+
<i class="fas fa-info-circle status-icon blue"></i>
38+
<? } ?>
39+
<? if ($data[$key]['LEVEL'] === 'Warning') {?>
40+
<i class="fas fa-exclamation-triangle status-icon orange"></i>
41+
<? } ?>
42+
<? if ($data[$key]['LEVEL'] === 'Error') {?>
43+
<i class="fas fa-times-circle status-icon red"></i>
44+
<? } ?>
3645
</div>
3746
<div class="clearfix l-unit__stat-col--left"><b><?=translate_date($data[$key]['DATE'])?></b></div>
38-
<div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['TIME']?></b></div>
39-
<div class="clearfix l-unit__stat-col--left wide-7"><?=htmlspecialchars($data[$key]['CMD'], ENT_QUOTES)?></div>
47+
<div class="clearfix l-unit__stat-col--left compact-2"><b><?=$data[$key]['TIME']?></b></div>
48+
49+
<div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['CATEGORY']?></b></div>
50+
<div class="clearfix l-unit__stat-col--left wide-7"><?=htmlspecialchars($data[$key]['MESSAGE'], ENT_QUOTES)?></div>
4051
</div>
4152
</div>
4253
<?}?>

0 commit comments

Comments
 (0)