mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1318 from j-ed/master 

added parameter mail_smtpauthtype to set SMTP authentication type.
This commit is contained in:
Thomas Müller 2013-01-28 01:42:46 -08:00
parent 31d83fddc4 93834b78a1
commit 857b15db37
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.sample.php
View File

@ -92,6 +92,10 @@ $CONFIG = array(
*/ */
"mail_smtpauth" => false, "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 */ /* Username to use for sendmail mail, depends on mail_smtpauth if this is used */
"mail_smtpname" => "", "mail_smtpname" => "",

2
lib/mail.php
View File

@ -38,6 +38,7 @@ class OC_Mail {
$SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' ); $SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' );
$SMTPPORT = OC_Config::getValue( 'mail_smtpport', 25 ); $SMTPPORT = OC_Config::getValue( 'mail_smtpport', 25 );
$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false ); $SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false );
$SMTPAUTHTYPE = OC_Config::getValue( 'mail_smtpauthtype', 'LOGIN' );
$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' ); $SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' );
$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' ); $SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );
$SMTPDEBUG = OC_Config::getValue( 'mail_smtpdebug', false ); $SMTPDEBUG = OC_Config::getValue( 'mail_smtpdebug', false );
@ -62,6 +63,7 @@ class OC_Mail {
$mailo->SMTPAuth = $SMTPAUTH; $mailo->SMTPAuth = $SMTPAUTH;
$mailo->SMTPDebug = $SMTPDEBUG; $mailo->SMTPDebug = $SMTPDEBUG;
$mailo->SMTPSecure = $SMTPSECURE; $mailo->SMTPSecure = $SMTPSECURE;
$mailo->AuthType = $SMTPAUTHTYPE;
$mailo->Username = $SMTPUSERNAME; $mailo->Username = $SMTPUSERNAME;
$mailo->Password = $SMTPPASSWORD; $mailo->Password = $SMTPPASSWORD;
$mailo->Timeout = $SMTPTIMEOUT; $mailo->Timeout = $SMTPTIMEOUT;