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

add smtp port configuration option

This commit is contained in:
Thomas Mueller 2013-01-02 19:04:08 +01:00
parent 166da88b73
commit 1727b2e84d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.sample.php
View File

@ -78,6 +78,9 @@ $CONFIG = array(
/* Host to use for sending mail, depends on mail_smtpmode if this is used */
"mail_smtphost" => "127.0.0.1",
/* Port to use for sending mail, depends on mail_smtpmode if this is used */
"mail_smtpport" => 25,
/* authentication needed to send mail, depends on mail_smtpmode if this is used
* (false = disable authentication)
*/

14
lib/mail.php
View File

@ -25,12 +25,18 @@ class OC_Mail {
* @param string $mailtext
* @param string $fromaddress
* @param string $fromname
* @param bool $html
* @param bool|int $html
* @param string $altbody
* @param string $ccaddress
* @param string $ccname
* @param string $bcc
* @throws Exception
*/
public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='', $bcc='') {
$SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' );
$SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' );
$SMTPPORT = OC_Config::getValue( 'mail_smtpport', 25 );
$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false );
$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' );
$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );
@ -49,6 +55,7 @@ class OC_Mail {
$mailo->Host = $SMTPHOST;
$mailo->Port = $SMTPPORT;
$mailo->SMTPAuth = $SMTPAUTH;
$mailo->Username = $SMTPUSERNAME;
$mailo->Password = $SMTPPASSWORD;
@ -89,8 +96,6 @@ class OC_Mail {
}
}
/**
* return the footer for a mail
*
@ -103,7 +108,4 @@ class OC_Mail {
return($txt);
}
}