Eoxia / wpshop

includes/modules/wps_customer/controller/wps_account_ctr.php

Doc Comments +1 added lines, -1 removed lines

@@ -481,7 +481,7 @@
 	}
 
 	/** SIGN UP - Display the commercial & newsletter form
-	 * @return void
+	 * @return string
 	 */
 	function display_commercial_newsletter_form() {
 		$output = '';

Spacing +313 added lines, -313 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_account_ctr {
 	/** Define the main directory containing the template for the current plugin
 	* @var string
@@ -19,50 +19,50 @@ 
 		$this->template_dir = WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . "/templates/";
 		/** Shortcodes **/
 		// Sign up Display Shortcode
-		add_shortcode( 'wps_signup', array( &$this, 'display_signup' ) );
+		add_shortcode('wps_signup', array(&$this, 'display_signup'));
 		// Log in Form Display Shortcode
-		add_shortcode( 'wpshop_login', array( &$this, 'get_login_form'));
+		add_shortcode('wpshop_login', array(&$this, 'get_login_form'));
 		//Log in first step
-		add_shortcode( 'wps_first_login', array( &$this, 'get_login_first_step'));
+		add_shortcode('wps_first_login', array(&$this, 'get_login_first_step'));
 		// Forgot password Form
-		add_shortcode( 'wps_forgot_password', array( &$this, 'get_forgot_password_form'));
+		add_shortcode('wps_forgot_password', array(&$this, 'get_forgot_password_form'));
 		// Renew password form
-		add_shortcode( 'wps_renew_password', array( &$this, 'get_renew_password_form'));
+		add_shortcode('wps_renew_password', array(&$this, 'get_renew_password_form'));
 		//Account informations
-		add_shortcode( 'wps_account_informations', array($this, 'display_account_informations') );
+		add_shortcode('wps_account_informations', array($this, 'display_account_informations'));
 		//Account form
-		add_shortcode( 'wps_account_informations_form', array($this, 'account_informations_form') );
+		add_shortcode('wps_account_informations_form', array($this, 'account_informations_form'));
 
 		/** Ajax Actions **/
 		// add_action('wap_ajax_wps_display_connexion_form', array(&$this, 'wps_ajax_get_login_form_interface') );
 		// add_action('wap_ajax_nopriv_wps_display_connexion_form', array(&$this, 'wps_ajax_get_login_form_interface') );
 
-		add_action('wp_ajax_wps_login_request', array(&$this, 'control_login_form_request') );
-		add_action('wp_ajax_nopriv_wps_login_request', array(&$this, 'control_login_form_request') );
+		add_action('wp_ajax_wps_login_request', array(&$this, 'control_login_form_request'));
+		add_action('wp_ajax_nopriv_wps_login_request', array(&$this, 'control_login_form_request'));
 
-		add_action('wp_ajax_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request') );
-		add_action('wp_ajax_nopriv_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request') );
+		add_action('wp_ajax_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request'));
+		add_action('wp_ajax_nopriv_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request'));
 
-		add_action('wp_ajax_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew') );
-		add_action('wp_ajax_nopriv_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew') );
+		add_action('wp_ajax_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew'));
+		add_action('wp_ajax_nopriv_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew'));
 
-		add_action('wp_ajax_wps_signup_request', array(&$this, 'wps_save_signup_form') );
-		add_action('wp_ajax_nopriv_wps_signup_request', array(&$this, 'wps_save_signup_form_nopriv') );
+		add_action('wp_ajax_wps_signup_request', array(&$this, 'wps_save_signup_form'));
+		add_action('wp_ajax_nopriv_wps_signup_request', array(&$this, 'wps_save_signup_form_nopriv'));
 
-		add_action('wp_ajax_wps_login_first_request', array(&$this, 'wps_login_first_request') );
-		add_action('wp_ajax_nopriv_wps_login_first_request', array(&$this, 'wps_login_first_request') );
+		add_action('wp_ajax_wps_login_first_request', array(&$this, 'wps_login_first_request'));
+		add_action('wp_ajax_nopriv_wps_login_first_request', array(&$this, 'wps_login_first_request'));
 
-		add_action( 'wp_ajax_wps_save_account_informations', array($this, 'wps_save_account_informations') );
+		add_action('wp_ajax_wps_save_account_informations', array($this, 'wps_save_account_informations'));
 
-		add_action( 'wp_ajax_wps_account_reload_informations', array($this, 'wps_account_reload_informations') );
+		add_action('wp_ajax_wps_account_reload_informations', array($this, 'wps_account_reload_informations'));
 
-		add_action( 'wp_ajax_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal') );
-		add_action( 'wp_ajax_nopriv_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal') );
+		add_action('wp_ajax_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal'));
+		add_action('wp_ajax_nopriv_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal'));
 
-		add_action( 'wp_ajax_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal') );
-		add_action( 'wp_ajax_nopriv_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal') );
+		add_action('wp_ajax_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal'));
+		add_action('wp_ajax_nopriv_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal'));
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts') );
+		add_action('wp_enqueue_scripts', array($this, 'add_scripts'));
 	}
 
 	/**
@@ -70,33 +70,33 @@ 
 	 */
 	function add_scripts() {
 		wp_enqueue_script('jquery');
-		wp_enqueue_script( 'wps_forgot_password_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_forgot_password.js' );
-		wp_enqueue_script( 'wps_login_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_login.js' );
-		wp_enqueue_script( 'wps_signup_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_signup.js' );
-		wp_enqueue_script( 'wps_account_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_account.js' );
-		wp_enqueue_style( 'wps_account_css', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/css/frontend.css' );
+		wp_enqueue_script('wps_forgot_password_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_forgot_password.js');
+		wp_enqueue_script('wps_login_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_login.js');
+		wp_enqueue_script('wps_signup_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_signup.js');
+		wp_enqueue_script('wps_account_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_account.js');
+		wp_enqueue_style('wps_account_css', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/css/frontend.css');
 	}
 
 	/** LOG IN - Display log in Form **/
-	function get_login_form( $force_login = false ) {
+	function get_login_form($force_login = false) {
 		$args = array();
-		if ( get_current_user_id() != 0 ) {
-			return __( 'You are already logged', 'wpshop');
+		if (get_current_user_id() != 0) {
+			return __('You are already logged', 'wpshop');
 		}
 		else {
-			$action = !empty( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : '';
-			$key = !empty( $_GET['key'] ) ? sanitize_text_field( $_GET['key'] ) : '';
-			$login = !empty( $_GET['login'] ) ? sanitize_text_field( $_GET['login'] ) : 0;
-			if ( !empty($action) && $action == 'retrieve_password' && !empty($key) && !empty($login) && !$force_login ) {
+			$action = !empty($_GET['action']) ? sanitize_text_field($_GET['action']) : '';
+			$key = !empty($_GET['key']) ? sanitize_text_field($_GET['key']) : '';
+			$login = !empty($_GET['login']) ? sanitize_text_field($_GET['login']) : 0;
+			if (!empty($action) && $action == 'retrieve_password' && !empty($key) && !empty($login) && !$force_login) {
 				$output = self::get_renew_password_form();
 			}
 			else {
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form") );
+				require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form"));
 				$output = ob_get_contents();
 				ob_end_clean();
-				if ( !$force_login ) {
-					$output .= do_shortcode( '[wps_signup]' );
+				if (!$force_login) {
+					$output .= do_shortcode('[wps_signup]');
 				}
 			}
 			return $output;
@@ -106,53 +106,53 @@ 
 	/** LOG IN - AJAX - Action to connect **/
 	function control_login_form_request() {
 
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'control_login_form_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'control_login_form_request'))
 			wp_die();
 
 		$result = '';
 		$status = false;
-		$origin = sanitize_text_field( $_POST['wps-checking-origin'] );
-		$wps_login_user_login = !empty( $_POST['wps_login_user_login'] ) ? sanitize_text_field( $_POST['wps_login_user_login' ] ) : '';
-		$wps_login_password = !empty( $_POST['wps_login_password'] ) ? sanitize_text_field( $_POST['wps_login_password' ] ) : '';
-		$page_account_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id') );
-		if ( !empty($wps_login_user_login) && !empty($wps_login_password) ) {
+		$origin = sanitize_text_field($_POST['wps-checking-origin']);
+		$wps_login_user_login = !empty($_POST['wps_login_user_login']) ? sanitize_text_field($_POST['wps_login_user_login']) : '';
+		$wps_login_password = !empty($_POST['wps_login_password']) ? sanitize_text_field($_POST['wps_login_password']) : '';
+		$page_account_id = wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'));
+		if (!empty($wps_login_user_login) && !empty($wps_login_password)) {
 			$creds = array();
 			// Test if an user exist with this login
-			$user_checking = get_user_by( 'login', $wps_login_user_login );
-			if( !empty($user_checking) ) {
+			$user_checking = get_user_by('login', $wps_login_user_login);
+			if (!empty($user_checking)) {
 				$creds['user_login'] = $wps_login_user_login;
 			}
 			else {
-				if ( is_email($wps_login_user_login) ) {
-					$user_checking = get_user_by( 'email', $wps_login_user_login );
+				if (is_email($wps_login_user_login)) {
+					$user_checking = get_user_by('email', $wps_login_user_login);
 					$creds['user_login'] = $user_checking->user_login;
 				}
 			}
-			$creds['user_password'] = wpshop_tools::varSanitizer( $_POST['wps_login_password'] );
-			$creds['remember'] =  !empty( $_POST['wps_login_remember_me'] ) ? (int) $_POST['wps_login_remember_me'] : false;
-			$user = wp_signon( $creds, false );
-			if ( is_wp_error($user) ) {
-				$result = '<div class="wps-alert-error">' .__('Connexion error', 'wpshop'). '</div>';
+			$creds['user_password'] = wpshop_tools::varSanitizer($_POST['wps_login_password']);
+			$creds['remember'] = !empty($_POST['wps_login_remember_me']) ? (int)$_POST['wps_login_remember_me'] : false;
+			$user = wp_signon($creds, false);
+			if (is_wp_error($user)) {
+				$result = '<div class="wps-alert-error">' . __('Connexion error', 'wpshop') . '</div>';
 			}
 			else {
-				$permalink_option = get_option( 'permalink_structure' );
-				$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-				if( $origin == $page_account_id ) {
-					$result = get_permalink( $page_account_id );
+				$permalink_option = get_option('permalink_structure');
+				$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+				if ($origin == $page_account_id) {
+					$result = get_permalink($page_account_id);
 				}
 				else {
-					$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
+					$result = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=3';
 				}
 				$status = true;
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('E-Mail and Password are required', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('E-Mail and Password are required', 'wpshop') . '</div>';
 		}
 
-		echo json_encode( array( $status, $result) );
+		echo json_encode(array($status, $result));
 		die();
 	}
 
@@ -160,13 +160,13 @@ 
 	 * LOG IN - AJAX - Display log in Form in Ajax
 	 */
 	function wps_ajax_get_login_form_interface() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_get_login_form_interface' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_ajax_get_login_form_interface'))
 			wp_die();
 
-		$response = array( 'status' => true, 'response' => self::get_login_form() );
-		echo json_encode( $response );
+		$response = array('status' => true, 'response' => self::get_login_form());
+		echo json_encode($response);
 		die();
 	}
 
@@ -174,7 +174,7 @@ 
 	function get_login_first_step() {
 		$output = '';
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "login/login-form", "first") );
+		require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form", "first"));
 		$output .= ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -184,39 +184,39 @@ 
 	 * LOG IN - First Step log in request
 	 */
 	function wps_login_first_request() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_login_first_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_login_first_request'))
 			wp_die();
 
 		$status = false; $login_action = false; $response = '';
-		$user_email = ( !empty($_POST['email_address']) ) ? wpshop_tools::varSanitizer( $_POST['email_address'] ) : null;
-		if ( !empty($user_email) ) {
+		$user_email = (!empty($_POST['email_address'])) ? wpshop_tools::varSanitizer($_POST['email_address']) : null;
+		if (!empty($user_email)) {
 			$status = true;
 			/** Check if a user exist with it's email **/
-			$checking_user = get_user_by( 'login', $user_email);
-			if ( !empty($checking_user) ) {
+			$checking_user = get_user_by('login', $user_email);
+			if (!empty($checking_user)) {
 				$login_action = true;
-				$user_firstname = get_user_meta( $checking_user->ID, 'first_name', true );
+				$user_firstname = get_user_meta($checking_user->ID, 'first_name', true);
 				$response = $user_firstname;
 			}
 			else {
-				$checking_user = get_user_by( 'email', $user_email);
-				if ( !empty( $checking_user ) ) {
+				$checking_user = get_user_by('email', $user_email);
+				if (!empty($checking_user)) {
 					$login_action = true;
-					$user_firstname = get_user_meta( $checking_user->ID, 'first_name', true );
+					$user_firstname = get_user_meta($checking_user->ID, 'first_name', true);
 					$response = $user_firstname;
 				}
 			}
 
-			if( !$login_action && is_email($user_email)  ) {
+			if (!$login_action && is_email($user_email)) {
 				$response = $user_email;
 			}
 		}
 		else {
-			$response = '<div class="wps-alert-error">' .__( 'An e-mail address is required', 'wpshop' ). '</div>';
+			$response = '<div class="wps-alert-error">' . __('An e-mail address is required', 'wpshop') . '</div>';
 		}
-		echo json_encode( array( 'status'=> $status, 'response' => $response, 'login_action' => $login_action) );
+		echo json_encode(array('status'=> $status, 'response' => $response, 'login_action' => $login_action));
 		die();
 	}
 
@@ -225,9 +225,9 @@ 
 	 */
 	function get_forgot_password_form() {
 		$output = '';
-		if ( get_current_user_id() == 0 ) {
+		if (get_current_user_id() == 0) {
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/forgot-password") );
+			require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/forgot-password"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -238,16 +238,16 @@ 
 	 * FORGOT PASSWORD - AJAX - Fill the forgot password modal
 	 */
 	function wps_fill_forgot_password_modal() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_fill_forgot_password_modal' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_fill_forgot_password_modal'))
 			wp_die();
 
 		$status = false; $title = $content = '';
-		$title = __( 'Forgot password', 'wpshop' );
+		$title = __('Forgot password', 'wpshop');
 		$content = do_shortcode('[wps_forgot_password]');
 		$status = true;
-		echo json_encode( array('status' => $status, 'title' => $title, 'content' => $content) );
+		echo json_encode(array('status' => $status, 'title' => $title, 'content' => $content));
 		wp_die();
 	}
 
@@ -255,48 +255,48 @@ 
 	 * FORGOT PASSWORD- AJAX - Forgot Password Request
 	 */
 	function wps_forgot_password_request() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_forgot_password_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_forgot_password_request'))
 			wp_die();
 
 		global $wpdb;
 		$status = false; $result = '';
-		$user_login = ( !empty( $_POST['wps_user_login']) ) ? wpshop_tools::varSanitizer($_POST['wps_user_login']) : null;
-		if ( !empty($user_login) ) {
+		$user_login = (!empty($_POST['wps_user_login'])) ? wpshop_tools::varSanitizer($_POST['wps_user_login']) : null;
+		if (!empty($user_login)) {
 			$existing_user = false;
 			$key_for_update = 'user_login';
 			$exist_user = get_user_by('login', $user_login);
-			if( !empty($exist_user) ) {
+			if (!empty($exist_user)) {
 				$existing_user = true;
 			}
 			else {
 				$exist_user = get_user_by('email', $user_login);
 				$key_for_update = 'user_email';
-				if ( !empty($exist_user) ) {
+				if (!empty($exist_user)) {
 					$existing_user = true;
 				}
 			}
 
-			if ( $existing_user ) {
+			if ($existing_user) {
 				$key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE $key_for_update = %s", $user_login));
-				if ( empty($key) ) {
+				if (empty($key)) {
 					$key = wp_generate_password(20, false);
 					$wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
 				}
 				$this->send_forgot_password_email($key, $user_login, $exist_user);
-				$result = '<div class="wps-alert-info">' .__('An e-mail with an password renew link has been sent to you', 'wpshop'). '</div>';
+				$result = '<div class="wps-alert-info">' . __('An e-mail with an password renew link has been sent to you', 'wpshop') . '</div>';
 				$status = true;
 			}
 			else {
-				$result = '<div class="wps-alert-error">' .__('No customer account corresponds to this email', 'wpshop'). '</div>';
+				$result = '<div class="wps-alert-error">' . __('No customer account corresponds to this email', 'wpshop') . '</div>';
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('Please fill the required field', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('Please fill the required field', 'wpshop') . '</div>';
 		}
-		$response = array( $status, $result );
-		echo json_encode( $response );
+		$response = array($status, $result);
+		echo json_encode($response);
 		die();
 	}
 
@@ -305,67 +305,67 @@ 
 	 * @param string $key
 	 * @param string $user_login
 	 */
-	function send_forgot_password_email($key, $user_login, $exist_user){
+	function send_forgot_password_email($key, $user_login, $exist_user) {
 		$user_data = $exist_user->data;
 		$email = $user_data->user_email;
 		$wps_message = new wps_message_ctr();
-		$first_name = get_user_meta( $user_data->ID, 'first_name', true );
-		$last_name = get_user_meta( $user_data->ID, 'last_name', true );
-		$permalink_option = get_option( 'permalink_structure' );
-		$link = '<a href="' .get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ).( (!empty($permalink_option)) ? '?' : '&').'order_step=2&action=retrieve_password&key=' .$key. '&login=' .rawurlencode($user_login). '">' .get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ). '&action=retrieve_password&key=' .$key. '&login=' .rawurlencode($user_login). '</a>';
-		if( !empty($key) && !empty( $user_login ) ) {
+		$first_name = get_user_meta($user_data->ID, 'first_name', true);
+		$last_name = get_user_meta($user_data->ID, 'last_name', true);
+		$permalink_option = get_option('permalink_structure');
+		$link = '<a href="' . get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2&action=retrieve_password&key=' . $key . '&login=' . rawurlencode($user_login) . '">' . get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . '&action=retrieve_password&key=' . $key . '&login=' . rawurlencode($user_login) . '</a>';
+		if (!empty($key) && !empty($user_login)) {
 			$wps_message->wpshop_prepared_email($email,
 			'WPSHOP_FORGOT_PASSWORD_MESSAGE',
-			array( 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'forgot_password_link' => $link)
+			array('customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'forgot_password_link' => $link)
 			);
 		}
 	}
 
 	/** FORGOT PASSWORD - AJAX - Make renew password action **/
 	function wps_forgot_password_renew() {
-		check_ajax_referer( 'wps_forgot_password_renew' );
+		check_ajax_referer('wps_forgot_password_renew');
 
 		global $wpdb;
 		$status = false; $result = $form = '';
-		$password = ( !empty( $_POST['pass1']) ) ? wpshop_tools::varSanitizer( $_POST['pass1'] ) : null;
-		$confirm_password = ( !empty( $_POST['pass2']) ) ? wpshop_tools::varSanitizer( $_POST['pass2'] ) : null;
-		$activation_key = ( !empty( $_POST['activation_key']) ) ?  wpshop_tools::varSanitizer( $_POST['activation_key'] ) : null;
-		$login = ( !empty( $_POST['user_login']) ) ?  wpshop_tools::varSanitizer( $_POST['user_login'] ) : null;
-		if ( !empty($password) && !empty($confirm_password) && $confirm_password == $password ) {
-			if ( !empty($activation_key) && !empty($login) ) {
+		$password = (!empty($_POST['pass1'])) ? wpshop_tools::varSanitizer($_POST['pass1']) : null;
+		$confirm_password = (!empty($_POST['pass2'])) ? wpshop_tools::varSanitizer($_POST['pass2']) : null;
+		$activation_key = (!empty($_POST['activation_key'])) ? wpshop_tools::varSanitizer($_POST['activation_key']) : null;
+		$login = (!empty($_POST['user_login'])) ? wpshop_tools::varSanitizer($_POST['user_login']) : null;
+		if (!empty($password) && !empty($confirm_password) && $confirm_password == $password) {
+			if (!empty($activation_key) && !empty($login)) {
 				$existing_user = false;
-				$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $activation_key, $login ) );
-				if( !empty($user) ) {
+				$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $activation_key, $login));
+				if (!empty($user)) {
 					$existing_user = true;
 				}
 				else {
-					$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_email = %s", $activation_key, $login ) );
-					if( !empty($user) ) {
+					$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_email = %s", $activation_key, $login));
+					if (!empty($user)) {
 						$existing_user = true;
 					}
 				}
 
-				if ( $existing_user ){
+				if ($existing_user) {
 					wp_set_password($password, $user->ID);
 					wp_password_change_notification($user);
 					$status = true;
-					$result = '<div class="wps-alert-success">' .__('Your password has been updated', 'wpshop'). '. <a href="#" id="display_connexion_form"> ' .__('Connect you', 'wpshop').' !</a></div>';
-					$form = self::get_login_form( true );
+					$result = '<div class="wps-alert-success">' . __('Your password has been updated', 'wpshop') . '. <a href="#" id="display_connexion_form"> ' . __('Connect you', 'wpshop') . ' !</a></div>';
+					$form = self::get_login_form(true);
 				}
 				else {
-					$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
+					$result = '<div class=" wps-alert-error">' . __('Invalid activation key', 'wpshop') . '</div>';
 				}
 			}
 			else {
-				$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
+				$result = '<div class=" wps-alert-error">' . __('Invalid activation key', 'wpshop') . '</div>';
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('Password and confirmation password are differents', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('Password and confirmation password are differents', 'wpshop') . '</div>';
 		}
 
-		$response = array( $status, $result, $form );
-		echo json_encode( $response);
+		$response = array($status, $result, $form);
+		echo json_encode($response);
 		die();
 	}
 
@@ -374,9 +374,9 @@ 
 	 * @return string
 	 */
 	function get_renew_password_form() {
-		if ( get_current_user_id() == 0 ) {
+		if (get_current_user_id() == 0) {
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "forgot-password/password-renew") );
+			require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/password-renew"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -385,7 +385,7 @@ 
 
 	/** FORGOT PASSWORD - AJAX - Get Forgot Password form **/
 	function wps_ajax_get_forgot_password_form() {
-		echo json_encode( array(self::get_forgot_password_form() ) );
+		echo json_encode(array(self::get_forgot_password_form()));
 		die();
 	}
 
@@ -393,29 +393,29 @@ 
 	 * SIGN UP - Display Sign up form
 	 * @return string
 	 */
-	function display_signup( $args = array() ) {
+	function display_signup($args = array()) {
 		global $wpdb;
 		$output = '';
-		if ( get_current_user_id() == 0 || !empty($args) ) {
+		if (get_current_user_id() == 0 || !empty($args)) {
 			$fields_to_output = $signup_fields = array();
 
-			$password_attribute = $signup_form_attributes =  array();
+			$password_attribute = $signup_form_attributes = array();
 
-			$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+			$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-			$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-			$customer_entity_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+			$customer_entity_id = $wpdb->get_var($query);
 			$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-			$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-			$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid' );
-			$customer_attributes_sections = $wpdb->get_results( $query );
-			foreach( $customer_attributes_sections as $k => $customer_attributes_section ) {
-				foreach( $account_attributes[$customer_attributes_section->id]['attribut'] as $attribute ) {
+			$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
+			$customer_attributes_sections = $wpdb->get_results($query);
+			foreach ($customer_attributes_sections as $k => $customer_attributes_section) {
+				foreach ($account_attributes[$customer_attributes_section->id]['attribut'] as $attribute) {
 					$signup_fields[] = $attribute;
 				}
 			}
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "signup/signup") );
+			require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -423,119 +423,119 @@ 
 	}
 
 	function wps_save_signup_form_nopriv() {
-		$this->wps_save_signup_form( true );
+		$this->wps_save_signup_form(true);
 	}
 
 	/**
 	 * SIGN UP - Save sign up form
 	 */
-	function wps_save_signup_form( $connect = false ) {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+	function wps_save_signup_form($connect = false) {
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_signup_form' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_save_signup_form'))
 			wp_die();
 
 		global $wpdb, $wpshop;
-		$user_id = ( !empty( $_POST['wps_sign_up_request_from_admin'] ) ) ? (int) $_POST['wps_sign_up_request_from_admin'] : get_current_user_id();
+		$user_id = (!empty($_POST['wps_sign_up_request_from_admin'])) ? (int)$_POST['wps_sign_up_request_from_admin'] : get_current_user_id();
 		$wps_message = new wps_message_ctr();
 		$status = $account_creation = false; $result = '';
-		$exclude_user_meta = array( 'user_email', 'user_pass' );
-		$attribute = !empty( $_POST['attribute'] ) ? (array) $_POST['attribute'] : array();
-		$element_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		if ( !empty( $element_id) ){
-			$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $element_id );
-			$attribute_set_id = $wpdb->get_var( $query );
-			if ( !empty($attribute_set_id) ){
-				$group = wps_address::get_addresss_form_fields_by_type( $attribute_set_id );
-				foreach ( $group as $attribute_sets ) {
-					foreach ( $attribute_sets as $attribute_set_field ) {
-						if( !empty($user_id) ) {
-							foreach( $attribute_set_field['content'] as $attribute_code => $att_def ) {
-								if( $attribute_code != 'account_user_email' ) {
+		$exclude_user_meta = array('user_email', 'user_pass');
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
+		$element_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		if (!empty($element_id)) {
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id);
+			$attribute_set_id = $wpdb->get_var($query);
+			if (!empty($attribute_set_id)) {
+				$group = wps_address::get_addresss_form_fields_by_type($attribute_set_id);
+				foreach ($group as $attribute_sets) {
+					foreach ($attribute_sets as $attribute_set_field) {
+						if (!empty($user_id)) {
+							foreach ($attribute_set_field['content'] as $attribute_code => $att_def) {
+								if ($attribute_code != 'account_user_email') {
 									$attribute_set_field['content'][$attribute_code]['required'] = 'no';
 								}
 							}
 						}
-						$validate = $wpshop->validateForm($attribute_set_field['content'], $attribute );
+						$validate = $wpshop->validateForm($attribute_set_field['content'], $attribute);
 					}
-					if ( empty($wpshop->errors) ) {
-						$user_name = !empty($attribute['varchar']['user_login']) ? sanitize_text_field( $attribute['varchar']['user_login'] ) : sanitize_email( $attribute['varchar']['user_email'] );
-						$user_pass = ( !empty($attribute['varchar']['user_pass']) && !empty($_POST['wps_signup_account_creation']) ) ? sanitize_text_field( $attribute['varchar']['user_pass'] ) : wp_generate_password( 12, false );
+					if (empty($wpshop->errors)) {
+						$user_name = !empty($attribute['varchar']['user_login']) ? sanitize_text_field($attribute['varchar']['user_login']) : sanitize_email($attribute['varchar']['user_email']);
+						$user_pass = (!empty($attribute['varchar']['user_pass']) && !empty($_POST['wps_signup_account_creation'])) ? sanitize_text_field($attribute['varchar']['user_pass']) : wp_generate_password(12, false);
 
-						if ( $user_id == 0  ) {
-							$user_id = wp_create_user($user_name, $user_pass, sanitize_email( $attribute['varchar']['user_email'] ) );
-							if ( !is_object( $user_id) ) {
+						if ($user_id == 0) {
+							$user_id = wp_create_user($user_name, $user_pass, sanitize_email($attribute['varchar']['user_email']));
+							if (!is_object($user_id)) {
 								$account_creation = true;
 								/** Update newsletter user preferences **/
 								$newsletter_preferences = array();
-								$newsletters_site = !empty( $_POST['newsletters_site'] ) ? (bool) $_POST['newsletters_site'] : false;
-								if( $newsletters_site ) {
+								$newsletters_site = !empty($_POST['newsletters_site']) ? (bool)$_POST['newsletters_site'] : false;
+								if ($newsletters_site) {
 									$newsletter_preferences['newsletters_site'] = 1;
 								}
-								$newsletters_site_partners = !empty( $_POST['newsletters_site_partners'] ) ? (bool) $_POST['newsletters_site_partners'] : false;
-								if( $newsletters_site_partners ) {
+								$newsletters_site_partners = !empty($_POST['newsletters_site_partners']) ? (bool)$_POST['newsletters_site_partners'] : false;
+								if ($newsletters_site_partners) {
 									$newsletter_preferences['newsletters_site_partners'] = 1;
 								}
 
-								update_user_meta( $user_id, 'user_preferences', $newsletter_preferences);
+								update_user_meta($user_id, 'user_preferences', $newsletter_preferences);
 							}
 						}
 
-						$customer_entity_request = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
-						$customer_post_ID = $wpdb->get_var( $customer_entity_request );
+						$customer_entity_request = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
+						$customer_post_ID = $wpdb->get_var($customer_entity_request);
 
-						if( !empty( $attribute ) ) {
+						if (!empty($attribute)) {
 							$user_info = $address_forms = $all_addresses_form = array();
-							$billing_option = get_option( 'wpshop_billing_address' );
-							foreach( $attribute as $type => $attributes ) {
-								if( !empty( $billing_option['integrate_into_register_form'] ) && $billing_option['integrate_into_register_form'] == 'yes' && ctype_digit( (string) $type ) ) {
+							$billing_option = get_option('wpshop_billing_address');
+							foreach ($attribute as $type => $attributes) {
+								if (!empty($billing_option['integrate_into_register_form']) && $billing_option['integrate_into_register_form'] == 'yes' && ctype_digit((string)$type)) {
 									//wps_address::save_address_infos( (int) $type );
-									foreach( $attributes as $sub_type => $sub_attributes ) {
-										if( !is_array( $sub_attributes ) ) {
-											$address_forms[$type][$sub_type] = sanitize_text_field( $sub_attributes );
+									foreach ($attributes as $sub_type => $sub_attributes) {
+										if (!is_array($sub_attributes)) {
+											$address_forms[$type][$sub_type] = sanitize_text_field($sub_attributes);
 											continue;
 										}
-										foreach( $sub_attributes as $sub_meta => $sub_attribute_value ) {
-											$address_forms[$type][$sub_type][$sub_meta] = sanitize_text_field( $sub_attribute_value );
+										foreach ($sub_attributes as $sub_meta => $sub_attribute_value) {
+											$address_forms[$type][$sub_type][$sub_meta] = sanitize_text_field($sub_attribute_value);
 										}
 									}
 								} else {
-									foreach( $attributes as $meta => $attribute_value ) {
-										$user_info[$meta] = sanitize_text_field( $attribute_value );
-										if( !empty( $billing_option['integrate_into_register_form'] ) && $billing_option['integrate_into_register_form'] == 'yes' && isset( $billing_option['integrate_into_register_form_matching_field'], $billing_option['integrate_into_register_form_matching_field'][$meta] ) ) {
+									foreach ($attributes as $meta => $attribute_value) {
+										$user_info[$meta] = sanitize_text_field($attribute_value);
+										if (!empty($billing_option['integrate_into_register_form']) && $billing_option['integrate_into_register_form'] == 'yes' && isset($billing_option['integrate_into_register_form_matching_field'], $billing_option['integrate_into_register_form_matching_field'][$meta])) {
 											$all_addresses_form[$type][$meta] = $user_info[$meta];
 										}
 									}
 								}
 							}
-							wps_customer_ctr::save_customer_synchronize( $customer_post_ID, $user_id, $user_info );
-							foreach( $address_forms as $type_of_form => $address_form ) {
-								$address_form = array_merge_recursive( $all_addresses_form, $address_form );
-								wps_address::save_address_infos( (int) $type_of_form, 0, array( 'type_of_form' => (int) $type_of_form, 'attribute' => array( $type_of_form => $address_form ) ), $customer_post_ID );
+							wps_customer_ctr::save_customer_synchronize($customer_post_ID, $user_id, $user_info);
+							foreach ($address_forms as $type_of_form => $address_form) {
+								$address_form = array_merge_recursive($all_addresses_form, $address_form);
+								wps_address::save_address_infos((int)$type_of_form, 0, array('type_of_form' => (int)$type_of_form, 'attribute' => array($type_of_form => $address_form)), $customer_post_ID);
 							}
 						}
 
-						if ( !empty( $_SESSION ) && !empty( $_SESSION[ 'cart' ] ) ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ));
-							$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
+						if (!empty($_SESSION) && !empty($_SESSION['cart'])) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$result = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=3';
 						}
 						else {
-							$account_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ));
-							$result = get_permalink( $account_page_id  );
+							$account_page_id = wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'));
+							$result = get_permalink($account_page_id);
 						}
 						$status = true;
 
-						if ( $account_creation && !empty( $user_id ) && $connect ) {
+						if ($account_creation && !empty($user_id) && $connect) {
 							$secure_cookie = is_ssl() ? true : false;
-							wp_set_auth_cookie( $user_id, true, $secure_cookie );
+							wp_set_auth_cookie($user_id, true, $secure_cookie);
 						}
-						$wps_message->wpshop_prepared_email( sanitize_email($attribute['varchar']['user_email']), 'WPSHOP_SIGNUP_MESSAGE', array('customer_first_name' => ( !empty($attribute['varchar']['first_name']) ) ? sanitize_text_field( $attribute['varchar']['first_name'] ) : '', 'customer_last_name' => ( !empty($attribute['varchar']['last_name']) ) ? sanitize_text_field( $attribute['varchar']['last_name'] ) : '', 'customer_user_email' => ( !empty($attribute['varchar']['user_email']) ) ? sanitize_email( $attribute['varchar']['user_email'] ) : '') );
+						$wps_message->wpshop_prepared_email(sanitize_email($attribute['varchar']['user_email']), 'WPSHOP_SIGNUP_MESSAGE', array('customer_first_name' => (!empty($attribute['varchar']['first_name'])) ? sanitize_text_field($attribute['varchar']['first_name']) : '', 'customer_last_name' => (!empty($attribute['varchar']['last_name'])) ? sanitize_text_field($attribute['varchar']['last_name']) : '', 'customer_user_email' => (!empty($attribute['varchar']['user_email'])) ? sanitize_email($attribute['varchar']['user_email']) : ''));
 
 					} else {
-						$result = '<div class="wps-alert-error">' .__('Some errors have been detected', 'wpshop') . ' : <ul>';
-						foreach(  $wpshop->errors as $error ){
-							$result .= '<li>' .$error. '</li>';
+						$result = '<div class="wps-alert-error">' . __('Some errors have been detected', 'wpshop') . ' : <ul>';
+						foreach ($wpshop->errors as $error) {
+							$result .= '<li>' . $error . '</li>';
 						}
 						$result .= '</div>';
 					}
@@ -544,7 +544,7 @@ 
 			}
 		}
 
-		wp_die( json_encode( array( $status, $result, $user_id ) ) );
+		wp_die(json_encode(array($status, $result, $user_id)));
 	}
 
 	/** SIGN UP - Display the commercial & newsletter form
@@ -552,10 +552,10 @@ 
 	 */
 	function display_commercial_newsletter_form() {
 		$output = '';
-		$user_preferences = get_user_meta( get_current_user_id(), 'user_preferences', true );
-		$wpshop_cart_option = get_option( 'wpshop_cart_option' );
+		$user_preferences = get_user_meta(get_current_user_id(), 'user_preferences', true);
+		$wpshop_cart_option = get_option('wpshop_cart_option');
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup", "newsletter") );
+		require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup", "newsletter"));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -566,88 +566,88 @@ 
 	 * ACCOUNT - Display Account informations
 	 * @return string
 	 */
-	function display_account_informations( $customer_id = '', $force_edition_form = false, $customer_link = false ) {
+	function display_account_informations($customer_id = '', $force_edition_form = false, $customer_link = false) {
 		global $wpdb;
 		$output = $attributes_sections_tpl = $attribute_details = '';
-		$is_from_admin = ( !empty($customer_id) ) ? true : false;
-		$customer_id = ( !empty($customer_id) ) ? $customer_id : get_current_user_id();
-		if( $customer_id != 0 ) {
+		$is_from_admin = (!empty($customer_id)) ? true : false;
+		$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+		if ($customer_id != 0) {
 			$screen = get_current_screen();
-			if( ( is_admin() && isset( $screen ) && is_object( $screen ) && $screen->post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) || $force_edition_form ) {
-				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id );
-				$cid = $wpdb->get_var( $query );
+			if ((is_admin() && isset($screen) && is_object($screen) && $screen->post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) || $force_edition_form) {
+				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id);
+				$cid = $wpdb->get_var($query);
 
 				$fields_to_output = $signup_fields = array();
 
-				$password_attribute = $signup_form_attributes =  array();
+				$password_attribute = $signup_form_attributes = array();
 
-				$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-				$customer_entity_id = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+				$customer_entity_id = $wpdb->get_var($query);
 				$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-				$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-				$query = $wpdb->prepare('SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d', $attributes_set->id );
-				$customer_attributes_sections = $wpdb->get_results( $query );
-				foreach( $customer_attributes_sections as $k => $attributes_section ) {
+				$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d', $attributes_set->id);
+				$customer_attributes_sections = $wpdb->get_results($query);
+				foreach ($customer_attributes_sections as $k => $attributes_section) {
 					$signup_fields[$attributes_section->name] = array();
-					if ( !empty( $account_attributes[$attributes_section->id] ) ) {
-						foreach( $account_attributes[$attributes_section->id]['attribut'] as $attribute ) {
+					if (!empty($account_attributes[$attributes_section->id])) {
+						foreach ($account_attributes[$attributes_section->id]['attribut'] as $attribute) {
 							$signup_fields[$attributes_section->name][] = $attribute;
 						}
 					}
 				}
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"backend", "customer-informations/customer_informations_form") );
+				require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "backend", "customer-informations/customer_informations_form"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			} else {
-				$customer_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id );
-				$cid = $wpdb->get_var( $query );
-
-				if( !empty($customer_entity_id) ) {
-					$query = $wpdb->prepare( 'SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d AND status = %s AND default_set = %s', $customer_entity_id, 'valid', 'yes' );
-					$attributes_sets = $wpdb->get_results( $query );
-					foreach( $attributes_sets as $attributes_set ) {
-						if( !empty($attributes_set->id) ) {
-							$query = $wpdb->prepare( 'SELECT * FROM '. WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
-							$attributes_sections = $wpdb->get_results( $query );
-
-							if( !empty($attributes_sections) ) {
-								foreach( $attributes_sections as $attributes_section ) {
-									$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE status = %s AND entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', 'valid', $customer_entity_id, $attributes_set->id, $attributes_section->id);
-									$attributes_details = $wpdb->get_results( $query );
-
-									foreach( $attributes_details as $attributes_detail ) {
-										$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE id = %d AND status = %s', $attributes_detail->attribute_id, 'valid' );
-										$attribute_def = $wpdb->get_row( $query );
-
-										$query = $wpdb->prepare( 'SELECT value  FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.strtolower($attribute_def->data_type). ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_id, $attribute_def->id, $cid );
-										$attribute_value = $wpdb->get_var( $query );
+				$customer_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id);
+				$cid = $wpdb->get_var($query);
+
+				if (!empty($customer_entity_id)) {
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s AND default_set = %s', $customer_entity_id, 'valid', 'yes');
+					$attributes_sets = $wpdb->get_results($query);
+					foreach ($attributes_sets as $attributes_set) {
+						if (!empty($attributes_set->id)) {
+							$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
+							$attributes_sections = $wpdb->get_results($query);
+
+							if (!empty($attributes_sections)) {
+								foreach ($attributes_sections as $attributes_section) {
+									$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE status = %s AND entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', 'valid', $customer_entity_id, $attributes_set->id, $attributes_section->id);
+									$attributes_details = $wpdb->get_results($query);
+
+									foreach ($attributes_details as $attributes_detail) {
+										$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d AND status = %s', $attributes_detail->attribute_id, 'valid');
+										$attribute_def = $wpdb->get_row($query);
+
+										$query = $wpdb->prepare('SELECT value  FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($attribute_def->data_type) . ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_id, $attribute_def->id, $cid);
+										$attribute_value = $wpdb->get_var($query);
 
 										/**	Check attribute type for specific type display	*/
-										if ( "datetime" == $attribute_def->data_type ) {
-											$attribute_value = mysql2date( get_option( 'date_format' ) . ( ( substr( $attribute_value, -9 ) != ' 00:00:00' ) ? ' ' . get_option( 'time_format' ) : '' ), $attribute_value, true);
+										if ("datetime" == $attribute_def->data_type) {
+											$attribute_value = mysql2date(get_option('date_format') . ((substr($attribute_value, -9) != ' 00:00:00') ? ' ' . get_option('time_format') : ''), $attribute_value, true);
 										}
 
 										/**	Check attribute input type in order to get specific value	*/
-										if ( in_array( $attribute_def->backend_input, array( 'multiple-select', 'select', 'radio', 'checkbox' ) ) ) {
-											if ( $attribute_def->data_type_to_use == 'custom' ) {
-												$query = $wpdb->prepare("SELECT label FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' AND id = %d", $attribute_def->id, $attribute_value );
-												$attribute_value = $wpdb->get_var( $query );
+										if (in_array($attribute_def->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'))) {
+											if ($attribute_def->data_type_to_use == 'custom') {
+												$query = $wpdb->prepare("SELECT label FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' AND id = %d", $attribute_def->id, $attribute_value);
+												$attribute_value = $wpdb->get_var($query);
 											}
-											else if ( $attribute_def->data_type_to_use == 'internal')  {
-												$associated_post = get_post( $atribute_value );
+											else if ($attribute_def->data_type_to_use == 'internal') {
+												$associated_post = get_post($atribute_value);
 												$attribute_value = $associated_post->post_title;
 											}
 										}
 
-										if( !empty( $attribute_def ) ) {
-											if( $attribute_def->frontend_input != 'password' ) {
+										if (!empty($attribute_def)) {
+											if ($attribute_def->frontend_input != 'password') {
 												ob_start();
-												require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_informations_element") );
+												require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations_element"));
 												$attribute_details .= ob_get_contents();
 												ob_end_clean();
 											}
@@ -655,7 +655,7 @@ 
 									}
 
 									ob_start();
-									require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_informations_group_element") );
+									require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations_group_element"));
 									$attributes_sections_tpl .= ob_get_contents();
 									ob_end_clean();
 
@@ -666,7 +666,7 @@ 
 					}
 				}
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations") );
+				require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -680,85 +680,85 @@ 
 	function account_informations_form() {
 		global $wpdb;
 		$output = '';
-		if ( get_current_user_id() != 0 ) {
+		if (get_current_user_id() != 0) {
 			// Customer ID data
-				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id() );
-				$cid = $wpdb->get_var( $query );
+				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id());
+				$cid = $wpdb->get_var($query);
 
 				$fields_to_output = $signup_fields = array();
 
-				$password_attribute = $signup_form_attributes =  array();
+				$password_attribute = $signup_form_attributes = array();
 
-				$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-				$customer_entity_id = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+				$customer_entity_id = $wpdb->get_var($query);
 				$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-				$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d', $attributes_set->id );
-				$customer_attributes_sections = $wpdb->get_results( $query );
-				foreach( $customer_attributes_sections as $k => $customer_attributes_section ) {
-					if ( !empty( $account_attributes[$customer_attributes_section->id] ) ) {
-						foreach( $account_attributes[$customer_attributes_section->id]['attribut'] as $attribute ) {
+				$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d', $attributes_set->id);
+				$customer_attributes_sections = $wpdb->get_results($query);
+				foreach ($customer_attributes_sections as $k => $customer_attributes_section) {
+					if (!empty($account_attributes[$customer_attributes_section->id])) {
+						foreach ($account_attributes[$customer_attributes_section->id]['attribut'] as $attribute) {
 							$signup_fields[] = $attribute;
 						}
 					}
 				}
 
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_form") );
+			require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_form"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
 		return $output;
 	}
 
-	function save_account_informations( $cid, $args, $admin = true ) {
+	function save_account_informations($cid, $args, $admin = true) {
 		global $wpdb, $wpshop;
 
-		$exclude_user_meta = array( 'user_email', 'user_pass' );
+		$exclude_user_meta = array('user_email', 'user_pass');
 		$wps_entities = new wpshop_entities();
-		$element_id = $wps_entities->get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+		$element_id = $wps_entities->get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-		$query = $wpdb->prepare( 'SELECT post_author FROM ' .$wpdb->posts. ' WHERE post_type = %s AND ID = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $cid );
-		$user_id = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT post_author FROM ' . $wpdb->posts . ' WHERE post_type = %s AND ID = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $cid);
+		$user_id = $wpdb->get_var($query);
 
 		$user_name = !empty($args['attribute']['varchar']['user_login']) ? $args['attribute']['varchar']['user_login'] : $args['attribute']['varchar']['user_email'];
 		$user_pass = !empty($args['attribute']['varchar']['user_pass']) ? $args['attribute']['varchar']['user_pass'] : '';
 
-		$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $element_id );
-		$attribute_set_id = $wpdb->get_var( $query );
-		if ( !empty($attribute_set_id) ) {
-			$group  = wps_address::get_addresss_form_fields_by_type( $attribute_set_id );
+		$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id);
+		$attribute_set_id = $wpdb->get_var($query);
+		if (!empty($attribute_set_id)) {
+			$group = wps_address::get_addresss_form_fields_by_type($attribute_set_id);
 			//Save data in attribute tables, ckeck first if exist to know if Insert or Update
-			wpshop_attributes::saveAttributeForEntity( $args['attribute'], $element_id, $cid );
-			foreach ( $group as $attribute_sets ) {
-				foreach ( $attribute_sets as $attribute_set_field ) {
-					if( $admin ) {
-						$validate = $wpshop->validateForm($attribute_set_field['content'], $args['attribute'] );
+			wpshop_attributes::saveAttributeForEntity($args['attribute'], $element_id, $cid);
+			foreach ($group as $attribute_sets) {
+				foreach ($attribute_sets as $attribute_set_field) {
+					if ($admin) {
+						$validate = $wpshop->validateForm($attribute_set_field['content'], $args['attribute']);
 					}
-					if ( empty($wpshop->errors) || !$admin ) {
+					if (empty($wpshop->errors) || !$admin) {
 						$wpshop_attributes = new wpshop_attributes();
-						foreach( $attribute_set_field['content'] as $attribute ) {
-							$attribute_def = wpshop_attributes::getElement( $attribute['name'], "'valid'", 'code');
-							if ( !in_array( $attribute['name'], $exclude_user_meta ) ) {
-								update_user_meta( $user_id, $attribute['name'], wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']])  );
+						foreach ($attribute_set_field['content'] as $attribute) {
+							$attribute_def = wpshop_attributes::getElement($attribute['name'], "'valid'", 'code');
+							if (!in_array($attribute['name'], $exclude_user_meta)) {
+								update_user_meta($user_id, $attribute['name'], wpshop_tools::varSanitizer($args['attribute'][$attribute['data_type']][$attribute['name']]));
 							}
 							else {
-								wp_update_user( array('ID' => $user_id, $attribute['name'] => wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']]) ) );
+								wp_update_user(array('ID' => $user_id, $attribute['name'] => wpshop_tools::varSanitizer($args['attribute'][$attribute['data_type']][$attribute['name']])));
 							}
 						}
 
 						/** Update newsletter user preferences **/
 						$newsletter_preferences = array();
-						if( !empty($args['newsletters_site']) ) {
+						if (!empty($args['newsletters_site'])) {
 							$newsletter_preferences['newsletters_site'] = 1;
 						}
-						if( !empty($args['newsletters_site_partners']) ) {
+						if (!empty($args['newsletters_site_partners'])) {
 							$newsletter_preferences['newsletters_site_partners'] = 1;
 						}
-						update_user_meta( $user_id, 'user_preferences', $newsletter_preferences);
+						update_user_meta($user_id, 'user_preferences', $newsletter_preferences);
 					} else {
 						return $wpshop->errors;
 					}
@@ -770,22 +770,22 @@ 
 	/**
 	 * ACCOUNT - Save account informations
 	 */
-	function wps_save_account_informations () {
-		check_ajax_referer( 'wps_save_account_informations' );
+	function wps_save_account_informations() {
+		check_ajax_referer('wps_save_account_informations');
 
 		global $wpdb;
 		$status = false; $response = '';
 
 		$user_id = get_current_user_id();
-		if ( !empty($user_id) ) {
-			$query = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id );
-			$cid = $wpdb->get_var( $query );
+		if (!empty($user_id)) {
+			$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
+			$cid = $wpdb->get_var($query);
 		}
 
-		$errors = $this->save_account_informations( $cid, $_POST );
-		if( !empty( $errors ) ) {
-			$response = '<div class="wps-alert-error">' .__('Some errors have been detected', 'wpshop') . ' : <ul>';
-			foreach( $errors as $error ){
+		$errors = $this->save_account_informations($cid, $_POST);
+		if (!empty($errors)) {
+			$response = '<div class="wps-alert-error">' . __('Some errors have been detected', 'wpshop') . ' : <ul>';
+			foreach ($errors as $error) {
 				$response .= '<li>' . $error . '</li>';
 			}
 			$response .= '</div>';
@@ -794,7 +794,7 @@ 
 			$status = true;
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'response' => $response) ) );
+		wp_die(json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 	/**
@@ -805,23 +805,23 @@ 
 
 		$status = false;
 		$response = do_shortcode('[wps_account_informations]');
-		if( !empty($response) ) {
+		if (!empty($response)) {
 			$status = true;
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'response' => $response ) ) );
+		wp_die(json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 	/**
 	 * ACCOUNT - AJAX - Fill account informations modal
 	 */
 	function wps_fill_account_informations_modal() {
-		check_ajax_referer( 'wps_fill_account_informations_modal' );
+		check_ajax_referer('wps_fill_account_informations_modal');
 
 		$title = $content = '';
 		$title = __('Edit your account informations', 'wpshop');
-		$content = do_shortcode( '[wps_account_informations_form]' );
-		echo json_encode( array( 'status' => true, 'title' => $title, 'content' => $content) );
+		$content = do_shortcode('[wps_account_informations_form]');
+		echo json_encode(array('status' => true, 'title' => $title, 'content' => $content));
 		wp_die();
 	}
 

includes/modules/wps_customer/templates/frontend/account/account-dashboard.php

Spacing +34 added lines, -34 removed lines

@@ -1,31 +1,31 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-$permalink_option = get_option( 'permalink_structure' );
-$account_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ) );
-$account_dashboard_part = !empty( $_GET['account_dashboard_part'] ) ? sanitize_text_field( $_GET['account_dashboard_part'] ) : '';
+<?php if (!defined('ABSPATH')) exit;
+$permalink_option = get_option('permalink_structure');
+$account_page_id = wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'));
+$account_dashboard_part = !empty($_GET['account_dashboard_part']) ? sanitize_text_field($_GET['account_dashboard_part']) : '';
 ?>
 
 <?php $user_id = get_current_user_id(); ?>
 
-<?php if ( 0 !== $user_id ) :
-	$account_user = get_userdata( $user_id ); ?>
+<?php if (0 !== $user_id) :
+	$account_user = get_userdata($user_id); ?>
 <div class="wps-user-dashboard" >
-	<?php do_action( 'wps_user_dashboard_header', $user_id, $account_user ); ?>
+	<?php do_action('wps_user_dashboard_header', $user_id, $account_user); ?>
 
 	<div class="wps-user-info has-sub-menu" >
 		<span class="wps-user-name">
-			<?php echo get_avatar( $user_id, 40 ); ?>
-			<strong><?php echo esc_html( $account_user->data->user_login ); ?></strong>
+			<?php echo get_avatar($user_id, 40); ?>
+			<strong><?php echo esc_html($account_user->data->user_login); ?></strong>
 		</span>
 		<ul class="sub-menu" >
 		<?php
-		if ( function_exists( 'current_user_switched' ) ) :
+		if (function_exists('current_user_switched')) :
 			$old_user = current_user_switched();
-			if ( $old_user && $url = user_switching::maybe_switch_url( $old_user ) ) :
-				printf( '<li><a href="%s">Switch back</a></li>', esc_url( $url ) );
+			if ($old_user && $url = user_switching::maybe_switch_url($old_user)) :
+				printf('<li><a href="%s">Switch back</a></li>', esc_url($url));
 			endif;
 		endif;
 		?>
-			<li><a href="<?php echo esc_url( wp_logout_url( site_url() ) ); ?>"><i class="wps-icon-power"></i>&nbsp;<?php esc_html_e( 'Se déconnecter', 'eoxia' ); ?></a></li>
+			<li><a href="<?php echo esc_url(wp_logout_url(site_url())); ?>"><i class="wps-icon-power"></i>&nbsp;<?php esc_html_e('Se déconnecter', 'eoxia'); ?></a></li>
 		</ul>
 	</div>
 </div>
@@ -34,50 +34,50 @@ 
 <section class="wps-section-account">
 	<div class="wps-section-taskbar">
 		<ul>
-			<li class="<?php echo ( ( empty($account_dashboard_part) || ( !empty($account_dashboard_part) && $account_dashboard_part == 'account' ) ) ? 'wps-activ' : '' ); ?>">
-				<a data-target="menu1" href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=account' ); ?>" title="" class="">
+			<li class="<?php echo ((empty($account_dashboard_part) || (!empty($account_dashboard_part) && $account_dashboard_part == 'account')) ? 'wps-activ' : ''); ?>">
+				<a data-target="menu1" href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=account'); ?>" title="" class="">
 					<i class="wps-icon-user"></i>
-					<span><?php _e( 'Account', 'wpshop'); ?></span>
+					<span><?php _e('Account', 'wpshop'); ?></span>
 				</a>
 			</li>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'address') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=address' ); ?>" title="" class="">
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'address') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=address'); ?>" title="" class="">
 					<i class="wps-icon-address"></i>
-					<span><?php _e( 'Addresses', 'wpshop'); ?></span>
+					<span><?php _e('Addresses', 'wpshop'); ?></span>
 				</a>
 			</li>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'order') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=order' ); ?>" title="" class="">
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'order') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=order'); ?>" title="" class="">
 					<i class="wps-icon-truck"></i>
-					<span><?php _e( 'Orders', 'wpshop'); ?></span>
+					<span><?php _e('Orders', 'wpshop'); ?></span>
 				</a>
 			</li>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'coupon') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=coupon' ); ?>" title="" class="">
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'coupon') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=coupon'); ?>" title="" class="">
 					<i class="wps-icon-promo"></i>
-					<span><?php _e( 'Coupons', 'wpshop'); ?></span>
+					<span><?php _e('Coupons', 'wpshop'); ?></span>
 				</a>
 			</li>
-			<?php $opinion_option = get_option( 'wps_opinion' );
-			if( !empty($opinion_option) && !empty($opinion_option['active']) ) : ?>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'opinion') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=opinion' ); ?>" title="" class="">
+			<?php $opinion_option = get_option('wps_opinion');
+			if (!empty($opinion_option) && !empty($opinion_option['active'])) : ?>
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'opinion') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=opinion'); ?>" title="" class="">
 					<i class="wps-icon-chat"></i>
-					<span><?php _e( 'Opinions', 'wpshop'); ?></span>
+					<span><?php _e('Opinions', 'wpshop'); ?></span>
 				</a>
 			</li>
 			<?php endif; ?>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'messages') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=messages' ); ?>" title="" class="">
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'messages') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=messages'); ?>" title="" class="">
 					<i class="wps-icon-email"></i>
-					<span><?php _e( 'Messages', 'wpshop' ); ?></span>
+					<span><?php _e('Messages', 'wpshop'); ?></span>
 				</a>
 			</li>
 			<?php echo apply_filters('wps_my_account_extra_part_menu', ''); ?>
 		</ul>
 	</div>
 	<div class="wps-section-content">
-		<div class="wps-activ" id="wps_dashboard_content" data-nonce="<?php echo wp_create_nonce( 'wps_refresh_add_opinion_list' ); ?>">
+		<div class="wps-activ" id="wps_dashboard_content" data-nonce="<?php echo wp_create_nonce('wps_refresh_add_opinion_list'); ?>">
 			<?php echo $content; ?>
 		</div>
 	</div>