diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 38d52be57d2..a488f6e1947 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -114,21 +114,63 @@ print ''; print ''.$langs->trans("Parameter").''; print ''.$langs->trans("Value").' '; print "\n"; -if (!defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST) -{ - print ''.$langs->trans("LDAPServer").''.$langs->trans("LDAPServer").''; -} -else -{ - print ''.$langs->trans("LDAPServer").''.LDAP_SERVER_HOST.''; -} -print ''.$langs->trans("LDAPServer").''.LDAP_SERVER_HOST.''; -print ''.$langs->trans("LDAPSuffix").''.LDAP_SUFFIX_DN.''; -print ''.$langs->trans("DNAdmin").''.LDAP_ADMIN_DN.''; -print ''.$langs->trans("LDAPPassword").''.LDAP_ADMIN_PASS.''; -print ''.$langs->trans("DNUser").''.LDAP_USER_DN.''; -print ''.$langs->trans("DNGroup").''.LDAP_GROUP_DN.''; -print ''.$langs->trans("Type").''.LDAP_SERVER_TYPE.''; + + if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST) + { + print ''.$langs->trans("LDAPServer").''.LDAP_SERVER_HOST.''; + } + else + { + print ''.$langs->trans("LDAPServer").''.$langs->trans("LDAPServerExample").''; + } + if (defined("LDAP_SUFFIX_DN") && LDAP_SUFFIX_DN) + { + print ''.$langs->trans("LDAPSuffix").''.LDAP_SUFFIX_DN.''; + } + else + { + print ''.$langs->trans("LDAPSuffix").''.$langs->trans("LDAPSuffixExample").''; + } + if (defined("LDAP_ADMIN_DN") && LDAP_ADMIN_DN) + { + print ''.$langs->trans("DNAdmin").''.LDAP_ADMIN_DN.''; + } + else + { + print ''.$langs->trans("DNAdmin").''.$langs->trans("DNAdminExample").''; + } + if (defined("LDAP_ADMIN_PASS") && LDAP_ADMIN_PASS) + { + print ''.$langs->trans("LDAPPassword").''.LDAP_ADMIN_PASS.''; + } + else + { + print ''.$langs->trans("LDAPPassword").''.$langs->trans("LDAPPasswordExample").''; + } + if (defined("LDAP_USER_DN") && LDAP_USER_DN) + { + print ''.$langs->trans("DNUser").''.LDAP_USER_DN.''; + } + else + { + print ''.$langs->trans("DNUser").''.$langs->trans("DNUserExample").''; + } + if (defined("LDAP_GROUP_DN") && LDAP_GROUP_DN) + { + print ''.$langs->trans("DNGroup").''.LDAP_GROUP_DN.''; + } + else + { + print ''.$langs->trans("DNGroup").''.$langs->trans("DNGroupExample").''; + } + if (defined("LDAP_SERVER_TYPE") && LDAP_SERVER_TYPE) + { + print ''.$langs->trans("Type").''.LDAP_GROUP_DN.''; + } + else + { + print ''.$langs->trans("Type").''.$langs->trans("TypeExample").''; + } print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index cd90a6a8f8e..f098b59b97e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -269,6 +269,13 @@ DNAdmin=LDAP Administrator LDAPPassword=Password DNUser=Users' DN DNGroup=Groups' DN +LDAPServerExample=LDAP server adress +LDAPSuffixExample=ex: dc=company,dc=com +DNAdminExample=ex: cn=adminldap +LDAPPasswordExample=Admin password +DNUserExample=ex: ou=users +DNGroupExample=ex: ou=groups +TypeExample=OpenLdap or Egroupware ##### Propal ##### PropalSetup=Commercial proposals module setup ##### Sendings ##### diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index aad99b91b1f..9cfdcce06fc 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -269,6 +269,13 @@ DNAdmin=Administrateur LDAP LDAPPassword=Mot de passe DNUser=DN des utilisateurs DNGroup=DN des groupes +LDAPServerExample=Adresse du serveur LDAP +LDAPSuffixExample=ex: dc=societe,dc=com +DNAdminExample=ex: cn=adminldap +LDAPPasswordExample=Mot de passe de l'administrateur LDAP +DNUserExample=ex: ou=users +DNGroupExample=ex: ou=groups +TypeExample=OpenLdap ou Egroupware ##### Propal ##### PropalSetup=Configuration du module Propositions Commerciales ##### Sendings #####