summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries/email.html
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-10-01 12:09:11 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-10-01 12:09:11 +0200
commit51a7b75ba023a4bf1e70840a19e0457f5123fb72 (patch)
tree5253b1a7bcb9ec99cb90c49ee2ac9604a5d68f5f /user_guide/libraries/email.html
parent73b295ce336b7f2079895cc59d9c3c9e6713c84c (diff)
parent4c589aed7b0215e3d4105b11776bc45f299d291d (diff)
Merge pull request #508 from wooptoo/develop
Added TLS and SSL support to Email library
Diffstat (limited to 'user_guide/libraries/email.html')
-rw-r--r--user_guide/libraries/email.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index d246254ab..de2f1c0c9 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -63,6 +63,7 @@ Email Class
<ul>
<li>Multiple Protocols: Mail, Sendmail, and SMTP</li>
+<li>TLS and SSL Encryption for SMTP</li>
<li>Multiple recipients</li>
<li>CC and BCCs</li>
<li>HTML or Plaintext email</li>
@@ -152,6 +153,8 @@ will NOT need to use the <dfn>$this->email->initialize()</dfn> function if you s
</tr><tr>
<td class="td"><strong>smtp_timeout</strong></td><td class="td">5</td><td class="td">None</td><td class="td">SMTP Timeout (in seconds).</td>
</tr><tr>
+<td class="td"><strong>smtp_crypto</strong></td><td class="td">No Default</td><td class="td">tls or ssl</td><td class="td">SMTP Encryption.</td>
+</tr><tr>
<td class="td"><strong>wordwrap</strong></td><td class="td">TRUE</td><td class="td">TRUE or FALSE (boolean)</td><td class="td">Enable word-wrap.</td>
</tr><tr>
<td class="td"><strong>wrapchars</strong></td><td class="td">76</td><td class="td"> </td><td class="td">Character count to wrap at.</td>
@@ -304,4 +307,4 @@ Next Topic:&nbsp;&nbsp;<a href="encryption.html">Encryption Class</a>
</div>
</body>
-</html> \ No newline at end of file
+</html>