Merge pull request #3442 from phil-davis/monitor-reload

2 files changed, 8 insertions, 6 deletions

diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 188d8dc..55b6aef 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -174,12 +174,9 @@ if ($_POST) {
 
 	if ($_POST['apply']) {
 		$retval = 0;
-		$retval = filter_configure();
+		$retval |= filter_configure();
 
 		clear_subsystem_dirty('filter');
-
-		$savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />%s Monitor %s the reload progress."),
-									"<a href='status_filter_reload.php'>", "</a>");
 	}
 }
 
@@ -331,6 +328,10 @@ if ($savemsg) {
 	print_info_box($savemsg, 'success');
 }
 
+if ($_POST['apply']) {
+	print_apply_result_box($retval);
+}
+
 if (is_subsystem_dirty('filter')) {
 	print_apply_box(gettext("The firewall rule configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
 }
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index 3b3c1c4..2163dc2 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -379,7 +379,7 @@ function print_callout($msg, $class = 'info', $heading = '') {
 
 function get_std_save_message($retval) {
 	$filter_related = false;
-	$filter_pages = array("nat", "filter");
+	$filter_pages = array("firewall_aliases", "firewall_nat", "firewall_rules", "status_logs_filter");
 	if ($retval === 0) {
 		// 0 is success
 		$to_return = gettext("The changes have been applied successfully.");
@@ -393,7 +393,8 @@ function get_std_save_message($retval) {
 		}
 	}
 	if ($filter_related) {
-		$to_return .= "<br />" . gettext("<a href=\"status_filter_reload.php\">Monitor</a> the filter reload progress.");
+		$to_return .= " " . gettext("The firewall rules are now reloading in the background.") . "<br />" .
+		    sprintf(gettext("%sMonitor%s the filter reload progress."), "<a href='status_filter_reload.php'>", "</a>");
 	}
 	return $to_return;
 }