summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/wizards
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-01-22 22:42:28 +0545
committerStephen Beaver <sbeaver@netgate.com>2016-01-22 12:21:45 -0500
commit3b3a95e5511ef5f60f8142480ddf5adcaed88cb1 (patch)
treec011d618e1b5d6123107f4c148d15fe0a6bb87d7 /src/usr/local/www/wizards
parentbea2dd6d5fd711653565ec212d0dd62a44b7f043 (diff)
downloadpfsense-3b3a95e5511ef5f60f8142480ddf5adcaed88cb1.zip
pfsense-3b3a95e5511ef5f60f8142480ddf5adcaed88cb1.tar.gz
Fix #5794 remove print_info_box_np chackes for gettext("apply")
1) Get rid of the stristr() checks to "guess" if an apply button should be used. 2) Change print_info_box() so it can take a button name of "close" , "apply" or none to decide which button to show. 3) Delete function print_info_box_np_undo() - nothing calls it. 4) Add new function print_apply_box() to provide an easy wrapper for print_info_box() with the parameters to be 'warning' level and 'apply' button. 5) Change print_info_box_np() calls to just print_info_box() or print_apply_box() as appropriate. There is 1 direct call to print_info_box_np() from vpn_ipsec_mobile.php remaining. That tries to make a "create" button. It was not working before this change. It needs to be sorted out and fixed separately. After this change there is no dependency on a string containing text like "apply" to make the apply button appear. Then we can work on re-engineering the internal code of print_info_box_np() print_info_box() and print_apply_box() to fit together however we like. It should be easy to preserving the current API to print_info_box() and print_apply_box().
Diffstat (limited to 'src/usr/local/www/wizards')
-rw-r--r--src/usr/local/www/wizards/setup_wizard.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/wizards/setup_wizard.xml b/src/usr/local/www/wizards/setup_wizard.xml
index 20281f7..4914c89 100644
--- a/src/usr/local/www/wizards/setup_wizard.xml
+++ b/src/usr/local/www/wizards/setup_wizard.xml
@@ -621,7 +621,7 @@
<stepsubmitphpaction>
<![CDATA[
if(empty($_POST['lanipaddress']) || !is_ipaddr($_POST['lanipaddress'])) {
- print_info_box_np("Invalid LAN IP Address. Please press back in your browser window and correct.");
+ print_info_box("Invalid LAN IP Address. Please press back in your browser window and correct.");
die;
}
@@ -709,7 +709,7 @@
local_user_set($admin_user);
write_config();
} else {
- print_info_box_np("Passwords do not match! Please press back in your browser window and correct.");
+ print_info_box("Passwords do not match! Please press back in your browser window and correct.");
die;
}
}
OpenPOWER on IntegriCloud