From d40956844270a8544215d09655c76ba48c449a4c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Aug 2015 15:07:16 +0200 Subject: [PATCH] Format code --- htdocs/core/class/CMailFile.class.php | 24 ++++++++++++------------ htdocs/core/class/smtps.class.php | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 2c58848fe4f..b3da46ff366 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -375,19 +375,19 @@ class CMailFile 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)) - { + 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); - $this->error="Error in hook maildao doactions ".$reshook; - dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR); - - return $reshook; - } + return $reshook; + } // Action according to choosed sending method if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index 5cc62c56bc6..51d9dd621dc 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -522,7 +522,7 @@ class SMTPs * @param mixed $_strConfigPath path to config file or VOID * @return void */ - function setConfig ( $_strConfigPath = null ) + function setConfig($_strConfigPath = null) { /** * Returns constructed SELECT Object string or boolean upon failure @@ -736,7 +736,7 @@ class SMTPs * @param string $_strTransEncode Content-Transfer-Encoding * @return void */ - function setTransEncode ( $_strTransEncode ) + function setTransEncode($_strTransEncode) { if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes)) $this->_smtpsTransEncode = $_strTransEncode; @@ -830,7 +830,7 @@ class SMTPs * @return void * */ - function _buildAddrList( $_type, $_addrList ) + function _buildAddrList($_type, $_addrList) { // Pull existing list $aryHost = $this->_msgRecipients;