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

Ajout Debug Syslog

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2005-08-08 13:24:39 +00:00
parent 7b34878ed2
commit 97be4b83b9
1 changed files with 215 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

425
htdocs/contact.class.php
View File

@ -98,6 +98,7 @@ class Contact
*/ */
function update($id, $user=0) function update($id, $user=0)
{ {
dolibarr_syslog("Contact::Update id=".$id,LOG_DEBUG);
$this->id = $id; $this->id = $id;
$this->error = array(); $this->error = array();
@ -116,8 +117,8 @@ class Contact
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET "; $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
$sql .= " civilite='$this->civilite_id'"; $sql .= " civilite='$this->civilite_id'";
$sql .= ", name='$this->name'"; $sql .= ", name='".trim($this->name)."'";
$sql .= ", firstname='$this->firstname'"; $sql .= ", firstname='".trim($this->firstname)."'";
$sql .= ", address='$this->address'"; $sql .= ", address='$this->address'";
$sql .= ", cp='$this->cp'"; $sql .= ", cp='$this->cp'";
$sql .= ", ville='$this->ville'"; $sql .= ", ville='$this->ville'";
@ -140,16 +141,16 @@ class Contact
if (!$result) if (!$result)
{ {
$this->error='Echec sql='.$sql; $this->error='Echec sql='.$sql;
} }
if (defined('MAIN_MODULE_LDAP') && MAIN_MODULE_LDAP) if (defined('MAIN_MODULE_LDAP') && MAIN_MODULE_LDAP)
{ {
if (defined('LDAP_CONTACT_ACTIVE') && LDAP_CONTACT_ACTIVE == 1) if (defined('LDAP_CONTACT_ACTIVE') && LDAP_CONTACT_ACTIVE == 1)
{
$this->update_ldap($user); $this->update_ldap($user);
}
} }
return $result; return $result;
} }
@ -161,188 +162,192 @@ class Contact
*/ */
function update_ldap($user) function update_ldap($user)
{ {
$info = array();
dolibarr_syslog("Contact::update_ldap",LOG_DEBUG);
$this->fetch($this->id); $this->fetch($this->id);
$ds = dolibarr_ldap_connect(); $ds = dolibarr_ldap_connect();
if ($ds) if ($ds)
{ {
dolibarr_ldap_setversion($ds,$version);
$ldapbind = dolibarr_ldap_bind($ds); $ldapbind = dolibarr_ldap_bind($ds);
if ($ldapbind) if ($ldapbind)
{ {
if (LDAP_SERVER_TYPE == 'activedirectory') //enlever utf8 pour etre compatible Windows if (LDAP_SERVER_TYPE == 'activedirectory') //enlever utf8 pour etre compatible Windows
{ {
$info["objectclass"][0] = "top"; $info["objectclass"][0] = "top";
$info["objectclass"][1] = "person"; $info["objectclass"][1] = "person";
$info["objectclass"][2] = "organizationalPerson"; $info["objectclass"][2] = "organizationalPerson";
//$info["objectclass"][3] = "inetOrgPerson"; //$info["objectclass"][3] = "inetOrgPerson";
$info["objectclass"][3] = "user"; $info["objectclass"][3] = "user";
$info["cn"] = $this->firstname." ".$this->name; $info["cn"] = $this->firstname." ".$this->name;
$info["sn"] = $this->name; $info["sn"] = $this->name;
$info["givenName"] = $this->firstname; $info["givenName"] = $this->firstname;
if ($this->poste) if ($this->poste)
$info["title"] = $this->poste; $info["title"] = $this->poste;
if ($this->socid > 0) if ($this->socid > 0)
{ {
$soc = new Societe($this->db); $soc = new Societe($this->db);
$soc->fetch($this->socid); $soc->fetch($this->socid);
$info["o"] = $soc->nom; $info["o"] = $soc->nom;
$info["company"] = $soc->nom; $info["company"] = $soc->nom;
if ($soc->client == 1) if ($soc->client == 1)
$info["businessCategory"] = "Clients"; $info["businessCategory"] = "Clients";
elseif ($soc->client == 2) elseif ($soc->client == 2)
$info["businessCategory"] = "Prospects"; $info["businessCategory"] = "Prospects";
if ($soc->fournisseur == 1) if ($soc->fournisseur == 1)
$info["businessCategory"] = "Fournisseurs"; $info["businessCategory"] = "Fournisseurs";
if ($soc->ville) if ($soc->ville)
{ {
if ($soc->adresse) if ($soc->adresse)
$info["streetAddress"] = $soc->adresse; $info["streetAddress"] = $soc->adresse;
if ($soc->cp) if ($soc->cp)
$info["postalCode"] = $soc->cp; $info["postalCode"] = $soc->cp;
$info["l"] = $soc->ville; $info["l"] = $soc->ville;
} }
}
if ($this->phone_pro)
$info["telephoneNumber"] = dolibarr_print_phone($this->phone_pro);
if ($this->phone_perso)
$info["homePhone"] = dolibarr_print_phone($this->phone_perso);
if ($this->phone_mobile)
$info["mobile"] = dolibarr_print_phone($this->phone_mobile);
if ($this->fax)
$info["facsimileTelephoneNumber"] = dolibarr_print_phone($this->fax);
if ($this->note)
$info["description"] = ($this->note);
if ($this->email)
$info["mail"] = $this->email;
$dn = "cn=".$info["cn"].",".LDAP_CONTACT_DN;
$r = @ldap_delete($ds, $dn);
if (! @ldap_add($ds, $dn, $info))
{
$this->error[0] = ldap_err2str(ldap_errno($ds));
}
} }
if ($this->phone_pro)
$info["telephoneNumber"] = dolibarr_print_phone($this->phone_pro);
if ($this->phone_perso)
$info["homePhone"] = dolibarr_print_phone($this->phone_perso);
if ($this->phone_mobile)
$info["mobile"] = dolibarr_print_phone($this->phone_mobile);
if ($this->fax)
$info["facsimileTelephoneNumber"] = dolibarr_print_phone($this->fax);
if ($this->note)
$info["description"] = ($this->note);
if ($this->email)
$info["mail"] = $this->email;
$dn = "cn=".$info["cn"].",".LDAP_CONTACT_DN;
$r = @ldap_delete($ds, $dn);
if (! @ldap_add($ds, $dn, $info))
{
$this->error[0] = ldap_err2str(ldap_errno($ds));
}
}
else
{
$info["objectclass"][0] = "top";
$info["objectclass"][1] = "person";
$info["objectclass"][2] = "organizationalPerson";
$info["objectclass"][3] = "inetOrgPerson";
$info["cn"] = utf8_encode($this->firstname." ".$this->name);
$info["sn"] = utf8_encode($this->name);
$info["givenName"] = utf8_encode($this->firstname);
if ($this->poste)
$info["title"] = utf8_encode($this->poste);
if ($this->socid > 0)
{
$soc = new Societe($this->db);
$soc->fetch($this->socid);
$info["o"] = utf8_encode($soc->nom);
if ($soc->client == 1)
$info["businessCategory"] = utf8_encode("Clients");
elseif ($soc->client == 2)
$info["businessCategory"] = utf8_encode("Prospects");
if ($soc->fournisseur == 1)
$info["businessCategory"] = utf8_encode("Fournisseurs");
if ($soc->ville)
{
if ($soc->adresse)
$info["street"] = utf8_encode($soc->adresse);
if ($soc->cp)
$info["postalCode"] = utf8_encode($soc->cp);
$info["l"] = utf8_encode($soc->ville);
}
}
if ($this->phone_pro)
$info["telephoneNumber"] = dolibarr_print_phone($this->phone_pro);
if ($this->phone_perso)
$info["homePhone"] = dolibarr_print_phone($this->phone_perso);
if ($this->phone_mobile)
$info["mobile"] = dolibarr_print_phone($this->phone_mobile);
if ($this->fax)
$info["facsimileTelephoneNumber"] = dolibarr_print_phone($this->fax);
if ($this->note)
$info["description"] = ($this->note);
if(LDAP_SERVER_TYPE == 'egroupware')
{
$info["objectclass"][4] = "phpgwContact"; // compatibilite egroupware
if ($this->email)
$info["rfc822Mailbox"] = $this->email;
$info['uidnumber'] = $this->id;
$info['phpgwTz'] = 0;
$info['phpgwMailType'] = 'INTERNET';
$info['phpgwMailHomeType'] = 'INTERNET';
$info["uid"] = $this->id. ":".$info["sn"];
$info["phpgwContactTypeId"] = 'n';
$info["phpgwContactCatId"] = 0;
$info["phpgwContactAccess"] = "public";
if (strlen($user->egroupware_id) == 0)
{
$user->egroupware_id = 1;
}
$info["phpgwContactOwner"] = $user->egroupware_id;
if ($this->phone_mobile)
$info["phpgwCellTelephoneNumber"] = dolibarr_print_phone($this->phone_mobile);
}
else else
{ {
if ($this->email) $info["objectclass"][0] = "top";
$info["mail"] = $this->email; $info["objectclass"][1] = "person";
} $info["objectclass"][2] = "organizationalPerson";
$info["objectclass"][3] = "inetOrgPerson";
$dn = "cn=".$info["cn"].",".LDAP_CONTACT_DN;
$info["cn"] = utf8_encode($this->firstname." ".$this->name);
$info["sn"] = utf8_encode($this->name);
$info["givenName"] = utf8_encode($this->firstname);
if ($this->poste)
$info["title"] = utf8_encode($this->poste);
if ($this->socid > 0)
{
$soc = new Societe($this->db);
$soc->fetch($this->socid);
$info["o"] = utf8_encode($soc->nom);
if ($soc->client == 1)
$info["businessCategory"] = utf8_encode("Clients");
elseif ($soc->client == 2)
$info["businessCategory"] = utf8_encode("Prospects");
if ($soc->fournisseur == 1)
$info["businessCategory"] = utf8_encode("Fournisseurs");
if ($soc->ville)
{
if ($soc->adresse)
$info["street"] = utf8_encode($soc->adresse);
if ($soc->cp)
$info["postalCode"] = utf8_encode($soc->cp);
$info["l"] = utf8_encode($soc->ville);
}
}
if ($this->phone_pro)
$info["telephoneNumber"] = dolibarr_print_phone($this->phone_pro);
if ($this->phone_perso)
$info["homePhone"] = dolibarr_print_phone($this->phone_perso);
if ($this->phone_mobile)
$info["mobile"] = dolibarr_print_phone($this->phone_mobile);
if ($this->fax)
$info["facsimileTelephoneNumber"] = dolibarr_print_phone($this->fax);
if ($this->note)
$info["description"] = ($this->note);
if(LDAP_SERVER_TYPE == 'egroupware')
{
$info["objectclass"][4] = "phpgwContact"; // compatibilite egroupware
if ($this->email)
$info["rfc822Mailbox"] = $this->email;
$info['uidnumber'] = $this->id;
$info['phpgwTz'] = 0;
$info['phpgwMailType'] = 'INTERNET';
$info['phpgwMailHomeType'] = 'INTERNET';
$info["uid"] = $this->id. ":".$info["sn"];
$info["phpgwContactTypeId"] = 'n';
$info["phpgwContactCatId"] = 0;
$info["phpgwContactAccess"] = "public";
if (strlen($user->egroupware_id) == 0)
{
$user->egroupware_id = 1;
}
$info["phpgwContactOwner"] = $user->egroupware_id;
if ($this->phone_mobile)
$info["phpgwCellTelephoneNumber"] = dolibarr_print_phone($this->phone_mobile);
}
else
{
if ($this->email)
$info["mail"] = $this->email;
}
$r = @ldap_delete($ds, $dn); $dn = "cn=".$info["cn"].",".LDAP_CONTACT_DN;
if (! @ldap_add($ds, $dn, $info)) dolibarr_syslog("Contact::update_ldap dn : ".$dn,LOG_DEBUG);
{
$this->error[0] = ldap_err2str(ldap_errno($ds)); $r = @ldap_delete($ds, $dn);
if (! @ldap_add($ds, $dn, $info))
{
$this->error[0] = ldap_err2str(ldap_errno($ds));
dolibarr_syslog("Contact::update_ldap error : ".$this->error[0],LOG_ERR);
}
} }
} }
}
else else
{ {
echo "Connexion au dn $dn échoué !"; dolibarr_syslog("Contact::update_ldap bind failed",LOG_DEBUG);
} }
dolibarr_ldap_unbind($ds); dolibarr_ldap_unbind($ds);
@ -350,6 +355,7 @@ class Contact
} }
else else
{ {
dolibarr_syslog("Contact::update_ldap Connexion failed",LOG_DEBUG);
echo "Impossible de se connecter au serveur LDAP !"; echo "Impossible de se connecter au serveur LDAP !";
} }
} }
@ -574,56 +580,55 @@ class Contact
$result = $this->db->query($sql); $result = $this->db->query($sql);
if (!$result) if (!$result)
{ {
print $this->db->error() . '<br>' . $sql; print $this->db->error() . '<br>' . $sql;
} }
if (defined('MAIN_MODULE_LDAP') && MAIN_MODULE_LDAP)
{
if (defined('LDAP_CONTACT_ACTIVE') && LDAP_CONTACT_ACTIVE == 1)
{
$ds = dolibarr_ldap_connect();
if ($ds) if (defined('MAIN_MODULE_LDAP') && MAIN_MODULE_LDAP)
{
if (defined('LDAP_CONTACT_ACTIVE') && LDAP_CONTACT_ACTIVE == 1)
{ {
dolibarr_ldap_setversion($ds, $version);
$ldapbind = dolibarr_ldap_bind($ds);
if ($ldapbind) $ds = dolibarr_ldap_connect();
{
// delete from ldap directory if ($ds)
if (LDAP_SERVER_TYPE == 'activedirectory') {
{ $ldapbind = dolibarr_ldap_bind($ds);
$userdn = $this->old_firstname." ".$this->old_name; //enlever utf8 pour etre compatible Windows
}
else
{
$userdn = utf8_encode($this->old_firstname." ".$this->old_name);
}
$dn = "cn=".$userdn.",".LDAP_CONTACT_DN;
if ($ldapbind)
{
// delete from ldap directory
if (LDAP_SERVER_TYPE == 'activedirectory')
{
$userdn = $this->old_firstname." ".$this->old_name; //enlever utf8 pour etre compatible Windows
}
else
{
$userdn = utf8_encode($this->old_firstname." ".$this->old_name);
}
$dn = "cn=".$userdn.",".LDAP_CONTACT_DN;
$r = @ldap_delete($ds, $dn); $r = @ldap_delete($ds, $dn);
} }
else else
{ {
echo "LDAP bind failed..."; echo "LDAP bind failed...";
} }
ldap_close($ds); ldap_close($ds);
} }
else else
{ {
echo "Unable to connect to LDAP server"; echo "Unable to connect to LDAP server";
} }
return $result; return $result;
}
}
} }
}
}
/* /*
* \brief Charge les informations sur le contact, depuis la base * \brief Charge les informations sur le contact, depuis la base
* \param id id du contact à charger * \param id id du contact à charger