From 708f08302ff19c19aebcb790f21b6cfc975d9189 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:02:18 +0100
Subject: [PATCH] Use encryption instead of connection for the encryption
 setting of a LDAP resource

---
 application/forms/Config/Resource/LdapResourceForm.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 7f5cfa35d..2d8a757e2 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -60,11 +60,11 @@ class LdapResourceForm extends Form
         );
         $this->addElement(
             'select',
-            'connection',
+            'encryption',
             array(
                 'required'      => true,
                 'autosubmit'    => true,
-                'label'         => $this->translate('Connection'),
+                'label'         => $this->translate('Encryption'),
                 'description'   => $this->translate(
                     'Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted communication or'
                     . ' 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
             $this->addElement(
                 'checkbox',