Stupid idea ever - read the blog (postmansmtp.com)

4 files changed, 32 insertions, 24 deletions

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>
diff --git a/postman-smtp.php b/postman-smtp.php
index 43f4801..cf29a7e 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.9.3
+ * Version: 1.9.4
  * 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.9.3' );
+	$kevinCostner = new Postman( __FILE__, '1.9.4' );
 }
diff --git a/readme.txt b/readme.txt
index 033d96b..d59717f 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.9.3
+Stable tag: 1.9.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -12,8 +12,8 @@ Send, log and troubleshoot your Outgoing Email easily. Supports everything: SMTP
 
 == Description ==
 
-= Version 1.9.3 released =
-Better secure delivery and external auth credentials (wp-config). [Read the detailes here](https://postmansmtp.com/post-smtp-1-9-0-better-support-for-secure-delivery/)
+= Version 1.9.4 released - A MUST READ FOR EXISTING USERS =
+I tryed to do stuff simple and I just the did opposite. [Read the detailes here](https://postmansmtp.com/post-smtp-1-9-4-im-only-human/)
 
 = WordPress Mail SMTP Plugin =
 
@@ -296,6 +296,9 @@ To avoid being flagged as spam, you need to prove your email isn't forged. On a
 
 
 == Changelog ==
+= 1.9.4 - 2018-08-03
+The most stupid idea ever remove (auto security select)
+
 = 1.9.3 - 2018-07-26
 Removed auto configure for port 25 (can be TLS)