upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-02-18 18:18:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Firewall: Schedule: Fix is_schedule_inuse so it works for legacy and new rules (#9807)

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

* Use config_read_array instead
This commit is contained in:
Monviech 2026-02-17 11:27:32 +01:00 committed by GitHub
parent c5cb86b6dd
commit 64e1a51d4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/www/firewall_schedule_edit.php
View file

@ -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;
}
}