Renomage classe gestion LDAP en ldap.class.php
This commit is contained in:
parent
8f526ad8a4
commit
e03c7dd496
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
|
||||||
|
|
||||||
@ -140,7 +140,7 @@ print '<td>'.$langs->trans("Value").'</td>';
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
// Lecture LDAP
|
// Lecture LDAP
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -31,7 +31,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
||||||
|
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
@ -257,7 +257,7 @@ if (function_exists("ldap_connect"))
|
|||||||
|
|
||||||
if ($_GET["action"] == 'test')
|
if ($_GET["action"] == 'test')
|
||||||
{
|
{
|
||||||
$ldap = new AuthLdap(); // Les parametres sont passés et récupérés via $conf
|
$ldap = new Ldap(); // Les parametres sont passés et récupérés via $conf
|
||||||
|
|
||||||
$result = $ldap->connect(); // Avec OpenLDAP 2.x.x, $reslt sera toujours vrai car connection a lieu dans premeiere fonction ldap_*
|
$result = $ldap->connect(); // Avec OpenLDAP 2.x.x, $reslt sera toujours vrai car connection a lieu dans premeiere fonction ldap_*
|
||||||
if ($result)
|
if ($result)
|
||||||
|
|||||||
@ -31,9 +31,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
||||||
require_once (DOL_DOCUMENT_ROOT."/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
|
||||||
|
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
|
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/user.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/user.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
||||||
|
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
||||||
|
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/user.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/user.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
||||||
|
|
||||||
$langs->load("admin");
|
$langs->load("admin");
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
\version $Revision$
|
\version $Revision$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -215,7 +215,7 @@ class Contact
|
|||||||
|
|
||||||
dolibarr_syslog("Contact.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
|
dolibarr_syslog("Contact.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
|
||||||
|
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
@ -350,7 +350,7 @@ class Contact
|
|||||||
|
|
||||||
dolibarr_syslog("Contact.class::update_ldap this->id=".$this->id,LOG_DEBUG);
|
dolibarr_syslog("Contact.class::update_ldap this->id=".$this->id,LOG_DEBUG);
|
||||||
|
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
|
||||||
require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
|
|
||||||
$user->getrights('commercial');
|
$user->getrights('commercial');
|
||||||
|
|
||||||
@ -152,7 +152,7 @@ print '<td>'.$langs->trans("Value").'</td>';
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
// Lecture LDAP
|
// Lecture LDAP
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -37,7 +37,7 @@
|
|||||||
\version $Revision$
|
\version $Revision$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1264,7 +1264,7 @@ class User
|
|||||||
|
|
||||||
dolibarr_syslog("User.class::update_ldap this->id=".$this->id,LOG_DEBUG);
|
dolibarr_syslog("User.class::update_ldap this->id=".$this->id,LOG_DEBUG);
|
||||||
|
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
@ -1339,7 +1339,7 @@ class User
|
|||||||
|
|
||||||
dolibarr_syslog("User.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
|
dolibarr_syslog("User.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
|
||||||
|
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
|
||||||
|
|
||||||
|
|
||||||
@ -124,7 +124,7 @@ if ($conf->ldap->enabled && $_GET["action"] == 'reactivate' && $candisableuser)
|
|||||||
$userid = $_GET["id"];
|
$userid = $_GET["id"];
|
||||||
$reactiveuser = new User($db, $userid);
|
$reactiveuser = new User($db, $userid);
|
||||||
$reactiveuser->fetch();
|
$reactiveuser->fetch();
|
||||||
$ldap = New AuthLdap();
|
$ldap = new Ldap();
|
||||||
if ($ldap->connect())
|
if ($ldap->connect())
|
||||||
{
|
{
|
||||||
$checkDn = $conf->global->LDAP_USER_DN;
|
$checkDn = $conf->global->LDAP_USER_DN;
|
||||||
@ -386,7 +386,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
|
|||||||
$login = $conf->global->LDAP_FIELD_LOGIN_SAMBA;
|
$login = $conf->global->LDAP_FIELD_LOGIN_SAMBA;
|
||||||
$SID = "objectsid";
|
$SID = "objectsid";
|
||||||
|
|
||||||
$ldap = new AuthLdap();
|
$ldap = new Ldap();
|
||||||
|
|
||||||
if ($ldap->connect())
|
if ($ldap->connect())
|
||||||
{
|
{
|
||||||
@ -664,7 +664,7 @@ else
|
|||||||
if ($conf->ldap->enabled && $fuser->ldap_sid)
|
if ($conf->ldap->enabled && $fuser->ldap_sid)
|
||||||
{
|
{
|
||||||
|
|
||||||
$ldap = New AuthLdap();
|
$ldap = new Ldap();
|
||||||
if ($ldap->connect())
|
if ($ldap->connect())
|
||||||
{
|
{
|
||||||
$entries = $ldap->fetch($fuser->login);
|
$entries = $ldap->fetch($fuser->login);
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
|
||||||
require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
|
|
||||||
$user->getrights('commercial');
|
$user->getrights('commercial');
|
||||||
|
|
||||||
@ -116,7 +116,7 @@ print '<td>'.$langs->trans("Value").'</td>';
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
// Lecture LDAP
|
// Lecture LDAP
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
|
||||||
require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
|
|
||||||
$user->getrights('commercial');
|
$user->getrights('commercial');
|
||||||
|
|
||||||
@ -131,7 +131,7 @@ print '<td>'.$langs->trans("Value").'</td>';
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
// Lecture LDAP
|
// Lecture LDAP
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
\version $Revision$
|
\version $Revision$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once (DOL_DOCUMENT_ROOT."/lib/authldap.lib.php");
|
require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -506,7 +506,7 @@ class UserGroup
|
|||||||
|
|
||||||
dolibarr_syslog("UserGroup.class::update_ldap this->id=".$this->id,LOG_DEBUG);
|
dolibarr_syslog("UserGroup.class::update_ldap this->id=".$this->id,LOG_DEBUG);
|
||||||
|
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
@ -578,7 +578,7 @@ class UserGroup
|
|||||||
|
|
||||||
dolibarr_syslog("UserGroup.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
|
dolibarr_syslog("UserGroup.class::delete_ldap this->id=".$this->id,LOG_DEBUG);
|
||||||
|
|
||||||
$ldap=new AuthLdap();
|
$ldap=new Ldap();
|
||||||
$result=$ldap->connect();
|
$result=$ldap->connect();
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user