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/ttrssmailer.php')

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


From 90df27a4c12d3be57744d0bb4cde048ff3174591 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 16:43:15 +0400
Subject: ttrssMailer: fix typo

---
 classes/ttrssmailer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'classes/ttrssmailer.php')

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 1f365c22e..54d180620 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -26,8 +26,8 @@ class ttrssMailer extends PHPMailer {
 	function __construct() {
 		$this->SetLanguage("en", "lib/phpmailer/language/");
 
-		if (SMTP_HOST) {
-			$pair = explode(":", SMTP_HOST, 2);
+		if (SMTP_SERVER) {
+			$pair = explode(":", SMTP_SERVER, 2);
 			$Mailer = "smtp";
 
 			$Host = $pair[0];
-- 
cgit v1.2.3


From 4f032700dbfbbfa35798e05497c8a868eb73476f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 16:50:22 +0400
Subject: ttrssMailer: actually use OOP properly

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

(limited to 'classes/ttrssmailer.php')

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 54d180620..fd7f969aa 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -17,34 +17,29 @@ class ttrssMailer extends PHPMailer {
 		public $CharSet = "UTF-8";
 		public $PluginDir = "lib/phpmailer/";
 		public $ContentType = "text/html"; //default email type is HTML
-		public $Host;
-		public $Port;
-		public $SMTPAuth=False;
-		public $Username;
-		public $Password;
 
 	function __construct() {
 		$this->SetLanguage("en", "lib/phpmailer/language/");
 
 		if (SMTP_SERVER) {
 			$pair = explode(":", SMTP_SERVER, 2);
-			$Mailer = "smtp";
+			$this->Mailer = "smtp";
 
-			$Host = $pair[0];
-			$Port = $pair[1];
+			$this->Host = $pair[0];
+			$this->Port = $pair[1];
 
 			if (!$Port) $Port = 25;
 		} else {
-			$Host = '';
-			$Port = '';
+			$this->Host = '';
+			$this->Port = '';
 		}
 
 
 		//if SMTP_LOGIN is specified, set credentials and enable auth
 		if(SMTP_LOGIN){
-			$SMTPAuth = true;
-			$Username = SMTP_LOGIN;
-			$Password = SMTP_PASSWORD;
+			$this->SMTPAuth = true;
+			$this->Username = SMTP_LOGIN;
+			$this->Password = SMTP_PASSWORD;
 			}
 	}
 	/*	@brief a simple mail function to send email using the defaults
-- 
cgit v1.2.3


From 6f7798b6434f5ef6073447998c436901b507e3df Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Tue, 7 May 2013 00:35:10 -0700
Subject: Fixing bugs found by static analysis

---
 classes/ttrssmailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/ttrssmailer.php')

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index fd7f969aa..1e8d07723 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -28,7 +28,7 @@ class ttrssMailer extends PHPMailer {
 			$this->Host = $pair[0];
 			$this->Port = $pair[1];
 
-			if (!$Port) $Port = 25;
+			if (!$this->Port) $this->Port = 25;
 		} else {
 			$this->Host = '';
 			$this->Port = '';
-- 
cgit v1.2.3