summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-01-23 09:14:39 -0500
committerStephen Beaver <sbeaver@netgate.com>2016-01-23 09:15:18 -0500
commit5dfc79c9f05c77ecf4ceff2981d81729077bb8ea (patch)
treee36ba2f6370a00ef97ee0a557367e9d73c0c4f4e
parent617daf5e38cefcad2d2f0ac4308f034131be31b7 (diff)
downloadpfsense-5dfc79c9f05c77ecf4ceff2981d81729077bb8ea.zip
pfsense-5dfc79c9f05c77ecf4ceff2981d81729077bb8ea.tar.gz
Fixed #5802
Added collapsible action to config backup
-rw-r--r--src/usr/local/www/diag_confbak.php2
-rw-r--r--src/usr/local/www/services_dhcp.php102
2 files changed, 52 insertions, 52 deletions
diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php
index 554c6ca..733ffa7 100644
--- a/src/usr/local/www/diag_confbak.php
+++ b/src/usr/local/www/diag_confbak.php
@@ -189,7 +189,7 @@ $form = new Form(new Form_Button(
gettext("Save")
));
-$section = new Form_Section('Saved Configurations');
+$section = new Form_Section('Saved Configurations', 'savedconfig', COLLAPSIBLE|SEC_CLOSED);
$section->addInput(new Form_Input(
'backupcount',
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index 0b76899..31326b9 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -1106,55 +1106,6 @@ $section->addInput(new Form_Input(
$form->add($section);
-if ($pconfig['netboot']) {
- $sectate = COLLAPSIBLE|SEC_OPEN;
-} else {
- $sectate = COLLAPSIBLE|SEC_CLOSED;
-}
-$section = new Form_Section("Network booting", nwkbootsec, $sectate);
-
-$section->addInput(new Form_Checkbox(
- 'netboot',
- 'Enable',
- 'Enables network booting',
- $pconfig['netboot']
-));
-
-$section->addInput(new Form_IpAddress(
- 'nextserver',
- 'Next Server',
- $pconfig['nextserver']
-))->setHelp('Enter the IP address of the next server');
-
-$section->addInput(new Form_Input(
- 'filename',
- 'Default BIOS file name',
- 'text',
- $pconfig['filename']
-));
-
-$section->addInput(new Form_Input(
- 'filename32',
- 'UEFI 32 bit file name',
- 'text',
- $pconfig['filename32']
-));
-
-$section->addInput(new Form_Input(
- 'filename64',
- 'UEFI 64 bit file name',
- 'text',
- $pconfig['filename64']
-))->setHelp('You need both a filename and a boot server configured for this to work! ' .
- 'You will need all three filenames and a boot server configured for UEFI to work! ');
-
-$section->addInput(new Form_Input(
- 'rootpath',
- 'Root path',
- 'text',
- $pconfig['rootpath']
-))->setHelp('string-format: iscsi:(servername):(protocol):(port):(LUN):targetname ');
-
// Advanced Additional options
$btnadv = new Form_Button(
'btnadvopts',
@@ -1168,8 +1119,6 @@ $section->addInput(new Form_StaticText(
$btnadv
));
-$form->add($section);
-
$section = new Form_Section('Additional BOOTP/DHCP Options');
$section->addClass('adnlopts');
@@ -1241,6 +1190,57 @@ $section->addInput(new Form_Button(
$form->add($section);
+if ($pconfig['netboot']) {
+ $sectate = COLLAPSIBLE|SEC_OPEN;
+} else {
+ $sectate = COLLAPSIBLE|SEC_CLOSED;
+}
+$section = new Form_Section("Network booting", nwkbootsec, $sectate);
+
+$section->addInput(new Form_Checkbox(
+ 'netboot',
+ 'Enable',
+ 'Enables network booting',
+ $pconfig['netboot']
+));
+
+$section->addInput(new Form_IpAddress(
+ 'nextserver',
+ 'Next Server',
+ $pconfig['nextserver']
+))->setHelp('Enter the IP address of the next server');
+
+$section->addInput(new Form_Input(
+ 'filename',
+ 'Default BIOS file name',
+ 'text',
+ $pconfig['filename']
+));
+
+$section->addInput(new Form_Input(
+ 'filename32',
+ 'UEFI 32 bit file name',
+ 'text',
+ $pconfig['filename32']
+));
+
+$section->addInput(new Form_Input(
+ 'filename64',
+ 'UEFI 64 bit file name',
+ 'text',
+ $pconfig['filename64']
+))->setHelp('You need both a filename and a boot server configured for this to work! ' .
+ 'You will need all three filenames and a boot server configured for UEFI to work! ');
+
+$section->addInput(new Form_Input(
+ 'rootpath',
+ 'Root path',
+ 'text',
+ $pconfig['rootpath']
+))->setHelp('string-format: iscsi:(servername):(protocol):(port):(LUN):targetname ');
+
+$form->add($section);
+
if ($act == "newpool") {
$form->addGlobal(new Form_Input(
'act',
OpenPOWER on IntegriCloud