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

Format code

Browse Source
This commit is contained in:
Laurent Destailleur 2015-08-20 15:07:16 +02:00
parent e24fd6fa37
commit d409568442
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/core/class/CMailFile.class.php
View File

@ -375,19 +375,19 @@ class CMailFile
if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
{ {
dol_include_once('/core/class/hookmanager.class.php');
dol_include_once('/core/class/hookmanager.class.php'); $hookmanager = new HookManager($db);
$hookmanager=new HookManager($db); $hookmanager->initHooks(array(
$hookmanager->initHooks(array('maildao')); 'maildao'
$reshook=$hookmanager->executeHooks('doactions',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks ));
if (!empty($reshook)) $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);
$this->error="Error in hook maildao doactions ".$reshook; return $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')

6
htdocs/core/class/smtps.class.php
View File

@ -522,7 +522,7 @@ class SMTPs
* @param mixed $_strConfigPath path to config file or VOID * @param mixed $_strConfigPath path to config file or VOID
* @return void * @return void
*/ */
function setConfig ( $_strConfigPath = null ) function setConfig($_strConfigPath = null)
{ {
/** /**
* Returns constructed SELECT Object string or boolean upon failure * Returns constructed SELECT Object string or boolean upon failure
@ -736,7 +736,7 @@ class SMTPs
* @param string $_strTransEncode Content-Transfer-Encoding * @param string $_strTransEncode Content-Transfer-Encoding
* @return void * @return void
*/ */
function setTransEncode ( $_strTransEncode ) function setTransEncode($_strTransEncode)
{ {
if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes)) if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
$this->_smtpsTransEncode = $_strTransEncode; $this->_smtpsTransEncode = $_strTransEncode;
@ -830,7 +830,7 @@ class SMTPs
* @return void * @return void
* *
*/ */
function _buildAddrList( $_type, $_addrList ) function _buildAddrList($_type, $_addrList)
{ {
// Pull existing list // Pull existing list
$aryHost = $this->_msgRecipients; $aryHost = $this->_msgRecipients;