Use encryption instead of connection for the encryption setting of a LDAP resource

This commit is contained in:
Eric Lippmann 2015-03-13 00:02:18 +01:00
parent 61e01a4439
commit 708f08302f

View File

@ -60,11 +60,11 @@ class LdapResourceForm extends Form
); );
$this->addElement( $this->addElement(
'select', 'select',
'connection', 'encryption',
array( array(
'required' => true, 'required' => true,
'autosubmit' => true, 'autosubmit' => true,
'label' => $this->translate('Connection'), 'label' => $this->translate('Encryption'),
'description' => $this->translate( 'description' => $this->translate(
'Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted communication or' 'Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted communication or'
. ' Plaintext for unencrypted communication' . ' Plaintext for unencrypted communication'
@ -77,7 +77,7 @@ class LdapResourceForm extends Form
) )
); );
if (isset($formData['connection']) && $formData['connection'] !== 'plaintext') { if (isset($formData['encryption']) && $formData['encryption'] !== 'plaintext') {
// TODO(jom): Do not show this checkbox unless the connection is actually failing due to certificate errors // TODO(jom): Do not show this checkbox unless the connection is actually failing due to certificate errors
$this->addElement( $this->addElement(
'checkbox', 'checkbox',