Report problems applying changes

1) Strictly keep track of the accumulating $retval from calls to various
functions that apply changes.
2) Use new function print_apply_result_box() to print a suitable message
in a suitable severity based on $retval

1 files changed, 3 insertions, 11 deletions

diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php
index 0bdb99e..e148150 100644
--- a/src/usr/local/www/firewall_shaper_queues.php
+++ b/src/usr/local/www/firewall_shaper_queues.php
@@ -167,15 +167,7 @@ if ($_POST['apply']) {
 
 	$retval = 0;
 	/* Setup pf rules since the user may have changed the optimization value */
-	$retval = filter_configure();
-	$savemsg = get_std_save_message($retval);
-	if (stristr($retval, "error") <> true) {
-		$savemsg = get_std_save_message($retval);
-		$class = 'alert-success';
-	} else {
-		$savemsg = $retval;
-		$class = 'alert-danger';
-	}
+	$retval |= filter_configure();
 
 	/* reset rrd queues */
 	system("rm -f /var/db/rrd/*queuedrops.rrd");
@@ -198,8 +190,8 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-if ($savemsg) {
-	print_info_box($savemsg, $class);
+if ($_POST['apply']) {
+	print_apply_result_box($retval);
 }
 
 if (is_subsystem_dirty('shaper')) {