Changed order of keys to alphabetic order. Moved debug ldap to last i…

…n list. And fixed so it says __DEPLOY_VERSION__
joomla · Mar 9, 2019 · 224ec41 · 224ec41
1 parent f3758cf
commit 224ec41
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
@@ -12,14 +12,14 @@ PLG_LDAP_FIELD_EMAIL_DESC="LDAP attribute which has the User's email address."
 PLG_LDAP_FIELD_EMAIL_LABEL="Map: Email"
 PLG_LDAP_FIELD_FULLNAME_DESC="LDAP attribute which has the User's full name."
 PLG_LDAP_FIELD_FULLNAME_LABEL="Map: Full Name"
+PLG_LDAP_FIELD_IGNORE_REQCERT_TLS_DESC="When enabled ignore the server certificate, this is useful when running for example Samba 4 with a self-signed certificate."
+PLG_LDAP_FIELD_IGNORE_REQCERT_TLS_LABEL="Ignore Certificate"
 PLG_LDAP_FIELD_HOST_DESC="Eg: openldap.example.com."
 PLG_LDAP_FIELD_HOST_LABEL="Host"
-PLG_LDAP_FIELD_NEGOCIATE_DESC="Negotiate TLS encryption with the LDAP server. This requires all traffic to and from the LDAP server to be encrypted."
-PLG_LDAP_FIELD_NEGOCIATE_LABEL="Negotiate TLS"
 PLG_LDAP_FIELD_LDAPDEBUG_DESC="Enables debug hardcoded to level 7"
 PLG_LDAP_FIELD_LDAPDEBUG_LABEL="Debug"
-PLG_LDAP_FIELD_IGNORE_REQCERT_TLS_DESC="When enabled ignore the server certificate, this is useful when running for example Samba 4 with a self-signed certificate."
-PLG_LDAP_FIELD_IGNORE_REQCERT_TLS_LABEL="Ignore Certificate"
+PLG_LDAP_FIELD_NEGOCIATE_DESC="Negotiate TLS encryption with the LDAP server. This requires all traffic to and from the LDAP server to be encrypted."
+PLG_LDAP_FIELD_NEGOCIATE_LABEL="Negotiate TLS"
 PLG_LDAP_FIELD_PASSWORD_DESC="The Connect Password is the password of an administrative account. This is used in Authenticate then Bind and Authenticated Compare authorisation methods."
 PLG_LDAP_FIELD_PASSWORD_LABEL="Connect Password"
 PLG_LDAP_FIELD_PORT_DESC="Default port is 389."

diff --git a/libraries/vendor/joomla/ldap/src/LdapClient.php b/libraries/vendor/joomla/ldap/src/LdapClient.php
@@ -92,15 +92,15 @@ class LdapClient
 	 * Ignore TLS Certificate (encrypted communications)
          *
          * @var    boolean
-         * @since  1.0
+         * @since  __DEPLOY_VERSION__
          */
 	 public $ignore_reqcert_tls = null;
 
         /**
 	 * Enable LDAP debug (encrypted communications)
          *
          * @var    boolean
-         * @since  1.0
+         * @since  __DEPLOY_VERSION__
          */
 	 public $ldap_debug = null;
 

diff --git a/plugins/authentication/ldap/ldap.xml b/plugins/authentication/ldap/ldap.xml
@@ -19,19 +19,6 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic">
-				<field
-					name="ldap_debug"
-					type="radio"
-					label="PLG_LDAP_FIELD_LDAPDEBUG_LABEL"
-					description="PLG_LDAP_FIELD_LDAPDEBUG_DESC"
-					default="0"
-					filter="integer"
-					class="btn-group btn-group-yesno"
-					>
-					<option value="1">JYES</option>
-					<option value="0">JNO</option>
-				</field>
-
 				<field
 					name="host"
 					type="text"
@@ -183,6 +170,18 @@
 					default="uid"
 					size="20"
 				/>
+				<field
+					name="ldap_debug"
+					type="radio"
+					label="PLG_LDAP_FIELD_LDAPDEBUG_LABEL"
+					description="PLG_LDAP_FIELD_LDAPDEBUG_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
 			</fieldset>
 		</fields>
 	</config>