From b9863a153c4a9295c3ddd214c1c1d21aa4807221 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 16:40:04 +0400
Subject: unify SMTP_HOST and SMTP_PORT as SMTP_SERVER

---
 classes/ttrssmailer.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'classes')

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 1eb9f1d3a..1f365c22e 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -25,17 +25,20 @@ class ttrssMailer extends PHPMailer {
 
 	function __construct() {
 		$this->SetLanguage("en", "lib/phpmailer/language/");
-		//if SMTP_HOST is specified, use SMTP to send mail directly
+
 		if (SMTP_HOST) {
-			$Host = SMTP_HOST;
+			$pair = explode(":", SMTP_HOST, 2);
 			$Mailer = "smtp";
+
+			$Host = $pair[0];
+			$Port = $pair[1];
+
+			if (!$Port) $Port = 25;
+		} else {
+			$Host = '';
+			$Port = '';
 		}
-		//if SMTP_PORT is specified, assign it. Otherwise default to port 25
-		if(SMTP_PORT){
-			$Port = SMTP_PORT;
-		}else{
-			$Port = "25";
-		}
+
 
 		//if SMTP_LOGIN is specified, set credentials and enable auth
 		if(SMTP_LOGIN){
-- 
cgit v1.2.3-54-g00ecf