pfSense

Fix #7300 provide default value for ipprotocol for old rules

Fix #7299 and other stuff

As far as I can see, filter_generate_user_rule() is always supposed to be called with 'ipprotocol' set to 'inet' or 'inet6'. The cases of rules for both ('inet46') are handled by calling filter_generate_user_rule() twice, passing 'inet' then 'inet6'....

Fixes #7296
HTML tags not allowed in selector option values

(cherry picked from commit 57f4327a60c0cabf43161a6cfde98479b42a7092)

Check that DHCP registration isn't enabled for DNS forwarder/resolver when disabling DHCP server
(cherry picked from commit e83c9b733c86f39a14a874b115f2b8e0adc952e7)

Only allow the DHCP registration options to be enabled when DHCP server is enabled as well
(cherry picked from commit c6d03f09e035806dca8ac3314b41a3eaf523ab3f)

Only allow the DHCP registration options to be enabled when DHCP server is enabled as well
(cherry picked from commit 13fca9bcb3fdecfb6f9707e621b49f89569abfd7)

Only start dhcpleases if DHCP server is enabled (Bug #6750)
(cherry picked from commit 3d8b01e8c6392b4177572d540c8160c7e6e071ca)

Captive portal: fix "Disconnect All" button

(cherry picked from commit 4fb2b17772928f39add5fc0529e94ed07a09de31)

User Manager - Status Icon

Use icon for status rather than textual asterisk to indicate disabled account.

(2.4, 2.3)

(cherry picked from commit edd88334dbe95af4600ae493fa86d45244cbaecb)

Merge pull request #3528 from phil-davis/system-information-widget-filter-2_3