From 9983c9755ee33e56a7f16ab3896eea3406e56619 Mon Sep 17 00:00:00 2001
From: yehudah <yehudah@b8457f37-d9ea-0310-8a92-e5e31aec5664>
Date: Fri, 3 Aug 2018 14:37:33 +0000
Subject: Stupid idea ever - read the blog (postmansmtp.com)

---
 Postman/PostmanOptions.php        | 41 ++++++++++++++++++++++-----------------
 Postman/PostmanViewController.php |  2 +-
 2 files changed, 24 insertions(+), 19 deletions(-)

(limited to 'Postman')

diff --git a/Postman/PostmanOptions.php b/Postman/PostmanOptions.php
index f0d675e..240b1aa 100644
--- a/Postman/PostmanOptions.php
+++ b/Postman/PostmanOptions.php
@@ -178,6 +178,10 @@ if ( ! class_exists( 'PostmanOptions' ) ) {
 			} else { 				return self::DEFAULT_MAIL_LOG_ENABLED; }
 		}
 		public function getRunMode() {
+			if ( defined( 'POST_SMTP_RUN_MODE' ) ) {
+				return POST_SMTP_RUN_MODE;
+			}
+			
 			if ( isset( $this->options [ self::RUN_MODE ] ) ) {
 				return $this->options [ self::RUN_MODE ];
 			} else { 				return self::DEFAULT_RUN_MODE; }
@@ -260,21 +264,11 @@ if ( ! class_exists( 'PostmanOptions' ) ) {
 				return $this->options [ PostmanOptions::AUTHENTICATION_TYPE ]; }
 		}
 		public function getEncryptionType() {
-		    $port = $this->getPort();
-		    switch ($port):
-                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;
+			if ( isset( $this->options [ PostmanOptions::SECURITY_TYPE ] ) ) {
+				return $this->options [ PostmanOptions::SECURITY_TYPE ];
+			}
 		}
+
 		public function getUsername() {
             if ( defined( 'POST_SMTP_AUTH_USERNAME' ) ) {
                 return POST_SMTP_AUTH_USERNAME;
@@ -285,24 +279,35 @@ if ( ! class_exists( 'PostmanOptions' ) ) {
 			}
 		}
 		public function getPassword() {
-
-		    if ( defined( 'POST_SMTP_AUTH_PASSWORD' ) ) {
-		        return POST_SMTP_AUTH_PASSWORD;
-            }
+			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 ] );
 			}
 		}
 		public function getMandrillApiKey() {
+			if ( defined( 'POST_SMTP_API_KEY' ) ) {
+				return POST_SMTP_API_KEY;
+			}
+			
 			if ( isset( $this->options [ PostmanOptions::MANDRILL_API_KEY ] ) ) {
 				return base64_decode( $this->options [ PostmanOptions::MANDRILL_API_KEY ] ); }
 		}
 		public function getSendGridApiKey() {
+			if ( defined( 'POST_SMTP_API_KEY' ) ) {
+				return POST_SMTP_API_KEY;
+			}
+
 			if ( isset( $this->options [ PostmanOptions::SENDGRID_API_KEY ] ) ) {
 				return base64_decode( $this->options [ PostmanOptions::SENDGRID_API_KEY ] ); }
 		}
 		public function getMailgunApiKey() {
+			if ( defined( 'POST_SMTP_API_KEY' ) ) {
+				return POST_SMTP_API_KEY;
+			}
+
 			if ( isset( $this->options [ PostmanOptions::MAILGUN_API_KEY ] ) ) {
 				return base64_decode( $this->options [ PostmanOptions::MAILGUN_API_KEY ] ); }
 		}
diff --git a/Postman/PostmanViewController.php b/Postman/PostmanViewController.php
index 7aeeae4..d2e6f45 100644
--- a/Postman/PostmanViewController.php
+++ b/Postman/PostmanViewController.php
@@ -307,7 +307,7 @@ if ( ! class_exists( 'PostmanViewController' ) ) {
 				echo '
 				<div class="updated settings-error notice is-dismissible"> 
 					<p>
-					<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>
+					<strong>Version ' . $version . ' I do mistakes too - A must read:</strong> <a target="_blank" href="https://postmansmtp.com/post-smtp-1-9-4-im-only-human/">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>
-- 
cgit v1.2.3