diff options
| author | Repox <storm@err0r.dk> | 2011-11-23 09:44:54 +0100 |
|---|---|---|
| committer | Repox <storm@err0r.dk> | 2011-11-23 09:44:54 +0100 |
| commit | e45f28c5ab7509ade2a9db0cd574d8a688bc4c3b (patch) | |
| tree | 81a8720574945f47edb0617842c331c6e1f476a1 /system/libraries/Email.php | |
| parent | 1f9a40f2465ee135d4ed0292d51a1ed6571173f0 (diff) | |
| parent | b25bf9db4af963269362e16cec0a99326c4439ad (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 6739db33b..7bde4c4fd 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1692,12 +1692,7 @@ class CI_Email { */ protected function _smtp_connect() { - $ssl = NULL; - - if ($this->smtp_crypto == 'ssl') - { - $ssl = 'ssl://'; - } + $ssl = ($this->smtp_crypto == 'ssl') ? 'ssl://' : NULL; $this->_smtp_connect = fsockopen($ssl.$this->smtp_host, $this->smtp_port, @@ -1717,6 +1712,7 @@ class CI_Email { { $this->_send_command('hello'); $this->_send_command('starttls'); + $crypto = stream_socket_enable_crypto($this->_smtp_connect, TRUE, STREAM_CRYPTO_METHOD_TLS_CLIENT); if ($crypto !== TRUE) @@ -2112,4 +2108,4 @@ class CI_Email { // END CI_Email class /* End of file Email.php */ -/* Location: ./system/libraries/Email.php */ +/* Location: ./system/libraries/Email.php */
\ No newline at end of file |