From 4d74738fe750cacd5c7ff40ce4652a8a4d19253c Mon Sep 17 00:00:00 2001 From: j-ed Date: Sat, 26 Jan 2013 12:04:06 +0100 Subject: Update config/config.sample.php added parameter mail_smtpauthtype to set SMTP authentication type. --- config/config.sample.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/config.sample.php b/config/config.sample.php index f26a53c1553..6ac161d2188 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -90,6 +90,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" => "", -- cgit v1.2.3 From 93834b78a13814e8b799126285a70f3303d04fea Mon Sep 17 00:00:00 2001 From: j-ed Date: Sat, 26 Jan 2013 12:09:54 +0100 Subject: Update lib/mail.php added parameter mail_smtpauthtype to set SMTP authentication type. --- lib/mail.php | 2 ++ 1 file changed, 2 insertions(+) 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; -- cgit v1.2.3