From 7bcd563c754cd705a57b4f94bc0e76f77d30b0c3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Nov 2006 15:06:26 +0000 Subject: [PATCH] =?UTF-8?q?R=E9organisation=20des=20param=E8tres=20du=20mo?= =?UTF-8?q?dule=20LDAP=20pour=20meilleure=20comprehension=20du=20fonctionn?= =?UTF-8?q?ement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/admin/ldap.php | 407 ++++++++++----------------------- htdocs/admin/ldap_contacts.php | 140 ++++++++++++ htdocs/admin/ldap_users.php | 283 +++++++++++++++++++++++ htdocs/langs/en_US/admin.lang | 22 +- htdocs/langs/fr_FR/admin.lang | 22 +- 5 files changed, 577 insertions(+), 297 deletions(-) create mode 100644 htdocs/admin/ldap_contacts.php create mode 100644 htdocs/admin/ldap_users.php diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 7c9981d5fa0..15140b45a87 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -47,6 +47,7 @@ $langs->load("admin"); if (!$user->admin) accessforbidden(); + /* * Actions */ @@ -61,7 +62,6 @@ if ($_GET["action"] == 'setvalue' && $user->admin) { print $db->error(); } - if (! dolibarr_set_const($db, 'LDAP_SERVER_HOST',$_POST["host"])) { print $db->error(); @@ -86,11 +86,7 @@ if ($_GET["action"] == 'setvalue' && $user->admin) { print $db->error(); } - if (! dolibarr_set_const($db, 'LDAP_USER_DN',$_POST["user"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_GROUP_DN',$_POST["group"])) + if (! dolibarr_set_const($db, 'LDAP_SERVER_USE_TLS',$_POST["usetls"])) { print $db->error(); } @@ -102,55 +98,6 @@ if ($_GET["action"] == 'setvalue' && $user->admin) { print $db->error(); } - if (! dolibarr_set_const($db, 'LDAP_CONTACT_DN',$_POST["contact"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_SERVER_USE_TLS',$_POST["usetls"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',$_POST["fieldphone"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FILTER_CONNECTION',$_POST["filterconnection"])) - { - print $db->error(); - } - if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"])) - { - print $db->error(); - } - if ($db->query($sql)) - { - Header("Location: ldap.php"); - exit; - } } @@ -173,18 +120,81 @@ if ($mesg) print '
'.$mesg.'
'; else print '
'; -print '
'; +// Onglets +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/ldap.php"; +$head[$h][1] = $langs->trans("LDAPGlobalParameters"); +$hselected=$h; +$h++; + +if ($conf->global->LDAP_SYNCHRO_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php"; + $head[$h][1] = $langs->trans("LDAPUsersAndGroupsSynchro"); + $h++; +} + +if ($conf->global->LDAP_CONTACT_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php"; + $head[$h][1] = $langs->trans("LDAPContactsSynchro"); + $h++; +} + +if ($conf->global->LDAP_MEMBERS_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php"; + $head[$h][1] = $langs->trans("LDAPMembersSynchro"); + $h++; +} + +dolibarr_fiche_head($head, $hselected, $langs->trans("LDAP")); + +$var=true; +$html=new Form($db); + + +print ''; print ''; + +// Liste de synchro actives +print ''; +print ''; +print "\n"; + +// Synchro utilisateurs/groupes active +$var=!$var; +print ''; + +// Synchro contact active +$var=!$var; +print ''; + + print ''; print ''; print ''; print ''; print "\n"; -$var=true; -$html=new Form($db); - // Type $var=!$var; print ''; -print ''; -print ''; -print "\n"; - -// Synchro utilisateurs/groupes active -$var=!$var; -print ''; - -// DN Pour les utilisateurs -$var=!$var; -print ''; - -// Champ de login -$var=!$var; -print ''; - -// Filtre de connexion -$var=!$var; -print ''; - -// DN pour les groupes -$var=!$var; -print ''; - - -print ''; -print ''; -print "\n"; - -// Synchro contact active -$var=!$var; -print ''; - -// DN Pour les contacts -$var=!$var; -print ''; - -print ''; -print ''; -print "\n"; - -// Login -$var=!$var; -print ''; - -// Name -$var=!$var; -print ''; - -// Firstname -$var=!$var; -print ''; - -// Mail -$var=!$var; -print ''; - -// Phone -$var=!$var; -print ''; - -// Fax -$var=!$var; -print ''; - -// Mobile -$var=!$var; -print ''; print ''; @@ -439,6 +283,8 @@ print '
'.$langs->trans("LDAPSynchronization").'
'.$langs->trans("LDAPDnSynchroActive").''; +$arraylist=array(); +$arraylist['0']=$langs->trans("No"); +$arraylist['ldap2dolibarr']=$langs->trans("LDAPToDolibarr"); +$arraylist['dolibarr2ldap']=$langs->trans("DolibarrToLDAP"); +$html->select_array('activesynchro',$arraylist,$conf->global->LDAP_SYNCHRO_ACTIVE); +print ''.$langs->trans("LDAPDnSynchroActiveExample"); +if ($conf->global->LDAP_SYNCHRO_ACTIVE && ! $conf->global->LDAP_USER_DN) +{ + print '
'.$langs->trans("LDAPSetupNotComplete").''; +} +print '
'.$langs->trans("LDAPDnContactActive").''; +$arraylist=array(); +$arraylist['0']=$langs->trans("No"); +$arraylist['1']=$langs->trans("DolibarrToLDAP"); +$html->select_array('activecontact',$arraylist,$conf->global->LDAP_CONTACT_ACTIVE); +print ''.$langs->trans("LDAPDnContactActiveExample").'
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Example").'
'.$langs->trans("Type").''; @@ -266,172 +276,6 @@ $html->select_array('usetls',$arraylist,$conf->global->LDAP_SERVER_USE_TLS); print ''.$langs->trans("LDAPServerUseTLSExample").'
'.$langs->trans("LDAPSynchronizeUsersAndGroup").'
'.$langs->trans("LDAPDnSynchroActive").''; -$arraylist=array(); -$arraylist['0']=$langs->trans("No"); -$arraylist['ldap2dolibarr']=$langs->trans("LDAPToDolibarr"); -$arraylist['dolibarr2ldap']=$langs->trans("DolibarrToLDAP"); -$html->select_array('activesynchro',$arraylist,$conf->global->LDAP_SYNCHRO_ACTIVE); -print ''.$langs->trans("LDAPDnSynchroActiveExample").'
'.$langs->trans("LDAPUserDn").''; -print ''; -print ''.$langs->trans("LDAPUserDnExample").'
'.$langs->trans("LDAPFieldLogin").''; -if ($conf->global->LDAP_FIELD_LOGIN) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFieldLoginExample").'
'.$langs->trans("LDAPFilterConnection").''; -if ($conf->global->LDAP_FILTER_CONNECTION) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFilterConnectionExample").'
'.$langs->trans("LDAPGroupDn").''; -print ''; -print ''.$langs->trans("LDAPGroupDnExample").'
'.$langs->trans("LDAPSynchronizeContacts").'
'.$langs->trans("LDAPDnContactActive").''; -$arraylist=array(); -$arraylist['0']=$langs->trans("No"); -$arraylist['1']=$langs->trans("Yes"); -$html->select_array('activecontact',$arraylist,$conf->global->LDAP_CONTACT_ACTIVE); -print ''.$langs->trans("LDAPDnContactActiveExample").'
'.$langs->trans("LDAPContactDn").''; -print ''; -print ''.$langs->trans("LDAPContactDnExample").'
'.$langs->trans("LDAPAttributes").'
'.$langs->trans("LDAPFieldLoginSamba").''; -if ($conf->global->LDAP_FIELD_LOGIN_SAMBA) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFieldLoginSambaExample").'
'.$langs->trans("LDAPFieldName").''; -if ($conf->global->LDAP_FIELD_NAME) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFieldNameExample").'
'.$langs->trans("LDAPFieldFirstName").''; -if ($conf->global->LDAP_FIELD_FIRSTNAME) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFieldFirstNameExample").'
'.$langs->trans("LDAPFieldMail").''; -if ($conf->global->LDAP_FIELD_MAIL) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFieldMailExample").'
'.$langs->trans("LDAPFieldPhone").''; -if ($conf->global->LDAP_FIELD_PHONE) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFieldPhoneExample").'
'.$langs->trans("LDAPFieldFax").''; -if ($conf->global->LDAP_FIELD_FAX) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFieldFaxExample").'
'.$langs->trans("LDAPFieldMobile").''; -if ($conf->global->LDAP_FIELD_MOBILE) -{ - print ''; -} -else -{ - print ''; -} -print ''.$langs->trans("LDAPFieldMobileExample").'
'; print '
'; +print ''; + /* @@ -446,84 +292,75 @@ print ''; */ if (function_exists("ldap_connect")) { - if ($conf->global->LDAP_SERVER_HOST) + if ($conf->global->LDAP_SERVER_HOST && $conf->global->LDAP_ADMIN_DN && $conf->global->LDAP_ADMIN_PASS) { - print ''.$langs->trans("LDAPTestConnect").'

'; + print ''.$langs->trans("LDAPTestConnect").'

'; } - - - if ($conf->global->LDAP_SERVER_HOST && $conf->global->LDAP_ADMIN_DN && $conf->global->LDAP_ADMIN_PASS && $_GET["action"] == 'test') + + if ($_GET["action"] == 'test') { - $ldap = New AuthLdap(); - // Test ldap_connect - // ce test n'est pas fiable car une ressource est constamment retournée - // il faut se fier au test ldap_bind + $ldap = new AuthLdap(); // Les parametres sont passés et récupérés via $conf + $ds = $ldap->connect(); if ($ds) { - print img_picto('','info'); - print $langs->trans("LDAPTestOK").'
'; + // Test ldap_bind + $bind = $ldap->bind(); + if ($bind) + { + print img_picto('','info').' '; + print ''.$langs->trans("LDAPTCPConnectOK",$conf->global->LDAP_SERVER_HOST,$conf->global->LDAP_SERVER_PORT).'
'; + } + else + { + print img_picto('','error').' '; + print $langs->trans("LDAPTCPConnectKO",$conf->global->LDAP_SERVER_HOST,$conf->global->LDAP_SERVER_PORT).' : '; + print $ldap->ldapErrorCode." - ".$ldap->ldapErrorText; + print "
"; + } + + // Test ldap_getversion + if (($ldap->getVersion() == 3)) + { + print img_picto('','info').' '; + print ''.$langs->trans("LDAPSetupForVersion3").'
'; + } + else + { + print img_picto('','info').' '; + print $langs->trans("LDAPSetupForVersion2").'
'; + } + + // Test ldap_unbind + $unbind = $ldap->unbind(); + + if ($unbind) + { + print img_picto('','info').' '; + print ''.$langs->trans("LDAPUnbindSuccessfull").'
'; + } + else + { + print img_picto('','error').' '; + print $langs->trans("LDAPUnbindFailed"); + print "
"; + print $ldap->ldapErrorCode." - ".$ldap->ldapErrorText; + } + } else { - print img_picto('','alerte'); - print $langs->trans("LDAPTestKO").'
'; + print img_picto('','error').' '; + print $langs->trans("LDAPTCPConnectKO",$conf->global->LDAP_SERVER_HOST,$conf->global->LDAP_SERVER_PORT).'
'; print "
"; print $ldap->ldapErrorCode." - ".$ldap->ldapErrorText; print "
"; } - if ($ds) - { - // Test ldap_getversion - if (($ldap->getVersion() == 3)) - { - print img_picto('','info'); - print $langs->trans("LDAPSetupForVersion3").'
'; - } - else - { - print img_picto('','info'); - print $langs->trans("LDAPSetupForVersion2").'
'; - } - - // Test ldap_bind - $bind = $ldap->bind(); - - if ($bind) - { - print img_picto('','info'); - print "Connexion au dn $dn réussi
"; - } - else - { - print img_picto('','alerte'); - print "Connexion au dn $dn raté : "; - print $ldap->ldapErrorCode." - ".$ldap->ldapErrorText; - print "
"; - } - - // Test ldap_unbind - $unbind = $ldap->unbind(); - - if ($unbind) - { - print img_picto('','info'); - print "Déconnection du dn $dn réussi
"; - } - else - { - print img_picto('','alerte'); - print "Déconnection du dn $dn raté"; - print "
"; - print $ldap->ldapErrorCode." - ".$ldap->ldapErrorText; - } - } } } $db->close(); llxFooter('$Date$ - $Revision$'); - ?> diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php new file mode 100644 index 00000000000..abc9d41f305 --- /dev/null +++ b/htdocs/admin/ldap_contacts.php @@ -0,0 +1,140 @@ + + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2005 Regis Houssin + * Copyright (C) 2006 Laurent Destailleur + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ + * $Source$ + */ + +/** + \file htdocs/admin/ldap.php + \ingroup ldap + \brief Page d'administration/configuration du module Ldap + \version $Revision$ + \remarks Exemple configuration : + LDAP_SERVER_HOST Serveur LDAP 192.168.1.50 + LDAP_SERVER_PORT Port LDAP 389 + LDAP_ADMIN_DN Administrateur LDAP cn=adminldap,dc=societe,dc=com + LDAP_ADMIN_PASS Mot de passe xxxxxxxx + LDAP_USER_DN DN des utilisateurs ou=users,dc=societe,dc=com + LDAP_GROUP_DN DN des groupes ou=groups,dc=societe,dc=com + LDAP_CONTACT_DN DN des contacts ou=contacts,dc=societe,dc=com + LDAP_SERVER_TYPE Type Openldap +*/ + +require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php"); + +$langs->load("admin"); + +if (!$user->admin) + accessforbidden(); + + +/* + * Actions + */ + +if ($_GET["action"] == 'setvalue' && $user->admin) +{ + +} + + + +/* + * Visu + */ + +llxHeader(); + +print_fiche_titre($langs->trans("LDAPSetup"),'','setup'); + +// Test si fonction LDAP actives +if (! function_exists("ldap_connect")) +{ + $mesg=$langs->trans("LDAPFunctionsNotAvailableOnPHP"); +} + +if ($mesg) print '
'.$mesg.'
'; +else print '
'; + + +// Onglets +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/ldap.php"; +$head[$h][1] = $langs->trans("LDAPGlobalParameters"); +$h++; + +if ($conf->global->LDAP_SYNCHRO_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php"; + $head[$h][1] = $langs->trans("LDAPUsersAndGroupsSynchro"); + $h++; +} + +if ($conf->global->LDAP_CONTACT_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php"; + $head[$h][1] = $langs->trans("LDAPContactsSynchro"); + $hselected=$h; + $h++; +} + +if ($conf->global->LDAP_MEMBERS_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php"; + $head[$h][1] = $langs->trans("LDAPMembersSynchro"); + $h++; +} + +dolibarr_fiche_head($head, $hselected, $langs->trans("LDAP")); + + +print '
'; + +print ''; + +print ''; +print ''; +print "\n"; + +$var=true; +$html=new Form($db); + + +// Not available +print ''; + + +print ''; +print '
'.$langs->trans("LDAPSynchronizeContacts").'
'.$langs->trans("LDAPParametersAreStillHardCoded").'
'; + +print '
'; + +print ''; + + +$db->close(); + +llxFooter('$Date$ - $Revision$'); + +?> diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php new file mode 100644 index 00000000000..3a64592558a --- /dev/null +++ b/htdocs/admin/ldap_users.php @@ -0,0 +1,283 @@ + + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2005 Regis Houssin + * Copyright (C) 2006 Laurent Destailleur + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ + * $Source$ + */ + +/** + \file htdocs/admin/ldap.php + \ingroup ldap + \brief Page d'administration/configuration du module Ldap + \version $Revision$ + \remarks Exemple configuration : + LDAP_SERVER_HOST Serveur LDAP 192.168.1.50 + LDAP_SERVER_PORT Port LDAP 389 + LDAP_ADMIN_DN Administrateur LDAP cn=adminldap,dc=societe,dc=com + LDAP_ADMIN_PASS Mot de passe xxxxxxxx + LDAP_USER_DN DN des utilisateurs ou=users,dc=societe,dc=com + LDAP_GROUP_DN DN des groupes ou=groups,dc=societe,dc=com + LDAP_CONTACT_DN DN des contacts ou=contacts,dc=societe,dc=com + LDAP_SERVER_TYPE Type Openldap +*/ + +require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php"); + +$langs->load("admin"); + +if (!$user->admin) + accessforbidden(); + + +/* + * Actions + */ + +if ($_GET["action"] == 'setvalue' && $user->admin) +{ + if (! dolibarr_set_const($db, 'LDAP_USER_DN',$_POST["user"])) + { + print $db->error(); + } + if (! dolibarr_set_const($db, 'LDAP_GROUP_DN',$_POST["group"])) + { + print $db->error(); + } + if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"])) + { + print $db->error(); + } + if (! dolibarr_set_const($db, 'LDAP_FILTER_CONNECTION',$_POST["filterconnection"])) + { + print $db->error(); + } +} + + + +/* + * Visu + */ + +llxHeader(); + +print_fiche_titre($langs->trans("LDAPSetup"),'','setup'); + +// Test si fonction LDAP actives +if (! function_exists("ldap_connect")) +{ + $mesg=$langs->trans("LDAPFunctionsNotAvailableOnPHP"); +} + +if ($mesg) print '
'.$mesg.'
'; +else print '
'; + + +// Onglets +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/ldap.php"; +$head[$h][1] = $langs->trans("LDAPGlobalParameters"); +$h++; + +if ($conf->global->LDAP_SYNCHRO_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php"; + $head[$h][1] = $langs->trans("LDAPUsersAndGroupsSynchro"); + $hselected=$h; + $h++; +} + +if ($conf->global->LDAP_CONTACT_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php"; + $head[$h][1] = $langs->trans("LDAPContactsSynchro"); + $h++; +} + +if ($conf->global->LDAP_MEMBERS_ACTIVE) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php"; + $head[$h][1] = $langs->trans("LDAPMembersSynchro"); + $h++; +} + +dolibarr_fiche_head($head, $hselected, $langs->trans("LDAP")); + + +print '
'; + +print ''; + +$var=true; +$html=new Form($db); + + +print ''; +print ''; +print "\n"; + +// DN Pour les utilisateurs +$var=!$var; +print ''; + +// DN pour les groupes +$var=!$var; +print ''; + +// Filtre de connexion +$var=!$var; +print ''; + +// Login unix +$var=!$var; +print ''; + +// Login samba +$var=!$var; +print ''; + +// Name +$var=!$var; +print ''; + +// Firstname +$var=!$var; +print ''; + +// Mail +$var=!$var; +print ''; + +// Phone +$var=!$var; +print ''; + +// Fax +$var=!$var; +print ''; + +// Mobile +$var=!$var; +print ''; + + + +print ''; +print '
'.$langs->trans("LDAPSynchronizeUsersAndGroup").'
'.$langs->trans("LDAPUserDn").''; +print ''; +print ''.$langs->trans("LDAPUserDnExample").'
'.$langs->trans("LDAPGroupDn").''; +print ''; +print ''.$langs->trans("LDAPGroupDnExample").'
'.$langs->trans("LDAPFilterConnection").''; +if ($conf->global->LDAP_FILTER_CONNECTION) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFilterConnectionExample").'
'.$langs->trans("LDAPFieldLoginUnix").''; +if ($conf->global->LDAP_FIELD_LOGIN) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldLoginExample").'
'.$langs->trans("LDAPFieldLoginSamba").''; +if ($conf->global->LDAP_FIELD_LOGIN_SAMBA) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldLoginSambaExample").'
'.$langs->trans("LDAPFieldName").''; +if ($conf->global->LDAP_FIELD_NAME) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldNameExample").'
'.$langs->trans("LDAPFieldFirstName").''; +if ($conf->global->LDAP_FIELD_FIRSTNAME) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldFirstNameExample").'
'.$langs->trans("LDAPFieldMail").''; +if ($conf->global->LDAP_FIELD_MAIL) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldMailExample").'
'.$langs->trans("LDAPFieldPhone").''; +if ($conf->global->LDAP_FIELD_PHONE) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldPhoneExample").'
'.$langs->trans("LDAPFieldFax").''; +if ($conf->global->LDAP_FIELD_FAX) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldFaxExample").'
'.$langs->trans("LDAPFieldMobile").''; +if ($conf->global->LDAP_FIELD_MOBILE) +{ + print ''; +} +else +{ + print ''; +} +print ''.$langs->trans("LDAPFieldMobileExample").'
'; + +print '
'; + +print ''; + + + +$db->close(); + +llxFooter('$Date$ - $Revision$'); + +?> diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 5ba866152bd..ae6c306617a 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -491,11 +491,15 @@ AddSubscriptionIntoAccount=Add subscriptions into bank or cash account, of bank AdherentMailRequired=EMail required to create a new member ##### LDAP setup ##### LDAPSetup=LDAP Setup +LDAPGlobalParameters=Global parameters +LDAPUsersAndGroupsSynchro=Users/groups synchro +LDAPContactsSynchro=Contacts synchro +LDAPSynchronization=LDAP synchronisation LDAPFunctionsNotAvailableOnPHP=LDAP functions are not availbale on your PHP -LDAPSynchronizeUsersAndGroup=Synchronize Dolibarr or LDAP users and groups +LDAPSynchronizeUsersAndGroup=Synchronize Dolibarr users and groups with LDAP LDAPToDolibarr=LDAP -> Dolibarr DolibarrToLDAP=Dolibarr -> LDAP -LDAPSynchronizeContacts=Synchronize Dolibarr contacts to LDAP +LDAPSynchronizeContacts=Synchronize Dolibarr contacts with LDAP LDAPTypeExample=OpenLdap, Egroupware or Active Directory LDAPPrimaryServer=LDAP primary server LDAPSecondaryServer=LDAP secondary server @@ -523,16 +527,20 @@ LDAPDnContactActiveExample=Activated/Unactivated synchronization LDAPContactDn=Dolibarr contacts' DN LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=com) LDAPTestConnect=Test LDAP connection -LDAPTestOK=Connect to LDAP server successful -LDAPTestKO=Connect to LDAP server failed +LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s) +LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s) +LDAPUnbindSuccessfull=Disconnect successfull +LDAPUnbindFailed=Disconnect failed +LDAPConnectToDNSuccessfull=Connection au DN (%s) réussie +LDAPConnectToDNFailed=Connection au DN (%s) échouée LDAPSetupForVersion3=LDAP server configured for version 3 LDAPSetupForVersion2=LDAP server configured for version 2 -LDAPFieldLogin=Login attribute +LDAPFieldLoginUnix=Login (unix) LDAPFieldLoginExample=Default attribute : uid LDAPFilterConnection=Search filter LDAPFilterConnectionExample=Default filter : &(objectClass=user)(objectCategory=person) LDAPAttributes=LDAP attributes -LDAPFieldLoginSamba=Login +LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSambaExample=Default attribute : samaccountname (Samba and ActiveDirectory) LDAPFieldName=Name LDAPFieldNameExample=Default attribute : sn @@ -546,6 +554,8 @@ LDAPFieldFax=Fax number LDAPFieldFaxExample=Default attribute : facsimiletelephonenumber LDAPFieldMobile=Cellular phone LDAPFieldMobileExample=Default attribute : mobile +LDAPParametersAreStillHardCoded=LDAP parametres are still hardcoded (in contact class) +LDAPSetupNotComplete=LDAP setup not complete (go on others tabs) ##### Products ##### ProductSetup=Products module setup NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 843cfe45d8a..48fec98d506 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -491,11 +491,15 @@ AddSubscriptionIntoAccount=Enregistrer cotisations dans compte bancaire ou caiss AdherentMailRequired=EMail obligatoire pour créer un nouvel adhérent ##### LDAP setup ##### LDAPSetup=Configuration du module LDAP +LDAPGlobalParameters=Paramètres globals +LDAPUsersAndGroupsSynchro=Synchro utilisateurs/groupes +LDAPContactsSynchro=Synchro contacts +LDAPSynchronization=Synchronisation LDAP LDAPFunctionsNotAvailableOnPHP=Les fonctions LDAP ne sont pas disponibles sur votre PHP -LDAPSynchronizeUsersAndGroup=Synchronisation des utilisateurs et groupes Dolibarr ou LDAP +LDAPSynchronizeUsersAndGroup=Synchronisation des utilisateurs et groupes Dolibarr avec LDAP LDAPToDolibarr=LDAP -> Dolibarr DolibarrToLDAP=Dolibarr -> LDAP -LDAPSynchronizeContacts=Synchronisation des contacts Dolibarr vers LDAP +LDAPSynchronizeContacts=Synchronisation des contacts Dolibarr avec LDAP LDAPTypeExample=OpenLdap, Egroupware ou Active Directory LDAPPrimaryServer=Serveur primaire LDAPSecondaryServer=Serveur secondaire @@ -523,16 +527,20 @@ LDAPDnContactActiveExample=Synchronisation activ LDAPContactDn=DN des contacts Dolibarr LDAPContactDnExample=DN complet (ex: ou=contacts,dc=societe,dc=com) LDAPTestConnect=Tester la connexion LDAP -LDAPTestOK=Connexion au serveur LDAP réussie -LDAPTestKO=Connexion au serveur LDAP echouée +LDAPTCPConnectOK=Connexion TCP au serveur LDAP réussie (Server=%s, Port=%s) +LDAPTCPConnectKO=Connexion TCP au serveur LDAP échouée (Server=%s, Port=%s) +LDAPUnbindSuccessfull=Déconnection réussie +LDAPUnbindFailed=Déconnection échouée +LDAPConnectToDNSuccessfull=Connection au DN (%s) réussie +LDAPConnectToDNFailed=Connection au DN (%s) échouée LDAPSetupForVersion3=Serveur LDAP configuré en version 3 LDAPSetupForVersion2=Serveur LDAP configuré en version 2 -LDAPFieldLogin=Attribut du Login +LDAPFieldLoginUnix=Login (unix) LDAPFieldLoginExample=Attribut par défaut : uid LDAPFilterConnection=Filtre de recherche LDAPFilterConnectionExample=Filtre par défaut : &(objectClass=user)(objectCategory=person) LDAPAttributes=Attributs LDAP -LDAPFieldLoginSamba=Login +LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSambaExample=Attribut par défaut : samaccountname (Samba et ActiveDirectory) LDAPFieldName=Nom LDAPFieldNameExample=Attribut par défaut : sn @@ -546,6 +554,8 @@ LDAPFieldFax=Num LDAPFieldFaxExample=Attribut par défaut : facsimiletelephonenumber LDAPFieldMobile=Téléphone portable LDAPFieldMobileExample=Attribut par défaut : mobile +LDAPParametersAreStillHardCoded=Les parametres LDAP sont codés en dur (dans classe contact) +LDAPSetupNotComplete=Configuration LDAP incomplète (à compléter sur les autres onglets) ##### Products ##### ProductSetup=Configuration du module Produits NumberOfProductShowInSelect=Nombre de produits max dans les listes déroulantes (0=aucune limite)