mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-13 11:15:21 +01:00
Fix: Echec des triggers quand il y a 2 triggers avec meme nom
Fix: Mauvais triggers appel quand creation user.
This commit is contained in:
@@ -35,62 +35,70 @@
|
||||
|
||||
class Interfaces
|
||||
{
|
||||
//! Repertoire contenant les definitions des triggers
|
||||
var $dir;
|
||||
|
||||
/**
|
||||
* \brief Constructeur.
|
||||
* \param DB handler d'acc<63>s base
|
||||
*/
|
||||
function Interfaces($DB)
|
||||
{
|
||||
$this->db = $DB ;
|
||||
$this->dir = DOL_DOCUMENT_ROOT . "/includes/triggers";
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Fonction appel<65>e lors du d<>clenchement d'un <20>v<EFBFBD>nement Dolibarr.
|
||||
* Cette fonction d<>clenche tous les triggers trouv<75>s
|
||||
* \param action Code de l'evenement
|
||||
* \param object Objet concern
|
||||
* \param user Objet user
|
||||
* \param lang Objet lang
|
||||
* \param conf Objet conf
|
||||
* \return int Nbre de triggers d<>clench<63>s si pas d'erreurs. Nb en erreur sinon.
|
||||
*/
|
||||
function run_triggers($action,$object,$user,$lang,$conf)
|
||||
{
|
||||
|
||||
$handle=opendir($this->dir);
|
||||
$modules = array();
|
||||
$nbok = $nbko = 0;
|
||||
|
||||
while (($file = readdir($handle))!==false)
|
||||
{
|
||||
if (is_readable($this->dir."/".$file) && eregi('interface_(.*).class.php$',$file,$reg))
|
||||
{
|
||||
$modName = "Interface".ucfirst($reg[1]);
|
||||
//print "file=$file"; print "modName=$modName"; exit;
|
||||
if ($modName)
|
||||
{
|
||||
include_once($this->dir."/".$file);
|
||||
$objMod = new $modName($this->db);
|
||||
if ($objMod)
|
||||
{
|
||||
if ($objMod->run_trigger($action,$object,$user,$lang,$conf) > 0)
|
||||
{
|
||||
$nbok++;
|
||||
}
|
||||
else
|
||||
{
|
||||
$nbko++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($nbko) return $nbko;
|
||||
return $nbok;
|
||||
}
|
||||
var $dir; // Repertoire contenant les fichiers triggers
|
||||
|
||||
/**
|
||||
* \brief Constructeur.
|
||||
* \param DB handler d'acc<63>s base
|
||||
*/
|
||||
function Interfaces($DB)
|
||||
{
|
||||
$this->db = $DB ;
|
||||
$this->dir = DOL_DOCUMENT_ROOT . "/includes/triggers";
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Fonction appel<65>e lors du d<>clenchement d'un <20>v<EFBFBD>nement Dolibarr.
|
||||
* Cette fonction d<>clenche tous les triggers trouv<75>s
|
||||
* \param action Code de l'evenement
|
||||
* \param object Objet concern
|
||||
* \param user Objet user
|
||||
* \param lang Objet lang
|
||||
* \param conf Objet conf
|
||||
* \return int Nbre de triggers d<>clench<63>s si pas d'erreurs. Nb en erreur sinon.
|
||||
*/
|
||||
function run_triggers($action,$object,$user,$lang,$conf)
|
||||
{
|
||||
|
||||
$handle=opendir($this->dir);
|
||||
$modules = array();
|
||||
$nbok = $nbko = 0;
|
||||
|
||||
while (($file = readdir($handle))!==false)
|
||||
{
|
||||
if (is_readable($this->dir."/".$file) && eregi('interface_(.*).class.php$',$file,$reg))
|
||||
{
|
||||
$modName = "Interface".ucfirst($reg[1]);
|
||||
//print "file=$file"; print "modName=$modName"; exit;
|
||||
if ($modName)
|
||||
{
|
||||
if (in_array($modName,$modules))
|
||||
{
|
||||
dolibarr_syslog("Error: Trigger file with name '$modName' already launched. Remove duplicate file.");
|
||||
}
|
||||
else
|
||||
{
|
||||
include_once($this->dir."/".$file);
|
||||
$objMod = new $modName($this->db);
|
||||
if ($objMod)
|
||||
{
|
||||
$modules[$i] = $modName;
|
||||
if ($objMod->run_trigger($action,$object,$user,$lang,$conf) > 0)
|
||||
{
|
||||
$nbok++;
|
||||
}
|
||||
else
|
||||
{
|
||||
$nbko++;
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($nbko) return $nbko;
|
||||
return $nbok;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user