diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
| commit | 31e723a907399d7d33a0699da082164055f79b3e (patch) | |
| tree | 7da079cc3db0a46512da1b02cc19307337d9ce54 /lib/mail.php | |
| parent | c7b1bdf00e65cca2a42d77fc5f27d0ea69e53be3 (diff) | |
| parent | 209d599ec5b00c5b92a33e902867fc621e725c93 (diff) | |
| download | nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.tar.gz nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.zip | |
Merge github.com:owncloud/core
Conflicts:
lib/public/share.php
Diffstat (limited to 'lib/mail.php')
| -rw-r--r-- | lib/mail.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/mail.php b/lib/mail.php index 4683a1b4eee..1bb202ac977 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -38,8 +38,12 @@ class OC_Mail { $SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' ); $SMTPPORT = OC_Config::getValue( 'mail_smtpport', 25 ); $SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false ); + $SMTPAUTHTYPE = OC_Config::getValue( 'mail_smtpauthtype', 'LOGIN' ); $SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' ); $SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' ); + $SMTPDEBUG = OC_Config::getValue( 'mail_smtpdebug', false ); + $SMTPTIMEOUT = OC_Config::getValue( 'mail_smtptimeout', 10 ); + $SMTPSECURE = OC_Config::getValue( 'mail_smtpsecure', '' ); $mailo = new PHPMailer(true); @@ -57,12 +61,16 @@ class OC_Mail { $mailo->Host = $SMTPHOST; $mailo->Port = $SMTPPORT; $mailo->SMTPAuth = $SMTPAUTH; + $mailo->SMTPDebug = $SMTPDEBUG; + $mailo->SMTPSecure = $SMTPSECURE; + $mailo->AuthType = $SMTPAUTHTYPE; $mailo->Username = $SMTPUSERNAME; $mailo->Password = $SMTPPASSWORD; + $mailo->Timeout = $SMTPTIMEOUT; - $mailo->From =$fromaddress; + $mailo->From = $fromaddress; $mailo->FromName = $fromname;; - $mailo->Sender =$fromaddress; + $mailo->Sender = $fromaddress; $a=explode(' ', $toaddress); try { foreach($a as $ad) { |