diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-23 15:09:36 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-23 15:09:36 +0100 |
| commit | 7bf69c822a90fb172e70aac49e13177ed2cf022d (patch) | |
| tree | 20f5e9b8d9bf5cf197aaded47d66c82183ec4618 /system/libraries | |
| parent | f944d3b50ad589aeb78fe04ceef9ebfe4c3bd692 (diff) | |
| parent | 2cae193647045a83014972d2aae908e7ea0ac8f3 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlite3
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Email.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index f30fe40b6..8f383c939 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -59,6 +59,7 @@ class CI_Email { public $crlf = "\n"; // The RFC 2045 compliant CRLF for quoted-printable is "\r\n". Apparently some servers, // even on the receiving end think they need to muck with CRLFs, so using "\n", while // distasteful, is the only thing that seems to work for all environments. + public $dsn = FALSE; // Delivery Status Notification public $send_multipart = TRUE; // TRUE/FALSE - Yahoo does not like multipart alternative, so this is an override. Set to FALSE for Yahoo. public $bcc_batch_mode = FALSE; // TRUE/FALSE - Turns on/off Bcc batch feature public $bcc_batch_size = 200; // If bcc_batch_mode = TRUE, sets max number of Bccs in each batch @@ -1567,9 +1568,15 @@ class CI_Email { $resp = 250; break; case 'to' : - - $this->_send_data('RCPT TO:<'.$data.'>'); - + + if ($this->dsn) + { + $this->_send_data('RCPT TO:<'.$data.'> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;'.$data); + } + else + { + $this->_send_data('RCPT TO:<'.$data.'>'); + } $resp = 250; break; case 'data' : |