diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index c929e451d6e..30f4e8c3ebf 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -142,13 +142,13 @@ if ($_POST["action"] == 'add_action')
{
if ($_POST["actioncode"] == 'AC_RDV' && $contact->getFullName($langs))
{
- $actioncomm->label = $langs->transnoentities("TaskRDVWith",$contact->getFullName($langs));
+ $actioncomm->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs));
}
else
{
if ($langs->trans("Action".$actioncomm->type_code) != "Action".$actioncomm->type_code)
{
- $actioncomm->label = $langs->transnoentities("Action".$actioncomm->type_code)."\n";
+ $actioncomm->label = $langs->transnoentitiesnoconv("Action".$actioncomm->type_code)."\n";
}
else $actioncomm->label = $cactioncomm->libelle;
}
@@ -207,7 +207,7 @@ if ($_POST["action"] == 'add_action')
{
$error=1;
$_GET["action"] = 'create';
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DateEnd")).'
';
+ $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")).'
';
}
if ($datea && $_POST["percentage"] == 0)
{
@@ -220,7 +220,7 @@ if ($_POST["action"] == 'add_action')
{
$error=1;
$_GET["action"] = 'create';
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
+ $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")).'
';
}
if (! $error)
diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php
index b9f4e969024..58d98f21908 100644
--- a/htdocs/contact.class.php
+++ b/htdocs/contact.class.php
@@ -22,192 +22,192 @@
*/
/**
- \file htdocs/contact.class.php
- \ingroup societe
- \brief Fichier de la classe des contacts
- \version $Id$
-*/
+ \file htdocs/contact.class.php
+ \ingroup societe
+ \brief Fichier de la classe des contacts
+ \version $Id$
+ */
require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php");
/**
- \class Contact
- \brief Classe permettant la gestion des contacts
-*/
+ \class Contact
+ \brief Classe permettant la gestion des contacts
+ */
class Contact extends CommonObject
{
- var $db;
- var $error;
- var $element='contact';
- var $table_element='socpeople';
+ var $db;
+ var $error;
+ var $element='contact';
+ var $table_element='socpeople';
- var $id;
+ var $id;
var $civilite_id;
- var $name;
- var $firstname;
- var $address;
- var $cp;
- var $ville;
- var $fk_pays;
- var $socid; // fk_soc
- var $status; // 0=brouillon, 1=4=actif, 5=inactif
+ var $name;
+ var $firstname;
+ var $address;
+ var $cp;
+ var $ville;
+ var $fk_pays;
+ var $socid; // fk_soc
+ var $status; // 0=brouillon, 1=4=actif, 5=inactif
- var $code;
- var $email;
- var $birthday;
+ var $code;
+ var $email;
+ var $birthday;
- var $ref_facturation; // Nb de reference facture pour lequel il est contact
- var $ref_contrat; // Nb de reference contrat pour lequel il est contact
- var $ref_commande; // Nb de reference commande pour lequel il est contact
- var $ref_propal; // Nb de reference propal pour lequel il est contact
+ var $ref_facturation; // Nb de reference facture pour lequel il est contact
+ var $ref_contrat; // Nb de reference contrat pour lequel il est contact
+ var $ref_commande; // Nb de reference commande pour lequel il est contact
+ var $ref_propal; // Nb de reference propal pour lequel il est contact
var $user_id;
var $user_login;
- /**
- * \brief Constructeur de l'objet contact
- * \param DB Habler d'acces base
- * \param id Id contact
- */
- function Contact($DB, $id=0)
- {
- $this->db = $DB;
- $this->id = $id;
+ /**
+ * \brief Constructeur de l'objet contact
+ * \param DB Habler d'acces base
+ * \param id Id contact
+ */
+ function Contact($DB, $id=0)
+ {
+ $this->db = $DB;
+ $this->id = $id;
- return 1;
- }
+ return 1;
+ }
- /**
- * \brief Add a contact in database
- * \param user Object user that create
- * \return int <0 if KO, >0 if OK
- */
- function create($user)
- {
- global $conf, $langs;
+ /**
+ * \brief Add a contact in database
+ * \param user Object user that create
+ * \return int <0 if KO, >0 if OK
+ */
+ function create($user)
+ {
+ global $conf, $langs;
// Clean parameters
- $this->name=trim($this->name);
- if (! $this->socid) $this->socid = 0;
+ $this->name=trim($this->name);
+ if (! $this->socid) $this->socid = 0;
if (! $this->priv) $this->priv = 0;
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (datec, fk_soc, name, fk_user_creat, priv)";
- $sql.= " VALUES (".$this->db->idate(mktime()).",";
- if ($this->socid > 0) $sql.= " ".$this->socid.",";
- else $sql.= "null,";
- $sql.= "'".addslashes($this->name)."',";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (datec, fk_soc, name, fk_user_creat, priv)";
+ $sql.= " VALUES (".$this->db->idate(mktime()).",";
+ if ($this->socid > 0) $sql.= " ".$this->socid.",";
+ else $sql.= "null,";
+ $sql.= "'".addslashes($this->name)."',";
$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null").",";
- $sql.= $this->priv;
- $sql.= ")";
+ $sql.= $this->priv;
+ $sql.= ")";
- dol_syslog("Contact::create sql=".$sql);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."socpeople");
+ dol_syslog("Contact::create sql=".$sql);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."socpeople");
- $result=$this->update($this->id, $user, 1);
- if ($result < 0)
- {
- $this->error=$this->db->error();
- return -2;
- }
+ $result=$this->update($this->id, $user, 1);
+ if ($result < 0)
+ {
+ $this->error=$this->db->error();
+ return -2;
+ }
- // Appel des triggers
- include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('CONTACT_CREATE',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
+ // Appel des triggers
+ include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+ $interface=new Interfaces($this->db);
+ $result=$interface->run_triggers('CONTACT_CREATE',$this,$user,$langs,$conf);
+ if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ // Fin appel triggers
- return $this->id;
- }
- else
- {
- $this->error=$this->db->error();
- dol_syslog("Contact::create ".$this->error, LOG_ERR);
- return -1;
- }
- }
+ return $this->id;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ dol_syslog("Contact::create ".$this->error, LOG_ERR);
+ return -1;
+ }
+ }
- /*
- * \brief Mise a jour des infos en base
- * \param id Id du contact a mettre a jour
- * \param user Objet utilisateur qui effectue la mise a jour
- * \param notrigger 0=non, 1=oui
- * \return int <0 si erreur, >0 si ok
- */
- function update($id, $user=0, $notrigger=0)
- {
- global $conf, $langs;
+ /*
+ * \brief Mise a jour des infos en base
+ * \param id Id du contact a mettre a jour
+ * \param user Objet utilisateur qui effectue la mise a jour
+ * \param notrigger 0=non, 1=oui
+ * \return int <0 si erreur, >0 si ok
+ */
+ function update($id, $user=0, $notrigger=0)
+ {
+ global $conf, $langs;
- $this->id = $id;
+ $this->id = $id;
- // Nettoyage parametres
- $this->name=trim($this->name);
- $this->firstname=trim($this->firstname);
+ // Nettoyage parametres
+ $this->name=trim($this->name);
+ $this->firstname=trim($this->firstname);
- $this->email=trim($this->email);
- $this->phone_pro=trim($this->phone_pro);
- $this->phone_perso=trim($this->phone_perso);
- $this->phone_mobile=trim($this->phone_mobile);
- $this->fax=trim($this->fax);
+ $this->email=trim($this->email);
+ $this->phone_pro=trim($this->phone_pro);
+ $this->phone_perso=trim($this->phone_perso);
+ $this->phone_mobile=trim($this->phone_mobile);
+ $this->fax=trim($this->fax);
- $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
- if ($this->socid > 0) $sql .= " fk_soc='".addslashes($this->socid)."',";
- if ($this->socid == -1) $sql .= " fk_soc=null,";
- $sql .= " civilite='".addslashes($this->civilite_id)."'";
- $sql .= ", name='".addslashes($this->name)."'";
- $sql .= ", firstname='".addslashes($this->firstname)."'";
- $sql .= ", address='".addslashes($this->address)."'";
- $sql .= ", cp='".addslashes($this->cp)."'";
- $sql .= ", ville='".addslashes($this->ville)."'";
- $sql .= ", fk_pays=".($this->fk_pays>0?$this->fk_pays:'NULL');
- $sql .= ", poste='".addslashes($this->poste)."'";
- $sql .= ", fax='".addslashes($this->fax)."'";
- $sql .= ", email='".addslashes($this->email)."'";
- $sql .= ", note='".addslashes($this->note)."'";
- $sql .= ", phone = '".addslashes($this->phone_pro)."'";
- $sql .= ", phone_perso = '".addslashes($this->phone_perso)."'";
- $sql .= ", phone_mobile = '".addslashes($this->phone_mobile)."'";
- $sql .= ", jabberid = '".addslashes($this->jabberid)."'";
- $sql .= ", priv = '".$this->priv."'";
- $sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"null");
- $sql .= " WHERE rowid=".$id;
+ $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
+ if ($this->socid > 0) $sql .= " fk_soc='".addslashes($this->socid)."',";
+ if ($this->socid == -1) $sql .= " fk_soc=null,";
+ $sql .= " civilite='".addslashes($this->civilite_id)."'";
+ $sql .= ", name='".addslashes($this->name)."'";
+ $sql .= ", firstname='".addslashes($this->firstname)."'";
+ $sql .= ", address='".addslashes($this->address)."'";
+ $sql .= ", cp='".addslashes($this->cp)."'";
+ $sql .= ", ville='".addslashes($this->ville)."'";
+ $sql .= ", fk_pays=".($this->fk_pays>0?$this->fk_pays:'NULL');
+ $sql .= ", poste='".addslashes($this->poste)."'";
+ $sql .= ", fax='".addslashes($this->fax)."'";
+ $sql .= ", email='".addslashes($this->email)."'";
+ $sql .= ", note='".addslashes($this->note)."'";
+ $sql .= ", phone = '".addslashes($this->phone_pro)."'";
+ $sql .= ", phone_perso = '".addslashes($this->phone_perso)."'";
+ $sql .= ", phone_mobile = '".addslashes($this->phone_mobile)."'";
+ $sql .= ", jabberid = '".addslashes($this->jabberid)."'";
+ $sql .= ", priv = '".$this->priv."'";
+ $sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"null");
+ $sql .= " WHERE rowid=".$id;
- dol_syslog("Contact::update sql=".$sql,LOG_DEBUG);
- $result = $this->db->query($sql);
- if (! $result)
- {
- $this->error=$this->db->lasterror().' sql='.$sql;
+ dol_syslog("Contact::update sql=".$sql,LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if (! $result)
+ {
+ $this->error=$this->db->lasterror().' sql='.$sql;
dol_syslog("Contact::update Error ".$this->error,LOG_ERR);
- return -1;
- }
+ return -1;
+ }
if (! $notrigger)
{
- // Appel des triggers
- include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('CONTACT_MODIFY',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
- }
+ // Appel des triggers
+ include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+ $interface=new Interfaces($this->db);
+ $result=$interface->run_triggers('CONTACT_MODIFY',$this,$user,$langs,$conf);
+ if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ // Fin appel triggers
+ }
- return 1;
- }
+ return 1;
+ }
- /*
- * \brief Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
- * \param info Info string loaded by _load_ldap_info
- * \param mode 0=Return DN without key inside (ou=xxx,dc=aaa,dc=bbb)
- 1=Return full DN (uid=qqq,ou=xxx,dc=aaa,dc=bbb)
- 2=Return key only (uid=qqq)
- * \return string DN
- */
+ /**
+ * \brief Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
+ * \param info Info string loaded by _load_ldap_info
+ * \param mode 0=Return DN without key inside (ou=xxx,dc=aaa,dc=bbb)
+ * 1=Return full DN (uid=qqq,ou=xxx,dc=aaa,dc=bbb)
+ * 2=Return key only (uid=qqq)
+ * \return string DN
+ */
function _load_ldap_dn($info,$mode=0)
{
global $conf;
@@ -219,11 +219,10 @@ class Contact extends CommonObject
}
- /*
- * \brief Initialise tableau info (tableau des attributs LDAP)
- * \return array Tableau info des attributs
- * TODO tester si la suppression des utf8_encode affecte l'utilisation de active directory
- */
+ /**
+ * \brief Initialise tableau info (tableau des attributs LDAP)
+ * \return array Tableau info des attributs
+ */
function _load_ldap_info()
{
global $conf,$langs;
@@ -232,9 +231,9 @@ class Contact extends CommonObject
$info["objectclass"]=split(',',$conf->global->LDAP_CONTACT_OBJECT_CLASS);
// Champs
- if ($this->getFullName($langs) && $conf->global->LDAP_FIELD_FULLNAME) $info[$conf->global->LDAP_FIELD_FULLNAME] = utf8_encode($this->getFullName($langs));
- if ($this->name && $conf->global->LDAP_FIELD_NAME) $info[$conf->global->LDAP_FIELD_NAME] = utf8_encode($this->name);
- if ($this->firstname && $conf->global->LDAP_FIELD_FIRSTNAME) $info[$conf->global->LDAP_FIELD_FIRSTNAME] = utf8_encode($this->firstname);
+ if ($this->getFullName($langs) && $conf->global->LDAP_FIELD_FULLNAME) $info[$conf->global->LDAP_FIELD_FULLNAME] = $this->getFullName($langs);
+ if ($this->name && $conf->global->LDAP_FIELD_NAME) $info[$conf->global->LDAP_FIELD_NAME] = $this->name;
+ if ($this->firstname && $conf->global->LDAP_FIELD_FIRSTNAME) $info[$conf->global->LDAP_FIELD_FIRSTNAME] = $this->firstname;
if ($this->poste) $info["title"] = $this->poste;
if ($this->socid > 0)
@@ -247,15 +246,15 @@ class Contact extends CommonObject
if ($soc->client == 2) $info["businessCategory"] = "Prospects";
if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
}
- if ($this->address && $conf->global->LDAP_FIELD_ADDRESS) $info[$conf->global->LDAP_FIELD_ADDRESS] = utf8_encode($this->address);
+ if ($this->address && $conf->global->LDAP_FIELD_ADDRESS) $info[$conf->global->LDAP_FIELD_ADDRESS] = $this->address;
if ($this->cp && $conf->global->LDAP_FIELD_ZIP) $info[$conf->global->LDAP_FIELD_ZIP] = $this->cp;
- if ($this->ville && $conf->global->LDAP_FIELD_TOWN) $info[$conf->global->LDAP_FIELD_TOWN] = utf8_encode($this->ville);
+ if ($this->ville && $conf->global->LDAP_FIELD_TOWN) $info[$conf->global->LDAP_FIELD_TOWN] = $this->ville;
if ($this->pays && $conf->global->LDAP_FIELD_COUNTRY) $info[$conf->global->LDAP_FIELD_COUNTRY] = $this->pays_code;
if ($this->phone_pro && $conf->global->LDAP_FIELD_PHONE) $info[$conf->global->LDAP_FIELD_PHONE] = $this->phone_pro;
if ($this->phone_perso && $conf->global->LDAP_FIELD_HOMEPHONE) $info[$conf->global->LDAP_FIELD_HOMEPHONE] = $this->phone_perso;
if ($this->phone_mobile && $conf->global->LDAP_FIELD_MOBILE) $info[$conf->global->LDAP_FIELD_MOBILE] = $this->phone_mobile;
if ($this->fax && $conf->global->LDAP_FIELD_FAX) $info[$conf->global->LDAP_FIELD_FAX] = $this->fax;
- if ($this->note && $conf->global->LDAP_FIELD_DESCRIPTION) $info[$conf->global->LDAP_FIELD_DESCRIPTION] = utf8_encode($this->note);
+ if ($this->note && $conf->global->LDAP_FIELD_DESCRIPTION) $info[$conf->global->LDAP_FIELD_DESCRIPTION] = $this->note;
if ($this->email && $conf->global->LDAP_FIELD_MAIL) $info[$conf->global->LDAP_FIELD_MAIL] = $this->email;
if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
@@ -288,10 +287,10 @@ class Contact extends CommonObject
/*
- * \brief Mise a jour des alertes
- * \param id id du contact
- * \param user Utilisateur qui demande l'alerte
- */
+ * \brief Mise a jour des alertes
+ * \param id id du contact
+ * \param user Utilisateur qui demande l'alerte
+ */
function update_perso($id, $user=0)
{
// Mis a jour contact
@@ -299,18 +298,18 @@ class Contact extends CommonObject
if ($this->birthday) // <0 si avant 1970, >0 si apres 1970
{
- if (eregi('^[0-9]+\-',$this->birthday))
- {
- // Si date = chaine (ne devrait pas arriver)
- $sql .= ", birthday='".$this->birthday."'";
- }
- else
- {
- // Si date = timestamp
- $sql .= ", birthday=".$this->db->idate($this->birthday);
- }
+ if (eregi('^[0-9]+\-',$this->birthday))
+ {
+ // Si date = chaine (ne devrait pas arriver)
+ $sql .= ", birthday='".$this->birthday."'";
+ }
+ else
+ {
+ // Si date = timestamp
+ $sql .= ", birthday=".$this->db->idate($this->birthday);
+ }
}
- if ($user) $sql .= ", fk_user_modif=".$user->id;
+ if ($user) $sql .= ", fk_user_modif=".$user->id;
$sql .= " WHERE rowid=".$id;
//print "update_perso: ".$this->birthday.'-'.$this->db->idate($this->birthday);
dol_syslog("Contact::update_perso this->birthday=".$this->birthday." - sql=".$sql);
@@ -326,8 +325,8 @@ class Contact extends CommonObject
//check existing
$sql_check = "SELECT * FROM ".MAIN_DB_PREFIX."user_alert WHERE type=1 AND fk_contact=$id AND fk_user=".$user->id;
$result_check = $this->db->query($sql_check);
- if (!$result_check or ($this->db->num_rows($result_check)<1))
- {
+ if (!$result_check or ($this->db->num_rows($result_check)<1))
+ {
//insert
$sql = "INSERT into ".MAIN_DB_PREFIX."user_alert(type,fk_contact,fk_user) ";
$sql.= "values (1,".$id.",".$user->id.")";
@@ -336,11 +335,11 @@ class Contact extends CommonObject
{
$this->error='Echec sql='.$sql;
}
- }
- else
- {
- $result = true;
- }
+ }
+ else
+ {
+ $result = true;
+ }
}
else
{
@@ -356,124 +355,124 @@ class Contact extends CommonObject
}
- /*
- * \brief Charge l'objet contact
- * \param id id du contact
- * \param user Utilisateur lie au contact pour une alerte
- * \return int -1 if KO, 0 if OK but not found, 1 if OK
- */
- function fetch($id, $user=0)
- {
- global $langs;
- $langs->load("companies");
- $sql = "SELECT c.rowid, c.fk_soc, c.civilite as civilite_id, c.name, c.firstname,";
- $sql.= " c.address, c.cp, c.ville,";
- $sql.= " c.fk_pays, p.libelle as pays, p.code as pays_code,";
- $sql.= " c.birthday,";
- $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,";
- $sql.= " c.priv, c.note,";
- $sql.= " u.rowid as user_id, u.login as user_login,";
- $sql.= " s.nom as socname";
- $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON c.fk_pays = p.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
- $sql.= " WHERE c.rowid = ". $id;
+ /*
+ * \brief Charge l'objet contact
+ * \param id id du contact
+ * \param user Utilisateur lie au contact pour une alerte
+ * \return int -1 if KO, 0 if OK but not found, 1 if OK
+ */
+ function fetch($id, $user=0)
+ {
+ global $langs;
+ $langs->load("companies");
+ $sql = "SELECT c.rowid, c.fk_soc, c.civilite as civilite_id, c.name, c.firstname,";
+ $sql.= " c.address, c.cp, c.ville,";
+ $sql.= " c.fk_pays, p.libelle as pays, p.code as pays_code,";
+ $sql.= " c.birthday,";
+ $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,";
+ $sql.= " c.priv, c.note,";
+ $sql.= " u.rowid as user_id, u.login as user_login,";
+ $sql.= " s.nom as socname";
+ $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON c.fk_pays = p.rowid";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
+ $sql.= " WHERE c.rowid = ". $id;
- dol_syslog("Contact::fetch sql=".$sql);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
- {
- $obj = $this->db->fetch_object($resql);
+ dol_syslog("Contact::fetch sql=".$sql);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
- $this->ref = $obj->rowid;
- $this->civilite_id = $obj->civilite_id;
- $this->name = $obj->name;
- $this->firstname = $obj->firstname;
- $this->nom = $obj->name;
- $this->prenom = $obj->firstname;
+ $this->id = $obj->rowid;
+ $this->ref = $obj->rowid;
+ $this->civilite_id = $obj->civilite_id;
+ $this->name = $obj->name;
+ $this->firstname = $obj->firstname;
+ $this->nom = $obj->name;
+ $this->prenom = $obj->firstname;
- $this->address = $obj->address;
- $this->adresse = $obj->address; // Todo: uniformiser le nom des variables
- $this->cp = $obj->cp;
- $this->ville = $obj->ville;
- $this->fk_pays = $obj->fk_pays;
- $this->pays_code = $obj->fk_pays?$obj->pays_code:'';
- $this->pays = ($obj->fk_pays > 0)?$langs->transnoentities("Country".$obj->pays_code):$langs->transnoentities("SelectCountry");
+ $this->address = $obj->address;
+ $this->adresse = $obj->address; // Todo: uniformiser le nom des variables
+ $this->cp = $obj->cp;
+ $this->ville = $obj->ville;
+ $this->fk_pays = $obj->fk_pays;
+ $this->pays_code = $obj->fk_pays?$obj->pays_code:'';
+ $this->pays = ($obj->fk_pays > 0)?$langs->transnoentities("Country".$obj->pays_code):$langs->transnoentities("SelectCountry");
- $this->societeid = $obj->fk_soc;
- $this->socid = $obj->fk_soc;
- $this->socname = $obj->socname;
- $this->poste = $obj->poste;
+ $this->societeid = $obj->fk_soc;
+ $this->socid = $obj->fk_soc;
+ $this->socname = $obj->socname;
+ $this->poste = $obj->poste;
- $this->phone_pro = trim($obj->phone);
- $this->fax = trim($obj->fax);
- $this->phone_perso = trim($obj->phone_perso);
- $this->phone_mobile = trim($obj->phone_mobile);
+ $this->phone_pro = trim($obj->phone);
+ $this->fax = trim($obj->fax);
+ $this->phone_perso = trim($obj->phone_perso);
+ $this->phone_mobile = trim($obj->phone_mobile);
- $this->email = $obj->email;
- $this->jabberid = $obj->jabberid;
- $this->priv = $obj->priv;
- $this->mail = $obj->email;
+ $this->email = $obj->email;
+ $this->jabberid = $obj->jabberid;
+ $this->priv = $obj->priv;
+ $this->mail = $obj->email;
- $this->birthday = dol_stringtotime($obj->birthday);
+ $this->birthday = dol_stringtotime($obj->birthday);
//print "fetch: ".$obj->birthday.'-'.$this->birthday;
- $this->birthday_alert = $obj->birthday_alert;
- $this->note = $obj->note;
- $this->user_id = $obj->user_id;
- $this->user_login = $obj->user_login;
+ $this->birthday_alert = $obj->birthday_alert;
+ $this->note = $obj->note;
+ $this->user_id = $obj->user_id;
+ $this->user_login = $obj->user_login;
- // Recherche le user Dolibarr li� � ce contact
- $sql = "SELECT u.rowid ";
- $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
- $sql .= " WHERE u.fk_socpeople = ". $this->id;
+ // Recherche le user Dolibarr li� � ce contact
+ $sql = "SELECT u.rowid ";
+ $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+ $sql .= " WHERE u.fk_socpeople = ". $this->id;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
- {
- $uobj = $this->db->fetch_object($resql);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $uobj = $this->db->fetch_object($resql);
- $this->user_id = $uobj->rowid;
- }
- $this->db->free($resql);
- }
- else
- {
- $this->error=$this->db->error();
- dol_syslog("Contact::fetch ".$this->error, LOG_ERR);
- return -1;
- }
+ $this->user_id = $uobj->rowid;
+ }
+ $this->db->free($resql);
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ dol_syslog("Contact::fetch ".$this->error, LOG_ERR);
+ return -1;
+ }
- // Charge alertes du user
- if ($user)
- {
- $sql = "SELECT fk_user";
- $sql .= " FROM ".MAIN_DB_PREFIX."user_alert";
- $sql .= " WHERE fk_user = ".$user->id." AND fk_contact = ".$id;
+ // Charge alertes du user
+ if ($user)
+ {
+ $sql = "SELECT fk_user";
+ $sql .= " FROM ".MAIN_DB_PREFIX."user_alert";
+ $sql .= " WHERE fk_user = ".$user->id." AND fk_contact = ".$id;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
- {
- $obj = $this->db->fetch_object($resql);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
- $this->birthday_alert = 1;
- }
- $this->db->free($resql);
- }
- else
- {
- $this->error=$this->db->error();
- dol_syslog("Contact::fetch ".$this->error, LOG_ERR);
- return -1;
- }
- }
+ $this->birthday_alert = 1;
+ }
+ $this->db->free($resql);
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ dol_syslog("Contact::fetch ".$this->error, LOG_ERR);
+ return -1;
+ }
+ }
return 1;
}
@@ -482,63 +481,63 @@ class Contact extends CommonObject
$this->error=$langs->trans("RecordNotFound");
return 0;
}
- }
- else
- {
+ }
+ else
+ {
$this->error=$this->db->error();
dol_syslog("Contact::fetch ".$this->error, LOG_ERR);
- return -1;
- }
- }
+ return -1;
+ }
+ }
- /*
- * \brief Charge le nombre d'elements auquel est lie ce contact
- * ref_facturation
- * ref_contrat
- * ref_commande
- * ref_propale
- * \return int 0 si ok, -1 si erreur
- */
- function load_ref_elements()
- {
- // Compte les elements pour lesquels il est contact
- $sql ="SELECT tc.element, count(ec.rowid) as nb";
- $sql.=" FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
- $sql.=" WHERE ec.fk_c_type_contact = tc.rowid";
- $sql.=" AND fk_socpeople = ". $this->id;
- $sql.=" GROUP BY tc.element";
-
- dol_syslog("Contact::load_ref_elements sql=".$sql);
-
- $resql=$this->db->query($sql);
- if ($resql)
- {
- while($obj=$this->db->fetch_object($resql))
- {
- if ($obj->nb)
- {
- if ($obj->element=='facture') $this->ref_facturation = $obj->nb;
- if ($obj->element=='contrat') $this->ref_contrat = $obj->nb;
- if ($obj->element=='commande') $this->ref_commande = $obj->nb;
- if ($obj->element=='propal') $this->ref_propal = $obj->nb;
- }
- }
- $this->db->free($resql);
- return 0;
- }
- else
- {
- $this->error=$this->db->error()." - ".$sql;
- dol_syslog("Contact::load_ref_elements Error ".$this->error, LOG_ERR);
- return -1;
- }
- }
-
/*
- * \brief Efface le contact de la base
- * \return int <0 si ko, >0 si ok
- */
+ * \brief Charge le nombre d'elements auquel est lie ce contact
+ * ref_facturation
+ * ref_contrat
+ * ref_commande
+ * ref_propale
+ * \return int 0 si ok, -1 si erreur
+ */
+ function load_ref_elements()
+ {
+ // Compte les elements pour lesquels il est contact
+ $sql ="SELECT tc.element, count(ec.rowid) as nb";
+ $sql.=" FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
+ $sql.=" WHERE ec.fk_c_type_contact = tc.rowid";
+ $sql.=" AND fk_socpeople = ". $this->id;
+ $sql.=" GROUP BY tc.element";
+
+ dol_syslog("Contact::load_ref_elements sql=".$sql);
+
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ while($obj=$this->db->fetch_object($resql))
+ {
+ if ($obj->nb)
+ {
+ if ($obj->element=='facture') $this->ref_facturation = $obj->nb;
+ if ($obj->element=='contrat') $this->ref_contrat = $obj->nb;
+ if ($obj->element=='commande') $this->ref_commande = $obj->nb;
+ if ($obj->element=='propal') $this->ref_propal = $obj->nb;
+ }
+ }
+ $this->db->free($resql);
+ return 0;
+ }
+ else
+ {
+ $this->error=$this->db->error()." - ".$sql;
+ dol_syslog("Contact::load_ref_elements Error ".$this->error, LOG_ERR);
+ return -1;
+ }
+ }
+
+ /*
+ * \brief Efface le contact de la base
+ * \return int <0 si ko, >0 si ok
+ */
function delete($notrigger=0)
{
global $conf, $langs, $user;
@@ -563,7 +562,7 @@ class Contact extends CommonObject
$resql = $this->db->query($sql);
if ($resql)
{
- $num=$this->db->num_rows($resql);
+ $num=$this->db->num_rows($resql);
$i=0;
while ($i < $num && ! $error)
@@ -609,10 +608,10 @@ class Contact extends CommonObject
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('CONTACT_DELETE',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
- if ($error) $this->error=join(',',$this->errors);
+ if ($error) $this->error=join(',',$this->errors);
}
if (! $error)
@@ -629,76 +628,76 @@ class Contact extends CommonObject
}
- /*
- * \brief Charge les informations sur le contact, depuis la base
- * \param id id du contact a charger
- */
- function info($id)
- {
- $sql = "SELECT c.rowid, ".$this->db->pdate("c.datec")." as datec, c.fk_user_creat";
- $sql .= ", ".$this->db->pdate("c.tms")." as tms, c.fk_user_modif";
- $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
- $sql .= " WHERE c.rowid = ".$id;
+ /*
+ * \brief Charge les informations sur le contact, depuis la base
+ * \param id id du contact a charger
+ */
+ function info($id)
+ {
+ $sql = "SELECT c.rowid, ".$this->db->pdate("c.datec")." as datec, c.fk_user_creat";
+ $sql .= ", ".$this->db->pdate("c.tms")." as tms, c.fk_user_modif";
+ $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+ $sql .= " WHERE c.rowid = ".$id;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
- {
- $obj = $this->db->fetch_object($resql);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
+ $this->id = $obj->rowid;
- if ($obj->fk_user_creat) {
- $cuser = new User($this->db, $obj->fk_user_creat);
- $cuser->fetch();
- $this->user_creation = $cuser;
- }
+ if ($obj->fk_user_creat) {
+ $cuser = new User($this->db, $obj->fk_user_creat);
+ $cuser->fetch();
+ $this->user_creation = $cuser;
+ }
- if ($obj->fk_user_modif) {
- $muser = new User($this->db, $obj->fk_user_modif);
- $muser->fetch();
- $this->user_modification = $muser;
- }
+ if ($obj->fk_user_modif) {
+ $muser = new User($this->db, $obj->fk_user_modif);
+ $muser->fetch();
+ $this->user_modification = $muser;
+ }
- $this->date_creation = $obj->datec;
- $this->date_modification = $obj->tms;
+ $this->date_creation = $obj->datec;
+ $this->date_modification = $obj->tms;
- }
+ }
- $this->db->free($resql);
- }
- else
- {
- print $this->db->error();
- }
- }
+ $this->db->free($resql);
+ }
+ else
+ {
+ print $this->db->error();
+ }
+ }
- /*
- * \brief Renvoi nombre d'emailings recu par le contact avec son email
- * \return int Nombre d'emailings
- */
- function getNbOfEMailings()
- {
- $sql = "SELECT count(mc.email) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
- $sql.= " WHERE mc.email = '".addslashes($this->email)."'";
- $sql.= " AND mc.statut=1"; // -1 erreur, 0 non envoye, 1 envoye avec succes
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $obj = $this->db->fetch_object($resql);
- $nb=$obj->nb;
+ /*
+ * \brief Renvoi nombre d'emailings recu par le contact avec son email
+ * \return int Nombre d'emailings
+ */
+ function getNbOfEMailings()
+ {
+ $sql = "SELECT count(mc.email) as nb";
+ $sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+ $sql.= " WHERE mc.email = '".addslashes($this->email)."'";
+ $sql.= " AND mc.statut=1"; // -1 erreur, 0 non envoye, 1 envoye avec succes
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $obj = $this->db->fetch_object($resql);
+ $nb=$obj->nb;
- $this->db->free($resql);
- return $nb;
- }
- else
- {
- $this->error=$this->db->error();
- return -1;
- }
- }
+ $this->db->free($resql);
+ return $nb;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
/**
* \brief Renvoie nom clicable (avec eventuellement le picto)
@@ -729,23 +728,23 @@ class Contact extends CommonObject
}
- /**
- * \brief Retourne le libelle de civilite du contact
- * \return string Nom traduit de la civilite
- */
- function getCivilityLabel()
- {
- global $langs;
- $langs->load("dict");
+ /**
+ * \brief Retourne le libelle de civilite du contact
+ * \return string Nom traduit de la civilite
+ */
+ function getCivilityLabel()
+ {
+ global $langs;
+ $langs->load("dict");
$code=$this->civilite_id;
- return $langs->trans("Civility".$code)!="Civility".$code ? $langs->trans("Civility".$code) : $code;
- }
+ return $langs->trans("Civility".$code)!="Civility".$code ? $langs->trans("Civility".$code) : $code;
+ }
/**
- * \brief Return full name (name+' '+lastname)
- * \param langs Lang object for output
+ * \brief Return full name (civility+' '+name+' '+lastname)
+ * \param langs Lang object for translation of civility
* \param option 0=No option, 1=Add civility
* \param nameorder 0=Lastname+Firstname, 1=Firstname+Lastname
* \return string String with full name
@@ -755,21 +754,21 @@ class Contact extends CommonObject
$ret='';
if ($option && $this->civilite_id)
{
- if ($langs->transnoentities("Civility".$this->civilite_id)!="Civility".$this->civilite_id) $ret.=$langs->transnoentities("Civility".$this->civilite_id).' ';
+ if ($langs->transnoentitiesnoconv("Civility".$this->civilite_id)!="Civility".$this->civilite_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civilite_id).' ';
else $ret.=$this->civilite_id.' ';
}
if ($nameorder)
{
- if ($this->firstname) $ret.=$langs->convToOutputCharset($this->firstname);
+ if ($this->firstname) $ret.=$this->firstname;
if ($this->firstname && $this->name) $ret.=' ';
- if ($this->name) $ret.=$langs->convToOutputCharset($this->name);
+ if ($this->name) $ret.=$this->name;
}
else
{
- if ($this->name) $ret.=$langs->convToOutputCharset($this->name);
+ if ($this->name) $ret.=$this->name;
if ($this->firstname && $this->name) $ret.=' ';
- if ($this->firstname) $ret.=$langs->convToOutputCharset($this->firstname);
+ if ($this->firstname) $ret.=$this->firstname;
}
return trim($ret);
}
@@ -795,48 +794,48 @@ class Contact extends CommonObject
{
global $langs;
- if ($mode == 0)
- {
- if ($statut==0) return $langs->trans('StatusContactDraft');
- if ($statut==1) return $langs->trans('StatusContactValidated');
- if ($statut==4) return $langs->trans('StatusContactValidated');
- if ($statut==5) return $langs->trans('StatusContactValidated');
+ if ($mode == 0)
+ {
+ if ($statut==0) return $langs->trans('StatusContactDraft');
+ if ($statut==1) return $langs->trans('StatusContactValidated');
+ if ($statut==4) return $langs->trans('StatusContactValidated');
+ if ($statut==5) return $langs->trans('StatusContactValidated');
+ }
+ if ($mode == 1)
+ {
+ if ($statut==0) return $langs->trans('StatusContactDraftShort');
+ if ($statut==1) return $langs->trans('StatusContactValidatedShort');
+ if ($statut==4) return $langs->trans('StatusContactValidatedShort');
+ if ($statut==5) return $langs->trans('StatusContactValidatedShort');
+ }
+ if ($mode == 2)
+ {
+ if ($statut==0) return img_picto($langs->trans('StatusContactDraftShort'),'statut0').' '.$langs->trans('StatusContactDraft');
+ if ($statut==1) return img_picto($langs->trans('StatusContactValidatedShort'),'statut1').' '.$langs->trans('StatusContactValidated');
+ if ($statut==4) return img_picto($langs->trans('StatusContactValidatedShort'),'statut4').' '.$langs->trans('StatusContactValidated');
+ if ($statut==5) return img_picto($langs->trans('StatusContactValidatedShort'),'statut5').' '.$langs->trans('StatusContactValidated');
+ }
+ if ($mode == 3)
+ {
+ if ($statut==0) return img_picto($langs->trans('StatusContactDraft'),'statut0');
+ if ($statut==1) return img_picto($langs->trans('StatusContactValidated'),'statut1');
+ if ($statut==4) return img_picto($langs->trans('StatusContactValidated'),'statut4');
+ if ($statut==5) return img_picto($langs->trans('StatusContactValidated'),'statut5');
+ }
+ if ($mode == 4)
+ {
+ if ($statut==0) return img_picto($langs->trans('StatusContactDraft'),'statut0').' '.$langs->trans('StatusContactDraft');
+ if ($statut==1) return img_picto($langs->trans('StatusContactValidated'),'statut1').' '.$langs->trans('StatusContactValidated');
+ if ($statut==4) return img_picto($langs->trans('StatusContactValidated'),'statut4').' '.$langs->trans('StatusContactValidated');
+ if ($statut==5) return img_picto($langs->trans('StatusContactValidated'),'statut5').' '.$langs->trans('StatusContactValidated');
+ }
+ if ($mode == 5)
+ {
+ if ($statut==0) return $langs->trans('StatusContactDraftShort').' '.img_picto($langs->trans('StatusContactDraftShort'),'statut0');
+ if ($statut==1) return $langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut1');
+ if ($statut==4) return $langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut4');
+ if ($statut==5) return $langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut5');
}
- if ($mode == 1)
- {
- if ($statut==0) return $langs->trans('StatusContactDraftShort');
- if ($statut==1) return $langs->trans('StatusContactValidatedShort');
- if ($statut==4) return $langs->trans('StatusContactValidatedShort');
- if ($statut==5) return $langs->trans('StatusContactValidatedShort');
- }
- if ($mode == 2)
- {
- if ($statut==0) return img_picto($langs->trans('StatusContactDraftShort'),'statut0').' '.$langs->trans('StatusContactDraft');
- if ($statut==1) return img_picto($langs->trans('StatusContactValidatedShort'),'statut1').' '.$langs->trans('StatusContactValidated');
- if ($statut==4) return img_picto($langs->trans('StatusContactValidatedShort'),'statut4').' '.$langs->trans('StatusContactValidated');
- if ($statut==5) return img_picto($langs->trans('StatusContactValidatedShort'),'statut5').' '.$langs->trans('StatusContactValidated');
- }
- if ($mode == 3)
- {
- if ($statut==0) return img_picto($langs->trans('StatusContactDraft'),'statut0');
- if ($statut==1) return img_picto($langs->trans('StatusContactValidated'),'statut1');
- if ($statut==4) return img_picto($langs->trans('StatusContactValidated'),'statut4');
- if ($statut==5) return img_picto($langs->trans('StatusContactValidated'),'statut5');
- }
- if ($mode == 4)
- {
- if ($statut==0) return img_picto($langs->trans('StatusContactDraft'),'statut0').' '.$langs->trans('StatusContactDraft');
- if ($statut==1) return img_picto($langs->trans('StatusContactValidated'),'statut1').' '.$langs->trans('StatusContactValidated');
- if ($statut==4) return img_picto($langs->trans('StatusContactValidated'),'statut4').' '.$langs->trans('StatusContactValidated');
- if ($statut==5) return img_picto($langs->trans('StatusContactValidated'),'statut5').' '.$langs->trans('StatusContactValidated');
- }
- if ($mode == 5)
- {
- if ($statut==0) return $langs->trans('StatusContactDraftShort').' '.img_picto($langs->trans('StatusContactDraftShort'),'statut0');
- if ($statut==1) return $langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut1');
- if ($statut==4) return $langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut4');
- if ($statut==5) return $langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut5');
- }
}
@@ -848,8 +847,8 @@ class Contact extends CommonObject
function LibPubPriv($statut)
{
global $langs;
- if ($statut=='1') return $langs->trans('ContactPrivate');
- else return $langs->trans('ContactPublic');
+ if ($statut=='1') return $langs->trans('ContactPrivate');
+ else return $langs->trans('ContactPublic');
}
diff --git a/htdocs/user.class.php b/htdocs/user.class.php
index f3867329d0c..6696b3b4bd4 100644
--- a/htdocs/user.class.php
+++ b/htdocs/user.class.php
@@ -1563,12 +1563,12 @@ class User extends CommonObject
}
- /*
+ /**
* \brief Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
* \param info Info string loaded by _load_ldap_info
* \param mode 0=Return DN without key inside (ou=xxx,dc=aaa,dc=bbb)
- 1=Return full DN (uid=qqq,ou=xxx,dc=aaa,dc=bbb)
- 2=Return key only (uid=qqq)
+ * 1=Return full DN (uid=qqq,ou=xxx,dc=aaa,dc=bbb)
+ * 2=Return key only (uid=qqq)
* \return string DN
*/
function _load_ldap_dn($info,$mode=0)
@@ -1582,7 +1582,7 @@ class User extends CommonObject
}
- /*
+ /**
* \brief Initialise tableau info (tableau des attributs LDAP)
* \return array Tableau info des attributs
*/
diff --git a/htdocs/usergroup.class.php b/htdocs/usergroup.class.php
index 6c3a8ec7191..5fdcd9201aa 100644
--- a/htdocs/usergroup.class.php
+++ b/htdocs/usergroup.class.php
@@ -522,12 +522,12 @@ class UserGroup extends CommonObject
}
- /*
+ /**
* \brief Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
* \param info Info string loaded by _load_ldap_info
* \param mode 0=Return DN without key inside (ou=xxx,dc=aaa,dc=bbb)
- 1=Return full DN (uid=qqq,ou=xxx,dc=aaa,dc=bbb)
- 2=Return key only (uid=qqq)
+ * 1=Return full DN (uid=qqq,ou=xxx,dc=aaa,dc=bbb)
+ * 2=Return key only (uid=qqq)
* \return string DN
*/
function _load_ldap_dn($info,$mode=0)
@@ -541,7 +541,7 @@ class UserGroup extends CommonObject
}
- /*
+ /**
* \brief Initialise tableau info (tableau des attributs LDAP)
* \return array Tableau info des attributs
*/
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index f04dc802c6d..affd1e9cda1 100644
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2006 Laurent Destailleur
+/* Copyright (C) 2005 Rodolphe Quiedeville
+ * Copyright (C) 2006-2009 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
@@ -15,20 +15,18 @@
* 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 scripts/company/sync_contacts_dolibarr2ldap.php
- \ingroup ldap company
- \brief Script de mise a jour des contacts dans LDAP depuis base Dolibarr
-*/
+ * \file scripts/company/sync_contacts_dolibarr2ldap.php
+ * \ingroup ldap company
+ * \brief Script to update all contacts from Dolibarr into a LDAP database
+ * \version $Id$
+ */
// Test si mode CLI
$sapi_type = php_sapi_name();
-$script_file=__FILE__;
+$script_file=__FILE__;
if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1];
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -37,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
if (! isset($argv[1]) || ! $argv[1]) {
- print "Usage: $script_file now\n";
+ print "Usage: $script_file now\n";
exit;
}
$now=$argv[1];
@@ -59,7 +57,7 @@ print "***** $script_file ($version) *****\n";
if (! $conf->global->LDAP_CONTACT_ACTIVE)
{
print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
- exit 1;
+ exit 1;
}
*/
@@ -74,7 +72,7 @@ if ($resql)
$ldap=new Ldap();
$ldap->connect_bind();
-
+
while ($i < $num)
{
$ldap->error="";
@@ -84,12 +82,12 @@ if ($resql)
$contact = new Contact($db);
$contact->id = $obj->rowid;
$contact->fetch($contact->id);
-
+
print $langs->trans("UpdateContact")." rowid=".$contact->id." ".$contact->getFullName($langs);
$info=$contact->_load_ldap_info();
$dn=$contact->_load_ldap_dn($info);
-
+
$result=$ldap->update($dn,$info,$user);
if ($result > 0)
{