From 835ae5bd30ba87e2838493f576798baa466d8c98 Mon Sep 17 00:00:00 2001
From: smusman98 <smusman@objects.ws>
Date: Mon, 18 Jul 2022 14:46:52 +0500
Subject: [PATCH] 2.0.23

* Fixed: WP_Scripts::localize called incorrectly message.
---
 Postman/Localize.php                          | 29 +++++++
 .../PostmanConfigurationController.php        | 26 +------
 .../postman_manual_config.js                  | 10 +--
 .../Postman-Configuration/postman_wizard.js   | 76 +++++++++----------
 .../PostmanConnectivityTestController.php     |  2 +-
 .../postman_port_test.js                      | 10 +--
 .../PostmanAdminPointer.php                   | 57 +++++++-------
 .../PostmanDiagnosticTestController.php       |  7 +-
 .../PostmanEmailLogController.php             |  6 +-
 Postman/Postman-Mail/postman_smtp.js          |  4 +-
 .../postman_send_test_email.js                | 12 +--
 Postman/Postman.php                           | 12 ---
 Postman/PostmanAdminController.php            |  2 +-
 Postman/PostmanViewController.php             |  9 +--
 postman-smtp.php                              | 12 ++-
 readme.txt                                    |  8 +-
 script/localize.js                            |  3 +
 script/postman.js                             |  2 +-
 script/postman_resend_email_sript.js          |  4 +-
 19 files changed, 146 insertions(+), 145 deletions(-)
 create mode 100644 Postman/Localize.php
 create mode 100644 script/localize.js

diff --git a/Postman/Localize.php b/Postman/Localize.php
new file mode 100644
index 00000000..f37b0827
--- /dev/null
+++ b/Postman/Localize.php
@@ -0,0 +1,29 @@
+<?php
+$warning = __( 'Warning', 'post-smtp' );
+
+return array(
+    /* translators: where %s is the name of the SMTP server */
+    'postman_smtp_mitm' => sprintf( '%s: %s', $warning, __( 'connected to %1$s instead of %2$s.', 'post-smtp' ) ),
+    /* translators: where %d is a port number */
+    'postman_wizard_bad_redirect_url' => __( 'You are about to configure OAuth 2.0 with an IP address instead of a domain name. This is not permitted. Either assign a real domain name to your site or add a fake one in your local host file.', 'post-smtp' ),
+    'postman_input_sender_email' => '#input_' . PostmanOptions::MESSAGE_SENDER_EMAIL,
+    'postman_input_sender_name' => '#input_' . PostmanOptions::MESSAGE_SENDER_NAME,
+    'postman_port_element_name' => '#input_' . PostmanOptions::PORT,
+    'postman_hostname_element_name' => '#input_' . PostmanOptions::HOSTNAME,
+    'postman_enc_for_password_el' => '#input_enc_type_password',
+    'postman_input_basic_username' => '#input_' . PostmanOptions::BASIC_AUTH_USERNAME,
+    'postman_input_basic_password' => '#input_' . PostmanOptions::BASIC_AUTH_PASSWORD,
+    'postman_redirect_url_el' => '#input_oauth_redirect_url',
+    'postman_input_auth_type' => '#input_' . PostmanOptions::AUTHENTICATION_TYPE,
+    'postman_js_email_was_resent' => __( 'Email was successfully resent (but without attachments)', 'post-smtp' ),
+    /* Translators: Where %s is an error message */
+    'postman_js_email_not_resent' => __( 'Email could not be resent. Error: %s', 'post-smtp' ),
+    'postman_js_resend_label' => __( 'Resend', 'post-smtp' ),
+    'steps_current_step' => 'steps_current_step',
+    'steps_pagination' => 'steps_pagination',
+    'steps_finish' => _x( 'Finish', 'Press this button to Finish this task', 'post-smtp' ),
+    'steps_next' => _x( 'Next', 'Press this button to go to the next step', 'post-smtp' ),
+    'steps_previous' => _x( 'Previous', 'Press this button to go to the previous step', 'post-smtp' ),
+    'steps_loading' => 'steps_loading'
+);
+
diff --git a/Postman/Postman-Configuration/PostmanConfigurationController.php b/Postman/Postman-Configuration/PostmanConfigurationController.php
index 2d9ff48f..f7c0cc4d 100644
--- a/Postman/Postman-Configuration/PostmanConfigurationController.php
+++ b/Postman/Postman-Configuration/PostmanConfigurationController.php
@@ -100,28 +100,6 @@ private function registerStylesAndScripts() {
 	/**
 	 */
 	private function addLocalizeScriptsToPage() {
-		$warning = __( 'Warning', 'post-smtp' );
-		/* translators: where %s is the name of the SMTP server */
-		wp_localize_script( 'postman_wizard_script', 'postman_smtp_mitm', sprintf( '%s: %s', $warning, __( 'connected to %1$s instead of %2$s.', 'post-smtp' ) ) );
-		/* translators: where %d is a port number */
-		wp_localize_script( 'postman_wizard_script', 'postman_wizard_bad_redirect_url', __( 'You are about to configure OAuth 2.0 with an IP address instead of a domain name. This is not permitted. Either assign a real domain name to your site or add a fake one in your local host file.', 'post-smtp' ) );
-
-		// user input
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_input_sender_email', '#input_' . PostmanOptions::MESSAGE_SENDER_EMAIL );
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_input_sender_name', '#input_' . PostmanOptions::MESSAGE_SENDER_NAME );
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_port_element_name', '#input_' . PostmanOptions::PORT );
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_hostname_element_name', '#input_' . PostmanOptions::HOSTNAME );
-
-		// the enc input
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_enc_for_password_el', '#input_enc_type_password' );
-		// these are the ids for the <option>s in the encryption <select>
-		// the password inputs
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_input_basic_username', '#input_' . PostmanOptions::BASIC_AUTH_USERNAME );
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_input_basic_password', '#input_' . PostmanOptions::BASIC_AUTH_PASSWORD );
-
-		// the auth input
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_redirect_url_el', '#input_oauth_redirect_url' );
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_input_auth_type', '#input_' . PostmanOptions::AUTHENTICATION_TYPE );
 
 		// the transport modules scripts
 		foreach ( PostmanTransportRegistry::getInstance()->getTransports() as $transport ) {
@@ -187,7 +165,7 @@ function enqueueWizardResources() {
 		wp_enqueue_style( 'jquery_steps_style' );
 		wp_enqueue_style( PostmanViewController::POSTMAN_STYLE );
 		wp_enqueue_script( 'postman_wizard_script' );
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, '$jq', 'jQuery.noConflict(true)' );
+		//wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, '$jq', 'jQuery.noConflict(true)' );
 		$shortLocale = substr( get_locale(), 0, 2 );
 		if ( $shortLocale != 'en' ) {
 			$url = plugins_url( sprintf( 'script/jquery-validate/localization/messages_%s.js', $shortLocale ), $this->rootPluginFilenameAndPath );
@@ -601,7 +579,7 @@ public function outputWizardContent() {
 		Postman::getMailerTypeRecommend();
 
 		$in_wizard = true;
-		include_once POST_SMTP_PATH . '/Postman/extra/donation.php';
+		//include_once POST_SMTP_PATH . '/Postman/extra/donation.php';
 
 		print '</section>';
 		print '</fieldset>';
diff --git a/Postman/Postman-Configuration/postman_manual_config.js b/Postman/Postman-Configuration/postman_manual_config.js
index 49438fc9..888647ef 100644
--- a/Postman/Postman-Configuration/postman_manual_config.js
+++ b/Postman/Postman-Configuration/postman_manual_config.js
@@ -44,7 +44,7 @@ jQuery(document).ready(
 				Hook.call( 'post_smtp_notification_change', selected );
 
 			});
-			
+
 
 			// add an event on the authentication input field
 			// on user changing the auth type, determine whether to show
@@ -61,23 +61,23 @@ jQuery(document).ready(
 
 			// add an event on the hostname input field
 			// on keyup, start the countdown
-			jQuery(postman_hostname_element_name).keyup(function() {
+			jQuery(post_smtp_localize.postman_hostname_element_name).keyup(function() {
 				clearTimeout(typingTimer);
-				if (jQuery(postman_hostname_element_name).val) {
+				if (jQuery(post_smtp_localize.postman_hostname_element_name).val) {
 					typingTimer = setTimeout(doneTyping, doneTypingInterval);
 				}
 			});
 
 			// user is "finished typing," do something
 			function doneTyping() {
-				if (jQuery(postman_input_auth_type).val() == 'oauth2') {
+				if (jQuery(post_smtp_localize.postman_input_auth_type).val() == 'oauth2') {
 					reloadOauthSection();
 				}
 			}
 		});
 
 function reloadOauthSection() {
-	var hostname = jQuery(postman_hostname_element_name).val();
+	var hostname = jQuery(post_smtp_localize.postman_hostname_element_name).val();
 	var transport = jQuery('#input_transport_type').val();
 	var authtype = jQuery('select#input_auth_type').val();
 	var security = jQuery('#security').val();
diff --git a/Postman/Postman-Configuration/postman_wizard.js b/Postman/Postman-Configuration/postman_wizard.js
index cbd20318..741d8638 100644
--- a/Postman/Postman-Configuration/postman_wizard.js
+++ b/Postman/Postman-Configuration/postman_wizard.js
@@ -7,7 +7,7 @@ portTestInProgress = false;
  * Functions to run on document load
  */
 jQuery(document).ready(function() {
-	jQuery(postman_input_sender_email).focus();
+	jQuery(post_smtp_localize.postman_input_sender_email).focus();
 	initializeJQuerySteps();
 	// add an event on the plugin selection
 	jQuery('input[name="input_plugin"]').click(function() {
@@ -63,7 +63,7 @@ function checkEmail(goDaddyHostDetected, email) {
 					smtpDiscovery = response.data;
 					if (response.data.hostname != null
 							&& response.data.hostname) {
-						jQuery(postman_hostname_element_name).val(
+						jQuery(post_smtp_localize.postman_hostname_element_name).val(
 								response.data.hostname);
 					}
 					enableSmtpHostnameInput(goDaddyHostDetected);
@@ -108,12 +108,12 @@ function initializeJQuerySteps() {
 				autoFocus : true,
 				startIndex : parseInt(postman_setup_wizard.start_page),
 				labels : {
-					current : steps_current_step,
-					pagination : steps_pagination,
-					finish : steps_finish,
-					next : steps_next,
-					previous : steps_previous,
-					loading : steps_loading
+					current : post_smtp_localize.steps_current_step,
+					pagination : post_smtp_localize.steps_pagination,
+					finish : post_smtp_localize.steps_finish,
+					next : post_smtp_localize.steps_next,
+					previous : post_smtp_localize.steps_previous,
+					loading : post_smtp_localize.steps_loading
 				},
 				onStepChanging : function(event, currentIndex, newIndex) {
 					return handleStepChange(event, currentIndex, newIndex,
@@ -121,7 +121,7 @@ function initializeJQuerySteps() {
 
 				},
 				onInit : function() {
-					jQuery(postman_input_sender_email).focus();
+					jQuery(post_smtp_localize.postman_input_sender_email).focus();
 				},
 				onStepChanged : function(event, currentIndex, priorIndex) {
 					return postHandleStepChange(event, currentIndex,
@@ -191,7 +191,7 @@ function handleStepChange(event, currentIndex, newIndex, form) {
 	if (currentIndex === 1) {
 		// page 1 : look-up the email
 		// address for the smtp server
-		checkGoDaddyAndCheckEmail(jQuery(postman_input_sender_email).val());
+		checkGoDaddyAndCheckEmail(jQuery(post_smtp_localize.postman_input_sender_email).val());
 
 	} else if (currentIndex === 2) {
 
@@ -203,7 +203,7 @@ function handleStepChange(event, currentIndex, newIndex, form) {
 		portsToCheck = 0;
 		totalAvail = 0;
 
-		getHostsToCheck(jQuery(postman_hostname_element_name).val());
+		getHostsToCheck(jQuery(post_smtp_localize.postman_hostname_element_name).val());
 
 	} else if (currentIndex === 3) {
 
@@ -219,9 +219,9 @@ function handleStepChange(event, currentIndex, newIndex, form) {
 		if (!valid) {
 			return false;
 		}
-		var chosenPort = jQuery(postman_port_element_name).val();
-		var hostname = jQuery(postman_hostname_element_name).val();
-		var authType = jQuery(postman_input_auth_type).val()
+		var chosenPort = jQuery(post_smtp_localize.postman_port_element_name).val();
+		var hostname = jQuery(post_smtp_localize.postman_hostname_element_name).val();
+		var authType = jQuery(post_smtp_localize.postman_input_auth_type).val()
 
 	}
 
@@ -234,7 +234,7 @@ function postHandleStepChange(event, currentIndex, priorIndex, myself) {
 	// the user is old enough and wants
 	// to the previous step.
 	if (currentIndex === 2) {
-		jQuery(postman_hostname_element_name).focus();
+		jQuery(post_smtp_localize.postman_hostname_element_name).focus();
 		// this is the second place i disable the next button but Steps
 		// re-enables it after the screen slides
 		if (priorIndex === 1) {
@@ -253,7 +253,7 @@ function postHandleStepChange(event, currentIndex, priorIndex, myself) {
 	}
 	if (currentIndex === 4) {
 		if (redirectUrlWarning) {
-			alert(postman_wizard_bad_redirect_url);
+			alert(post_smtp_localize.postman_wizard_bad_redirect_url);
 		}
 		if (chosenPort == 'none') {
 			if (priorIndex === 5) {
@@ -269,7 +269,7 @@ function postHandleStepChange(event, currentIndex, priorIndex, myself) {
 
 /**
  * Asks the server for a List of sockets to perform port checks upon.
- * 
+ *
  * @param hostname
  */
 function getHostsToCheck(hostname) {
@@ -298,7 +298,7 @@ function getHostsToCheck(hostname) {
 
 /**
  * Handles the response from the server of the list of sockets to check.
- * 
+ *
  * @param hostname
  * @param response
  */
@@ -323,7 +323,7 @@ function handleHostsToCheckResponse(response) {
 
 /**
  * Asks the server to run a connectivity test on the given port
- * 
+ *
  * @param hostname
  * @param port
  * @param data
@@ -342,7 +342,7 @@ function postThePortTest(hostname, port, data) {
 
 /**
  * Handles the result of the port test
- * 
+ *
  * @param hostname
  * @param port
  * @param data
@@ -368,7 +368,7 @@ function handlePortTestResponse(hostname, port, data, response) {
 }
 
 /**
- * 
+ *
  * @param message
  */
 function updateStatus(message) {
@@ -502,7 +502,7 @@ function handleConfigurationResponse(response) {
 
 	jQuery('select#input_notification_service').change(function() {
 		var selected = jQuery( this ).val();
-		
+
 		if ( selected == 'default' ) {
 			jQuery('#slack_cred').fadeOut('fast');
 			jQuery('#pushover_cred').fadeOut('fast');
@@ -554,7 +554,7 @@ function getConfiguration() {
 		var data = {
 			'action' : 'import_configuration',
 			'plugin' : plugin,
-			'_wpnonce' : jQuery('#_wpnonce').val(),
+			'security' : jQuery('#security').val(),
 		};
 		jQuery
 				.post(
@@ -564,21 +564,21 @@ function getConfiguration() {
 							if (response.success) {
 								jQuery('select#input_transport_type').val(
 										'smtp');
-								jQuery(postman_input_sender_email).val(
+								jQuery(post_smtp_localize.postman_input_sender_email).val(
 										response.sender_email);
-								jQuery(postman_input_sender_name).val(
+								jQuery(post_smtp_localize.postman_input_sender_name).val(
 										response.sender_name);
-								jQuery(postman_hostname_element_name).val(
+								jQuery(post_smtp_localize.postman_hostname_element_name).val(
 										response.hostname);
-								jQuery(postman_port_element_name).val(
+								jQuery(post_smtp_localize.postman_port_element_name).val(
 										response.port);
-								jQuery(postman_input_auth_type).val(
+								jQuery(post_smtp_localize.postman_input_auth_type).val(
 										response.auth_type);
 								jQuery('#input_enc_type')
 										.val(response.enc_type);
-								jQuery(postman_input_basic_username).val(
+								jQuery(post_smtp_localize.postman_input_basic_username).val(
 										response.basic_auth_username);
-								jQuery(postman_input_basic_password).val(
+								jQuery(post_smtp_localize.postman_input_basic_password).val(
 										response.basic_auth_password);
 								switchBetweenPasswordAndOAuth();
 							}
@@ -586,14 +586,14 @@ function getConfiguration() {
 					ajaxFailed(response);
 				});
 	} else {
-		jQuery(postman_input_sender_email).val('');
-		jQuery(postman_input_sender_name).val('');
-		jQuery(postman_input_basic_username).val('');
-		jQuery(postman_input_basic_password).val('');
-		jQuery(postman_hostname_element_name).val('');
-		jQuery(postman_port_element_name).val('');
-		jQuery(postman_input_auth_type).val('none');
-		jQuery(postman_enc_for_password_el).val('none');
+		jQuery(post_smtp_localize.postman_input_sender_email).val('');
+		jQuery(post_smtp_localize.postman_input_sender_name).val('');
+		jQuery(post_smtp_localize.postman_input_basic_username).val('');
+		jQuery(post_smtp_localize.postman_input_basic_password).val('');
+		jQuery(post_smtp_localize.postman_hostname_element_name).val('');
+		jQuery(post_smtp_localize.postman_port_element_name).val('');
+		jQuery(post_smtp_localize.postman_input_auth_type).val('none');
+		jQuery(post_smtp_localize.postman_enc_for_password_el).val('none');
 		switchBetweenPasswordAndOAuth();
 	}
 }
diff --git a/Postman/Postman-Connectivity-Test/PostmanConnectivityTestController.php b/Postman/Postman-Connectivity-Test/PostmanConnectivityTestController.php
index b7ac6a80..61e3e10a 100644
--- a/Postman/Postman-Connectivity-Test/PostmanConnectivityTestController.php
+++ b/Postman/Postman-Connectivity-Test/PostmanConnectivityTestController.php
@@ -97,7 +97,7 @@ function enqueuePortTestResources() {
 		wp_enqueue_style( PostmanViewController::POSTMAN_STYLE );
 		wp_enqueue_script( 'postman_port_test_script' );
 		$warning = __( 'Warning', 'post-smtp' );
-		wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_hostname_element_name', '#input_' . PostmanOptions::HOSTNAME );
+
         wp_localize_script( PostmanViewController::POSTMAN_SCRIPT, 'postman_email_test', array(
             'recipient' => '#' . PostmanSendTestEmailController::RECIPIENT_EMAIL_FIELD_NAME,
             'not_started' => _x( 'In Outbox', 'Email Test Status', 'post-smtp' ),
diff --git a/Postman/Postman-Connectivity-Test/postman_port_test.js b/Postman/Postman-Connectivity-Test/postman_port_test.js
index 8667c060..724f584f 100644
--- a/Postman/Postman-Connectivity-Test/postman_port_test.js
+++ b/Postman/Postman-Connectivity-Test/postman_port_test.js
@@ -2,7 +2,7 @@ postman_begin_test_button_id = 'input#begin-port-test';
 
 jQuery(document).ready(function() {
 	var elHostname = jQuery(postman_begin_test_button_id);
-	jQuery(postman_hostname_element_name).focus();
+	jQuery(post_smtp_localize.postman_hostname_element_name).focus();
 	elHostname.click(function() {
 		valid = jQuery('#port_test_form_id').valid();
 		if (!valid) {
@@ -20,7 +20,7 @@ jQuery(document).ready(function() {
 		$elTestingTable.show();
 		show('.portquiz');
 
-		var hostname = jQuery(postman_hostname_element_name).val();
+		var hostname = jQuery(post_smtp_localize.postman_hostname_element_name).val();
 		var data = {
 			'action' : 'postman_get_hosts_to_test',
 			'hostname' : hostname,
@@ -45,7 +45,7 @@ jQuery(document).ready(function() {
 
 /**
  * Handles the response from the server of the list of sockets to check.
- * 
+ *
  * @param hostname
  * @param response
  */
@@ -262,7 +262,7 @@ function enableButtonCheck() {
 	if (totalPortsTested >= portsToBeTested) {
 		enable(postman_begin_test_button_id);
 		hideLoaderIcon();
-		jQuery(postman_hostname_element_name).focus();
+		jQuery(post_smtp_localize.postman_hostname_element_name).focus();
 	}
 }
 function inspectResponse(id, response, port) {
@@ -333,4 +333,4 @@ function addConclusion(message, success, isSecure) {
 		message = '&#10060; ' + secureIcon + message;
 	}
 	jQuery('ol.conclusion').append('<li>' + message + '</li>');
-}
\ No newline at end of file
+}
diff --git a/Postman/Postman-Controller/PostmanAdminPointer.php b/Postman/Postman-Controller/PostmanAdminPointer.php
index a05376b0..622231ac 100644
--- a/Postman/Postman-Controller/PostmanAdminPointer.php
+++ b/Postman/Postman-Controller/PostmanAdminPointer.php
@@ -4,90 +4,95 @@
 }
 
 if (! class_exists ( 'PostmanAdminPointer' )) {
-	
+
 	/**
 	 * From http://code.tutsplus.com/articles/integrating-with-wordpress-ui-admin-pointers--wp-26853
 	 *
 	 * @author jasonhendriks
-	 *        
+	 *
 	 */
 	class PostmanAdminPointer {
 		private $logger;
 		private $rootPluginFilenameAndPath;
-		
+
 		/**
 		 *
-		 * @param mixed $rootPluginFilenameAndPath        	
+		 * @param mixed $rootPluginFilenameAndPath
 		 */
 		function __construct($rootPluginFilenameAndPath) {
 			$this->logger = new PostmanLogger ( get_class ( $this ) );
 			$this->rootPluginFilenameAndPath = $rootPluginFilenameAndPath;
-			
+
 			// Don't run on WP < 3.3
 			if (get_bloginfo ( 'version' ) < '3.3' || true)
 				return;
-			
+
 			add_action ( 'admin_enqueue_scripts', array (
 					$this,
-					'wptuts_pointer_load' 
+					'wptuts_pointer_load'
 			), 1000 );
 			add_filter ( 'postman_admin_pointers-settings_page_postman', array (
 					$this,
-					'wptuts_register_pointer_testing' 
+					'wptuts_register_pointer_testing'
 			) );
 		}
-		
+
 		/**
 		 *
-		 * @param mixed $hook_suffix        	
+		 * @param mixed $hook_suffix
 		 */
 		function wptuts_pointer_load($hook_suffix) {
 			// only do this for administrators
 			if (PostmanUtils::isAdmin ()) {
 				$this->logger->trace ( 'wptuts' );
-				
+
 				$screen = get_current_screen ();
 				$screen_id = $screen->id;
-				
+
 				// Get pointers for this screen
 				$pointers = apply_filters ( 'postman_admin_pointers-' . $screen_id, array () );
-				
+
 				if (! $pointers || ! is_array ( $pointers ))
 					return;
-					
+
 					// Get dismissed pointers
 				$dismissed = explode ( ',', ( string ) get_user_meta ( get_current_user_id (), 'dismissed_wp_pointers', true ) );
 				$this->logger->trace ( $dismissed );
 				$valid_pointers = array ();
-				
+
 				// Check pointers and remove dismissed ones.
 				foreach ( $pointers as $pointer_id => $pointer ) {
-					
+
 					// Sanity check
 					if (in_array ( $pointer_id, $dismissed ) || empty ( $pointer ) || empty ( $pointer_id ) || empty ( $pointer ['target'] ) || empty ( $pointer ['options'] ))
 						continue;
-					
+
 					$pointer ['pointer_id'] = $pointer_id;
-					
+
 					// Add the pointer to $valid_pointers array
 					$valid_pointers ['pointers'] [] = $pointer;
 				}
-				
+
 				// No valid pointers? Stop here.
 				if (empty ( $valid_pointers )) {
 					return;
 				}
-				
+
 				// Add pointers style to queue.
 				wp_enqueue_style ( 'wp-pointer' );
-				
+
 				// Add pointers script to queue. Add custom script.
+                /**
+                 * @todo Check if this work
+                 */
+                /*
 				wp_enqueue_script ( 'postman_admin_pointer', plugins_url ( 'script/postman-admin-pointer.js', $this->rootPluginFilenameAndPath ), array (
-						'wp-pointer' 
+						'wp-pointer'
 				) );
-				
+
 				// Add pointer options to script.
 				wp_localize_script ( 'postman_admin_pointer', 'postman_admin_pointer', $valid_pointers );
+                */
 				$this->logger->trace ( 'out wptuts' );
 			}
 		}
@@ -100,9 +105,9 @@ function wptuts_register_pointer_testing($p) {
 								'content' => '',
 								'position' => array (
 										'edge' => 'top',
-										'align' => 'left' 
-								) 
-						) 
+										'align' => 'left'
+								)
+						)
 				);
 				return $p;
 			}
diff --git a/Postman/Postman-Diagnostic-Test/PostmanDiagnosticTestController.php b/Postman/Postman-Diagnostic-Test/PostmanDiagnosticTestController.php
index 18a3ec5e..c884e8ea 100644
--- a/Postman/Postman-Diagnostic-Test/PostmanDiagnosticTestController.php
+++ b/Postman/Postman-Diagnostic-Test/PostmanDiagnosticTestController.php
@@ -204,13 +204,16 @@ private function getFilters( $hook = '' ) {
 			foreach ( $functions as $function ) {
 				$thing = $function ['function'];
 				if ( is_array( $thing ) ) {
-					$name = get_class( $thing [0] ) . '->' . $thing [1];
-					array_push( $functionArray, $name );
+                    $name = get_class($thing [0]) . '->' . $thing [1];
+                    array_push($functionArray, $name);
+                } elseif ( is_object( $thing ) ) {
+                    array_push( $functionArray, 'Anonymous Function' );
 				} else {
 					array_push( $functionArray, $thing );
 				}
 			}
 		}
+
 		return implode( ', ', $functionArray );
 	}
 
diff --git a/Postman/Postman-Email-Log/PostmanEmailLogController.php b/Postman/Postman-Email-Log/PostmanEmailLogController.php
index 2a829884..c2f4ffeb 100644
--- a/Postman/Postman-Email-Log/PostmanEmailLogController.php
+++ b/Postman/Postman-Email-Log/PostmanEmailLogController.php
@@ -391,10 +391,6 @@ function postman_email_log_enqueue_resources() {
 		wp_enqueue_style( 'postman_email_log' );
 		wp_enqueue_script( 'postman_resend_email_script' );
 		wp_enqueue_script( 'sprintf' );
-		wp_localize_script( 'postman_resend_email_script', 'postman_js_email_was_resent', __( 'Email was successfully resent (but without attachments)', 'post-smtp' ) );
-		/* Translators: Where %s is an error message */
-		wp_localize_script( 'postman_resend_email_script', 'postman_js_email_not_resent', __( 'Email could not be resent. Error: %s', 'post-smtp' ) );
-		wp_localize_script( 'postman_resend_email_script', 'postman_js_resend_label', __( 'Resend', 'post-smtp' ) );
 	}
 
 	/**
@@ -425,7 +421,7 @@ function postman_render_email_page() {
 	/* Translators where (%s) is the name of the plugin */
 		echo sprintf( __( '%s Email Log', 'post-smtp' ), __( 'Post SMTP', 'post-smtp' ) )?></h2>
 
-    <?php include_once POST_SMTP_PATH . '/Postman/extra/donation.php'; ?>
+    <?php //include_once POST_SMTP_PATH . '/Postman/extra/donation.php'; ?>
 
 	<div
 		style="background: #ECECEC; border: 1px solid #CCC; padding: 0 10px; margin-top: 5px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;">
diff --git a/Postman/Postman-Mail/postman_smtp.js b/Postman/Postman-Mail/postman_smtp.js
index 2e6d18fd..c9632706 100644
--- a/Postman/Postman-Mail/postman_smtp.js
+++ b/Postman/Postman-Mail/postman_smtp.js
@@ -42,7 +42,7 @@ function postmanSmtpInit() {
 			show('p#wizard_oauth2_help');
 			jQuery('p#wizard_oauth2_help').html(
 					response.configuration.help_text);
-			jQuery(postman_redirect_url_el).val(
+			jQuery(post_smtp_localize.postman_redirect_url_el).val(
 					response.configuration.redirect_url);
 			jQuery('#input_oauth_callback_domain').val(
 					response.configuration.callback_domain);
@@ -86,4 +86,4 @@ function postmanSmtpInit() {
 	// modded by this transport
 	var transportName = jQuery('select#input_transport_type').val();
 	transport.handleTransportChange(transportName);
-}
\ No newline at end of file
+}
diff --git a/Postman/Postman-Send-Test-Email/postman_send_test_email.js b/Postman/Postman-Send-Test-Email/postman_send_test_email.js
index ab69d1ff..a0604ba3 100644
--- a/Postman/Postman-Send-Test-Email/postman_send_test_email.js
+++ b/Postman/Postman-Send-Test-Email/postman_send_test_email.js
@@ -14,12 +14,12 @@ jQuery(document).ready(
 								stepsOrientation : "vertical",
 								autoFocus : true,
 								labels : {
-									current : steps_current_step,
-									pagination : steps_pagination,
-									finish : steps_finish,
-									next : steps_next,
-									previous : steps_previous,
-									loading : steps_loading
+									current : post_smtp_localize.steps_current_step,
+									pagination : post_smtp_localize.steps_pagination,
+									finish : post_smtp_localize.steps_finish,
+									next : post_smtp_localize.steps_next,
+									previous : post_smtp_localize.steps_previous,
+									loading : post_smtp_localize.steps_loading
 								},
 								onStepChanging : function(event, currentIndex,
 										newIndex) {
diff --git a/Postman/Postman.php b/Postman/Postman.php
index e6700105..75c3edce 100644
--- a/Postman/Postman.php
+++ b/Postman/Postman.php
@@ -147,18 +147,6 @@ public function __construct( $rootPluginFilenameAndPath, $version ) {
 
         add_filter( 'extra_plugin_headers', [ $this, 'add_extension_headers' ] );
 
-		/**
-		 * @todo: WPML say they fix the issue in version 3.9
-		 * https://wordpress.org/support/topic/error-in-pluggable-php173/#post-10021301
-		 */
-		if ( get_option( 'icl_sitepress_version' ) && version_compare( get_option( 'icl_sitepress_version' ), '3.9', '<' ) ) {
-
-			$active_plugins = (array)get_option('active_plugins', array());
-			if (in_array('sitepress-multilingual-cms/sitepress.php', $active_plugins) && !get_option('postman_wpml_fixed')) {
-				add_action('admin_notices', array($this, 'post_smtp_wpml_admin_notice'));
-			}
-		}
-
 		// hook on the wp_loaded event
 		add_action( 'wp_loaded', array(
 				$this,
diff --git a/Postman/PostmanAdminController.php b/Postman/PostmanAdminController.php
index 964d9a84..b2877d09 100644
--- a/Postman/PostmanAdminController.php
+++ b/Postman/PostmanAdminController.php
@@ -301,7 +301,7 @@ public function postmanModifyLinksOnPluginsListPage( $links ) {
 			// only administrators should be able to trigger this
 			if ( PostmanUtils::isAdmin() ) {
 				$mylinks = array(
-                        sprintf( '<a href="%s" target="_blank" class="postman_settings">%s</a>', 'https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=yehudahas@gmail.com&item_name=Donation+for+PostSMTP', __( 'Donate', 'post-smtp' ) ),
+                        //sprintf( '<a href="%s" target="_blank" class="postman_settings">%s</a>', 'https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=yehudahas@gmail.com&item_name=Donation+for+PostSMTP', __( 'Donate', 'post-smtp' ) ),
 						sprintf( '<a href="%s" class="postman_settings">%s</a>', PostmanUtils::getSettingsPageUrl(), __( 'Settings', 'post-smtp' ) ),
 						sprintf( '<a href="%s" class="postman_settings">%s</a>', 'https://postmansmtp.com', __( 'Visit us', 'post-smtp' ) ),
 				);
diff --git a/Postman/PostmanViewController.php b/Postman/PostmanViewController.php
index a905ad9d..7cf070b7 100644
--- a/Postman/PostmanViewController.php
+++ b/Postman/PostmanViewController.php
@@ -169,13 +169,6 @@ public function registerStylesAndScripts() {
 					'bad_response' => __( 'An unexpected error occurred', 'post-smtp' ),
 					'corrupt_response' => __( 'Unexpected PHP messages corrupted the Ajax response', 'post-smtp' ),
 			) );
-
-			wp_localize_script( 'jquery_steps_script', 'steps_current_step', 'steps_current_step' );
-			wp_localize_script( 'jquery_steps_script', 'steps_pagination', 'steps_pagination' );
-			wp_localize_script( 'jquery_steps_script', 'steps_finish', _x( 'Finish', 'Press this button to Finish this task', 'post-smtp' ) );
-			wp_localize_script( 'jquery_steps_script', 'steps_next', _x( 'Next', 'Press this button to go to the next step', 'post-smtp' ) );
-			wp_localize_script( 'jquery_steps_script', 'steps_previous', _x( 'Previous', 'Press this button to go to the previous step', 'post-smtp' ) );
-			wp_localize_script( 'jquery_steps_script', 'steps_loading', 'steps_loading' );
 		}
 
 		/**
@@ -332,7 +325,7 @@ private function displayTopNavigation() {
 				</div>';
 			}
 
-            include_once POST_SMTP_PATH . '/Postman/extra/donation.php';
+            //include_once POST_SMTP_PATH . '/Postman/extra/donation.php';
 
             echo '<div class="twitter-wrap">';
 			    print '<div id="postman-main-menu" class="welcome-panel">';
diff --git a/postman-smtp.php b/postman-smtp.php
index 947eddea..7ef9f955 100644
--- a/postman-smtp.php
+++ b/postman-smtp.php
@@ -6,7 +6,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: 2.0.22
+ * Version: 2.0.23
  * Author: Yehuda Hassine
  * Text Domain: post-smtp
  * Author URI: https://postmansmtp.com
@@ -35,10 +35,10 @@
 define( 'POST_SMTP_BASE', __FILE__ );
 define( 'POST_SMTP_PATH', __DIR__ );
 define( 'POST_SMTP_URL', plugins_url('', POST_SMTP_BASE ) );
-define( 'POST_SMTP_VER', '2.0.22' );
+define( 'POST_SMTP_VER', '2.0.23' );
 define( 'POST_SMTP_SHOW_RELEASE_MESSAGE', true );
-define( 'POST_SMTP_RELEASE_MESSAGE', "*** IMPORTANT TO READ *** - Chrome Extension URL change." );
-define( 'POST_SMTP_RELEASE_URL', 'https://postmansmtp.com/chrome-extension-update/' );
+define( 'POST_SMTP_RELEASE_MESSAGE', "`WP_Scripts::localize called incorrectly` - Fixed" );
+define( 'POST_SMTP_RELEASE_URL', '#' );
 
 $postman_smtp_exist = in_array( 'postman-smtp/postman-smtp.php', (array) get_option( 'active_plugins', array() ) );
 $required_php_version = version_compare( PHP_VERSION, '5.6.0', '<' );
@@ -111,6 +111,10 @@ function post_dismiss_not_configured() {
 add_action( 'admin_footer', 'post_dismiss_not_configured' );
 
 function post_smtp_general_scripts() {
+    $localize = include( POST_SMTP_PATH . '/Postman/Localize.php' );
+    wp_register_script( 'post-smtp-localize', POST_SMTP_URL . '/script/localize.js', [], false );
+    wp_localize_script( 'post-smtp-localize', 'post_smtp_localize', $localize );
+    wp_enqueue_script( 'post-smtp-localize' );
     wp_enqueue_script( 'post-smtp-hooks', POST_SMTP_URL . '/script/post-smtp-hooks.js', [], false );
 }
 add_action( 'admin_enqueue_scripts', 'post_smtp_general_scripts', 8 );
diff --git a/readme.txt b/readme.txt
index 2625a554..119d7ba0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,9 @@
 === Post SMTP Mailer/Email Log ===
 Contributors: yehudah
-Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=yehudahas@gmail.com&item_name=Donation+for+PostSMTP
 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: 5.6
-Stable tag: 2.0.22
+Tested up to: 5.7.1
+Stable tag: 2.0.23
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -281,6 +280,9 @@ To avoid being flagged as spam, you need to prove your email isn't forged. On a
 
 == Changelog ==
 
+= 2.0.23 - 2021-04-22
+* Fixed: `WP_Scripts::localize called incorrectly` message.
+
 = 2.0.22 - 2021-02-14
 * Update: Chrome extension URL change
 * Fixed: Double save when extension save to option
diff --git a/script/localize.js b/script/localize.js
new file mode 100644
index 00000000..ba040510
--- /dev/null
+++ b/script/localize.js
@@ -0,0 +1,3 @@
+(function ($) {
+    console.log('Post SMTP localize loaded.');
+})(jQuery)
diff --git a/script/postman.js b/script/postman.js
index 53c6927c..b2a8e3a3 100644
--- a/script/postman.js
+++ b/script/postman.js
@@ -110,7 +110,7 @@ function handleConfigurationResponse(response) {
 	if (response.display_auth == 'oauth2') {
 		show('p#wizard_oauth2_help');
 		jQuery('p#wizard_oauth2_help').html(response.help_text);
-		jQuery(postman_redirect_url_el).val(response.redirect_url);
+		jQuery(post_smtp_localize.postman_redirect_url_el).val(response.redirect_url);
 		jQuery('#input_oauth_callback_domain').val(response.callback_domain);
 		jQuery('#client_id').html(response.client_id_label);
 		jQuery('#client_secret').html(response.client_secret_label);
diff --git a/script/postman_resend_email_sript.js b/script/postman_resend_email_sript.js
index c6d218a7..d41c2b0e 100644
--- a/script/postman_resend_email_sript.js
+++ b/script/postman_resend_email_sript.js
@@ -30,9 +30,9 @@ jQuery(document).ready(function($) {
 		jQuery.post(ajaxurl, data, function(response) {
 			if (response.success) {
 				alert(response.data.message);
-	//			jQuery('span#resend-' + emailId).text(postman_js_resend_label);
+	//			jQuery('span#resend-' + emailId).text(post_smtp_localize.postman_js_resend_label);
 			} else {
-				alert(sprintf(postman_js_email_not_resent, response.data.message));
+				alert(sprintf(post_smtp_localize.postman_js_email_not_resent, response.data.message));
 			}
 		}).fail(function(response) {
 			ajaxFailed(response);