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

Fix: Echec des triggers quand il y a 2 triggers avec meme nom

Browse Source 
Fix: Mauvais triggers appel quand creation user.
This commit is contained in:
Laurent Destailleur 2006-12-24 15:11:56 +00:00
parent 1f7a2b715c
commit d7edb59b09
3 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
htdocs/interfaces.class.php
View File

@ -35,62 +35,70 @@
class Interfaces class Interfaces
{ {
//! Repertoire contenant les definitions des triggers var $dir; // Repertoire contenant les fichiers triggers
var $dir;
/** /**
* \brief Constructeur. * \brief Constructeur.
* \param DB handler d'accès base * \param DB handler d'accès base
*/ */
function Interfaces($DB) function Interfaces($DB)
{ {
$this->db = $DB ; $this->db = $DB ;
$this->dir = DOL_DOCUMENT_ROOT . "/includes/triggers"; $this->dir = DOL_DOCUMENT_ROOT . "/includes/triggers";
} }
/** /**
* \brief Fonction appelée lors du déclenchement d'un évènement Dolibarr. * \brief Fonction appelée lors du déclenchement d'un évènement Dolibarr.
* Cette fonction déclenche tous les triggers trouvés * Cette fonction déclenche tous les triggers trouvés
* \param action Code de l'evenement * \param action Code de l'evenement
* \param object Objet concern * \param object Objet concern
* \param user Objet user * \param user Objet user
* \param lang Objet lang * \param lang Objet lang
* \param conf Objet conf * \param conf Objet conf
* \return int Nbre de triggers déclenchés si pas d'erreurs. Nb en erreur sinon. * \return int Nbre de triggers déclenchés si pas d'erreurs. Nb en erreur sinon.
*/ */
function run_triggers($action,$object,$user,$lang,$conf) function run_triggers($action,$object,$user,$lang,$conf)
{ {
$handle=opendir($this->dir); $handle=opendir($this->dir);
$modules = array(); $modules = array();
$nbok = $nbko = 0; $nbok = $nbko = 0;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (is_readable($this->dir."/".$file) && eregi('interface_(.*).class.php$',$file,$reg)) if (is_readable($this->dir."/".$file) && eregi('interface_(.*).class.php$',$file,$reg))
{ {
$modName = "Interface".ucfirst($reg[1]); $modName = "Interface".ucfirst($reg[1]);
//print "file=$file"; print "modName=$modName"; exit; //print "file=$file"; print "modName=$modName"; exit;
if ($modName) if ($modName)
{ {
include_once($this->dir."/".$file); if (in_array($modName,$modules))
$objMod = new $modName($this->db); {
if ($objMod) dolibarr_syslog("Error: Trigger file with name '$modName' already launched. Remove duplicate file.");
{ }
if ($objMod->run_trigger($action,$object,$user,$lang,$conf) > 0) else
{ {
$nbok++; include_once($this->dir."/".$file);
} $objMod = new $modName($this->db);
else if ($objMod)
{ {
$nbko++; $modules[$i] = $modName;
} if ($objMod->run_trigger($action,$object,$user,$lang,$conf) > 0)
} {
} $nbok++;
} }
} else
if ($nbko) return $nbko; {
return $nbok; $nbko++;
} }
$i++;
}
}
}
}
}
if ($nbko) return $nbko;
return $nbok;
}
} }
?> ?>

3
htdocs/user.class.php
View File

@ -652,6 +652,7 @@ class User
$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid) VALUES(now(),'".addslashes($this->login)."','".$this->ldap_sid."')"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid) VALUES(now(),'".addslashes($this->login)."','".$this->ldap_sid."')";
$result=$this->db->query($sql); $result=$this->db->query($sql);
dolibarr_syslog("User.class::create sql=".$sql);
if ($result) if ($result)
{ {
$table = "".MAIN_DB_PREFIX."user"; $table = "".MAIN_DB_PREFIX."user";
@ -666,7 +667,7 @@ class User
} }
// Update minor fields // Update minor fields
if ($this->update() < 0) if ($this->update(1) < 0)
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
$this->db->rollback(); $this->db->rollback();

2
htdocs/user/fiche.php
View File

@ -166,7 +166,7 @@ if ($_POST["action"] == 'add' && $canadduser)
$db->rollback(); $db->rollback();
//$message='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'</div>'; //$message='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'</div>';
$message='<div class="error">'.$edituser->error.$id.'</div>'; $message='<div class="error">'.$edituser->error.'</div>';
$action="create"; // Go back to create page $action="create"; // Go back to create page
} }