Eoxia / wpshop

includes/modules/wps_message/templates/frontend/customer-messages.php

Spacing +22 added lines, -22 removed lines

@@ -1,19 +1,19 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($messages_histo) && is_array($messages_histo) ) :?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($messages_histo) && is_array($messages_histo)) :?>
 	<div class="wps-table wps-my-message">
 		<div class="wps-table-header wps-table-row">
-			<div class="wps-table-cell"><?php _e( 'Message title', 'wpshop' ); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Send date', 'wpshop' ); ?></div>
+			<div class="wps-table-cell"><?php _e('Message title', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Send date', 'wpshop'); ?></div>
 		</div>
-		<?php $page_message_histo = isset( $_GET['page_message_histo'] ) ? (int) $_GET['page_message_histo'] : 1;
-		$nb_pages_messages_histo = ceil( count( $messages_histo ) / wps_message_ctr::$mails_display );
-		$messages_histo = array_slice( $messages_histo, ( $page_message_histo - 1 ) * wps_message_ctr::$mails_display, wps_message_ctr::$mails_display );
-		reset( $messages_histo );
-		while( $messages = current( $messages_histo ) ) :
-			$first_send_date = key( $messages_histo );
-			reset( $messages );
-			while( $message = current( $messages ) ) :
-				$key = key( $messages ); ?>
+		<?php $page_message_histo = isset($_GET['page_message_histo']) ? (int)$_GET['page_message_histo'] : 1;
+		$nb_pages_messages_histo = ceil(count($messages_histo) / wps_message_ctr::$mails_display);
+		$messages_histo = array_slice($messages_histo, ($page_message_histo - 1) * wps_message_ctr::$mails_display, wps_message_ctr::$mails_display);
+		reset($messages_histo);
+		while ($messages = current($messages_histo)) :
+			$first_send_date = key($messages_histo);
+			reset($messages);
+			while ($message = current($messages)) :
+				$key = key($messages); ?>
 		<div class="wps-table-content wps-table-row" data-date="<?php echo substr($first_send_date, 0, 7); ?>" >
 			<div class="wps-table-cell wps-message-title-container">
 				<?php $message_special_id = rand(); ?>
@@ -21,27 +21,27 @@ 
 				<div id="wps-customer-message-<?php echo $message_special_id; ?>" style="display:none;" ><?php echo $message['message']; ?></div>
 			</div>
 			<div class="wps-table-cell">
-			<?php if( !empty($message['dates']) ) : ?>
+			<?php if (!empty($message['dates'])) : ?>
 				<ul>
-				<?php foreach( $message['dates'] as $date ) : ?>
-					<li><?php echo mysql2date( get_option('date_format') . ' ' . get_option('time_format') , $date, true ); ?></li>
+				<?php foreach ($message['dates'] as $date) : ?>
+					<li><?php echo mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $date, true); ?></li>
 				<?php endforeach; ?>
 				</ul>
 			<?php endif; ?>
 			</div>
 		</div>
-		<?php	next( $messages );
+		<?php	next($messages);
 			endwhile;
-			next( $messages_histo );
+			next($messages_histo);
 		endwhile; ?>
 	</div>
-	<?php if( $nb_pages_messages_histo != 1 ) {
-		for( $i = 1; $i <= $nb_pages_messages_histo; $i++ ) { ?>
-		<?php echo '<' . ( ( $page_message_histo == $i ) ? 'span' : 'a href="' . add_query_arg( array( 'page_message_histo' => $i ) ) . '"' ) . ' class="page-numbers">' . $i . '</' . ( ( $page_message_histo == $i ) ? 'span' : 'a' ) . '>'; ?>
+	<?php if ($nb_pages_messages_histo != 1) {
+		for ($i = 1; $i <= $nb_pages_messages_histo; $i++) { ?>
+		<?php echo '<' . (($page_message_histo == $i) ? 'span' : 'a href="' . add_query_arg(array('page_message_histo' => $i)) . '"') . ' class="page-numbers">' . $i . '</' . (($page_message_histo == $i) ? 'span' : 'a') . '>'; ?>
 	<?php }
 	} ?>
 <?php else: ?>
 	<div class="wps-alert-info">
-		<?php _e( 'No email was sent.', 'wpshop' ); ?>
+		<?php _e('No email was sent.', 'wpshop'); ?>
 	</div>
 <?php endif; ?>

includes/modules/wps_message/controller/wps_message_ctr.php

Spacing +142 added lines, -142 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_message_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -20,14 +20,14 @@ 
 		$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'));
@@ -39,11 +39,11 @@ 
 	public function enqueue_scripts() {
 		/** 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);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 				'show_in_nav_menus' 		=> false,
 				'rewrite' 					=> false,
 				'query_var' 				=> true,
-				'supports' 					=> array('title','editor'),
+				'supports' 					=> array('title', 'editor'),
 				'has_archive' 				=> false
 		));
 	}
@@ -97,7 +97,7 @@ 
 		add_meta_box(
 		'wpshop_message_histo',
 		__('Message historic', 'wpshop'),
-		array( $this, 'message_histo_box'),
+		array($this, 'message_histo_box'),
 		WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, 'normal', 'high'
 		);
 	}
@@ -119,15 +119,15 @@ 
 	 * @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();
 		}
@@ -139,13 +139,13 @@ 
 	 */
 	public static function create_default_message() {
 		// Get default messages defined into xml files
-		$xml_default_emails = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml' );
-		$default_emails = new SimpleXMLElement( $xml_default_emails );
+		$xml_default_emails = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml');
+		$default_emails = new SimpleXMLElement($xml_default_emails);
 
 		//Read default emails for options creation
-		foreach ( $default_emails->xpath( '//emails/email' ) as $email ) {
-			if (  ( WPSHOP_DEFINED_SHOP_TYPE == (string)$email->attributes()->shop_type ) || ( 'sale' == WPSHOP_DEFINED_SHOP_TYPE ) ) {
-				self::createMessage( (string)$email->attributes()->code, (string)$email->subject, (string)$email->content );
+		foreach ($default_emails->xpath('//emails/email') as $email) {
+			if ((WPSHOP_DEFINED_SHOP_TYPE == (string)$email->attributes()->shop_type) || ('sale' == WPSHOP_DEFINED_SHOP_TYPE)) {
+				self::createMessage((string)$email->attributes()->code, (string)$email->subject, (string)$email->content);
 			}
 		}
 	}
@@ -157,24 +157,24 @@ 
 	 * @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;
 
-		$object = empty( $object ) ? constant( $code . '_OBJECT' ) : $object;
-		$message = empty( $message ) ? constant( $code ) : $message;
-		$message_option = get_option( $code, null );
+		$object = empty($object) ? constant($code . '_OBJECT') : $object;
+		$message = empty($message) ? constant($code) : $message;
+		$message_option = get_option($code, null);
 
-		if ( empty( $message_option ) && !empty( $object ) && !empty( $message ) ) {
+		if (empty($message_option) && !empty($object) && !empty($message)) {
 			$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;
@@ -190,13 +190,13 @@ 
 	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);
 			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;
@@ -211,9 +211,9 @@ 
 		$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')
+				'extract' =>__('Extract from the message', 'wpshop'),
+				'date' => __('Creation date', 'wpshop'),
+				'last_dispatch_date' => __('Last dispatch date', 'wpshop')
 		);
 
 		return $columns;
@@ -229,12 +229,12 @@ 
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE,
 				'posts_per_page' => '-1',
 		));
-		$options='';
+		$options = '';
 		if (!empty($posts)) {
-			$options = '<option value="0">' .__('Select values from list', 'wpshop'). '</option>';
+			$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>';
+				$selected = $p->ID == $current ? ' selected="selected"' : '';
+				$options .= '<option value="' . $p->ID . '"' . $selected . '>' . $p->post_title . '</option>';
 			}
 		}
 		wp_reset_query();
@@ -247,13 +247,13 @@ 
 	 * @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 : 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 : 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);
 
 // 		ob_start();
 // 		require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "frontend", "messages") );
@@ -262,22 +262,22 @@ 
 
 		/**	Order emails	*/
 		$messages_histo = array();
-		foreach( $messages_data as $meta_id => $messages ) :
+		foreach ($messages_data as $meta_id => $messages) :
 			$i = 0;
-			foreach ( $messages as $message ) :
-				$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) :
+				$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++;
 			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();
 
@@ -289,10 +289,10 @@ 
 	 * @param string $message : message content
 	 * @return string
 	 */
-	public static function customize_message( $message ) {
-		if( !empty($message) ) {
+	public static function customize_message($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();
 		}
@@ -302,12 +302,12 @@ 
 	/** Store a new message
 	 * @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;
-		$object_empty = array('object_type'=>'','object_id'=>0);
+		$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);
+		$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,
@@ -319,7 +319,7 @@ 
 		);
 		$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);
 	}
 
 	/**
@@ -330,37 +330,37 @@ 
 	 * @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) {
-			$avant[] = '['.$key.']';
+		foreach ($data as $key => $value) {
+			$avant[] = '[' . $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;
@@ -369,9 +369,9 @@ 
 		}
 		$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') ) {
+		if (($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE')) {
 			$string = preg_replace("/\[(.*)\]/Usi", '', $string);
 		}
 
@@ -386,21 +386,21 @@ 
 	 * @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 );
+		$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 );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE ID = %s', $model_id);
+		$post_message = $wpdb->get_row($query);
 		$duplicate_message = '';
-		if ( !empty($post_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);
 			/* On envoie le mail */
-			if ( array_key_exists('order_content', $data) || array_key_exists('order_addresses', $data) || array_key_exists('order_customer_comments', $data) ) {
+			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) ) {
+			if (!empty($email)) {
 				$this->wpshop_email($email, $title, $message, true, $model_id, $object, $attached_file, $duplicate_message);
 			}
 		}
@@ -420,17 +420,17 @@ 
 	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);
 			}
 
 		}
@@ -438,19 +438,19 @@ 
 		$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);
 
 
-		if ( !empty($attachments) ) {
-			unlink( $attachments );
+		if (!empty($attachments)) {
+			unlink($attachments);
 		}
 	}
 
@@ -459,13 +459,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) ) {
+		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();
 		}
@@ -478,44 +478,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) ) {
+		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 (!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 ($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();
 						}
@@ -531,21 +531,21 @@ 
 	 * @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 );
+		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_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();
 		}
@@ -560,15 +560,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();
 			}
@@ -579,15 +579,15 @@ 
 	/**
 	 * Support historic messages
 	 */
-	function wpshop_messages_historic_correction () {
+	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('post_id' => $user_post_id ), array('meta_id' => $message->meta_id ) );
+		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));
 		}
 	}
 
@@ -596,9 +596,9 @@ 
 	 * 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;
@@ -608,7 +608,7 @@ 
 		$result = unserialize($result[0]->meta_value);
 		$result = $result[0]['mess_message'];
 
-		wp_die( $result );
+		wp_die($result);
 	}
 
 }