From 0b204e240b77da28a269cf0e87826bb35ebee542 Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Fri, 15 Jan 2016 12:19:57 -0500
Subject: Fixes some hide/show issues. An lucky bug in 2.2 was not duplicated
 in 2.3 so the page operated as written rather that as desired.

---
 src/usr/local/www/vpn_openvpn_server.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/usr/local/www')

diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php
index eaaa76e..b7814cf 100644
--- a/src/usr/local/www/vpn_openvpn_server.php
+++ b/src/usr/local/www/vpn_openvpn_server.php
@@ -824,7 +824,7 @@ if ($act=="new" || $act=="edit"):
 		'cert_depth',
 		'Certificate Depth',
 		$pconfig['cert_depth'],
-		$openvpn_cert_depths
+		["" => "Do Not Check"] + $openvpn_cert_depths
 		))->setHelp('When a certificate-based client logs in, do not accept certificates below this depth. ' .
 					'Useful for denying certificates made with intermediate CAs generated from the same CA as the server.');
 
@@ -982,6 +982,7 @@ if ($act=="new" || $act=="edit"):
 	$form->add($section);
 
 	$section = new Form_Section('Client Settings');
+	$section->addClass('advanced');
 
 	$section->addInput(new Form_Checkbox(
 		'dynamic_ip',
@@ -1083,10 +1084,6 @@ if ($act=="new" || $act=="edit"):
 		$pconfig['ntp_server2']
 	));
 
-	$form->add($section);
-
-	$section = new Form_Section('NetBIOS Options');
-
 	$section->addInput(new Form_Checkbox(
 		'netbios_enable',
 		'NetBIOS enable',
@@ -1150,7 +1147,6 @@ if ($act=="new" || $act=="edit"):
 	$form->add($section);
 
 	$section = new Form_Section('Advanced Configuration');
-	$section->addClass('advanced');
 
 	$section->addInput(new Form_Textarea(
 		'custom_options',
@@ -1338,6 +1334,7 @@ events.push(function() {
 				break;
 			case "server_tls":
 				hideMultiClass('authmode', true);
+				hideClass('advanced', false);
 				hideCheckbox('autokey_enable', true);
 			default:
 				hideInput('custom_options', false);
@@ -1439,8 +1436,8 @@ events.push(function() {
 		hideInput('netbios_scope', hide);
 		hideCheckbox('wins_server_enable', hide);
 		wins_server_change();
-		hideCheckbox('client_mgmt_port_enable', hide);
-		client_mgmt_port_change();
+//		hideCheckbox('client_mgmt_port_enable', hide);
+//		client_mgmt_port_change();
 	}
 
 	function tuntap_change() {
-- 
cgit v1.1