From 5868f472f852217accc3b562fe3c74b8b55a2326 Mon Sep 17 00:00:00 2001
From: Philip Joseph <jphilip@sangoma.com>
Date: Wed, 9 Sep 2026 14:54:26 +0530
Subject: [PATCH] Changes for Bootstrap and Symfony compatibility fix for
 sysadmin dependency

---
 Console/Firewall.class.php    |  4 ++--
 assets/css/firewall.css       | 29 +++++++++++++++++++++++++++++
 views/intrusion_detection.php | 19 +++++++++----------
 views/page.about.php          |  4 ++--
 4 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/Console/Firewall.class.php b/Console/Firewall.class.php
index e11d307e..f6d5d1ca 100644
--- a/Console/Firewall.class.php
+++ b/Console/Firewall.class.php
@@ -28,7 +28,7 @@ class Firewall extends Command {
 	];
 
 	// This is the fwconsole __construct equivalent
-	protected function configure(){
+	protected function configure(): void{
 		$this->setName('firewall')
 			->setDescription(_('Firewall functions'))
 			->addOption('force', 'f', InputOption::VALUE_NONE, _('Force Add/Removal of entry'))
@@ -40,7 +40,7 @@ protected function configure(){
 	}
 
 	// We've been called
-	protected function execute(InputInterface $input, OutputInterface $output){
+	protected function execute(InputInterface $input, OutputInterface $output): int{
 		$cmd = $input->getArgument('cmd');
 		switch ($cmd) {
 		case "stop":
diff --git a/assets/css/firewall.css b/assets/css/firewall.css
index bcb77848..c788f02f 100644
--- a/assets/css/firewall.css
+++ b/assets/css/firewall.css
@@ -50,6 +50,35 @@ tr[zone='other']>td { background-color: #ede7f6; }
 // Dont' display the action bar unless we've explictly asked for it.
 #action-bar{ display: none; }
 
+.alert .btn-close,
+.alert .btn-close-sm {
+	width: 10px;
+	height: 10px;
+	padding: 0.4em;
+	background-size: 10px;
+}
+
+#whitelisttable,
+#banlisttable,
+#whitelisttable th,
+#whitelisttable td,
+#banlisttable th,
+#banlisttable td,
+.bootstrap-table:has(#whitelisttable),
+.bootstrap-table:has(#banlisttable),
+.bootstrap-table:has(#whitelisttable) .fixed-table-container,
+.bootstrap-table:has(#banlisttable) .fixed-table-container,
+.bootstrap-table:has(#whitelisttable) .table > :not(caption) > * > *,
+.bootstrap-table:has(#banlisttable) .table > :not(caption) > * > * {
+	--bs-table-border-color: rgba(94, 156, 125, 0.9);
+	--bt-table-border-color: rgba(94, 156, 125, 0.9);
+	border-color: rgba(94, 156, 125, 0.9) !important;
+}
+#whitelisttable,
+#banlisttable {
+	border-collapse: collapse;
+}
+
 
 
 
diff --git a/views/intrusion_detection.php b/views/intrusion_detection.php
index 0a0416d7..3f042367 100644
--- a/views/intrusion_detection.php
+++ b/views/intrusion_detection.php
@@ -6,8 +6,8 @@
 	echo '<script type="text/javascript" src="modules/firewall/assets/js/views/main.js"></script>';
 	echo '<script type="text/javascript" src="modules/firewall/assets/js/views/advanced.js"></script>';
 	?>
-	<div class="alert alert-dismissable alert-warning">
-		<button type="button" class="close" data-dismiss="alert" aria-hidden="true"> × </button>
+	<div class="alert alert-dismissible alert-warning" role="alert">
+		<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
 		<h4>
 			<?php echo _("Warning!") ?>
 		</h4>
@@ -45,22 +45,21 @@
 					<?php echo _("Intrusion Detection") ?>
 				</h1>
 			</div>
-			<div class="col-md-6 text-right">
+			<div class="col-md-6 text-end">
 				<?php if ($from_sysadmin) { ?>
 					<!-- Modal -->
-					<i class="fa fa-2x fa-cogs adv-settings" title="Advanced Settings" data-toggle="modal"
-						data-target="#advanced-settings"></i>
+					<button type="button" class="btn btn-default adv-settings" title="Advanced Settings" data-bs-toggle="modal" data-bs-target="#advanced-settings">
+						<i class="fa fa-cogs"></i>
+					</button>
 					<div class="modal fade" id="advanced-settings" tabindex="-1" role="dialog"
 						aria-labelledby="advanced-settingsLabel" aria-hidden="true">
 						<div class="modal-dialog" role="document">
 							<div class="modal-content">
 								<div class="modal-header">
-									<h5 class="modal-title text-left" id="advanced-settingsLabel">
+									<h5 class="modal-title text-start" id="advanced-settingsLabel">
 										<?php echo _("Advanced Settings") ?>
 									</h5>
-									<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-										<span aria-hidden="true">&times;</span>
-									</button>
+									<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 								</div>
 								<div class="modal-body text-left">
 									<div class="fpbx-container">
@@ -397,7 +396,7 @@ class="hidden defset"><i class="fa fa-refresh"></i></a>
 	</div>
 	<br>
 	<div class="alert alert-warning alert-dismissible" id="needApply" style="display: none">
-		<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+		<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
 		<strong>Warning!</strong> ' . _("The changes are not yet applied. They will be applied during the next synchronization. However, you can apply them immediately by clicking the Save button.") . '.
   	</div>
 	<div class="container-fuild">
diff --git a/views/page.about.php b/views/page.about.php
index a3f3c0e5..7be43663 100644
--- a/views/page.about.php
+++ b/views/page.about.php
@@ -35,8 +35,8 @@
 <div class="container-fluid">
     <div class="row">
       <div class="col-md-12">
-        <div class="alert alert-dismissable alert-warning">				 
-          <button type="button" class="close" data-dismiss="alert" aria-hidden="true"> × </button>
+        <div class="alert alert-dismissible alert-warning" role="alert">
+          <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
           <h4> <?php echo _("Warning!") ?> </h4> 
           <?php echo _("Note: The Intrusion Detection handling method has been updated recently. Please clear your browser cache and refresh if you are having issues seeing the Intrusion Detection Start/Restart/Stop button.") ?>
         </div>