fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 14:52:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

Implement force_sender, exception handling, and logging with triggers

Browse source
This commit is contained in:
Kijin Sung 2016-05-23 16:22:38 +09:00
parent 73d940cd08
commit 194ef11de7
4 changed files with 134 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/framework/mail.php
View file

@ -12,6 +12,7 @@ class Mail
*/
public $message = null;
public $driver = null;
public $caller = '';
protected $content_type = 'text/html';
protected $attachments = array();
public $errors = array();
@ -143,8 +144,8 @@ class Mail
*/
public function getFrom()
{
$list = $this->formatAddresses($this->message->getFrom());
return $list ? array_first($list) : null;
$list = $this->message->getFrom();
return $list ? array_first($this->formatAddresses($list)) : null;
}
/**
@ -556,6 +557,13 @@ class Mail
*/
public function send()
{
// Get caller information.
$backtrace = debug_backtrace(0);
if(count($backtrace) && isset($backtrace[0]['file']))
{
$this->caller = $backtrace[0]['file'] . ($backtrace[0]['line'] ? (' line ' . $backtrace[0]['line']) : '');
}
// Reset Message-ID in case send() is called multiple times.
$random = substr(hash('sha256', mt_rand() . microtime() . getmypid()), 0, 32);
$sender = $this->message->getFrom(); reset($sender);
@ -598,6 +606,16 @@ class Mail
return $this->sent;
}
/**
* Get caller information.
*
* @return string
*/
public function getCaller()
{
return $this->caller;
}
/**
* Get errors.
*