diff --git a/public_html/deployment/classes/messenger.class.php b/public_html/deployment/classes/messenger.class.php index 589183a847c0e220cd8f13d21e1bcb0d9167bd1a..f888cefbadd64ea35d841a27788db0d6f4f80525 100644 --- a/public_html/deployment/classes/messenger.class.php +++ b/public_html/deployment/classes/messenger.class.php @@ -42,14 +42,16 @@ class messenger { } /** - * send an email if _aCfg['email'] exists + * send an email if _aCfg['email']['to'] exists */ private function _sendEmail(){ - if (array_key_exists('email', $this->_aCfg) && array_key_exists('to', $this->_aCfg['email']) - ) { + if (isset($this->_aCfg['email']['to']) && $this->_aCfg['email']['to']) { preg_match('/^(.*)\n/', $this->_sMessage, $aTmp); $sSubject = $aTmp[0]; - return mail($this->_aCfg['email']['to'], $sSubject, $this->_sMessage, "From: " . $this->_aCfg['email']['from'] . "\r\n" . + return mail( + $this->_aCfg['email']['to'], + $sSubject, $this->_sMessage, + "From: " . $this->_aCfg['email']['from'] . "\r\n" . "Reply-To: " . $this->_aCfg['email']['from'] . "\r\n" ); } @@ -57,15 +59,15 @@ class messenger { } /** - * send a message to slack if _aCfg['slack'] exists + * send a message to slack if _aCfg['slack']['incomingurl'] exists */ private function _sendToSlack(){ - if (array_key_exists('slack', $this->_aCfg)) { + if (isset($this->_aCfg['slack']['incomingurl']) && $this->_aCfg['slack']['incomingurl']) { require_once(__DIR__ . '/../../vendor/shooker/shooker.php'); $shkr = new Shooker(); $shkr->setupIncoming($this->_aCfg['slack']['incomingurl']); - $sUser=(array_key_exists('user', $this->_aCfg['slack'])? $this->_aCfg['slack']['user']: false); - $sIcon=(array_key_exists('icon', $this->_aCfg['slack'])? $this->_aCfg['slack']['icon']: false); + $sUser=(isset($this->_aCfg['slack']['user'])? $this->_aCfg['slack']['user']: false); + $sIcon=(isset($this->_aCfg['slack']['icon'])? $this->_aCfg['slack']['icon']: false); return $shkr->sendMessage($this->_sMessage, $sUser, $sIcon); } return false;