Eoxia / wpshop

includes/modules/wps_download_file/controller/wps_download_file_ctr.php

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <span class="wps-mini-cart-body-title">
 <strong><?php echo $total_cart_item; ?></strong><?php _e( 'item(s)', 'wpshop'); ?><span><strong><?php echo number_format( $total_cart, 2, '.', ''); ?></strong><?php echo $currency; ?></span>
@@ -12,8 +14,7 @@ 
 				$parent_post = $parent_def['parent_post'];
 				$item_id = $parent_post->ID;
 				$item_title =  $parent_post->post_title;
-			}
-			else {
+			} else {
 				$item_title = $item['item_name'];
 			}
 			?>

Spacing +21 added lines, -21 removed lines

@@ -1,31 +1,31 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 class wps_download_file_ctr {
 	public function __construct() {
-		add_action( 'admin_post_download_file', array( $this, 'wpshop_download_file' ) );
+		add_action('admin_post_download_file', array($this, 'wpshop_download_file'));
 	}
 
 	// Download product downloadable
 	public function wpshop_download_file() {
-		$download = !empty( $_GET['download'] ) ? sanitize_text_field( $_GET['download'] ) : '';
-		$oid = !empty( $_GET['oid'] ) ? (int) $_GET['oid'] : 0;
+		$download = !empty($_GET['download']) ? sanitize_text_field($_GET['download']) : '';
+		$oid = !empty($_GET['oid']) ? (int)$_GET['oid'] : 0;
 
-		if ( !empty( $download ) && !empty( $oid ) ) {
+		if (!empty($download) && !empty($oid)) {
 			$variation_id = '';
-			if(is_user_logged_in()) {
+			if (is_user_logged_in()) {
 				$user_id = get_current_user_id();
 				$order = get_post_meta($oid, '_order_postmeta', true);
-				if(!empty($order)) {
-					$download_codes = get_user_meta($user_id, '_order_download_codes_'.$oid, true);
-					if ( !empty($download_codes) && is_array($download_codes) ) {
-						foreach ( $download_codes as $downloadable_product_id => $d ) {
+				if (!empty($order)) {
+					$download_codes = get_user_meta($user_id, '_order_download_codes_' . $oid, true);
+					if (!empty($download_codes) && is_array($download_codes)) {
+						foreach ($download_codes as $downloadable_product_id => $d) {
 							$is_encrypted = false;
-							if ( $d['download_code'] == $download ) {
-								wpshop_tools::create_custom_hook ('encrypt_actions_for_downloadable_product', array( 'order_id' => $oid, 'download_product_id' => $downloadable_product_id ) );
+							if ($d['download_code'] == $download) {
+								wpshop_tools::create_custom_hook('encrypt_actions_for_downloadable_product', array('order_id' => $oid, 'download_product_id' => $downloadable_product_id));
 
-								if ( get_post_type( $downloadable_product_id ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-									$parent_def = wpshop_products::get_parent_variation( $downloadable_product_id );
-									if ( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+								if (get_post_type($downloadable_product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+									$parent_def = wpshop_products::get_parent_variation($downloadable_product_id);
+									if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 										$parent_post = $parent_def['parent_post'];
 										$variation_id = $downloadable_product_id;
 										$downloadable_product_id = $parent_post->ID;
@@ -38,15 +38,15 @@ 
 									'is_downloadable_', 'file_url', $order
 								);
 
-								if ( $link !== false ) {
+								if ($link !== false) {
 									$uploads = wp_upload_dir();
 									$basedir = $uploads['basedir'];
 									$pos = strpos($link, 'uploads');
-									$link = $basedir.substr($link,$pos+7);
+									$link = $basedir . substr($link, $pos + 7);
 									/** If plugin is encrypted **/
-									$encrypted_plugin_path = get_post_meta( $oid, '_download_file_path_'.$oid.'_'.( ( !empty( $variation_id ) && get_post_type( $variation_id ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) ? $variation_id : $downloadable_product_id ), true);
-									if ( !empty($encrypted_plugin_path) ) {
-										$link = WPSHOP_UPLOAD_DIR.$encrypted_plugin_path;
+									$encrypted_plugin_path = get_post_meta($oid, '_download_file_path_' . $oid . '_' . ((!empty($variation_id) && get_post_type($variation_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) ? $variation_id : $downloadable_product_id), true);
+									if (!empty($encrypted_plugin_path)) {
+										$link = WPSHOP_UPLOAD_DIR . $encrypted_plugin_path;
 										$is_encrypted = true;
 									}
 
@@ -58,7 +58,7 @@ 
 				}
 			}
 			else {
-				wp_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_myaccount_page_id') ) ) );
+				wp_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))));
 			}
 		}
 		echo __('Impossible to download the file you requested', 'wpshop');

includes/modules/wps_download_file/wps_download_file.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Plugin force download
 *
@@ -8,5 +8,5 @@ 
 * @subpackage includes
 */
 
-require_once( dirname( __FILE__ ) . '/controller/wps_download_file_ctr.php' );
+require_once(dirname(__FILE__) . '/controller/wps_download_file_ctr.php');
 new wps_download_file_ctr();
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/librairies/dashboard.class.php

Spacing +95 added lines, -95 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 class wpshop_dashboard {
@@ -29,7 +29,7 @@ 
 
 										<td class="first b"><a href="edit.php?post_type=<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>"><?php
 											$num_posts = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-											$number_of_products = number_format_i18n( $num_posts->publish );
+											$number_of_products = number_format_i18n($num_posts->publish);
 											echo $number_of_products;
 										?></a></td>
 										<td class="t"><a href="edit.php?post_type=<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>"><?php _e('Products', 'wpshop'); ?></a></td>
@@ -67,8 +67,8 @@ 
 									if ($orders) {
 										foreach ($orders as $o) {
 											$order = get_post_meta($o->ID, '_order_postmeta', true);
-											if(!empty($order['order_status'])){
-												switch($order['order_status']) {
+											if (!empty($order['order_status'])) {
+												switch ($order['order_status']) {
 													case 'completed': $order_completed++; break;
 													case 'shipped': $order_shipped++; break;
 													case 'awaiting_payment': $order_awaiting_payment++; break;
@@ -128,7 +128,7 @@ 
 
 						<?php
 						// New customers
-						$query = $wpdb->prepare('SELECT COUNT(*) FROM '.$wpdb->users.' WHERE user_registered > (NOW()-INTERVAL 7 DAY)', '');
+						$query = $wpdb->prepare('SELECT COUNT(*) FROM ' . $wpdb->users . ' WHERE user_registered > (NOW()-INTERVAL 7 DAY)', '');
 						$result = $wpdb->get_var($query);
 						?>
 						<span class="alignright"><?php echo $result; ?></span>
@@ -136,7 +136,7 @@ 
 
 						<?php
 						// Number of customers who ordered
-						$query = $wpdb->prepare('SELECT COUNT(DISTINCT post_author) FROM '.$wpdb->posts.' WHERE post_type="'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'"', '');
+						$query = $wpdb->prepare('SELECT COUNT(DISTINCT post_author) FROM ' . $wpdb->posts . ' WHERE post_type="' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"', '');
 						$result = $wpdb->get_var($query);
 						?>
 						<span class="alignright"><?php echo $result; ?></span>
@@ -147,13 +147,13 @@ 
 							$query = $wpdb->prepare("SELECT user_id, meta_value FROM " . $wpdb->usermeta . " WHERE meta_key = %s", 'user_preferences');
 							$user_preferences = $wpdb->get_results($query);
 							$nb_of_customer_for_newsletter = $nb_of_customer_for_newsletter_partners = 0;
-							foreach ( $user_preferences as $meta_values ) {
-								$user_prefs = unserialize( $meta_values->meta_value );
+							foreach ($user_preferences as $meta_values) {
+								$user_prefs = unserialize($meta_values->meta_value);
 
-								if ( !empty($user_prefs['newsletters_site']) && $user_prefs['newsletters_site'] ) {
+								if (!empty($user_prefs['newsletters_site']) && $user_prefs['newsletters_site']) {
 									$nb_of_customer_for_newsletter++;
 								}
-								else if ( !empty($user_prefs['newsletters_site_partners']) && $user_prefs['newsletters_site_partners'] ) {
+								else if (!empty($user_prefs['newsletters_site_partners']) && $user_prefs['newsletters_site_partners']) {
 									$nb_of_customer_for_newsletter_partners++;
 								}
 							}
@@ -171,10 +171,10 @@ 
 					<h3 class="hndle"><span><?php _e('Quick Links', 'wpshop') ?></span></h3>
 					<div class="inside">
 						<ul id="wps_dashboard_quick_links">
-							<li><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_product' ); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_product.jpg" alt="<?php _e( 'Create a new product', 'wpshop'); ?>" /><br/><?php _e('Create a product', 'wpshop'); ?></a></li>
-							<li><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_shop_order' ); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_order.jpg" alt="<?php _e( 'Create order', 'wpshop'); ?>" /><br/><?php _e('Create an order', 'wpshop'); ?></a></li>
-							<li><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_shop_coupon' ); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_coupon.jpg" alt="<?php _e( 'Create a coupon', 'wpshop'); ?>" /><br/><?php _e('Create a coupon', 'wpshop'); ?></a></li>
-							<li><a href="<?php echo admin_url( 'admin.php?page=wpshop_statistics' ); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_statistics.jpg" alt="<?php _e( 'Statistics', 'wpshop'); ?>" /><br/><?php _e('Statistics', 'wpshop'); ?></a></li>
+							<li><a href="<?php echo admin_url('post-new.php?post_type=wpshop_product'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_product.jpg" alt="<?php _e('Create a new product', 'wpshop'); ?>" /><br/><?php _e('Create a product', 'wpshop'); ?></a></li>
+							<li><a href="<?php echo admin_url('post-new.php?post_type=wpshop_shop_order'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_order.jpg" alt="<?php _e('Create order', 'wpshop'); ?>" /><br/><?php _e('Create an order', 'wpshop'); ?></a></li>
+							<li><a href="<?php echo admin_url('post-new.php?post_type=wpshop_shop_coupon'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_coupon.jpg" alt="<?php _e('Create a coupon', 'wpshop'); ?>" /><br/><?php _e('Create a coupon', 'wpshop'); ?></a></li>
+							<li><a href="<?php echo admin_url('admin.php?page=wpshop_statistics'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_statistics.jpg" alt="<?php _e('Statistics', 'wpshop'); ?>" /><br/><?php _e('Statistics', 'wpshop'); ?></a></li>
 						</ul>
 						<?php
 						// Number of products on sale
@@ -257,15 +257,15 @@ 
 				<?php
 					global $current_month_offset;
 
-					$current_month_offset = (isset($_GET['month'])) ? (int) $_GET['month'] : (int) date('m');
+					$current_month_offset = (isset($_GET['month'])) ? (int)$_GET['month'] : (int)date('m');
 
 									?>
 				<div class="postbox stats" id="wpshop-stats">
 					<h3 class="hndle">
-						<?php if ($current_month_offset!=date('m')) : ?>
-							<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset+1; ?>" class="next"><?php echo __('Next Month','wpshop'); ?> &rarr;</a>
+						<?php if ($current_month_offset != date('m')) : ?>
+							<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset + 1; ?>" class="next"><?php echo __('Next Month', 'wpshop'); ?> &rarr;</a>
 						<?php endif; ?>
-						<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset-1; ?>" class="previous">&larr; <?php echo __('Previous Month','wpshop'); ?></a>
+						<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset - 1; ?>" class="previous">&larr; <?php echo __('Previous Month', 'wpshop'); ?></a>
 						<span><?php _e('Monthly Sales', 'wpshop') ?></span></h3>
 					<div class="inside">
 						<div id="placeholder" style="width:100%; height:300px; position:relative;"></div>
@@ -295,11 +295,11 @@ 
 
 								<?php
 
-									function orders_this_month( $where = '' ) {
+									function orders_this_month($where = '') {
 										global $current_month_offset;
 
 										$month = $current_month_offset;
-										$year = (int) date('Y');
+										$year = (int)date('Y');
 
 										$first_day = strtotime("{$year}-{$month}-01");
 										$last_day = strtotime('-1 second', strtotime('+1 month', $first_day));
@@ -312,29 +312,29 @@ 
 
 										return $where;
 									}
-									add_filter( 'posts_where', 'orders_this_month' );
+									add_filter('posts_where', 'orders_this_month');
 
 									$args = array(
 										'numberposts'      => -1,
 										'orderby'          => 'post_date',
 										'order'            => 'DESC',
 										'post_type'        => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-										'post_status'      => 'publish' ,
+										'post_status'      => 'publish',
 										'suppress_filters' => false
 									);
-									$orders = get_posts( $args );
+									$orders = get_posts($args);
 
 									$order_counts = array();
 									$order_amounts = array();
 
 									// Blank date ranges to begin
 									$month = $current_month_offset;
-									$year = (int) date('Y');
+									$year = (int)date('Y');
 
 									$first_day = strtotime("{$year}-{$month}-01");
 									$last_day = strtotime('-1 second', strtotime('+1 month', $first_day));
 
-									if ((date('m') - $current_month_offset)==0) :
+									if ((date('m') - $current_month_offset) == 0) :
 										$up_to = date('d', strtotime('NOW'));
 									else :
 										$up_to = date('d', $last_day);
@@ -343,7 +343,7 @@ 
 
 									while ($count < $up_to) :
 
-										$time = strtotime(date('Ymd', strtotime('+ '.$count.' DAY', $first_day))).'000';
+										$time = strtotime(date('Ymd', strtotime('+ ' . $count . ' DAY', $first_day))) . '000';
 
 										$order_counts[$time] = 0;
 										$order_amounts[$time] = 0;
@@ -356,9 +356,9 @@ 
 
 											$order_data = get_post_meta($order->ID, '_order_postmeta', true);
 
-											if ($order_data['order_status']=='denied' || $order_data['order_status']=='awaiting_payment') continue;
+											if ($order_data['order_status'] == 'denied' || $order_data['order_status'] == 'awaiting_payment') continue;
 
-											$time = strtotime(date('Ymd', strtotime($order_data['order_date']))).'000';
+											$time = strtotime(date('Ymd', strtotime($order_data['order_date']))) . '000';
 
 											$order_grand_total = !empty($order_data['order_grand_total']) ? $order_data['order_grand_total'] : 0;
 
@@ -366,12 +366,12 @@ 
 											else : $order_counts[$time] = 1; endif;
 
 											if (isset($order_amounts[$time])) $order_amounts[$time] = $order_amounts[$time] + $order_grand_total;
-											else $order_amounts[$time] = (float) $order_grand_total;
+											else $order_amounts[$time] = (float)$order_grand_total;
 
 										endforeach;
 									endif;
 
-									remove_filter( 'posts_where', 'orders_this_month' );
+									remove_filter('posts_where', 'orders_this_month');
 								?>
 
 								var d = [
@@ -394,7 +394,7 @@ 
 
 								for (var i = 0; i < d2.length; ++i) d2[i][0] += 60 * 60 * 1000;
 
-								var plot = jQuery.plot(jQuery("#placeholder"), [ { label: "<?php echo __('Number of sales','wpshop'); ?>", data: d }, { label: "<?php echo __('Sales amount','wpshop'); ?>", data: d2, yaxis: 2 } ], {
+								var plot = jQuery.plot(jQuery("#placeholder"), [ { label: "<?php echo __('Number of sales', 'wpshop'); ?>", data: d }, { label: "<?php echo __('Sales amount', 'wpshop'); ?>", data: d2, yaxis: 2 } ], {
 									series: {
 										lines: { show: true },
 										points: { show: true }
@@ -441,10 +441,10 @@ 
 
 											jQuery("#tooltip").remove();
 
-											if (item.series.label=="<?php echo __('Number of sales','wpshop'); ?>") {
+											if (item.series.label=="<?php echo __('Number of sales', 'wpshop'); ?>") {
 
 												var y = item.datapoint[1];
-												showTooltip(item.pageX, item.pageY, y+" <?php echo __('sales','wpshop'); ?>");
+												showTooltip(item.pageX, item.pageY, y+" <?php echo __('sales', 'wpshop'); ?>");
 
 											} else {
 
@@ -490,13 +490,13 @@ 
 						<label><?php _e('Number of active order', 'wpshop'); ?></label><br />
 
 						<?php
-						$result=0;
+						$result = 0;
 						// Number of orders the last 7 days
-						$query = $wpdb->prepare('SELECT ID FROM '.$wpdb->posts.' WHERE post_type="'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'" AND post_date > (NOW()-INTERVAL 7 DAY)', '');
+						$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type="' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '" AND post_date > (NOW()-INTERVAL 7 DAY)', '');
 						$data = $wpdb->get_results($query, ARRAY_A);
-						foreach($data as $d) {
+						foreach ($data as $d) {
 							$postmeta = get_post_meta($d['ID'], '_order_postmeta', true);
-							if(!empty($postmeta) && !empty($postmeta['order_key']) && substr($postmeta['order_key'],0,2)=='OR')
+							if (!empty($postmeta) && !empty($postmeta['order_key']) && substr($postmeta['order_key'], 0, 2) == 'OR')
 								$result++;
 						}
 						?>
@@ -504,17 +504,17 @@ 
 						<label><?php _e('Number of orders the last 7 days', 'wpshop'); ?></label><br />
 
 						<?php
-						$result=0;
+						$result = 0;
 						// Number of orders the last 7 days
-						$query = $wpdb->prepare('SELECT ID FROM '.$wpdb->posts.' WHERE post_type="'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'" AND post_date > (NOW()-INTERVAL 7 DAY)', '');
+						$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type="' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '" AND post_date > (NOW()-INTERVAL 7 DAY)', '');
 						$data = $wpdb->get_results($query, ARRAY_A);
-						foreach($data as $d) {
+						foreach ($data as $d) {
 							$postmeta = get_post_meta($d['ID'], '_order_postmeta', true);
-							if(!empty($postmeta) && !empty($postmeta['order_grand_total']))
-								$result+=$postmeta['order_grand_total'];
+							if (!empty($postmeta) && !empty($postmeta['order_grand_total']))
+								$result += $postmeta['order_grand_total'];
 						}
-						if(count($data)>0)
-							$result = round($result/count($data),2);
+						if (count($data) > 0)
+							$result = round($result / count($data), 2);
 						?>
 						<span class="alignright"><?php echo wpshop_tools::wpshop_get_currency(); ?> <?php echo $result; ?></span>
 						<label><?php _e('Cart price average', 'wpshop'); ?></label>
@@ -529,9 +529,9 @@ 
 						<table width="100%">
 							<tr>
 								<td><?php self::wpshop_rss_tutorial_videos(); ?></td>
-								<td valign="top" cellpadding="20" ><h2 class="wps_dashboard"><?php _e('Need help with WPShop', 'wpshop' ); ?> ?</h2>
-									<p><?php _e( 'You need help with WPShop ? You some questions ?', 'wpshop' ); ?></p>
-									<p><h3 class="wps_dashboard"><?php _e( 'Two solutions', 'wpshop'); ?></h3></p>
+								<td valign="top" cellpadding="20" ><h2 class="wps_dashboard"><?php _e('Need help with WPShop', 'wpshop'); ?> ?</h2>
+									<p><?php _e('You need help with WPShop ? You some questions ?', 'wpshop'); ?></p>
+									<p><h3 class="wps_dashboard"><?php _e('Two solutions', 'wpshop'); ?></h3></p>
 									<p><center><br/><a href="http://shop.eoxia.com/ecommerce/modules-wpshop/assistance/" title="<?php _e('WPShop Assistance', 'wpshop'); ?>" target="_blank"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>assistance_wpshop.jpg" alt="<?php _e('WPShop Assistance', 'wpshop'); ?>" /></a><br/>
 									<a href="http://forums.eoxia.com/" title="<?php _e('WPShop Forum', 'wpshop'); ?>" target="_blank"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>forum_wpshop.jpg" alt="<?php _e('WPShop Forum', 'wpshop'); ?>" /></a></center></p>
 								</td>
@@ -575,44 +575,44 @@ 
 	
 	function wpshop_dashboard_orders() {
 		$output = '';
-		$orders = get_posts( array( 'posts_per_page' => 10, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'post_status' => 'publish', 'orderby' => 'post_date', 'order' => 'DESC') );		
-		if ( !empty($orders) ) {
-			$payment_status = unserialize( WPSHOP_ORDER_STATUS );	
+		$orders = get_posts(array('posts_per_page' => 10, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'post_status' => 'publish', 'orderby' => 'post_date', 'order' => 'DESC'));		
+		if (!empty($orders)) {
+			$payment_status = unserialize(WPSHOP_ORDER_STATUS);	
 			
 			$output .= '<table id="wps_dashboard_orders_summary">';
-			$output .= '<tr><th class="wps_dashboard_order_date">' .__('Date', 'wpshop'). '</th><th class="wps_dashboard_order_customer_name">' .__('Customer', 'wpshop'). '</th><th class="wps_dashboard_order_amount">' .__('Amount', 'wpshop'). '</th><th class="wps_dashboard_order_status">' .__('Status', 'wpshop'). '</th><th class="wps_dashboard_order_actions"></th></tr>';
+			$output .= '<tr><th class="wps_dashboard_order_date">' . __('Date', 'wpshop') . '</th><th class="wps_dashboard_order_customer_name">' . __('Customer', 'wpshop') . '</th><th class="wps_dashboard_order_amount">' . __('Amount', 'wpshop') . '</th><th class="wps_dashboard_order_status">' . __('Status', 'wpshop') . '</th><th class="wps_dashboard_order_actions"></th></tr>';
 			$stried = false;
-			foreach( $orders as $order ) {
-				$stried = ( $stried == false ) ? true : false;
+			foreach ($orders as $order) {
+				$stried = ($stried == false) ? true : false;
 				$additionnal_class = ($stried) ? 'wps_stried_line' : '';
-				$output .= '<tr class="' .$additionnal_class. '">';
-				$order_meta = get_post_meta( $order->ID, '_order_postmeta', true );
-				$order_info = get_post_meta( $order->ID, '_order_info', true );
+				$output .= '<tr class="' . $additionnal_class . '">';
+				$order_meta = get_post_meta($order->ID, '_order_postmeta', true);
+				$order_info = get_post_meta($order->ID, '_order_info', true);
 				
-				if ( !empty($order_meta) ) {
-					$output .= '<td>' .( (!empty($order_meta) && !empty($order_meta['order_date']) ) ? date( 'd-m-Y', strtotime($order_meta['order_date']) ): '' ). '</td>';
-					$output .= '<td>' .( (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name']) && !empty($order_info['billing']['address']['address_first_name']) ) ? strtoupper($order_info['billing']['address']['address_last_name']).' '.$order_info['billing']['address']['address_first_name']: '' ). '</td>';
+				if (!empty($order_meta)) {
+					$output .= '<td>' . ((!empty($order_meta) && !empty($order_meta['order_date'])) ? date('d-m-Y', strtotime($order_meta['order_date'])) : '') . '</td>';
+					$output .= '<td>' . ((!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name']) && !empty($order_info['billing']['address']['address_first_name'])) ? strtoupper($order_info['billing']['address']['address_last_name']) . ' ' . $order_info['billing']['address']['address_first_name'] : '') . '</td>';
 
-					$output .= '<td>' .( (!empty($order_meta['order_grand_total']) ) ? number_format( $order_meta['order_grand_total'], 2, '.', '' ).' '.wpshop_tools::wpshop_get_currency( false ) : '-' ). '</td>';
-					$output .= '<td><span class="wps_dashboard_' .$order_meta['order_status']. '">' .__($payment_status[ $order_meta['order_status'] ], 'wpshop' ). '</span></td>';
+					$output .= '<td>' . ((!empty($order_meta['order_grand_total'])) ? number_format($order_meta['order_grand_total'], 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency(false) : '-') . '</td>';
+					$output .= '<td><span class="wps_dashboard_' . $order_meta['order_status'] . '">' . __($payment_status[$order_meta['order_status']], 'wpshop') . '</span></td>';
 					$output .= '<td>';
-					$output .= '<a href="' .admin_url('/post.php?post=' .$order->ID. '&action=edit'). '"><img src="' .WPSHOP_MEDIAS_ICON_URL. 'icon_loupe.png" alt="' .__('See', 'wpshop'). '" /></a>';
+					$output .= '<a href="' . admin_url('/post.php?post=' . $order->ID . '&action=edit') . '"><img src="' . WPSHOP_MEDIAS_ICON_URL . 'icon_loupe.png" alt="' . __('See', 'wpshop') . '" /></a>';
 					
 					$invoice_ref = '';
-					if ( !empty($order_meta['order_invoice_ref']) ) {
+					if (!empty($order_meta['order_invoice_ref'])) {
 						$invoice_ref = $order_meta['order_invoice_ref'];
 					}
-					if ( !empty($invoice_ref) ) {
-						if( !empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received']) ) {
-							$invoice_ref = $order_meta['order_payment']['received'][ count($order_meta['order_payment']['received']) - 1 ]['invoice_ref'];
+					if (!empty($invoice_ref)) {
+						if (!empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received'])) {
+							$invoice_ref = $order_meta['order_payment']['received'][count($order_meta['order_payment']['received']) - 1]['invoice_ref'];
 						}
 					}
 					
-					if ( ( $order_meta['order_status'] == 'partially_paid' || $order_meta['order_status'] == 'completed' || $order_meta['order_status'] == 'shipped' ) && !empty($invoice_ref) ) {
-						$output .= ' <a href="' .WPSHOP_TEMPLATES_URL. 'invoice.php?order_id=' .$order->ID. '&invoice_ref&=' .$invoice_ref. '&mode=pdf"><img src="' .WPSHOP_MEDIAS_ICON_URL. 'icon_invoice.png" alt="' .__('Invoice', 'wpshop'). '" /></a>';
+					if (($order_meta['order_status'] == 'partially_paid' || $order_meta['order_status'] == 'completed' || $order_meta['order_status'] == 'shipped') && !empty($invoice_ref)) {
+						$output .= ' <a href="' . WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $order->ID . '&invoice_ref&=' . $invoice_ref . '&mode=pdf"><img src="' . WPSHOP_MEDIAS_ICON_URL . 'icon_invoice.png" alt="' . __('Invoice', 'wpshop') . '" /></a>';
 					}
-					if ( $order_meta['order_status'] == 'shipped' ) {
-						$output .= ' <a href="'.WPSHOP_TEMPLATES_URL. 'invoice.php?order_id=' .$order->ID. '&bon_colisage=ok&mode=pdf"><img src="' .WPSHOP_MEDIAS_ICON_URL. 'bon_colisage_icon.png" alt="' .__('Shipping Slip', 'wpshop'). '" /></a>';
+					if ($order_meta['order_status'] == 'shipped') {
+						$output .= ' <a href="' . WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $order->ID . '&bon_colisage=ok&mode=pdf"><img src="' . WPSHOP_MEDIAS_ICON_URL . 'bon_colisage_icon.png" alt="' . __('Shipping Slip', 'wpshop') . '" /></a>';
 					}
 					$output .= '</td>';
 				}
@@ -626,24 +626,24 @@ 
 	
 	function wpshop_rss_feed() {
 		$output = '';
-		include_once( ABSPATH . WPINC . '/feed.php' );
+		include_once(ABSPATH . WPINC . '/feed.php');
 	
-		$rss = fetch_feed( 'http://www.wpshop.fr/feed/' );
-		if( ! is_wp_error( $rss ) ){ 
-			$maxitems = $rss->get_item_quantity( 4 );
-			$rss_items = $rss->get_items( 0, $maxitems );
+		$rss = fetch_feed('http://www.wpshop.fr/feed/');
+		if (!is_wp_error($rss)) { 
+			$maxitems = $rss->get_item_quantity(4);
+			$rss_items = $rss->get_items(0, $maxitems);
 		}
 		else {
 			$output .= '<p>' . __('WPShop News cannot be loaded', 'wpshop') . '</p>';
 		}
 	
-		if ( $maxitems == 0 ) {
+		if ($maxitems == 0) {
 			$output .= '<p>' . __('No WPShop new has been found', 'wpshop') . '</p>';
 		}
 		else {
 			$output .= '<ul class="recent-orders">';
-			foreach ( $rss_items as $item ) {
-				$output .= '<li><a href="' .$item->get_permalink() . '" title="' .$item->get_title(). '" target="_blank">' .$item->get_title(). '</a><br/>';
+			foreach ($rss_items as $item) {
+				$output .= '<li><a href="' . $item->get_permalink() . '" title="' . $item->get_title() . '" target="_blank">' . $item->get_title() . '</a><br/>';
 				$output .= $item->get_content();
 				$output .= '</li>';
 			}
@@ -654,39 +654,39 @@ 
 	
 	
 	function wpshop_rss_tutorial_videos() {
-		$ini_get_checking = ini_get( 'allow_url_fopen' );
-		if ( $ini_get_checking != 0 ) {
+		$ini_get_checking = ini_get('allow_url_fopen');
+		if ($ini_get_checking != 0) {
 			$content = file_get_contents('http://www.wpshop.fr/rss_video.xml');
 			$videos_rss = new SimpleXmlElement($content);
-			if ( !empty($videos_rss) && !empty($videos_rss->channel) ) {
+			if (!empty($videos_rss) && !empty($videos_rss->channel)) {
 				$videos_items = array();
-				foreach( $videos_rss->channel->item as $i => $item ) {
+				foreach ($videos_rss->channel->item as $i => $item) {
 					$videos_items[] = $item;
 				}
-				$rand_element = array_rand( $videos_items );
+				$rand_element = array_rand($videos_items);
 				$output  = '<div class="wps_dashboard_video_container">';
-				$output .= '<div class="wps_dashboard_video_title">' .$videos_items[ $rand_element ]->title. '</div>';
-				$output .= '<div class="wps_dashboard_video"><iframe width="400" height="290" src="' .$videos_items[ $rand_element ]->embed_link. '" frameborder="0" allowfullscreen></iframe></div>';
-				$output .= '<div class="wps_dashboard_video_description">' .$videos_items[ $rand_element ]->description. '</div>';
+				$output .= '<div class="wps_dashboard_video_title">' . $videos_items[$rand_element]->title . '</div>';
+				$output .= '<div class="wps_dashboard_video"><iframe width="400" height="290" src="' . $videos_items[$rand_element]->embed_link . '" frameborder="0" allowfullscreen></iframe></div>';
+				$output .= '<div class="wps_dashboard_video_description">' . $videos_items[$rand_element]->description . '</div>';
 				$output .= '</div>';
 				
 			}
 			else {
-				$output =__('No tutorial videos can be loaded', 'wpshop' );
+				$output = __('No tutorial videos can be loaded', 'wpshop');
 			}
 		}
 		else {
-			$output = __( 'Your servor doesn\'t allow to open external files', 'wpshop');
+			$output = __('Your servor doesn\'t allow to open external files', 'wpshop');
 		}
 		echo $output;
 	}
 	
 	function wpshop_dashboard_get_changelog() {
-		$readme_file = fopen( WPSHOP_DIR.'/readme.txt', 'r' );
-		if ( $readme_file ) {
-			$txt = file_get_contents( WPSHOP_DIR.'/readme.txt' );
-			$pre_change_log = explode( '== Changelog ==', $txt );
-			$versions = explode( '= Version', $pre_change_log[1] );
+		$readme_file = fopen(WPSHOP_DIR . '/readme.txt', 'r');
+		if ($readme_file) {
+			$txt = file_get_contents(WPSHOP_DIR . '/readme.txt');
+			$pre_change_log = explode('== Changelog ==', $txt);
+			$versions = explode('= Version', $pre_change_log[1]);
 
 			echo $versions[1];
 		}

Braces +38 added lines, -24 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -152,8 +154,7 @@ 
 
 								if ( !empty($user_prefs['newsletters_site']) && $user_prefs['newsletters_site'] ) {
 									$nb_of_customer_for_newsletter++;
-								}
-								else if ( !empty($user_prefs['newsletters_site_partners']) && $user_prefs['newsletters_site_partners'] ) {
+								} else if ( !empty($user_prefs['newsletters_site_partners']) && $user_prefs['newsletters_site_partners'] ) {
 									$nb_of_customer_for_newsletter_partners++;
 								}
 							}
@@ -336,8 +337,10 @@ 
 
 									if ((date('m') - $current_month_offset)==0) :
 										$up_to = date('d', strtotime('NOW'));
-									else :
+									else {
+										:
 										$up_to = date('d', $last_day);
+									}
 									endif;
 									$count = 0;
 
@@ -356,17 +359,25 @@ 
 
 											$order_data = get_post_meta($order->ID, '_order_postmeta', true);
 
-											if ($order_data['order_status']=='denied' || $order_data['order_status']=='awaiting_payment') continue;
+											if ($order_data['order_status']=='denied' || $order_data['order_status']=='awaiting_payment') {
+												continue;
+											}
 
 											$time = strtotime(date('Ymd', strtotime($order_data['order_date']))).'000';
 
 											$order_grand_total = !empty($order_data['order_grand_total']) ? $order_data['order_grand_total'] : 0;
 
 											if (isset($order_counts[$time])) : $order_counts[$time]++;
-											else : $order_counts[$time] = 1; endif;
+											else {
+												: $order_counts[$time] = 1;
+											}
+											endif;
 
-											if (isset($order_amounts[$time])) $order_amounts[$time] = $order_amounts[$time] + $order_grand_total;
-											else $order_amounts[$time] = (float) $order_grand_total;
+											if (isset($order_amounts[$time])) {
+												$order_amounts[$time] = $order_amounts[$time] + $order_grand_total;
+											} else {
+												$order_amounts[$time] = (float) $order_grand_total;
+											}
 
 										endforeach;
 									endif;
@@ -377,7 +388,9 @@ 
 								var d = [
 									<?php
 										$values = array();
-										foreach ($order_counts as $key => $value) $values[] = "[$key, $value]";
+										foreach ($order_counts as $key => $value) {
+											$values[] = "[$key, $value]";
+										}
 										echo implode(',', $values);
 									?>
 								];
@@ -387,7 +400,9 @@ 
 								var d2 = [
 									<?php
 										$values = array();
-										foreach ($order_amounts as $key => $value) $values[] = "[$key, $value]";
+										foreach ($order_amounts as $key => $value) {
+											$values[] = "[$key, $value]";
+										}
 										echo implode(',', $values);
 									?>
 								];
@@ -496,8 +511,9 @@ 
 						$data = $wpdb->get_results($query, ARRAY_A);
 						foreach($data as $d) {
 							$postmeta = get_post_meta($d['ID'], '_order_postmeta', true);
-							if(!empty($postmeta) && !empty($postmeta['order_key']) && substr($postmeta['order_key'],0,2)=='OR')
-								$result++;
+							if(!empty($postmeta) && !empty($postmeta['order_key']) && substr($postmeta['order_key'],0,2)=='OR') {
+															$result++;
+							}
 						}
 						?>
 						<span class="alignright"><?php echo $result; ?></span>
@@ -510,11 +526,13 @@ 
 						$data = $wpdb->get_results($query, ARRAY_A);
 						foreach($data as $d) {
 							$postmeta = get_post_meta($d['ID'], '_order_postmeta', true);
-							if(!empty($postmeta) && !empty($postmeta['order_grand_total']))
-								$result+=$postmeta['order_grand_total'];
+							if(!empty($postmeta) && !empty($postmeta['order_grand_total'])) {
+															$result+=$postmeta['order_grand_total'];
+							}
+						}
+						if(count($data)>0) {
+													$result = round($result/count($data),2);
 						}
-						if(count($data)>0)
-							$result = round($result/count($data),2);
 						?>
 						<span class="alignright"><?php echo wpshop_tools::wpshop_get_currency(); ?> <?php echo $result; ?></span>
 						<label><?php _e('Cart price average', 'wpshop'); ?></label>
@@ -632,15 +650,13 @@ 
 		if( ! is_wp_error( $rss ) ){ 
 			$maxitems = $rss->get_item_quantity( 4 );
 			$rss_items = $rss->get_items( 0, $maxitems );
-		}
-		else {
+		} else {
 			$output .= '<p>' . __('WPShop News cannot be loaded', 'wpshop') . '</p>';
 		}
 	
 		if ( $maxitems == 0 ) {
 			$output .= '<p>' . __('No WPShop new has been found', 'wpshop') . '</p>';
-		}
-		else {
+		} else {
 			$output .= '<ul class="recent-orders">';
 			foreach ( $rss_items as $item ) {
 				$output .= '<li><a href="' .$item->get_permalink() . '" title="' .$item->get_title(). '" target="_blank">' .$item->get_title(). '</a><br/>';
@@ -670,12 +686,10 @@ 
 				$output .= '<div class="wps_dashboard_video_description">' .$videos_items[ $rand_element ]->description. '</div>';
 				$output .= '</div>';
 				
-			}
-			else {
+			} else {
 				$output =__('No tutorial videos can be loaded', 'wpshop' );
 			}
-		}
-		else {
+		} else {
 			$output = __( 'Your servor doesn\'t allow to open external files', 'wpshop');
 		}
 		echo $output;

includes/modules/wps_dashboard/templates/backend/dashboard.php

Braces +24 added lines, -8 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wrap wpshopMainWrap" >
 	<div id="wpshopLoadingPicture" class="wpshopHide" ><img src="<?php echo WPSHOP_LOADING_ICON; ?>" alt="loading picture" class="wpshopPageMessage_Icon" /></div>
@@ -285,8 +287,10 @@ 
 
 								if ((date('m') - $current_month_offset)==0) :
 									$up_to = date('d', strtotime('NOW'));
-								else :
+								else {
+									:
 									$up_to = date('d', $last_day);
+								}
 								endif;
 								$count = 0;
 
@@ -305,17 +309,25 @@ 
 
 										$order_data = get_post_meta($order->ID, '_order_postmeta', true);
 
-										if ($order_data['order_status']=='denied' || $order_data['order_status']=='awaiting_payment') continue;
+										if ($order_data['order_status']=='denied' || $order_data['order_status']=='awaiting_payment') {
+											continue;
+										}
 
 										$time = strtotime(date('Ymd', strtotime($order_data['order_date']))).'000';
 
 										$order_grand_total = !empty($order_data['order_grand_total']) ? $order_data['order_grand_total'] : 0;
 
 										if (isset($order_counts[$time])) : $order_counts[$time]++;
-										else : $order_counts[$time] = 1; endif;
+										else {
+											: $order_counts[$time] = 1;
+										}
+										endif;
 
-										if (isset($order_amounts[$time])) $order_amounts[$time] = $order_amounts[$time] + $order_grand_total;
-										else $order_amounts[$time] = (float) $order_grand_total;
+										if (isset($order_amounts[$time])) {
+											$order_amounts[$time] = $order_amounts[$time] + $order_grand_total;
+										} else {
+											$order_amounts[$time] = (float) $order_grand_total;
+										}
 
 									endforeach;
 								endif;
@@ -326,7 +338,9 @@ 
 							var d = [
 								<?php
 									$values = array();
-									foreach ($order_counts as $key => $value) $values[] = "[$key, $value]";
+									foreach ($order_counts as $key => $value) {
+										$values[] = "[$key, $value]";
+									}
 									echo implode(',', $values);
 								?>
 							];
@@ -336,7 +350,9 @@ 
 							var d2 = [
 								<?php
 									$values = array();
-									foreach ($order_amounts as $key => $value) $values[] = "[$key, $value]";
+									foreach ($order_amounts as $key => $value) {
+										$values[] = "[$key, $value]";
+									}
 									echo implode(',', $values);
 								?>
 							];

Spacing +46 added lines, -46 removed lines

@@ -1,16 +1,16 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wrap wpshopMainWrap" >
 	<div id="wpshopLoadingPicture" class="wpshopHide" ><img src="<?php echo WPSHOP_LOADING_ICON; ?>" alt="loading picture" class="wpshopPageMessage_Icon" /></div>
-	<div id="wpshopMessage" class="fade below-h2 wpshopPageMessage <?php echo ( !empty( $actionInformationMessage ) ? 'wpshopPageMessage_Updated' : ''); ?>" ><?php !empty( $actionInformationMessage ) ? _e( $actionInformationMessage, 'wpshop' ) : ''; ?></div>
+	<div id="wpshopMessage" class="fade below-h2 wpshopPageMessage <?php echo (!empty($actionInformationMessage) ? 'wpshopPageMessage_Updated' : ''); ?>" ><?php !empty($actionInformationMessage) ? _e($actionInformationMessage, 'wpshop') : ''; ?></div>
 
 	<div class="pageTitle" id="pageTitleContainer" >
-		<h2 ><?php _e( 'Shop dashboard', 'wpshop'); ?></h2>
+		<h2 ><?php _e('Shop dashboard', 'wpshop'); ?></h2>
 	</div>
 	<div id="champsCaches" class="wpshop_cls wpshopHide" ></div>
 	<div class="wpshop_cls" id="wpshopMainContent" >
 
-	<?php apply_filters( 'wps-dashboard-notice', '' ); ?>
+	<?php apply_filters('wps-dashboard-notice', ''); ?>
 
 	<div id="wpshop_dashboard">
 
@@ -30,7 +30,7 @@ 
 
 									<td class="first b"><a href="edit.php?post_type=<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>"><?php
 										$num_posts = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-										$number_of_products = number_format_i18n( $num_posts->publish );
+										$number_of_products = number_format_i18n($num_posts->publish);
 										echo $number_of_products;
 									?></a></td>
 									<td class="t"><a href="edit.php?post_type=<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>"><?php _e('Products', 'wpshop'); ?></a></td>
@@ -46,7 +46,7 @@ 
 								</tr>
 								<tr>
 									<?php
-									$query = $wpdb->prepare( "SELECT COUNT( DISTINCT us.ID ) FROM {$wpdb->users} us JOIN {$wpdb->posts} ON us.ID = post_author AND post_type = %s", 'wpshop_shop_order' );
+									$query = $wpdb->prepare("SELECT COUNT( DISTINCT us.ID ) FROM {$wpdb->users} us JOIN {$wpdb->posts} ON us.ID = post_author AND post_type = %s", 'wpshop_shop_order');
 									$result = $wpdb->get_var($query);
 									?>
 									<td class="first b"><a href="users.php"><?php echo $result; ?></a></td>
@@ -76,8 +76,8 @@ 
 								if ($orders) {
 									foreach ($orders as $o) {
 										$order = get_post_meta($o->ID, '_order_postmeta', true);
-										if(!empty($order['order_status'])){
-											switch($order['order_status']) {
+										if (!empty($order['order_status'])) {
+											switch ($order['order_status']) {
 												case 'completed': $order_completed++; break;
 												case 'shipped': $order_shipped++; break;
 												case 'awaiting_payment': $order_awaiting_payment++; break;
@@ -136,11 +136,11 @@ 
 				<h3 class="hndle"><span class="dashicons dashicons-performance"></span> <span><?php _e('Quick Links', 'wpshop') ?></span></h3>
 				<div class="inside">
 					<div class="wps-gridwrapper5-padded wpshop-gridwrapper-quick-link">
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_product' ); ?>"><span class="dashicons dashicons-archive"></span></a></div><center><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_product' ); ?>"><?php _e( 'Create a new product', 'wpshop'); ?></a></center></div>
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_shop_order' ); ?>"><span class="dashicons dashicons-cart"></span></a></div><center><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_shop_order' ); ?>"><?php _e( 'Create order', 'wpshop'); ?></a></center></div>
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ); ?>"><span class="dashicons dashicons-businessman"></span></a></div><center><a href="<?php echo admin_url( 'post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ); ?>"><?php _e( 'Create a customer', 'wpshop'); ?></a></center></div>
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'admin.php?page=wpshop_statistics' ); ?>"><span class="dashicons dashicons-chart-line"></span></a></div><center><a href="<?php echo admin_url( 'admin.php?page=wpshop_statistics' ); ?>"><?php _e( 'Statistics', 'wpshop'); ?></a></center></div>
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'options-general.php?page=wpshop_option#wpshop_display_option' ); ?>"><span class="dashicons dashicons-admin-appearance"></span></a></div><center><a href="<?php echo admin_url( 'options-general.php?page=wpshop_option' ); ?>"><?php _e( 'Customize your shop', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('post-new.php?post_type=wpshop_product'); ?>"><span class="dashicons dashicons-archive"></span></a></div><center><a href="<?php echo admin_url('post-new.php?post_type=wpshop_product'); ?>"><?php _e('Create a new product', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('post-new.php?post_type=wpshop_shop_order'); ?>"><span class="dashicons dashicons-cart"></span></a></div><center><a href="<?php echo admin_url('post-new.php?post_type=wpshop_shop_order'); ?>"><?php _e('Create order', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS); ?>"><span class="dashicons dashicons-businessman"></span></a></div><center><a href="<?php echo admin_url('post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS); ?>"><?php _e('Create a customer', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('admin.php?page=wpshop_statistics'); ?>"><span class="dashicons dashicons-chart-line"></span></a></div><center><a href="<?php echo admin_url('admin.php?page=wpshop_statistics'); ?>"><?php _e('Statistics', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('options-general.php?page=wpshop_option#wpshop_display_option'); ?>"><span class="dashicons dashicons-admin-appearance"></span></a></div><center><a href="<?php echo admin_url('options-general.php?page=wpshop_option'); ?>"><?php _e('Customize your shop', 'wpshop'); ?></a></center></div>
 					</div>
 				</div>
 			</div><!-- postbox end -->
@@ -155,36 +155,36 @@ 
 						<div class="wps-table-header wps-table-row">
 							<div class="wps-table-cell"><?php _e('Number of users', 'wpshop'); ?></div>
 							<div class="wps-table-cell"><?php $result = count(get_users()); echo $result; ?></div>
-							<div class="wps-table-cell"><?php echo ( !empty($result) ) ? '<a href="' . admin_url(). 'admin.php?page=wpshop_dashboard&download_users=users_all" role="button" id="download_all_users_contacts" class="wps-bton-first-rounded">' .__( 'Download the list', 'wpshop' ). '</a>' : ''; ?></div>
+							<div class="wps-table-cell"><?php echo (!empty($result)) ? '<a href="' . admin_url() . 'admin.php?page=wpshop_dashboard&download_users=users_all" role="button" id="download_all_users_contacts" class="wps-bton-first-rounded">' . __('Download the list', 'wpshop') . '</a>' : ''; ?></div>
 						</div>
 
 
 
 						<div class="wps-table-header wps-table-row">
 							<?php
-							$query = $wpdb->prepare( "SELECT COUNT( DISTINCT user_id ) FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') )", 'wpshop_shop_order', 'user_preferences', 's:16:"newsletters_site";i:1;', 's:16:"newsletters_site";b:1;' );
+							$query = $wpdb->prepare("SELECT COUNT( DISTINCT user_id ) FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') )", 'wpshop_shop_order', 'user_preferences', 's:16:"newsletters_site";i:1;', 's:16:"newsletters_site";b:1;');
 							$nbcustomers_site = $wpdb->get_var($query);
 							?>
 							<div class="wps-table-cell"><?php _e('Number of customers who wants to receive shop newsletters', 'wpshop'); ?></div>
 							<div class="wps-table-cell"><?php echo $nbcustomers_site; ?></div>
-							<div class="wps-table-cell"><?php echo ( !empty($nbcustomers_site) ) ? '<a href="' . admin_url(). 'admin.php?page=wpshop_dashboard&download_users=newsletters_site" role="button" id="download_newsletter_contacts" class="wps-bton-first-rounded">' .__( 'Download the list', 'wpshop' ). '</a>' : ''; ?></div>
+							<div class="wps-table-cell"><?php echo (!empty($nbcustomers_site)) ? '<a href="' . admin_url() . 'admin.php?page=wpshop_dashboard&download_users=newsletters_site" role="button" id="download_newsletter_contacts" class="wps-bton-first-rounded">' . __('Download the list', 'wpshop') . '</a>' : ''; ?></div>
 						</div>
 
 						<div class="wps-table-header wps-table-row">
 							<?php
-							$query = $wpdb->prepare( "SELECT COUNT( DISTINCT user_id ) FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') )", 'wpshop_shop_order', 'user_preferences', 's:25:"newsletters_site_partners";i:1;', 's:25:"newsletters_site_partners";b:1;' );
+							$query = $wpdb->prepare("SELECT COUNT( DISTINCT user_id ) FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') )", 'wpshop_shop_order', 'user_preferences', 's:25:"newsletters_site_partners";i:1;', 's:25:"newsletters_site_partners";b:1;');
 							$nbcustomers_site_partners = $wpdb->get_var($query);
 							?>
 							<div class="wps-table-cell"><?php _e('Number of customers who wants to receive partners newsletters', 'wpshop'); ?></div>
 							<div class="wps-table-cell"><?php echo $nbcustomers_site_partners; ?></div>
-							<div class="wps-table-cell"><?php echo ( !empty($nbcustomers_site_partners) ) ? '<a href="' . admin_url(). 'admin.php?page=wpshop_dashboard&download_users=newsletters_site_partners" role="button" id="download_newsletter_partners_contacts" class="wps-bton-first-rounded">' .__( 'Download the list', 'wpshop' ). '</a>' : ''; ?></div>
+							<div class="wps-table-cell"><?php echo (!empty($nbcustomers_site_partners)) ? '<a href="' . admin_url() . 'admin.php?page=wpshop_dashboard&download_users=newsletters_site_partners" role="button" id="download_newsletter_partners_contacts" class="wps-bton-first-rounded">' . __('Download the list', 'wpshop') . '</a>' : ''; ?></div>
 						</div>
 					</div>
 				</div>
 			</div><!-- postbox end -->
 
 			<?php
-				if( class_exists('wps_export_ctr') ) {
+				if (class_exists('wps_export_ctr')) {
 					$wps_export = new wps_export_ctr();
 					$wps_export->wps_export_tpl();
 				}
@@ -206,15 +206,15 @@ 
 			<?php
 				global $current_month_offset;
 
-				$current_month_offset = (int) date('m');
-				$current_month_offset = isset( $_GET['month'] ) ? (int) $_GET['month'] : $current_month_offset;
+				$current_month_offset = (int)date('m');
+				$current_month_offset = isset($_GET['month']) ? (int)$_GET['month'] : $current_month_offset;
 			?>
 			<div class="postbox stats" id="wpshop-stats">
 				<h3 class="hndle"><span class="dashicons dashicons-chart-area"></span>
-					<?php if ($current_month_offset!=date('m')) : ?>
-						<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset+1; ?>" class="next"><?php echo __('Next Month','wpshop'); ?> &rarr;</a>
+					<?php if ($current_month_offset != date('m')) : ?>
+						<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset + 1; ?>" class="next"><?php echo __('Next Month', 'wpshop'); ?> &rarr;</a>
 					<?php endif; ?>
-					<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset-1; ?>" class="previous">&larr; <?php echo __('Previous Month','wpshop'); ?></a>
+					<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset - 1; ?>" class="previous">&larr; <?php echo __('Previous Month', 'wpshop'); ?></a>
 					<span><?php _e('Monthly Sales', 'wpshop') ?></span></h3>
 				<div class="inside">
 					<div id="placeholder" style="width:100%; height:300px; position:relative;"></div>
@@ -244,11 +244,11 @@ 
 
 							<?php
 
-								function orders_this_month( $where = '' ) {
+								function orders_this_month($where = '') {
 									global $current_month_offset;
 
 									$month = $current_month_offset;
-									$year = (int) date('Y');
+									$year = (int)date('Y');
 
 									$first_day = strtotime("{$year}-{$month}-01");
 									$last_day = strtotime('-1 second', strtotime('+1 month', $first_day));
@@ -261,29 +261,29 @@ 
 
 									return $where;
 								}
-								add_filter( 'posts_where', 'orders_this_month' );
+								add_filter('posts_where', 'orders_this_month');
 
 								$args = array(
 									'numberposts'      => -1,
 									'orderby'          => 'post_date',
 									'order'            => 'DESC',
 									'post_type'        => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-									'post_status'      => 'publish' ,
+									'post_status'      => 'publish',
 									'suppress_filters' => false
 								);
-								$orders = get_posts( $args );
+								$orders = get_posts($args);
 
 								$order_counts = array();
 								$order_amounts = array();
 
 								// Blank date ranges to begin
 								$month = $current_month_offset;
-								$year = (int) date('Y');
+								$year = (int)date('Y');
 
 								$first_day = strtotime("{$year}-{$month}-01");
 								$last_day = strtotime('-1 second', strtotime('+1 month', $first_day));
 
-								if ((date('m') - $current_month_offset)==0) :
+								if ((date('m') - $current_month_offset) == 0) :
 									$up_to = date('d', strtotime('NOW'));
 								else :
 									$up_to = date('d', $last_day);
@@ -292,7 +292,7 @@ 
 
 								while ($count < $up_to) :
 
-									$time = strtotime(date('Ymd', strtotime('+ '.$count.' DAY', $first_day))).'000';
+									$time = strtotime(date('Ymd', strtotime('+ ' . $count . ' DAY', $first_day))) . '000';
 
 									$order_counts[$time] = 0;
 									$order_amounts[$time] = 0;
@@ -305,9 +305,9 @@ 
 
 										$order_data = get_post_meta($order->ID, '_order_postmeta', true);
 
-										if ($order_data['order_status']=='denied' || $order_data['order_status']=='awaiting_payment') continue;
+										if ($order_data['order_status'] == 'denied' || $order_data['order_status'] == 'awaiting_payment') continue;
 
-										$time = strtotime(date('Ymd', strtotime($order_data['order_date']))).'000';
+										$time = strtotime(date('Ymd', strtotime($order_data['order_date']))) . '000';
 
 										$order_grand_total = !empty($order_data['order_grand_total']) ? $order_data['order_grand_total'] : 0;
 
@@ -315,12 +315,12 @@ 
 										else : $order_counts[$time] = 1; endif;
 
 										if (isset($order_amounts[$time])) $order_amounts[$time] = $order_amounts[$time] + $order_grand_total;
-										else $order_amounts[$time] = (float) $order_grand_total;
+										else $order_amounts[$time] = (float)$order_grand_total;
 
 									endforeach;
 								endif;
 
-								remove_filter( 'posts_where', 'orders_this_month' );
+								remove_filter('posts_where', 'orders_this_month');
 							?>
 
 							var d = [
@@ -343,7 +343,7 @@ 
 
 							for (var i = 0; i < d2.length; ++i) d2[i][0] += 60 * 60 * 1000;
 
-							var plot = jQuery.plot(jQuery("#placeholder"), [ { label: "<?php echo __('Number of sales','wpshop'); ?>", data: d }, { label: "<?php echo __('Sales amount','wpshop'); ?>", data: d2, yaxis: 2 } ], {
+							var plot = jQuery.plot(jQuery("#placeholder"), [ { label: "<?php echo __('Number of sales', 'wpshop'); ?>", data: d }, { label: "<?php echo __('Sales amount', 'wpshop'); ?>", data: d2, yaxis: 2 } ], {
 								series: {
 									lines: { show: true },
 									points: { show: true }
@@ -390,10 +390,10 @@ 
 
 										jQuery("#tooltip").remove();
 
-										if (item.series.label=="<?php echo __('Number of sales','wpshop'); ?>") {
+										if (item.series.label=="<?php echo __('Number of sales', 'wpshop'); ?>") {
 
 											var y = item.datapoint[1];
-											showTooltip(item.pageX, item.pageY, y+" <?php echo __('sales','wpshop'); ?>");
+											showTooltip(item.pageX, item.pageY, y+" <?php echo __('sales', 'wpshop'); ?>");
 
 										} else {
 
@@ -424,15 +424,15 @@ 
 				<div class="inside">
 
 					<div class="wps-boxed">
-						<span class="wps-h5"><?php _e( 'WPSHOP is also...', 'wpshop'); ?></span>
+						<span class="wps-h5"><?php _e('WPSHOP is also...', 'wpshop'); ?></span>
 						<div class="wps-gridwrapper4-padded">
-							<div><a href="http://shop.eoxia.com/ecommerce/wpshop_product/assistance-wordpress/" target="_blank" title="<?php _e( 'Assistance', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>assistance_wpshop.jpg" alt="WPSHOP Assistance" /></a><div class="wps-h5"><center><?php _e( 'Assistance', 'wpshop'); ?></center></div><center><?php _e('To assist you in your WPShop Experience', 'wpshop'); ?></center></div>
-							<div><a href="http://shop.eoxia.com/boutique/shop/themes-wpshop/" target="_blank" title="<?php _e( 'WPSHOP Themes', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>themes_wpshop.jpg" alt="WPSHOP Themes" /></a><div class="wps-h5"><center><?php _e( 'WPSHOP Themes', 'wpshop'); ?></center></div><center><?php _e('To offer to your customer all WPShop\'s powerful experience', 'wpshop'); ?></center></div>
-							<div><a href="http://shop.eoxia.com/boutique/shop/modules-wpshop/" target="_blank" title="<?php _e( 'WPSHOP\'s add-ons', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>modules_wpshop.jpg" alt="WPSHOP Assistance" /></a><div class="wps-h5"><center><?php _e( 'WPSHOP\'s add-ons', 'wpshop'); ?></center></div><center><?php _e('To boost your shop with new functions', 'wpshop'); ?></center></div>
-							<div><a href="http://forums.eoxia.com/forum/wpshop" target="_blank" title="<?php _e( 'WPSHOP\'s Forum', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>forum_wpshop.jpg" alt="Forum Assistance" /></a><div class="wps-h5"><center><?php _e( 'WPSHOP\'s Forum', 'wpshop'); ?></center></div><center><?php _e('To respond at your questions', 'wpshop'); ?></center></div>
+							<div><a href="http://shop.eoxia.com/ecommerce/wpshop_product/assistance-wordpress/" target="_blank" title="<?php _e('Assistance', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>assistance_wpshop.jpg" alt="WPSHOP Assistance" /></a><div class="wps-h5"><center><?php _e('Assistance', 'wpshop'); ?></center></div><center><?php _e('To assist you in your WPShop Experience', 'wpshop'); ?></center></div>
+							<div><a href="http://shop.eoxia.com/boutique/shop/themes-wpshop/" target="_blank" title="<?php _e('WPSHOP Themes', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>themes_wpshop.jpg" alt="WPSHOP Themes" /></a><div class="wps-h5"><center><?php _e('WPSHOP Themes', 'wpshop'); ?></center></div><center><?php _e('To offer to your customer all WPShop\'s powerful experience', 'wpshop'); ?></center></div>
+							<div><a href="http://shop.eoxia.com/boutique/shop/modules-wpshop/" target="_blank" title="<?php _e('WPSHOP\'s add-ons', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>modules_wpshop.jpg" alt="WPSHOP Assistance" /></a><div class="wps-h5"><center><?php _e('WPSHOP\'s add-ons', 'wpshop'); ?></center></div><center><?php _e('To boost your shop with new functions', 'wpshop'); ?></center></div>
+							<div><a href="http://forums.eoxia.com/forum/wpshop" target="_blank" title="<?php _e('WPSHOP\'s Forum', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>forum_wpshop.jpg" alt="Forum Assistance" /></a><div class="wps-h5"><center><?php _e('WPSHOP\'s Forum', 'wpshop'); ?></center></div><center><?php _e('To respond at your questions', 'wpshop'); ?></center></div>
 						</div>
 						<br/><br/>
-						<span class="wps-h6"><?php _e( 'Be connected', 'wpshop'); ?></span>
+						<span class="wps-h6"><?php _e('Be connected', 'wpshop'); ?></span>
 						<div class="wps-gridwrapper2-padded">
 							<div>
 								<div class="fb-like" data-href="https://fr-fr.facebook.com/wpshopplugin" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
@@ -445,7 +445,7 @@ 
 					</div>
 
 					<div class="wps-boxed">
-						<span class="wps-h5"><?php _e( 'WPSHOP\'s Video Tutorials', 'wpshop')?></span>
+						<span class="wps-h5"><?php _e('WPSHOP\'s Video Tutorials', 'wpshop')?></span>
 						<div><?php $this->wpshop_rss_tutorial_videos(); ?></div>
 					</div>
 

includes/modules/wps_customer/controller/wps_customer_group.php

Braces +10 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_customer_group {
 	function __construct() {
 		add_action('admin_menu', array( $this, 'register_customer_groups_submenu' ) );
@@ -47,8 +49,9 @@ 
 
 					// Redirect
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP.'&action=edit&code='.$code));
+				} else {
+					echo __('This group already exist','wpshop');
 				}
-				else echo __('This group already exist','wpshop');
 			}
 			// EDITION
 			elseif (!empty($editrole) && !empty($code)) {
@@ -67,8 +70,9 @@ 
 					$this->unaffectUsersToGroup($code); // !important
 					$this->affectUsersToGroup($code, $group_users);
 				}
+			} else {
+				wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));
 			}
-			else wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));
 		}
 	}
 
@@ -295,10 +299,8 @@ 
 									}
 								}
 							}
-						}
-						else {wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));exit;}
-					}
-					else {wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));exit;}
+						} else {wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));exit;}
+					} else {wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));exit;}
 
 					break;
 
@@ -350,8 +352,7 @@ 
 				</form>
 			';
 
-		}
-		else {
+		} else {
 
 
 			$wpshop_list_table = new wpshop_groups_custom_List_table();

Doc Comments +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 
 	/**
 	 * Affecte des utilisateurs � un role
-	 * @param $code identifiant du role
+	 * @param string $code identifiant du role
 	 * @param $users liste d'utilisateurs a affecter
 	 */
 	function affectUsersToGroup($code, $users)
@@ -99,7 +99,7 @@ 
 
 	/**
 	 * D�saffecte des utilisateurs � un role
-	 * @param $code identifiant du role
+	 * @param string $code identifiant du role
 	 */
 	function unaffectUsersToGroup($code)
 	{
@@ -125,7 +125,7 @@ 
 
 	/**
 	 * Enregistre les metas pour un role donn�
-	 * @param $code identifiant du role
+	 * @param string $code identifiant du role
 	 * @param $desc description du role
 	 * @param $parent parent du role
 	 */
@@ -164,7 +164,7 @@ 
 
 	/**
 	 * Enregistre les droits pour un role donn�
-	 * @param $code identifiant du role
+	 * @param string $code identifiant du role
 	 * @param $role identifiant du role actuel sur lequel le role est bas�
 	 * @param $newrole identifiant du role sur lequel le role doit etre bas�
 	 */
@@ -195,7 +195,7 @@ 
 
 	/**
 	 * Retourne les infos sur le role donn�
-	 * @param $code identifiant du role
+	 * @param string $code identifiant du role
 	 */
 	function getRole($code)
 	{

Spacing +67 added lines, -67 removed lines

@@ -1,7 +1,7 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_customer_group {
 	function __construct() {
-		add_action('admin_menu', array( $this, 'register_customer_groups_submenu' ) );
+		add_action('admin_menu', array($this, 'register_customer_groups_submenu'));
 	}
 
 	function register_customer_groups_submenu() {
@@ -14,13 +14,13 @@ 
 	 * Gérer les actions $_POST
 	 */
 	function manage_post() {
-		$addrole = !empty( $_POST['addrole'] ) ? sanitize_text_field( $_POST['addrole'] ) : '';
-		$editrole = !empty( $_POST['editrole'] ) ? sanitize_text_field( $_POST['editrole'] ) : '';
-		$group_name = !empty( $_POST['group-name'] ) ? sanitize_text_field( $_POST['group-name'] ) : '';
-		$group_parent = !empty( $_POST['group-parent'] ) ? sanitize_text_field( $_POST['group-parent'] ) : '';
-		$group_description = !empty( $_POST['group-description'] ) ? sanitize_text_field( $_POST['group-description'] ) : '';
-		$group_users = !empty( $_POST['group-users'] ) ? (array) $_POST['group-users'] : array();
-		$code = !empty( $_GET['code'] ) ? sanitize_text_field( $_GET['code'] ) : '';
+		$addrole = !empty($_POST['addrole']) ? sanitize_text_field($_POST['addrole']) : '';
+		$editrole = !empty($_POST['editrole']) ? sanitize_text_field($_POST['editrole']) : '';
+		$group_name = !empty($_POST['group-name']) ? sanitize_text_field($_POST['group-name']) : '';
+		$group_parent = !empty($_POST['group-parent']) ? sanitize_text_field($_POST['group-parent']) : '';
+		$group_description = !empty($_POST['group-description']) ? sanitize_text_field($_POST['group-description']) : '';
+		$group_users = !empty($_POST['group-users']) ? (array)$_POST['group-users'] : array();
+		$code = !empty($_GET['code']) ? sanitize_text_field($_GET['code']) : '';
 
 		if ((!empty($addrole) || !empty($editrole)) && !empty($group_name)) {
 
@@ -30,7 +30,7 @@ 
 			// AJOUT
 			if (!empty($addrole)) {
 
-				$code = 'wpshop_'.str_replace('-', '_', sanitize_title($group_name));
+				$code = 'wpshop_' . str_replace('-', '_', sanitize_title($group_name));
 
 				// Si le role n'existe pas
 				if (!isset($roles[$code])) {
@@ -40,15 +40,15 @@ 
 					add_role($code, sanitize_text_field($group_name), $rights);
 
 					// On enregistre les metas du groupe
-					$this->setGroupMetas($code, sanitize_text_field( $group_description ), sanitize_text_field( $group_parent ) );
+					$this->setGroupMetas($code, sanitize_text_field($group_description), sanitize_text_field($group_parent));
 
 					// On affecte des utilisateurs au role
 					$this->affectUsersToGroup($code, $group_users);
 
 					// Redirect
-					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP.'&action=edit&code='.$code));
+					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . WPSHOP_NEWTYPE_IDENTIFIER_GROUP . '&action=edit&code=' . $code));
 				}
-				else echo __('This group already exist','wpshop');
+				else echo __('This group already exist', 'wpshop');
 			}
 			// EDITION
 			elseif (!empty($editrole) && !empty($code)) {
@@ -58,17 +58,17 @@ 
 
 					$current_role = $this->getRole($code);
 
-					$this->setNewRoleRights($code, $current_role['parent'], sanitize_text_field( $group_parent ) );
+					$this->setNewRoleRights($code, $current_role['parent'], sanitize_text_field($group_parent));
 
 					// On enregistre les metas du groupe
-					$this->setGroupMetas($code, sanitize_text_field( $group_description ) , sanitize_text_field( $group_parent ) );
+					$this->setGroupMetas($code, sanitize_text_field($group_description), sanitize_text_field($group_parent));
 
 					// On affecte des utilisateurs au role
 					$this->unaffectUsersToGroup($code); // !important
 					$this->affectUsersToGroup($code, $group_users);
 				}
 			}
-			else wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));
+			else wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . WPSHOP_NEWTYPE_IDENTIFIER_GROUP));
 		}
 	}
 
@@ -110,11 +110,11 @@ 
 		if (isset($roles[$code])) {
 			$wps_customer_mdl = new wps_customer_mdl();
 			$users = $wps_customer_mdl->getUserList();
-			if( !empty($users) ) {
-				foreach($users as $user) {
+			if (!empty($users)) {
+				foreach ($users as $user) {
 					$u = new WP_User($user->ID);
 					// Si l'utilisateur poss�de le role, on le retire de sa liste de droits
-					if (isset($u->roles[0]) && $u->roles[0]==$code) {
+					if (isset($u->roles[0]) && $u->roles[0] == $code) {
 						$u->remove_role($u->roles[0]);
 						$u->add_role('subscriber');
 					}
@@ -177,7 +177,7 @@ 
 			// On retire les anciens droits
 			$rights = $this->getRoleRights($role);
 			if (!empty($rights)) {
-				foreach($rights as $c => $b) {
+				foreach ($rights as $c => $b) {
 					$wp_roles->remove_cap($code, $c);
 				}
 			}
@@ -185,7 +185,7 @@ 
 			// On ajoute les nouveaux droits
 			$rights = $this->getRoleRights($newrole);
 			if (!empty($rights)) {
-				foreach($rights as $c => $b) {
+				foreach ($rights as $c => $b) {
 					$wp_roles->add_cap($code, $c);
 				}
 			}
@@ -226,22 +226,22 @@ 
 		self::manage_post();
 
 		ob_start();
-		wpshop_display::displayPageHeader(__('Groups', 'wpshop'), '', __('Groups', 'wpshop'), __('Groups', 'wpshop'), true, 'admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP.'&action=add', '');
+		wpshop_display::displayPageHeader(__('Groups', 'wpshop'), '', __('Groups', 'wpshop'), __('Groups', 'wpshop'), true, 'admin.php?page=' . WPSHOP_NEWTYPE_IDENTIFIER_GROUP . '&action=add', '');
 		$content = ob_get_contents();
 		ob_end_clean();
 		$wps_customer_mdl = new wps_customer_mdl();
-		$action = !empty( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : '';
-		$code = !empty( $_GET['code'] ) ? sanitize_text_field( $_GET['code'] ) : '';
+		$action = !empty($_GET['action']) ? sanitize_text_field($_GET['action']) : '';
+		$code = !empty($_GET['code']) ? sanitize_text_field($_GET['code']) : '';
 		// Si on re�oit une action
-		if ( !empty( $action ) ) {
+		if (!empty($action)) {
 
 			$readonly_name_field = '';
 
-			switch ( $action ) {
+			switch ($action) {
 
 				case 'delete':
 
-					if ( !empty( $code ) ) {
+					if (!empty($code)) {
 
 						$roles = get_option('wp_user_roles', array());
 
@@ -252,7 +252,7 @@ 
 						}
 					}
 
-					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));
+					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . WPSHOP_NEWTYPE_IDENTIFIER_GROUP));
 
 					break;
 
@@ -269,36 +269,36 @@ 
 							$group_name = $role['name'];
 							$group_description = $role['description'];
 							$group_parent = $role['parent'];
-							$submit_button_value = __('Edit the group','wpshop');
+							$submit_button_value = __('Edit the group', 'wpshop');
 							$submit_button_name = 'editrole';
 
 							// ROLES
 							$roles = get_option('wp_user_roles', array());
 							$select_parent = '<option value="">--</option>';
 
-							foreach($roles as $code => $role) {
+							foreach ($roles as $code => $role) {
 								if ($code != $code) {
-									$selected = $group_parent==$code ? 'selected' : '';
-									$select_parent .= '<option value="'.$code.'" '.$selected.'>'.$role['name'].'</option>';
+									$selected = $group_parent == $code ? 'selected' : '';
+									$select_parent .= '<option value="' . $code . '" ' . $selected . '>' . $role['name'] . '</option>';
 								}
 							}
 
 							// USERS
 							$users = $wps_customer_mdl->getUserList();
-							if( !empty($users) ) {
+							if (!empty($users)) {
 								$select_users = '';
-								foreach($users as $user) {
+								foreach ($users as $user) {
 									if ($user->ID != 1) {
 										$u = new WP_User($user->ID);
-										$selected = isset($u->roles[0]) && $u->roles[0]==$code ? 'selected' : '';
-										$select_users .= '<option value="'.$user->ID.'" '.$selected.'>'.$user->user_login.'</option>';
+										$selected = isset($u->roles[0]) && $u->roles[0] == $code ? 'selected' : '';
+										$select_users .= '<option value="' . $user->ID . '" ' . $selected . '>' . $user->user_login . '</option>';
 									}
 								}
 							}
 						}
-						else {wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));exit;}
+						else {wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . WPSHOP_NEWTYPE_IDENTIFIER_GROUP)); exit; }
 					}
-					else {wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP));exit;}
+					else {wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . WPSHOP_NEWTYPE_IDENTIFIER_GROUP)); exit; }
 
 					break;
 
@@ -306,23 +306,23 @@ 
 
 
 					$group_name = $group_description = '';
-					$submit_button_value = __('Create the group','wpshop');
+					$submit_button_value = __('Create the group', 'wpshop');
 					$submit_button_name = 'addrole';
 
 					// ROLES
 					$roles = get_option('wp_user_roles', array());
-					$select_parent = '<option value="">--</option>';;
-					foreach($roles as $code => $role) {
-						$select_parent .= '<option value="'.$code.'">'.$role['name'].'</option>';
+					$select_parent = '<option value="">--</option>'; ;
+					foreach ($roles as $code => $role) {
+						$select_parent .= '<option value="' . $code . '">' . $role['name'] . '</option>';
 					}
 
 					// USERS
 					$users = $wps_customer_mdl->getUserList();
 					$select_users = '';
-					if( !empty($users) ) {
-						foreach($users as $user) {
+					if (!empty($users)) {
+						foreach ($users as $user) {
 							if ($user->ID != 1) {
-								$select_users .= '<option value="'.$user->ID.'">'.$user->user_login.'</option>';
+								$select_users .= '<option value="' . $user->ID . '">' . $user->user_login . '</option>';
 							}
 						}
 					}
@@ -332,21 +332,21 @@ 
 
 			$content .= '
 				<form method="post">
-					<label>'.__('Name','wpshop').'</label><br /><input type="text" name="group-name" style="width:500px;" value="'.$group_name.'" '.$readonly_name_field.' /><br /><br />
+					<label>'.__('Name', 'wpshop') . '</label><br /><input type="text" name="group-name" style="width:500px;" value="' . $group_name . '" ' . $readonly_name_field . ' /><br /><br />
 
-					<label>'.__('Parent','wpshop').'</label><br />
+					<label>'.__('Parent', 'wpshop') . '</label><br />
 					<select name="group-parent" class="chosen_select" style="width:500px;">
-						'.$select_parent.'
+						'.$select_parent . '
 					</select><br /><br />
 
-					<label>'.__('Users','wpshop').'</label><br />
+					<label>'.__('Users', 'wpshop') . '</label><br />
 					<select name="group-users[]" class="chosen_select" multiple style="width:500px;">
-						'.$select_users.'
+						'.$select_users . '
 					</select><br /><br />
 
-					<label>'.__('Description','wpshop').'</label><br /><textarea name="group-description" style="width:500px;">'.$group_description.'</textarea><br /><br />
+					<label>'.__('Description', 'wpshop') . '</label><br /><textarea name="group-description" style="width:500px;">' . $group_description . '</textarea><br /><br />
 
-					<input type="submit" class="button-primary" name="'.$submit_button_name.'" value="'.$submit_button_value.'" /> &nbsp;&nbsp;&nbsp; <a href="admin.php?page='.WPSHOP_NEWTYPE_IDENTIFIER_GROUP.'">'.__('Cancel','wpshop').'</a>
+					<input type="submit" class="button-primary" name="'.$submit_button_name . '" value="' . $submit_button_value . '" /> &nbsp;&nbsp;&nbsp; <a href="admin.php?page=' . WPSHOP_NEWTYPE_IDENTIFIER_GROUP . '">' . __('Cancel', 'wpshop') . '</a>
 				</form>
 			';
 
@@ -356,32 +356,32 @@ 
 
 			$wpshop_list_table = new wpshop_groups_custom_List_table();
 			//Fetch, prepare, sort, and filter our data...
-			$status="'valid'";
-			$attribute_status = !empty( $_REQUEST['attribute_status'] ) ? sanitize_text_field( $_REQUEST['attribute_status'] ) : '';
-			$orderby = !empty( $_REQUEST['orderby'] ) ? sanitize_text_field( $_REQUEST['orderby'] ) : '';
-			$order = !empty( $_REQUEST['order'] ) ? sanitize_text_field( $_REQUEST['order'] ) : '';
-			if(!empty($attribute_status)){
-				switch($attribute_status){
+			$status = "'valid'";
+			$attribute_status = !empty($_REQUEST['attribute_status']) ? sanitize_text_field($_REQUEST['attribute_status']) : '';
+			$orderby = !empty($_REQUEST['orderby']) ? sanitize_text_field($_REQUEST['orderby']) : '';
+			$order = !empty($_REQUEST['order']) ? sanitize_text_field($_REQUEST['order']) : '';
+			if (!empty($attribute_status)) {
+				switch ($attribute_status) {
 					case 'unactive':
-						$status="'moderated', 'notused'";
-						if(empty($orderby) && empty($order)){
-							$orderby ='status';
-							$order ='asc';
+						$status = "'moderated', 'notused'";
+						if (empty($orderby) && empty($order)) {
+							$orderby = 'status';
+							$order = 'asc';
 						}
 						break;
 					default:
-						$status="'".$attribute_status."'";
+						$status = "'" . $attribute_status . "'";
 						break;
 				}
 			}
 
 			$roles = get_option('wp_user_roles', array());
 
-			$i=0;
-			$attribute_set_list=array();
-			$group_not_to_display = array('administrator','editor','author','contributor','subscriber');
+			$i = 0;
+			$attribute_set_list = array();
+			$group_not_to_display = array('administrator', 'editor', 'author', 'contributor', 'subscriber');
 			$wpshop_groups_meta = get_option('wpshop_groups_meta', array());
-			foreach($roles as $code => $role) {
+			foreach ($roles as $code => $role) {
 				if (!in_array($code, $group_not_to_display)) {
 					$description = !empty($wpshop_groups_meta[$code]['description']) ? $wpshop_groups_meta[$code]['description'] : '--';
 					$attribute_set_list[$i]['name'] = $role['name'];

includes/config.php

Spacing +42 added lines, -42 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Plugin configuration file.
 *
@@ -10,8 +10,8 @@ 
 */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /*	Declare wordpress database class reference var	*/
@@ -91,7 +91,7 @@ 
 	DEFINE('WPSHOP_PRODUCT_VIEW_NB', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_view_nb');
 	DEFINE('WPSHOP_PRODUCT_FRONT_DISPLAY_CONF', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attributes_frontend_display');
 
-	DEFINE('WPSHOP_DEFAULT_CUSTOM_TYPES', serialize( array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) ));
+	DEFINE('WPSHOP_DEFAULT_CUSTOM_TYPES', serialize(array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS)));
 
 
 	DEFINE('WPSHOP_IDENTIFIER_CUSTOMER', 'U');
@@ -104,7 +104,7 @@ 
 	DEFINE('WPSHOP_COUNTRY_LIST', serialize($wpshop_tab_countries));
 
 
-	DEFINE('WPSHOP_COMMON_ATTRIBUTES_PARENT_VARIATION_PRODUCT', serialize(array('tx_tva')) );
+	DEFINE('WPSHOP_COMMON_ATTRIBUTES_PARENT_VARIATION_PRODUCT', serialize(array('tx_tva')));
 
 /*	Define database table names	*/
 	DEFINE('WPSHOP_DBT_ENTITIES', $wpdb->prefix . 'wpshop__entity');
@@ -163,17 +163,17 @@ 
 	DEFINE('WPSHOP_DISPLAY_LIST_TYPE', $wpshop_display_option['wpshop_display_list_type']);
 
 	/*	ADMIN DISPLAY	*/
-	$attribute_page_layout_types=array('tab' => __('Tabs', 'wpshop'), 'separated_bloc' => __('Separated bloc', 'wpshop'));
+	$attribute_page_layout_types = array('tab' => __('Tabs', 'wpshop'), 'separated_bloc' => __('Separated bloc', 'wpshop'));
 	$wpshop_admin_display_option = get_option('wpshop_admin_display_option', array());
-	DEFINE('WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_set_layout'])?$wpshop_admin_display_option['wpshop_admin_attr_set_layout']:'separated_bloc'));
-	DEFINE('WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_layout'])?$wpshop_admin_display_option['wpshop_admin_attr_layout']:'tab'));
-	$product_page_layout_types=array('movable-tab' => __('Separated box in product page', 'wpshop'), 'fixed-tab' => __('A tab in product data box "Product data"', 'wpshop'), 'each-box' => __('In each attribute group section "Product data"', 'wpshop'));
-	DEFINE('WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE', (!empty($wpshop_admin_display_option['wpshop_admin_product_shortcode_display'])?$wpshop_admin_display_option['wpshop_admin_product_shortcode_display']:'each-box'));
+	DEFINE('WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_set_layout']) ? $wpshop_admin_display_option['wpshop_admin_attr_set_layout'] : 'separated_bloc'));
+	DEFINE('WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_layout']) ? $wpshop_admin_display_option['wpshop_admin_attr_layout'] : 'tab'));
+	$product_page_layout_types = array('movable-tab' => __('Separated box in product page', 'wpshop'), 'fixed-tab' => __('A tab in product data box "Product data"', 'wpshop'), 'each-box' => __('In each attribute group section "Product data"', 'wpshop'));
+	DEFINE('WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE', (!empty($wpshop_admin_display_option['wpshop_admin_product_shortcode_display']) ? $wpshop_admin_display_option['wpshop_admin_product_shortcode_display'] : 'each-box'));
 
 
 /*	Define the default email messages	*/
-	DEFINE('WPSHOP_SIGNUP_MESSAGE_OBJECT', __('Account creation confirmation','wpshop'));
-	DEFINE('WPSHOP_SIGNUP_MESSAGE', __('Hello [customer_first_name] [customer_last_name], this email confirms that your account has just been created. Thank you for your loyalty. Have a good day.','wpshop'));
+	DEFINE('WPSHOP_SIGNUP_MESSAGE_OBJECT', __('Account creation confirmation', 'wpshop'));
+	DEFINE('WPSHOP_SIGNUP_MESSAGE', __('Hello [customer_first_name] [customer_last_name], this email confirms that your account has just been created. Thank you for your loyalty. Have a good day.', 'wpshop'));
 
 	DEFINE('WPSHOP_ORDER_CONFIRMATION_MESSAGE_OBJECT', __('Your order has been recorded', 'wpshop'));
 	DEFINE('WPSHOP_ORDER_CONFIRMATION_MESSAGE', __('Hello [customer_first_name] [customer_last_name], this email confirms that your order has been recorded (order date : [order_date]). Thank you for your loyalty. Have a good day.', 'wpshop'));
@@ -208,14 +208,14 @@ 
 	DEFINE('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE_OBJECT', __('Your downloadable product is available', 'wpshop'));
 	DEFINE('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE', __('Hello [customer_first_name] [customer_last_name], <br />this email confirms that your downloadable product is available : [download_product_link].<br /><br /> Thank you for your loyalty. Have a good day.', 'wpshop'));
 
-	DEFINE('WPSHOP_ORDER_IS_CANCELED_OBJECT', __('Your order has been canceled', 'wpshop') );
+	DEFINE('WPSHOP_ORDER_IS_CANCELED_OBJECT', __('Your order has been canceled', 'wpshop'));
 	DEFINE('WPSHOP_ORDER_IS_CANCELED', __('Hello [customer_first_name] [customer_last_name], <br />this email confirms your order ( Order key : [order_key] - Date : [order_date] ) has been canceled.<br /><br /> Thank you for your loyalty. Have a good day.', 'wpshop'));
 
-	DEFINE('WPSHOP_FORGOT_PASSWORD_MESSAGE_OBJECT', __('Renewal of password', 'wpshop') );
-	DEFINE('WPSHOP_FORGOT_PASSWORD_MESSAGE', __('Hello [customer_first_name] [customer_last_name], <br />Somebody has asked a renewal of password for your account.<br/><br/>To renew your password, click on this link : [forgot_password_link].<br/>If you are not at the origin of this request, please ignore this message.', 'wpshop') );
+	DEFINE('WPSHOP_FORGOT_PASSWORD_MESSAGE_OBJECT', __('Renewal of password', 'wpshop'));
+	DEFINE('WPSHOP_FORGOT_PASSWORD_MESSAGE', __('Hello [customer_first_name] [customer_last_name], <br />Somebody has asked a renewal of password for your account.<br/><br/>To renew your password, click on this link : [forgot_password_link].<br/>If you are not at the origin of this request, please ignore this message.', 'wpshop'));
 
-	DEFINE('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE_OBJECT', __('Pay and finalize your order', 'wpshop') );
-	DEFINE('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE', __('Hello [customer_first_name] [customer_last_name], <br />An order is available for you on our website.<br/>You can click on this link to pay and finalize this order : [direct_payment_link]<br/><br/>[order_content]<br /><br />Thank you for your loyalty. Have a good day.', 'wpshop') );
+	DEFINE('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE_OBJECT', __('Pay and finalize your order', 'wpshop'));
+	DEFINE('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE', __('Hello [customer_first_name] [customer_last_name], <br />An order is available for you on our website.<br/>You can click on this link to pay and finalize this order : [direct_payment_link]<br/><br/>[order_content]<br /><br />Thank you for your loyalty. Have a good day.', 'wpshop'));
 
 
 /*	Define debug vars	*/
@@ -225,39 +225,39 @@ 
 
 	/*	ALLOWED IPS	*/
 	$default_ip = array('127.0.0.1', '0.0.0.0');
-	DEFINE('WPSHOP_DEBUG_MODE_ALLOWED_IP', (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP'])?serialize(array_merge($default_ip, array($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']))):serialize($default_ip)));
+	DEFINE('WPSHOP_DEBUG_MODE_ALLOWED_IP', (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']) ? serialize(array_merge($default_ip, array($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']))) : serialize($default_ip)));
 	/*	DEBUG MODE	*/
 	$debug_mode = false;
-	if ( !empty($extra_options['WPSHOP_DEBUG_MODE']) && ($extra_options['WPSHOP_DEBUG_MODE'] == 'true') || (!empty($_GET['distant_debug_mode']) && sanitize_key($_GET['distant_debug_mode']) == 'eoxia') )
+	if (!empty($extra_options['WPSHOP_DEBUG_MODE']) && ($extra_options['WPSHOP_DEBUG_MODE'] == 'true') || (!empty($_GET['distant_debug_mode']) && sanitize_key($_GET['distant_debug_mode']) == 'eoxia'))
 		$debug_mode = true;
 	DEFINE('WPSHOP_DEBUG_MODE', $debug_mode);
 	/*	DATA DELETE	*/
 	$delete_data = false;
-	if ( !empty($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION']) && ($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION']) && ($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] == 'true'))
 		$delete_data = true;
 	DEFINE('WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION', $delete_data);
 
 	/*	TOOLS MENU	*/
 	$tools_menu_display = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_TOOLS_MENU']) && ($extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DISPLAY_TOOLS_MENU']) && ($extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] == 'true'))
 		$tools_menu_display = true;
 	DEFINE('WPSHOP_DISPLAY_TOOLS_MENU', $tools_menu_display);
 
 	/*	ATT VALUE PER USER	*/
 	$attr_value_per_user = false;
-	if ( !empty($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER']) && ($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] == 'true') )
+	if (!empty($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER']) && ($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] == 'true'))
 		$attr_value_per_user = true;
 	DEFINE('WPSHOP_ATTRIBUTE_VALUE_PER_USER', $attr_value_per_user);
 
 	/*	DISPLAY AVAILABLE KEYS FOR TEMPLATE	*/
 	$display_available_keys_for_template = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE']) && ($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE']) && ($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] == 'true'))
 		$display_available_keys_for_template = true;
 	DEFINE('WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE', $display_available_keys_for_template);
 
 	/*	MULTIPLE VALUE PER USER	*/
 	$display_value_attribute_type_select = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT']) && ($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT']) && ($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] == 'true'))
 		$display_value_attribute_type_select = true;
 	DEFINE('WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT', $display_value_attribute_type_select);
 
@@ -285,7 +285,7 @@ 
 
 /*	Define the different vars used for price calculation	*/
 	$wpshop_shop_price_piloting = get_option('wpshop_shop_price_piloting');
-	DEFINE('WPSHOP_PRODUCT_PRICE_PILOT', ( !empty($wpshop_shop_price_piloting) ? $wpshop_shop_price_piloting : 'TTC'));
+	DEFINE('WPSHOP_PRODUCT_PRICE_PILOT', (!empty($wpshop_shop_price_piloting) ? $wpshop_shop_price_piloting : 'TTC'));
 
 	DEFINE('WPSHOP_COST_OF_POSTAGE', 'cost_of_postage');
 	DEFINE('WPSHOP_PRODUCT_PRICE_HT', 'price_ht');
@@ -306,7 +306,7 @@ 
 	DEFINE('WPSHOP_ATTRIBUTE_UNDELETABLE', serialize(array_merge(array(), unserialize(WPSHOP_ATTRIBUTE_PRICES))));
 
 /*	Define the attribute list to hide or variation creation	*/
-	DEFINE('WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE', serialize( array_merge(unserialize(WPSHOP_ATTRIBUTE_PRICES), array('product_attribute_set_id', 'product_reference')) ) );
+	DEFINE('WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE', serialize(array_merge(unserialize(WPSHOP_ATTRIBUTE_PRICES), array('product_attribute_set_id', 'product_reference'))));
 
 /*	Define the default currency	*/
 	DEFINE('WPSHOP_SHOP_DEFAULT_CURRENCY', 'EUR');
@@ -317,7 +317,7 @@ 
 
 /*	Define the shipping default rules	*/
 	DEFINE('WPSHOP_SHOP_SHIPPING_RULES', serialize(array(
-		'min_max' => array('min'=>0,'max'=>30),
+		'min_max' => array('min'=>0, 'max'=>30),
 		'free_from' => 4500
 	)));
 	$shipping_fees_array = array(
@@ -339,20 +339,20 @@ 
 
 /*	Define addons modules */
 	DEFINE('WPSHOP_ADDONS_KEY_IS', '48');
-	DEFINE('WPSHOP_ADDONS_STATES_CLASS', serialize( array(true => 'wpshop_addons_state wpshop_addons_state_activated', false => 'wpshop_addons_state wpshop_addons_state_deactivated')));
-	DEFINE('WPSHOP_ADDONS_LIST', serialize(array('WPSHOP_ADDONS_QUOTATION' => array(__('Quotation','wpshop'), '48', 'per_site', 'quotation_allowed', 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE'), 'WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC' => array(__('Payment gateway CIC','wpshop'), '32', 'per_site', '')/* , 'WPSHOP_ADDONS_PRICE_PER_GROUP' => array(__('Price per user group','wpshop'), '13', 'free') */)));
-	DEFINE('WPSHOP_ADDONS_QUOTATION', (!empty($wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate'])?$wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate']:false));
-	DEFINE('WPSHOP_ADDONS_PRICE_PER_GROUP', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate'])?$wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate']:false));
-	DEFINE('WPSHOP_PAYMENT_METHOD_CIC', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate'])?$wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate']:false));
+	DEFINE('WPSHOP_ADDONS_STATES_CLASS', serialize(array(true => 'wpshop_addons_state wpshop_addons_state_activated', false => 'wpshop_addons_state wpshop_addons_state_deactivated')));
+	DEFINE('WPSHOP_ADDONS_LIST', serialize(array('WPSHOP_ADDONS_QUOTATION' => array(__('Quotation', 'wpshop'), '48', 'per_site', 'quotation_allowed', 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE'), 'WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC' => array(__('Payment gateway CIC', 'wpshop'), '32', 'per_site', '')/* , 'WPSHOP_ADDONS_PRICE_PER_GROUP' => array(__('Price per user group','wpshop'), '13', 'free') */)));
+	DEFINE('WPSHOP_ADDONS_QUOTATION', (!empty($wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate'] : false));
+	DEFINE('WPSHOP_ADDONS_PRICE_PER_GROUP', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate'] : false));
+	DEFINE('WPSHOP_PAYMENT_METHOD_CIC', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate'] : false));
 	DEFINE('WPSHOP_ADDONS_QUOTATION_CODE', 'nfdJK-AsBCO-%AZDZA');
 	DEFINE('WPSHOP_ADDONS_PRICE_PER_GROUP_CODE', '7GnnQ-5FeqZ-BiKz3');
 	DEFINE('WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC', 'nZYsM-vQ8qC-VfVfA');
 
 /*	Define payment method params	*/
 	$wpshop_paymentMethod = get_option('wps_payment_mode');
-	if(WPSHOP_PAYMENT_METHOD_CIC || !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) ) {
+	if (WPSHOP_PAYMENT_METHOD_CIC || !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic'])) {
 		$cmcic_params = get_option('wpshop_cmcic_params', array());
-		if(!empty($cmcic_params)){
+		if (!empty($cmcic_params)) {
 			DEFINE("CMCIC_CLE", $cmcic_params['cle']);
 			DEFINE("CMCIC_TPE", $cmcic_params['tpe']);
 			DEFINE("CMCIC_VERSION", $cmcic_params['version']);
@@ -364,7 +364,7 @@ 
 	}
 
 /** Civility	*/
-$civility = array(1=>__('Mr.','wpshop'),__('Mrs.','wpshop'),__('Miss','wpshop'));
+$civility = array(1=>__('Mr.', 'wpshop'), __('Mrs.', 'wpshop'), __('Miss', 'wpshop'));
 /** Status	*/
 $order_status = array(
 	'' 					=> __('Awaiting treatment', 'wpshop'),
@@ -392,14 +392,14 @@ 
 	'show_ui' 				=> 'boolean',
 	'show_in_nav_menus' 	=> 'boolean',
 	'show_in_menu' 			=> 'boolean|text',
-	'capabilities'			=> array( 'publish_posts', 'edit_posts', 'edit_others_posts', 'delete_posts', 'delete_others_posts', 'read_private_posts', 'edit_post', 'delete_post', 'read_post' ),
+	'capabilities'			=> array('publish_posts', 'edit_posts', 'edit_others_posts', 'delete_posts', 'delete_others_posts', 'read_private_posts', 'edit_post', 'delete_post', 'read_post'),
 	'hierarchical' 			=> false,
 	'rewrite' 				=> false,
 	'query_var'				=> true,
 	'supports' 				=> unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT)
 );
 DEFINE('WPSHOP_REGISTER_POST_TYPE_ARGS', serialize($register_post_type_args));
-DEFINE('WPSHOP_REGISTER_POST_TYPE_MANDATORY_SUPPORTS', serialize( array('title', 'editor', 'thumbnail', 'excerpt') ));
+DEFINE('WPSHOP_REGISTER_POST_TYPE_MANDATORY_SUPPORTS', serialize(array('title', 'editor', 'thumbnail', 'excerpt')));
 DEFINE('WPSHOP_PRODUCT_HIDDEN_METABOX', serialize(array('formatdiv', 'pageparentdiv', 'postexcerpt', 'trackbacksdiv', 'postcustom', 'commentstatusdiv', 'commentsdiv', 'slugdiv', 'authordiv', 'revisionsdiv')));
 
 /* Shop type	*/
@@ -410,8 +410,8 @@ 
 DEFINE('WPSHOP_ATTR_SELECT_TYPE_TOGGLED', serialize(array('custom' => 'internal_data', 'internal' => 'custom_data')));
 
 /*	Define the types existing into the current wordpress installation	*/
-$default_to_exclude = array('attachment','revision','nav_menu_item', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE);
-DEFINE('WPSHOP_INTERNAL_TYPES_TO_EXCLUDE', (!empty($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE'])?serialize(array_merge(array($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE']),$default_to_exclude)):serialize($default_to_exclude)));
+$default_to_exclude = array('attachment', 'revision', 'nav_menu_item', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE);
+DEFINE('WPSHOP_INTERNAL_TYPES_TO_EXCLUDE', (!empty($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE']) ? serialize(array_merge(array($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE']), $default_to_exclude)) : serialize($default_to_exclude)));
 
 /*	Start form field display config	*/
 /*	Get the list of possible posts status	*/
@@ -421,9 +421,9 @@ 
 	$comboxOptionToHide = array('deleted');
 
 /*	Attributes form	*/
-	$attribute_displayed_field = array('id', 'status', 'entity_id', 'is_required', 'is_unique', 'is_visible_in_front', 'is_visible_in_front_listing', 'frontend_input', 'backend_input', 'frontend_label', 'default_value', 'is_requiring_unit', '_unit_group_id', '_default_unit', 'is_historisable','is_intrinsic', 'is_filterable', 'code', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_used_in_admin_listing_column', 'is_used_in_quick_add_form', 'frontend_verification', 'is_user_defined', 'is_used_in_variation', 'is_used_for_variation', '_need_verification', '_display_informations_about_value', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'is_searchable');
-	$attribute_options_group = array(__('Attribute unit', 'wpshop') => array('is_requiring_unit','_unit_group_id','_default_unit'), __('Frontend option', 'wpshop') => array('is_visible_in_front','is_visible_in_front_listing','is_used_for_sort_by','is_visible_in_advanced_search', 'is_searchable', '_display_informations_about_value'), __('Variations', 'wpshop') => array('is_user_defined', 'is_used_in_variation', 'is_used_for_variation', 'frontend_input'));
-	DEFINE('WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS', serialize( array('_need_verification', 'frontend_verification', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'frontend_help_message') ));
+	$attribute_displayed_field = array('id', 'status', 'entity_id', 'is_required', 'is_unique', 'is_visible_in_front', 'is_visible_in_front_listing', 'frontend_input', 'backend_input', 'frontend_label', 'default_value', 'is_requiring_unit', '_unit_group_id', '_default_unit', 'is_historisable', 'is_intrinsic', 'is_filterable', 'code', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_used_in_admin_listing_column', 'is_used_in_quick_add_form', 'frontend_verification', 'is_user_defined', 'is_used_in_variation', 'is_used_for_variation', '_need_verification', '_display_informations_about_value', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'is_searchable');
+	$attribute_options_group = array(__('Attribute unit', 'wpshop') => array('is_requiring_unit', '_unit_group_id', '_default_unit'), __('Frontend option', 'wpshop') => array('is_visible_in_front', 'is_visible_in_front_listing', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_searchable', '_display_informations_about_value'), __('Variations', 'wpshop') => array('is_user_defined', 'is_used_in_variation', 'is_used_for_variation', 'frontend_input'));
+	DEFINE('WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS', serialize(array('_need_verification', 'frontend_verification', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'frontend_help_message')));
 
 /*	General form	*/
 	$attribute_hidden_field = array('position');

Braces +21 added lines, -13 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * Plugin configuration file.
 *
@@ -228,37 +230,43 @@ 
 	DEFINE('WPSHOP_DEBUG_MODE_ALLOWED_IP', (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP'])?serialize(array_merge($default_ip, array($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']))):serialize($default_ip)));
 	/*	DEBUG MODE	*/
 	$debug_mode = false;
-	if ( !empty($extra_options['WPSHOP_DEBUG_MODE']) && ($extra_options['WPSHOP_DEBUG_MODE'] == 'true') || (!empty($_GET['distant_debug_mode']) && sanitize_key($_GET['distant_debug_mode']) == 'eoxia') )
-		$debug_mode = true;
+	if ( !empty($extra_options['WPSHOP_DEBUG_MODE']) && ($extra_options['WPSHOP_DEBUG_MODE'] == 'true') || (!empty($_GET['distant_debug_mode']) && sanitize_key($_GET['distant_debug_mode']) == 'eoxia') ) {
+			$debug_mode = true;
+	}
 	DEFINE('WPSHOP_DEBUG_MODE', $debug_mode);
 	/*	DATA DELETE	*/
 	$delete_data = false;
-	if ( !empty($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION']) && ($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] == 'true') )
-		$delete_data = true;
+	if ( !empty($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION']) && ($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] == 'true') ) {
+			$delete_data = true;
+	}
 	DEFINE('WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION', $delete_data);
 
 	/*	TOOLS MENU	*/
 	$tools_menu_display = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_TOOLS_MENU']) && ($extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] == 'true') )
-		$tools_menu_display = true;
+	if ( !empty($extra_options['WPSHOP_DISPLAY_TOOLS_MENU']) && ($extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] == 'true') ) {
+			$tools_menu_display = true;
+	}
 	DEFINE('WPSHOP_DISPLAY_TOOLS_MENU', $tools_menu_display);
 
 	/*	ATT VALUE PER USER	*/
 	$attr_value_per_user = false;
-	if ( !empty($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER']) && ($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] == 'true') )
-		$attr_value_per_user = true;
+	if ( !empty($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER']) && ($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] == 'true') ) {
+			$attr_value_per_user = true;
+	}
 	DEFINE('WPSHOP_ATTRIBUTE_VALUE_PER_USER', $attr_value_per_user);
 
 	/*	DISPLAY AVAILABLE KEYS FOR TEMPLATE	*/
 	$display_available_keys_for_template = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE']) && ($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] == 'true') )
-		$display_available_keys_for_template = true;
+	if ( !empty($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE']) && ($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] == 'true') ) {
+			$display_available_keys_for_template = true;
+	}
 	DEFINE('WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE', $display_available_keys_for_template);
 
 	/*	MULTIPLE VALUE PER USER	*/
 	$display_value_attribute_type_select = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT']) && ($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] == 'true') )
-		$display_value_attribute_type_select = true;
+	if ( !empty($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT']) && ($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] == 'true') ) {
+			$display_value_attribute_type_select = true;
+	}
 	DEFINE('WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT', $display_value_attribute_type_select);
 
 /*	Define element prefix	*/

includes/modules/wps-pos-addon/controller/wps-pos-addon.ctr.php

Spacing +126 added lines, -126 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Fichier du controlleur principal de l'extension de caisse pour WP-Shop / Main controller file for point of sale management plugin
@@ -20,37 +20,37 @@ 
 	 */
 	function __construct() {
 		/**	Declaration des sessions / Call session utilities on init	*/
-		add_action( 'init', array( $this, 'wps_pos_addon_session' ) );
-		add_action( 'init', array( $this, 'wps_pos_option_db' ) );
+		add_action('init', array($this, 'wps_pos_addon_session'));
+		add_action('init', array($this, 'wps_pos_option_db'));
 
-		$tab = ( !empty( $_GET['tab'] ) ) ? sanitize_text_field( $_GET['tab'] ) : '';
+		$tab = (!empty($_GET['tab'])) ? sanitize_text_field($_GET['tab']) : '';
 
-		if( !empty( $tab ) || $tab == 'dashboard' ) {
+		if (!empty($tab) || $tab == 'dashboard') {
 			/**	Instanciation des différents composants du logiciel de caisse / Instanciate the different component for POS addon	*/
 			$this->wps_pos_customer = new wps_pos_addon_customer();
 			$this->wps_pos_product = new wps_pos_addon_product();
 			$this->wps_pos_order = new wps_pos_addon_order();
-		} elseif( $tab == 'bank_deposit' ) {
+		} elseif ($tab == 'bank_deposit') {
 			$this->wps_pos_addon_bank_deposit = new wps_pos_addon_bank_deposit();
 			$this->wps_pos_addon_bank_deposit_histo = new wps_pos_addon_bank_deposit_histo();
 
 			/** AJAX Bank Deposit **/
-			add_action( 'wp_ajax_save_historic_query', array( $this->wps_pos_addon_bank_deposit_histo, 'save_historic_ajax' ) );
+			add_action('wp_ajax_save_historic_query', array($this->wps_pos_addon_bank_deposit_histo, 'save_historic_ajax'));
 		}
 
 		/**	Appel des scripts et styles pour le logiciel de caisse / Include styles and scripts for backend	*/
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_assets' ) );
-		add_action( 'admin_print_scripts', array( &$this, 'print_js') );
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_assets'));
+		add_action('admin_print_scripts', array(&$this, 'print_js'));
 
 		/**	Appel du point d'accroche de création de menu dans l'administration et redéfinition de l'ordre des menus / Define the administration menu with some arrangements for displaying the created menu under wpshop menu	*/
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-		add_action( 'menu_order', array( $this, 'admin_menu_order' ), 11 );
-		add_action( 'custom_menu_order', array( $this, 'admin_custom_menu_order' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
+		add_action('menu_order', array($this, 'admin_menu_order'), 11);
+		add_action('custom_menu_order', array($this, 'admin_custom_menu_order'));
 
 		/**	AJAX Definition	*/
 		/**	Recharge la liste d'un élément donné ( client ou produit ) pour une lettre donnée / Load element list corresponding to a given letter	*/
-		add_action( 'wp_ajax_wpspos_load_element_from_letter', array( $this, 'ajax_load_element_from_letter' ) );
-		add_action( 'wp_ajax_wpspos_save_config_barcode_only', array( $this, 'ajax_save_config_barcode_only' ) );
+		add_action('wp_ajax_wpspos_load_element_from_letter', array($this, 'ajax_load_element_from_letter'));
+		add_action('wp_ajax_wpspos_save_config_barcode_only', array($this, 'ajax_save_config_barcode_only'));
 		// add_action( 'wap_ajax_wpspos_state_is_quotation', array( $this, 'ajax_wpspos_state_is_quotation' ) );
 		// add_action( 'wap_ajax_wpspos_state_is_receipt', array( $this, 'ajax_wpspos_state_is_receipt' ) );
 
@@ -66,17 +66,17 @@ 
 	function admin_assets() {
 		global $wps_pos_addon_menu;
 		$screen = get_current_screen();
-		if ( $screen->id == $wps_pos_addon_menu ) {
-			wp_register_style( 'wpspos-common-styles', WPSPOS_URL . 'assets/css/backend.css', '', WPSPOS_VERSION );
-			wp_enqueue_style( 'wpspos-common-styles' );
+		if ($screen->id == $wps_pos_addon_menu) {
+			wp_register_style('wpspos-common-styles', WPSPOS_URL . 'assets/css/backend.css', '', WPSPOS_VERSION);
+			wp_enqueue_style('wpspos-common-styles');
 
-			$tab = ( !empty( $_GET['tab'] ) ) ? sanitize_text_field( $_GET['tab'] ) : '';
+			$tab = (!empty($_GET['tab'])) ? sanitize_text_field($_GET['tab']) : '';
 
-			if( empty( $tab ) || $tab == 'bank_deposit' ) {
-				wp_enqueue_script('wpspos-backend-bank-deposit-js',  WPSPOS_URL . 'assets/js/backend_bank_deposit.js', '', WPSPOS_VERSION);
+			if (empty($tab) || $tab == 'bank_deposit') {
+				wp_enqueue_script('wpspos-backend-bank-deposit-js', WPSPOS_URL . 'assets/js/backend_bank_deposit.js', '', WPSPOS_VERSION);
 			} else {
-				wp_enqueue_script('wpspos-backend-js',  WPSPOS_URL . 'assets/js/backend.js', '', WPSPOS_VERSION);
-				wp_enqueue_script('wpshop_jquery_chosen',  WPSHOP_JS_URL . 'jquery-libs/chosen.jquery.min.js', '', WPSHOP_VERSION);
+				wp_enqueue_script('wpspos-backend-js', WPSPOS_URL . 'assets/js/backend.js', '', WPSPOS_VERSION);
+				wp_enqueue_script('wpshop_jquery_chosen', WPSHOP_JS_URL . 'jquery-libs/chosen.jquery.min.js', '', WPSHOP_VERSION);
 			}
 		}
 	}
@@ -88,8 +88,8 @@ 
 		global $wps_pos_addon_menu;
 		$screen = get_current_screen();
 
-		if ( $screen->id == $wps_pos_addon_menu ) {
-			require_once( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_PATH . 'assets/', 'js', 'header.js' ) );
+		if ($screen->id == $wps_pos_addon_menu) {
+			require_once(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_PATH . 'assets/', 'js', 'header.js'));
 		}
 	}
 
@@ -99,7 +99,7 @@ 
 	function admin_menu() {
 		global $wps_pos_addon_menu;
 
-		$wps_pos_addon_menu = add_menu_page( __( 'WP-Shop point of sale interface', 'wps-pos-i18n' ), __( 'WP-Shop POS', 'wps-pos-i18n' ), 'manage_options', 'wps-pos', array( $this, 'display_pos' ), 'dashicons-store' );
+		$wps_pos_addon_menu = add_menu_page(__('WP-Shop point of sale interface', 'wps-pos-i18n'), __('WP-Shop POS', 'wps-pos-i18n'), 'manage_options', 'wps-pos', array($this, 'display_pos'), 'dashicons-store');
 	}
 
 	/**
@@ -109,19 +109,19 @@ 
 	 *
 	 * @return array The new admin menu order with the POS addon placed
 	 */
-	function admin_menu_order( $current_menu_order ) {
+	function admin_menu_order($current_menu_order) {
 		/**	Create a new menu order	*/
 		$wps_pos_menu_ordered = array();
 
 		/**	Read the current existing menu order for rearrange it	*/
-		foreach ( $current_menu_order as $menu_item ) {
-			if ( 'edit.php?post_type=wpshop_shop_order' == $menu_item ) {
+		foreach ($current_menu_order as $menu_item) {
+			if ('edit.php?post_type=wpshop_shop_order' == $menu_item) {
 				$wps_pos_menu_ordered[] = 'wps-pos';
 				$wps_pos_menu_ordered[] = 'edit.php?post_type=wpshop_shop_order';
 
-				unset( $current_menu_order[ array_search( 'wps-pos', $current_menu_order ) ] );
+				unset($current_menu_order[array_search('wps-pos', $current_menu_order)]);
 			}
-			else if ( 'wps-pos' != $menu_item ) {
+			else if ('wps-pos' != $menu_item) {
 				$wps_pos_menu_ordered[] = $menu_item;
 			}
 		}
@@ -135,7 +135,7 @@ 
 	 * @return boolean A boolean var defining if we apply admin menu reorder for current user
 	 */
 	function admin_custom_menu_order() {
-		return current_user_can( 'manage_options' );
+		return current_user_can('manage_options');
 	}
 
 	/**
@@ -144,20 +144,20 @@ 
 	function wps_pos_addon_session() {
 		@session_start();
 
-		$new_order = ( !empty( $_GET['new_order'] ) ) ? sanitize_text_field( $_GET['new_order'] ) : '';
-		$page = ( !empty( $_GET['page'] ) ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$new_order = (!empty($_GET['new_order'])) ? sanitize_text_field($_GET['new_order']) : '';
+		$page = (!empty($_GET['page'])) ? sanitize_text_field($_GET['page']) : '';
 
-		if ( 'yes' == $new_order ) {
-			unset( $_SESSION[ 'cart' ] );
-			unset( $_SESSION[ 'wps-pos-addon' ] );
-			delete_user_meta( get_current_user_id(), '_wpshop_persistent_cart' );
+		if ('yes' == $new_order) {
+			unset($_SESSION['cart']);
+			unset($_SESSION['wps-pos-addon']);
+			delete_user_meta(get_current_user_id(), '_wpshop_persistent_cart');
 			session_destroy();
 
-			wp_safe_redirect( admin_url( 'admin.php?page=wps-pos' ) );
+			wp_safe_redirect(admin_url('admin.php?page=wps-pos'));
 		}
 
-		if( empty( $page ) || ( 'wps-pos' != $page ) ) {
-			unset( $_SESSION[ 'wps-pos-addon' ] );
+		if (empty($page) || ('wps-pos' != $page)) {
+			unset($_SESSION['wps-pos-addon']);
 		}
 
 	}
@@ -167,12 +167,12 @@ 
 	 */
 	function wps_pos_option_db() {
 		$option = 'wps_pos_options';
-		$options = get_option( $option, false );
-		if( $options === false ) {
+		$options = get_option($option, false);
+		if ($options === false) {
 			$values = array(
 				'only_barcode' => 'checked',
 				);
-			add_option( $option, $values );
+			add_option($option, $values);
 		} else {
 			/**
 			 * If want to treat options case by case */
@@ -191,45 +191,45 @@ 
 		global $wpdb;
 
 		/** Activate Barcode attribute **/
-		if ( false ) {
-			$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array( 'status' => 'valid' ), array( 'code' => 'barcode' ) );
+		if (false) {
+			$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => 'barcode'));
 
 			/** Get the product entity id **/
-			$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_name = %s', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-			$product_entity_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_name = %s', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$product_entity_id = $wpdb->get_var($query);
 
 			/** Check the barcode attribute id **/
-			$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s', 'barcode');
-			$attribute_barcode_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', 'barcode');
+			$attribute_barcode_id = $wpdb->get_var($query);
 
-			$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $product_entity_id );
-			$products_groups = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $product_entity_id);
+			$products_groups = $wpdb->get_results($query);
 			/** For each attributes groups used for product configuration **/
-			foreach( $products_groups as $products_group ) {
-				$query = $wpdb->prepare( 'SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE attribute_set_id = %d AND code = %s', $products_group->id, 'general');
-				$attributes_set_sections = $wpdb->get_results( $query );
-				foreach( $attributes_set_sections as $attributes_set_section ) {
-					$query = $wpdb->prepare( 'SELECT MAX(position) AS max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $product_entity_id, $products_group->id, $attributes_set_section->id);
-					$max_position = $wpdb->get_var( $query );
-
-					$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d', $product_entity_id, $products_group->id, $attributes_set_section->id, $attribute_barcode_id);
-					$exist_barcode_details_definition = $wpdb->get_results( $query );
+			foreach ($products_groups as $products_group) {
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND code = %s', $products_group->id, 'general');
+				$attributes_set_sections = $wpdb->get_results($query);
+				foreach ($attributes_set_sections as $attributes_set_section) {
+					$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $product_entity_id, $products_group->id, $attributes_set_section->id);
+					$max_position = $wpdb->get_var($query);
+
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d', $product_entity_id, $products_group->id, $attributes_set_section->id, $attribute_barcode_id);
+					$exist_barcode_details_definition = $wpdb->get_results($query);
 					/** Insert the barcode attribute details **/
-					if ( !empty ($max_position) && empty($exist_barcode_details_definition) ) {
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $product_entity_id, 'attribute_set_id' => $products_group->id, 'attribute_group_id' => $attributes_set_section->id, 'attribute_id' => $attribute_barcode_id, 'position' => (int)$max_position +1) );
+					if (!empty ($max_position) && empty($exist_barcode_details_definition)) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $product_entity_id, 'attribute_set_id' => $products_group->id, 'attribute_group_id' => $attributes_set_section->id, 'attribute_id' => $attribute_barcode_id, 'position' => (int)$max_position + 1));
 					}
 				}
 			}
 		}
 
 		/** Activate Barcode for search **/
-		$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array('is_used_for_sort_by' => 'yes', 'is_used_in_quick_add_form' => 'yes'), array('code' => 'barcode') );
+		$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_for_sort_by' => 'yes', 'is_used_in_quick_add_form' => 'yes'), array('code' => 'barcode'));
 
 		/** Activate attribute for the product quick add form **/
-		$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
-		$code = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? 'price_ht' : 'product_price';
-		$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array( 'is_used_in_quick_add_form' => 'yes'), array('code' => $code)  );
-		$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array( 'is_used_in_quick_add_form' => 'yes'), array('code' => 'tx_tva' )  );
+		$price_piloting_option = get_option('wpshop_shop_price_piloting');
+		$code = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? 'price_ht' : 'product_price';
+		$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_quick_add_form' => 'yes'), array('code' => $code));
+		$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_quick_add_form' => 'yes'), array('code' => 'tx_tva'));
 
 		/** Check If Shop Customer attribute set exist - Deprecated **/
 		/* $customer_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS );
@@ -238,7 +238,7 @@ 
 
 		$exist_attribute_group = 'Nope';
 
-		if ( empty($exist_attribute_group) ) {
+		if (empty($exist_attribute_group)) {
 			/** Create a Attributes Group for POS Customer infos **/
 			$wpdb->insert(
 				WPSHOP_DBT_ATTRIBUTE_SET,
@@ -260,7 +260,7 @@ 
 					'creation_date' => current_time('mysql', 0),
 					'last_update_date' => current_time('mysql', 0),
 					'attribute_set_id' => $attribute_set_id,
-					'code' => sanitize_title( __('Shop Customer main infos', 'wps-pos-i18n') ),
+					'code' => sanitize_title(__('Shop Customer main infos', 'wps-pos-i18n')),
 					'name' => __('Shop Customer main infos', 'wps-pos-i18n')
 				)
 			);
@@ -272,17 +272,17 @@ 
 					'creation_date' => current_time('mysql', 0),
 					'last_update_date' => current_time('mysql', 0),
 					'attribute_set_id' => $attribute_set_id,
-					'code' => sanitize_title( __('Shop Customer address infos', 'wps-pos-i18n') ),
+					'code' => sanitize_title(__('Shop Customer address infos', 'wps-pos-i18n')),
 					'name' => __('Shop Customer address infos', 'wps-pos-i18n')
 				)
 			);
 			$address_set_id = $wpdb->insert_id;
 			/** Affect Attributes **/
-			$attributes = array( 'last_name' => $main_set_id, 'first_name' => $main_set_id, 'address_last_name' => $main_set_id, 'address_first_name' => $main_set_id, 'address_user_email' => $main_set_id, 'address' => $address_set_id, 'postcode' => $address_set_id, 'city' => $address_set_id, 'phone' => $address_set_id);
+			$attributes = array('last_name' => $main_set_id, 'first_name' => $main_set_id, 'address_last_name' => $main_set_id, 'address_first_name' => $main_set_id, 'address_user_email' => $main_set_id, 'address' => $address_set_id, 'postcode' => $address_set_id, 'city' => $address_set_id, 'phone' => $address_set_id);
 			$i = 1;
-			foreach( $attributes as $attribute => $group_id) {
-				$attribute_def = wpshop_attributes::getElement( $attribute, "'valid'", 'code');
-				if ( !empty($attribute_def) ) {
+			foreach ($attributes as $attribute => $group_id) {
+				$attribute_def = wpshop_attributes::getElement($attribute, "'valid'", 'code');
+				if (!empty($attribute_def)) {
 					$wpdb->insert(
 						WPSHOP_DBT_ATTRIBUTE_DETAILS,
 						array(
@@ -302,32 +302,32 @@ 
 		}
 
 		$user_name = 'default_customer';
-		$user_id = username_exists( $user_name );
-		if ( !$user_id ) {
-			$random_password = wp_generate_password( $length = 12, $include_standard_special_chars=false );
-			$user_id = wp_create_user( $user_name, $random_password, 'client_defaut@wpshop.fr' );
-
-			if ( !empty($user_id) ) {
-				update_user_meta($user_id, 'last_name', __('Default', 'wps-pos-i18n') );
-				update_user_meta($user_id, 'first_name', __('Customer', 'wps-pos-i18n') );
+		$user_id = username_exists($user_name);
+		if (!$user_id) {
+			$random_password = wp_generate_password($length = 12, $include_standard_special_chars = false);
+			$user_id = wp_create_user($user_name, $random_password, 'client_defaut@wpshop.fr');
+
+			if (!empty($user_id)) {
+				update_user_meta($user_id, 'last_name', __('Default', 'wps-pos-i18n'));
+				update_user_meta($user_id, 'first_name', __('Customer', 'wps-pos-i18n'));
 				/** Add the default customer id in Option table **/
 				update_option('wpshop_pos_addon_default_customer_id', $user_id);
 			}
 		}
 
 		/** Get post of user id */
-		$customers_associated_to_user = get_posts( array (
+		$customers_associated_to_user = get_posts(array(
 			'post_status' => 'draft',
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS,
 			'author' => $user_id,
-		) );
-		$customer_id = !empty( $customers_associated_to_user ) && !empty( $customers_associated_to_user[ 0 ] ) && !empty( $customers_associated_to_user[ 0 ]->ID ) ? $customers_associated_to_user[ 0 ]->ID : null;
+		));
+		$customer_id = !empty($customers_associated_to_user) && !empty($customers_associated_to_user[0]) && !empty($customers_associated_to_user[0]->ID) ? $customers_associated_to_user[0]->ID : null;
 
 		$customer_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-		if ( !empty( $customer_id ) ) {
+		if (!empty($customer_id)) {
 			/** Insert attribute data */
-			wpshop_attributes::saveAttributeForEntity( array(
+			wpshop_attributes::saveAttributeForEntity(array(
 				'varchar' => array(
 					'last_name' => __('Default', 'wps-pos-i18n'),
 					'first_name' => __('Customer', 'wps-pos-i18n'),
@@ -340,7 +340,7 @@ 
 					'city' => __('Default city'),
 					'phone' => '0000000042',
 				),
-			),  $customer_entity_id, $customer_id );
+			), $customer_entity_id, $customer_id);
 		}
 	}
 
@@ -352,14 +352,14 @@ 
 		$module_folder = WPSPOS_PATH . '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( $folder ) ) {
-					$child_folder_content = scandir( $module_folder . $folder );
-					if ( file_exists( $module_folder . $folder . '/' . $folder . '.php') ) {
-						$f =  $module_folder . $folder . '/' . $folder . '.php';
-						include( $f );
+		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($folder)) {
+					$child_folder_content = scandir($module_folder . $folder);
+					if (file_exists($module_folder . $folder . '/' . $folder . '.php')) {
+						$f = $module_folder . $folder . '/' . $folder . '.php';
+						include($f);
 					}
 				}
 			}
@@ -371,25 +371,25 @@ 
 	 */
 	function display_pos() {
 		/**	Define the current step for current order	*/
-		$default_customer_id = get_option( 'wpshop_pos_addon_default_customer_id' );
+		$default_customer_id = get_option('wpshop_pos_addon_default_customer_id');
 		$default_user_exists = false;
-		if ( !empty( $default_customer_id ) ) {
-			$default_user = get_user_by( 'id', $default_customer_id );
-			if ( false !== $default_user ) {
+		if (!empty($default_customer_id)) {
+			$default_user = get_user_by('id', $default_customer_id);
+			if (false !== $default_user) {
 				$default_user_exists = true;
 			}
 		}
 
-		if ( !empty( $default_user_exists ) ) {
+		if (!empty($default_user_exists)) {
 			$current_step = 2;
-			$_SESSION[ 'cart' ][ 'customer_id' ] = $default_customer_id;
+			$_SESSION['cart']['customer_id'] = $default_customer_id;
 		}
 		else {
 			$current_step = 0;
-			$_SESSION[ 'cart' ][ 'customer_id' ] = null;
+			$_SESSION['cart']['customer_id'] = null;
 		}
 
-		require_once( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend', 'pos' ) );
+		require_once(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend', 'pos'));
 	}
 
 	/**
@@ -397,9 +397,9 @@ 
 	 */
 	function ajax_load_element_from_letter() {
 
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_load_element_from_letter' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_load_element_from_letter'))
 			wp_die();
 
 		$response = array(
@@ -407,37 +407,37 @@ 
 			'output' => __('An error occured', 'wps-pos-i18n'),
 		);
 
-		$alphabet = unserialize( WPSPOS_ALPHABET_LETTERS );
-		$letter = !empty( $_POST['term'] ) && in_array( $_POST['term'], $alphabet )	? sanitize_text_field( $_POST['term'] ) : null;
-		$element_type = !empty( $_POST['element_type'] ) ? sanitize_text_field( $_POST['element_type'] ) : 'customer';
-		$response[ 'element_type' ] = $element_type;
+		$alphabet = unserialize(WPSPOS_ALPHABET_LETTERS);
+		$letter = !empty($_POST['term']) && in_array($_POST['term'], $alphabet) ? sanitize_text_field($_POST['term']) : null;
+		$element_type = !empty($_POST['element_type']) ? sanitize_text_field($_POST['element_type']) : 'customer';
+		$response['element_type'] = $element_type;
 
-		if ( !empty( $letter ) ) {
+		if (!empty($letter)) {
 			$error_message = '';
-			switch ( $element_type ) {
+			switch ($element_type) {
 				case 'customer':
-					$result = $this->wps_pos_customer->display_customer_list( $letter );
+					$result = $this->wps_pos_customer->display_customer_list($letter);
 					break;
 				case 'product':
 					$wps_pos_product = new wps_pos_addon_product();
-					$result = $this->wps_pos_product->get_product_table_by_alphabet( $letter );
+					$result = $this->wps_pos_product->get_product_table_by_alphabet($letter);
 					break;
 			}
 
-			if ( empty( $result ) ) {
-				$response[ 'output' ] = sprintf( __( 'Nothing found in %s for letter %s', 'wps-pos-i18n' ), __( $element_type, 'wps-pos-i18n' ), $letter);
+			if (empty($result)) {
+				$response['output'] = sprintf(__('Nothing found in %s for letter %s', 'wps-pos-i18n'), __($element_type, 'wps-pos-i18n'), $letter);
 			}
 			else {
-				$response[ 'status' ] = true;
-				$response[ 'output' ] = $result;
+				$response['status'] = true;
+				$response['output'] = $result;
 			}
 
 		}
 		else {
-			$response[ 'output' ] = sprintf( __( 'THe requested term (%s) to search is invalid. Please check your request and try again', 'wps-pos-i18n' ), $letter );
+			$response['output'] = sprintf(__('THe requested term (%s) to search is invalid. Please check your request and try again', 'wps-pos-i18n'), $letter);
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 	/**
@@ -445,16 +445,16 @@ 
 	 */
 	function ajax_save_config_barcode_only() {
 
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_config_barcode_only' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_save_config_barcode_only'))
 			wp_die();
 
 		$option = 'wps_pos_options';
-		$values = get_option( $option );
-		if ( !empty( $values['only_barcode'] ) ) {
-			$values['only_barcode'] = !empty( $_POST['value_checkbox'] ) ? sanitize_text_field( $_POST['value_checkbox' ] ) : '';
-	  	update_option( $option, $values );
+		$values = get_option($option);
+		if (!empty($values['only_barcode'])) {
+			$values['only_barcode'] = !empty($_POST['value_checkbox']) ? sanitize_text_field($_POST['value_checkbox']) : '';
+	  	update_option($option, $values);
 		}
 		wp_die();
 	}

Braces +13 added lines, -13 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Fichier du controlleur principal de l'extension de caisse pour WP-Shop / Main controller file for point of sale management plugin
@@ -120,8 +122,7 @@ 
 				$wps_pos_menu_ordered[] = 'edit.php?post_type=wpshop_shop_order';
 
 				unset( $current_menu_order[ array_search( 'wps-pos', $current_menu_order ) ] );
-			}
-			else if ( 'wps-pos' != $menu_item ) {
+			} else if ( 'wps-pos' != $menu_item ) {
 				$wps_pos_menu_ordered[] = $menu_item;
 			}
 		}
@@ -383,8 +384,7 @@ 
 		if ( !empty( $default_user_exists ) ) {
 			$current_step = 2;
 			$_SESSION[ 'cart' ][ 'customer_id' ] = $default_customer_id;
-		}
-		else {
+		} else {
 			$current_step = 0;
 			$_SESSION[ 'cart' ][ 'customer_id' ] = null;
 		}
@@ -399,8 +399,9 @@ 
 
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_load_element_from_letter' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_load_element_from_letter' ) ) {
+					wp_die();
+		}
 
 		$response = array(
 			'status' => false,
@@ -426,14 +427,12 @@ 
 
 			if ( empty( $result ) ) {
 				$response[ 'output' ] = sprintf( __( 'Nothing found in %s for letter %s', 'wps-pos-i18n' ), __( $element_type, 'wps-pos-i18n' ), $letter);
-			}
-			else {
+			} else {
 				$response[ 'status' ] = true;
 				$response[ 'output' ] = $result;
 			}
 
-		}
-		else {
+		} else {
 			$response[ 'output' ] = sprintf( __( 'THe requested term (%s) to search is invalid. Please check your request and try again', 'wps-pos-i18n' ), $letter );
 		}
 
@@ -447,8 +446,9 @@ 
 
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_config_barcode_only' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_config_barcode_only' ) ) {
+					wp_die();
+		}
 
 		$option = 'wps_pos_options';
 		$values = get_option( $option );

includes/modules/wps-pos-addon/templates/backend/alphabet-letters.php

Spacing +2 added lines, -2 removed lines

@@ -1,3 +1,3 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
-<button data-nonce="<?php echo wp_create_nonce( 'ajax_load_element_from_letter' ); ?>" class="wps-bton-<?php echo ( ( __( 'ALL', 'wps-pos-i18n' ) == $alpha ) || ( empty( $available_letters ) || ( in_array( $alpha, explode( ',', $available_letters ) ) ) ) ? ( !empty( $chosen_letter ) && ( $alpha == $chosen_letter ) ? 'third' : 'first' ) : 'second' ); ?>-rounded wps-pos-letter-choice wps-pos-letter-choice-<?php echo $alpha; ?> wps-pos-<?php echo $type; ?>-letter-choice wps-pos-<?php echo $type; ?>-letter-choice-<?php echo $alpha; ?> <?php echo $type; ?>" data-type="<?php echo $type; ?>" data-id="<?php echo $alpha; ?>" type="button" ><?php echo $alpha; ?></button>
+<button data-nonce="<?php echo wp_create_nonce('ajax_load_element_from_letter'); ?>" class="wps-bton-<?php echo ((__('ALL', 'wps-pos-i18n') == $alpha) || (empty($available_letters) || (in_array($alpha, explode(',', $available_letters)))) ? (!empty($chosen_letter) && ($alpha == $chosen_letter) ? 'third' : 'first') : 'second'); ?>-rounded wps-pos-letter-choice wps-pos-letter-choice-<?php echo $alpha; ?> wps-pos-<?php echo $type; ?>-letter-choice wps-pos-<?php echo $type; ?>-letter-choice-<?php echo $alpha; ?> <?php echo $type; ?>" data-type="<?php echo $type; ?>" data-id="<?php echo $alpha; ?>" type="button" ><?php echo $alpha; ?></button>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_orders/templates/frontend/order_row_in_account.php

Spacing +18 added lines, -18 removed lines

@@ -1,20 +1,20 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-table-content wps-table-row">
-	<?php $order_status = unserialize( WPSHOP_ORDER_STATUS ); ?>
-	<?php $color_label = array( 'awaiting_payment' => 'jaune', 'canceled' => 'rouge', 'partially_paid' => 'orange', 'incorrect_amount' => 'orange', 'denied' => 'rouge', 'shipped' => 'bleu', 'payment_refused' => 'rouge', 'completed' => 'vert', 'refunded' => 'rouge', 'pos' => 'bleu' ); ?>
-	<?php $currency = wpshop_tools::wpshop_get_currency( false ); ?>
-	<div class="wps-table-cell"><?php echo mysql2date( get_option('date_format'), $order_meta['order_date'], true ) . '<br>' . mysql2date( get_option('time_format'), $order_meta['order_date'], true ); ?></div>
+	<?php $order_status = unserialize(WPSHOP_ORDER_STATUS); ?>
+	<?php $color_label = array('awaiting_payment' => 'jaune', 'canceled' => 'rouge', 'partially_paid' => 'orange', 'incorrect_amount' => 'orange', 'denied' => 'rouge', 'shipped' => 'bleu', 'payment_refused' => 'rouge', 'completed' => 'vert', 'refunded' => 'rouge', 'pos' => 'bleu'); ?>
+	<?php $currency = wpshop_tools::wpshop_get_currency(false); ?>
+	<div class="wps-table-cell"><?php echo mysql2date(get_option('date_format'), $order_meta['order_date'], true) . '<br>' . mysql2date(get_option('time_format'), $order_meta['order_date'], true); ?></div>
 	<div class="wps-table-cell"><?php echo $order_meta['order_key']; ?></div>
-	<div class="wps-table-cell"><?php echo wpshop_tools::formate_number( $order_meta['order_grand_total'] ).' '.$currency; ?></div>
+	<div class="wps-table-cell"><?php echo wpshop_tools::formate_number($order_meta['order_grand_total']) . ' ' . $currency; ?></div>
 	<div class="wps-table-cell">
-		<span class="wps-label-<?php echo $color_label[$order_meta['order_status']]; ?>"><?php _e( $order_status[$order_meta['order_status']], 'wpshop' ); ?></span>
+		<span class="wps-label-<?php echo $color_label[$order_meta['order_status']]; ?>"><?php _e($order_status[$order_meta['order_status']], 'wpshop'); ?></span>
 	</div>
 	<div class="wps-table-cell">
-		<?php if(!empty($order_meta['order_trackingLink'])):?>
+		<?php if (!empty($order_meta['order_trackingLink'])):?>
 			<?php /** Check if http:// it's found in the link */
 			$url = $order_meta['order_trackingLink'];
-			if('http://' != substr($url, 0, 7))
+			if ('http://' != substr($url, 0, 7))
 				$url = 'http://' . $url;
 			?>
 			<a href="<?php echo $url; ?>" target="_blank"><?php echo !empty($order_meta['order_trackingNumber']) ? $order_meta['order_trackingNumber'] : ""; ?></a>
@@ -22,25 +22,25 @@ 
 			<?php _e('No tracking links', 'wpshop'); ?>
 		<?php endif; ?>
 	</div>
-	<?php if( !is_admin() ): ?>
+	<?php if (!is_admin()): ?>
 		<div class="wps-table-cell wps-customer-order-list-actions">
-			<button data-nonce="<?php echo wp_create_nonce( 'wps_orders_load_details' ); ?>" class="wps-bton-third wps-orders-details-opener" id="wps-order-details-opener-<?php echo $order_id; ?>"><?php _e( 'Order details', 'wpshop' ); ?></button>
+			<button data-nonce="<?php echo wp_create_nonce('wps_orders_load_details'); ?>" class="wps-bton-third wps-orders-details-opener" id="wps-order-details-opener-<?php echo $order_id; ?>"><?php _e('Order details', 'wpshop'); ?></button>
 
-			<?php if( !empty( $order_meta ) && $order_meta['order_status'] != 'canceled' && ( ( !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' ) || !empty( $order_meta['order_temporary_key'] ) ) && isset( $order_meta['pay_quotation'] ) && (float) $order_meta['order_amount_to_pay_now'] != (float) 0 ) : ?>
-				<button data-nonce="<?php echo wp_create_nonce( 'wps_checkout_quotation' ); ?>" class="wps-bton-third wps-quotation-checkout button-thrid" data-oid="<?php echo $order_id; ?>"><?php _e( 'Pay quotation', 'wpshop' ); ?></button>
+			<?php if (!empty($order_meta) && $order_meta['order_status'] != 'canceled' && ((!empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation') || !empty($order_meta['order_temporary_key'])) && isset($order_meta['pay_quotation']) && (float)$order_meta['order_amount_to_pay_now'] != (float)0) : ?>
+				<button data-nonce="<?php echo wp_create_nonce('wps_checkout_quotation'); ?>" class="wps-bton-third wps-quotation-checkout button-thrid" data-oid="<?php echo $order_id; ?>"><?php _e('Pay quotation', 'wpshop'); ?></button>
 			<?php endif; ?>
 
-			<?php if ( !empty( $order_meta ) && !empty( $order_meta[ 'order_invoice_ref' ] ) ) : ?>
-			<br/><a href="<?php echo WPSHOP_TEMPLATES_URL; ?>invoice.php?order_id=<?php echo $order_id; ?>&invoice_ref=<?php echo $order_meta[ 'order_invoice_ref' ]; ?>&mode=pdf" target="_blank" class="wps-bton-third" role="button"><?php _e( 'Download invoice', 'wpshop' ); ?></a>
+			<?php if (!empty($order_meta) && !empty($order_meta['order_invoice_ref'])) : ?>
+			<br/><a href="<?php echo WPSHOP_TEMPLATES_URL; ?>invoice.php?order_id=<?php echo $order_id; ?>&invoice_ref=<?php echo $order_meta['order_invoice_ref']; ?>&mode=pdf" target="_blank" class="wps-bton-third" role="button"><?php _e('Download invoice', 'wpshop'); ?></a>
 			<?php endif; ?>
 
 			<!-- Display delete order -->
 			<?php $wpshop_display_delete_order_option = get_option('wpshop_display_option'); ?>
-			<?php if( !empty($wpshop_display_delete_order_option) && !empty($wpshop_display_delete_order_option['wpshop_display_delete_order']) && $wpshop_display_delete_order_option['wpshop_display_delete_order'] && !empty( $order_meta ) && $order_meta['order_status'] == 'awaiting_payment' ):?>
-			<br/><button data-nonce="<?php echo wp_create_nonce( 'wps_delete_order' ); ?>" class="wps-bton-first-mini-rounded wps-orders-delete button-secondary" data-id="<?php echo $order_id; ?>"><?php _e( 'Delete order', 'wpshop' ); ?></button>
+			<?php if (!empty($wpshop_display_delete_order_option) && !empty($wpshop_display_delete_order_option['wpshop_display_delete_order']) && $wpshop_display_delete_order_option['wpshop_display_delete_order'] && !empty($order_meta) && $order_meta['order_status'] == 'awaiting_payment'):?>
+			<br/><button data-nonce="<?php echo wp_create_nonce('wps_delete_order'); ?>" class="wps-bton-first-mini-rounded wps-orders-delete button-secondary" data-id="<?php echo $order_id; ?>"><?php _e('Delete order', 'wpshop'); ?></button>
 			<?php endif; ?>
 		</div>
 	<?php else : ?>
-		<div class="wps-table-cell"><a href="<?php echo admin_url( 'post.php?post='.$order_id.'&action=edit' ); ?>" target="_blank" role="button" class="wps-bton-first-mini-rounded" ><?php _e( 'Order details', 'wpshop' ); ?></a></div>
+		<div class="wps-table-cell"><a href="<?php echo admin_url('post.php?post=' . $order_id . '&action=edit'); ?>" target="_blank" role="button" class="wps-bton-first-mini-rounded" ><?php _e('Order details', 'wpshop'); ?></a></div>
 	<?php endif?>
 </div>

Braces +16 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wps-table-content wps-table-row">
 	<?php $order_status = unserialize( WPSHOP_ORDER_STATUS ); ?>
@@ -14,12 +16,16 @@ 
 		<?php if(!empty($order_meta['order_trackingLink'])):?>
 			<?php /** Check if http:// it's found in the link */
 			$url = $order_meta['order_trackingLink'];
-			if('http://' != substr($url, 0, 7))
-				$url = 'http://' . $url;
+			if('http://' != substr($url, 0, 7)) {
+							$url = 'http://' . $url;
+			}
 			?>
 			<a href="<?php echo $url; ?>" target="_blank"><?php echo !empty($order_meta['order_trackingNumber']) ? $order_meta['order_trackingNumber'] : ""; ?></a>
-		<?php else: ?>
-			<?php _e('No tracking links', 'wpshop'); ?>
+		<?php else {
+	: ?>
+			<?php _e('No tracking links', 'wpshop');
+}
+?>
 		<?php endif; ?>
 	</div>
 	<?php if( !is_admin() ): ?>
@@ -40,7 +46,10 @@ 
 			<br/><button data-nonce="<?php echo wp_create_nonce( 'wps_delete_order' ); ?>" class="wps-bton-first-mini-rounded wps-orders-delete button-secondary" data-id="<?php echo $order_id; ?>"><?php _e( 'Delete order', 'wpshop' ); ?></button>
 			<?php endif; ?>
 		</div>
-	<?php else : ?>
-		<div class="wps-table-cell"><a href="<?php echo admin_url( 'post.php?post='.$order_id.'&action=edit' ); ?>" target="_blank" role="button" class="wps-bton-first-mini-rounded" ><?php _e( 'Order details', 'wpshop' ); ?></a></div>
+	<?php else {
+	: ?>
+		<div class="wps-table-cell"><a href="<?php echo admin_url( 'post.php?post='.$order_id.'&action=edit' );
+}
+?>" target="_blank" role="button" class="wps-bton-first-mini-rounded" ><?php _e( 'Order details', 'wpshop' ); ?></a></div>
 	<?php endif?>
 </div>