From 64e1a51d4a11b5ad32aea34eee43aef77bd4536c Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:27:32 +0100
Subject: [PATCH] Firewall: Schedule: Fix is_schedule_inuse so it works for
 legacy and new rules (#9807)

* Firewall: Schedule: Fix is_schedule_inuse so it works for legacy and new rules

* Use config_read_array instead
---
 src/www/firewall_schedule_edit.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php
index 138f4fab36..37092d2a2c 100644
--- a/src/www/firewall_schedule_edit.php
+++ b/src/www/firewall_schedule_edit.php
@@ -39,8 +39,11 @@ function is_schedule_inuse($schedule)
     }
 
     /* loop through firewall rules looking for schedule in use */
-    foreach (config_read_array('filter', 'rule', false) as $rule) {
-        if ($rule['sched'] == $schedule) {
+    $legacy_rules = config_read_array('filter', 'rule', false);
+    $mvc_rules  = config_read_array('OPNsense', 'Firewall', 'Filter', 'rules', 'rule', false);
+
+    foreach (array_merge($legacy_rules, $mvc_rules) as $rule) {
+        if (!empty($rule['sched']) && $rule['sched'] == $schedule) {
             return true;
         }
     }