Eoxia / wpshop

includes/modules/wps_message/controller/wps_message_ctr.php

Spacing +205 added lines, -205 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) { exit;
+<?php if (!defined('ABSPATH')) { exit;
 }
 class wps_message_ctr {
 
@@ -18,19 +18,19 @@ 
 	function __construct() {
 
 		/** Js */
-		add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
+		add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
 		// End if().
 		$this->template_dir = WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/';
 		// WP General actions
-		add_action( 'admin_init', array( $this, 'wps_messages_init_actions' ) );
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
-		add_action( 'manage_' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_posts_custom_column',  array( $this, 'messages_custom_columns' ) );
-		add_filter( 'manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_columns', array( $this, 'messages_edit_columns' ) );
+		add_action('admin_init', array($this, 'wps_messages_init_actions'));
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'));
+		add_action('manage_' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_posts_custom_column', array($this, 'messages_custom_columns'));
+		add_filter('manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_columns', array($this, 'messages_edit_columns'));
 		// Shortcodes
-		add_shortcode( 'wps_message_histo', array( $this, 'display_message_histo_per_customer' ) );
-		add_shortcode( 'order_customer_personnal_informations', array( $this, 'order_personnal_informations' ) );
+		add_shortcode('wps_message_histo', array($this, 'display_message_histo_per_customer'));
+		add_shortcode('order_customer_personnal_informations', array($this, 'order_personnal_informations'));
 		/** Ajax */
-		add_action( 'wp_ajax_get_content_message', array( $this, 'get_content_message' ) );
+		add_action('wp_ajax_get_content_message', array($this, 'get_content_message'));
 	}
 
 	/**
@@ -40,10 +40,10 @@ 
 
 		/** Css */
 		add_thickbox();
-		wp_register_style( 'wpeo-message-css', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/css/frontend.css', '', WPS_MESSAGE_VERSION );
-		wp_enqueue_style( 'wpeo-message-css' );
+		wp_register_style('wpeo-message-css', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/css/frontend.css', '', WPS_MESSAGE_VERSION);
+		wp_enqueue_style('wpeo-message-css');
 		/** My js */
-		wp_enqueue_script( 'wps-message-js', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/js/frontend.js', array( 'jquery', 'thickbox' ), WPS_MESSAGE_VERSION );
+		wp_enqueue_script('wps-message-js', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/js/frontend.js', array('jquery', 'thickbox'), WPS_MESSAGE_VERSION);
 	}
 
 	/**
@@ -59,23 +59,23 @@ 
 	 */
 	function create_message_type() {
 
-		register_post_type( WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, array(
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, array(
 			'labels' => array(
-				'name' => __( 'Message', 'wpshop' ),
-				'singular_name' => __( 'message', 'wpshop' ),
-				'add_new' => __( 'Add message', 'wpshop' ),
-				'add_new_item' => __( 'Add New message', 'wpshop' ),
-				'edit' => __( 'Edit', 'wpshop' ),
-				'edit_item' => __( 'Edit message', 'wpshop' ),
-				'new_item' => __( 'New message', 'wpshop' ),
-				'view' => __( 'View message', 'wpshop' ),
-				'view_item' => __( 'View message', 'wpshop' ),
-				'search_items' => __( 'Search messages', 'wpshop' ),
-				'not_found' => __( 'No message found', 'wpshop' ),
-				'not_found_in_trash' => __( 'No message found in trash', 'wpshop' ),
+				'name' => __('Message', 'wpshop'),
+				'singular_name' => __('message', 'wpshop'),
+				'add_new' => __('Add message', 'wpshop'),
+				'add_new_item' => __('Add New message', 'wpshop'),
+				'edit' => __('Edit', 'wpshop'),
+				'edit_item' => __('Edit message', 'wpshop'),
+				'new_item' => __('New message', 'wpshop'),
+				'view' => __('View message', 'wpshop'),
+				'view_item' => __('View message', 'wpshop'),
+				'search_items' => __('Search messages', 'wpshop'),
+				'not_found' => __('No message found', 'wpshop'),
+				'not_found_in_trash' => __('No message found in trash', 'wpshop'),
 				'parent-item-colon' => '',
 			),
-			'description' => __( 'This is where store messages are stored.', 'wpshop' ),
+			'description' => __('This is where store messages are stored.', 'wpshop'),
 			'public' => true,
 			'show_ui' => true,
 			'capability_type' => 'post',
@@ -86,9 +86,9 @@ 
 			'show_in_nav_menus' => false,
 			'rewrite' => false,
 			'query_var' => true,
-			'supports' => array( 'title', 'editor' ),
+			'supports' => array('title', 'editor'),
 			'has_archive' => false,
-		) );
+		));
 	}
 
 	/**
@@ -97,10 +97,10 @@ 
 	function add_meta_boxes() {
 
 		// Add message sending historic meta box
-		add_meta_box( 'wpshop_message_histo',
-			__( 'Message historic', 'wpshop' ),
-			array( $this, 'message_histo_box' ),
-		WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, 'normal', 'high' );
+		add_meta_box('wpshop_message_histo',
+			__('Message historic', 'wpshop'),
+			array($this, 'message_histo_box'),
+		WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, 'normal', 'high');
 	}
 
 	/**
@@ -109,10 +109,10 @@ 
 	 * @param unknown_type $post
 	 * @param unknown_type $params
 	 */
-	function message_histo_box( $post, $params ) {
+	function message_histo_box($post, $params) {
 
 		$output  = '<div id="message_histo_container">';
-		$output .= $this->get_historic_message_by_type( $post->ID );
+		$output .= $this->get_historic_message_by_type($post->ID);
 		$output .= '</div>';
 		echo $output;
 	}
@@ -123,39 +123,39 @@ 
 	 * @param  integer $message_type_id : Message type ID
 	 * @return string
 	 */
-	function get_historic_message_by_type( $message_type_id ) {
+	function get_historic_message_by_type($message_type_id) {
 
 		global $wpdb;
 		$output = '';
-		if ( ! empty( $message_type_id ) ) {
+		if (!empty($message_type_id)) {
 			// Recover all sended messages
 			$wps_message_mdl = new wps_message_mdl();
-			$messages = $wps_message_mdl->get_messages_histo( $message_type_id );
+			$messages = $wps_message_mdl->get_messages_histo($message_type_id);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend', 'message_historic' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend', 'message_historic'));
 			$output .= ob_get_contents();
 			ob_end_clean();
 		}
 		return $output;
 	}
 
-	public static function get_xml_messages( $code = null ) {
-		if ( is_null( self::$xml_messages ) ) {
-			$xml_default_emails = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml' );
-			$default_emails = new SimpleXMLElement( $xml_default_emails );
+	public static function get_xml_messages($code = null) {
+		if (is_null(self::$xml_messages)) {
+			$xml_default_emails = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml');
+			$default_emails = new SimpleXMLElement($xml_default_emails);
 			self::$xml_messages = array();
-			foreach ( $default_emails->xpath( '//emails/email' ) as $email ) {
-				self::$xml_messages[ (string) $email->attributes()->code ] = array(
-					'shop_type' => (string) $email->attributes()->shop_type,
-					'object' => (string) $email->subject,
-					'message' => (string) $email->content,
+			foreach ($default_emails->xpath('//emails/email') as $email) {
+				self::$xml_messages[(string)$email->attributes()->code] = array(
+					'shop_type' => (string)$email->attributes()->shop_type,
+					'object' => (string)$email->subject,
+					'message' => (string)$email->content,
 				);
 			}
 		}
-		if ( is_null( $code ) ) {
+		if (is_null($code)) {
 			return self::$xml_messages;
-		} elseif ( isset( self::$xml_messages[ $code ] ) ) {
-			return self::$xml_messages[ $code ];
+		} elseif (isset(self::$xml_messages[$code])) {
+			return self::$xml_messages[$code];
 		} else {
 			return false;
 		}
@@ -165,9 +165,9 @@ 
 	 */
 	public static function create_default_message() {
 		// Read default emails for options creation
-		foreach ( self::get_xml_messages() as $code => $email ) {
-			if ( ( WPSHOP_DEFINED_SHOP_TYPE == $email['shop_type'] ) || ( 'sale' == WPSHOP_DEFINED_SHOP_TYPE ) ) {
-				self::createMessage( $code, $email['object'], $email['message'] );
+		foreach (self::get_xml_messages() as $code => $email) {
+			if ((WPSHOP_DEFINED_SHOP_TYPE == $email['shop_type']) || ('sale' == WPSHOP_DEFINED_SHOP_TYPE)) {
+				self::createMessage($code, $email['object'], $email['message']);
 			}
 		}
 	}
@@ -180,25 +180,25 @@ 
 	 * @param string $message : Message content
 	 * @return integer message ID
 	 */
-	public static function createMessage( $code, $object = '', $message = '' ) {
+	public static function createMessage($code, $object = '', $message = '') {
 		$id = 0;
-		$xml_message = self::get_xml_messages( $code );
-		$object = empty( $object ) ? $xml_message['object'] : $object;
-		$message = empty( $message ) ? $xml_message['message'] : $message;
-		$message_option = get_option( $code, null );
-		if ( empty( $message_option ) || false === get_post_status( $message_option ) ) {
-			$id = post_exists( __( $object , 'wpshop' ), self::customize_message( __( $message, 'wpshop' ) ) );
-			if( $id == 0 ) {
+		$xml_message = self::get_xml_messages($code);
+		$object = empty($object) ? $xml_message['object'] : $object;
+		$message = empty($message) ? $xml_message['message'] : $message;
+		$message_option = get_option($code, null);
+		if (empty($message_option) || false === get_post_status($message_option)) {
+			$id = post_exists(__($object, 'wpshop'), self::customize_message(__($message, 'wpshop')));
+			if ($id == 0) {
 				$new_message = array(
-					'post_title' => __( $object , 'wpshop' ),
-					'post_content' => self::customize_message( __( $message, 'wpshop' ) ),
+					'post_title' => __($object, 'wpshop'),
+					'post_content' => self::customize_message(__($message, 'wpshop')),
 					'post_status' => 'publish',
 					'post_author' => 1,
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE,
 				);
-				$id = wp_insert_post( $new_message );
+				$id = wp_insert_post($new_message);
 			}
-			update_option( $code, $id );
+			update_option($code, $id);
 		} else {
 			$id = $message_option;
 		}
@@ -211,17 +211,17 @@ 
 	 *
 	 * @return array
 	 */
-	function messages_custom_columns( $column ) {
+	function messages_custom_columns($column) {
 
 		global $post;
 		$metadata = get_post_custom();
-		switch ( $column ) {
+		switch ($column) {
 			case 'extract':
-				echo wp_trim_words( $post->post_content, 55 );
+				echo wp_trim_words($post->post_content, 55);
 		break;
 			case 'last_dispatch_date':
-				if ( ! empty( $metadata['wpshop_message_last_dispatch_date'][0] ) ) {
-					echo mysql2date( 'd F Y, H:i:s',$metadata['wpshop_message_last_dispatch_date'][0], true );
+				if (!empty($metadata['wpshop_message_last_dispatch_date'][0])) {
+					echo mysql2date('d F Y, H:i:s', $metadata['wpshop_message_last_dispatch_date'][0], true);
 				} else { echo '-';
 				}
 		break;
@@ -233,14 +233,14 @@ 
 	 *
 	 * @return array
 	 */
-	function messages_edit_columns( $columns ) {
+	function messages_edit_columns($columns) {
 
 		$columns = array(
 			'cb' => '<input type="checkbox" />',
-			'title' => __( 'Name', 'wpshop' ),
-			'extract' => __( 'Extract from the message','wpshop' ),
-			'date' => __( 'Creation date','wpshop' ),
-			'last_dispatch_date' => __( 'Last dispatch date','wpshop' ),
+			'title' => __('Name', 'wpshop'),
+			'extract' => __('Extract from the message', 'wpshop'),
+			'date' => __('Creation date', 'wpshop'),
+			'last_dispatch_date' => __('Last dispatch date', 'wpshop'),
 		);
 		return $columns;
 	}
@@ -251,17 +251,17 @@ 
 	 * @param integer $current
 	 * @return string
 	 */
-	function getMessageListOption( $current = 0 ) {
+	function getMessageListOption($current = 0) {
 
-		$posts = query_posts( array(
+		$posts = query_posts(array(
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE,
 			'posts_per_page' => '-1',
-		) );
+		));
 		$options = '';
-		if ( ! empty( $posts ) ) {
-			$options = '<option value="0">' . __( 'Select values from list', 'wpshop' ) . '</option>';
-			foreach ( $posts as $p ) {
-				$selected = $p->ID == $current ? ' selected="selected"': '';
+		if (!empty($posts)) {
+			$options = '<option value="0">' . __('Select values from list', 'wpshop') . '</option>';
+			foreach ($posts as $p) {
+				$selected = $p->ID == $current ? ' selected="selected"' : '';
 				$options .= '<option value="' . $p->ID . '"' . $selected . '>' . $p->post_title . '</option>';
 			}
 		}
@@ -276,35 +276,35 @@ 
 	 * @param integer $customer_id : ID to identifiate the customer
 	 * @return string
 	 */
-	function display_message_histo_per_customer( $args, $customer_id = '' ) {
-		$customer_id = ( ! empty( $customer_id ) ) ? $customer_id : ( isset( $args['cid'] ) && ! empty( $args['cid'] ) ? $args['cid'] : get_current_user_id() );
-		$message_id = ( ! empty( $args ) && ! empty( $args['message_id'] ) ) ? $args['message_id'] : '';
+	function display_message_histo_per_customer($args, $customer_id = '') {
+		$customer_id = (!empty($customer_id)) ? $customer_id : (isset($args['cid']) && !empty($args['cid']) ? $args['cid'] : get_current_user_id());
+		$message_id = (!empty($args) && !empty($args['message_id'])) ? $args['message_id'] : '';
 		$message_elements = '';
 		$wps_message_mdl = new wps_message_mdl();
-		$messages_data = $wps_message_mdl->get_messages_histo( $message_id, $customer_id );
+		$messages_data = $wps_message_mdl->get_messages_histo($message_id, $customer_id);
 
 		$current_user = wp_get_current_user();
 
 		$messages_histo = array();
-		foreach ( $messages_data as $meta_id => $messages ) :
+		foreach ($messages_data as $meta_id => $messages) :
 			$i = 0;
-			foreach ( $messages as $message ) :
-				if ( $current_user->user_email === $message['mess_user_email'] ) :
-					$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['title'] = $message['mess_title'];
-					$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['message'] = $message['mess_message'];
-					$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['dates'] = $message['mess_dispatch_date'];
-					if ( ! empty( $message['mess_object_id'] ) ) {
-						$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['object'] = $message['mess_object_id'];
+			foreach ($messages as $message) :
+				if ($current_user->user_email === $message['mess_user_email']) :
+					$messages_histo[$message['mess_dispatch_date'][0]][$i]['title'] = $message['mess_title'];
+					$messages_histo[$message['mess_dispatch_date'][0]][$i]['message'] = $message['mess_message'];
+					$messages_histo[$message['mess_dispatch_date'][0]][$i]['dates'] = $message['mess_dispatch_date'];
+					if (!empty($message['mess_object_id'])) {
+						$messages_histo[$message['mess_dispatch_date'][0]][$i]['object'] = $message['mess_object_id'];
 					}
 					$i++;
 				endif;
 			endforeach;
 		endforeach;
 
-		ksort( $messages_histo );
-		$messages_histo = array_reverse( $messages_histo );
+		ksort($messages_histo);
+		$messages_histo = array_reverse($messages_histo);
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'frontend', 'customer', 'messages' ) );
+		require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'frontend', 'customer', 'messages'));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -317,11 +317,11 @@ 
 	 * @param string $message : message content
 	 * @return string
 	 */
-	public static function customize_message( $message ) {
+	public static function customize_message($message) {
 
-		if ( ! empty( $message ) ) {
+		if (!empty($message)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/', 'backend', 'message_html_structure' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/', 'backend', 'message_html_structure'));
 			$message = ob_get_contents();
 			ob_end_clean();
 		}
@@ -332,15 +332,15 @@ 
 	 *
 	 * @return boolean
 	 */
-	function add_message( $recipient_id = 0, $email, $title, $message, $model_id, $object, $date = null ) {
+	function add_message($recipient_id = 0, $email, $title, $message, $model_id, $object, $date = null) {
 
-		$date = empty( $date ) ? current_time( 'mysql', 0 ) : $date;
+		$date = empty($date) ? current_time('mysql', 0) : $date;
 		$object_empty = array(
 			'object_type' => '',
 			'object_id' => 0,
 		);
-		$object = array_merge( $object_empty, $object );
-		$historic = get_post_meta( $recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr( $date, 0, 7 ), true );
+		$object = array_merge($object_empty, $object);
+		$historic = get_post_meta($recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr($date, 0, 7), true);
 		$data_to_insert = array(
 			'mess_user_id' => $recipient_id,
 			'mess_user_email' => $email,
@@ -348,10 +348,10 @@ 
 			'mess_object_id' => $object['object_id'],
 			'mess_title' => $title,
 			'mess_message' => $message,
-			'mess_dispatch_date' => array( $date ),
+			'mess_dispatch_date' => array($date),
 		);
 		$historic[] = $data_to_insert;
-		update_post_meta( $recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr( $date, 0, 7 ), $historic );
+		update_post_meta($recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr($date, 0, 7), $historic);
 	}
 
 	/**
@@ -363,49 +363,49 @@ 
 	 * @param boolean $duplicate_message : Duplicate a light message for historic storage
 	 * @return string
 	 */
-	function customMessage( $string, $data, $model_name = '', $duplicate_message = false ) {
+	function customMessage($string, $data, $model_name = '', $duplicate_message = false) {
 
 		$avant = array();
 		$apres = array();
-		$logo_option = get_option( 'wpshop_logo' );
+		$logo_option = get_option('wpshop_logo');
 
-		$data['your_shop_logo'] = ( ! empty( $logo_option ) ) ? '<img src="' . $logo_option . '" alt="' . get_bloginfo( 'name' ) . '" />' : '';
+		$data['your_shop_logo'] = (!empty($logo_option)) ? '<img src="' . $logo_option . '" alt="' . get_bloginfo('name') . '" />' : '';
 
-		foreach ( $data as $key => $value ) {
+		foreach ($data as $key => $value) {
 			$avant[] = '[' . $key . ']';
-			switch ( $key ) {
+			switch ($key) {
 				case 'order_content' :
-					$apres[] = ( $duplicate_message ) ? '[order_content]' : $this->order_content_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_content]' : $this->order_content_template_for_mail($data['order_id']);
 					break;
 				case 'order_addresses' :
-					$apres[] = ( $duplicate_message ) ? '[order_addresses]' : $this->order_addresses_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_addresses]' : $this->order_addresses_template_for_mail($data['order_id']);
 					break;
 
 				case 'order_billing_address' :
-					$apres[] = ( $duplicate_message ) ? '[order_billing_address]' : $this->order_addresses_template_for_mail( $data['order_id'], 'billing' );
+					$apres[] = ($duplicate_message) ? '[order_billing_address]' : $this->order_addresses_template_for_mail($data['order_id'], 'billing');
 					break;
 
 				case 'order_shipping_address' :
-					$apres[] = ( $duplicate_message ) ? '[order_shipping_address]' : $this->order_addresses_template_for_mail( $data['order_id'], 'shipping' );
+					$apres[] = ($duplicate_message) ? '[order_shipping_address]' : $this->order_addresses_template_for_mail($data['order_id'], 'shipping');
 					break;
 
 				case 'order_customer_comments' :
-					$apres[] = ( $duplicate_message ) ? '[order_customer_comments]' : $this->order_customer_comment_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_customer_comments]' : $this->order_customer_comment_template_for_mail($data['order_id']);
 					break;
 				case 'order_personnal_informations' :
-					$apres[] = ( $duplicate_message ) ? '[order_personnal_informations]' : $this->order_personnal_informations();
+					$apres[] = ($duplicate_message) ? '[order_personnal_informations]' : $this->order_personnal_informations();
 					break;
 				default :
 					$apres[] = $value;
 					break;
 			}
 		}
-		$string = str_replace( $avant, $apres, $string );
+		$string = str_replace($avant, $apres, $string);
 
-		$string = apply_filters( 'wps_more_customized_message', $string, $data, $duplicate_message );
+		$string = apply_filters('wps_more_customized_message', $string, $data, $duplicate_message);
 
-		if ( ($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE') ) {
-			$string = preg_replace( '/\[(.*)\]/Usi', '', $string );
+		if (($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE')) {
+			$string = preg_replace('/\[(.*)\]/Usi', '', $string);
 		}
 
 		return $string;
@@ -420,22 +420,22 @@ 
 	 * @param string $object : message object
 	 * @param file   $attached_file : File to attached to e-mail
 	 */
-	function wpshop_prepared_email( $email, $model_name, $data = array(), $object = array(), $attached_file = '' ) {
+	function wpshop_prepared_email($email, $model_name, $data = array(), $object = array(), $attached_file = '') {
 		global $wpdb;
-		$data = apply_filters( 'wps_extra_data_to_send_in_email', $data );
-		$model_id = get_option( $model_name, 0 );
-		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE ID = %s', $model_id );
-		$post_message = $wpdb->get_row( $query );
+		$data = apply_filters('wps_extra_data_to_send_in_email', $data);
+		$model_id = get_option($model_name, 0);
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE ID = %s', $model_id);
+		$post_message = $wpdb->get_row($query);
 		$duplicate_message = '';
-		if ( ! empty( $post_message ) ) {
-			$title = $this->customMessage( $post_message->post_title, $data, $model_name );
-			$message = $this->customMessage( $post_message->post_content, $data, $model_name );
+		if (!empty($post_message)) {
+			$title = $this->customMessage($post_message->post_title, $data, $model_name);
+			$message = $this->customMessage($post_message->post_content, $data, $model_name);
 			// End if().
-			if ( array_key_exists( 'order_content', $data ) || array_key_exists( 'order_addresses', $data ) || array_key_exists( 'order_customer_comments', $data ) ) {
-				$duplicate_message = $this->customMessage( $post_message->post_content, $data, $model_name, true );
+			if (array_key_exists('order_content', $data) || array_key_exists('order_addresses', $data) || array_key_exists('order_customer_comments', $data)) {
+				$duplicate_message = $this->customMessage($post_message->post_content, $data, $model_name, true);
 			}
-			if ( ! empty( $email ) ) {
-				$this->wpshop_email( $email, $title, $message, true, $model_id, $object, $attached_file, $duplicate_message );
+			if (!empty($email)) {
+				$this->wpshop_email($email, $title, $message, true, $model_id, $object, $attached_file, $duplicate_message);
 			}
 		}
 	}
@@ -452,37 +452,37 @@ 
 	 * @param file    $attachments : File to attached to e-mail
 	 * @param string  $duplicate_message : lighter message to store
 	 */
-	function wpshop_email( $email, $title, $message, $save = true, $model_id, $object = array(), $attachments = '', $duplicate_message = '' ) {
+	function wpshop_email($email, $title, $message, $save = true, $model_id, $object = array(), $attachments = '', $duplicate_message = '') {
 		global $wpdb;
 		// Sauvegarde
-		if ( $save ) {
-			$user = $wpdb->get_row( 'SELECT ID FROM ' . $wpdb->users . ' WHERE user_email="' . $email . '";' );
+		if ($save) {
+			$user = $wpdb->get_row('SELECT ID FROM ' . $wpdb->users . ' WHERE user_email="' . $email . '";');
 			$user_id = $user ? $user->ID : get_current_user_id();
-			$query = $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s ', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			$user_post_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s ', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			$user_post_id = $wpdb->get_var($query);
 
-			if ( ! empty( $duplicate_message ) ) {
-				$this->add_message( $user_post_id, $email, $title, $duplicate_message, $model_id, $object );
+			if (!empty($duplicate_message)) {
+				$this->add_message($user_post_id, $email, $title, $duplicate_message, $model_id, $object);
 			} else {
-				$this->add_message( $user_post_id, $email, $title, $message, $model_id, $object );
+				$this->add_message($user_post_id, $email, $title, $message, $model_id, $object);
 			}
 		}
 
-		$emails = get_option( 'wpshop_emails', array() );
+		$emails = get_option('wpshop_emails', array());
 		$noreply_email = $emails['noreply_email'];
 		// Split the email to get the name
-		$vers_nom = substr( $email, 0, strpos( $email,'@' ) );
+		$vers_nom = substr($email, 0, strpos($email, '@'));
 
 		// Headers du mail
 		$headers = "MIME-Version: 1.0\r\n";
 		$headers .= "Content-type: text/html; charset=UTF-8\r\n";
-		$headers .= 'From: ' . get_bloginfo( 'name' ) . ' <' . $noreply_email . '>' . "\r\n";
+		$headers .= 'From: ' . get_bloginfo('name') . ' <' . $noreply_email . '>' . "\r\n";
 
 		// Mail en HTML
-		@wp_mail( $email, $title, $message, $headers, $attachments );
+		@wp_mail($email, $title, $message, $headers, $attachments);
 
-		if ( ! empty( $attachments ) ) {
-			unlink( $attachments );
+		if (!empty($attachments)) {
+			unlink($attachments);
 		}
 	}
 
@@ -492,13 +492,13 @@ 
 	 * @param integer $order_id : Order ID
 	 * @return string
 	 */
-	function order_content_template_for_mail( $order_id ) {
+	function order_content_template_for_mail($order_id) {
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$currency_code = wpshop_tools::wpshop_get_currency( false );
-			$orders_infos = get_post_meta( $order_id, '_order_postmeta', true );
+		if (!empty($order_id)) {
+			$currency_code = wpshop_tools::wpshop_get_currency(false);
+			$orders_infos = get_post_meta($order_id, '_order_postmeta', true);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_content_mail_template' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_content_mail_template'));
 			$message .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -512,44 +512,44 @@ 
 	 * @param integer $address_type : Address type ID
 	 * @return string
 	 */
-	function order_addresses_template_for_mail( $order_id, $address_type = '' ) {
+	function order_addresses_template_for_mail($order_id, $address_type = '') {
 		global $wpdb;
-		$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-		$display_shipping = ( ! empty( $shipping_option ) && ! empty( $shipping_option['activate'] ) ) ? true : false;
+		$shipping_option = get_option('wpshop_shipping_address_choice');
+		$display_shipping = (!empty($shipping_option) && !empty($shipping_option['activate'])) ? true : false;
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$order_addresses = get_post_meta( $order_id, '_order_info', true );
-			if ( ! empty( $order_addresses ) ) {
-				foreach ( $order_addresses as $key => $order_address ) {
-					if ( ! empty( $order_address ) && ( empty( $address_type ) || $address_type == $key ) ) {
-
-						if ( $key != 'shipping' || ($key == 'shipping' && $display_shipping) ) {
-							$address_type_title = ( ! empty( $key ) && $key == 'billing' ) ? __( 'Billing address', 'wpshop' ) : __( 'Shipping address', 'wpshop' );
+		if (!empty($order_id)) {
+			$order_addresses = get_post_meta($order_id, '_order_info', true);
+			if (!empty($order_addresses)) {
+				foreach ($order_addresses as $key => $order_address) {
+					if (!empty($order_address) && (empty($address_type) || $address_type == $key)) {
+
+						if ($key != 'shipping' || ($key == 'shipping' && $display_shipping)) {
+							$address_type_title = (!empty($key) && $key == 'billing') ? __('Billing address', 'wpshop') : __('Shipping address', 'wpshop');
 							$civility = '';
-							if ( ! empty( $order_address['address']['civility'] ) ) {
-								$query = $wpdb->prepare( 'SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $order_address['address']['civility'] );
-								$civility = $wpdb->get_var( $query );
+							if (!empty($order_address['address']['civility'])) {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $order_address['address']['civility']);
+								$civility = $wpdb->get_var($query);
 							}
 
 							// Address informations
-							$customer_last_name = ( ! empty( $order_address['address']['address_last_name'] ) ) ? $order_address['address']['address_last_name'] : '';
-							$customer_firtsname = ( ! empty( $order_address['address']['address_first_name'] ) ) ? $order_address['address']['address_first_name'] : '';
-							$customer_company = ( ! empty( $order_address['address']['company'] ) ) ? $order_address['address']['company'] : '';
-							$customer_address = ( ! empty( $order_address['address']['address'] ) ) ? $order_address['address']['address'] : '';
-							$customer_zip_code = ( ! empty( $order_address['address']['postcode'] ) ) ? $order_address['address']['postcode'] : '';
-							$customer_city = ( ! empty( $order_address['address']['city'] ) ) ? $order_address['address']['city'] : '';
-							$customer_state = ( ! empty( $order_address['address']['state'] ) ) ? $order_address['address']['state'] : '';
-							$customer_phone = ( ! empty( $order_address['address']['phone'] ) ) ? ' Tel. : ' . $order_address['address']['phone'] : '';
+							$customer_last_name = (!empty($order_address['address']['address_last_name'])) ? $order_address['address']['address_last_name'] : '';
+							$customer_firtsname = (!empty($order_address['address']['address_first_name'])) ? $order_address['address']['address_first_name'] : '';
+							$customer_company = (!empty($order_address['address']['company'])) ? $order_address['address']['company'] : '';
+							$customer_address = (!empty($order_address['address']['address'])) ? $order_address['address']['address'] : '';
+							$customer_zip_code = (!empty($order_address['address']['postcode'])) ? $order_address['address']['postcode'] : '';
+							$customer_city = (!empty($order_address['address']['city'])) ? $order_address['address']['city'] : '';
+							$customer_state = (!empty($order_address['address']['state'])) ? $order_address['address']['state'] : '';
+							$customer_phone = (!empty($order_address['address']['phone'])) ? ' Tel. : ' . $order_address['address']['phone'] : '';
 							$country = '';
-							foreach ( unserialize( WPSHOP_COUNTRY_LIST ) as $key => $value ) {
-								if ( ! empty( $order_address['address']['country'] ) && $key == $order_address['address']['country'] ) {
+							foreach (unserialize(WPSHOP_COUNTRY_LIST) as $key => $value) {
+								if (!empty($order_address['address']['country']) && $key == $order_address['address']['country']) {
 									$country = $value;
 								}
 							}
 							$customer_country = $country;
 
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_addresses_template_for_mail' ) );
+							require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_addresses_template_for_mail'));
 							$message .= ob_get_contents();
 							ob_end_clean();
 						}
@@ -566,20 +566,20 @@ 
 	 * @param integer $order_id : Order ID
 	 * @return string
 	 */
-	function order_customer_comment_template_for_mail( $order_id ) {
+	function order_customer_comment_template_for_mail($order_id) {
 		global $wpdb;
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$query = $wpdb->prepare( 'SELECT post_excerpt FROM ' . $wpdb->posts . ' WHERE ID = %d', $order_id );
-			$comment = $wpdb->get_var( $query );
-			$order_infos = get_post_meta( $order_id, '_order_postmeta', true );
-			if ( ! empty( $order_infos['order_key'] ) ) {
-				$comment_title = __( 'Comments about the order', 'wpshop' );
+		if (!empty($order_id)) {
+			$query = $wpdb->prepare('SELECT post_excerpt FROM ' . $wpdb->posts . ' WHERE ID = %d', $order_id);
+			$comment = $wpdb->get_var($query);
+			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
+			if (!empty($order_infos['order_key'])) {
+				$comment_title = __('Comments about the order', 'wpshop');
 			} else {
-				$comment_title = __( 'Comments about the quotation', 'wpshop' );
+				$comment_title = __('Comments about the quotation', 'wpshop');
 			}
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_email_customer_comments' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_email_customer_comments'));
 			$message .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -595,15 +595,15 @@ 
 		global $wpdb;
 		$user_id = get_current_user_id();
 		$message = '';
-		$customer_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		if ( ! empty( $customer_entity ) ) {
+		$customer_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		if (!empty($customer_entity)) {
 
-			$query = $wpdb->prepare( 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $customer_entity, 'valid' );
-			$attributes_sets = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $customer_entity, 'valid');
+			$attributes_sets = $wpdb->get_results($query);
 
-			if ( ! empty( $attributes_sets ) ) {
+			if (!empty($attributes_sets)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_personnal_informations_template_for_mail' ) );
+				require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_personnal_informations_template_for_mail'));
 				$message .= ob_get_contents();
 				ob_end_clean();
 			}
@@ -616,17 +616,17 @@ 
 	 */
 	function wpshop_messages_historic_correction() {
 		global $wpdb;
-		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_%' );
-		$messages_histo = $wpdb->get_results( $query );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_%');
+		$messages_histo = $wpdb->get_results($query);
 
-		foreach ( $messages_histo as $message ) {
-			$query_user = $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s',  $message->post_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			$user_post_id = $wpdb->get_var( $query_user );
-			$wpdb->update( $wpdb->postmeta, array(
+		foreach ($messages_histo as $message) {
+			$query_user = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s', $message->post_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			$user_post_id = $wpdb->get_var($query_user);
+			$wpdb->update($wpdb->postmeta, array(
 				'post_id' => $user_post_id,
 				), array(
 				'meta_id' => $message->meta_id,
-			) );
+			));
 		}
 	}
 
@@ -635,20 +635,20 @@ 
 	 * Récupères le contenu du message
 	 */
 	public function get_content_message() {
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( ! wp_verify_nonce( $_wpnonce, 'get_content_message' ) ) {
+		if (!wp_verify_nonce($_wpnonce, 'get_content_message')) {
 			wp_die();
 		}
 
 		global $wpdb;
-		$meta_id = (int) $_GET['meta_id'];
+		$meta_id = (int)$_GET['meta_id'];
 
-		$result = $wpdb->get_results( $wpdb->prepare( 'SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_id=%d', array( ($meta_id) ) ) );
-		$result = unserialize( $result[0]->meta_value );
+		$result = $wpdb->get_results($wpdb->prepare('SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_id=%d', array(($meta_id))));
+		$result = unserialize($result[0]->meta_value);
 		$result = $result[0]['mess_message'];
 
-		wp_die( $result );
+		wp_die($result);
 	}
 
 }

includes/modules/wps_customer/templates/frontend/account/account_informations.php

Spacing +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-boxed">
 	<?php echo $attributes_sections_tpl; ?>
-	<?php if ( $customer_link ) : ?>
-		<div><a href="<?php echo get_edit_post_link( $cid ); ?>"><?php esc_html_e( 'See customer', 'wpshop' ); ?></a></div>
-		<?php apply_filters( 'wps_filter_customer_in_order', $cid, wps_customer_ctr::get_author_id_by_customer_id( $cid ) ); ?>
-	<?php elseif ( ! is_admin() || strpos( $_SERVER['REQUEST_URI'], 'admin-ajax.php' ) ) : ?>
-		<div><button data-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_fill_account_informations_modal' ) ); ?>" data-customer-id="<?php echo esc_attr( $cid ); ?>" class="wps-link wps-alignright" id="wps_modal_account_informations_opener"><i class="wps-icon-pencil"></i><?php esc_html_e( 'Edit your account informations', 'wpshop' ); ?></button></div>
+	<?php if ($customer_link) : ?>
+		<div><a href="<?php echo get_edit_post_link($cid); ?>"><?php esc_html_e('See customer', 'wpshop'); ?></a></div>
+		<?php apply_filters('wps_filter_customer_in_order', $cid, wps_customer_ctr::get_author_id_by_customer_id($cid)); ?>
+	<?php elseif (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) : ?>
+		<div><button data-nonce="<?php echo esc_attr(wp_create_nonce('wps_fill_account_informations_modal')); ?>" data-customer-id="<?php echo esc_attr($cid); ?>" class="wps-link wps-alignright" id="wps_modal_account_informations_opener"><i class="wps-icon-pencil"></i><?php esc_html_e('Edit your account informations', 'wpshop'); ?></button></div>
 	<?php endif; ?>
 </div>

includes/modules/wps_customer/controller/wps_account_ctr.php

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/controller/wps_customer_admin_ctr.php

Spacing +78 added lines, -78 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Customer
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,20 +26,20 @@ 
 		 *
 		 * @since 1.4.4.3
 		 */
-		add_filter( 'gettext', array( $this, 'change_admin_cpt_text_filter' ), 20, 3 );
+		add_filter('gettext', array($this, 'change_admin_cpt_text_filter'), 20, 3);
 
 		/** Define templates path */
 		$this->template_dir = WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . '/templates/';
 
 		/** WordPress hooks */
-		add_action( 'admin_enqueue_scripts', array( $this, 'customer_admin_assets' ) );
-		add_action( 'save_post', array( $this, 'save_entity_customer' ), 10, 2 );
-		add_filter( 'post_updated_messages', array( $this, 'customer_post_messages' ) );
+		add_action('admin_enqueue_scripts', array($this, 'customer_admin_assets'));
+		add_action('save_post', array($this, 'save_entity_customer'), 10, 2);
+		add_filter('post_updated_messages', array($this, 'customer_post_messages'));
 
 		/** Ajax Listener */
-		add_action( 'wp_ajax_wps_order_refresh_customer_informations', array( $this, 'wps_order_refresh_customer_informations' ) );
-		add_action( 'wp_ajax_wps_load_customer_creation_form_in_admin', array( $this, 'wps_load_customer_creation_form_in_admin' ) );
-		add_action( 'wp_ajax_wps_order_refresh_customer_list', array( $this, 'wps_order_refresh_customer_list' ) );
+		add_action('wp_ajax_wps_order_refresh_customer_informations', array($this, 'wps_order_refresh_customer_informations'));
+		add_action('wp_ajax_wps_load_customer_creation_form_in_admin', array($this, 'wps_load_customer_creation_form_in_admin'));
+		add_action('wp_ajax_wps_order_refresh_customer_list', array($this, 'wps_order_refresh_customer_list'));
 	}
 
 	/**
@@ -51,13 +51,13 @@ 
 	 *
 	 * @return string                    [description]
 	 */
-	function change_admin_cpt_text_filter( $translated_text, $untranslated_text, $domain ) {
+	function change_admin_cpt_text_filter($translated_text, $untranslated_text, $domain) {
 		global $typenow;
 
-		if ( is_admin() && WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS === $typenow ) {
-			switch ( $untranslated_text ) {
+		if (is_admin() && WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS === $typenow) {
+			switch ($untranslated_text) {
 				case 'Publish':
-					$translated_text = __( 'Save','wpshop' );
+					$translated_text = __('Save', 'wpshop');
 				break;
 			}
 		}
@@ -70,8 +70,8 @@ 
 	 * @param integer $post_id The current saved post id / L'identifiant post qui vient d'être sauvegardé.
 	 * @param WP_Post $post THe entire post currently saved / Le post qui vient d'être sauvegardé.
 	 */
-	public function save_entity_customer( $post_id, $post ) {
-		if ( ( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS !== $post->post_type ) || ( 'auto-draft' === $post->post_status ) || wp_is_post_revision( $post_id ) ) {
+	public function save_entity_customer($post_id, $post) {
+		if ((WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS !== $post->post_type) || ('auto-draft' === $post->post_status) || wp_is_post_revision($post_id)) {
 			return;
 		}
 		$custom_args = array();
@@ -81,17 +81,17 @@ 
 		);
 
 		/** Récupération des informations envoyées par l'administrateur et ajout de la possibilité d'étendre/modifier les données envoyées avec un filtre */
-		$sended_attributes = ( ! empty( $_POST ) && ! empty( $_POST['attribute'] ) ? (array) $_POST['attribute'] : array() ); // WPCS: CSRF ok.
-		$data_to_save = apply_filters( 'wps_save_customer_extra_filter', $sended_attributes );
-		if ( ! empty( $sended_attributes ) ) {
+		$sended_attributes = (!empty($_POST) && !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array()); // WPCS: CSRF ok.
+		$data_to_save = apply_filters('wps_save_customer_extra_filter', $sended_attributes);
+		if (!empty($sended_attributes)) {
 			/*    Save the attributes values into wpshop eav database    */
 			$update_from = '';
 			$lang = WPSHOP_CURRENT_LOCALE;
-			if ( ! empty( $data_to_save['icl_post_language'] ) ) {
-				$query = $wpdb->prepare( "SELECT locale FROM {$wpdb->prefix}icl_locale_map WHERE code = %s", $data_to_save['icl_post_language'] );
-				$lang = $wpdb->get_var( $query ); // WPCS: unprepared SQL ok.
+			if (!empty($data_to_save['icl_post_language'])) {
+				$query = $wpdb->prepare("SELECT locale FROM {$wpdb->prefix}icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
+				$lang = $wpdb->get_var($query); // WPCS: unprepared SQL ok.
 			}
-			wpshop_attributes::saveAttributeForEntity( $sended_attributes, wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ), $post_id, $lang, $update_from );
+			wpshop_attributes::saveAttributeForEntity($sended_attributes, wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS), $post_id, $lang, $update_from);
 		}
 
 		/**
@@ -101,9 +101,9 @@ 
 		 *
 		 * @see https://codex.wordpress.org/Function_Reference/wp_update_post
 		 */
-		remove_action( 'save_post', array( $this, 'save_entity_customer' ) );
-		wp_update_post( wp_parse_args( $custom_args, $default_args ) );
-		add_action( 'save_post', array( $this, 'save_entity_customer' ) );
+		remove_action('save_post', array($this, 'save_entity_customer'));
+		wp_update_post(wp_parse_args($custom_args, $default_args));
+		add_action('save_post', array($this, 'save_entity_customer'));
 	}
 
 	/**
@@ -114,24 +114,24 @@ 
 	 *
 	 * @return array           New messages list.
 	 */
-	function customer_post_messages( $messages ) {
+	function customer_post_messages($messages) {
 		$customer = get_post();
 
-		$messages[ WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ] = array(
+		$messages[WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS] = array(
 			0		=> '', // Unused. Messages start at index 1.
-			1		=> __( 'Customer updated.', 'wpshop' ),
-			2		=> __( 'Custom field updated.', 'wpshop' ),
-			3		=> __( 'Custom field deleted.', 'wpshop' ),
-			4		=> __( 'Customer updated.', 'wpshop' ),
-			5		=> isset( $_GET['revision'] ) ? sprintf( __( 'Customer restored to revision from %s', 'wpshop' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6		=> __( 'Customer saved.', 'wpshop' ),
-			7		=> __( 'Customer saved.', 'wpshop' ),
-			8		=> __( 'Customer submitted.', 'wpshop' ),
+			1		=> __('Customer updated.', 'wpshop'),
+			2		=> __('Custom field updated.', 'wpshop'),
+			3		=> __('Custom field deleted.', 'wpshop'),
+			4		=> __('Customer updated.', 'wpshop'),
+			5		=> isset($_GET['revision']) ? sprintf(__('Customer restored to revision from %s', 'wpshop'), wp_post_revision_title((int)$_GET['revision'], false)) : false,
+			6		=> __('Customer saved.', 'wpshop'),
+			7		=> __('Customer saved.', 'wpshop'),
+			8		=> __('Customer submitted.', 'wpshop'),
 			9		=> sprintf(
-				__( 'Customer scheduled for: <strong>%1$s</strong>.', 'wpshop' ),
-				date_i18n( __( 'M j, Y @ G:i', 'wpshop' ), strtotime( $customer->post_date ) )
+				__('Customer scheduled for: <strong>%1$s</strong>.', 'wpshop'),
+				date_i18n(__('M j, Y @ G:i', 'wpshop'), strtotime($customer->post_date))
 			),
-			10	=> __( 'Customer saved.', 'wpshop' ),
+			10	=> __('Customer saved.', 'wpshop'),
 		);
 
 		return $messages;
@@ -145,14 +145,14 @@ 
 		$module_folder = WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . '/modules/';
 
 		/**	Check if the defined directory exists for reading and including the different modules	*/
-		if ( is_dir( $module_folder ) ) {
-			$parent_folder_content = scandir( $module_folder );
-			foreach ( $parent_folder_content as $folder ) {
-				if ( $folder && '.' !== substr( $folder, 0, 1 ) && is_dir( $module_folder . $folder ) ) {
-					$child_folder_content = scandir( $module_folder . $folder );
-					if ( file_exists( $module_folder . $folder . '/' . $folder . '.php' ) ) {
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
+			foreach ($parent_folder_content as $folder) {
+				if ($folder && '.' !== substr($folder, 0, 1) && is_dir($module_folder . $folder)) {
+					$child_folder_content = scandir($module_folder . $folder);
+					if (file_exists($module_folder . $folder . '/' . $folder . '.php')) {
 						$f = $module_folder . $folder . '/' . $folder . '.php';
-						include( $f );
+						include($f);
 					}
 				}
 			}
@@ -164,10 +164,10 @@ 
 	 */
 	function customer_admin_assets() {
 		global $current_screen;
-		if ( in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ), true ) ) {
-			wp_enqueue_script( 'wps_customer_admin_js', WPS_ACCOUNT_URL . '/' . WPS_ACCOUNT_DIR . '/assets/backend/js/wps_customer_backend.js', '', WPSHOP_VERSION );
-			wp_register_style( 'wpshop-modules-customer-backend-styles', WPS_ACCOUNT_URL . '/' . WPS_ACCOUNT_DIR . '/assets/backend/css/backend.css', '', WPSHOP_VERSION );
-			wp_enqueue_style( 'wpshop-modules-customer-backend-styles' );
+		if (in_array($current_screen->post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS), true)) {
+			wp_enqueue_script('wps_customer_admin_js', WPS_ACCOUNT_URL . '/' . WPS_ACCOUNT_DIR . '/assets/backend/js/wps_customer_backend.js', '', WPSHOP_VERSION);
+			wp_register_style('wpshop-modules-customer-backend-styles', WPS_ACCOUNT_URL . '/' . WPS_ACCOUNT_DIR . '/assets/backend/css/backend.css', '', WPSHOP_VERSION);
+			wp_enqueue_style('wpshop-modules-customer-backend-styles');
 		}
 	}
 
@@ -176,9 +176,9 @@ 
 	 * AJAX - Customer creation form
 	 */
 	function wps_load_customer_creation_form_in_admin() {
-		check_ajax_referer( 'wps_load_customer_creation_form_in_admin' );
+		check_ajax_referer('wps_load_customer_creation_form_in_admin');
 
-		echo do_shortcode( '[wps_signup display="admin"]' );
+		echo do_shortcode('[wps_signup display="admin"]');
 		wp_die();
 	}
 
@@ -187,18 +187,18 @@ 
 	 * AJAX - Reload Customer list
 	 */
 	function wps_order_refresh_customer_list() {
-		check_ajax_referer( 'wps_order_refresh_customer_list' );
+		check_ajax_referer('wps_order_refresh_customer_list');
 
 		$status = false;
 		$response = '';
-		$customer_id = ( ! empty( $_POST['customer_id'] ) ) ? intval( $_POST['customer_id'] ) : null;
-		if ( ! empty( $customer_id ) ) {
+		$customer_id = (!empty($_POST['customer_id'])) ? intval($_POST['customer_id']) : null;
+		if (!empty($customer_id)) {
 			$wps_customer = new wps_customer_ctr();
-			$response = $wps_customer->customer_select( $customer_id );
+			$response = $wps_customer->customer_select($customer_id);
 			$status = true;
 		}
 
-		wp_die( wp_json_encode( array( 'status' => $status, 'response' => $response ) ) );
+		wp_die(wp_json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 	/**
@@ -207,20 +207,20 @@ 
 	 * @version 1.4.4.3
 	 */
 	function wps_order_refresh_customer_informations() {
-		check_ajax_referer( 'wps_order_refresh_customer_informations' );
+		check_ajax_referer('wps_order_refresh_customer_informations');
 
 		$status = false;
 		$output = '';
-		$customer_id = ( ! empty( $_POST['customer_id'] ) ) ? intval( $_POST['customer_id'] ) : null;
-		$order_id = ( ! empty( $_POST['order_id'] ) ) ? intval( $_POST['order_id'] ) : null;
-		if ( ! empty( $order_id ) && ! empty( $customer_id ) ) {
+		$customer_id = (!empty($_POST['customer_id'])) ? intval($_POST['customer_id']) : null;
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : null;
+		if (!empty($order_id) && !empty($customer_id)) {
 			ob_start();
-			self::display_customer_informations_in_order( $order_id, $customer_id );
+			self::display_customer_informations_in_order($order_id, $customer_id);
 			$output = ob_get_clean();
 			$status = true;
 		}
 
-		wp_die( wp_json_encode( array( 'status' => $status, 'output' => $output ) ) );
+		wp_die(wp_json_encode(array('status' => $status, 'output' => $output)));
 	}
 
 	/**
@@ -231,49 +231,49 @@ 
 	 * @param  integer $order_id    L'identifiant de la commande sur laquelle on se trouve / The order identifier we are on.
 	 * @param  integer $customer_id L'identifiant du client pour lequel on veut afficher les informations / The customer identifier we want to display information for.
 	 */
-	public static function display_customer_informations_in_order( $order_id, $customer_id = 0 ) {
+	public static function display_customer_informations_in_order($order_id, $customer_id = 0) {
 		// Récupération des informations de la commande dans la base de données / Retrieve order information from database.
-		$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
-		$order_infos = get_post_meta( $order_id, '_order_info', true );
+		$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
+		$order_infos = get_post_meta($order_id, '_order_info', true);
 
 		// On vérifie si un client est doit être sélectionné / Check if a customer is already selected.
-		$customer_id = ( ! empty( $customer_id ) ? (int) $customer_id : ( ! empty( $order_metadata['customer_id'] )  ? $order_metadata['customer_id'] : '' ) );
+		$customer_id = (!empty($customer_id) ? (int)$customer_id : (!empty($order_metadata['customer_id']) ? $order_metadata['customer_id'] : ''));
 
 		// Récupération des informations d'adresses du client connecté / Retrieve addresses informations for the current customer.
 		// Adresse de facturation / Billing address.
-		$billing_address_option = get_option( 'wpshop_billing_address' );
-		$billing_address_option = ( ! empty( $billing_address_option ) && ! empty( $billing_address_option['choice'] ) ) ? $billing_address_option['choice'] : '';
+		$billing_address_option = get_option('wpshop_billing_address');
+		$billing_address_option = (!empty($billing_address_option) && !empty($billing_address_option['choice'])) ? $billing_address_option['choice'] : '';
 
 		// Adresse de livraison / Shipping address.
 		$shipping_address_content = '';
-		$shipping_address_option = get_option( 'wpshop_shipping_address_choice' );
+		$shipping_address_option = get_option('wpshop_shipping_address_choice');
 		// Vérification de l'activation ou non des livraisons pour l'affichage des adresses correspondantes / Check shipping addresses state in order to display or not addresses.
-		$shipping_addresses_activated = ( ! empty( $shipping_address_option ) && ! empty( $shipping_address_option['activate'] ) ) ? true : false;
+		$shipping_addresses_activated = (!empty($shipping_address_option) && !empty($shipping_address_option['activate'])) ? true : false;
 
 		// Vérification du statut de la commande pour définir les actions disponibles / Check order status in order to know what action are available.
 		$order_update_close = false;
-		if ( empty( $order_metadata ) || empty( $order_metadata['customer_id'] ) || ( 'awaiting_payment' === $order_metadata['order_status'] ) ) {
+		if (empty($order_metadata) || empty($order_metadata['customer_id']) || ('awaiting_payment' === $order_metadata['order_status'])) {
 			$order_update_close = true;
 		}
 
-		if ( ! empty( $customer_id ) ) {
+		if (!empty($customer_id)) {
 			// Récupération des informations sur le client / Retrieve customer datas.
 			$wps_account = new wps_account_ctr();
-			$customer_datas = $wps_account->display_account_informations( $customer_id, false, true );
+			$customer_datas = $wps_account->display_account_informations($customer_id, false, true);
 
-			if ( true === $order_update_close ) {
+			if (true === $order_update_close) {
 				$wps_address = new wps_address();
-				$addresses = $wps_address->display_addresses_interface( $customer_id, true );
+				$addresses = $wps_address->display_addresses_interface($customer_id, true);
 			} else {
 				$wps_address_admin = new wps_address_admin();
-				$addresses = $wps_address_admin->display_customer_address_in_order( $order_id, 'billing' );
-				if ( true === $shipping_addresses_activated ) {
-					$addresses .= $wps_address_admin->display_customer_address_in_order( $order_id, 'shipping' );
+				$addresses = $wps_address_admin->display_customer_address_in_order($order_id, 'billing');
+				if (true === $shipping_addresses_activated) {
+					$addresses .= $wps_address_admin->display_customer_address_in_order($order_id, 'shipping');
 				}
 			}
 		}
 
-		require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'backend/customer-informations', 'wps-order-customer-informations' ) );
+		require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'backend/customer-informations', 'wps-order-customer-informations'));
 	}
 
 }