diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-24 13:16:55 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-24 13:17:31 -0400 |
| commit | 97508a552c616b0f3c7569e54a017d53c5cd94f6 (patch) | |
| tree | 323cc90c6d6dbee90b74bcb30a1f35253013365d /src/usr/local/www/vpn_openvpn_server.php | |
| parent | 51fe2104bbaae7cb64bc598997d34a539fea7d17 (diff) | |
| download | pfsense-97508a552c616b0f3c7569e54a017d53c5cd94f6.zip pfsense-97508a552c616b0f3c7569e54a017d53c5cd94f6.tar.gz | |
Fixed #5189
Diffstat (limited to 'src/usr/local/www/vpn_openvpn_server.php')
| -rw-r--r-- | src/usr/local/www/vpn_openvpn_server.php | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 424659a..910ec02 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -859,7 +859,7 @@ if($act=="new" || $act=="edit") : $section->addInput(new Form_Select( 'certref', - 'Peer Certificate Authority', + 'Server certificate', $pconfig['certref'], build_cert_list() ))->setHelp(count($a_cert) ? '':sprintf('No Certificates defined. You may create one here: %s', '<a href="system_camanager.php">System > Cert Manager</a>')); @@ -874,7 +874,7 @@ if($act=="new" || $act=="edit") : if (!$pconfig['shared_key']) { $section->addInput(new Form_checkbox( 'autokey_enable', - 'Auto generate', + 'Shared key', 'Automatically generate a shared key', $pconfig['autokey_enable'] )); @@ -1374,8 +1374,8 @@ events.push(function(){ hideInput('caref', true); hideInput('crlref', true); hideLabel('Peer Certificate Revocation list', true); + hideLabel('Peer Certificate Authority', true); hideInput('certref', true); - hideCheckbox('autotls_enable', true); hideCheckbox('tlsauth_enable', true); hideInput('dh_length', true); hideInput('cert_depth', true); @@ -1441,18 +1441,34 @@ events.push(function(){ // Process "Enable authentication of TLS packets" checkbox function tlsauth_change() { - hideCheckbox('autotls_enable', !$('#tlsauth_enable').prop('checked') || ($('#mode').val() == 'p2p_shared_key')); autotls_change(); } // Process "Automatically generate a shared TLS authentication key" checkbox + // Hide 'autotls_enable' AND 'tls' if mode == p2p_shared_key + // Otherwise hide 'tls' based on state of 'autotls_enable' function autotls_change() { - hideInput('tls', $('#autotls_enable').prop('checked') || !$('#tlsauth_enable').prop('checked')); + if(($('#mode').val() == 'p2p_shared_key') || (!$('#tlsauth_enable').prop('checked'))){ + hideInput('tls', true); + hideInput('autotls_enable', true); + } else { + hideInput('autotls_enable', false); + hideInput('tls', $('#autotls_enable').prop('checked') || !$('#tlsauth_enable').prop('checked')); + } } function autokey_change() { var hide = $('#autokey_enable').prop('checked') - hideInput('shared_key', hide); + + if($('#mode').val() != 'p2p_shared_key') { + hideCheckbox('autokey_enable', true); + hideInput('shared_key', true); + } else { + hideInput('shared_key', hide); + hideCheckbox('autokey_enable', false); + } + + } function gwredir_change() { |
