Merge pull request #39 from petitphp/add_additionnals_placeholders_for_email_notifications

add additionnal placeholders for email content

Author: herewithme

classes/models/class-member.php

@@ -321,6 +321,8 @@ public function register_notification( $plaintext_pass = '' ) {
 		$message = str_replace( '%%display_name%%', $display_name, $message );
 		$message = str_replace( '%%user_name%%', $username, $message );
 		$message = str_replace( '%%user_email%%', $email, $message );
+		$message = str_replace( '%%first_name%%', ( !empty( $this->first_name ) ) ? stripslashes( $this->first_name ) : "", $message );
+		$message = str_replace( '%%last_name%%', ( !empty( $this->last_name ) ) ? stripslashes( $this->last_name ) : "", $message );
 
 		foreach( $recipients as $mail ) {
 			// Send mail to admin
@@ -339,11 +341,15 @@ public function register_notification( $plaintext_pass = '' ) {
 		}
 
 		$subject = str_replace( '%%blog_name%%', $blogname, $subject );
+		$message = str_replace( '%%blog_name%%', $blogname, $message );
 		$message = str_replace( '%%display_name%%', $display_name, $message );
 		$message = str_replace( '%%user_name%%', $username, $message );
 		$message = str_replace( '%%user_email%%', $email, $message );
 		$message = str_replace( '%%user_password%%', $plaintext_pass, $message );
+		$message = str_replace( '%%site_url%%', network_site_url( ), $message );
 		$message = str_replace( '%%login_url%%', mpt_get_login_permalink( ), $message );
+		$message = str_replace( '%%first_name%%', ( !empty( $this->first_name ) ) ? stripslashes( $this->first_name ) : "", $message );
+		$message = str_replace( '%%last_name%%', ( !empty( $this->last_name ) ) ? stripslashes( $this->last_name ) : "", $message );
 
 		// Allow plugins hooks
 		$subject = apply_filters( 'mpt_register_notification_subject', $subject, $this );
@@ -371,6 +377,7 @@ public function register_validation_notification( $key ) {
 		$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
 		$username = stripslashes( $this->get_display_name( ) );
+		$display_name = stripslashes( $this->get_display_name( ) );
 		$email = stripslashes( $this->email );
 
 		// Get all options for admin notification email.
@@ -383,9 +390,13 @@ public function register_validation_notification( $key ) {
 
 		// Build message text
 		$subject = str_replace( '%%blog_name%%', $blogname, $subject );
+		$message = str_replace( '%%blog_name%%', $blogname, $message );
+		$message = str_replace( '%%display_name%%', $display_name, $message );
+		$message = str_replace( '%%user_name%%', $username, $message );
 		$message = str_replace( '%%site_url%%', network_site_url( ), $message );
 		$message = str_replace( '%%confirm_register_link%%', ''.add_query_arg( array( 'mpt-action' => 'validation-member-registration', 'ID' => $this->id, 'key' => $key ), mpt_get_registration_permalink() ). '' , $message );
-		
+		$message = str_replace( '%%first_name%%', ( !empty( $this->first_name ) ) ? stripslashes( $this->first_name ) : "", $message );
+		$message = str_replace( '%%last_name%%', ( !empty( $this->last_name ) ) ? stripslashes( $this->last_name ) : "", $message );
 
 		// Allow plugins hooks
 		$subject = apply_filters( 'mpt_register_validation_notification_subject', $subject, $this );