From cf4f97dd2088e057ae7a832d3fdca058a845f354 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 1 Mar 2024 08:07:21 +0100
Subject: [PATCH] firewall: fix PHP warnings

---
 src/www/firewall_nat.php          | 2 +-
 src/www/firewall_nat_edit.php     | 4 ++--
 src/www/firewall_nat_out_edit.php | 4 ++--
 src/www/firewall_rules_edit.php   | 4 ++--
 src/www/firewall_scrub.php        | 2 +-
 src/www/firewall_scrub_edit.php   | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index c22a1e8eb..14cfc74d8 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -475,7 +475,7 @@ $( document ).ready(function() {
                       </td>
 
                       <td>
-                        <span title="<?=htmlspecialchars(get_alias_description($natent['target']));?>" data-toggle="tooltip" data-html="true">
+                        <span title="<?= html_safe(get_alias_description($natent['target'])) ?>" data-toggle="tooltip" data-html="true">
                           <?=$natent['target'];?>
                         </span>
 
diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index f3ff6dd88..c7ddbc5a9 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -1103,7 +1103,7 @@ $( document ).ready(function() {
                 <tr>
                   <td><?=gettext("Created");?></td>
                   <td>
-                    <?= date(gettext('n/j/y H:i:s'), $pconfig['created']['time']) ?> (<?= $pconfig['created']['username'] ?>)
+                    <?= date(gettext('n/j/y H:i:s'), (int)$pconfig['created']['time']) ?> (<?= $pconfig['created']['username'] ?>)
                   </td>
                 </tr>
 <?php          endif;
@@ -1112,7 +1112,7 @@ $( document ).ready(function() {
                 <tr>
                   <td><?=gettext("Updated");?></td>
                   <td>
-                    <?= date(gettext('n/j/y H:i:s'), $pconfig['updated']['time']) ?> (<?= $pconfig['updated']['username'] ?>)
+                    <?= date(gettext('n/j/y H:i:s'), (int)$pconfig['updated']['time']) ?> (<?= $pconfig['updated']['username'] ?>)
                   </td>
                 </tr>
 <?php          endif;
diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index 65eb02fec..9d894973c 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -852,7 +852,7 @@ include("head.inc");
                 <tr>
                   <td><?=gettext("Created");?></td>
                   <td>
-                    <?= date(gettext('n/j/y H:i:s'), $a_out[$id]['created']['time']) ?> (<?= $a_out[$id]['created']['username'] ?>)
+                    <?= date(gettext('n/j/y H:i:s'), (int)$a_out[$id]['created']['time']) ?> (<?= $a_out[$id]['created']['username'] ?>)
                   </td>
                 </tr>
 <?php
@@ -862,7 +862,7 @@ include("head.inc");
                 <tr>
                   <td><?=gettext("Updated");?></td>
                   <td>
-                    <?= date(gettext('n/j/y H:i:s'), $a_out[$id]['updated']['time']) ?> (<?= $a_out[$id]['updated']['username'] ?>)
+                    <?= date(gettext('n/j/y H:i:s'), (int)$a_out[$id]['updated']['time']) ?> (<?= $a_out[$id]['updated']['username'] ?>)
                   </td>
                 </tr>
 <?php
diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index 6a5b44332..6f3883569 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -1729,7 +1729,7 @@ endforeach;?>
                     <tr>
                       <td><?=gettext("Created");?></td>
                       <td>
-                        <?= date(gettext('n/j/y H:i:s'), $a_filter[$id]['created']['time']) ?> (<?= $a_filter[$id]['created']['username'] ?>)
+                        <?= date(gettext('n/j/y H:i:s'), (int)$a_filter[$id]['created']['time']) ?> (<?= $a_filter[$id]['created']['username'] ?>)
                       </td>
                     </tr>
 <?php
@@ -1738,7 +1738,7 @@ endforeach;?>
                     <tr>
                       <td><?=gettext("Updated");?></td>
                       <td>
-                        <?= date(gettext('n/j/y H:i:s'), $a_filter[$id]['updated']['time']) ?> (<?= $a_filter[$id]['updated']['username'] ?>)
+                        <?= date(gettext('n/j/y H:i:s'), (int)$a_filter[$id]['updated']['time']) ?> (<?= $a_filter[$id]['updated']['username'] ?>)
                       </td>
                     </tr>
 <?php
diff --git a/src/www/firewall_scrub.php b/src/www/firewall_scrub.php
index 5382cecc0..ea5e64e35 100644
--- a/src/www/firewall_scrub.php
+++ b/src/www/firewall_scrub.php
@@ -380,7 +380,7 @@ $( document ).ready(function() {
 
                     </td>
                     <td>
-                        <?=$scrubEntry['descr'];?>
+                        <?= $scrubEntry['descr'] ?? '' ?>
                     </td>
                     <td>
                         <a data-id="<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?= html_safe(gettext("Move selected rules before this rule")) ?>" class="act_move btn btn-default btn-xs">
diff --git a/src/www/firewall_scrub_edit.php b/src/www/firewall_scrub_edit.php
index 7dd755c67..e06f85c1d 100644
--- a/src/www/firewall_scrub_edit.php
+++ b/src/www/firewall_scrub_edit.php
@@ -639,7 +639,7 @@ include("head.inc");
                     <tr>
                       <td style="width:22%"><?=gettext("Created");?></td>
                       <td style="width:78%">
-                        <?= date(gettext('n/j/y H:i:s'), $a_scrub[$id]['created']['time']) ?> (<?= $a_scrub[$id]['created']['username'] ?>)
+                        <?= date(gettext('n/j/y H:i:s'), (int)$a_scrub[$id]['created']['time']) ?> (<?= $a_scrub[$id]['created']['username'] ?>)
                       </td>
                     </tr>
 <?php
@@ -648,7 +648,7 @@ include("head.inc");
                     <tr>
                       <td><?=gettext("Updated");?></td>
                       <td>
-                        <?= date(gettext('n/j/y H:i:s'), $a_scrub[$id]['updated']['time']) ?> (<?= $a_scrub[$id]['updated']['username'] ?>)
+                        <?= date(gettext('n/j/y H:i:s'), (int)$a_scrub[$id]['updated']['time']) ?> (<?= $a_scrub[$id]['updated']['username'] ?>)
                       </td>
                     </tr>
 <?php