From 18dd31c4715cbf949236e087ceac361a360e09d4 Mon Sep 17 00:00:00 2001
From: yehudah <yehudah@b8457f37-d9ea-0310-8a92-e5e31aec5664>
Date: Sun, 22 Jul 2018 09:34:11 +0000
Subject: [PATCH] Better support for secure delivery and auth contacts
 (wp-config)

git-svn-id: https://plugins.svn.wordpress.org/post-smtp/trunk@1912939 b8457f37-d9ea-0310-8a92-e5e31aec5664
---
 .../Zend-1.12.10/Mail/Protocol/Smtp.php       |  9 ++++-
 Postman/PostmanOptions.php                    | 34 ++++++++++++++++---
 Postman/PostmanViewController.php             |  2 +-
 postman-smtp.php                              |  4 +--
 readme.txt                                    |  7 +++-
 5 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php b/Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php
index b71ff100..be6d9089 100644
--- a/Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php
+++ b/Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php
@@ -208,7 +208,14 @@ public function helo($host = '127.0.0.1')
             stream_context_set_option($this->_socket, 'ssl', 'verify_peer_name', false);
             stream_context_set_option($this->_socket, 'ssl', 'allow_self_signed', true);
 
-            if (!stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+            $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+
+            if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+                $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+                $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+            }
+
+            if (!stream_socket_enable_crypto($this->_socket, true, $crypto_method)) {
                 /**
                  * @see Postman_Zend_Mail_Protocol_Exception
                  */
diff --git a/Postman/PostmanOptions.php b/Postman/PostmanOptions.php
index 193f8c97..20d3a046 100644
--- a/Postman/PostmanOptions.php
+++ b/Postman/PostmanOptions.php
@@ -260,16 +260,42 @@ public function getAuthenticationType() {
 				return $this->options [ PostmanOptions::AUTHENTICATION_TYPE ]; }
 		}
 		public function getEncryptionType() {
-			if ( isset( $this->options [ PostmanOptions::SECURITY_TYPE ] ) ) {
-				return $this->options [ PostmanOptions::SECURITY_TYPE ]; }
+		    $port = $this->getPort();
+		    switch ($port):
+                case 25:
+                    return 'none';
+                    break;
+                case 465:
+                    return 'ssl';
+                    break;
+                case 587:
+                    return 'tls';
+                    break;
+                case 2525:
+                    return 'tls';
+                    break;
+                default:
+                    return isset( $this->options [ PostmanOptions::SECURITY_TYPE ] ) ? $this->options [ PostmanOptions::SECURITY_TYPE ] : 'none';
+            endswitch;
 		}
 		public function getUsername() {
+            if ( defined( POST_SMTP_AUTH_USERNAME ) ) {
+                return POST_SMTP_AUTH_USERNAME;
+            }
+
 			if ( isset( $this->options [ PostmanOptions::BASIC_AUTH_USERNAME ] ) ) {
-				return $this->options [ PostmanOptions::BASIC_AUTH_USERNAME ]; }
+				return $this->options [ PostmanOptions::BASIC_AUTH_USERNAME ];
+			}
 		}
 		public function getPassword() {
+
+		    if ( defined( POST_SMTP_AUTH_PASSWORD ) ) {
+		        return POST_SMTP_AUTH_PASSWORD;
+            }
+
 			if ( isset( $this->options [ PostmanOptions::BASIC_AUTH_PASSWORD ] ) ) {
-				return base64_decode( $this->options [ PostmanOptions::BASIC_AUTH_PASSWORD ] ); }
+				return base64_decode( $this->options [ PostmanOptions::BASIC_AUTH_PASSWORD ] );
+			}
 		}
 		public function getMandrillApiKey() {
 			if ( isset( $this->options [ PostmanOptions::MANDRILL_API_KEY ] ) ) {
diff --git a/Postman/PostmanViewController.php b/Postman/PostmanViewController.php
index 5fb8cb1f..7aeeae41 100644
--- a/Postman/PostmanViewController.php
+++ b/Postman/PostmanViewController.php
@@ -307,7 +307,7 @@ private function displayTopNavigation() {
 				echo '
 				<div class="updated settings-error notice is-dismissible"> 
 					<p>
-					<strong>Version ' . $version . ' released with lockfile fix and new PHP requirement:</strong> <a target="_blank" href="https://postmansmtp.com/post-smtp-v1-8-6-lockfile-and-raise-the-php-version">Read Here</a>
+					<strong>Version ' . $version . ' released with better compability for secure ports:</strong> <a target="_blank" href="https://postmansmtp.com/post-smtp-1-9-0-better-support-for-secure-delivery">Read Here</a>
 					</p>
 					<button style="z-index: 100;" data-version="'. $version . '" data-security="' . wp_create_nonce('postsmtp') .'" type="button" class="notice-dismiss postman-release-message">
 						<span class="screen-reader-text">Dismiss this notice.</span>
diff --git a/postman-smtp.php b/postman-smtp.php
index 8537790c..64c639e2 100644
--- a/postman-smtp.php
+++ b/postman-smtp.php
@@ -4,7 +4,7 @@
  * Plugin Name: Post SMTP
  * Plugin URI: https://wordpress.org/plugins/post-smtp/
  * Description: Email not reliable? Post SMTP is the first and only WordPress SMTP plugin to implement OAuth 2.0 for Gmail, Hotmail and Yahoo Mail. Setup is a breeze with the Configuration Wizard and integrated Port Tester. Enjoy worry-free delivery even if your password changes!
- * Version: 1.8.9
+ * Version: 1.9.0
  * Author: Jason Hendriks, Yehuda Hassine
  * Text Domain: post-smtp
  * Author URI: https://postmansmtp.com
@@ -123,5 +123,5 @@ function post_start( $startingMemory ) {
  */
 function post_setupPostman() {
 	require_once 'Postman/Postman.php';
-	$kevinCostner = new Postman( __FILE__, '1.8.9' );
+	$kevinCostner = new Postman( __FILE__, '1.9.0' );
 }
diff --git a/readme.txt b/readme.txt
index f49e869e..0b9f1354 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=yehuda@m
 Tags: postman smtp, postman, smtp, email, mail, mailer, email log, oauth2, gmail, google apps, hotmail, yahoo, mandrill api, sendgrid api, elastic email, office365, mailgun
 Requires at least: 3.9
 Tested up to: 4.9.5
-Stable tag: 1.8.9
+Stable tag: 1.9.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -296,6 +296,11 @@ To avoid being flagged as spam, you need to prove your email isn't forged. On a
 
 
 == Changelog ==
+= 1.9.0 - 2018-07-22
+* Better support for secure delivery
+* Support for constants auth (inside wp-config), check the detailes our [Blog](https://postmansmtp.com/post-smtp-1-9-0-better-support-for-secure-delivery)
+* Automatic encryption select base on the port input - 25, 465, 587, 2525
+
 = 1.8.9 - 2018-04-24
 * Sendgrid bug