lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ajout: possibilite de changer le port du serveur ldap

Browse Source
This commit is contained in:
Regis Houssin 2005-07-13 09:22:59 +00:00
parent fcf9a075b8
commit 79c8d176d4
4 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
htdocs/admin/ldap.php
View File

@ -48,6 +48,13 @@ if ($_GET["action"] == 'setvalue' && $user->admin)
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
('LDAP_SERVER_HOST','".$_POST["host"]."',0);"; ('LDAP_SERVER_HOST','".$_POST["host"]."',0);";
$db->query($sql); $db->query($sql);
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'LDAP_SERVER_PORT';";
$db->query($sql);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
('LDAP_SERVER_PORT','".$_POST["port"]."',0);";
$db->query($sql);
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'LDAP_SUFFIX_DN';"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'LDAP_SUFFIX_DN';";
$db->query($sql); $db->query($sql);
@ -137,6 +144,14 @@ print "</tr>\n";
{ {
print '<tr><td>'.$langs->trans("LDAPServer").'</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>'; print '<tr><td>'.$langs->trans("LDAPServer").'</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
} }
if (defined("LDAP_SERVER_PORT") && LDAP_SERVER_PORT)
{
print '<tr><td>'.$langs->trans("LDAPServerPort").'</td><td>'.LDAP_SERVER_PORT.'</td></tr>';
}
else
{
print '<tr><td>'.$langs->trans("LDAPServerPort").'</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
}
if (defined("LDAP_SUFFIX_DN") && LDAP_SUFFIX_DN) if (defined("LDAP_SUFFIX_DN") && LDAP_SUFFIX_DN)
{ {
print '<tr><td>'.$langs->trans("LDAPSuffix").'</td><td>'.LDAP_SUFFIX_DN.'</td></tr>'; print '<tr><td>'.$langs->trans("LDAPSuffix").'</td><td>'.LDAP_SUFFIX_DN.'</td></tr>';
@ -221,6 +236,16 @@ print '<tr><td>';
print $langs->trans("LDAPServer").'</td><td>'; print $langs->trans("LDAPServer").'</td><td>';
print '<input size="25" type="text" name="host" value="'.LDAP_SERVER_HOST.'">'; print '<input size="25" type="text" name="host" value="'.LDAP_SERVER_HOST.'">';
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("LDAPServerPort").'</td><td>';
if (defined("LDAP_SERVER_PORT") && LDAP_SERVER_PORT)
{
print '<input size="25" type="text" name="port" value="'.LDAP_SERVER_PORT.'">';
}
else
{
print '<input size="25" type="text" name="port" value="389">';
}
print '</td></tr>';
print '<tr><td>'.$langs->trans("LDAPSuffix").'</td><td>'; print '<tr><td>'.$langs->trans("LDAPSuffix").'</td><td>';
print '<input size="25" type="text" name="suffix" value="'.LDAP_SUFFIX_DN.'">'; print '<input size="25" type="text" name="suffix" value="'.LDAP_SUFFIX_DN.'">';
print '</td></tr>'; print '</td></tr>';
@ -295,11 +320,17 @@ if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST) {
if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST && LDAP_ADMIN_DN && LDAP_ADMIN_PASS && $_GET["action"] == 'test') if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST && LDAP_ADMIN_DN && LDAP_ADMIN_PASS && $_GET["action"] == 'test')
{ {
$ds = dolibarr_ldap_connect(); $ds = dolibarr_ldap_connect();
/*
if ($ds) if ($ds)
{ {
print "connection au serveur ldap réussie<br>"; print "connexion au serveur ldap réussie<br>";
}
else
{
print "connexion au serveur ldap échouée";
print img_picto('','alerte');
print "<br>";
}
if ((dolibarr_ldap_getversion($ds) == 3)) if ((dolibarr_ldap_getversion($ds) == 3))
{ {
print "Serveur ldap configuré en version 3<br>"; print "Serveur ldap configuré en version 3<br>";
@ -308,21 +339,21 @@ if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST && LDAP_ADMIN_DN && LDAP_ADM
{ {
print "Serveur ldap configuré en version 2<br>"; print "Serveur ldap configuré en version 2<br>";
} }
*/
$bind = dolibarr_ldap_bind($ds); $bind = @dolibarr_ldap_bind($ds);
if ($bind) if ($bind)
{ {
print "connection au dn $dn réussi<br>"; print "connexion au dn $dn réussi<br>";
} }
else else
{ {
print "connection au dn $dn raté"; print "connexion au dn $dn raté";
print img_picto('','alerte'); print img_picto('','alerte');
print "<br>"; print "<br>";
} }
$unbind = dolibarr_ldap_unbind($ds); $unbind = @dolibarr_ldap_unbind($ds);
if ($bind) if ($bind)
{ {
@ -334,11 +365,6 @@ if (defined("LDAP_SERVER_HOST") && LDAP_SERVER_HOST && LDAP_ADMIN_DN && LDAP_ADM
print img_picto('','alerte'); print img_picto('','alerte');
print "<br>"; print "<br>";
} }
}
else
{
print "connection au serveur ldap échouée<br>";
}
} }
$db->close(); $db->close();

2
htdocs/langs/en_US/admin.lang
View File

@ -265,6 +265,8 @@ InterventionsSetup=Interventions module setup
##### LDAP setup #### ##### LDAP setup ####
LDAPSetup=LDAP Setup LDAPSetup=LDAP Setup
LDAPServer=LDAP Server LDAPServer=LDAP Server
LDAPServerPort=LDAP server port
LDAPServerPortExample=Default port : 389
TestConnectLdap=Test connection TestConnectLdap=Test connection
LDAPSuffix=LDAP suffix LDAPSuffix=LDAP suffix
DNAdmin=LDAP Administrator DNAdmin=LDAP Administrator

2
htdocs/langs/fr_FR/admin.lang
View File

@ -265,6 +265,8 @@ InterventionsSetup=Configuration du module Interventions
##### LDAP setup ##### ##### LDAP setup #####
LDAPSetup=Configuration du module LDAP LDAPSetup=Configuration du module LDAP
LDAPServer=Serveur LDAP LDAPServer=Serveur LDAP
LDAPServerPort=Port du serveur LDAP
LDAPServerPortExample=Port par défaut : 389
TestConnectLdap=Tester la connexion TestConnectLdap=Tester la connexion
LDAPSuffix=Suffix LDAP LDAPSuffix=Suffix LDAP
DNAdmin=Administrateur LDAP DNAdmin=Administrateur LDAP

4
htdocs/lib/ldap.lib.php
View File

@ -40,8 +40,8 @@
function dolibarr_ldap_connect() function dolibarr_ldap_connect()
{ {
$ldapconnect = ldap_connect(LDAP_SERVER_HOST); $ldapconnect = ldap_connect(LDAP_SERVER_HOST,LDAP_SERVER_PORT);
return $ldapconnect; return $ldapconnect;
} }