summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system_routes.php
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2017-01-03 10:50:22 +0545
committerPhil Davis <phil.davis@inf.org>2017-01-03 10:50:22 +0545
commit44c423566b6eff18ec43ee77edddb94e3a3aa858 (patch)
treeec35ff8f9243236c75e9b120b80a2f62251ad5d8 /src/usr/local/www/system_routes.php
parent46c06ade87cbea59d1113a23a5d91f15dab9048c (diff)
downloadpfsense-44c423566b6eff18ec43ee77edddb94e3a3aa858.zip
pfsense-44c423566b6eff18ec43ee77edddb94e3a3aa858.tar.gz
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
Diffstat (limited to 'src/usr/local/www/system_routes.php')
-rw-r--r--src/usr/local/www/system_routes.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php
index cac6cce..48925c1 100644
--- a/src/usr/local/www/system_routes.php
+++ b/src/usr/local/www/system_routes.php
@@ -61,12 +61,11 @@ if ($_POST) {
@unlink("{$g['tmp_path']}/.system_routes.apply");
}
- $retval = system_routing_configure();
+ $retval |= system_routing_configure();
$retval |= filter_configure();
/* reconfigure our gateway monitor */
setup_gateways_monitor();
- $savemsg = get_std_save_message($retval);
if ($retval == 0) {
clear_subsystem_dirty('staticroutes');
}
@@ -218,8 +217,8 @@ include("head.inc");
if ($input_errors) {
print_input_errors($input_errors);
}
-if ($savemsg) {
- print_info_box($savemsg, 'success');
+if ($_POST['apply']) {
+ print_apply_result_box($retval);
}
if (is_subsystem_dirty('staticroutes')) {
print_apply_box(gettext("The static route configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
OpenPOWER on IntegriCloud