From dbe0a04f711ad129499a572ec76dd355ecc18210 Mon Sep 17 00:00:00 2001
From: Pablo Pacheco <pablo.sg.pacheco@gmail.com>
Date: Tue, 9 Jan 2024 16:13:11 -0300
Subject: [PATCH] v2.6.5

---
 email-verification-for-woocommerce.php        |   8 +-
 includes/alg-wc-ev-functions.php              |  21 +-
 includes/class-alg-wc-ev-core.php             |  22 +-
 includes/class-alg-wc-ev-emails.php           |  12 +-
 .../class-alg-wc-ev-settings-email.php        |  13 +-
 langs/emails-verification-for-woocommerce.pot | 213 +++++++++---------
 readme.txt                                    |   8 +-
 7 files changed, 177 insertions(+), 120 deletions(-)

diff --git a/email-verification-for-woocommerce.php b/email-verification-for-woocommerce.php
index 0ae8322..77f2edd 100644
--- a/email-verification-for-woocommerce.php
+++ b/email-verification-for-woocommerce.php
@@ -3,13 +3,13 @@
 Plugin Name: Email Verification for WooCommerce
 Plugin URI: https://wpfactory.com/item/email-verification-for-woocommerce/
 Description: Verify user emails in WooCommerce. Beautifully.
-Version: 2.6.3
+Version: 2.6.5
 Author: WPFactory
 Author URI: https://wpfactory.com
 Text Domain: emails-verification-for-woocommerce
 Domain Path: /langs
-Copyright: © 2023 WPFactory
-WC tested up to: 8.3
+Copyright: © 2024 WPFactory
+WC tested up to: 8.4
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */
@@ -62,7 +62,7 @@ final class Alg_WC_Email_Verification {
 	 * @var   string
 	 * @since 1.0.0
 	 */
-	public $version = '2.6.3';
+	public $version = '2.6.5';
 
 	/**
 	 * @var   Alg_WC_Email_Verification The single instance of the class
diff --git a/includes/alg-wc-ev-functions.php b/includes/alg-wc-ev-functions.php
index 9a5d41f..5c16d74 100644
--- a/includes/alg-wc-ev-functions.php
+++ b/includes/alg-wc-ev-functions.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Functions.
  *
- * @version 2.6.0
+ * @version 2.6.5
  * @since   1.9.0
  * @author  WPFactory
  */
@@ -179,6 +179,25 @@ function alg_wc_ev_get_user_placeholders( $args ) {
 	}
 }
 
+if ( ! function_exists( 'alg_wc_ev_get_common_placeholders' ) ) {
+	/**
+	 * alg_wc_ev_get_common_placeholders.
+	 *
+	 * @version 2.6.5
+	 * @since   2.6.5
+	 *
+	 * @return array
+	 */
+	function alg_wc_ev_get_common_placeholders() {
+		$placeholders = array(
+			'%site_title%' => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
+			'%site_url%'   => wp_parse_url( home_url(), PHP_URL_HOST )
+		);
+
+		return apply_filters( 'alg_wc_ev_common_placeholders', $placeholders );
+	}
+}
+
 if ( ! function_exists( 'alg_wc_ev_get_default_session_start_params' ) ) {
 	/**
 	 * alg_wc_ev_get_session_start_default_params.
diff --git a/includes/class-alg-wc-ev-core.php b/includes/class-alg-wc-ev-core.php
index 9805c65..f9d0266 100644
--- a/includes/class-alg-wc-ev-core.php
+++ b/includes/class-alg-wc-ev-core.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Core Class.
  *
- * @version 2.6.2
+ * @version 2.6.4
  * @since   1.0.0
  * @author  WPFactory
  */
@@ -1134,7 +1134,7 @@ function get_default_hashids_salt_opt() {
 		/**
 		 * add_this_script_footer.
 		 *
-		 * @version 2.6.0
+		 * @version 2.6.4
 		 * @since   2.5.8
 		 *
 		 * @return string
@@ -1144,6 +1144,7 @@ function add_this_script_footer() {
             <script>
                 jQuery(function ($) {
                     var billing_email_input = $('input[name="billing_email"]');
+					
 
 					<?php
 					if ( is_checkout() && ! is_wc_endpoint_url() ) {
@@ -1170,12 +1171,21 @@ function add_this_script_footer() {
 
                     var current_billing_email = billing_email_input.val();
                     var billing_email_paragraph = $('p[id="billing_email_field"]');
-                    billing_email_paragraph.append('<div id="alg_wc_ev_activation_guest_verify"></div>');
+					billing_email_paragraph.append('<div id="alg_wc_ev_activation_guest_verify"></div>');
+					
                     var guest_email_verify_text = $('div[id="alg_wc_ev_activation_guest_verify"]');
+					
+					
                     var resend_email_verify = $('a[id="alg_wc_ev_resend_verify"]');
                     send_alg_wc_ev_guest_verification_email("new", current_billing_email);
                     billing_email_input.on('input change paste keyup blur', function () {
-                        send_alg_wc_ev_guest_verification_email("new", $(this).val());
+                        // send_alg_wc_ev_guest_verification_email("new", $(this).val());
+						guest_email_verify_text.html('');
+						var regexo = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+                        var isValido = regexo.test($(this).val());
+                        if (isValido) {
+							guest_email_verify_text.html('<a href="javascript:;" id="alg_wc_ev_send_verify">Send Verify Email</a>');
+						}
                     });
 
 
@@ -1221,6 +1231,10 @@ function send_alg_wc_ev_guest_verification_email(send, email) {
 
                     $("body").on("click", "#alg_wc_ev_resend_verify", function () {
                         send_alg_wc_ev_guest_verification_email("resend", $('input[name="billing_email"]').val());
+                    });
+					
+					$("body").on("click", "#alg_wc_ev_send_verify", function () {
+                        send_alg_wc_ev_guest_verification_email("new", $('input[name="billing_email"]').val());
                     });
                 });
             </script>
diff --git a/includes/class-alg-wc-ev-emails.php b/includes/class-alg-wc-ev-emails.php
index 35373c2..ae6c13a 100644
--- a/includes/class-alg-wc-ev-emails.php
+++ b/includes/class-alg-wc-ev-emails.php
@@ -249,7 +249,7 @@ function get_verification_url( $args = null, $checkout = false ) {
 	/**
 	 * get_email_subject.
 	 *
-	 * @version 2.3.1
+	 * @version 2.6.5
 	 * @since   2.3.1
 	 */
 	function get_email_subject( $args ) {
@@ -257,7 +257,7 @@ function get_email_subject( $args ) {
 			'user_id'      => '',
 			'subject'      => '',
 			'context'      => 'activation_email_separate',
-			'placeholders' => array()
+			'placeholders' => alg_wc_ev_get_common_placeholders()
 		) );
 		$user_id      = $args['user_id'];
 		$placeholders = array_merge( $args['placeholders'], alg_wc_ev_get_user_placeholders( array( 'user_id' => $user_id ) ) );
@@ -268,7 +268,7 @@ function get_email_subject( $args ) {
 	/**
 	 * get_email_content.
 	 *
-	 * @version 2.4.0
+	 * @version 2.6.5
 	 * @since   1.8.0
 	 * @todo    (maybe) `$user->user_url`, `$user->user_registered`
 	 *
@@ -283,7 +283,7 @@ function get_email_content( $args = null ) {
 			'content' => __( '<p>Please <a href="%verification_url%" target="_blank">click here</a> to verify your email.</p>', 'emails-verification-for-woocommerce' ),
 			'heading' => __( 'Activate your account', 'emails-verification-for-woocommerce' ),
 			'context' => 'activation_email_separate',
-			'placeholders' => array()
+			'placeholders' => alg_wc_ev_get_common_placeholders()
 		) );
 		$user_id = $args['user_id'];
 		$code = $args['code'];
@@ -497,8 +497,8 @@ function send_mail( $to, $subject, $message ) {
 		 * `wc_mail( $to, $subject, $message, $headers = "Content-Type: text/html\r\n", $attachments = '' )`
 		 * `wp_mail( string|array $to, string $subject, string $message, string|array $headers = '', string|array $attachments = array() )`
 		 */
-		$func    = get_option( 'alg_wc_ev_mail_function', 'wc_mail' );
-		$message = apply_filters( 'alg_wc_ev_send_mail_message', $message, $func );
+		$func                 = get_option( 'alg_wc_ev_mail_function', 'wc_mail' );
+		$message              = apply_filters( 'alg_wc_ev_send_mail_message', $message, $func );
 		$res     = $func( $to, $subject, $message, "Content-Type: text/html\r\n" );
 		if ( ! $res ) {
 			$error_message  = __( 'Error sending mail.', 'emails-verification-for-woocommerce' );
diff --git a/includes/settings/class-alg-wc-ev-settings-email.php b/includes/settings/class-alg-wc-ev-settings-email.php
index d8530f4..ff66a3d 100644
--- a/includes/settings/class-alg-wc-ev-settings-email.php
+++ b/includes/settings/class-alg-wc-ev-settings-email.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Email Section Settings.
  *
- * @version 2.4.8
+ * @version 2.6.5
  * @since   1.3.0
  * @author  WPFactory
  */
@@ -35,6 +35,8 @@ function __construct() {
 	 */
 	function get_default_email_placeholders(){
 		return array(
+			'%site_title%',
+			'%site_url%',
 			'%user_id%',
 			'%user_login%',
 			'%user_nicename%',
@@ -52,7 +54,7 @@ function get_default_email_placeholders(){
 	/**
 	 * get_settings.
 	 *
-	 * @version 2.4.8
+	 * @version 2.6.5
 	 * @since   1.3.0
 	 */
 	function get_settings() {
@@ -180,6 +182,8 @@ function get_settings() {
 			array(
 				'title'             => __( 'Email content', 'emails-verification-for-woocommerce' ),
 				'desc'              => sprintf( __( 'Placeholders: %s', 'emails-verification-for-woocommerce' ), '<code>' . implode( '</code>, <code>', array(
+						'%site_title%',
+						'%site_url%',
 						'%verification_url%',
 						'%user_id%',
 						'%user_first_name%',
@@ -189,6 +193,7 @@ function get_settings() {
 						'%user_email%',
 						'%user_display_name%',
 					) ) . '</code>' ),
+				'desc_tip'          => sprintf( __( 'If you\'re having deliverability problems or emails being sent to Spam, please try using the placeholders %s and %s on the Email Content or subject.', 'emails-verification-for-woocommerce' ), '<code>%site_title%</code>','<code>%site_url%</code>'),
 				'type'              => 'textarea',
 				'id'                => 'alg_wc_ev_email_content',
 				'default'           => __( '<p>Please <a href="%verification_url%" target="_blank">click here</a> to verify your email.</p>', 'emails-verification-for-woocommerce' ),
@@ -265,6 +270,8 @@ function get_settings() {
 			array(
 				'title'             => __( 'Email content', 'emails-verification-for-woocommerce' ),
 				'desc'              => sprintf( __( 'Placeholders: %s', 'emails-verification-for-woocommerce' ), '<code>' . implode( '</code>, <code>', array(
+						'%site_title%',
+						'%site_url%',
 						'%user_id%',
 						'%user_first_name%',
 						'%user_last_name%',
@@ -273,6 +280,7 @@ function get_settings() {
 						'%user_email%',
 						'%user_display_name%',
 					) ) . '</code>' ),
+				'desc_tip'          => sprintf( __( 'If you\'re having deliverability problems or emails being sent to Spam, please try using the placeholders %s and %s on the Email Content or subject.', 'emails-verification-for-woocommerce' ), '<code>%site_title%</code>','<code>%site_url%</code>'),
 				'type'              => 'textarea',
 				'id'                => 'alg_wc_ev_confirmation_email_content',
 				'default'           => __( '<p>Your account has been activated successfully.</p>', 'emails-verification-for-woocommerce' ),
@@ -363,6 +371,7 @@ function get_settings() {
 			array(
 				'title'         => __( 'Content', 'emails-verification-for-woocommerce' ),
 				'desc'          => $this->available_placeholders_desc( $this->get_default_email_placeholders() ),
+				'desc_tip'          => sprintf( __( 'If you\'re having deliverability problems or emails being sent to Spam, please try using the placeholders %s and %s on the Email Content content or subject.', 'emails-verification-for-woocommerce' ), '<code>%site_title%</code>','<code>%site_url%</code>'),
 				'type'          => 'textarea',
 				'id'            => 'alg_wc_ev_admin_email_content',
 				'default'       => sprintf( __( 'User %s has just verified his email (%s).', 'emails-verification-for-woocommerce' ),
diff --git a/langs/emails-verification-for-woocommerce.pot b/langs/emails-verification-for-woocommerce.pot
index 70c7f09..c7c612d 100644
--- a/langs/emails-verification-for-woocommerce.pot
+++ b/langs/emails-verification-for-woocommerce.pot
@@ -1,15 +1,15 @@
-# Copyright (C) 2023 WPFactory
+# Copyright (C) 2024 WPFactory
 # This file is distributed under the GNU General Public License v3.0.
 msgid ""
 msgstr ""
-"Project-Id-Version: emails-verification-for-woocommerce 2.6.3\n"
+"Project-Id-Version: emails-verification-for-woocommerce 2.6.5\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/emails-verification-for-woocommerce\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-12-05T20:55:01+01:00\n"
+"POT-Creation-Date: 2024-01-09T20:12:17+01:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.7.1\n"
 "X-Domain: emails-verification-for-woocommerce\n"
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Go Pro"
 msgstr ""
 
-#: includes/alg-wc-ev-functions.php:225
+#: includes/alg-wc-ev-functions.php:244
 msgid "When the task is complete an email is going to be sent to %s."
 msgstr ""
 
@@ -222,21 +222,21 @@ msgstr ""
 #: includes/class-alg-wc-ev-emails.php:80
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:164
 #: includes/pro/class-alg-wc-ev-pro.php:121
-#: includes/settings/class-alg-wc-ev-settings-email.php:250
+#: includes/settings/class-alg-wc-ev-settings-email.php:255
 msgid "Your account has been activated successfully"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:75
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:176
 #: includes/pro/class-alg-wc-ev-pro.php:108
-#: includes/settings/class-alg-wc-ev-settings-email.php:260
+#: includes/settings/class-alg-wc-ev-settings-email.php:265
 msgid "Your account has been activated"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:283
 #: includes/class-alg-wc-ev-emails.php:547
 #: includes/pro/class-alg-wc-ev-pro.php:804
-#: includes/settings/class-alg-wc-ev-settings-email.php:194
+#: includes/settings/class-alg-wc-ev-settings-email.php:199
 msgid "<p>Please <a href=\"%verification_url%\" target=\"_blank\">click here</a> to verify your email.</p>"
 msgstr ""
 
@@ -245,14 +245,14 @@ msgstr ""
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:196
 #: includes/pro/class-alg-wc-ev-pro.php:634
 #: includes/pro/class-alg-wc-ev-pro.php:822
-#: includes/settings/class-alg-wc-ev-settings-email.php:204
+#: includes/settings/class-alg-wc-ev-settings-email.php:209
 msgid "Activate your account"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:383
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:157
 #: includes/pro/class-alg-wc-ev-pro.php:791
-#: includes/settings/class-alg-wc-ev-settings-email.php:175
+#: includes/settings/class-alg-wc-ev-settings-email.php:177
 msgid "Please activate your account"
 msgstr ""
 
@@ -339,24 +339,24 @@ msgstr ""
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:32
 #: includes/pro/class-alg-wc-ev-compatibility-pro.php:300
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:253
-#: includes/settings/class-alg-wc-ev-settings-email.php:135
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
 msgid "Activation email"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:33
-#: includes/settings/class-alg-wc-ev-settings-email.php:138
+#: includes/settings/class-alg-wc-ev-settings-email.php:140
 msgid "An email sent to the user with an activation link."
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-compatibility-pro.php:301
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:31
-#: includes/settings/class-alg-wc-ev-settings-email.php:225
-#: includes/settings/class-alg-wc-ev-settings-email.php:231
+#: includes/settings/class-alg-wc-ev-settings-email.php:230
+#: includes/settings/class-alg-wc-ev-settings-email.php:236
 msgid "Confirmation email"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:32
-#: includes/settings/class-alg-wc-ev-settings-email.php:228
+#: includes/settings/class-alg-wc-ev-settings-email.php:233
 msgid "An email sent to the user when the account is verified."
 msgstr ""
 
@@ -390,17 +390,17 @@ msgid "You need to <a href=\"%myaccount_url%\" target=\"_blank\">register</a> an
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-pro.php:770
-#: includes/settings/class-alg-wc-ev-settings-email.php:359
+#: includes/settings/class-alg-wc-ev-settings-email.php:367
 msgid "User account has been activated"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-pro.php:771
-#: includes/settings/class-alg-wc-ev-settings-email.php:368
+#: includes/settings/class-alg-wc-ev-settings-email.php:377
 msgid "User %s has just verified his email (%s)."
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-pro.php:776
-#: includes/settings/class-alg-wc-ev-settings-email.php:351
+#: includes/settings/class-alg-wc-ev-settings-email.php:359
 msgid "User email has been verified"
 msgstr ""
 
@@ -460,8 +460,8 @@ msgstr ""
 #: includes/settings/class-alg-wc-ev-settings-admin.php:82
 #: includes/settings/class-alg-wc-ev-settings-admin.php:88
 #: includes/settings/class-alg-wc-ev-settings-admin.php:103
-#: includes/settings/class-alg-wc-ev-settings-email.php:240
-#: includes/settings/class-alg-wc-ev-settings-email.php:332
+#: includes/settings/class-alg-wc-ev-settings-email.php:245
+#: includes/settings/class-alg-wc-ev-settings-email.php:340
 msgid "Verified column"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgid "The position of the column."
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-admin.php:102
-#: includes/settings/class-alg-wc-ev-settings-email.php:240
-#: includes/settings/class-alg-wc-ev-settings-email.php:332
+#: includes/settings/class-alg-wc-ev-settings-email.php:245
+#: includes/settings/class-alg-wc-ev-settings-email.php:340
 msgid "Actions"
 msgstr ""
 
@@ -737,8 +737,8 @@ msgid "Change this if you are having issues with \"Prevent automatic user login
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:232
-#: includes/settings/class-alg-wc-ev-settings-email.php:68
-#: includes/settings/class-alg-wc-ev-settings-email.php:150
+#: includes/settings/class-alg-wc-ev-settings-email.php:70
+#: includes/settings/class-alg-wc-ev-settings-email.php:152
 msgid "Leave the default value if unsure."
 msgstr ""
 
@@ -1270,8 +1270,8 @@ msgstr ""
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:115
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:160
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:267
-#: includes/settings/class-alg-wc-ev-settings-email.php:90
-#: includes/settings/class-alg-wc-ev-settings-email.php:97
+#: includes/settings/class-alg-wc-ev-settings-email.php:92
+#: includes/settings/class-alg-wc-ev-settings-email.php:99
 #: includes/settings/class-alg-wc-ev-settings-general.php:58
 msgid "Plain"
 msgstr ""
@@ -1365,12 +1365,12 @@ msgid "In order to enable the %s and %s email types, it's necessary to set the o
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:193
-#: includes/settings/class-alg-wc-ev-settings-email.php:106
+#: includes/settings/class-alg-wc-ev-settings-email.php:108
 msgid "Activation"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:193
-#: includes/settings/class-alg-wc-ev-settings-email.php:106
+#: includes/settings/class-alg-wc-ev-settings-email.php:108
 msgid "Confirmation"
 msgstr ""
 
@@ -1379,8 +1379,8 @@ msgid "Email > WC email template"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:193
-#: includes/settings/class-alg-wc-ev-settings-email.php:106
-#: includes/settings/class-alg-wc-ev-settings-email.php:114
+#: includes/settings/class-alg-wc-ev-settings-email.php:108
+#: includes/settings/class-alg-wc-ev-settings-email.php:116
 msgid "WooCommerce > Emails"
 msgstr ""
 
@@ -1438,7 +1438,7 @@ msgid "YayMail - WooCommerce Email Customizer"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:264
-#: includes/settings/class-alg-wc-ev-settings-email.php:80
+#: includes/settings/class-alg-wc-ev-settings-email.php:82
 msgid "Customer new account email"
 msgstr ""
 
@@ -1476,249 +1476,258 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:61
+#: includes/settings/class-alg-wc-ev-settings-email.php:63
 msgid "Email options"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
+#: includes/settings/class-alg-wc-ev-settings-email.php:68
 msgid "Mail function"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:67
+#: includes/settings/class-alg-wc-ev-settings-email.php:69
 msgid "Function used for sending the plugin's emails."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:74
-#: includes/settings/class-alg-wc-ev-settings-email.php:75
 #: includes/settings/class-alg-wc-ev-settings-email.php:76
+#: includes/settings/class-alg-wc-ev-settings-email.php:77
+#: includes/settings/class-alg-wc-ev-settings-email.php:78
 msgid "%s function"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:81
+#: includes/settings/class-alg-wc-ev-settings-email.php:83
 msgid "Delay WooCommerce \"Customer new account\" email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:84
 msgid "\"Customer new account\" email is only sent on successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:89
-#: includes/settings/class-alg-wc-ev-settings-email.php:119
-#: includes/settings/class-alg-wc-ev-settings-email.php:200
+#: includes/settings/class-alg-wc-ev-settings-email.php:91
+#: includes/settings/class-alg-wc-ev-settings-email.php:121
+#: includes/settings/class-alg-wc-ev-settings-email.php:205
 msgid "Email template"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:90
+#: includes/settings/class-alg-wc-ev-settings-email.php:92
 msgid "Possible values: %s, %s, %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:90
-#: includes/settings/class-alg-wc-ev-settings-email.php:98
-#: includes/settings/class-alg-wc-ev-settings-email.php:119
-#: includes/settings/class-alg-wc-ev-settings-email.php:200
+#: includes/settings/class-alg-wc-ev-settings-email.php:92
+#: includes/settings/class-alg-wc-ev-settings-email.php:100
+#: includes/settings/class-alg-wc-ev-settings-email.php:121
+#: includes/settings/class-alg-wc-ev-settings-email.php:205
 msgid "WooCommerce"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:90
-#: includes/settings/class-alg-wc-ev-settings-email.php:99
-#: includes/settings/class-alg-wc-ev-settings-email.php:119
-#: includes/settings/class-alg-wc-ev-settings-email.php:200
+#: includes/settings/class-alg-wc-ev-settings-email.php:92
+#: includes/settings/class-alg-wc-ev-settings-email.php:101
+#: includes/settings/class-alg-wc-ev-settings-email.php:121
+#: includes/settings/class-alg-wc-ev-settings-email.php:205
 msgid "Smart"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:91
+#: includes/settings/class-alg-wc-ev-settings-email.php:93
 msgid "\"Smart\" will automatically send a \"Plain\" email when appended to other email, like the \"Customer new account\" email, and will send a \"WooCommerce\" email when sending it as a separate email. Most probably \"Smart\" will be the best choice."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:104
+#: includes/settings/class-alg-wc-ev-settings-email.php:106
 msgid "WC email template"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:105
+#: includes/settings/class-alg-wc-ev-settings-email.php:107
 msgid "%s will use the template options from this page."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:105
-#: includes/settings/class-alg-wc-ev-settings-email.php:113
+#: includes/settings/class-alg-wc-ev-settings-email.php:107
+#: includes/settings/class-alg-wc-ev-settings-email.php:115
 msgid "Email Verification plugin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:106
+#: includes/settings/class-alg-wc-ev-settings-email.php:108
 msgid "%s option will create new emails (%s) on %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:107
+#: includes/settings/class-alg-wc-ev-settings-email.php:109
 msgid "This option will only be useful if the Email Template option is set as <code>WooCommerce</code> or <code>Smart</code>."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:118
+#: includes/settings/class-alg-wc-ev-settings-email.php:120
 msgid "Email wrap method"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:119
-#: includes/settings/class-alg-wc-ev-settings-email.php:200
+#: includes/settings/class-alg-wc-ev-settings-email.php:121
+#: includes/settings/class-alg-wc-ev-settings-email.php:205
 msgid "If \"%s\" option is selected as \"%s\" or \"%s\", set the email wrap method here."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:124
+#: includes/settings/class-alg-wc-ev-settings-email.php:126
 msgid "Manual - Adding WooCommerce header and footer manually"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:125
+#: includes/settings/class-alg-wc-ev-settings-email.php:127
 msgid "Native - Using %s function"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:141
+#: includes/settings/class-alg-wc-ev-settings-email.php:143
 #: includes/settings/class-alg-wc-ev-settings-section.php:104
 msgid "Send as a separate email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:142
+#: includes/settings/class-alg-wc-ev-settings-email.php:144
 msgid "Send verification as a separate email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:143
+#: includes/settings/class-alg-wc-ev-settings-email.php:145
 msgid "Disable it if you want to append it to the standard WooCommerce \"Customer new account\" email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:149
+#: includes/settings/class-alg-wc-ev-settings-email.php:151
 msgid "Email sending trigger"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:159
 msgid "On \"user register\""
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:158
+#: includes/settings/class-alg-wc-ev-settings-email.php:160
 msgid "On \"WooCommerce created customer\""
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:163
+#: includes/settings/class-alg-wc-ev-settings-email.php:165
 msgid "Activation email delay"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:164
+#: includes/settings/class-alg-wc-ev-settings-email.php:166
 msgid "Delay the activation email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:165
+#: includes/settings/class-alg-wc-ev-settings-email.php:167
 msgid "Try to enable it if the activation emails are getting sent to authenticated users."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:172
-#: includes/settings/class-alg-wc-ev-settings-email.php:247
+#: includes/settings/class-alg-wc-ev-settings-email.php:174
+#: includes/settings/class-alg-wc-ev-settings-email.php:252
 msgid "Email subject"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:181
-#: includes/settings/class-alg-wc-ev-settings-email.php:266
+#: includes/settings/class-alg-wc-ev-settings-email.php:183
+#: includes/settings/class-alg-wc-ev-settings-email.php:271
 msgid "Email content"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:182
-#: includes/settings/class-alg-wc-ev-settings-email.php:267
+#: includes/settings/class-alg-wc-ev-settings-email.php:184
+#: includes/settings/class-alg-wc-ev-settings-email.php:272
 msgid "Placeholders: %s"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:201
+#: includes/settings/class-alg-wc-ev-settings-email.php:196
+#: includes/settings/class-alg-wc-ev-settings-email.php:283
+msgid "If you're having deliverability problems or emails being sent to Spam, please try using the placeholders %s and %s on the Email Content or subject."
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:206
 msgid "Email heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:210
+#: includes/settings/class-alg-wc-ev-settings-email.php:215
 msgid "Fine tune placement"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:211
+#: includes/settings/class-alg-wc-ev-settings-email.php:216
 msgid "Choose precisely where the activation email will be appended to the \"Customer new account\" email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:212
+#: includes/settings/class-alg-wc-ev-settings-email.php:217
 msgid "It's necessary to add %s to the %s email template."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:232
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
 msgid "Send confirmation email to users who have just verified their accounts"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:239
+#: includes/settings/class-alg-wc-ev-settings-email.php:244
 msgid "Send confirmation email to the user manually verified by admin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:240
-#: includes/settings/class-alg-wc-ev-settings-email.php:332
+#: includes/settings/class-alg-wc-ev-settings-email.php:245
+#: includes/settings/class-alg-wc-ev-settings-email.php:340
 msgid "Only useful if the options %s, %s are enabled."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:256
+#: includes/settings/class-alg-wc-ev-settings-email.php:261
 msgid "Email Heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:278
+#: includes/settings/class-alg-wc-ev-settings-email.php:286
 msgid "<p>Your account has been activated successfully.</p>"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:284
+#: includes/settings/class-alg-wc-ev-settings-email.php:292
 msgid "Delay"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:285
+#: includes/settings/class-alg-wc-ev-settings-email.php:293
 msgid "Wait for some time before sending the email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:291
+#: includes/settings/class-alg-wc-ev-settings-email.php:299
 msgid "Unit of time."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:297
+#: includes/settings/class-alg-wc-ev-settings-email.php:305
 msgid "Hours"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:298
+#: includes/settings/class-alg-wc-ev-settings-email.php:306
 #: includes/settings/class-alg-wc-ev-settings-general.php:273
 msgid "Days"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:302
+#: includes/settings/class-alg-wc-ev-settings-email.php:310
 msgid "Delay value."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:315
-#: includes/settings/class-alg-wc-ev-settings-email.php:321
+#: includes/settings/class-alg-wc-ev-settings-email.php:323
+#: includes/settings/class-alg-wc-ev-settings-email.php:329
 msgid "Admin email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:317
+#: includes/settings/class-alg-wc-ev-settings-email.php:325
 msgid "An email sent to the admin when a user verifies his email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:323
+#: includes/settings/class-alg-wc-ev-settings-email.php:331
 msgid "Send email to the admin when a user verifies his email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:331
+#: includes/settings/class-alg-wc-ev-settings-email.php:339
 msgid "Send admin email when a user has been manually verified by admin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:339
+#: includes/settings/class-alg-wc-ev-settings-email.php:347
 msgid "Recipient"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:340
+#: includes/settings/class-alg-wc-ev-settings-email.php:348
 msgid "Leave empty to send to %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:347
+#: includes/settings/class-alg-wc-ev-settings-email.php:355
 msgid "Subject"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:355
+#: includes/settings/class-alg-wc-ev-settings-email.php:363
 msgid "Heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:364
+#: includes/settings/class-alg-wc-ev-settings-email.php:372
 msgid "Content"
 msgstr ""
 
+#: includes/settings/class-alg-wc-ev-settings-email.php:374
+msgid "If you're having deliverability problems or emails being sent to Spam, please try using the placeholders %s and %s on the Email Content content or subject."
+msgstr ""
+
 #: includes/settings/class-alg-wc-ev-settings-general.php:24
 msgid "General"
 msgstr ""
diff --git a/readme.txt b/readme.txt
index efe538b..e548070 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: wpcodefactory, omardabbas, karzin, anbinder, algoritmika, kousikmu
 Tags: woocommerce, email, verification, email verification, woo commerce
 Requires at least: 4.4
 Tested up to: 6.4
-Stable tag: 2.6.3
+Stable tag: 2.6.5
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -206,6 +206,12 @@ Params for the `[alg_wc_ev_email_content_placeholder]` shortcode:
 
 == Changelog ==
 
+= 2.6.5 - 09/01/2024 =
+* Dev - Email - Add `%site_title%` and `%site_url%` placeholders to emails. This should help with deliverability problems and emails sent to Spam.
+
+= 2.6.4 - 03/01/2024 =
+* Fix - Guest verification email change to do action on click "Send Mail" link.
+
 = 2.6.3 - 05/12/2023 =
 * Fix - When the option "WC email template" is set to "WooCommerce > Emails", the activation and confirmation emails can't have their content changed via settings.
 * WC tested up to: 8.3.