From 1727b2e84d9c6202f4777dff3c6b7433ec8783c7 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 2 Jan 2013 19:04:08 +0100
Subject: [PATCH] add smtp port configuration option
---
config/config.sample.php | 3 +++
lib/mail.php | 14 ++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
index 78dfe17ea7..2eec7847f9 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -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)
*/
diff --git a/lib/mail.php b/lib/mail.php
index c78fcce88d..4683a1b4ee 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -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);
}
-
-
-
}
--
GitLab