Mode hook
in $conf->global->MAIN_DISABLE_ALL_MAILS
This commit is contained in:
parent
25842b3295
commit
1277596242
@ -373,21 +373,22 @@ class CMailFile
|
|||||||
|
|
||||||
$res=false;
|
$res=false;
|
||||||
|
|
||||||
dol_include_once('/core/class/hookmanager.class.php');
|
|
||||||
$hookmanager=new HookManager($db);
|
|
||||||
$hookmanager->initHooks(array('maildao'));
|
|
||||||
$reshook=$hookmanager->executeHooks('doactions',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
|
|
||||||
if (!empty($reshook))
|
|
||||||
{
|
|
||||||
|
|
||||||
$this->error="Error in hook maildao doactions ".$reshook;
|
|
||||||
dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
|
|
||||||
|
|
||||||
return $reshook;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
|
if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
|
||||||
{
|
{
|
||||||
|
|
||||||
|
dol_include_once('/core/class/hookmanager.class.php');
|
||||||
|
$hookmanager=new HookManager($db);
|
||||||
|
$hookmanager->initHooks(array('maildao'));
|
||||||
|
$reshook=$hookmanager->executeHooks('doactions',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
|
||||||
|
if (!empty($reshook))
|
||||||
|
{
|
||||||
|
|
||||||
|
$this->error="Error in hook maildao doactions ".$reshook;
|
||||||
|
dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
|
||||||
|
|
||||||
|
return $reshook;
|
||||||
|
}
|
||||||
|
|
||||||
// Action according to choosed sending method
|
// Action according to choosed sending method
|
||||||
if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
|
if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user