User creation not correctly managed if not defined
This commit is contained in:
parent
f582d6004d
commit
db953b2606
@ -88,7 +88,7 @@ class ActionComm
|
|||||||
* \brief Ajout d'une action en base
|
* \brief Ajout d'une action en base
|
||||||
* \param user auteur de la creation de l'action
|
* \param user auteur de la creation de l'action
|
||||||
* \param notrigger 1 ne declenche pas les triggers, 0 sinon
|
* \param notrigger 1 ne declenche pas les triggers, 0 sinon
|
||||||
* \return int id de l'action cr<EFBFBD><EFBFBD>e, < 0 si erreur
|
* \return int id de l'action creee, < 0 si erreur
|
||||||
*/
|
*/
|
||||||
function add($user,$notrigger=0)
|
function add($user,$notrigger=0)
|
||||||
{
|
{
|
||||||
@ -159,7 +159,7 @@ class ActionComm
|
|||||||
$sql.= ($this->durationa >= 0?"'".$this->durationa."'":"null").",";
|
$sql.= ($this->durationa >= 0?"'".$this->durationa."'":"null").",";
|
||||||
$sql.= "'".$this->type_id."', '".$this->societe->id."' ,'".addslashes($this->note)."',";
|
$sql.= "'".$this->type_id."', '".$this->societe->id."' ,'".addslashes($this->note)."',";
|
||||||
$sql.= ($this->contact->id > 0?"'".$this->contact->id."'":"null").",";
|
$sql.= ($this->contact->id > 0?"'".$this->contact->id."'":"null").",";
|
||||||
$sql.= "'".$user->id."',";
|
$sql.= ($user->id > 0 ? "'".$user->id."'":"null").",";
|
||||||
$sql.= ($this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").",";
|
$sql.= ($this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").",";
|
||||||
$sql.= ($this->userdone->id > 0?"'".$this->userdone->id."'":"null").",";
|
$sql.= ($this->userdone->id > 0?"'".$this->userdone->id."'":"null").",";
|
||||||
$sql.= "'".addslashes($this->label)."','".$this->percentage."','".$this->priority."','".$this->punctual."',";
|
$sql.= "'".addslashes($this->label)."','".$this->percentage."','".$this->priority."','".$this->punctual."',";
|
||||||
|
|||||||
@ -741,7 +741,8 @@ if ($_GET["id"])
|
|||||||
|
|
||||||
// Input by
|
// Input by
|
||||||
print '<tr><td width="30%" nowrap>'.$langs->trans("ActionAskedBy").'</td><td colspan="3">';
|
print '<tr><td width="30%" nowrap>'.$langs->trans("ActionAskedBy").'</td><td colspan="3">';
|
||||||
print $act->author->getNomUrl(1);
|
if ($act->author->id > 0) print $act->author->getNomUrl(1);
|
||||||
|
else print ' ';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Affecte a
|
// Affecte a
|
||||||
|
|||||||
@ -80,9 +80,9 @@ class Contact extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Ajout d'un contact en base
|
* \brief Add a contact in database
|
||||||
* \param user Utilisateur qui effectue l'ajout
|
* \param user Object user that create
|
||||||
* \return int <0 si ko, >0 si ok
|
* \return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function create($user)
|
function create($user)
|
||||||
{
|
{
|
||||||
@ -98,7 +98,7 @@ class Contact extends CommonObject
|
|||||||
if ($this->socid > 0) $sql.= " ".$this->socid.",";
|
if ($this->socid > 0) $sql.= " ".$this->socid.",";
|
||||||
else $sql.= "null,";
|
else $sql.= "null,";
|
||||||
$sql.= "'".addslashes($this->name)."',";
|
$sql.= "'".addslashes($this->name)."',";
|
||||||
$sql.= $user->id.",";
|
$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null").",";
|
||||||
$sql.= $this->priv;
|
$sql.= $this->priv;
|
||||||
$sql.= ")";
|
$sql.= ")";
|
||||||
|
|
||||||
@ -178,7 +178,7 @@ class Contact extends CommonObject
|
|||||||
$sql .= ", phone_mobile = '".addslashes($this->phone_mobile)."'";
|
$sql .= ", phone_mobile = '".addslashes($this->phone_mobile)."'";
|
||||||
$sql .= ", jabberid = '".addslashes($this->jabberid)."'";
|
$sql .= ", jabberid = '".addslashes($this->jabberid)."'";
|
||||||
$sql .= ", priv = '".$this->priv."'";
|
$sql .= ", priv = '".$this->priv."'";
|
||||||
if ($user) $sql .= ", fk_user_modif=".$user->id;
|
$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"null");
|
||||||
$sql .= " WHERE rowid=".$id;
|
$sql .= " WHERE rowid=".$id;
|
||||||
|
|
||||||
dolibarr_syslog("Contact::update sql=".$sql,LOG_DEBUG);
|
dolibarr_syslog("Contact::update sql=".$sql,LOG_DEBUG);
|
||||||
|
|||||||
@ -125,17 +125,17 @@ class Societe extends CommonObject
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* \brief Cree la societe en base
|
|
||||||
* \param user Objet utilisateur qui demande la cr<EFBFBD>ation
|
|
||||||
* \return int 0 si ok, < 0 si erreur
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Create third party in database
|
||||||
|
* \param user Object of user that ask creation
|
||||||
|
* \return int >= 0 if OK, < 0 if KO
|
||||||
|
*/
|
||||||
function create($user='')
|
function create($user='')
|
||||||
{
|
{
|
||||||
global $langs,$conf;
|
global $langs,$conf;
|
||||||
|
|
||||||
// Nettoyage param<61>tres
|
// clean parameters
|
||||||
$this->nom=trim($this->nom);
|
$this->nom=trim($this->nom);
|
||||||
|
|
||||||
dolibarr_syslog("Societe::create ".$this->nom);
|
dolibarr_syslog("Societe::create ".$this->nom);
|
||||||
@ -151,8 +151,11 @@ class Societe extends CommonObject
|
|||||||
if ($result >= 0)
|
if ($result >= 0)
|
||||||
{
|
{
|
||||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, datec, datea, fk_user_creat)";
|
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, datec, datea, fk_user_creat)";
|
||||||
$sql .= " VALUES ('".addslashes($this->nom)."', now(), now(), '".$user->id."')";
|
$sql.= " VALUES ('".addslashes($this->nom)."', now(), now(),";
|
||||||
|
$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null");
|
||||||
|
$sql.= ")";
|
||||||
|
|
||||||
|
dolibarr_syslog("Societe::create sql=".$sql);
|
||||||
$result=$this->db->query($sql);
|
$result=$this->db->query($sql);
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
@ -295,7 +298,7 @@ class Societe extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* \brief Update parameters of third party
|
* \brief Update parameters of third party
|
||||||
* \param id id societe
|
* \param id id societe
|
||||||
* \param user Utilisateur qui demande la mise <EFBFBD> jour
|
* \param user Utilisateur qui demande la mise a jour
|
||||||
* \param call_trigger 0=non, 1=oui
|
* \param call_trigger 0=non, 1=oui
|
||||||
* \param allowmodcodeclient Autorise modif code client
|
* \param allowmodcodeclient Autorise modif code client
|
||||||
* \param allowmodcodefournisseur Autorise modif code fournisseur
|
* \param allowmodcodefournisseur Autorise modif code fournisseur
|
||||||
@ -307,7 +310,7 @@ class Societe extends CommonObject
|
|||||||
|
|
||||||
dolibarr_syslog("Societe::Update id=".$id." call_trigger=".$call_triger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
|
dolibarr_syslog("Societe::Update id=".$id." call_trigger=".$call_triger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
|
||||||
|
|
||||||
// Nettoyage des param<61>tres
|
// Clean parameters
|
||||||
$this->id=$id;
|
$this->id=$id;
|
||||||
$this->capital=trim($this->capital);
|
$this->capital=trim($this->capital);
|
||||||
$this->nom=trim($this->nom);
|
$this->nom=trim($this->nom);
|
||||||
@ -413,7 +416,7 @@ class Societe extends CommonObject
|
|||||||
|
|
||||||
$sql .= ", code_compta_fournisseur = ".($this->code_compta_fournisseur?"'".addslashes($this->code_compta_fournisseur)."'":"null");
|
$sql .= ", code_compta_fournisseur = ".($this->code_compta_fournisseur?"'".addslashes($this->code_compta_fournisseur)."'":"null");
|
||||||
}
|
}
|
||||||
if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
|
$sql .= ", fk_user_modif = ".($user->id > 0 ? "'".$user->id."'":"null");
|
||||||
$sql .= " WHERE rowid = '" . $id ."'";
|
$sql .= " WHERE rowid = '" . $id ."'";
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -49,7 +49,7 @@ class User extends CommonObject
|
|||||||
var $element='user';
|
var $element='user';
|
||||||
var $table_element='user';
|
var $table_element='user';
|
||||||
|
|
||||||
var $id;
|
var $id=0;
|
||||||
var $ldap_sid;
|
var $ldap_sid;
|
||||||
var $search_sid;
|
var $search_sid;
|
||||||
var $fullname;
|
var $fullname;
|
||||||
@ -65,9 +65,9 @@ class User extends CommonObject
|
|||||||
|
|
||||||
//! Mot de passe en clair en memoire
|
//! Mot de passe en clair en memoire
|
||||||
var $pass;
|
var $pass;
|
||||||
//! Mot de passe en clair en base (renseign<EFBFBD> si DATABASE_PWD_ENCRYPTED=0)
|
//! Mot de passe en clair en base (renseigne si DATABASE_PWD_ENCRYPTED=0)
|
||||||
var $pass_indatabase;
|
var $pass_indatabase;
|
||||||
//! Mot de passe crypte en base (toujours renseign<EFBFBD>)
|
//! Mot de passe crypte en base (toujours renseigne)
|
||||||
var $pass_indatabase_crypted;
|
var $pass_indatabase_crypted;
|
||||||
|
|
||||||
var $datec;
|
var $datec;
|
||||||
@ -91,7 +91,7 @@ class User extends CommonObject
|
|||||||
|
|
||||||
var $rights;
|
var $rights;
|
||||||
var $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */
|
var $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */
|
||||||
var $tab_loaded=array(); // Tableau pour signaler les permissions deja charg<EFBFBD>es
|
var $tab_loaded=array(); // Tableau pour signaler les permissions deja chargees
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user