Fix string

bin/v-add-firewall-rule

@@ -100,8 +100,13 @@ $BIN/v-update-firewall
 #                       Hestia                             #
 #----------------------------------------------------------#
 
+# Fix missing port value in log if zero
 # Logging
-$BIN/v-log-action "system" "Info" "Firewall" "Added firewall rule (Action: $chain, Port: $port, Protocol: $protocol)."
+if [ -z "$port" ]; then
+    port="0"
+fi
+
+$BIN/v-log-action "system" "Info" "Firewall" "Added firewall rule (Action: $action, Port: $port, Protocol: $protocol)."
 log_event "$OK" "$ARGUMENTS"
 
 exit

web/templates/admin/list_log.html

@@ -26,9 +26,9 @@
 
   <div class="header table-header">     
     <div class="l-unit__col l-unit__col--right">
-      <div class="clearfix l-unit__stat-col--left compact text-center">&nbsp;</div>
+      <div class="clearfix l-unit__stat-col--left super-compact text-center">&nbsp;</div>
       <div class="clearfix l-unit__stat-col--left"><b><?php print _('Date');?></b></div>
-      <div class="clearfix l-unit__stat-col--left compact"><b><?php print _('Time');?></b></div>
+      <div class="clearfix l-unit__stat-col--left compact-2"><b><?php print _('Time');?></b></div>
 
       <div class="clearfix l-unit__stat-col--left"><b><?php print _('Category');?></b></div>
       <div class="clearfix l-unit__stat-col--left"><b><?php print _('Message');?></b></div>
@@ -41,7 +41,7 @@
       ?>
       <div class="l-unit header animated fadeIn">
         <div class="l-unit__col l-unit__col--right">
-          <div class="clearfix l-unit__stat-col--left compact text-center">
+          <div class="clearfix l-unit__stat-col--left super-compact text-center">
             <? if ($data[$key]['LEVEL'] === 'Info') {?>
               <i class="fas fa-info-circle status-icon blue"></i>
             <? } ?>
@@ -53,7 +53,7 @@
             <? } ?>
           </div>
           <div class="clearfix l-unit__stat-col--left"><b><?=translate_date($data[$key]['DATE'])?></b></div>
-          <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
+          <div class="clearfix l-unit__stat-col--left compact-2"><b><?=$data[$key]['TIME']?></b></div>
 
           <div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['CATEGORY']?></b></div>
           <div class="clearfix l-unit__stat-col--left wide-7"><?=htmlspecialchars($data[$key]['MESSAGE'], ENT_QUOTES)?></div>

web/templates/user/list_log.html

@@ -3,6 +3,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <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>
       <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>
+
     </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>
@@ -16,12 +17,12 @@
 
   <div class="header table-header">     
     <div class="l-unit__col l-unit__col--right">
-      <div class="clearfix l-unit__stat-col--left super-compact">
-        &nbsp;
-      </div>       
+      <div class="clearfix l-unit__stat-col--left super-compact text-center">&nbsp;</div>
       <div class="clearfix l-unit__stat-col--left"><b><?php print _('Date');?></b></div>
-      <div class="clearfix l-unit__stat-col--left"><b><?php print _('Time');?></b></div>
-      <div class="clearfix l-unit__stat-col--left"><b><?php print _('Value');?></b></div>
+      <div class="clearfix l-unit__stat-col--left compact-2"><b><?php print _('Time');?></b></div>
+
+      <div class="clearfix l-unit__stat-col--left"><b><?php print _('Category');?></b></div>
+      <div class="clearfix l-unit__stat-col--left"><b><?php print _('Message');?></b></div>
     </div>
   </div>
 
@@ -31,12 +32,22 @@
       ?>
       <div class="l-unit header animated fadeIn">
         <div class="l-unit__col l-unit__col--right">
-          <div class="clearfix l-unit__stat-col--left super-compact">
-            <i class="fas fa-info-circle status-icon dim"></i>
+          <div class="clearfix l-unit__stat-col--left super-compact text-center">
+            <? if ($data[$key]['LEVEL'] === 'Info') {?>
+              <i class="fas fa-info-circle status-icon blue"></i>
+            <? } ?>
+            <? if ($data[$key]['LEVEL'] === 'Warning') {?>
+              <i class="fas fa-exclamation-triangle status-icon orange"></i>
+            <? } ?>
+            <? if ($data[$key]['LEVEL'] === 'Error') {?>
+              <i class="fas fa-times-circle status-icon red"></i>
+            <? } ?>
           </div>
           <div class="clearfix l-unit__stat-col--left"><b><?=translate_date($data[$key]['DATE'])?></b></div>
-          <div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['TIME']?></b></div>
-          <div class="clearfix l-unit__stat-col--left wide-7"><?=htmlspecialchars($data[$key]['CMD'], ENT_QUOTES)?></div>
+          <div class="clearfix l-unit__stat-col--left compact-2"><b><?=$data[$key]['TIME']?></b></div>
+
+          <div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['CATEGORY']?></b></div>
+          <div class="clearfix l-unit__stat-col--left wide-7"><?=htmlspecialchars($data[$key]['MESSAGE'], ENT_QUOTES)?></div>
         </div>
       </div>
   <?}?>