diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index d0a664b67..b5b2fbf88 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -184,7 +184,6 @@
-
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
index 06d90489c..dd13b89f3 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
@@ -518,12 +518,6 @@
status_dhcpv6_leases.php*
-
- Status: Filter Reload Status
-
- status_filter_reload.php*
-
- Status: Gateway Groups
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index c64d57ed2..4e3a700df 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -49,14 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
system_cron_configure();
filter_configure();
clear_subsystem_dirty('filter');
- $savemsg = sprintf(
- gettext(
- 'The settings have been applied and the rules are now reloading ' .
- 'in the background. You can monitor the reload progress %shere%s.'
- ),
- '',
- ''
- );
+ $savemsg = gettext('The settings have been applied and the rules are now reloading in the background.');
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del' && isset($id)) {
// delete single item
if (!empty($a_filter[$id]['associated-rule-id'])) {
diff --git a/src/www/firewall_scrub.php b/src/www/firewall_scrub.php
index 4671cba41..e13ac2494 100644
--- a/src/www/firewall_scrub.php
+++ b/src/www/firewall_scrub.php
@@ -37,14 +37,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['scrubrnid'] = !empty($config['system']['scrubrnid']);
$pconfig['scrub_interface_disable'] = !empty($config['system']['scrub_interface_disable']);
if (!empty($_GET['savemsg'])) {
- $savemsg = sprintf(
- gettext(
- 'The settings have been applied and the rules are now reloading ' .
- 'in the background. You can monitor the reload progress %shere%s.'
- ),
- '',
- ''
- );
+ $savemsg = gettext('The settings have been applied and the rules are now reloading in the background.');
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
$pconfig = $_POST;
diff --git a/src/www/status_filter_reload.php b/src/www/status_filter_reload.php
deleted file mode 100644
index f54405477..000000000
--- a/src/www/status_filter_reload.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once("guiconfig.inc");
-
-if($_GET['getstatus']) {
- $status = '';
- if (file_exists('/var/run/filter_reload_status')) {
- $status = file_get_contents('/var/run/filter_reload_status');
- }
- echo $status;
- exit;
-}
-
-if ($_POST['reloadfilter']) {
- configd_run("filter reload");
- if ( isset($config['hasync']['synchronizetoip']) && trim($config['hasync']['synchronizetoip']) != "") {
- // only try to sync when hasync is configured
- configd_run("filter sync reload");
- }
- header(url_safe('Location: /status_filter_reload.php'));
- exit;
-}
-if ($_POST['syncfilter']) {
- configd_run("filter sync");
- header(url_safe('Location: /status_filter_reload.php'));
- exit;
-}
-
-include("head.inc");
-
-?>
-
-
-
-
-