summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system_advanced_misc.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_advanced_misc.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_advanced_misc.php')
-rw-r--r--src/usr/local/www/system_advanced_misc.php12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php
index 796a32b..d43d591 100644
--- a/src/usr/local/www/system_advanced_misc.php
+++ b/src/usr/local/www/system_advanced_misc.php
@@ -265,14 +265,10 @@ if ($_POST) {
write_config();
+ $changes_applied = true;
$retval = 0;
system_resolvconf_generate(true);
- $retval = filter_configure();
- if (stristr($retval, "error") <> true) {
- $savemsg = get_std_save_message(gettext($retval));
- } else {
- $savemsg = gettext($retval);
- }
+ $retval |= filter_configure();
activate_powerd();
load_crypto();
@@ -291,8 +287,8 @@ if ($input_errors) {
unset($pconfig['doreboot']);
}
-if ($savemsg) {
- print_info_box($savemsg, 'success');
+if ($changes_applied) {
+ print_apply_result_box($retval);
}
$tab_array = array();
OpenPOWER on IntegriCloud