Remove Username from Emails

hide the username in emails which include a password or password reset link (like password reset or new account mail -> if password is to be generated automatically). This is an advise from Trusted Shops. Can be turned off in GZD email settings.

includes/admin/settings/class-wc-gzd-settings-germanized.php

@@ -628,6 +628,15 @@ public function get_email_settings() {
 
 		$settings = array_merge( $settings, array(
 
+			array(
+				'title' 	=> __( 'Hide Username', 'woocommerce-germanized' ),
+				'desc' 		=> __( 'Hide username from email content if password or password reset link is embedded.', 'woocommerce-germanized' ),
+				'desc_tip'  => __( 'Trusted Shops advises to not show the username together with an account password or password reset link. This option hides (or masks) the username in those specific cases.', 'woocommerce-germanized' ),
+				'id' 		=> 'woocommerce_gzd_hide_username_with_password',
+				'default'	=> 'yes',
+				'type' 		=> 'checkbox',
+			),
+
 			array( 'type' => 'sectionend', 'id' => 'email_options' ),
 
 			array(	'title' => __( 'Email Attachment Options', 'woocommerce-germanized' ), 'type' => 'title', 'id' => 'email_attachment_options', 'desc' => '<div class="notice inline notice-warning"><p>' . sprintf( __( 'Want to attach automatically generated PDF files to emails instead of plain text? %sUpgrade to %spro%s%s', 'woocommerce-germanized' ), '<a style="margin-left: 1em" href="https://vendidero.de/woocommerce-germanized" class="button">', '<span class="wc-gzd-pro">', '</span>', '</a>' ) . '</p></div>' ),

includes/class-wc-gzd-emails.php

@@ -38,14 +38,57 @@ public function __construct() {
 
         // Change email template path if is germanized email template
 		add_filter( 'woocommerce_template_directory', array( $this, 'set_woocommerce_template_dir' ), 10, 2 );
-
 		// Map partially refunded order mail template to correct email instance
         add_filter( 'woocommerce_gzd_email_template_id_comparison', array( $this, 'check_for_partial_refund_mail' ), 10, 3 );
+        // Hide username if an email contains a password or password reset link (TS advises to do so)
+        if ( 'yes' === get_option( 'woocommerce_gzd_hide_username_with_password' ) )
+            add_filter( 'woocommerce_before_template_part', array( $this, 'maybe_set_gettext_username_filter' ), 10, 4 );
 
         if ( is_admin() )
 		    $this->admin_hooks();
 	}
 
+	public function maybe_set_gettext_username_filter( $template_name, $template_path, $located, $args ) {
+
+		$templates = array(
+			'emails/customer-reset-password.php' => 'maybe_hide_username_password_reset',
+			'emails/plain/customer-reset-password.php' => 'maybe_hide_username_password_reset',
+		);
+
+		// If the password is generated automatically and sent by email, hide the username
+		if ( 'yes' === get_option( 'woocommerce_registration_generate_password' ) ) {
+			$templates = array_merge( $templates, array(
+				'emails/customer-new-account.php' => 'maybe_hide_username_new_account',
+				'emails/plain/customer-new-account.php' => 'maybe_hide_username_new_account'
+			) );
+		}
+
+		if ( isset( $templates[ $template_name ] ) ) {
+			add_filter( 'gettext', array( $this, $templates[ $template_name ] ), 10, 3 );
+		}
+	}
+
+	public function maybe_hide_username_password_reset( $translated, $original, $domain ) {
+		if ( 'woocommerce' === $domain ) {
+			if ( 'Someone requested that the password be reset for the following account:' === $original ) {
+				return __( 'Someone requested a password reset for your account.', 'woocommerce-germanized' );
+			} else if ( 'Username: %s' === $original ) {
+				remove_filter( 'gettext', array( $this, 'maybe_hide_username_password_reset' ), 10, 3 );
+				return '';
+			}
+		}
+
+		return $translated;
+	}
+
+	public function maybe_hide_username_new_account( $translated, $original, $domain ) {
+		if ( 'woocommerce' === $domain && 'Thanks for creating an account on %s. Your username is <strong>%s</strong>' === $original ) {
+			remove_filter( 'gettext', array( $this, 'maybe_hide_username_new_account' ), 10, 3 );
+			return __( 'Thanks for creating an account on %s.', 'woocommerce-germanized' );
+		}
+		return $translated;
+	}
+
 	public function check_for_partial_refund_mail( $result, $mail_id, $tpl ) {
 
 		if ( $mail_id === 'customer_partially_refunded_order' && $tpl === 'customer_refunded_order' )

readme.txt

@@ -171,6 +171,7 @@ Bug reports may be filed via our [GitHub repository](https://github.com/vendider
 * Fix - Small Business VAT total tax removal (as Trusted Shops advised)
 * Fix - FontAwesome Update to latest version
 * Fix - Use frontend options filter for admin billing_title field
+* Fix - By default remove username from password reset, new account mail if password or reset link is included (Trusted Shops advised)
 
 = 1.8.6 =
 * Fix - plugin_locale filter in WC_GZD_Install

templates/emails/customer-new-account-activation.php

@@ -15,7 +15,7 @@
 
 <?php do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
-<p><?php printf( __( "Thanks for creating an account on %s. Your username is %s. Please follow the activation link to activate your account:", 'woocommerce-germanized' ), esc_html( $blogname ), '<strong>' . esc_html( $user_login ) . '</strong>' ); ?></p>
+<p><?php printf( __( "Thanks for creating an account on %s. Please follow the activation link to activate your account:", 'woocommerce-germanized' ), esc_html( $blogname ) ); ?></p>
 
 <p><a class="wc-button button" href="<?php echo esc_attr( $user_activation_url );?>"><?php _e( 'Activate your account', 'woocommerce-germanized' );?></a></p>
 

templates/emails/plain/customer-new-account-activation.php

@@ -13,7 +13,7 @@
 
 echo "= " . $email_heading . " =\n\n";
 
-echo sprintf( __( "Thanks for creating an account on %s. Your username is %s. Please follow the activation link to activate your account:", 'woocommerce-germanized' ), esc_html( $blogname ), esc_html( $user_login ) ) . "\n\n";
+echo sprintf( __( "Thanks for creating an account on %s. Please follow the activation link to activate your account:", 'woocommerce-germanized' ), esc_html( $blogname ) ) . "\n\n";
 
 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";