Fix SSL, TLS vs LDAPS, STARTTLS in the LDAP resource form

Icinga · Mar 12, 2015 · 61e01a4 · 61e01a4
1 parent db08cca
commit 61e01a4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
@@ -66,12 +66,13 @@ public function createElements(array $formData)
                 'autosubmit'    => true,
                 'label'         => $this->translate('Connection'),
                 'description'   => $this->translate(
-                    'The type of connection to use. Unencrypted (Plaintext) or encrypted (SSL, TLS).'
+                    'Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted communication or'
+                    . ' Plaintext for unencrypted communication'
                 ),
                 'multiOptions'  => array(
                     'plaintext'             => $this->translate('Plaintext'),
-                    Connection::LDAPS       => 'Secure Sockets Layer (SSL)',
-                    Connection::STARTTLS    => 'Transport Layer Security (TLS)'
+                    Connection::LDAPS       => 'LDAPS',
+                    Connection::STARTTLS    => 'STARTTLS'
                 )
             )
         );