Eoxia / wpshop

includes/modules/wps_address/controller/wps_address_ctr.php

Doc Comments +5 added lines, -6 removed lines

@@ -453,7 +453,7 @@ 
 	 * Get all addresses for current customer for display
 	 *
 	 * @param integer $address_type_id The current identifier of address type -> attribute_set_id
-	 * @param string $address_type A string allowing to display
+	 * @param string $address_type_title A string allowing to display
 	 *
 	 * @return string The complete html output for customer addresses
 	 */
@@ -578,7 +578,7 @@ 
 	 * @param integer $address_id Optionnal. Si fournit correspond à l'identifiant de l'adresse à éditer / If given: identifier of the address we want to update.
 	 * @param integer $customer_id Optinnal. Si fournit corrspond à l'identifiant du client pour lequel créer/éditer l'adresse / If given: Identifier of customer to create/update address for.
 	 *
-	 * @return array Un tableau contenant l'affihage du formulaire en premier index et le titre du forulaire en second index.
+	 * @return string[] Un tableau contenant l'affihage du formulaire en premier index et le titre du forulaire en second index.
 	 */
 	function loading_address_form( $address_type_id, $address_id = '', $customer_id = '' ) {
 		$first_address_checking = false;
@@ -605,7 +605,7 @@ 
 	/**
 	 * Generate an array with all fields for the address form construction. Classified by address type.
 	 * @param $typeof
-	 * @return array
+	 * @return string
 	 */
 	public static function get_addresss_form_fields_by_type ( $typeof, $id ='' ) {
 		$submit_billing_and_shipping_info = !empty( $_POST['submitbillingAndShippingInfo'] ) ? sanitize_key( $_POST['submitbillingAndShippingInfo'] ) : '';
@@ -756,7 +756,6 @@ 
 	 * @param string $type : Type of address
 	 * @param string $first : Customer first address ?
 	 * @param string $referer : Referer website page
-	 * @param string $admin : Display this form in admin panel
 	 */
 	public static function display_form_fields($type, $id = '', $first = '', $referer = '', $special_values = array(), $options = array(), $display_for_admin = array(), $other_customer = '' ) {
 		global $wpshop, $wpshop_form, $wpdb;
@@ -1115,9 +1114,9 @@ 
 	 * [display_address_interface_content description]
 	 *
 	 * @param  [type]  $address_type_id  [description].
-	 * @param  [type]  $address_title    [description].
+	 * @param  string  $address_title    [description].
 	 * @param  [type]  $selected_address [description].
-	 * @param  [type]  $type             [description].
+	 * @param  string  $type             [description].
 	 * @param  string  $customer_id      [description].
 	 * @param  boolean $admin_display    [description].
 	 * @param  string  $order_id         [description].

Spacing +454 added lines, -454 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * File defining class for addresses initialisation
  *
@@ -8,8 +8,8 @@ 
  */
 
 /** Check if the plugin WPS_LOCALISATION_VERSION is defined. If not defined script will be stopped here */
-if ( !defined( 'WPS_LOCALISATION_VERSION' ) ) {
-	die( __("You are not allowed to use this service.", 'wpeo_geoloc') );
+if (!defined('WPS_LOCALISATION_VERSION')) {
+	die(__("You are not allowed to use this service.", 'wpeo_geoloc'));
 }
 
 /**
@@ -26,49 +26,49 @@ 
 	 */
 	function __construct() {
 		/**	Create customer entity type on wordpress initilisation*/
-		add_action( 'init', array( $this, 'create_addresses_entity' ) );
+		add_action('init', array($this, 'create_addresses_entity'));
 
 		/**	Add filters for addresses list	*/
-		add_filter( 'bulk_actions-edit-' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, array( $this, 'addresses_list_table_bulk_actions' ) );
-		add_filter( 'manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_columns', array( $this, 'list_table_header' ) );
-		add_action( 'manage_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_posts_custom_column' , array( $this, 'list_table_column_content' ), 10, 2 );
+		add_filter('bulk_actions-edit-' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, array($this, 'addresses_list_table_bulk_actions'));
+		add_filter('manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_columns', array($this, 'list_table_header'));
+		add_action('manage_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_posts_custom_column', array($this, 'list_table_column_content'), 10, 2);
 
 		/**	Filter search for customers	*/
-		add_filter( 'pre_get_posts', array( $this, 'addresses_custom_query' ) );
+		add_filter('pre_get_posts', array($this, 'addresses_custom_query'));
 
 		/**	Load	*/
-		add_filter( 'wpshop_custom_template', array( &$this, 'custom_template_load' ) );
+		add_filter('wpshop_custom_template', array(&$this, 'custom_template_load'));
 
 
 		/**	Add shortocde listener for addresses	*/
-		add_shortcode( 'wps_address_list', array( &$this, 'get_addresses') );
-		add_shortcode( 'wps_addresses', array( &$this, 'shortcode_callback_display_addresses') );
-		add_shortcode( 'wps_addresses_list', array( &$this, 'shortcode_display_addresses_list' ) );
+		add_shortcode('wps_address_list', array(&$this, 'get_addresses'));
+		add_shortcode('wps_addresses', array(&$this, 'shortcode_callback_display_addresses'));
+		add_shortcode('wps_addresses_list', array(&$this, 'shortcode_display_addresses_list'));
 
 		/**	Add listener for ajax actions	*/
-		add_action( 'wp_ajax_wps_load_address_form', array( &$this, 'wps_load_address_form') ); // DONE
-		add_action( 'wp_ajax_wps_save_address', array( &$this, 'wps_save_address') ); // DONE
-		add_action( 'wp_ajax_wps-address-edition-form-load', array( &$this, 'load_address_edition_form' ) ); // DONE
-		add_action( 'wp_ajax_wps-address-display-an-address', array( &$this, 'display_address' ) ); // DONE
+		add_action('wp_ajax_wps_load_address_form', array(&$this, 'wps_load_address_form')); // DONE
+		add_action('wp_ajax_wps_save_address', array(&$this, 'wps_save_address')); // DONE
+		add_action('wp_ajax_wps-address-edition-form-load', array(&$this, 'load_address_edition_form')); // DONE
+		add_action('wp_ajax_wps-address-display-an-address', array(&$this, 'display_address')); // DONE
 // 		add_action( 'wap_ajax_wps-address-save-address', array( &$this, 'wps_save_address' ) );
-		add_action( 'wp_ajax_wps-address-display-list', array( &$this, 'display_addresses_list' ) ); // DONE
-		add_action( 'wp_ajax_wps-address-add-new', array( &$this, 'display_address_adding_form' ) ); // DONE
-		add_action( 'wp_ajax_wps_delete_an_address', array( &$this, 'wps_delete_an_address' ) ); // DONE
-		add_action( 'wp_ajax_wps_reload_address_interface', array( &$this, 'wps_reload_address_interface' ) );
+		add_action('wp_ajax_wps-address-display-list', array(&$this, 'display_addresses_list')); // DONE
+		add_action('wp_ajax_wps-address-add-new', array(&$this, 'display_address_adding_form')); // DONE
+		add_action('wp_ajax_wps_delete_an_address', array(&$this, 'wps_delete_an_address')); // DONE
+		add_action('wp_ajax_wps_reload_address_interface', array(&$this, 'wps_reload_address_interface'));
 // 		add_action( 'wap_ajax_display_address_form', array( &$this, '') );
 // 		add_action( 'wap_ajax_wps-add-an-address-in-admin', array( $this, 'wps_add_an_address_in_admin' ) );
 
 		/*	Include the different javascript	*/
-		add_action( 'wp_enqueue_scripts', array( &$this, 'frontend_js' ) );
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_scripts' ) );
+		add_action('wp_enqueue_scripts', array(&$this, 'frontend_js'));
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_scripts'));
 
 		/**	Add addresses metaboxes to wordpress element	*/
-		add_action('add_meta_boxes', array( &$this, 'addresses_metaboxes'), 1);
+		add_action('add_meta_boxes', array(&$this, 'addresses_metaboxes'), 1);
 	}
 
-	function shortcode_display_addresses_list( $args ) {
-		$addresses = $this->get_addresses_list( $args[ 'id' ] );
-		require_once( wpshop_tools::get_template_part( WPS_LOCALISATION_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, 'backend', 'addresses') );
+	function shortcode_display_addresses_list($args) {
+		$addresses = $this->get_addresses_list($args['id']);
+		require_once(wpshop_tools::get_template_part(WPS_LOCALISATION_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, 'backend', 'addresses'));
 	}
 
 	/**
@@ -76,30 +76,30 @@ 
 	 */
 	function create_addresses_entity() {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT P.post_title, PM.meta_value FROM {$wpdb->posts} AS P INNER JOIN {$wpdb->postmeta} AS PM ON (PM.post_id = P.ID) WHERE P.post_name = %s AND PM.meta_key = %s", WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, '_wpshop_entity_params' );
-		$entity_definition = $wpdb->get_row( $query );
-		$entity_params = !empty( $entity_definition ) && !empty( $entity_definition->meta_value ) ? unserialize( $entity_definition->meta_value ) : null;
+		$query = $wpdb->prepare("SELECT P.post_title, PM.meta_value FROM {$wpdb->posts} AS P INNER JOIN {$wpdb->postmeta} AS PM ON (PM.post_id = P.ID) WHERE P.post_name = %s AND PM.meta_key = %s", WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, '_wpshop_entity_params');
+		$entity_definition = $wpdb->get_row($query);
+		$entity_params = !empty($entity_definition) && !empty($entity_definition->meta_value) ? unserialize($entity_definition->meta_value) : null;
 
 		$post_type_params = array(
 			'labels' => array(
-				'name'					=> __( 'Addresses' , 'wpshop' ),
-				'singular_name' 		=> __( 'Address', 'wpshop' ),
-				'add_new_item' 			=> __( 'New address', 'wpshop' ),
-				'add_new' 				=> __( 'New address', 'wpshop' ),
-				'edit_item' 			=> __( 'Edit address', 'wpshop' ),
-				'new_item' 				=> __( 'New address', 'wpshop' ),
-				'view_item' 			=> __( 'View address', 'wpshop' ),
-				'search_items' 			=> __( 'Search in addresses', 'wpshop' ),
-				'not_found' 			=> __( 'No address found', 'wpshop' ),
-				'not_found_in_trash' 	=> __( 'No address founded in trash', 'wpshop' ),
+				'name'					=> __('Addresses', 'wpshop'),
+				'singular_name' 		=> __('Address', 'wpshop'),
+				'add_new_item' 			=> __('New address', 'wpshop'),
+				'add_new' 				=> __('New address', 'wpshop'),
+				'edit_item' 			=> __('Edit address', 'wpshop'),
+				'new_item' 				=> __('New address', 'wpshop'),
+				'view_item' 			=> __('View address', 'wpshop'),
+				'search_items' 			=> __('Search in addresses', 'wpshop'),
+				'not_found' 			=> __('No address found', 'wpshop'),
+				'not_found_in_trash' 	=> __('No address founded in trash', 'wpshop'),
 				'parent_item_colon' 	=> '',
 			),
 			'description'         	=> '',
-			'supports'            	=> !empty($entity_params['support']) ? $entity_params['support'] : array( 'title' ),
+			'supports'            	=> !empty($entity_params['support']) ? $entity_params['support'] : array('title'),
 			'hierarchical'        	=> false,
 			'public'              	=> false,
 			'show_ui'             	=> false,
-			'show_in_menu'        	=> 'edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS,
+			'show_in_menu'        	=> 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS,
 			'show_in_nav_menus'   	=> false,
 			'show_in_admin_bar'   	=> false,
 			'can_export'          	=> false,
@@ -108,7 +108,7 @@ 
 			'publicly_queryable'  	=> false,
 			'rewrite'			  	=> false,
 		);
-		register_post_type( WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, $post_type_params );
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, $post_type_params);
 	}
 
 	/**
@@ -118,9 +118,9 @@ 
 	 *
 	 * @return array The new action list to use into customer list table
 	 */
-	function addresses_list_table_bulk_actions( $actions ){
-		unset( $actions[ 'edit' ] );
-		unset( $actions[ 'trash' ] );
+	function addresses_list_table_bulk_actions($actions) {
+		unset($actions['edit']);
+		unset($actions['trash']);
 
 		return $actions;
 	}
@@ -132,14 +132,14 @@ 
 	 *
 	 * @return array The new header to display
 	 */
-	function list_table_header( $current_header ) {
-		unset( $current_header['title'] );
-		unset( $current_header['date'] );
+	function list_table_header($current_header) {
+		unset($current_header['title']);
+		unset($current_header['date']);
 
-		$current_header['address_identifier'] = __( 'Address ID', 'wpshop' );
-		$current_header['address_element_name'] = __( 'Element', 'wpshop' );
-		$current_header['address_type'] = __( 'Address type', 'wpshop' );
-		$current_header['address_content'] = __( 'Address', 'wpshop' );
+		$current_header['address_identifier'] = __('Address ID', 'wpshop');
+		$current_header['address_element_name'] = __('Element', 'wpshop');
+		$current_header['address_type'] = __('Address type', 'wpshop');
+		$current_header['address_content'] = __('Address', 'wpshop');
 
 		return $current_header;
 	}
@@ -150,50 +150,50 @@ 
 	 * @param string $column The column identifier to modify output for
 	 * @param integer $post_id The current post identifier
 	 */
-	function list_table_column_content( $column, $post_id ) {
+	function list_table_column_content($column, $post_id) {
 		global $wpdb;
 
 		/**	Get wp_users idenfifier from customer id	*/
-		$query = $wpdb->prepare( "SELECT PA.post_parent AS post_parent, PA.post_author AS post_author, PC.ID AS parent_id, PC.post_title AS post_title, PC.post_type AS post_type FROM {$wpdb->posts} AS PC INNER JOIN {$wpdb->posts} AS PA ON ( PA.post_parent = PC.ID ) WHERE PA.ID = %d", $post_id);
-		$address_associated_element = $wpdb->get_row( $query );
+		$query = $wpdb->prepare("SELECT PA.post_parent AS post_parent, PA.post_author AS post_author, PC.ID AS parent_id, PC.post_title AS post_title, PC.post_type AS post_type FROM {$wpdb->posts} AS PC INNER JOIN {$wpdb->posts} AS PA ON ( PA.post_parent = PC.ID ) WHERE PA.ID = %d", $post_id);
+		$address_associated_element = $wpdb->get_row($query);
 
 		/**	SCOTCH - Define the associated element type - SCOTCH	*/
 		$address_associated_element_type = $address_associated_element->post_type;
-		if ( $address_associated_element->post_parent == $address_associated_element->post_author ) {
+		if ($address_associated_element->post_parent == $address_associated_element->post_author) {
 			$address_associated_element_type = WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS;
 		}
 
 		/**	Get the	associated element definition	*/
-		$associated_element_definition = get_post_type_object( $address_associated_element_type );
+		$associated_element_definition = get_post_type_object($address_associated_element_type);
 
 		/**	Get address informations	*/
-		$address_meta = get_post_meta( $post_id );
+		$address_meta = get_post_meta($post_id);
 
 		/**	Get user data	*/
-		switch ( $address_associated_element_type ) {
+		switch ($address_associated_element_type) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS:
-				$associated_customer = get_userdata( $address_associated_element->post_author );
+				$associated_customer = get_userdata($address_associated_element->post_author);
 				$customer_name_to_display = $associated_customer->display_name;
-				if ( !empty( $associated_customer->first_name ) && !empty( $associated_customer->last_name ) ) {
-					$customer_name_to_display = $associated_customer->last_name . ' ' .  $associated_customer->first_name ;
+				if (!empty($associated_customer->first_name) && !empty($associated_customer->last_name)) {
+					$customer_name_to_display = $associated_customer->last_name . ' ' . $associated_customer->first_name;
 				}
-				$element_main_infos = ( !empty( $associated_element_definition ) && !empty( $associated_element_definition->labels ) && !empty( $associated_element_definition->labels->singular_name ) ?  $associated_element_definition->labels->singular_name . ' - ' : "" ) . $address_associated_element->parent_id . ' - ' . $customer_name_to_display;
+				$element_main_infos = (!empty($associated_element_definition) && !empty($associated_element_definition->labels) && !empty($associated_element_definition->labels->singular_name) ? $associated_element_definition->labels->singular_name . ' - ' : "") . $address_associated_element->parent_id . ' - ' . $customer_name_to_display;
 			break;
 
 			default:
-				$element_main_infos = ( !empty( $associated_element_definition ) && !empty( $associated_element_definition->labels ) && !empty( $associated_element_definition->labels->singular_name ) ?  $associated_element_definition->labels->singular_name . ' - ' : "" ) . $address_associated_element->parent_id . ' - ' . $address_associated_element->post_title;
+				$element_main_infos = (!empty($associated_element_definition) && !empty($associated_element_definition->labels) && !empty($associated_element_definition->labels->singular_name) ? $associated_element_definition->labels->singular_name . ' - ' : "") . $address_associated_element->parent_id . ' - ' . $address_associated_element->post_title;
 			break;
 		}
 
 		/**	Switch current column for custom case	*/
 		$use_template = true;
-		switch ( $column ) { }
+		switch ($column) { }
 
 		/**	Require the template for displaying the current column	*/
-		if ( $use_template ) {
-			$template = wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, 'backend', 'addresses_listtable/' . $column );
-			if ( is_file( $template ) ) {
-				require( $template );
+		if ($use_template) {
+			$template = wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, 'backend', 'addresses_listtable/' . $column);
+			if (is_file($template)) {
+				require($template);
 			}
 		}
 	}
@@ -203,9 +203,9 @@ 
 	 *
 	 * @param WP_Object $query The current query launched for retrieving addresses
 	 */
-	function addresses_custom_query( $query ) {
-		if( is_admin() && $query->query['post_type'] == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS && $query->is_main_query() ) {
-	        add_filter( 'posts_orderby', array( $this, 'addresses_custom_query_order' ) );
+	function addresses_custom_query($query) {
+		if (is_admin() && $query->query['post_type'] == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS && $query->is_main_query()) {
+	        add_filter('posts_orderby', array($this, 'addresses_custom_query_order'));
 		}
 	}
 
@@ -227,15 +227,15 @@ 
 	 *
 	 * @since 1.0 - WPShop 1.3.7.0
 	 */
-	function addresses_metaboxes( $post ) {
+	function addresses_metaboxes($post) {
 		global $wpdb;
 
-		$query = $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_type = %s", $post, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES );
-		$parent = $wpdb->get_var( $query );
-		if ( !empty( $parent ) ) {
-			$address_meta_box_checking = get_post_meta( $parent, '_wpshop_entity_attached_address', true);
-			if ( !empty($address_meta_box_checking) ) {
-				add_meta_box( 'wps_attached_addresses', __('Attached addresses', 'wpshop'), array( &$this, 'addresses_metaboxes_content' ), $post, 'normal', 'default' );
+		$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_type = %s", $post, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
+		$parent = $wpdb->get_var($query);
+		if (!empty($parent)) {
+			$address_meta_box_checking = get_post_meta($parent, '_wpshop_entity_attached_address', true);
+			if (!empty($address_meta_box_checking)) {
+				add_meta_box('wps_attached_addresses', __('Attached addresses', 'wpshop'), array(&$this, 'addresses_metaboxes_content'), $post, 'normal', 'default');
 			}
 		}
 	}
@@ -248,9 +248,9 @@ 
 	 *
 	 * @since 1.0 - WPShop 1.3.7.0
 	 */
-	function addresses_metaboxes_content( $post, $args ) {
-		$addresses = self::get_addresses_list( $post->ID );
-		require( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address", "metabox") );
+	function addresses_metaboxes_content($post, $args) {
+		$addresses = self::get_addresses_list($post->ID);
+		require(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address", "metabox"));
 	}
 
 	/**
@@ -259,19 +259,19 @@ 
 	 * @since 1.0 - WPShop 1.3.7.0
 	 */
 	function frontend_js() {
-		wp_register_style( 'wps_address_frontend_css', WPS_ADDRESS_URL . '/assets/css/frontend.css' );
-		wp_enqueue_style( 'wps_address_frontend_css' );
-		wp_enqueue_script( 'wps_address_js',  WPS_ADDRESS_URL . '/assets/frontend/js/wps_address.js', array( 'jquery', 'jquery-form' ) );
+		wp_register_style('wps_address_frontend_css', WPS_ADDRESS_URL . '/assets/css/frontend.css');
+		wp_enqueue_style('wps_address_frontend_css');
+		wp_enqueue_script('wps_address_js', WPS_ADDRESS_URL . '/assets/frontend/js/wps_address.js', array('jquery', 'jquery-form'));
 	}
 
 	function admin_scripts() {
 		global $current_screen;
-	    if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ), true ) )
+	    if (!in_array($current_screen->post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS), true))
 	        return;
 
-		wp_enqueue_script( 'wps_address_js',  WPS_ADDRESS_URL . '/assets/backend/js/wps_address.js', array( 'jquery', 'jquery-form' ) );
-		wp_register_style( 'wps_address_backend_css', WPS_ADDRESS_URL . '/assets/backend/css/backend.css'/*, array( '' )*/ );
-		wp_enqueue_style( 'wps_address_backend_css' );
+		wp_enqueue_script('wps_address_js', WPS_ADDRESS_URL . '/assets/backend/js/wps_address.js', array('jquery', 'jquery-form'));
+		wp_register_style('wps_address_backend_css', WPS_ADDRESS_URL . '/assets/backend/css/backend.css'/*, array( '' )*/);
+		wp_enqueue_style('wps_address_backend_css');
 	}
 
 	/** Load module/addon automatically to existing template list
@@ -280,11 +280,11 @@ 
 	 *
 	 * @return array The template with new elements
 	 */
-	function custom_template_load( $templates ) {
-		include( WPS_LOCALISATION_TEMPLATES_MAIN_DIR . 'wpshop/main_elements.tpl.php');
+	function custom_template_load($templates) {
+		include(WPS_LOCALISATION_TEMPLATES_MAIN_DIR . 'wpshop/main_elements.tpl.php');
 
 		$wpshop_display = new wpshop_display();
-		$templates = $wpshop_display->add_modules_template_to_internal( $tpl_element, $templates );
+		$templates = $wpshop_display->add_modules_template_to_internal($tpl_element, $templates);
 		unset($tpl_element);
 
 		return $templates;
@@ -298,23 +298,23 @@ 
 	 * @param Integer $user_id
 	 * @return Ambigous <multitype:, mixed, string, boolean, unknown, string>
 	 */
-	public static function get_addresses_list_no_hidden_attributes( $user_id ) {
+	public static function get_addresses_list_no_hidden_attributes($user_id) {
 		global $wpdb;
-		$query = $wpdb->prepare( 'SELECT ID FROM '. $wpdb->posts . ' WHERE post_type = %s AND post_parent = %s', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, $user_id );
-		$addresses_ids = $wpdb->get_col( $query );
-		$address_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS );
+		$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_parent = %s', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, $user_id);
+		$addresses_ids = $wpdb->get_col($query);
+		$address_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
 		$addresses_result = array();
-		foreach( $addresses_ids as $address_id ) {
-			$address_post_meta = get_post_meta( $address_id, '_wpshop_address_metadata', true );
-			$address_type_id = get_post_meta( $address_id, '_wpshop_address_attribute_set_id', true );
-			$query = $wpdb->prepare( 'SELECT attribute_id FROM '.WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND entity_type_id = %d ORDER BY position', $address_type_id, $address_entity_id );
-			$attributes_ids = $wpdb->get_col( $query );
-			if( !empty( $attributes_ids ) ) {
-				foreach( $attributes_ids as $attributes_id ) {
-					$attribute_def = wpshop_attributes::getElement( $attributes_id, '"valid"', 'id' );
-					if( !empty( $attribute_def ) && !empty( $address_post_meta[ $attribute_def->code ] ) && $attribute_def->frontend_input != 'hidden' ) {
-						$addresses_result[ $address_type_id ][ $address_id ][ $attribute_def->code ]['label'] = stripslashes( __( $attribute_def->frontend_label , 'wpshop' ) );
-						$addresses_result[ $address_type_id ][ $address_id ][ $attribute_def->code ]['value'] = stripslashes( __( $address_post_meta[ $attribute_def->code ], 'wpshop' ) );
+		foreach ($addresses_ids as $address_id) {
+			$address_post_meta = get_post_meta($address_id, '_wpshop_address_metadata', true);
+			$address_type_id = get_post_meta($address_id, '_wpshop_address_attribute_set_id', true);
+			$query = $wpdb->prepare('SELECT attribute_id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND entity_type_id = %d ORDER BY position', $address_type_id, $address_entity_id);
+			$attributes_ids = $wpdb->get_col($query);
+			if (!empty($attributes_ids)) {
+				foreach ($attributes_ids as $attributes_id) {
+					$attribute_def = wpshop_attributes::getElement($attributes_id, '"valid"', 'id');
+					if (!empty($attribute_def) && !empty($address_post_meta[$attribute_def->code]) && $attribute_def->frontend_input != 'hidden') {
+						$addresses_result[$address_type_id][$address_id][$attribute_def->code]['label'] = stripslashes(__($attribute_def->frontend_label, 'wpshop'));
+						$addresses_result[$address_type_id][$address_id][$attribute_def->code]['value'] = stripslashes(__($address_post_meta[$attribute_def->code], 'wpshop'));
 					}
 				}
 			}
@@ -327,16 +327,16 @@ 
 	 * @param Integer $user_id
 	 * @return Ambigous <multitype:, mixed, string, boolean, unknown, string>
 	 */
-	public static function get_addresses_list( $user_id ) {
+	public static function get_addresses_list($user_id) {
 		global $wpdb;
 		$addresses_list = array();
-		$query = $wpdb->prepare( 'SELECT ID FROM '. $wpdb->posts. ' WHERE post_type = %s AND post_parent = %s', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, $user_id );
-		$addresses = $wpdb->get_results( $query );
-		foreach( $addresses as $address ) {
-			$address_post_meta = get_post_meta( $address->ID, '_wpshop_address_metadata', true);
-			$address_type_post_meta = get_post_meta( $address->ID, '_wpshop_address_attribute_set_id', true);
+		$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_parent = %s', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, $user_id);
+		$addresses = $wpdb->get_results($query);
+		foreach ($addresses as $address) {
+			$address_post_meta = get_post_meta($address->ID, '_wpshop_address_metadata', true);
+			$address_type_post_meta = get_post_meta($address->ID, '_wpshop_address_attribute_set_id', true);
 
-			if( !empty($address_post_meta) && !empty($address_type_post_meta) ) {
+			if (!empty($address_post_meta) && !empty($address_type_post_meta)) {
 				$addresses_list[$address_type_post_meta][$address->ID] = $address_post_meta;
 			}
 		}
@@ -344,58 +344,58 @@ 
 	}
 
 	/** Display Address**/
-	public static function display_an_address( $address, $address_id = '', $address_type_id = '' ) {
+	public static function display_an_address($address, $address_id = '', $address_type_id = '') {
 		global $wpdb;
 		$countries = unserialize(WPSHOP_COUNTRY_LIST);
 		$output = '';
-		if ( !empty($address) ) {
+		if (!empty($address)) {
 			$has_model = false;
 
 			/** Check if a model exists**/
-			if ( !empty($address_id) || !empty( $address_type_id ) ) {
-				$address_type = ( !empty($address_type_id) ) ? $address_type_id : get_post_meta( $address_id, '_wpshop_address_attribute_set_id', true );
-				if( !empty($address_type) ) {
+			if (!empty($address_id) || !empty($address_type_id)) {
+				$address_type = (!empty($address_type_id)) ? $address_type_id : get_post_meta($address_id, '_wpshop_address_attribute_set_id', true);
+				if (!empty($address_type)) {
 					/** Shipping & Billing option **/
-					$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-					if ( !empty($shipping_option) && !empty($shipping_option['choice']) && $shipping_option['choice'] == $address_type && !empty($shipping_option['display_model']) ) {
-						$display_model =  $shipping_option['display_model'];
+					$shipping_option = get_option('wpshop_shipping_address_choice');
+					if (!empty($shipping_option) && !empty($shipping_option['choice']) && $shipping_option['choice'] == $address_type && !empty($shipping_option['display_model'])) {
+						$display_model = $shipping_option['display_model'];
 						$has_model = true;
 
 					}
 					else {
-						$billing_option = get_option( 'wpshop_billing_address' );
-						if ( !empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $address_type && !empty($billing_option['display_model']) ) {
-							$display_model =  $billing_option['display_model'];
+						$billing_option = get_option('wpshop_billing_address');
+						if (!empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $address_type && !empty($billing_option['display_model'])) {
+							$display_model = $billing_option['display_model'];
 							$has_model = true;
 						}
 					}
 				}
 			}
 			$has_model = false;
-			if (  $has_model ) {
-				foreach( $display_model as $group_id => $group ) {
-					foreach( $group as $att_id => $att ) {
-						if ( !empty($att) ) {
+			if ($has_model) {
+				foreach ($display_model as $group_id => $group) {
+					foreach ($group as $att_id => $att) {
+						if (!empty($att)) {
 							// Get attribute def
-							$attribute_id = str_replace( 'attribute_', '' , $att );
-							if( !empty($attribute_id) ) {
-								$attribute_def = wpshop_attributes::getElement( $attribute_id, '"valid"', 'id' );
-								if ( !empty($attribute_def) ) {
-									if ( $attribute_def->frontend_input == 'select' ) {
-										$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d',$address[ $attribute_def->code] );
-										$output .= '<strong>'.__( $attribute_def->frontend_label, 'wpshop').' :</strong> '.__( $wpdb->get_var( $query ), 'wpshop' ).' ';
+							$attribute_id = str_replace('attribute_', '', $att);
+							if (!empty($attribute_id)) {
+								$attribute_def = wpshop_attributes::getElement($attribute_id, '"valid"', 'id');
+								if (!empty($attribute_def)) {
+									if ($attribute_def->frontend_input == 'select') {
+										$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $address[$attribute_def->code]);
+										$output .= '<strong>' . __($attribute_def->frontend_label, 'wpshop') . ' :</strong> ' . __($wpdb->get_var($query), 'wpshop') . ' ';
 									}
-									elseif( $attribute_def->frontend_verification == 'country' ) {
-										$output .= ( !empty($countries[ $address[ $attribute_def->code] ]) ) ? '<strong>'.__( $attribute_def->frontend_label, 'wpshop').' :</strong> '.__( $countries[ $address[ $attribute_def->code] ], 'wpshop' ).' ' : '';
+									elseif ($attribute_def->frontend_verification == 'country') {
+										$output .= (!empty($countries[$address[$attribute_def->code]])) ? '<strong>' . __($attribute_def->frontend_label, 'wpshop') . ' :</strong> ' . __($countries[$address[$attribute_def->code]], 'wpshop') . ' ' : '';
 									}
 									else {
-										$output .= ( !empty($address[ $attribute_def->code]) ) ? '<strong>'.__( $attribute_def->frontend_label, 'wpshop').' :</strong> '.$address[ $attribute_def->code].' ' : ' ';
+										$output .= (!empty($address[$attribute_def->code])) ? '<strong>' . __($attribute_def->frontend_label, 'wpshop') . ' :</strong> ' . $address[$attribute_def->code] . ' ' : ' ';
 									}
 								}
 								//End Line
-								$next_element = next( $display_model[$group_id] );
-								$end_line = strstr( $next_element, '-end-line-', true );
-								if ( !empty($end_line) && $end_line == 'wps-attribute' ) {
+								$next_element = next($display_model[$group_id]);
+								$end_line = strstr($next_element, '-end-line-', true);
+								if (!empty($end_line) && $end_line == 'wps-attribute') {
 									$output .= '<br/>';
 								}
 							}
@@ -404,29 +404,29 @@ 
 				}
 			}
 			else {
-				if( !empty($address_type) ) {
+				if (!empty($address_type)) {
 					$tmp_array = array();
-					$address_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS );
-					$query = $wpdb->prepare( 'SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND entity_type_id = %d ORDER BY position', $address_type, $address_entity_id);
-					$attributes_ids = $wpdb->get_results( $query );
-					if( !empty($attributes_ids) ) {
-						foreach( $attributes_ids as $attributes_id ) {
-							if ( !empty( $attributes_id->attribute_id ) ) {
-								$attribute_def = wpshop_attributes::getElement( $attributes_id->attribute_id, '"valid"', 'id' );
-								if( $attribute_def->frontend_input != 'hidden') {
-									if( !empty($attribute_def) && !empty($address[ $attribute_def->code ]) && $attribute_def->frontend_input != 'hidden' ) {
-										$tmp_array[ $attribute_def->code]['label'] =  stripslashes( __( $attribute_def->frontend_label , 'wpshop' ) );
-
-										if( $attribute_def->frontend_verification == 'country' ) {
-											$tmp_array[ $attribute_def->code]['value'] =  ( !empty($countries[ $address[ $attribute_def->code] ]) ) ? stripslashes( __( $countries[ $address[ $attribute_def->code] ], 'wpshop' ) ) : stripslashes( $address[ $attribute_def->code ] );
+					$address_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND entity_type_id = %d ORDER BY position', $address_type, $address_entity_id);
+					$attributes_ids = $wpdb->get_results($query);
+					if (!empty($attributes_ids)) {
+						foreach ($attributes_ids as $attributes_id) {
+							if (!empty($attributes_id->attribute_id)) {
+								$attribute_def = wpshop_attributes::getElement($attributes_id->attribute_id, '"valid"', 'id');
+								if ($attribute_def->frontend_input != 'hidden') {
+									if (!empty($attribute_def) && !empty($address[$attribute_def->code]) && $attribute_def->frontend_input != 'hidden') {
+										$tmp_array[$attribute_def->code]['label'] = stripslashes(__($attribute_def->frontend_label, 'wpshop'));
+
+										if ($attribute_def->frontend_verification == 'country') {
+											$tmp_array[$attribute_def->code]['value'] = (!empty($countries[$address[$attribute_def->code]])) ? stripslashes(__($countries[$address[$attribute_def->code]], 'wpshop')) : stripslashes($address[$attribute_def->code]);
 										}
-										elseif( in_array( $attribute_def->frontend_input, array('select', 'checkbox') ) ) {
-											$query = $wpdb->prepare( 'SELECT label FROM '. WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $address[ $attribute_def->code] );
-											$value = $wpdb->get_var( $query );
-											$tmp_array[ $attribute_def->code]['value'] = ( !empty($value) ) ? stripslashes(  __( $value, 'wpshop' ) ) : '';
+										elseif (in_array($attribute_def->frontend_input, array('select', 'checkbox'))) {
+											$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $address[$attribute_def->code]);
+											$value = $wpdb->get_var($query);
+											$tmp_array[$attribute_def->code]['value'] = (!empty($value)) ? stripslashes(__($value, 'wpshop')) : '';
 										}
 										else {
-											$tmp_array[ $attribute_def->code]['value'] = stripslashes(   __( $address[ $attribute_def->code ], 'wpshop' ) );
+											$tmp_array[$attribute_def->code]['value'] = stripslashes(__($address[$attribute_def->code], 'wpshop'));
 										}
 									}
 								}
@@ -435,12 +435,12 @@ 
 						$address = $tmp_array;
 					}
 				}
-				foreach( $address as $element_code => $element_value ) {
-					if( is_array($element_value) ) {
-						$output .= '<span class="wps-'.$element_code.'"><strong>' .stripslashes( $element_value['label'] ). ' :</strong> ' .stripslashes( $element_value['value'] ). '</span>';
+				foreach ($address as $element_code => $element_value) {
+					if (is_array($element_value)) {
+						$output .= '<span class="wps-' . $element_code . '"><strong>' . stripslashes($element_value['label']) . ' :</strong> ' . stripslashes($element_value['value']) . '</span>';
 					}
 					else {
-						$output .= '<span class="wps-'.$element_code.'">' .stripslashes( $element_value ). '</span>';
+						$output .= '<span class="wps-' . $element_code . '">' . stripslashes($element_value) . '</span>';
 					}
 				}
 			}
@@ -457,13 +457,13 @@ 
 	 *
 	 * @return string The complete html output for customer addresses
 	 */
-	function get_addresses_by_type( $address_type_id, $address_type_title, $args = array() ) {
+	function get_addresses_by_type($address_type_id, $address_type_title, $args = array()) {
 		global $wpdb;
 		/**	Get current customer addresses list	*/
-		if ( is_admin() ) {
-			$post = !empty( $_GET['post'] ) ? (array) $_GET['post'] : array();
-			$post = get_post( $post );
-			if ( !empty($post->post_parent) ) {
+		if (is_admin()) {
+			$post = !empty($_GET['post']) ? (array)$_GET['post'] : array();
+			$post = get_post($post);
+			if (!empty($post->post_parent)) {
 				$customer_id = $post->post_parent;
 			}
 			else {
@@ -482,85 +482,85 @@ 
 					AND ADDRESSES.post_parent = %d
 				AND ADDRESSES_META.meta_key = %s
 				AND ADDRESSES_META.meta_value = %d",
-				WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, $customer_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_attribute_set_id', $address_type_id);
+				WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, $customer_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $address_type_id);
 		$addresses = $wpdb->get_results($query);
 		$addresses_list = '';
 
 
 		/**	Initialize	*/
 		$tpl_component = array();
-		$tpl_component['CUSTOMER_ADDRESS_TYPE_TITLE'] = ( !empty($args) && !empty($args['first']) && $args['first'] ) ? __('Your address', 'wpshop') : $address_type_title;
+		$tpl_component['CUSTOMER_ADDRESS_TYPE_TITLE'] = (!empty($args) && !empty($args['first']) && $args['first']) ? __('Your address', 'wpshop') : $address_type_title;
 		$tpl_component['LOADING_ICON'] = WPSHOP_LOADING_ICON;
 		$tpl_component['ADDRESS_BUTTONS'] = '';
-		if( count($addresses) > 0 ) {
-			$tpl_component['ADD_NEW_ADDRESS_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?')===false ? '?' : '&amp;'). 'action=add_address&type=' .$address_type_id;
+		if (count($addresses) > 0) {
+			$tpl_component['ADD_NEW_ADDRESS_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?') === false ? '?' : '&amp;') . 'action=add_address&type=' . $address_type_id;
 		}
 		else {
-			$tpl_component['ADD_NEW_ADDRESS_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?')===false ? '?' : '&amp;'). 'action=add_address&type=' .$address_type_id .'&first';
+			$tpl_component['ADD_NEW_ADDRESS_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?') === false ? '?' : '&amp;') . 'action=add_address&type=' . $address_type_id . '&first';
 		}
-		$tpl_component['ADDRESS_TYPE'] = ( !empty($address_type_title) && ($address_type_title == __('Shipping address', 'wpshop'))) ? 'shipping_address' : 'billing_address';
-		$tpl_component['ADD_NEW_ADDRESS_TITLE'] = sprintf(__('Add a new %s', 'wpshop'), ( ( !empty($args) && !empty($args['first']) && $args['first'] ) ? __('address', 'wpshop') : $address_type_title ));
+		$tpl_component['ADDRESS_TYPE'] = (!empty($address_type_title) && ($address_type_title == __('Shipping address', 'wpshop'))) ? 'shipping_address' : 'billing_address';
+		$tpl_component['ADD_NEW_ADDRESS_TITLE'] = sprintf(__('Add a new %s', 'wpshop'), ((!empty($args) && !empty($args['first']) && $args['first']) ? __('address', 'wpshop') : $address_type_title));
 
 
 		/**	Read customer list	*/
-		if( count($addresses) > 0 ) {
+		if (count($addresses) > 0) {
 			/**	Get the fields for addresses	*/
 			$address_fields = wps_address::get_addresss_form_fields_by_type($address_type_id);
 			$first = true;
 			$tpl_component['ADDRESS_COMBOBOX_OPTION'] = '';
 			$nb_of_addresses = 0;
-			foreach ( $addresses as $address ) {
+			foreach ($addresses as $address) {
 				// Display the addresses
 				/** If there isn't address in SESSION we display the first address of list by default */
-				if ( empty($_SESSION[$tpl_component['ADDRESS_TYPE']]) && $first && !is_admin() ) {
+				if (empty($_SESSION[$tpl_component['ADDRESS_TYPE']]) && $first && !is_admin()) {
 					$address_id = $address->ID;
-					if ( !is_admin() ) {
+					if (!is_admin()) {
 						$_SESSION[$tpl_component['ADDRESS_TYPE']] = $address->ID;
 					}
 				}
 				else {
-					$address_id = ( !empty($_SESSION[$tpl_component['ADDRESS_TYPE']]) )  ? $_SESSION[$tpl_component['ADDRESS_TYPE']] : '';
+					$address_id = (!empty($_SESSION[$tpl_component['ADDRESS_TYPE']])) ? $_SESSION[$tpl_component['ADDRESS_TYPE']] : '';
 				}
-				$address_selected_infos = get_post_meta($address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-				$address_infos = get_post_meta($address->ID, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
+				$address_selected_infos = get_post_meta($address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+				$address_infos = get_post_meta($address->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
 
 
-				if ( !empty($address_infos) ) {
+				if (!empty($address_infos)) {
 
 					$tpl_component['ADDRESS_ID'] = $address->ID;
 					/** If no address was selected, we select the first of the list **/
 					$tpl_component['CUSTOMER_ADDRESS_CONTENT'] = self::display_an_address($address_fields, $address_selected_infos, $address_id);
 					$tpl_component['ADDRESS_BUTTONS'] = wpshop_display::display_template_element('addresses_box_actions_button_edit', $tpl_component);
-					$tpl_component['choosen_address_LINK_EDIT'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?')===false ? '?' : '&') . 'action=editAddress&amp;id='.$address_id;
+					$tpl_component['choosen_address_LINK_EDIT'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?') === false ? '?' : '&') . 'action=editAddress&amp;id=' . $address_id;
 					$tpl_component['DEFAULT_ADDRESS_ID'] = $address_id;
 					$tpl_component['ADRESS_CONTAINER_CLASS'] = ' wpshop_customer_adress_container_' . $address->ID;
 					$tpl_component['CUSTOMER_CHOOSEN_ADDRESS'] = wpshop_display::display_template_element('display_address_container', $tpl_component);
-					if ( empty($tpl_component['CUSTOMER_ADDRESS_CONTENT']) ) {
-						$tpl_component['CUSTOMER_CHOOSEN_ADDRESS'] = '<span style="color:red;">'.__('No data','wpshop').'</span>';
+					if (empty($tpl_component['CUSTOMER_ADDRESS_CONTENT'])) {
+						$tpl_component['CUSTOMER_CHOOSEN_ADDRESS'] = '<span style="color:red;">' . __('No data', 'wpshop') . '</span>';
 					}
 
-					$tpl_component['ADDRESS_COMBOBOX_OPTION'] .= '<option value="' .$address->ID. '" ' .( ( !empty($_SESSION[$tpl_component['ADDRESS_TYPE']]) && $_SESSION[$tpl_component['ADDRESS_TYPE']] == $address->ID) ? 'selected="selected"' : null). '>' . (!empty($address_infos['address_title']) ? $address_infos['address_title'] : $address_type_title) . '</option>';
+					$tpl_component['ADDRESS_COMBOBOX_OPTION'] .= '<option value="' . $address->ID . '" ' . ((!empty($_SESSION[$tpl_component['ADDRESS_TYPE']]) && $_SESSION[$tpl_component['ADDRESS_TYPE']] == $address->ID) ? 'selected="selected"' : null) . '>' . (!empty($address_infos['address_title']) ? $address_infos['address_title'] : $address_type_title) . '</option>';
 					$nb_of_addresses++;
 				}
 				$first = false;
 			}
 			$tpl_component['ADDRESS_COMBOBOX'] = '';
-			if ( !is_admin() ) {
+			if (!is_admin()) {
 				$tpl_component['ADDRESS_COMBOBOX'] = (!empty($tpl_component['ADDRESS_COMBOBOX_OPTION']) && ($nb_of_addresses > 1)) ? wpshop_display::display_template_element('addresses_type_combobox', $tpl_component) : '';
 			}
 		}
 		else {
-			if ( !empty($args) && !empty($args['first']) && $args['first'] ) {
+			if (!empty($args) && !empty($args['first']) && $args['first']) {
 				$tpl_component['ADDRESS_TYPE'] = 'first_address';
 			}
 			$tpl_component['ADDRESS_ID'] = 0;
 			$tpl_component['DEFAULT_ADDRESS_ID'] = 0;
 			$tpl_component['ADDRESS_COMBOBOX'] = '';
-			$tpl_component['CUSTOMER_CHOOSEN_ADDRESS'] = sprintf( __('You don\'t have any %s, %splease create a new one%s', 'wpshop'), ( (!empty($args) && !empty($args['first']) && $args['first']) ? __('address', 'wpshop') : strtolower($address_type_title) ) , '<a href="' . $tpl_component['ADD_NEW_ADDRESS_LINK'] . '" >', '</a>' );
+			$tpl_component['CUSTOMER_CHOOSEN_ADDRESS'] = sprintf(__('You don\'t have any %s, %splease create a new one%s', 'wpshop'), ((!empty($args) && !empty($args['first']) && $args['first']) ? __('address', 'wpshop') : strtolower($address_type_title)), '<a href="' . $tpl_component['ADD_NEW_ADDRESS_LINK'] . '" >', '</a>');
 		}
 
 		$tpl_component['ADDRESS_BUTTONS'] .= wpshop_display::display_template_element('addresses_box_actions_button_new_address', $tpl_component);
-		if ( !empty($args['only_display']) && ($args['only_display'] == 'yes') ) {
+		if (!empty($args['only_display']) && ($args['only_display'] == 'yes')) {
 			$tpl_component['ADDRESS_BUTTONS'] = '';
 		}
 
@@ -580,26 +580,26 @@ 
 	 *
 	 * @return array Un tableau contenant l'affihage du formulaire en premier index et le titre du forulaire en second index.
 	 */
-	function loading_address_form( $address_type_id, $address_id = '', $customer_id = '' ) {
+	function loading_address_form($address_type_id, $address_id = '', $customer_id = '') {
 		$first_address_checking = false;
 		// $customer_id = wps_customer_ctr::get_customer_id_by_author_id( $user_id );
-		if ( ! empty( $address_id ) ) {
-			$title = __( 'Edit your address', 'wpshop' );
-		} elseif ( $address_type_id ) {
-			$billing_option = get_option( 'wpshop_billing_address' );
+		if (!empty($address_id)) {
+			$title = __('Edit your address', 'wpshop');
+		} elseif ($address_type_id) {
+			$billing_option = get_option('wpshop_billing_address');
 
-			$addresses = self::get_addresses_list( $customer_id );
-			$list_addresses = ( ! empty( $addresses[ $billing_option['choice'] ] ) ) ? $addresses[ $billing_option['choice'] ] : array();
-			$first_address_checking = ( empty( $list_addresses ) ) ? true : false;
+			$addresses = self::get_addresses_list($customer_id);
+			$list_addresses = (!empty($addresses[$billing_option['choice']])) ? $addresses[$billing_option['choice']] : array();
+			$first_address_checking = (empty($list_addresses)) ? true : false;
 
-			$title = __( 'Add a new address', 'wpshop' );
+			$title = __('Add a new address', 'wpshop');
 		}
 
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, 'common', 'address', 'form' ) );
+		require(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, 'common', 'address', 'form'));
 		$form = ob_get_clean();
 
-		return array( $form, $title );
+		return array($form, $title);
 	}
 
 	/**
@@ -607,32 +607,32 @@ 
 	 * @param $typeof
 	 * @return array
 	 */
-	public static function get_addresss_form_fields_by_type ( $typeof, $id ='' ) {
-		$submit_billing_and_shipping_info = !empty( $_POST['submitbillingAndShippingInfo'] ) ? sanitize_key( $_POST['submitbillingAndShippingInfo'] ) : '';
+	public static function get_addresss_form_fields_by_type($typeof, $id = '') {
+		$submit_billing_and_shipping_info = !empty($_POST['submitbillingAndShippingInfo']) ? sanitize_key($_POST['submitbillingAndShippingInfo']) : '';
 
 		$address = array();
 		$all_addresses = '';
-		$attribute = !empty( $_POST['attribute'] ) ? (array) $_POST['attribute'] : array();
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
 		/*	Get the attribute set details in order to build the product interface	*/
 
 		$atribute_set_details = wpshop_attributes_set::getAttributeSetDetails($typeof, "'valid'");
-		if ( !empty($atribute_set_details) ) {
+		if (!empty($atribute_set_details)) {
 			foreach ($atribute_set_details as $productAttributeSetDetail) {
 				$address = array();
 				$group_name = $productAttributeSetDetail['name'];
 
-				if(count($productAttributeSetDetail['attribut']) >= 1){
-					foreach($productAttributeSetDetail['attribut'] as $attribute) {
-						if(!empty($attribute->id)) {
-							if ( !empty( $submit_billing_and_shipping_info ) ) {
+				if (count($productAttributeSetDetail['attribut']) >= 1) {
+					foreach ($productAttributeSetDetail['attribut'] as $attribute) {
+						if (!empty($attribute->id)) {
+							if (!empty($submit_billing_and_shipping_info)) {
 								$value = $attribute[$typeof][$attribute->data_type][$attribute->code];
 							}
 							else {
 								$value = wpshop_attributes::getAttributeValueForEntityInSet($attribute->data_type, $attribute->id, wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS), (int)$id, array('intrinsic' => $attribute->is_intrinsic, 'backend_input' => $attribute->backend_input));
 							}
-							$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute, $value, array() );
-							$attribute_output_def['id'] = 'address_' . $typeof . '_' .$attribute_output_def['id'];
-							$address[str_replace( '-', '_', sanitize_title($group_name) ).'_'.$attribute->code] = $attribute_output_def;
+							$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute, $value, array());
+							$attribute_output_def['id'] = 'address_' . $typeof . '_' . $attribute_output_def['id'];
+							$address[str_replace('-', '_', sanitize_title($group_name)) . '_' . $attribute->code] = $attribute_output_def;
 						}
 					}
 				}
@@ -657,29 +657,29 @@ 
 	 *
 	 * @return array                        [description]
 	 */
-	public static function save_address_infos( $attribute_set_id, $address_id_to_copy = 0, $address_info_to_copy = array(), $customer_id = false, $post_id = false ) {
-		if ( empty( $address_info_to_copy ) ) {
-			$address_info_to_copy = (array) $_POST;
+	public static function save_address_infos($attribute_set_id, $address_id_to_copy = 0, $address_info_to_copy = array(), $customer_id = false, $post_id = false) {
+		if (empty($address_info_to_copy)) {
+			$address_info_to_copy = (array)$_POST;
 		}
 
-		$adress_save_the_first = ! empty( $address_info_to_copy['wps-address-save-the-first'] ) ? sanitize_text_field( $address_info_to_copy['wps-address-save-the-first'] ) : '';
+		$adress_save_the_first = !empty($address_info_to_copy['wps-address-save-the-first']) ? sanitize_text_field($address_info_to_copy['wps-address-save-the-first']) : '';
 
-		$attribute = (array) $address_info_to_copy['attribute'];
+		$attribute = (array)$address_info_to_copy['attribute'];
 
-		$type_of_form = (int) $address_info_to_copy['type_of_form'];
-		$current_item_edited = ! empty( $address_info_to_copy['attribute'][ $attribute_set_id ]['item_id'] ) ? (int) wpshop_tools::varSanitizer( $address_info_to_copy['attribute'][ $attribute_set_id ]['item_id'] ) : null;
-		$current_attribute_set_id = ! empty( $address_info_to_copy['current_attribute_set_id'] ) ? (int) $address_info_to_copy['current_attribute_set_id'] : '';
-		$shipping_to_billing = ! empty( $address_info_to_copy['wps-shipping-to-billing'] ) ? sanitize_text_field( $address_info_to_copy['wps-shipping-to-billing'] ) : '';
-		$shipping_to_billing_id = ! empty( $address_info_to_copy['wps-shipping-to-billing-id'] ) ? (int) $address_info_to_copy['wps-shipping-to-billing-id'] : $address_id_to_copy;
+		$type_of_form = (int)$address_info_to_copy['type_of_form'];
+		$current_item_edited = !empty($address_info_to_copy['attribute'][$attribute_set_id]['item_id']) ? (int)wpshop_tools::varSanitizer($address_info_to_copy['attribute'][$attribute_set_id]['item_id']) : null;
+		$current_attribute_set_id = !empty($address_info_to_copy['current_attribute_set_id']) ? (int)$address_info_to_copy['current_attribute_set_id'] : '';
+		$shipping_to_billing = !empty($address_info_to_copy['wps-shipping-to-billing']) ? sanitize_text_field($address_info_to_copy['wps-shipping-to-billing']) : '';
+		$shipping_to_billing_id = !empty($address_info_to_copy['wps-shipping-to-billing-id']) ? (int)$address_info_to_copy['wps-shipping-to-billing-id'] : $address_id_to_copy;
 
 		// Create or update the post address
 		// @TODO : REQUEST.
-		$customer_id_from_cookie = ! empty( $_COOKIE ) && ! empty( $_COOKIE['wps_current_connected_customer'] ) ? (int) $_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id( get_current_user_id() );
-		$customer_id = ( ! empty( $customer_id ) ? (int) $customer_id : ( ! empty( $_REQUEST['user']['customer_id'] ) ? (int) $_REQUEST['user']['customer_id'] : $customer_id_from_cookie ) );
-		$post_id = ! empty( $post_id ) ? (int) $post_id : ( ! empty( $_REQUEST['post_ID'] ) ? (int) $_REQUEST['post_ID'] : 0 );
+		$customer_id_from_cookie = !empty($_COOKIE) && !empty($_COOKIE['wps_current_connected_customer']) ? (int)$_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id(get_current_user_id());
+		$customer_id = (!empty($customer_id) ? (int)$customer_id : (!empty($_REQUEST['user']['customer_id']) ? (int)$_REQUEST['user']['customer_id'] : $customer_id_from_cookie));
+		$post_id = !empty($post_id) ? (int)$post_id : (!empty($_REQUEST['post_ID']) ? (int)$_REQUEST['post_ID'] : 0);
 
 		$post_address = array(
-			'post_title' => ! empty( $attribute ) && ! empty( $attribute[ $attribute_set_id ] ) && ! empty( $attribute[ $attribute_set_id ]['varchar'] ) && ! empty( $attribute[ $attribute_set_id ]['varchar']['address_title'] ) ? $attribute[ $attribute_set_id ]['varchar']['address_title'] : '',
+			'post_title' => !empty($attribute) && !empty($attribute[$attribute_set_id]) && !empty($attribute[$attribute_set_id]['varchar']) && !empty($attribute[$attribute_set_id]['varchar']['address_title']) ? $attribute[$attribute_set_id]['varchar']['address_title'] : '',
 			'post_status' => 'draft',
 			'post_name' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
@@ -687,58 +687,58 @@ 
 
 		$edit_other_thing = true;
 
-		if ( empty( $current_item_edited ) && ( empty( $current_attribute_set_id ) || $current_attribute_set_id != $attribute_set_id ) ) {
+		if (empty($current_item_edited) && (empty($current_attribute_set_id) || $current_attribute_set_id != $attribute_set_id)) {
 			$post_address['post_author'] = get_current_user_id();
-			$post_address['post_parent'] = empty( $customer_id ) && ! empty( $post_id ) ? $post_id : $customer_id;
-			$current_item_edited = wp_insert_post( $post_address );
-			if ( is_admin() ) {
-				$attribute[ $attribute_set_id ]['item_id'] = $current_item_edited;
+			$post_address['post_parent'] = empty($customer_id) && !empty($post_id) ? $post_id : $customer_id;
+			$current_item_edited = wp_insert_post($post_address);
+			if (is_admin()) {
+				$attribute[$attribute_set_id]['item_id'] = $current_item_edited;
 			}
 		} else {
 			$post_address['ID'] = $current_item_edited;
-			wp_update_post( $post_address );
+			wp_update_post($post_address);
 		}
 
 		/* Shipping to billing save */
-		if ( ! empty( $shipping_to_billing ) ) {
-			$wps_shipping_to_billing = array( 'wps-shipping-to-billing' => $shipping_to_billing );
+		if (!empty($shipping_to_billing)) {
+			$wps_shipping_to_billing = array('wps-shipping-to-billing' => $shipping_to_billing);
 
-			if ( ! empty( $shipping_to_billing_id ) ) {
+			if (!empty($shipping_to_billing_id)) {
 				$wps_shipping_to_billing['wps-shipping-to-billing-id'] = $shipping_to_billing_id;
 			}
-			update_post_meta( $current_item_edited, 'wps-shipping-to-billing', $wps_shipping_to_billing );
+			update_post_meta($current_item_edited, 'wps-shipping-to-billing', $wps_shipping_to_billing);
 		}
 
 		// Update the post_meta of address.
-		update_post_meta( $current_item_edited, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, $attribute_set_id );
+		update_post_meta($current_item_edited, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, $attribute_set_id);
 
-		foreach ( $attribute[ $attribute_set_id ] as $type => $type_content ) {
+		foreach ($attribute[$attribute_set_id] as $type => $type_content) {
 			$attribute_not_to_do = array();
-			if ( is_array( $type_content ) ) {
-				foreach ( $type_content as $code => $value ) {
-					$attribute_def = wpshop_attributes::getElement( $code, "'valid'", 'code' );
-					if ( ! empty( $attribute_def->_need_verification ) && 'yes' === $attribute_def->_need_verification ) {
+			if (is_array($type_content)) {
+				foreach ($type_content as $code => $value) {
+					$attribute_def = wpshop_attributes::getElement($code, "'valid'", 'code');
+					if (!empty($attribute_def->_need_verification) && 'yes' === $attribute_def->_need_verification) {
 						$code_verif = $code . '2';
 						$attribute_not_to_do[] = $code_verif;
-						if ( ! empty( $attributes[ $code_verif ] ) ) {
-							unset( $attributes[ $code_verif ] );
+						if (!empty($attributes[$code_verif])) {
+							unset($attributes[$code_verif]);
 						}
 					}
-					if ( ! in_array( $code, $attribute_not_to_do, true ) ) {
-						$attributes[ $code ] = $value;
+					if (!in_array($code, $attribute_not_to_do, true)) {
+						$attributes[$code] = $value;
 					}
 				}
 			}
 		}
 
-		$attributes = apply_filters( 'wps-address-coordinate-calculation', $attributes );
+		$attributes = apply_filters('wps-address-coordinate-calculation', $attributes);
 
-		$result = wpshop_attributes::setAttributesValuesForItem( $current_item_edited, $attributes, false, '' );
+		$result = wpshop_attributes::setAttributesValuesForItem($current_item_edited, $attributes, false, '');
 		$result['current_id'] = $current_item_edited;
 
-		if ( ! empty( $result['current_id'] ) ) {
-			$billing_option = get_option( 'wpshop_billing_address' );
-			if ( ! empty( $billing_option ) && ! empty( $billing_option['choice'] ) && $billing_option['choice'] === $attribute_set_id ) {
+		if (!empty($result['current_id'])) {
+			$billing_option = get_option('wpshop_billing_address');
+			if (!empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] === $attribute_set_id) {
 				$_SESSION['billing_address'] = $result['current_id'];
 			} else {
 				$_SESSION['shipping_address'] = $result['current_id'];
@@ -755,27 +755,27 @@ 
 	 * @param string $referer : Referer website page
 	 * @param string $admin : Display this form in admin panel
 	 */
-	public static function display_form_fields($type, $id = '', $first = '', $referer = '', $special_values = array(), $options = array(), $display_for_admin = array(), $other_customer = '' ) {
+	public static function display_form_fields($type, $id = '', $first = '', $referer = '', $special_values = array(), $options = array(), $display_for_admin = array(), $other_customer = '') {
 		global $wpshop, $wpshop_form, $wpdb;
 
 		$choosen_address = get_option('wpshop_billing_address');
 		$shipping_address = get_option('wpshop_shipping_address_choice');
 		$output_form_fields = $form_model = '';
 
-		$user_id = ( ! empty($other_customer) ) ? $other_customer : get_current_user_id();
+		$user_id = (!empty($other_customer)) ? $other_customer : get_current_user_id();
 
-		if ( empty($type) ) {
+		if (empty($type)) {
 			$type = $choosen_address['choice'];
 		}
 
 		$result = wps_address::get_addresss_form_fields_by_type($type, $id);
 
 		/** Check if it's shipping or billing **/
-		if ( $type == $choosen_address['choice'] ) {
-			$form_model =  ( !empty($choosen_address['display_model']) ) ? $choosen_address['display_model'] : null;
+		if ($type == $choosen_address['choice']) {
+			$form_model = (!empty($choosen_address['display_model'])) ? $choosen_address['display_model'] : null;
 		}
-		elseif( $type == $shipping_address['choice'] ) {
-			$form_model = ( !empty($shipping_address['display_model']) ) ? $shipping_address['display_model'] : null;
+		elseif ($type == $shipping_address['choice']) {
+			$form_model = (!empty($shipping_address['display_model'])) ? $shipping_address['display_model'] : null;
 		}
 
 
@@ -785,17 +785,17 @@ 
 		// take the address informations
 		$current_item_edited = !empty($id) ? (int)$id : null;
 
-		foreach ( $form as $group_id => $group_fields) {
-			if ( empty($options) || (!empty($options) && ($options['title']))) $output_form_fields .= '<h2>'.__( $group_fields['name'], 'wpshop' ).'</h2>';
+		foreach ($form as $group_id => $group_fields) {
+			if (empty($options) || (!empty($options) && ($options['title']))) $output_form_fields .= '<h2>' . __($group_fields['name'], 'wpshop') . '</h2>';
 			$end_line_indicator = 0; $fields_limit_per_line = -1;
-			foreach ( $group_fields['content'] as $key => $field) {
-				$attribute_def = wpshop_attributes::getElement( $field['name'], $element_status = "'valid'", $field_to_search = 'code' );
+			foreach ($group_fields['content'] as $key => $field) {
+				$attribute_def = wpshop_attributes::getElement($field['name'], $element_status = "'valid'", $field_to_search = 'code');
 				/** Grid opening **/
-				if ( !empty($form_model) && !empty($form_model[$group_id]) && in_array('wps-attribute-end-line-'.$end_line_indicator, $form_model[$group_id]) && $fields_limit_per_line == -1 ) {
-					$current_key = array_search( 'wps-attribute-end-line-'.$end_line_indicator, $form_model[$group_id] );
-					$current_attribute_key = array_search( 'attribute_'.$attribute_def->id, $form_model[$group_id] );
+				if (!empty($form_model) && !empty($form_model[$group_id]) && in_array('wps-attribute-end-line-' . $end_line_indicator, $form_model[$group_id]) && $fields_limit_per_line == -1) {
+					$current_key = array_search('wps-attribute-end-line-' . $end_line_indicator, $form_model[$group_id]);
+					$current_attribute_key = array_search('attribute_' . $attribute_def->id, $form_model[$group_id]);
 
-					if( $current_attribute_key > $current_key ) {
+					if ($current_attribute_key > $current_key) {
 // 						/** Define limit **/
 // 						if( in_array('wps-attribute-end-line-' . ($end_line_indicator + 1 ) , $form_model[$group_id]) ) {
 // 							$next_key = array_search( 'wps-attribute-end-line-'.( $end_line_indicator + 1 ), $form_model[$group_id] );
@@ -808,121 +808,121 @@ 
 // 							$fields_limit_per_line = $end_tab - $current_key - 1;
 // 							$fields_limit_per_line = ( $fields_limit_per_line > 6 )  ? 6 : $fields_limit_per_line;
 // 						}
-						if ( !empty($fields_limit_per_line) && $fields_limit_per_line != -1 ) {
-							if ( $fields_limit_per_line == 1 ) {
+						if (!empty($fields_limit_per_line) && $fields_limit_per_line != -1) {
+							if ($fields_limit_per_line == 1) {
 								$output_form_fields .= '<div class="wps-row">';
 							}
 							else {
-								$output_form_fields .= '<div class="wps-row wps-gridwrapper' .$fields_limit_per_line. '-padded">';
+								$output_form_fields .= '<div class="wps-row wps-gridwrapper' . $fields_limit_per_line . '-padded">';
 							}
 						}
 					}
 				}
 
-				if ( empty($options['field_to_hide']) || !is_array($options['field_to_hide']) || !in_array( $key, $options['field_to_hide'] ) ) {
+				if (empty($options['field_to_hide']) || !is_array($options['field_to_hide']) || !in_array($key, $options['field_to_hide'])) {
 					$attributeInputDomain = 'attribute[' . $type . '][' . $field['data_type'] . ']';
 					// Test if there is POST var or if user have already fill his address infos and fill the fields with these infos
-					$referer = !empty($_POST['referer']) ? sanitize_text_field( $_POST['referer'] ) : '';
-					if( !empty($referer) ) {
-						$value = !empty( $_POST[$form['id']."_".$field['name']] ) ? sanitize_text_field( $_POST[$form['id']."_".$field['name']] ) : '';
+					$referer = !empty($_POST['referer']) ? sanitize_text_field($_POST['referer']) : '';
+					if (!empty($referer)) {
+						$value = !empty($_POST[$form['id'] . "_" . $field['name']]) ? sanitize_text_field($_POST[$form['id'] . "_" . $field['name']]) : '';
 					}
 
 
 
 					// Fill Automaticly some fields when it's an address creation
-					switch ( $field['name']) {
+					switch ($field['name']) {
 						case 'address_title' :
-							if( empty($field['value']) ) {
+							if (empty($field['value'])) {
 								/** Count Billing and shipping address **/
 								$billing_address_count = $shipping_address_count = 1;
-								if ( get_current_user_id() != 0 ) {
-									$addresses = get_posts( array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, 'post_parent' => get_current_user_id(), 'post_status' => 'draft') );
-									if ( !empty($addresses) ) {
-										foreach( $addresses as $address ) {
-											$address_type = get_post_meta( $address->ID, '_wpshop_address_attribute_set_id', true);
-											if ( !empty($address_type) ){
-												if ( !empty( $shipping_address_choice['choice'] ) && $address_type == $shipping_address_choice['choice'] ) {
+								if (get_current_user_id() != 0) {
+									$addresses = get_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, 'post_parent' => get_current_user_id(), 'post_status' => 'draft'));
+									if (!empty($addresses)) {
+										foreach ($addresses as $address) {
+											$address_type = get_post_meta($address->ID, '_wpshop_address_attribute_set_id', true);
+											if (!empty($address_type)) {
+												if (!empty($shipping_address_choice['choice']) && $address_type == $shipping_address_choice['choice']) {
 													$shipping_address_count++;
 												}
-												else{
+												else {
 													$billing_address_count++;
 												}
 											}
 										}
 									}
 								}
-								$field['value'] = ( $type == $choosen_address['choice'] ) ? __('Billing address', 'wpshop').( ($billing_address_count > 1) ? ' '.$billing_address_count : '' ) : __('Shipping address', 'wpshop').( ($shipping_address_count > 1) ? ' '.$shipping_address_count : '');
+								$field['value'] = ($type == $choosen_address['choice']) ? __('Billing address', 'wpshop') . (($billing_address_count > 1) ? ' ' . $billing_address_count : '') : __('Shipping address', 'wpshop') . (($shipping_address_count > 1) ? ' ' . $shipping_address_count : '');
 
 							}
 							break;
 						case 'address_last_name' :
-							if( empty($field['value']) ) {
-								$usermeta_last_name = get_user_meta( $user_id, 'last_name', true);
-								$field['value'] = ( !empty($usermeta_last_name) ) ? $usermeta_last_name :  '';
+							if (empty($field['value'])) {
+								$usermeta_last_name = get_user_meta($user_id, 'last_name', true);
+								$field['value'] = (!empty($usermeta_last_name)) ? $usermeta_last_name : '';
 							}
 							break;
 						case 'address_first_name' :
-							if( empty($field['value']) ) {
-								$usermeta_first_name = get_user_meta( $user_id, 'first_name', true);
-								$field['value'] = ( !empty($usermeta_first_name) ) ? $usermeta_first_name :  '';
+							if (empty($field['value'])) {
+								$usermeta_first_name = get_user_meta($user_id, 'first_name', true);
+								$field['value'] = (!empty($usermeta_first_name)) ? $usermeta_first_name : '';
 							}
 							break;
 						case 'address_user_email' :
-							if( empty($field['value']) ) {
-								$user_infos = get_userdata( $user_id );
-								$field['value'] = ( !empty($user_infos) && !empty($user_infos->user_email) ) ? $user_infos->user_email :  '';
+							if (empty($field['value'])) {
+								$user_infos = get_userdata($user_id);
+								$field['value'] = (!empty($user_infos) && !empty($user_infos->user_email)) ? $user_infos->user_email : '';
 							}
 							break;
 						default :
-							$field['value'] = ( !empty($field['value']) ) ? $field['value'] : '';
+							$field['value'] = (!empty($field['value'])) ? $field['value'] : '';
 							break;
 					}
 
 
 
 					/** Fill fields if $_POST exist **/
-					if ( !empty( $attribute[$type][$field['data_type']][$field['name']] ) ) {
-						$field['value'] = sanitize_text_field( $_POST['attribute'][$type][$field['data_type']][$field['name']] );
+					if (!empty($attribute[$type][$field['data_type']][$field['name']])) {
+						$field['value'] = sanitize_text_field($_POST['attribute'][$type][$field['data_type']][$field['name']]);
 					}
 
 
-					if( $field['name'] == 'address_title' && !empty($first) && $type == __('Billing address', 'wpshop') ) {
+					if ($field['name'] == 'address_title' && !empty($first) && $type == __('Billing address', 'wpshop')) {
 						$value = __('Billing address', 'wpshop');
 					}
-					elseif( $field['name'] == 'address_title' && !empty($first) && $type == __('Shipping address', 'wpshop') ) {
+					elseif ($field['name'] == 'address_title' && !empty($first) && $type == __('Shipping address', 'wpshop')) {
 						$value = __('Shipping address', 'wpshop');
 					}
 
-					if ( !empty($special_values[$field['name']]) ) {
+					if (!empty($special_values[$field['name']])) {
 						$field['value'] = $special_values[$field['name']];
 					}
 
 					$template = 'wpshop_account_form_input';
-					if ( $field['type'] == 'hidden' ) {
+					if ($field['type'] == 'hidden') {
 						$template = 'wpshop_account_form_hidden_input';
 					}
 
-					if ( $field['frontend_verification'] == 'country' ) {
+					if ($field['frontend_verification'] == 'country') {
 						$field['type'] = 'select';
 						/** display a country list **/
 						$countries_list = unserialize(WPSHOP_COUNTRY_LIST);
 						$possible_values = array_merge(array('' => __('Choose a country')), $countries_list);
 
-						$limit_countries_list = get_option( 'wpshop_limit_country_list' );
-						$default_country_choice = get_option( 'wpshop_country_default_choice' );
-						if ( !empty($limit_countries_list) ) {
+						$limit_countries_list = get_option('wpshop_limit_country_list');
+						$default_country_choice = get_option('wpshop_country_default_choice');
+						if (!empty($limit_countries_list)) {
 							$possible_values = array();
-							if ( count($limit_countries_list) > 1 ) {
+							if (count($limit_countries_list) > 1) {
 								$possible_values[''] = __('Choose a country');
 							}
-							foreach( $limit_countries_list as $country_code) {
-								if ( !empty($countries_list) && !empty($countries_list[$country_code]) ) {
+							foreach ($limit_countries_list as $country_code) {
+								if (!empty($countries_list) && !empty($countries_list[$country_code])) {
 									$possible_values[$country_code] = $countries_list[$country_code];
 								}
 							}
 						}
 
-						$field['value'] = ( !empty($default_country_choice) && array_key_exists($default_country_choice, $possible_values ) ) ? $default_country_choice : '';
+						$field['value'] = (!empty($default_country_choice) && array_key_exists($default_country_choice, $possible_values)) ? $default_country_choice : '';
 						$field['possible_value'] = $possible_values;
 						$field['valueToPut'] = 'index';
 
@@ -934,8 +934,8 @@ 
 					$input_tpl_component = array();
 
 					//$input_tpl_component['CUSTOMER_FORM_INPUT_MAIN_CONTAINER_CLASS'] = ' wsphop_customer_account_form_container wsphop_customer_account_form_container_' . $field['name'] . $element_simple_class;
-					$input_tpl_component['CUSTOMER_FORM_INPUT_NAME'] = ( !empty($field['name']) ) ? $field['name'] : '';
-					$input_tpl_component['CUSTOMER_FORM_INPUT_LABEL'] = ( $field['type'] != 'hidden' ) ? stripslashes( __( $field['label'], 'wpshop' ) ) . ( ( $field['required'] == 'yes' ) ? ' <em>*</em>' : '') : '';
+					$input_tpl_component['CUSTOMER_FORM_INPUT_NAME'] = (!empty($field['name'])) ? $field['name'] : '';
+					$input_tpl_component['CUSTOMER_FORM_INPUT_LABEL'] = ($field['type'] != 'hidden') ? stripslashes(__($field['label'], 'wpshop')) . (($field['required'] == 'yes') ? ' <em>*</em>' : '') : '';
 					$input_tpl_component['CUSTOMER_FORM_INPUT_LABEL_OPTIONS'] = ' for="' . $field['id'] . '"';
 					$input_tpl_component['CUSTOMER_FORM_INPUT_FIELD'] = wpshop_form::check_input_type($field, $attributeInputDomain);
 					//$output_form_fields .= wpshop_display::display_template_element($template, $input_tpl_component);
@@ -946,16 +946,16 @@ 
 
 					unset($input_tpl_component);
 
-					if ( $field['_need_verification'] == 'yes' ) {
+					if ($field['_need_verification'] == 'yes') {
 						$field['name'] = $field['name'] . '2';
 						$field['id'] = $field['id'] . '2';
 						$element_simple_class = str_replace('"', '', str_replace('class="', '', str_replace('wpshop_input_datetime', '', $field['option'])));
 						$input_tpl_component = array();
 						$input_tpl_component['CUSTOMER_FORM_INPUT_NAME'] = $field['name'];
-						$input_tpl_component['CUSTOMER_FORM_INPUT_LABEL'] = __( $field['label'], 'wpshop' ) . ( ( ($field['required'] == 'yes' && !is_admin()) || ($field['name'] == 'address_user_email' && is_admin()) ) ? ' <span class="required">*</span>' : '');
+						$input_tpl_component['CUSTOMER_FORM_INPUT_LABEL'] = __($field['label'], 'wpshop') . ((($field['required'] == 'yes' && !is_admin()) || ($field['name'] == 'address_user_email' && is_admin())) ? ' <span class="required">*</span>' : '');
 						$input_tpl_component['CUSTOMER_FORM_INPUT_LABEL_OPTIONS'] = ' for="' . $field['id'] . '"';
 						$input_tpl_component['CUSTOMER_FORM_INPUT_MAIN_CONTAINER_CLASS'] = ' wsphop_customer_account_form_container wsphop_customer_account_form_container_' . $field['name'] . $element_simple_class;
-						$input_tpl_component['CUSTOMER_FORM_INPUT_LABEL'] = sprintf( __('Confirm %s', 'wpshop'), strtolower( __( $field['label'], 'wpshop' ) ) ). ( ($field['required'] == 'yes') && !is_admin() ? ' <span class="required">*</span>' : '');
+						$input_tpl_component['CUSTOMER_FORM_INPUT_LABEL'] = sprintf(__('Confirm %s', 'wpshop'), strtolower(__($field['label'], 'wpshop'))) . (($field['required'] == 'yes') && !is_admin() ? ' <span class="required">*</span>' : '');
 						$input_tpl_component['CUSTOMER_FORM_INPUT_FIELD'] = wpshop_form::check_input_type($field, $attributeInputDomain) . $field['options'];
 						//$output_form_fields .= wpshop_display::display_template_element($template, $input_tpl_component);
 						$output_form_fields .= wpshop_display::display_template_element('wps_address_field', $input_tpl_component, array(), 'wpshop');
@@ -964,9 +964,9 @@ 
 				}
 
 				/** Grid closing **/
-				if( $fields_limit_per_line != -1 && !empty($fields_limit_per_line) ) {
+				if ($fields_limit_per_line != -1 && !empty($fields_limit_per_line)) {
 					$fields_limit_per_line--;
-					if( $fields_limit_per_line == 0 ) {
+					if ($fields_limit_per_line == 0) {
 						$output_form_fields .= '</div>';
 						$fields_limit_per_line = -1;
 						$end_line_indicator++;
@@ -975,18 +975,18 @@ 
 			}
 		}
 
-		if ( $type ==  $choosen_address['choice'] ) {
-			$output_form_fields .= '<input type="hidden" name="billing_address" value="'.$choosen_address['choice'].'" />';
+		if ($type == $choosen_address['choice']) {
+			$output_form_fields .= '<input type="hidden" name="billing_address" value="' . $choosen_address['choice'] . '" />';
 		}
 		$shipping_address_options = get_option('wpshop_shipping_address_choice');
-		if ( $type ==  $shipping_address_options['choice'] ) {
-			$output_form_fields .= '<input type="hidden" name="shipping_address" value="' .$shipping_address_options['choice']. '" />';
+		if ($type == $shipping_address_options['choice']) {
+			$output_form_fields .= '<input type="hidden" name="shipping_address" value="' . $shipping_address_options['choice'] . '" />';
 		}
-		$output_form_fields .= '<input type="hidden" name="type_of_form" value="' .$type. '" /><input type="hidden" name="attribute[' .$type. '][item_id]" value="' .$current_item_edited. '" />';
+		$output_form_fields .= '<input type="hidden" name="type_of_form" value="' . $type . '" /><input type="hidden" name="attribute[' . $type . '][item_id]" value="' . $current_item_edited . '" />';
 
-		$output_form_fields .= ( $user_id != get_current_user_id() ) ? '<input type="hidden" name="user[customer_id]" value="' .$user_id. '" />' : '';
+		$output_form_fields .= ($user_id != get_current_user_id()) ? '<input type="hidden" name="user[customer_id]" value="' . $user_id . '" />' : '';
 
-		if ( empty($first) ) $output_form_fields = wpshop_display::display_template_element('wpshop_customer_addresses_form', array('CUSTOMER_ADDRESSES_FORM_CONTENT' => $output_form_fields, 'CUSTOMER_ADDRESSES_FORM_BUTTONS' => ''));
+		if (empty($first)) $output_form_fields = wpshop_display::display_template_element('wpshop_customer_addresses_form', array('CUSTOMER_ADDRESSES_FORM_CONTENT' => $output_form_fields, 'CUSTOMER_ADDRESSES_FORM_BUTTONS' => ''));
 
 		return $output_form_fields;
 	}
@@ -996,22 +996,22 @@ 
 	 * @param integer $shipping_address_type_id
 	 * @param integer $billing_address_type_id
 	 */
-	function shipping_to_billing( $shipping_address_type_id, $billing_address_type_id ) {
+	function shipping_to_billing($shipping_address_type_id, $billing_address_type_id) {
 		global $wpdb;
 		$tmp_array = array();
-		$tmp_array = !empty( $_REQUEST ) ? (array)$_REQUEST : array();
+		$tmp_array = !empty($_REQUEST) ? (array)$_REQUEST : array();
 
 		$billing_fields = array();
-		if( !empty($tmp_array) && !empty($tmp_array['attribute']) && !empty($tmp_array['attribute'][$shipping_address_type_id]) ) {
-			foreach ($tmp_array['attribute'][$shipping_address_type_id] as $key => $attribute_group ) {
-				if ( is_array($attribute_group) ) {
-					foreach( $attribute_group as $field_name => $value ) {
-						$attribute_def = wpshop_attributes::getElement( sanitize_text_field( $field_name ), "'valid'", 'code' );
-						if( !empty($attribute_def) ) {
-							$query = $wpdb->prepare( 'SELECT * FROM '. WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE status = %s AND attribute_id = %d AND attribute_set_id = %s', 'valid', (int)$attribute_def->id, sanitize_text_field( $billing_address_type_id ) );
-							$attribute_exist = $wpdb->get_var( $query );
-							if ( !empty($attribute_exist) ) {
-								$tmp_array['attribute'][$billing_address_type_id][$attribute_def->data_type][$field_name] = sanitize_text_field( $value );
+		if (!empty($tmp_array) && !empty($tmp_array['attribute']) && !empty($tmp_array['attribute'][$shipping_address_type_id])) {
+			foreach ($tmp_array['attribute'][$shipping_address_type_id] as $key => $attribute_group) {
+				if (is_array($attribute_group)) {
+					foreach ($attribute_group as $field_name => $value) {
+						$attribute_def = wpshop_attributes::getElement(sanitize_text_field($field_name), "'valid'", 'code');
+						if (!empty($attribute_def)) {
+							$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE status = %s AND attribute_id = %d AND attribute_set_id = %s', 'valid', (int)$attribute_def->id, sanitize_text_field($billing_address_type_id));
+							$attribute_exist = $wpdb->get_var($query);
+							if (!empty($attribute_exist)) {
+								$tmp_array['attribute'][$billing_address_type_id][$attribute_def->data_type][$field_name] = sanitize_text_field($value);
 							}
 						}
 					}
@@ -1029,9 +1029,9 @@ 
 	 *
 	 * @param  array $args Les arguments passés au shortcode.
 	 */
-	function shortcode_callback_display_addresses( $args ) {
-		$customer_id = ! empty( $args ) && ! empty( $args['cid'] ) ? (int) $args['cid'] : wps_customer_ctr::get_customer_id_by_author_id( get_current_user_id() );
-		return $this->display_addresses_interface( $customer_id );
+	function shortcode_callback_display_addresses($args) {
+		$customer_id = !empty($args) && !empty($args['cid']) ? (int)$args['cid'] : wps_customer_ctr::get_customer_id_by_author_id(get_current_user_id());
+		return $this->display_addresses_interface($customer_id);
 	}
 
 	/**
@@ -1043,27 +1043,27 @@ 
 	 *
 	 * @return string
 	 */
-	function display_addresses_interface( $customer_id = '', $admin_display = false, $order_id = '' ) {
+	function display_addresses_interface($customer_id = '', $admin_display = false, $order_id = '') {
 		$output = $extra_class = $billing_address_display = $shipping_address_display = $first_address_checking = '';
 
-		if ( $customer_id ) {
-			$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-			$billing_option = get_option( 'wpshop_billing_address' );
+		if ($customer_id) {
+			$shipping_option = get_option('wpshop_shipping_address_choice');
+			$billing_option = get_option('wpshop_billing_address');
 
 			/** Shipping address */
 			// Check if is only downloadable else display address.
 			$cart_is_downloadable = false;
-			if ( ! empty( $_SESSION['cart'] ) && ! empty( $_SESSION['cart']['order_items'] ) ) {
-				foreach ( $_SESSION['cart']['order_items'] as $c ) {
-					$product = wpshop_products::get_product_data( $c['item_id'] );
+			if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+				foreach ($_SESSION['cart']['order_items'] as $c) {
+					$product = wpshop_products::get_product_data($c['item_id']);
 					// Check if it's a variation and check the parent product.
-					if ( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION === get_post_type( $c['item_id'] ) ) {
-						$parent_def = wpshop_products::get_parent_variation( $c['item_id'] );
-						if ( ! empty( $parent_def ) && ! empty( $parent_def['parent_post_meta'] ) && ! empty( $parent_def['parent_post_meta']['is_downloadable_'] ) ) {
+					if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION === get_post_type($c['item_id'])) {
+						$parent_def = wpshop_products::get_parent_variation($c['item_id']);
+						if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_'])) {
 							$product['is_downloadable_'] = $parent_def['parent_post_meta']['is_downloadable_'];
 						}
 					}
-					if ( ! empty( $product['is_downloadable_'] ) && ( strtolower( __( $product['is_downloadable_'], 'wpshop' ) ) === strtolower( __( 'Yes', 'wpshop' ) ) ) ) {
+					if (!empty($product['is_downloadable_']) && (strtolower(__($product['is_downloadable_'], 'wpshop')) === strtolower(__('Yes', 'wpshop')))) {
 						$cart_is_downloadable = true;
 					} else {
 						$cart_is_downloadable = false;
@@ -1073,15 +1073,15 @@ 
 			}
 
 			$checkout_address_type = array(
-				'shipping' => __( 'Shipping address', 'wpshop' ),
-				'billing' => __( 'Billing address', 'wpshop' ),
+				'shipping' => __('Shipping address', 'wpshop'),
+				'billing' => __('Billing address', 'wpshop'),
 			);
 			$shipping_is_avalaible = true;
-			foreach ( $checkout_address_type as $address_type => $address_title ) {
+			foreach ($checkout_address_type as $address_type => $address_title) {
 				$display_address_of_type = true;
-				switch ( $address_type  ) {
+				switch ($address_type) {
 					case 'shipping':
-						if ( empty( $shipping_option ) || empty( $shipping_option['activate'] ) || $cart_is_downloadable ) {
+						if (empty($shipping_option) || empty($shipping_option['activate']) || $cart_is_downloadable) {
 							$display_address_of_type = false;
 							$shipping_is_avalaible = false;
 						} else {
@@ -1093,12 +1093,12 @@ 
 					break;
 				}
 
-				if ( $display_address_of_type ) {
-					$box_content = ! $admin_display ? self::display_address_interface_content( $address_type_id, $address_title, '', $address_type, $customer_id ) : '';
-					$first_address_checking = ( empty( $box_content ) && ( 'shipping' === $address_type ) ) ? true : false;
+				if ($display_address_of_type) {
+					$box_content = !$admin_display ? self::display_address_interface_content($address_type_id, $address_title, '', $address_type, $customer_id) : '';
+					$first_address_checking = (empty($box_content) && ('shipping' === $address_type)) ? true : false;
 
 					ob_start();
-					require( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, ( $admin_display ? 'backend' : 'frontend' ), 'address', 'container' ) );
+					require(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, ($admin_display ? 'backend' : 'frontend'), 'address', 'container'));
 					$output .= ob_get_contents();
 					ob_end_clean();
 				}
@@ -1121,22 +1121,22 @@ 
 	 *
 	 * @return [type]                    [description]
 	 */
-	public static function display_address_interface_content( $address_type_id, $address_title, $selected_address = null, $type, $customer_id = '', $admin_display = false, $order_id = '' ) {
-		$customer_id_from_cookie = ! empty( $_COOKIE ) && ! empty( $_COOKIE['wps_current_connected_customer'] ) ? (int) $_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id( get_current_user_id() );
-		$customer_id = ! empty( $customer_id ) && ! empty( $customer_id ) && is_int( (int) $customer_id ) ? (int) $customer_id : $customer_id_from_cookie;
+	public static function display_address_interface_content($address_type_id, $address_title, $selected_address = null, $type, $customer_id = '', $admin_display = false, $order_id = '') {
+		$customer_id_from_cookie = !empty($_COOKIE) && !empty($_COOKIE['wps_current_connected_customer']) ? (int)$_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id(get_current_user_id());
+		$customer_id = !empty($customer_id) && !empty($customer_id) && is_int((int)$customer_id) ? (int)$customer_id : $customer_id_from_cookie;
 
-		$select_id = ( ! empty( $type ) && ( 'shipping' === $type ) ) ?  'shipping_address_address_list' : 'billing_address_address_list';
+		$select_id = (!empty($type) && ('shipping' === $type)) ? 'shipping_address_address_list' : 'billing_address_address_list';
 		$output = '';
 
-		if ( ! empty( $address_type_id ) ) {
-			$addresses = self::get_addresses_list( $customer_id );
-			$list_addresses = ( ! empty( $addresses[ $address_type_id ] ) ) ? $addresses[ $address_type_id ] : array();
-			if ( empty( $list_addresses ) ) {
-				$form = self::display_form_fields( $address_type_id );
+		if (!empty($address_type_id)) {
+			$addresses = self::get_addresses_list($customer_id);
+			$list_addresses = (!empty($addresses[$address_type_id])) ? $addresses[$address_type_id] : array();
+			if (empty($list_addresses)) {
+				$form = self::display_form_fields($address_type_id);
 			}
 
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, ( $admin_display ? 'backend' : 'frontend' ), 'address', 'content' ) );
+			require(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, ($admin_display ? 'backend' : 'frontend'), 'address', 'content'));
 			$output .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -1151,14 +1151,14 @@ 
 	 * @since 1.0 - WPShop 1.3.7.0
 	 */
 	function display_addresses_list() {
-		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = (!empty($_REQUEST['_wpnonce'])) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'display_addresses_list' ) )
+		if (!wp_verify_nonce($_wpnonce, 'display_addresses_list'))
 			die();
 
-		$post_id = (int) $_POST['post_id'];
-		$addresses = $this->get_addresses_list( $post_id );
-		require_once( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "addresses" ) );
+		$post_id = (int)$_POST['post_id'];
+		$addresses = $this->get_addresses_list($post_id);
+		require_once(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "addresses"));
 		die();
 	}
 
@@ -1168,21 +1168,21 @@ 
 	 * @since 1.0 - WPShop 1.3.7.0
 	 */
 	function display_address() {
-		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = (!empty($_REQUEST['_wpnonce'])) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_address_display_an_address' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_address_display_an_address'))
 			die();
 
-		$adress_id = (int) $_POST['address_id'];
-		$address_post_meta = get_post_meta( $adress_id, '_wpshop_address_metadata', true);
-		$address_type_post_meta = get_post_meta( $adress_id, '_wpshop_address_attribute_set_id', true);
-		if( !empty($address_post_meta) && !empty($address_type_post_meta) ) {
-			$addresses_list[$address_type_post_meta][ $adress_id ] = $address_post_meta;
+		$adress_id = (int)$_POST['address_id'];
+		$address_post_meta = get_post_meta($adress_id, '_wpshop_address_metadata', true);
+		$address_type_post_meta = get_post_meta($adress_id, '_wpshop_address_attribute_set_id', true);
+		if (!empty($address_post_meta) && !empty($address_type_post_meta)) {
+			$addresses_list[$address_type_post_meta][$adress_id] = $address_post_meta;
 		}
 		$address_open = true;
-		foreach ( $addresses_list as $address_type => $addresses_list_by_type ) :
-			foreach ( $addresses_list_by_type as $address_id => $address ) :
-				require( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address" ) );
+		foreach ($addresses_list as $address_type => $addresses_list_by_type) :
+			foreach ($addresses_list_by_type as $address_id => $address) :
+				require(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address"));
 			endforeach;
 		endforeach;
 
@@ -1197,29 +1197,29 @@ 
 	function display_address_adding_form() {
 		global $wpdb;
 
-		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = (!empty($_REQUEST['_wpnonce'])) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'display_address_adding_form' ) )
+		if (!wp_verify_nonce($_wpnonce, 'display_address_adding_form'))
 			die();
 
 		$address_id = 0;
-		$post_ID = (int)$_POST[ 'post_id' ];
-		$element = get_post( $post_ID );
-		$query = $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s ", $element->post_type);
-		$element_cpt = $wpdb->get_var( $query );
-		$attached_addresses = get_post_meta( $element_cpt, '_wpshop_entity_attached_address', true );
-
-		if ( !empty( $attached_addresses ) ) {
-			if ( count( $attached_addresses ) == 1 ) {
-				$address_type_id = $attached_addresses[ 0 ];
-				require_once( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address", "form" ) );
+		$post_ID = (int)$_POST['post_id'];
+		$element = get_post($post_ID);
+		$query = $wpdb->prepare("SELECT ID FROM {$wpdb->posts} WHERE post_name = %s ", $element->post_type);
+		$element_cpt = $wpdb->get_var($query);
+		$attached_addresses = get_post_meta($element_cpt, '_wpshop_entity_attached_address', true);
+
+		if (!empty($attached_addresses)) {
+			if (count($attached_addresses) == 1) {
+				$address_type_id = $attached_addresses[0];
+				require_once(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address", "form"));
 			}
 			else {
-				require_once( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "addresses", "types" ) );
+				require_once(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "addresses", "types"));
 			}
 		}
 		else {
-			printf( __( 'No addresses are attached to this element type %s', 'wpeo_geoloc' ), $element->post_type);
+			printf(__('No addresses are attached to this element type %s', 'wpeo_geoloc'), $element->post_type);
 		}
 
 		die();
@@ -1231,20 +1231,20 @@ 
 	 * @since 1.0 - WPShop 1.3.7.0
 	 */
 	function load_address_edition_form() {
-		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = (!empty($_REQUEST['_wpnonce'])) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_address_edition_form_load' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_address_edition_form_load'))
 			die();
 
-		$address_id = (int)$_POST[ 'element_id' ];
-		$post_ID = (int)$_POST[ 'post_id' ];
-		$address_type_id = get_post_meta( $address_id, '_wpshop_address_attribute_set_id', true);
-		$wpeogeo_adress = !empty( $_POST[ 'wpeogeo-address-type-chosen-for-creation' ] ) ? (int) $_POST[ 'wpeogeo-address-type-chosen-for-creation' ] : 0;
-		if ( empty( $address_id ) && empty( $address_type_id ) && !empty( $wpeogeo_adress ) ) {
+		$address_id = (int)$_POST['element_id'];
+		$post_ID = (int)$_POST['post_id'];
+		$address_type_id = get_post_meta($address_id, '_wpshop_address_attribute_set_id', true);
+		$wpeogeo_adress = !empty($_POST['wpeogeo-address-type-chosen-for-creation']) ? (int)$_POST['wpeogeo-address-type-chosen-for-creation'] : 0;
+		if (empty($address_id) && empty($address_type_id) && !empty($wpeogeo_adress)) {
 			$address_type_id = $wpeogeo_adress;
 		}
 
-		require( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address", "form" ) );
+		require(wpshop_tools::get_template_part(WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address", "form"));
 		die();
 	}
 
@@ -1252,22 +1252,22 @@ 
 	 * AJAX - Delete an address
 	 */
 	function wps_delete_an_address() {
-		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = (!empty($_REQUEST['_wpnonce'])) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_delete_an_address' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_delete_an_address'))
 			die();
 
 		$status = false; $response = '';
-		$address_id = ( !empty( $_POST['address_id']) ) ? (int) $_POST['address_id'] : null;
-		if( !empty($address_id) ) {
+		$address_id = (!empty($_POST['address_id'])) ? (int)$_POST['address_id'] : null;
+		if (!empty($address_id)) {
 			/** Check if user is author of address **/
-			$address = get_post( $address_id );
-			if( !empty($address) && !empty($address->post_type) && $address->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS && !empty($address->post_author) && $address->post_author == get_current_user_id() ) {
-				wp_delete_post( $address_id, true );
+			$address = get_post($address_id);
+			if (!empty($address) && !empty($address->post_type) && $address->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS && !empty($address->post_author) && $address->post_author == get_current_user_id()) {
+				wp_delete_post($address_id, true);
 				$status = true;
 			}
 		}
-		echo json_encode( array('status' => $status, 'response' => $response) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		die();
 	}
 
@@ -1275,27 +1275,27 @@ 
 	 * AJAX - Relad Address Interface in new checkout tunnel
 	 */
 	function wps_reload_address_interface() {
-		check_ajax_referer( 'wps_reload_address_interface' );
+		check_ajax_referer('wps_reload_address_interface');
 
 		global $wpdb;
 		$status = false; $response = '';
-		$address_type = !empty($_POST['address_type']) ? (int) $_POST['address_type'] : null;
-		$selected_address = !empty($_POST['address_id']) ? (int) $_POST['address_id'] : null;
+		$address_type = !empty($_POST['address_type']) ? (int)$_POST['address_type'] : null;
+		$selected_address = !empty($_POST['address_id']) ? (int)$_POST['address_id'] : null;
 
-		if ( !empty( $address_type ) ) {
-			$billing_option = get_option( 'wpshop_billing_address' );
-			if ( !empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $address_type ) {
+		if (!empty($address_type)) {
+			$billing_option = get_option('wpshop_billing_address');
+			if (!empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $address_type) {
 				$type = 'billing';
 			}
 			else {
 				$type = 'shipping';
 			}
-			$query = $wpdb->prepare( 'SELECT name FROM '.WPSHOP_DBT_ATTRIBUTE_SET .' WHERE id = %d ', $address_type );
-			$address_title = __( $wpdb->get_var( $query ), 'wpshop' );
-			$response = self::display_address_interface_content( $address_type, $address_title, $selected_address, $type );
+			$query = $wpdb->prepare('SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE id = %d ', $address_type);
+			$address_title = __($wpdb->get_var($query), 'wpshop');
+			$response = self::display_address_interface_content($address_type, $address_title, $selected_address, $type);
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		die();
 	}
 
@@ -1303,59 +1303,59 @@ 
 	 * AJAX - Load address form in Modal Box
 	 */
 	function wps_load_address_form() {
-		$address_type_id = ( ! empty( $_POST['address_type_id'] ) ) ? sanitize_text_field( $_POST['address_type_id'] ) : '';
-		check_ajax_referer( 'wps_load_address_form_' . $address_type_id );
+		$address_type_id = (!empty($_POST['address_type_id'])) ? sanitize_text_field($_POST['address_type_id']) : '';
+		check_ajax_referer('wps_load_address_form_' . $address_type_id);
 
-		$address_id = ( ! empty( $_POST['address_id'] ) ) ? (int) $_POST['address_id'] : '';
-		$customer_id_from_cookie = ! empty( $_COOKIE ) && ! empty( $_COOKIE['wps_current_connected_customer'] ) ? (int) $_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id( get_current_user_id() );
+		$address_id = (!empty($_POST['address_id'])) ? (int)$_POST['address_id'] : '';
+		$customer_id_from_cookie = !empty($_COOKIE) && !empty($_COOKIE['wps_current_connected_customer']) ? (int)$_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id(get_current_user_id());
 
-		wp_die( wp_json_encode( self::loading_address_form( $address_type_id, $address_id, $customer_id_from_cookie ) ) );
+		wp_die(wp_json_encode(self::loading_address_form($address_type_id, $address_id, $customer_id_from_cookie)));
 	}
 
 	/**
 	 * AJAX - Function for save address
 	 */
 	function wps_save_address() {
-		check_ajax_referer( 'wps_save_address' );
+		check_ajax_referer('wps_save_address');
 		global $wpshop, $wpdb;
 
 		$status = false;
 		$result = $address_type = $same_address_type = '';
 
-		$adress_save_the_first = ! empty( $_POST['wps-address-save-the-first'] ) ? sanitize_text_field( $_POST['wps-address-save-the-first'] ) : '';
-		$attribute = ! empty( $_POST['attribute'] ) ? (array) $_POST['attribute'] : '';
+		$adress_save_the_first = !empty($_POST['wps-address-save-the-first']) ? sanitize_text_field($_POST['wps-address-save-the-first']) : '';
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : '';
 
-		foreach ( $attribute as $id_group => $attribute_group ) {
+		foreach ($attribute as $id_group => $attribute_group) {
 			$address_type = $id_group;
-			$group = wps_address::get_addresss_form_fields_by_type( $id_group );
-			foreach ( $group as $attribute_sets ) {
-				foreach ( $attribute_sets as $attribute_set_field ) {
-					$validate = $wpshop->validateForm( $attribute_set_field['content'], $attribute[ $id_group ], 'address_edition' );
+			$group = wps_address::get_addresss_form_fields_by_type($id_group);
+			foreach ($group as $attribute_sets) {
+				foreach ($attribute_sets as $attribute_set_field) {
+					$validate = $wpshop->validateForm($attribute_set_field['content'], $attribute[$id_group], 'address_edition');
 				}
 
-				if ( $validate ) {
-					$shipping_save = self::save_address_infos( $id_group );
+				if ($validate) {
+					$shipping_save = self::save_address_infos($id_group);
 
-					$wps_shipping_to_billing = ! empty( $_POST['wps-shipping-to-billing'] ) ? sanitize_text_field( $_POST['wps-shipping-to-billing'] ) : '';
-					if ( ! empty( $wps_shipping_to_billing ) ) {
-						$billing_option = get_option( 'wpshop_billing_address' );
-						$shipping_option = get_option( 'wpshop_shipping_address_choice' );
+					$wps_shipping_to_billing = !empty($_POST['wps-shipping-to-billing']) ? sanitize_text_field($_POST['wps-shipping-to-billing']) : '';
+					if (!empty($wps_shipping_to_billing)) {
+						$billing_option = get_option('wpshop_billing_address');
+						$shipping_option = get_option('wpshop_shipping_address_choice');
 
-						$address_info_to_copy = self::shipping_to_billing( $shipping_option['choice'], $billing_option['choice'] );
-						self::save_address_infos( $billing_option['choice'], $shipping_save['current_id'], $address_info_to_copy );
+						$address_info_to_copy = self::shipping_to_billing($shipping_option['choice'], $billing_option['choice']);
+						self::save_address_infos($billing_option['choice'], $shipping_save['current_id'], $address_info_to_copy);
 						$same_address_type = $billing_option['choice'];
 					}
 
 					$status = true;
-					if ( ! empty( $adress_save_the_first ) ) {
-						$query = $wpdb->prepare( 'SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE id = %d ', $address_type );
-						$address_title = __( $wpdb->get_var( $query ), 'wpshop' );
-						$result = self::display_address_interface_content( $address_type, $address_title, $shipping_save['current_id'], $adress_save_the_first );
+					if (!empty($adress_save_the_first)) {
+						$query = $wpdb->prepare('SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE id = %d ', $address_type);
+						$address_title = __($wpdb->get_var($query), 'wpshop');
+						$result = self::display_address_interface_content($address_type, $address_title, $shipping_save['current_id'], $adress_save_the_first);
 					}
 				} else {
-					if ( ! empty( $wpshop->errors ) ) {
-						$result = '<div class="wps-alert wps-alert-error">' . __( 'Some errors have been detected', 'wpshop' ) . ' : <ul>';
-						foreach ( $wpshop->errors as $error ) {
+					if (!empty($wpshop->errors)) {
+						$result = '<div class="wps-alert wps-alert-error">' . __('Some errors have been detected', 'wpshop') . ' : <ul>';
+						foreach ($wpshop->errors as $error) {
 							$result .= '<li>' . $error . '</li>';
 						}
 						$result .= '</ul></div>';
@@ -1364,7 +1364,7 @@ 
 			}
 		}
 
-		wp_die( json_encode( array( $status, $result, $address_type, $same_address_type ) ) );
+		wp_die(json_encode(array($status, $result, $address_type, $same_address_type)));
 	}
 
 }

Braces +47 added lines, -55 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * File defining class for addresses initialisation
  *
@@ -266,8 +268,9 @@ 
 
 	function admin_scripts() {
 		global $current_screen;
-	    if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ), true ) )
-	        return;
+	    if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ), true ) ) {
+	    	        return;
+	    }
 
 		wp_enqueue_script( 'wps_address_js',  WPS_ADDRESS_URL . '/assets/backend/js/wps_address.js', array( 'jquery', 'jquery-form' ) );
 		wp_register_style( 'wps_address_backend_css', WPS_ADDRESS_URL . '/assets/backend/css/backend.css'/*, array( '' )*/ );
@@ -361,8 +364,7 @@ 
 						$display_model =  $shipping_option['display_model'];
 						$has_model = true;
 
-					}
-					else {
+					} else {
 						$billing_option = get_option( 'wpshop_billing_address' );
 						if ( !empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $address_type && !empty($billing_option['display_model']) ) {
 							$display_model =  $billing_option['display_model'];
@@ -384,11 +386,9 @@ 
 									if ( $attribute_def->frontend_input == 'select' ) {
 										$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d',$address[ $attribute_def->code] );
 										$output .= '<strong>'.__( $attribute_def->frontend_label, 'wpshop').' :</strong> '.__( $wpdb->get_var( $query ), 'wpshop' ).' ';
-									}
-									elseif( $attribute_def->frontend_verification == 'country' ) {
+									} elseif( $attribute_def->frontend_verification == 'country' ) {
 										$output .= ( !empty($countries[ $address[ $attribute_def->code] ]) ) ? '<strong>'.__( $attribute_def->frontend_label, 'wpshop').' :</strong> '.__( $countries[ $address[ $attribute_def->code] ], 'wpshop' ).' ' : '';
-									}
-									else {
+									} else {
 										$output .= ( !empty($address[ $attribute_def->code]) ) ? '<strong>'.__( $attribute_def->frontend_label, 'wpshop').' :</strong> '.$address[ $attribute_def->code].' ' : ' ';
 									}
 								}
@@ -402,8 +402,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				if( !empty($address_type) ) {
 					$tmp_array = array();
 					$address_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS );
@@ -419,13 +418,11 @@ 
 
 										if( $attribute_def->frontend_verification == 'country' ) {
 											$tmp_array[ $attribute_def->code]['value'] =  ( !empty($countries[ $address[ $attribute_def->code] ]) ) ? stripslashes( __( $countries[ $address[ $attribute_def->code] ], 'wpshop' ) ) : stripslashes( $address[ $attribute_def->code ] );
-										}
-										elseif( in_array( $attribute_def->frontend_input, array('select', 'checkbox') ) ) {
+										} elseif( in_array( $attribute_def->frontend_input, array('select', 'checkbox') ) ) {
 											$query = $wpdb->prepare( 'SELECT label FROM '. WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $address[ $attribute_def->code] );
 											$value = $wpdb->get_var( $query );
 											$tmp_array[ $attribute_def->code]['value'] = ( !empty($value) ) ? stripslashes(  __( $value, 'wpshop' ) ) : '';
-										}
-										else {
+										} else {
 											$tmp_array[ $attribute_def->code]['value'] = stripslashes(   __( $address[ $attribute_def->code ], 'wpshop' ) );
 										}
 									}
@@ -438,8 +435,7 @@ 
 				foreach( $address as $element_code => $element_value ) {
 					if( is_array($element_value) ) {
 						$output .= '<span class="wps-'.$element_code.'"><strong>' .stripslashes( $element_value['label'] ). ' :</strong> ' .stripslashes( $element_value['value'] ). '</span>';
-					}
-					else {
+					} else {
 						$output .= '<span class="wps-'.$element_code.'">' .stripslashes( $element_value ). '</span>';
 					}
 				}
@@ -465,12 +461,10 @@ 
 			$post = get_post( $post );
 			if ( !empty($post->post_parent) ) {
 				$customer_id = $post->post_parent;
-			}
-			else {
+			} else {
 				$customer_id = $post->post_author;
 			}
-		}
-		else {
+		} else {
 			$customer_id = get_current_user_id();
 		}
 
@@ -494,8 +488,7 @@ 
 		$tpl_component['ADDRESS_BUTTONS'] = '';
 		if( count($addresses) > 0 ) {
 			$tpl_component['ADD_NEW_ADDRESS_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?')===false ? '?' : '&amp;'). 'action=add_address&type=' .$address_type_id;
-		}
-		else {
+		} else {
 			$tpl_component['ADD_NEW_ADDRESS_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?')===false ? '?' : '&amp;'). 'action=add_address&type=' .$address_type_id .'&first';
 		}
 		$tpl_component['ADDRESS_TYPE'] = ( !empty($address_type_title) && ($address_type_title == __('Shipping address', 'wpshop'))) ? 'shipping_address' : 'billing_address';
@@ -517,8 +510,7 @@ 
 					if ( !is_admin() ) {
 						$_SESSION[$tpl_component['ADDRESS_TYPE']] = $address->ID;
 					}
-				}
-				else {
+				} else {
 					$address_id = ( !empty($_SESSION[$tpl_component['ADDRESS_TYPE']]) )  ? $_SESSION[$tpl_component['ADDRESS_TYPE']] : '';
 				}
 				$address_selected_infos = get_post_meta($address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
@@ -548,8 +540,7 @@ 
 			if ( !is_admin() ) {
 				$tpl_component['ADDRESS_COMBOBOX'] = (!empty($tpl_component['ADDRESS_COMBOBOX_OPTION']) && ($nb_of_addresses > 1)) ? wpshop_display::display_template_element('addresses_type_combobox', $tpl_component) : '';
 			}
-		}
-		else {
+		} else {
 			if ( !empty($args) && !empty($args['first']) && $args['first'] ) {
 				$tpl_component['ADDRESS_TYPE'] = 'first_address';
 			}
@@ -626,8 +617,7 @@ 
 						if(!empty($attribute->id)) {
 							if ( !empty( $submit_billing_and_shipping_info ) ) {
 								$value = $attribute[$typeof][$attribute->data_type][$attribute->code];
-							}
-							else {
+							} else {
 								$value = wpshop_attributes::getAttributeValueForEntityInSet($attribute->data_type, $attribute->id, wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS), (int)$id, array('intrinsic' => $attribute->is_intrinsic, 'backend_input' => $attribute->backend_input));
 							}
 							$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute, $value, array() );
@@ -773,8 +763,7 @@ 
 		/** Check if it's shipping or billing **/
 		if ( $type == $choosen_address['choice'] ) {
 			$form_model =  ( !empty($choosen_address['display_model']) ) ? $choosen_address['display_model'] : null;
-		}
-		elseif( $type == $shipping_address['choice'] ) {
+		} elseif( $type == $shipping_address['choice'] ) {
 			$form_model = ( !empty($shipping_address['display_model']) ) ? $shipping_address['display_model'] : null;
 		}
 
@@ -786,7 +775,9 @@ 
 		$current_item_edited = !empty($id) ? (int)$id : null;
 
 		foreach ( $form as $group_id => $group_fields) {
-			if ( empty($options) || (!empty($options) && ($options['title']))) $output_form_fields .= '<h2>'.__( $group_fields['name'], 'wpshop' ).'</h2>';
+			if ( empty($options) || (!empty($options) && ($options['title']))) {
+				$output_form_fields .= '<h2>'.__( $group_fields['name'], 'wpshop' ).'</h2>';
+			}
 			$end_line_indicator = 0; $fields_limit_per_line = -1;
 			foreach ( $group_fields['content'] as $key => $field) {
 				$attribute_def = wpshop_attributes::getElement( $field['name'], $element_status = "'valid'", $field_to_search = 'code' );
@@ -811,8 +802,7 @@ 
 						if ( !empty($fields_limit_per_line) && $fields_limit_per_line != -1 ) {
 							if ( $fields_limit_per_line == 1 ) {
 								$output_form_fields .= '<div class="wps-row">';
-							}
-							else {
+							} else {
 								$output_form_fields .= '<div class="wps-row wps-gridwrapper' .$fields_limit_per_line. '-padded">';
 							}
 						}
@@ -843,8 +833,7 @@ 
 											if ( !empty($address_type) ){
 												if ( !empty( $shipping_address_choice['choice'] ) && $address_type == $shipping_address_choice['choice'] ) {
 													$shipping_address_count++;
-												}
-												else{
+												} else{
 													$billing_address_count++;
 												}
 											}
@@ -888,8 +877,7 @@ 
 
 					if( $field['name'] == 'address_title' && !empty($first) && $type == __('Billing address', 'wpshop') ) {
 						$value = __('Billing address', 'wpshop');
-					}
-					elseif( $field['name'] == 'address_title' && !empty($first) && $type == __('Shipping address', 'wpshop') ) {
+					} elseif( $field['name'] == 'address_title' && !empty($first) && $type == __('Shipping address', 'wpshop') ) {
 						$value = __('Shipping address', 'wpshop');
 					}
 
@@ -986,7 +974,9 @@ 
 
 		$output_form_fields .= ( $user_id != get_current_user_id() ) ? '<input type="hidden" name="user[customer_id]" value="' .$user_id. '" />' : '';
 
-		if ( empty($first) ) $output_form_fields = wpshop_display::display_template_element('wpshop_customer_addresses_form', array('CUSTOMER_ADDRESSES_FORM_CONTENT' => $output_form_fields, 'CUSTOMER_ADDRESSES_FORM_BUTTONS' => ''));
+		if ( empty($first) ) {
+			$output_form_fields = wpshop_display::display_template_element('wpshop_customer_addresses_form', array('CUSTOMER_ADDRESSES_FORM_CONTENT' => $output_form_fields, 'CUSTOMER_ADDRESSES_FORM_BUTTONS' => ''));
+		}
 
 		return $output_form_fields;
 	}
@@ -1153,8 +1143,9 @@ 
 	function display_addresses_list() {
 		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'display_addresses_list' ) )
-			die();
+		if ( !wp_verify_nonce( $_wpnonce, 'display_addresses_list' ) ) {
+					die();
+		}
 
 		$post_id = (int) $_POST['post_id'];
 		$addresses = $this->get_addresses_list( $post_id );
@@ -1170,8 +1161,9 @@ 
 	function display_address() {
 		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_address_display_an_address' ) )
-			die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_address_display_an_address' ) ) {
+					die();
+		}
 
 		$adress_id = (int) $_POST['address_id'];
 		$address_post_meta = get_post_meta( $adress_id, '_wpshop_address_metadata', true);
@@ -1199,8 +1191,9 @@ 
 
 		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'display_address_adding_form' ) )
-			die();
+		if ( !wp_verify_nonce( $_wpnonce, 'display_address_adding_form' ) ) {
+					die();
+		}
 
 		$address_id = 0;
 		$post_ID = (int)$_POST[ 'post_id' ];
@@ -1213,12 +1206,10 @@ 
 			if ( count( $attached_addresses ) == 1 ) {
 				$address_type_id = $attached_addresses[ 0 ];
 				require_once( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "address", "form" ) );
-			}
-			else {
+			} else {
 				require_once( wpshop_tools::get_template_part( WPS_ADDRESS_DIR, WPS_LOCALISATION_TEMPLATES_MAIN_DIR, "backend", "addresses", "types" ) );
 			}
-		}
-		else {
+		} else {
 			printf( __( 'No addresses are attached to this element type %s', 'wpeo_geoloc' ), $element->post_type);
 		}
 
@@ -1233,8 +1224,9 @@ 
 	function load_address_edition_form() {
 		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_address_edition_form_load' ) )
-			die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_address_edition_form_load' ) ) {
+					die();
+		}
 
 		$address_id = (int)$_POST[ 'element_id' ];
 		$post_ID = (int)$_POST[ 'post_id' ];
@@ -1254,8 +1246,9 @@ 
 	function wps_delete_an_address() {
 		$_wpnonce = ( !empty( $_REQUEST['_wpnonce'] ) ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_delete_an_address' ) )
-			die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_delete_an_address' ) ) {
+					die();
+		}
 
 		$status = false; $response = '';
 		$address_id = ( !empty( $_POST['address_id']) ) ? (int) $_POST['address_id'] : null;
@@ -1286,8 +1279,7 @@ 
 			$billing_option = get_option( 'wpshop_billing_address' );
 			if ( !empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $address_type ) {
 				$type = 'billing';
-			}
-			else {
+			} else {
 				$type = 'shipping';
 			}
 			$query = $wpdb->prepare( 'SELECT name FROM '.WPSHOP_DBT_ATTRIBUTE_SET .' WHERE id = %d ', $address_type );

includes/modules/wps_customer/controller/wps_account_ctr.php

Doc Comments +4 added lines, -1 removed lines

@@ -537,7 +537,7 @@ 
 	}
 
 	/** SIGN UP - Display the commercial & newsletter form
-	 * @return void
+	 * @return string
 	 */
 	function display_commercial_newsletter_form() {
 		$output = '';
@@ -719,6 +719,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param integer $cid
+	 */
 	function save_account_informations( $cid, $args, $admin = true ) {
 		global $wpdb, $wpshop;
 

Spacing +304 added lines, -304 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_account_ctr {
 
 	private $redirect = false;
@@ -8,50 +8,50 @@ 
 	function __construct() {
 		/** 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, 'shortcode_callback_display_account_informations') );
+		add_shortcode('wps_account_informations', array($this, 'shortcode_callback_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'));
 	}
 
 	/**
@@ -59,33 +59,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, WPS_ACCOUNT_TPL,  "frontend", "login/login-form") );
+				require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "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;
@@ -95,53 +95,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();
 	}
 
@@ -149,13 +149,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();
 	}
 
@@ -163,7 +163,7 @@ 
 	function get_login_first_step() {
 		$output = '';
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "login/login-form", "first") );
+		require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "login/login-form", "first"));
 		$output .= ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -173,39 +173,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();
 	}
 
@@ -214,9 +214,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, WPS_ACCOUNT_TPL,  "frontend", "forgot-password/forgot-password") );
+			require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "forgot-password/forgot-password"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -227,16 +227,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();
 	}
 
@@ -244,48 +244,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();
 	}
 
@@ -294,67 +294,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();
 	}
 
@@ -363,9 +363,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, WPS_ACCOUNT_TPL, "frontend", "forgot-password/password-renew") );
+			require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "forgot-password/password-renew"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -374,7 +374,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();
 	}
 
@@ -382,29 +382,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, WPS_ACCOUNT_TPL, "frontend", "signup/signup") );
+			require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "signup/signup"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -412,119 +412,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>';
 					}
@@ -533,7 +533,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
@@ -541,10 +541,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, WPS_ACCOUNT_TPL,  "frontend", "signup/signup", "newsletter") );
+		require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "signup/signup", "newsletter"));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -558,9 +558,9 @@ 
 	 *
 	 * @param  array $args Les arguments passés au shortcode.
 	 */
-	function shortcode_callback_display_account_informations( $args ) {
-		$customer_id = ! empty( $args ) && ! empty( $args['cid'] ) ? (int) $args['cid'] : wps_customer_ctr::get_customer_id_by_author_id( get_current_user_id() );
-		return $this->display_account_informations( $customer_id );
+	function shortcode_callback_display_account_informations($args) {
+		$customer_id = !empty($args) && !empty($args['cid']) ? (int)$args['cid'] : wps_customer_ctr::get_customer_id_by_author_id(get_current_user_id());
+		return $this->display_account_informations($customer_id);
 	}
 
 	/**
@@ -570,29 +570,29 @@ 
 	 *
 	 * @return string     L'afficahge HTML des champs
 	 */
-	function display_account_form_fields( $cid ) {
+	function display_account_form_fields($cid) {
 		global $wpdb;
 
-		$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+		$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 		$fields_to_output = $signup_form_section = $password_attribute = $signup_form_attributes = array();
 
-		$query = $wpdb->prepare( 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $customer_entity_type_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 => $customer_attributes_section ) {
-			$signup_form_section[ $customer_attributes_section->name ] = array();
-			if ( ! empty( $account_attributes[ $customer_attributes_section->id ] ) ) {
-				foreach ( $account_attributes[ $customer_attributes_section->id ]['attribut'] as $attribute ) {
-					$signup_form_section[ $customer_attributes_section->name ][] = $attribute;
+		$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $customer_entity_type_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 => $customer_attributes_section) {
+			$signup_form_section[$customer_attributes_section->name] = array();
+			if (!empty($account_attributes[$customer_attributes_section->id])) {
+				foreach ($account_attributes[$customer_attributes_section->id]['attribut'] as $attribute) {
+					$signup_form_section[$customer_attributes_section->name][] = $attribute;
 				}
 			}
 		}
 
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'common/account', 'account', 'form' ) );
+		require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'common/account', 'account', 'form'));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -604,61 +604,61 @@ 
 	 *
 	 * @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 = '';
-		$customer_id = ( ! empty( $customer_id ) ) ? $customer_id : get_current_user_id();
-		if ( 0 !== $customer_id ) {
+		$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+		if (0 !== $customer_id) {
 			$screen = get_current_screen();
-			$customer_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+			$customer_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 			$cid = $customer_id;
 
-			if ( ( is_admin() && isset( $screen ) && is_object( $screen ) && ( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS == $screen->post_type ) ) || $force_edition_form ) {
+			if ((is_admin() && isset($screen) && is_object($screen) && (WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS == $screen->post_type)) || $force_edition_form) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'backend/customer-informations', 'form' ) );
+				require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'backend/customer-informations', 'form'));
 				$output = ob_get_contents();
 				ob_end_clean();
 			} else {
-				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 );
+				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);
 									$attribute_details = '';
-									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 );
+									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 );
+										$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 );
-											} elseif ( $attribute_def->data_type_to_use == 'internal')  {
-												$associated_post = get_post( $atribute_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);
+											} elseif ($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, WPS_ACCOUNT_TPL, "frontend", "account/account_informations_element") );
+												require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "account/account_informations_element"));
 												$attribute_details .= ob_get_contents();
 												ob_end_clean();
 											}
@@ -666,7 +666,7 @@ 
 									}
 
 									ob_start();
-									require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "account/account_informations_group_element") );
+									require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, "frontend", "account/account_informations_group_element"));
 									$attributes_sections_tpl .= ob_get_contents();
 									ob_end_clean();
 								}
@@ -676,7 +676,7 @@ 
 				}
 
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'frontend', 'account/account_informations' ) );
+				require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'frontend', 'account/account_informations'));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -689,15 +689,15 @@ 
 	 * 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');
 
-		$customer_id_from_cookie = ! empty( $_COOKIE ) && ! empty( $_COOKIE['wps_current_connected_customer'] ) ? (int) $_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id( get_current_user_id() );
-		$customer_id = ! empty( $_POST ) && ! empty( $_POST['customer_id'] ) && is_int( (int) $_POST['customer_id'] ) ? (int) $_POST['customer_id'] : $customer_id_from_cookie;
+		$customer_id_from_cookie = !empty($_COOKIE) && !empty($_COOKIE['wps_current_connected_customer']) ? (int)$_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id(get_current_user_id());
+		$customer_id = !empty($_POST) && !empty($_POST['customer_id']) && is_int((int)$_POST['customer_id']) ? (int)$_POST['customer_id'] : $customer_id_from_cookie;
 
-		$title = __( 'Edit your account informations', 'wpshop' );
-		$content = $this->account_informations_form( $customer_id );
+		$title = __('Edit your account informations', 'wpshop');
+		$content = $this->account_informations_form($customer_id);
 
-		wp_die( wp_json_encode( array( 'status' => true, 'title' => $title, 'content' => $content ) ) );
+		wp_die(wp_json_encode(array('status' => true, 'title' => $title, 'content' => $content)));
 	}
 
 	/**
@@ -705,13 +705,13 @@ 
 	 *
 	 * @param integer $cid L'identifiant du client pour lequel on veut modifier les informations.
 	 */
-	function account_informations_form( $cid = 0 ) {
+	function account_informations_form($cid = 0) {
 		global $wpdb;
 		$output = '';
 
-		if ( 0 !== $cid ) {
+		if (0 !== $cid) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'frontend', 'account/account_form' ) );
+			require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'frontend', 'account/account_form'));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -719,49 +719,49 @@ 
 		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);
 
-		$user_id = wps_customer_ctr::get_author_id_by_customer_id( $cid );
+		$user_id = wps_customer_ctr::get_author_id_by_customer_id($cid);
 
-		$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'] : '';
+		$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;
 					}
@@ -774,18 +774,18 @@ 
 	 * ACCOUNT - Save account informations
 	 */
 	function wps_save_account_informations() {
-		check_ajax_referer( 'wps_save_account_informations' );
+		check_ajax_referer('wps_save_account_informations');
 
 		$status = true;
 		$response = '';
 
-		$customer_id_from_cookie = ! empty( $_COOKIE ) && ! empty( $_COOKIE['wps_current_connected_customer'] ) ? (int) $_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id( get_current_user_id() );
-		$customer_id = ! empty( $_POST ) && ! empty( $_POST['customer_id'] ) && is_int( (int) $_POST['customer_id'] ) ? (int) $_POST['customer_id'] : $customer_id_from_cookie;
+		$customer_id_from_cookie = !empty($_COOKIE) && !empty($_COOKIE['wps_current_connected_customer']) ? (int)$_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id(get_current_user_id());
+		$customer_id = !empty($_POST) && !empty($_POST['customer_id']) && is_int((int)$_POST['customer_id']) ? (int)$_POST['customer_id'] : $customer_id_from_cookie;
 
-		$errors = $this->save_account_informations( $customer_id, $_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($customer_id, $_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 @@ 
 			$response = $customer_id;
 		}
 
-		wp_die( wp_json_encode( array( 'status' => $status, 'response' => $response ) ) );
+		wp_die(wp_json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 	/**
@@ -803,16 +803,16 @@ 
 	function wps_account_reload_informations() {
 		// check_ajax_referer( 'wps_account_reload_informations' );
 
-		$customer_id_from_cookie = ! empty( $_COOKIE ) && ! empty( $_COOKIE['wps_current_connected_customer'] ) ? (int) $_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id( get_current_user_id() );
-		$customer_id = ! empty( $_POST ) && ! empty( $_POST['customer_id'] ) && is_int( (int) $_POST['customer_id'] ) ? (int) $_POST['customer_id'] : $customer_id_from_cookie;
+		$customer_id_from_cookie = !empty($_COOKIE) && !empty($_COOKIE['wps_current_connected_customer']) ? (int)$_COOKIE['wps_current_connected_customer'] : wps_customer_ctr::get_customer_id_by_author_id(get_current_user_id());
+		$customer_id = !empty($_POST) && !empty($_POST['customer_id']) && is_int((int)$_POST['customer_id']) ? (int)$_POST['customer_id'] : $customer_id_from_cookie;
 
 		$status = false;
-		$response = $this->display_account_informations( $customer_id );
-		if ( ! empty( $response ) ) {
+		$response = $this->display_account_informations($customer_id);
+		if (!empty($response)) {
 			$status = true;
 		}
 
-		wp_die( wp_json_encode( array( 'status' => $status, 'response' => $response ) ) );
+		wp_die(wp_json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 }

includes/modules/wps_customer_contacts/templates/backend/contact.php

Spacing +17 added lines, -17 removed lines

@@ -9,37 +9,37 @@
  * @version 3.0.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 ?>
-<?php foreach ( $users as $user_id => $user ) : ?>
-	<?php if ( 0 !== $user_id ) : ?>
-		<?php if ( true === $user['is_default'] ) : ?>
+<?php foreach ($users as $user_id => $user) : ?>
+	<?php if (0 !== $user_id) : ?>
+		<?php if (true === $user['is_default']) : ?>
 			<?php $default_user = $user_id; ?>
 		<?php endif; ?>
-	<tr data-customer-id="<?php echo esc_attr( $customer->ID ); ?>" data-user-id="<?php echo esc_attr( $user_id ); ?>" >
-		<td>#<?php echo esc_html( $user_id ); ?></td>
-		<td><?php echo esc_html( $user['last_name'] . ' ' . $user['first_name'] ); ?></td>
-		<td><?php echo esc_html( $user['display_name'] ); ?></td>
-		<td><?php echo esc_html( $user['user_email'] ); ?></td>
+	<tr data-customer-id="<?php echo esc_attr($customer->ID); ?>" data-user-id="<?php echo esc_attr($user_id); ?>" >
+		<td>#<?php echo esc_html($user_id); ?></td>
+		<td><?php echo esc_html($user['last_name'] . ' ' . $user['first_name']); ?></td>
+		<td><?php echo esc_html($user['display_name']); ?></td>
+		<td><?php echo esc_html($user['user_email']); ?></td>
 
 		<td class="wps-customer-contacts-actions" >
 
-		<?php do_action( 'wps_customer_contacts_list_action', $user_id ); ?>
+		<?php do_action('wps_customer_contacts_list_action', $user_id); ?>
 
-		<?php if ( true === $user['is_default'] ) : ?>
-			<i title="<?php esc_attr_e( 'This is the main contact / customer creator', 'wpshop' ); ?>" class="dashicons dashicons-star-filled" ></i>
+		<?php if (true === $user['is_default']) : ?>
+			<i title="<?php esc_attr_e('This is the main contact / customer creator', 'wpshop'); ?>" class="dashicons dashicons-star-filled" ></i>
 		<?php else : ?>
-			<i title="<?php esc_attr_e( 'Change to default customer', 'wpshop' ); ?>" class="dashicons dashicons-star-empty" ></i>
+			<i title="<?php esc_attr_e('Change to default customer', 'wpshop'); ?>" class="dashicons dashicons-star-empty" ></i>
 		<?php endif; ?>
 
-		<!-- <a title="<?php esc_attr_e( 'User account edition', 'wpshop' ); ?>" href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=load_user_account_form&_wpnonce=' . wp_create_nonce( 'load_user_account_form' ) . '&user_id=' . $user_id ) ); ?>" class="thickbox" ><i class="dashicons dashicons-edit" ></i></a> -->
+		<!-- <a title="<?php esc_attr_e('User account edition', 'wpshop'); ?>" href="<?php echo esc_url(admin_url('admin-ajax.php?action=load_user_account_form&_wpnonce=' . wp_create_nonce('load_user_account_form') . '&user_id=' . $user_id)); ?>" class="thickbox" ><i class="dashicons dashicons-edit" ></i></a> -->
 
-		<?php if ( true === $user['is_default'] ) : ?>
-			<i title="<?php esc_attr_e( 'This is the main contact, you can\'t unlink it', 'wpshop' ); ?>" class="dashicons dashicons-lock" ></i>
+		<?php if (true === $user['is_default']) : ?>
+			<i title="<?php esc_attr_e('This is the main contact, you can\'t unlink it', 'wpshop'); ?>" class="dashicons dashicons-lock" ></i>
 		<?php else : ?>
-			<i title="<?php esc_attr_e( 'Unlink this user', 'wpshop' ); ?>" class="dashicons dashicons-editor-unlink" ></i>
+			<i title="<?php esc_attr_e('Unlink this user', 'wpshop'); ?>" class="dashicons dashicons-editor-unlink" ></i>
 		<?php endif; ?>
 		</td>
 	</tr>

Braces +10 added lines, -4 removed lines

@@ -30,16 +30,22 @@
 
 		<?php if ( true === $user['is_default'] ) : ?>
 			<i title="<?php esc_attr_e( 'This is the main contact / customer creator', 'wpshop' ); ?>" class="dashicons dashicons-star-filled" ></i>
-		<?php else : ?>
-			<i title="<?php esc_attr_e( 'Change to default customer', 'wpshop' ); ?>" class="dashicons dashicons-star-empty" ></i>
+		<?php else {
+	: ?>
+			<i title="<?php esc_attr_e( 'Change to default customer', 'wpshop' );
+}
+?>" class="dashicons dashicons-star-empty" ></i>
 		<?php endif; ?>
 
 		<!-- <a title="<?php esc_attr_e( 'User account edition', 'wpshop' ); ?>" href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=load_user_account_form&_wpnonce=' . wp_create_nonce( 'load_user_account_form' ) . '&user_id=' . $user_id ) ); ?>" class="thickbox" ><i class="dashicons dashicons-edit" ></i></a> -->
 
 		<?php if ( true === $user['is_default'] ) : ?>
 			<i title="<?php esc_attr_e( 'This is the main contact, you can\'t unlink it', 'wpshop' ); ?>" class="dashicons dashicons-lock" ></i>
-		<?php else : ?>
-			<i title="<?php esc_attr_e( 'Unlink this user', 'wpshop' ); ?>" class="dashicons dashicons-editor-unlink" ></i>
+		<?php else {
+	: ?>
+			<i title="<?php esc_attr_e( 'Unlink this user', 'wpshop' );
+}
+?>" class="dashicons dashicons-editor-unlink" ></i>
 		<?php endif; ?>
 		</td>
 	</tr>

includes/modules/wps_customer_contacts/templates/backend/contacts.php

Spacing +9 added lines, -9 removed lines

@@ -9,19 +9,19 @@ 
  * @version 3.0.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 $default_user = 0;
 ob_start();
-require( wpshop_tools::get_template_part( WPS_CUST_CONTACT_DIR, WPS_CUST_CONTACT_TPL, 'backend', 'contact' ) );
+require(wpshop_tools::get_template_part(WPS_CUST_CONTACT_DIR, WPS_CUST_CONTACT_TPL, 'backend', 'contact'));
 $output = ob_get_clean();
 
 ?><table class="wp-list-table widefat fixed striped users"
-	data-dissociate-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_customer_contacts_dissociate' ) ); ?>"
-	data-change-default-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_customer_contacts_change_default' ) ); ?>"
-	data-default-user-id="<?php echo esc_attr( $default_user ); ?>"  >
+	data-dissociate-nonce="<?php echo esc_attr(wp_create_nonce('wps_customer_contacts_dissociate')); ?>"
+	data-change-default-nonce="<?php echo esc_attr(wp_create_nonce('wps_customer_contacts_change_default')); ?>"
+	data-default-user-id="<?php echo esc_attr($default_user); ?>"  >
 
 	<tbody>
 		<?php echo $output; // WPCS: XSS ok. ?>
@@ -31,11 +31,11 @@ 
 		<tr>
 			<td colspan="5" class="wps-customer-associate-contact-container" >
 				<span class="wps-customer-contact-association-opener" ><i class="dashicons dashicons-plus" ></i></span>
-				<input type="text" class="wps-customer-autocomplete-input hidden" placeholder="<?php esc_html_e( 'Start typing for user searching', 'wpshop' ); ?>"
-					data-search-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_customer_search' ) ); ?>"
+				<input type="text" class="wps-customer-autocomplete-input hidden" placeholder="<?php esc_html_e('Start typing for user searching', 'wpshop'); ?>"
+					data-search-nonce="<?php echo esc_attr(wp_create_nonce('wps_customer_search')); ?>"
 					data-types="users"
-					data-customer="<?php echo esc_attr( $customer->ID ); ?>"
-					data-associate-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_customer_contacts_associate' ) ); ?>" />
+					data-customer="<?php echo esc_attr($customer->ID); ?>"
+					data-associate-nonce="<?php echo esc_attr(wp_create_nonce('wps_customer_contacts_associate')); ?>" />
 			</td>
 		</tr>
 	</tfoot>

includes/modules/wps_customer_contacts/controller/wps-customer-contact.action.php

Spacing +84 added lines, -84 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage modules
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,20 +29,20 @@ 
 	 * Instanciation des actions pour la gestion des clients
 	 */
 	public function __construct() {
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_box' ) );
+		add_action('add_meta_boxes', array($this, 'add_meta_box'));
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'callback_admin_enqueue_scripts' ), 11 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'callback_enqueue_scripts' ), 11 );
+		add_action('admin_enqueue_scripts', array($this, 'callback_admin_enqueue_scripts'), 11);
+		add_action('wp_enqueue_scripts', array($this, 'callback_enqueue_scripts'), 11);
 
 		/** Affichage de la liste déroulante des clients associés dans le compte de l'utilisateur connecté / Display associated customer list into connected user account */
-		add_action( 'wps_user_dashboard_header', array( $this, 'callback_customer_dashboard' ), 10, 2 );
+		add_action('wps_user_dashboard_header', array($this, 'callback_customer_dashboard'), 10, 2);
 
 		// Association des utilisateurs à un client / Associate a user to a customer.
-		add_action( 'wp_ajax_wps_customer_contacts_associate', array( $this, 'ajax_callback_associate_user' ) );
+		add_action('wp_ajax_wps_customer_contacts_associate', array($this, 'ajax_callback_associate_user'));
 		// Dissociation d'un utilisateur à un client / Dissociate a user from a customer.
-		add_action( 'wp_ajax_wps_customer_contacts_dissociate', array( $this, 'ajax_callback_dissociate_user' ) );
+		add_action('wp_ajax_wps_customer_contacts_dissociate', array($this, 'ajax_callback_dissociate_user'));
 		// Changement de l'utilisateur par défaut (auteur) d'un client / Change the default user (author) for a customer.
-		add_action( 'wp_ajax_wps_customer_contacts_change_default', array( $this, 'ajax_callback_change_default_user' ) );
+		add_action('wp_ajax_wps_customer_contacts_change_default', array($this, 'ajax_callback_change_default_user'));
 	}
 
 	/**
@@ -50,8 +50,8 @@ 
 	 *
 	 * @param string $post_type Le type d'élément sur lequel se trouve l'utilisateur / Element type where the user is.
 	 */
-	function add_meta_box( $post_type ) {
-		add_meta_box( 'wps_customer_contacts', __( 'Customer contact list', 'wpshop' ), array( $this, 'customer_contact_list_callback' ), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'normal', 'high' );
+	function add_meta_box($post_type) {
+		add_meta_box('wps_customer_contacts', __('Customer contact list', 'wpshop'), array($this, 'customer_contact_list_callback'), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'normal', 'high');
 	}
 
 	/**
@@ -61,15 +61,15 @@ 
 	 */
 	public function callback_admin_enqueue_scripts() {
 		$screen = get_current_screen();
-		if ( in_array( $screen->id, array( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ), true ) ) {
-			wp_register_style( 'wps_customer_contacts-style', WPS_CUST_CONTACT_URL . 'assets/css/wps_customer_contacts.backend.css', array(), WPSHOP_VERSION );
-			wp_enqueue_style( 'wps_customer_contacts-style' );
-			wp_register_script( 'wps_customer_contacts-script', WPS_CUST_CONTACT_URL . 'assets/js/wps_customer_contacts.backend.js', array( 'jquery', 'jquery-form', 'jquery-ui-autocomplete' ), WPSHOP_VERSION );
-			wp_localize_script( 'wps_customer_contacts-script', 'wpshopCrm', array(
-				'confirm_user_dissociation' 	=> __( 'Are you sure you want to dissociate this user', 'wpshop' ),
-				'confirm_change_default_user' => __( 'Are you sure you want to change default user for current customer?', 'wpshop' ),
-			) );
-			wp_enqueue_script( 'wps_customer_contacts-script' );
+		if (in_array($screen->id, array(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS), true)) {
+			wp_register_style('wps_customer_contacts-style', WPS_CUST_CONTACT_URL . 'assets/css/wps_customer_contacts.backend.css', array(), WPSHOP_VERSION);
+			wp_enqueue_style('wps_customer_contacts-style');
+			wp_register_script('wps_customer_contacts-script', WPS_CUST_CONTACT_URL . 'assets/js/wps_customer_contacts.backend.js', array('jquery', 'jquery-form', 'jquery-ui-autocomplete'), WPSHOP_VERSION);
+			wp_localize_script('wps_customer_contacts-script', 'wpshopCrm', array(
+				'confirm_user_dissociation' 	=> __('Are you sure you want to dissociate this user', 'wpshop'),
+				'confirm_change_default_user' => __('Are you sure you want to change default user for current customer?', 'wpshop'),
+			));
+			wp_enqueue_script('wps_customer_contacts-script');
 			add_thickbox();
 		}
 	}
@@ -78,13 +78,13 @@ 
 	 * Enqueue scripts and style in frontend
 	 */
 	public function callback_enqueue_scripts() {
-		$pagename = get_query_var( 'pagename' );
-		if ( in_array( $pagename, array( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ), true ) ) {
-			wp_register_style( 'task-manager-frontend-style', WPS_CUST_CONTACT_URL . 'assets/css/frontend.css', array(), WPSHOP_VERSION );
-			wp_enqueue_style( 'task-manager-frontend-style' );
+		$pagename = get_query_var('pagename');
+		if (in_array($pagename, array(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS), true)) {
+			wp_register_style('task-manager-frontend-style', WPS_CUST_CONTACT_URL . 'assets/css/frontend.css', array(), WPSHOP_VERSION);
+			wp_enqueue_style('task-manager-frontend-style');
 		}
-		wp_register_script( 'wps_customer_contacts-frontend-script', WPS_CUST_CONTACT_URL . 'assets/js/wps_customer_contacts.frontend.js', array(), WPSHOP_VERSION );
-		wp_enqueue_script( 'wps_customer_contacts-frontend-script' );
+		wp_register_script('wps_customer_contacts-frontend-script', WPS_CUST_CONTACT_URL . 'assets/js/wps_customer_contacts.frontend.js', array(), WPSHOP_VERSION);
+		wp_enqueue_script('wps_customer_contacts-frontend-script');
 	}
 
 	/**
@@ -92,11 +92,11 @@ 
 	 *
 	 * @param WP_Post $customer La définition principale du client actuellement en cours d'édition / Current edited customer definition.
 	 */
-	function customer_contact_list_callback( $customer ) {
-		$users = $this->get_customer_contact_list( $customer );
+	function customer_contact_list_callback($customer) {
+		$users = $this->get_customer_contact_list($customer);
 
 		/** Display user list for current customer */
-		require( wpshop_tools::get_template_part( WPS_CUST_CONTACT_DIR, WPS_CUST_CONTACT_TPL, 'backend', 'contacts' ) );
+		require(wpshop_tools::get_template_part(WPS_CUST_CONTACT_DIR, WPS_CUST_CONTACT_TPL, 'backend', 'contacts'));
 	}
 
 	/**
@@ -106,23 +106,23 @@ 
 	 *
 	 * @return [type]           [description]
 	 */
-	function get_customer_contact_list( $customer ) {
+	function get_customer_contact_list($customer) {
 		/** Define user list */
 		$users = array();
 
 		/** Get associated users' */
-		$associated_users = (array) get_post_meta( $customer->ID, $this->user_contact_list_meta_key, true );
-		$user_list = wp_parse_id_list( array_merge( $associated_users, array( $customer->post_author ) ) );
-		if ( ! empty( $user_list ) ) {
-			foreach ( $user_list as $user_id ) {
-				if ( 0 !== $user_id ) {
-					$associated_user = get_user_by( 'ID', $user_id );
-					if ( is_object( $associated_user ) ) {
-						$users[ $user_id ] = wp_parse_args( $associated_user->data, array(
+		$associated_users = (array)get_post_meta($customer->ID, $this->user_contact_list_meta_key, true);
+		$user_list = wp_parse_id_list(array_merge($associated_users, array($customer->post_author)));
+		if (!empty($user_list)) {
+			foreach ($user_list as $user_id) {
+				if (0 !== $user_id) {
+					$associated_user = get_user_by('ID', $user_id);
+					if (is_object($associated_user)) {
+						$users[$user_id] = wp_parse_args($associated_user->data, array(
 							'last_name'		=> $associated_user->last_name,
 							'first_name'	=> $associated_user->first_name,
-							'is_default'	=> ( $user_id === (int) $customer->post_author ? true : false ),
-						) );
+							'is_default'	=> ($user_id === (int)$customer->post_author ? true : false),
+						));
 					}
 				}
 			}
@@ -137,20 +137,20 @@ 
 	 * @param integer $user_id Identifiant de l'utilisateur actuellement connecté / User identifier currenly connected.
 	 * @param WP_User $account_user La définition du compte utilisateur / The user account definition.
 	 */
-	function callback_customer_dashboard( $user_id, $account_user ) {
+	function callback_customer_dashboard($user_id, $account_user) {
 		$customers = array();
 
-		$customers_from_posts = new WP_Query( array(
+		$customers_from_posts = new WP_Query(array(
 			'post_type'				=> WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS,
 			'author'					=> $user_id,
 			'posts_per_page'	=> -1,
 			'post_status'			=> 'any',
-		) );
-		if ( $customers_from_posts->have_posts() ) {
-			$customers = array_merge( $customers, $customers_from_posts->posts );
+		));
+		if ($customers_from_posts->have_posts()) {
+			$customers = array_merge($customers, $customers_from_posts->posts);
 		}
 
-		$customers_from_meta = new WP_Query( array(
+		$customers_from_meta = new WP_Query(array(
 			'post_type'				=> WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS,
 			'posts_per_page'	=> -1,
 			'post_status'			=> 'any',
@@ -162,20 +162,20 @@ 
 					'type'		=> 'CHAR',
 				),
 			),
-		) );
-		if ( $customers_from_meta->have_posts() ) {
-			$customers = array_merge( $customers, $customers_from_meta->posts );
+		));
+		if ($customers_from_meta->have_posts()) {
+			$customers = array_merge($customers, $customers_from_meta->posts);
 		}
-		usort( $customers, function( $a, $b ) {
-			if ( $a->ID === $b->ID ) {
+		usort($customers, function($a, $b) {
+			if ($a->ID === $b->ID) {
 				return 0;
 			}
 			return ($a < $b) ? -1 : 1;
 		});
 
-		if ( ! empty( $customers ) && ( 1 < count( $customers ) ) ) {
+		if (!empty($customers) && (1 < count($customers))) {
 			/** Display user list for current customer */
-			require( wpshop_tools::get_template_part( WPS_CUST_CONTACT_DIR, WPS_CUST_CONTACT_TPL, 'frontend', 'customer', 'choice' ) );
+			require(wpshop_tools::get_template_part(WPS_CUST_CONTACT_DIR, WPS_CUST_CONTACT_TPL, 'frontend', 'customer', 'choice'));
 		}
 	}
 
@@ -183,20 +183,20 @@ 
 	 * Ajax callback - Associate a user to a customer
 	 */
 	function ajax_callback_associate_user() {
-		check_ajax_referer( 'wps_customer_contacts_associate' );
+		check_ajax_referer('wps_customer_contacts_associate');
 
-		$customer_id = ! empty( $_POST ) && ! empty( $_POST['CID'] ) && is_int( (int) $_POST['CID'] ) ? (int) $_POST['CID'] : null;
-		$user_id = ! empty( $_POST ) && ! empty( $_POST['UID'] ) && is_int( (int) $_POST['UID'] ) ? (int) $_POST['UID'] : null;
+		$customer_id = !empty($_POST) && !empty($_POST['CID']) && is_int((int)$_POST['CID']) ? (int)$_POST['CID'] : null;
+		$user_id = !empty($_POST) && !empty($_POST['UID']) && is_int((int)$_POST['UID']) ? (int)$_POST['UID'] : null;
 
-		$associated_users = get_post_meta( $customer_id, $this->user_contact_list_meta_key, true );
-		if ( ! empty( $associated_users ) ) {
-			$new_associated_users = wp_parse_id_list( array_merge( $associated_users, array( $user_id ) ) );
+		$associated_users = get_post_meta($customer_id, $this->user_contact_list_meta_key, true);
+		if (!empty($associated_users)) {
+			$new_associated_users = wp_parse_id_list(array_merge($associated_users, array($user_id)));
 		} else {
-			$new_associated_users = array( $user_id );
+			$new_associated_users = array($user_id);
 		}
 
-		update_post_meta( $customer_id, $this->user_contact_list_meta_key, $new_associated_users );
-		$this->customer_contact_list_callback( get_post( $customer_id ) );
+		update_post_meta($customer_id, $this->user_contact_list_meta_key, $new_associated_users);
+		$this->customer_contact_list_callback(get_post($customer_id));
 		wp_die();
 	}
 
@@ -204,20 +204,20 @@ 
 	 * Ajax callback - Associate a user to a customer
 	 */
 	function ajax_callback_dissociate_user() {
-		check_ajax_referer( 'wps_customer_contacts_dissociate' );
+		check_ajax_referer('wps_customer_contacts_dissociate');
 
-		$customer_id = ! empty( $_POST ) && ! empty( $_POST['CID'] ) && is_int( (int) $_POST['CID'] ) ? (int) $_POST['CID'] : null;
-		$user_id = ! empty( $_POST ) && ! empty( $_POST['UID'] ) && is_int( (int) $_POST['UID'] ) ? (int) $_POST['UID'] : null;
+		$customer_id = !empty($_POST) && !empty($_POST['CID']) && is_int((int)$_POST['CID']) ? (int)$_POST['CID'] : null;
+		$user_id = !empty($_POST) && !empty($_POST['UID']) && is_int((int)$_POST['UID']) ? (int)$_POST['UID'] : null;
 
-		$associated_users = get_post_meta( $customer_id, $this->user_contact_list_meta_key, true );
-		foreach ( $associated_users as $key => $id ) {
-			if ( $id === $user_id ) {
-				unset( $associated_users[ $key ] );
+		$associated_users = get_post_meta($customer_id, $this->user_contact_list_meta_key, true);
+		foreach ($associated_users as $key => $id) {
+			if ($id === $user_id) {
+				unset($associated_users[$key]);
 			}
 		}
 
-		update_post_meta( $customer_id, $this->user_contact_list_meta_key, $associated_users );
-		$this->customer_contact_list_callback( get_post( $customer_id ) );
+		update_post_meta($customer_id, $this->user_contact_list_meta_key, $associated_users);
+		$this->customer_contact_list_callback(get_post($customer_id));
 		wp_die();
 	}
 
@@ -225,30 +225,30 @@ 
 	 * Ajax callback - Change the default user for a customer
 	 */
 	function ajax_callback_change_default_user() {
-		check_ajax_referer( 'wps_customer_contacts_change_default' );
+		check_ajax_referer('wps_customer_contacts_change_default');
 
-		$customer_id = ! empty( $_POST ) && ! empty( $_POST['CID'] ) && is_int( (int) $_POST['CID'] ) ? (int) $_POST['CID'] : null;
-		$user_id = ! empty( $_POST ) && ! empty( $_POST['UID'] ) && is_int( (int) $_POST['UID'] ) ? (int) $_POST['UID'] : null;
-		$old_user_id = ! empty( $_POST ) && ! empty( $_POST['current_default_user_id'] ) && is_int( (int) $_POST['current_default_user_id'] ) ? (int) $_POST['current_default_user_id'] : null;
+		$customer_id = !empty($_POST) && !empty($_POST['CID']) && is_int((int)$_POST['CID']) ? (int)$_POST['CID'] : null;
+		$user_id = !empty($_POST) && !empty($_POST['UID']) && is_int((int)$_POST['UID']) ? (int)$_POST['UID'] : null;
+		$old_user_id = !empty($_POST) && !empty($_POST['current_default_user_id']) && is_int((int)$_POST['current_default_user_id']) ? (int)$_POST['current_default_user_id'] : null;
 
-		$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, array( 'post_author' => $user_id ), array( 'ID' => $customer_id ) );
-		$customer_default_user_changes = get_post_meta( $customer_id, '_wps_customer_default_user_histo', true );
+		$GLOBALS['wpdb']->update($GLOBALS['wpdb']->posts, array('post_author' => $user_id), array('ID' => $customer_id));
+		$customer_default_user_changes = get_post_meta($customer_id, '_wps_customer_default_user_histo', true);
 		$customer_default_user_changes[] = array(
-			'date'						=> current_time( 'mysql' ),
+			'date'						=> current_time('mysql'),
 			'old_post_author'	=> $old_user_id,
 			'update_author'		=> get_current_user_id(),
 		);
-		update_post_meta( $customer_id, '_wps_customer_default_user_histo', $customer_default_user_changes );
+		update_post_meta($customer_id, '_wps_customer_default_user_histo', $customer_default_user_changes);
 
-		$associated_users = get_post_meta( $customer_id, $this->user_contact_list_meta_key, true );
-		if ( ! empty( $associated_users ) ) {
-			$new_associated_users = wp_parse_id_list( array_merge( $associated_users, array( $old_user_id ) ) );
+		$associated_users = get_post_meta($customer_id, $this->user_contact_list_meta_key, true);
+		if (!empty($associated_users)) {
+			$new_associated_users = wp_parse_id_list(array_merge($associated_users, array($old_user_id)));
 		} else {
-			$new_associated_users = array( $old_user_id );
+			$new_associated_users = array($old_user_id);
 		}
-		update_post_meta( $customer_id, $this->user_contact_list_meta_key, $new_associated_users );
+		update_post_meta($customer_id, $this->user_contact_list_meta_key, $new_associated_users);
 
-		$this->customer_contact_list_callback( get_post( $customer_id ) );
+		$this->customer_contact_list_callback(get_post($customer_id));
 		wp_die();
 	}
 

includes/modules/wps_address/templates/common/address-form.php

Spacing +8 added lines, -8 removed lines

@@ -5,25 +5,25 @@
  * @package WPShop
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 ?>
 <div id="wps_address_error_container"></div>
-<form id="wps_address_form_save" action="<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>" method="post">
+<form id="wps_address_form_save" action="<?php echo esc_url(admin_url('admin-ajax.php')); ?>" method="post">
 	<input type="hidden" name="action" value="wps_save_address" />
-	<input type="hidden" name="post_ID" value="<?php echo esc_attr( $customer_id ); ?>" />
-	<?php wp_nonce_field( 'wps_save_address' ); ?>
-	<?php echo self::display_form_fields( $address_type_id, $address_id, '', '', array(), array(), array(), $customer_id ); // WPCS: XSS ok. ?>
+	<input type="hidden" name="post_ID" value="<?php echo esc_attr($customer_id); ?>" />
+	<?php wp_nonce_field('wps_save_address'); ?>
+	<?php echo self::display_form_fields($address_type_id, $address_id, '', '', array(), array(), array(), $customer_id); // WPCS: XSS ok. ?>
 
 	<?php
 	/** Check if a billing address is already save **/
-	if ( $first_address_checking && ( $address_type_id !== (int) $billing_option['choice'] ) ) : ?>
+	if ($first_address_checking && ($address_type_id !== (int)$billing_option['choice'])) : ?>
 		<div class="wps-form">
-			<input name="wps-shipping-to-billing" id="wps-shipping-to-billing" checked="checked" type="checkbox" /> <label for="wps-shipping-to-billing"><?php esc_html_e( 'Use the same address for billing', 'wpshop' ); ?></label>
+			<input name="wps-shipping-to-billing" id="wps-shipping-to-billing" checked="checked" type="checkbox" /> <label for="wps-shipping-to-billing"><?php esc_html_e('Use the same address for billing', 'wpshop'); ?></label>
 		</div>
 	<?php endif; ?>
 
-	<button id="wps_submit_address_form" class="wps-bton-first-alignRight-rounded" ><?php esc_html_e( 'Save', 'wpshop' ); ?></button>
+	<button id="wps_submit_address_form" class="wps-bton-first-alignRight-rounded" ><?php esc_html_e('Save', 'wpshop'); ?></button>
 </form>

includes/modules/wps_address/templates/frontend/address-container.php

Spacing +22 added lines, -22 removed lines

@@ -1,66 +1,66 @@
 <?php
- if ( !defined( 'ABSPATH' ) ) exit;
-?><div class="wps-<?php echo esc_attr( $address_type ); ?>-address" <?php if ( ! empty( $first_address_checking ) && ! is_admin() && ( 'billing' === $address_type ) ) { echo 'style="display: none;"'; } ?>>
+ if (!defined('ABSPATH')) exit;
+?><div class="wps-<?php echo esc_attr($address_type); ?>-address" <?php if (!empty($first_address_checking) && !is_admin() && ('billing' === $address_type)) { echo 'style="display: none;"'; } ?>>
 	<div class="wps-gridwrapper">
-		<div class="wps-grid4x6"><span class="wps-h3"><?php echo esc_html( $address_title ); ?></span></div>
+		<div class="wps-grid4x6"><span class="wps-h3"><?php echo esc_html($address_title); ?></span></div>
 	</div>
-	<ul class="wps-itemList wps-address-container" data-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_reload_address_interface' ) ); ?>" id="wps-address-container-<?php echo esc_attr( $address_type_id ); ?>">
-<?php if ( ! empty( $box_content ) ) : ?>
+	<ul class="wps-itemList wps-address-container" data-nonce="<?php echo esc_attr(wp_create_nonce('wps_reload_address_interface')); ?>" id="wps-address-container-<?php echo esc_attr($address_type_id); ?>">
+<?php if (!empty($box_content)) : ?>
 		<?php echo $box_content; // WPCS: XSS ok. ?>
 <?php endif; ?>
 	</ul>
 
 <?php
 $hide_add_btn = true;
-if ( empty( $box_content ) && ( 'shipping' === $address_type ) ) :
+if (empty($box_content) && ('shipping' === $address_type)) :
 	$hide_add_btn = false;
 ?>	<div class="wps-address-first-address-creation-container" >
 		<div id="wps_address_error_container" ></div>
-		<form id="wps_address_form_save_first_address" action="<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>" method="post">
+		<form id="wps_address_form_save_first_address" action="<?php echo esc_url(admin_url('admin-ajax.php')); ?>" method="post">
 			<input type="hidden" name="action" value="wps_save_address" />
-			<?php wp_nonce_field( 'wps_save_address' ); ?>
-			<input type="hidden" name="wps-address-save-the-first" value="<?php echo esc_attr( $address_type ); ?>" />
-			<?php echo self::display_form_fields( $address_type_id, '', 'first', '', array(), array(), array(), get_current_user_id() ); // WPCS: XSS ok. ?>
+			<?php wp_nonce_field('wps_save_address'); ?>
+			<input type="hidden" name="wps-address-save-the-first" value="<?php echo esc_attr($address_type); ?>" />
+			<?php echo self::display_form_fields($address_type_id, '', 'first', '', array(), array(), array(), get_current_user_id()); // WPCS: XSS ok. ?>
 
 			<?php // Affichage d'une case à cocher permettant la création d'une adresse de facturatoin à parti de l'adresse de livraison / Display checkbox for creating billing address from shipping if there is no billing address. ?>
-			<?php if ( $address_type_id === $shipping_option['choice'] ) : ?>
+			<?php if ($address_type_id === $shipping_option['choice']) : ?>
 			<label class="wps-form" >
 				<input name="wps-shipping-to-billing" id="wps-shipping_to_billing" checked="checked" type="checkbox" />
-				<?php esc_html_e( 'Use the same address for billing', 'wpshop' ); ?>
+				<?php esc_html_e('Use the same address for billing', 'wpshop'); ?>
 			</label>
 			<?php endif; ?>
 
-			<button class="wps_submit_address_form wps-bton-first-alignRight-rounded"><?php esc_html_e( 'Save', 'wpshop' ); ?></button>
+			<button class="wps_submit_address_form wps-bton-first-alignRight-rounded"><?php esc_html_e('Save', 'wpshop'); ?></button>
 		</form>
 	</div>
-<?php elseif ( empty( $box_content ) && ( 'billing' === $address_type ) && ! $shipping_is_avalaible ) :
+<?php elseif (empty($box_content) && ('billing' === $address_type) && !$shipping_is_avalaible) :
 	$hide_add_btn = $shipping_is_avalaible;
 ?>
 
 	<div class="wps-address-first-address-creation-container" >
 		<div id="wps_address_error_container" ></div>
-		<form id="wps_address_form_save_first_address" action="<?php echo admin_url( 'admin-ajax.php' ); ?>" method="post">
+		<form id="wps_address_form_save_first_address" action="<?php echo admin_url('admin-ajax.php'); ?>" method="post">
 			<input type="hidden" name="action" value="wps_save_address" />
-			<?php wp_nonce_field( 'wps_save_address' ); ?>
+			<?php wp_nonce_field('wps_save_address'); ?>
 			<input type="hidden" name="wps-address-save-the-first" value="<?php echo $address_type; ?>" />
-			<?php echo self::display_form_fields( $address_type_id, '', 'first', '', array(), array(), array(), get_current_user_id() ); ?>
+			<?php echo self::display_form_fields($address_type_id, '', 'first', '', array(), array(), array(), get_current_user_id()); ?>
 
 <?php
 			/** Check if a billing address is already save **/
-	if ( $address_type_id != $billing_option['choice'] ) :
+	if ($address_type_id != $billing_option['choice']) :
 ?>
 			<label class="wps-form" >
 				<input name="wps-shipping-to-billing" id="wps-shipping_to_billing" checked="checked" type="checkbox" />
-				<?php esc_html_e( 'Use the same address for billing', 'wpshop' ); ?>
+				<?php esc_html_e('Use the same address for billing', 'wpshop'); ?>
 			</label>
 <?php endif; ?>
 
-			<button class="wps_submit_address_form wps-bton-first-alignRight-rounded"><?php esc_html_e( 'Save', 'wpshop' ); ?></button>
+			<button class="wps_submit_address_form wps-bton-first-alignRight-rounded"><?php esc_html_e('Save', 'wpshop'); ?></button>
 		</form>
 	</div>
 <?php endif; ?>
 
-	<?php if ( ! is_admin() && $hide_add_btn ) : ?>
-		<button data-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_load_address_form_' . $address_type_id ) ); ?>" id="wps-add-an-address-<?php echo esc_attr( $address_type_id ); ?>" class="wps-bton-third wps-add-an-address<?php echo ( empty( $box_content ) && ! $hide_add_btn ? ' hidden' : '' ); ?>" ><i class="wps-icon-plus"></i><?php printf( __( 'Add a %s', 'wpshop' ), strtolower( $address_title ) ); ?></button>
+	<?php if (!is_admin() && $hide_add_btn) : ?>
+		<button data-nonce="<?php echo esc_attr(wp_create_nonce('wps_load_address_form_' . $address_type_id)); ?>" id="wps-add-an-address-<?php echo esc_attr($address_type_id); ?>" class="wps-bton-third wps-add-an-address<?php echo (empty($box_content) && !$hide_add_btn ? ' hidden' : ''); ?>" ><i class="wps-icon-plus"></i><?php printf(__('Add a %s', 'wpshop'), strtolower($address_title)); ?></button>
 	<?php endif; ?>
 </div>

Braces +4 added lines, -2 removed lines

@@ -1,6 +1,8 @@
 <?php
- if ( !defined( 'ABSPATH' ) ) exit;
-?><div class="wps-<?php echo esc_attr( $address_type ); ?>-address" <?php if ( ! empty( $first_address_checking ) && ! is_admin() && ( 'billing' === $address_type ) ) { echo 'style="display: none;"'; } ?>>
+ if ( !defined( 'ABSPATH' ) ) {
+ 	exit;
+ }
+ ?><div class="wps-<?php echo esc_attr( $address_type ); ?>-address" <?php if ( ! empty( $first_address_checking ) && ! is_admin() && ( 'billing' === $address_type ) ) { echo 'style="display: none;"'; } ?>>
 	<div class="wps-gridwrapper">
 		<div class="wps-grid4x6"><span class="wps-h3"><?php echo esc_html( $address_title ); ?></span></div>
 	</div>

includes/modules/wps_address/templates/frontend/address-content.php

Spacing +14 added lines, -14 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 $i = 0;
-if ( !empty($list_addresses) ) :
-	foreach( $list_addresses as $address_id => $address ) :
+if (!empty($list_addresses)) :
+	foreach ($list_addresses as $address_id => $address) :
 	$name_to_display  = '';
-	$name_to_display .= ( !empty($address['address_last_name']) ) ? $address['address_last_name'].' ': '';
-	$name_to_display .= ( !empty($address['address_first_name']) ) ? $address['address_first_name'].' - ': '';
-	$name_to_display .= ( !empty($address['address']) ) ? $address['address'].' ': '';
-	$name_to_display .= ( !empty($address['postcode']) ) ? $address['postcode'].' ': '';
-	$name_to_display .= ( !empty($address['city']) ) ? $address['city'].' ': '';
+	$name_to_display .= (!empty($address['address_last_name'])) ? $address['address_last_name'] . ' ' : '';
+	$name_to_display .= (!empty($address['address_first_name'])) ? $address['address_first_name'] . ' - ' : '';
+	$name_to_display .= (!empty($address['address'])) ? $address['address'] . ' ' : '';
+	$name_to_display .= (!empty($address['postcode'])) ? $address['postcode'] . ' ' : '';
+	$name_to_display .= (!empty($address['city'])) ? $address['city'] . ' ' : '';
 
 	$class = $checked = '';
 
-	$selected_address = ( !empty($_SESSION[ $type.'_address' ] ) ) ? $_SESSION[ $type.'_address' ] : '';
+	$selected_address = (!empty($_SESSION[$type . '_address'])) ? $_SESSION[$type . '_address'] : '';
 
-	if( !empty($selected_address) && $address_id == $selected_address ) {
+	if (!empty($selected_address) && $address_id == $selected_address) {
 		$class = 'wps-activ';
 		$checked = 'checked="checked"';
 	} else {
-		if( $i == 0 && empty($selected_address) ) {
+		if ($i == 0 && empty($selected_address)) {
 			$checked = 'checked="checked"';
 			$class = 'wps-activ';
 		} else {
@@ -28,14 +28,14 @@ 
 ?>
 		<li class="<?php echo $class; ?> wps-bloc-loader">
 			<span><input type="radio" class="wps_select_address" value="<?php echo $address_id; ?>" name="<?php echo $type; ?>_address_id" id="wps_select_address_<?php echo $address_id; ?>" <?php echo $checked; ?> /></span>
-			<span><strong><?php echo ( ( !empty($address['address_title']) ) ? $address['address_title'] : '' ); ?></strong></span>
+			<span><strong><?php echo ((!empty($address['address_title'])) ? $address['address_title'] : ''); ?></strong></span>
 			<span><?php echo $name_to_display; ?></span>
 			<span class="wps-itemList-tools">
-				<a href="" title="<?php _e( 'Edit this address', 'wpshop' ); ?>" class="wps-address-edit-address" id="wps-address-edit-address-<?php echo $address_id; ?>" data-address_type="<?php echo $address_type_id; ?>" data-nonce="<?php echo wp_create_nonce( 'wps_load_address_form_' . $address_type_id ); ?>" ><i class="wps-icon-pencil"></i></a>
-				<a href="" title="<?php _e( 'Delete this address', 'wpshop' ); ?>" class="wps-address-delete-address" id="wps-address-delete-address-<?php echo $address_id; ?>-<?php echo $address_type_id; ?>" data-nonce="<?php echo wp_create_nonce( 'wps_delete_an_address' ); ?>" ><i class="wps-icon-trash"></i></a>
+				<a href="" title="<?php _e('Edit this address', 'wpshop'); ?>" class="wps-address-edit-address" id="wps-address-edit-address-<?php echo $address_id; ?>" data-address_type="<?php echo $address_type_id; ?>" data-nonce="<?php echo wp_create_nonce('wps_load_address_form_' . $address_type_id); ?>" ><i class="wps-icon-pencil"></i></a>
+				<a href="" title="<?php _e('Delete this address', 'wpshop'); ?>" class="wps-address-delete-address" id="wps-address-delete-address-<?php echo $address_id; ?>-<?php echo $address_type_id; ?>" data-nonce="<?php echo wp_create_nonce('wps_delete_an_address'); ?>" ><i class="wps-icon-trash"></i></a>
 			</span>
 			<div class="wps-itemList-content">
-				<?php echo wps_address::display_an_address( $address, $address_id ); ?>
+				<?php echo wps_address::display_an_address($address, $address_id); ?>
 			</div>
 		</li>
 <?php

includes/modules/wps_address/templates/backend/address-content.php

Spacing +26 added lines, -26 removed lines

@@ -6,60 +6,60 @@
  * @subpackage Customer
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 global $post_id;
-$post_id = ( ! empty( $order_id ) ) ? $order_id : $post_id;
+$post_id = (!empty($order_id)) ? $order_id : $post_id;
 
-$order_infos = get_post_meta( $post_id, '_order_info', true );
-$order_meta = get_post_meta( $post_id, '_order_postmeta', true );
+$order_infos = get_post_meta($post_id, '_order_info', true);
+$order_meta = get_post_meta($post_id, '_order_postmeta', true);
 $i = 0;
 
-if ( ! empty( $list_addresses ) ) :
-	foreach ( $list_addresses as $address_id => $address ) :
-		$adress_post = get_post( $address_id );
+if (!empty($list_addresses)) :
+	foreach ($list_addresses as $address_id => $address) :
+		$adress_post = get_post($address_id);
 		$name_to_display = $customer_name = '';
-		$customer_name = ( ! empty( $address['address_last_name'] ) ) ? $address['address_last_name'] . ' ' : '';
-		$customer_name .= ( ! empty( $address['address_first_name'] ) ) ? $address['address_first_name'] . ' - ': '';
-		$name_to_display .= ( ! empty( $address['address'] ) ) ? $address['address'] . ' ' : '';
-		$name_to_display .= ( ! empty( $address['postcode'] ) ) ? $address['postcode'] . ' ' : '';
-		$name_to_display .= ( ! empty( $address['city'] ) ) ? $address['city'] . ' ' : '';
-		$name_to_display .= ( ! empty( $address['country'] ) ) ? $address['country'] . ' ' : '';
+		$customer_name = (!empty($address['address_last_name'])) ? $address['address_last_name'] . ' ' : '';
+		$customer_name .= (!empty($address['address_first_name'])) ? $address['address_first_name'] . ' - ' : '';
+		$name_to_display .= (!empty($address['address'])) ? $address['address'] . ' ' : '';
+		$name_to_display .= (!empty($address['postcode'])) ? $address['postcode'] . ' ' : '';
+		$name_to_display .= (!empty($address['city'])) ? $address['city'] . ' ' : '';
+		$name_to_display .= (!empty($address['country'])) ? $address['country'] . ' ' : '';
 
 		$class = $checked = $selected_address = '';
-		if ( ! empty( $order_infos ) && ! empty( $order_infos[ $type ] ) && ! empty( $order_infos[ $type ]['address_id'] ) ) {
-			$selected_address = $order_infos[ $type ]['address_id'];
+		if (!empty($order_infos) && !empty($order_infos[$type]) && !empty($order_infos[$type]['address_id'])) {
+			$selected_address = $order_infos[$type]['address_id'];
 		}
 
-		if ( ! empty( $selected_address ) && $address_id == $selected_address ) {
+		if (!empty($selected_address) && $address_id == $selected_address) {
 			$class = 'wps-activ';
 			$checked = 'checked="checked"';
 		} else {
-			if ( ( 0 === $i) && empty( $selected_address ) ) {
+			if ((0 === $i) && empty($selected_address)) {
 				$checked = 'checked="checked"';
 				$class = 'wps-activ';
 			}
 		}
 
 		$url_separator = '?';
-		if ( strpos( admin_url( 'admin-ajax.php' ), '?' ) ) :
+		if (strpos(admin_url('admin-ajax.php'), '?')) :
 			$url_separator = '&';
 		endif;
 ?>
-		<li class="<?php echo esc_attr( $class ); ?> wps-bloc-loader wps_address_li">
-			<span><input type="radio" class="wps_select_address" value="<?php echo esc_attr( $address_id ); ?>" name="<?php echo esc_attr( $type ); ?>_address_id" id="wps_select_address_<?php echo esc_attr( $address_id ); ?>" <?php echo $checked; ?> /></span>
-			<span><strong><?php echo ( ! empty( $customer_name ) ? $customer_name : '' ); ?></strong></span>
-			<span><?php echo esc_html( $name_to_display ); ?></span>
+		<li class="<?php echo esc_attr($class); ?> wps-bloc-loader wps_address_li">
+			<span><input type="radio" class="wps_select_address" value="<?php echo esc_attr($address_id); ?>" name="<?php echo esc_attr($type); ?>_address_id" id="wps_select_address_<?php echo esc_attr($address_id); ?>" <?php echo $checked; ?> /></span>
+			<span><strong><?php echo (!empty($customer_name) ? $customer_name : ''); ?></strong></span>
+			<span><?php echo esc_html($name_to_display); ?></span>
 			<span class="wps-itemList-tools">
 				<!-- wps_delete_an_address -->
-				<a href="<?php print wp_nonce_url( admin_url( 'admin-ajax.php' ) . $url_separator . 'action=wps_order_load_address_edit_form&address_id=' . $address_id . '&address_type=' . $address_type_id . '&customer_id=' . $customer_id . '&width=740&height=690', 'load_adress_edit_form', '_wpnonce' ); ?>" title="<?php _e( 'Edit this address', 'wpshop' ); ?>" class="wps-address-edit-address thickbox" id="wps-address-edit-address-<?php echo $address_id; ?>"><i class="wps-icon-pencil"></i></a>
-				<a href="" data-nonce="<?php echo wp_create_nonce( 'delete_address_in_order_panel_' . $address_id . '-' . $address_type_id ); ?>" title="<?php _e( 'Delete this address', 'wpshop' ); ?>" class="wps-address-delete-address" id="wps-address-delete-address-<?php echo $address_id; ?>-<?php echo $address_type_id; ?>"><i class="wps-icon-trash"></i></a>
+				<a href="<?php print wp_nonce_url(admin_url('admin-ajax.php') . $url_separator . 'action=wps_order_load_address_edit_form&address_id=' . $address_id . '&address_type=' . $address_type_id . '&customer_id=' . $customer_id . '&width=740&height=690', 'load_adress_edit_form', '_wpnonce'); ?>" title="<?php _e('Edit this address', 'wpshop'); ?>" class="wps-address-edit-address thickbox" id="wps-address-edit-address-<?php echo $address_id; ?>"><i class="wps-icon-pencil"></i></a>
+				<a href="" data-nonce="<?php echo wp_create_nonce('delete_address_in_order_panel_' . $address_id . '-' . $address_type_id); ?>" title="<?php _e('Delete this address', 'wpshop'); ?>" class="wps-address-delete-address" id="wps-address-delete-address-<?php echo $address_id; ?>-<?php echo $address_type_id; ?>"><i class="wps-icon-trash"></i></a>
 			</span>
 		</li>
-		<li class="wps_address_li_content"<?php echo ($checked) ? ' style="display: list-item;"' : '';?>>
-			<?php echo wps_address::display_an_address( $address, $address_id ); ?>
+		<li class="wps_address_li_content"<?php echo ($checked) ? ' style="display: list-item;"' : ''; ?>>
+			<?php echo wps_address::display_an_address($address, $address_id); ?>
 		</li>
 <?php
 		$i++;