diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-01-28 01:42:46 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-01-28 01:42:46 -0800 |
| commit | 857b15db3739fe8fbbad4df0f10e9b48ba1f90c2 (patch) | |
| tree | 02e5e380b755127bfeb0cc13e0603c247d433d20 | |
| parent | 31d83fddc482959d7fb4f7377cc7020c59c30951 (diff) | |
| parent | 93834b78a13814e8b799126285a70f3303d04fea (diff) | |
| download | nextcloud-server-857b15db3739fe8fbbad4df0f10e9b48ba1f90c2.tar.gz nextcloud-server-857b15db3739fe8fbbad4df0f10e9b48ba1f90c2.zip | |
Merge pull request #1318 from j-ed/master
added parameter mail_smtpauthtype to set SMTP authentication type.
| -rw-r--r-- | config/config.sample.php | 4 | ||||
| -rw-r--r-- | lib/mail.php | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 51373327f44..78d513c7f23 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -92,6 +92,10 @@ $CONFIG = array( */ "mail_smtpauth" => false, +/* authentication type needed to send mail, depends on mail_smtpmode if this is used + * Can be LOGIN (default), PLAIN or NTLM */ +"mail_smtpauthtype" => "LOGIN", + /* Username to use for sendmail mail, depends on mail_smtpauth if this is used */ "mail_smtpname" => "", diff --git a/lib/mail.php b/lib/mail.php index ffc4d01b79f..1bb202ac977 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -38,6 +38,7 @@ 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 ); @@ -62,6 +63,7 @@ class OC_Mail { $mailo->SMTPAuth = $SMTPAUTH; $mailo->SMTPDebug = $SMTPDEBUG; $mailo->SMTPSecure = $SMTPSECURE; + $mailo->AuthType = $SMTPAUTHTYPE; $mailo->Username = $SMTPUSERNAME; $mailo->Password = $SMTPPASSWORD; $mailo->Timeout = $SMTPTIMEOUT; |