Eoxia / wpshop

includes/modules/wps_options/templates/backend/wps_display_options_customize_customer_account.php

Spacing +10 added lines, -10 removed lines

@@ -1,22 +1,22 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-gridwrapper3-padded">
 	<div>
 		<div class="wps-form-group">
-			<label><?php _e( 'Selected part element background', 'wpshop'); ?> :</label>
+			<label><?php _e('Selected part element background', 'wpshop'); ?> :</label>
 			<div class="wps-form">
-			<input type="text" name="wpshop_customize_display_option[account][activ_element_background]" class="wps-color-picker-field" value="<?php echo ( !empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['activ_element_background']) )   ? $wpshop_customize_display_option['account']['activ_element_background'] : ''; ?>" />
-			<span style="display : inline-block; width : 20px; height : 20px; background : <?php echo ( !empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['activ_element_background']) )   ? $wpshop_customize_display_option['account']['activ_element_background'] : ''; ?>"></span>
+			<input type="text" name="wpshop_customize_display_option[account][activ_element_background]" class="wps-color-picker-field" value="<?php echo (!empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['activ_element_background'])) ? $wpshop_customize_display_option['account']['activ_element_background'] : ''; ?>" />
+			<span style="display : inline-block; width : 20px; height : 20px; background : <?php echo (!empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['activ_element_background'])) ? $wpshop_customize_display_option['account']['activ_element_background'] : ''; ?>"></span>
 			</div>
 		</div>
 	</div>
 	
 	<div>
 		<div class="wps-form-group">
-			<label><?php _e( 'Information box background color', 'wpshop'); ?> :</label>
+			<label><?php _e('Information box background color', 'wpshop'); ?> :</label>
 			<div class="wps-form">
-			<input type="text" name="wpshop_customize_display_option[account][information_box_background]" class="wps-color-picker-field" value="<?php echo ( !empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['information_box_background']) )   ? $wpshop_customize_display_option['account']['information_box_background'] : ''; ?>" />
-			<span style="display : inline-block; width : 20px; height : 20px; background : <?php echo ( !empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['information_box_background']) )   ? $wpshop_customize_display_option['account']['information_box_background'] : ''; ?>"></span>
+			<input type="text" name="wpshop_customize_display_option[account][information_box_background]" class="wps-color-picker-field" value="<?php echo (!empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['information_box_background'])) ? $wpshop_customize_display_option['account']['information_box_background'] : ''; ?>" />
+			<span style="display : inline-block; width : 20px; height : 20px; background : <?php echo (!empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['information_box_background'])) ? $wpshop_customize_display_option['account']['information_box_background'] : ''; ?>"></span>
 			
 			</div>
 		</div>
@@ -24,10 +24,10 @@ 
 	
 	<div>
 		<div class="wps-form-group">
-			<label><?php _e( 'Unselected part element background', 'wpshop'); ?> :</label>
+			<label><?php _e('Unselected part element background', 'wpshop'); ?> :</label>
 			<div class="wps-form">
-			<input type="text" name="wpshop_customize_display_option[account][part_background]" class="wps-color-picker-field" value="<?php echo ( !empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['part_background']) )   ? $wpshop_customize_display_option['account']['part_background'] : ''; ?>"/>
-			<span style="display : inline-block; width : 20px; height : 20px; background : <?php echo ( !empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['part_background']) )   ? $wpshop_customize_display_option['account']['part_background'] : ''; ?>"></span>
+			<input type="text" name="wpshop_customize_display_option[account][part_background]" class="wps-color-picker-field" value="<?php echo (!empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['part_background'])) ? $wpshop_customize_display_option['account']['part_background'] : ''; ?>"/>
+			<span style="display : inline-block; width : 20px; height : 20px; background : <?php echo (!empty($wpshop_customize_display_option) && !empty($wpshop_customize_display_option['account']) && !empty($wpshop_customize_display_option['account']['part_background'])) ? $wpshop_customize_display_option['account']['part_background'] : ''; ?>"></span>
 			
 			</div>
 		</div>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wps-gridwrapper3-padded">
 	<div>

includes/modules/wps_coupon/wps_coupon.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Bootstrap file
@@ -7,10 +7,10 @@ 
  */
 
 DEFINE('WPS_COUPON_DIR', basename(dirname(__FILE__)));
-DEFINE('WPS_COUPON_PATH', str_replace( "\\", "/", str_replace( WPS_COUPON_DIR, "", dirname( __FILE__ ) ) ) );
-DEFINE('WPS_COUPON_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_COUPON_PATH ) );
+DEFINE('WPS_COUPON_PATH', str_replace("\\", "/", str_replace(WPS_COUPON_DIR, "", dirname(__FILE__))));
+DEFINE('WPS_COUPON_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_COUPON_PATH));
 
 
-include( plugin_dir_path( __FILE__ ).'/controller/wps_coupon_ctr.php' );
-include( plugin_dir_path( __FILE__ ).'/model/wps_coupon_model.php' );
+include(plugin_dir_path(__FILE__) . '/controller/wps_coupon_ctr.php');
+include(plugin_dir_path(__FILE__) . '/model/wps_coupon_model.php');
 $wps_coupon = new wps_coupon_ctr();

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Bootstrap file

includes/modules/wps_coupon/templates/frontend/coupons.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !$is_from_admin ) : ?>
 <span class="wps-h5"><?php _e( 'My coupons', 'wpshop'); ?></span>
 <?php endif;  ?>

Spacing +7 added lines, -7 removed lines

@@ -1,14 +1,14 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !$is_from_admin ) : ?>
-<span class="wps-h5"><?php _e( 'My coupons', 'wpshop'); ?></span>
-<?php endif;  ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!$is_from_admin) : ?>
+<span class="wps-h5"><?php _e('My coupons', 'wpshop'); ?></span>
+<?php endif; ?>
 
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
-		<div class="wps-table-cell"><?php _e( 'Coupon value', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Coupon value', 'wpshop'); ?></div>
 		<!-- TODO Display elements only when is !empty -->
-		<!--<div class="wps-table-cell"><?php _e( 'Validity date', 'wpshop'); ?></div>-->
-		<div class="wps-table-cell"><?php _e( 'Coupon code', 'wpshop'); ?></div>
+		<!--<div class="wps-table-cell"><?php _e('Validity date', 'wpshop'); ?></div>-->
+		<div class="wps-table-cell"><?php _e('Coupon code', 'wpshop'); ?></div>
 	</div>
 	<?php echo $coupons_rows; ?>
 </div>

includes/modules/wps_coupon/templates/frontend/coupon.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-table-content wps-table-row">
 		<div class="wps-table-cell"><?php echo $coupon_value; ?></div>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wps-table-content wps-table-row">
 		<div class="wps-table-cell"><?php echo $coupon_value; ?></div>

includes/modules/wps_coupon/templates/backend/coupon-metabox.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <table class="wpshop_coupon_definition_table" >
 	<tr class="wpshop_coupon_definition_table_code_coupon_line" >

Spacing +14 added lines, -14 removed lines

@@ -1,16 +1,16 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <table class="wpshop_coupon_definition_table" >
 	<tr class="wpshop_coupon_definition_table_code_coupon_line" >
-		<td class="wpshop_coupon_definition_table_label wpshop_coupon_definition_code_coupon_input_label" ><label for="coupon_code" ><?php _e('Coupon code','wpshop'); ?></label></td>
+		<td class="wpshop_coupon_definition_table_label wpshop_coupon_definition_code_coupon_input_label" ><label for="coupon_code" ><?php _e('Coupon code', 'wpshop'); ?></label></td>
 		<td class="wpshop_coupon_definition_table_input wpshop_coupon_definition_code_coupon_input" ><input type="text" name="coupon_code" id="coupon_code" value="<?php echo $coupon_code; ?>" /></td>
 	</tr>
 	<tr class="wpshop_coupon_definition_table_code_type_line" >
-		<td class="wpshop_coupon_definition_table_label wpshop_coupon_definition_coupon_type_amount_label" ><input type="radio" name="coupon_type" class="wpshop_coupon_type" id="coupon_type_amount" value="amount" <?php echo ( ($wpshop_coupon_discount_type=='amount') || empty($wpshop_coupon_discount_type) ? 'checked="checked"' : null ); ?> /><label for="coupon_type_amount" ><?php _e('Coupon discount amount','wpshop'); ?></label></td>
-		<td class="wpshop_coupon_definition_table_input wpshop_coupon_definition_coupon_type_input" rowspan="2" ><input type="text" name="coupon_discount_amount" value="<?php echo $coupon_discount_amount; ?>" /><span class="wpshop_coupon_type_unit wpshop_coupon_type_unit_amount" > <?php echo ( ( (!empty($wpshop_coupon_discount_type) && $wpshop_coupon_discount_type == 'percent' ) ) ? '%' : wpshop_tools::wpshop_get_currency().' '.__('ATI', 'wpshop')); ?></span><span class="wpshopHide wpshop_coupon_type_unit wpshop_coupon_type_unit_percent" > % </span></td>
+		<td class="wpshop_coupon_definition_table_label wpshop_coupon_definition_coupon_type_amount_label" ><input type="radio" name="coupon_type" class="wpshop_coupon_type" id="coupon_type_amount" value="amount" <?php echo (($wpshop_coupon_discount_type == 'amount') || empty($wpshop_coupon_discount_type) ? 'checked="checked"' : null); ?> /><label for="coupon_type_amount" ><?php _e('Coupon discount amount', 'wpshop'); ?></label></td>
+		<td class="wpshop_coupon_definition_table_input wpshop_coupon_definition_coupon_type_input" rowspan="2" ><input type="text" name="coupon_discount_amount" value="<?php echo $coupon_discount_amount; ?>" /><span class="wpshop_coupon_type_unit wpshop_coupon_type_unit_amount" > <?php echo (((!empty($wpshop_coupon_discount_type) && $wpshop_coupon_discount_type == 'percent')) ? '%' : wpshop_tools::wpshop_get_currency() . ' ' . __('ATI', 'wpshop')); ?></span><span class="wpshopHide wpshop_coupon_type_unit wpshop_coupon_type_unit_percent" > % </span></td>
 	</tr>
 	<tr class="wpshop_coupon_definition_table_code_type_line" >
-		<td class="wpshop_coupon_definition_table_label wpshop_coupon_definition_coupon_type_percent_label" ><input type="radio" name="coupon_type" id="coupon_type_percent" class="wpshop_coupon_type" value="percent" <?php echo ($wpshop_coupon_discount_type=='percent'?'checked="checked"':null); ?> /><label for="coupon_type_percent" ><?php _e('Coupon discount percent','wpshop'); ?></label></td>
+		<td class="wpshop_coupon_definition_table_label wpshop_coupon_definition_coupon_type_percent_label" ><input type="radio" name="coupon_type" id="coupon_type_percent" class="wpshop_coupon_type" value="percent" <?php echo ($wpshop_coupon_discount_type == 'percent' ? 'checked="checked"' : null); ?> /><label for="coupon_type_percent" ><?php _e('Coupon discount percent', 'wpshop'); ?></label></td>
 	</tr>
 	<tr>
 		<td>
@@ -24,14 +24,14 @@ 
 						'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS,
 						'post_status' => 'draft',
 				);
-				$customers = get_posts( $args );
-				if ( !empty($customers) ) :
-				 	foreach( $customers as $customer ) :
-				 		$name = strtoupper( get_user_meta( $customer->post_author, 'last_name', true ) ).' '.get_user_meta( $customer->post_author, 'first_name', true );
+				$customers = get_posts($args);
+				if (!empty($customers)) :
+				 	foreach ($customers as $customer) :
+				 		$name = strtoupper(get_user_meta($customer->post_author, 'last_name', true)) . ' ' . get_user_meta($customer->post_author, 'first_name', true);
 						$user = get_userdata($customer->post_author);
-						if ( !empty( $user ) ) :
+						if (!empty($user)) :
 ?>
-						<option value="<?php echo $customer->post_author; ?>" <?php echo ( (!empty( $coupon_receiver) && is_array($coupon_receiver) && in_array($customer->post_author, $coupon_receiver)) ? 'selected="selected"' : '' ); ?>><?php echo $name; ?> ( <?php echo $user->user_email; ?> )</option>
+						<option value="<?php echo $customer->post_author; ?>" <?php echo ((!empty($coupon_receiver) && is_array($coupon_receiver) && in_array($customer->post_author, $coupon_receiver)) ? 'selected="selected"' : ''); ?>><?php echo $name; ?> ( <?php echo $user->user_email; ?> )</option>
 <?php
 						endif;
 					endforeach;
@@ -56,10 +56,10 @@ 
 			<label for="wpshop_coupon_mini_amount"><?php _e('Minimum order amount to use this coupon', 'wpshop'); ?></label> :
 		</td>
 		<td>
-			<input type="text" name="wpshop_coupon_mini_amount" value="<?php echo ( (!empty($wpshop_coupon_minimum_amount) && !empty($wpshop_coupon_minimum_amount['amount']) ) ? $wpshop_coupon_minimum_amount['amount'] : ''); ?>" id="wpshop_coupon_mini_amount" /> <?php echo $default_currency; ?>
+			<input type="text" name="wpshop_coupon_mini_amount" value="<?php echo ((!empty($wpshop_coupon_minimum_amount) && !empty($wpshop_coupon_minimum_amount['amount'])) ? $wpshop_coupon_minimum_amount['amount'] : ''); ?>" id="wpshop_coupon_mini_amount" /> <?php echo $default_currency; ?>
 			<select name="wpshop_coupon_min_mount_shipping_rule">
-			<option value="no_shipping_cost" <?php echo ( (!empty($wpshop_coupon_minimum_amount) && !empty($wpshop_coupon_minimum_amount['shipping_rule']) && $wpshop_coupon_minimum_amount['shipping_rule'] == 'no_shipping_cost') ? 'selected="selected"' : ''); ?>><?php _e('Without shipping cost', 'wpshop'); ?></option>
-			<option value="shipping_cost" <?php echo ( (!empty($wpshop_coupon_minimum_amount) && !empty($wpshop_coupon_minimum_amount['shipping_rule']) && $wpshop_coupon_minimum_amount['shipping_rule'] == 'shipping_cost') ? 'selected="selected"' : ''); ?>><?php _e('With shipping cost', 'wpshop'); ?></option>
+			<option value="no_shipping_cost" <?php echo ((!empty($wpshop_coupon_minimum_amount) && !empty($wpshop_coupon_minimum_amount['shipping_rule']) && $wpshop_coupon_minimum_amount['shipping_rule'] == 'no_shipping_cost') ? 'selected="selected"' : ''); ?>><?php _e('Without shipping cost', 'wpshop'); ?></option>
+			<option value="shipping_cost" <?php echo ((!empty($wpshop_coupon_minimum_amount) && !empty($wpshop_coupon_minimum_amount['shipping_rule']) && $wpshop_coupon_minimum_amount['shipping_rule'] == 'shipping_cost') ? 'selected="selected"' : ''); ?>><?php _e('With shipping cost', 'wpshop'); ?></option>
 			</select>
 			<br/><?php _e('Leave empty if you want no limitation', 'wpshop'); ?>
 		</td>

includes/modules/wps_coupon/model/wps_coupon_model.php

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_coupon_model {
 	function __construct() {
 		
@@ -65,8 +67,7 @@ 
 	
 		if ( !empty($coupon_use[$user_id]) ) {
 			$coupon_use[$user_id] = $coupon_use[$user_id] + 1;
-		}
-		else {
+		} else {
 			$coupon_use[$user_id] = 1;
 		}
 		update_post_meta( $coupon_id, '_wpshop_coupon_usage', $coupon_use);

Spacing +17 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_coupon_model {
 	function __construct() {
 
@@ -9,7 +9,7 @@ 
 	 * @return array
 	 */
 	function get_coupons() {
-		$coupons = get_posts( array( 'post_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_COUPON, 'post_status' => 'publish' ) );
+		$coupons = get_posts(array('post_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_COUPON, 'post_status' => 'publish'));
 		return $coupons;
 	}
 
@@ -17,16 +17,16 @@ 
 	 * Save coupon custom datas on asave post action
 	 * @param array $data
 	 */
-	function save_coupons_informations( $data ) {
-		if( !empty($data) ) {
-			$amount_min_limit = array( 'amount' => ( ( !empty($data['wpshop_coupon_mini_amount']) ) ? $data['wpshop_coupon_mini_amount'] : null ), 'shipping_rule' => ( ( !empty($data['wpshop_coupon_min_mount_shipping_rule']) ) ? $data['wpshop_coupon_min_mount_shipping_rule'] : null ) );
+	function save_coupons_informations($data) {
+		if (!empty($data)) {
+			$amount_min_limit = array('amount' => ((!empty($data['wpshop_coupon_mini_amount'])) ? $data['wpshop_coupon_mini_amount'] : null), 'shipping_rule' => ((!empty($data['wpshop_coupon_min_mount_shipping_rule'])) ? $data['wpshop_coupon_min_mount_shipping_rule'] : null));
 			update_post_meta($data['post_ID'], 'wpshop_coupon_code', $data['coupon_code']);
-			update_post_meta($data['post_ID'], 'wpshop_coupon_discount_value', floatval( str_replace(',', '.',$data['coupon_discount_amount']) ) );
+			update_post_meta($data['post_ID'], 'wpshop_coupon_discount_value', floatval(str_replace(',', '.', $data['coupon_discount_amount'])));
 			update_post_meta($data['post_ID'], 'wpshop_coupon_discount_type', $data['wpshop_coupon_discount_type']);
-			update_post_meta($data['post_ID'], 'wpshop_coupon_individual_use', $data['coupon_receiver'] );
+			update_post_meta($data['post_ID'], 'wpshop_coupon_individual_use', $data['coupon_receiver']);
 			update_post_meta($data['post_ID'], 'wpshop_coupon_product_ids', '');
 			update_post_meta($data['post_ID'], 'wpshop_coupon_exclude_product_ids', '');
-			update_post_meta($data['post_ID'], 'wpshop_coupon_usage_limit', $data['coupon_usage_limit'] );
+			update_post_meta($data['post_ID'], 'wpshop_coupon_usage_limit', $data['coupon_usage_limit']);
 			update_post_meta($data['post_ID'], 'wpshop_coupon_start_date', '');
 			update_post_meta($data['post_ID'], 'wpshop_coupon_expiry_date', '');
 			update_post_meta($data['post_ID'], 'wpshop_coupon_apply_before_tax', '');
@@ -42,15 +42,15 @@ 
 	 * @param integer $coupon_id
 	 * @return array
 	 */
-	function get_coupon_data( $coupon_id ) {
+	function get_coupon_data($coupon_id) {
 		global $wpdb;
-		$coupon_id = ( !empty($coupon_id) ) ? $coupon_id : ( !empty($_SESSION['cart']['coupon_id']) ) ? $_SESSION['cart']['coupon_id'] : null ;
-		if( !empty($coupon_id) ) {
-			$query = $wpdb->prepare('SELECT meta_key, meta_value FROM ' . $wpdb->postmeta . ' WHERE post_id = %d', $coupon_id );
+		$coupon_id = (!empty($coupon_id)) ? $coupon_id : (!empty($_SESSION['cart']['coupon_id'])) ? $_SESSION['cart']['coupon_id'] : null;
+		if (!empty($coupon_id)) {
+			$query = $wpdb->prepare('SELECT meta_key, meta_value FROM ' . $wpdb->postmeta . ' WHERE post_id = %d', $coupon_id);
 			$coupons = $wpdb->get_results($query, ARRAY_A);
 			$coupon = array();
 			$coupon['coupon_id'] = $coupon_id;
-			foreach($coupons as $coupon_info){
+			foreach ($coupons as $coupon_info) {
 				$coupon[$coupon_info['meta_key']] = $coupon_info['meta_value'];
 			}
 			return $coupon;
@@ -59,16 +59,16 @@ 
 	}
 
 	/** Save an historic of coupon usage */
-	function save_coupon_use( $coupon_id ) {
-		$coupon_use = get_post_meta( $coupon_id, '_wpshop_coupon_usage', true);
+	function save_coupon_use($coupon_id) {
+		$coupon_use = get_post_meta($coupon_id, '_wpshop_coupon_usage', true);
 		$user_id = get_current_user_id();
 
-		if ( !empty($coupon_use[$user_id]) ) {
+		if (!empty($coupon_use[$user_id])) {
 			$coupon_use[$user_id] = $coupon_use[$user_id] + 1;
 		}
 		else {
 			$coupon_use[$user_id] = 1;
 		}
-		update_post_meta( $coupon_id, '_wpshop_coupon_usage', $coupon_use);
+		update_post_meta($coupon_id, '_wpshop_coupon_usage', $coupon_use);
 	}
 }
\ No newline at end of file

includes/modules/wps_search/controller/wps_customer_search.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wpshop_customer_search {
 
 	function __construct() {

Spacing +14 added lines, -14 removed lines

@@ -1,24 +1,24 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wpshop_customer_search {
 
 	function __construct() {
-		if  ( is_admin() ) {
-			add_filter( 'posts_where', array(&$this, 'wpshop_search_where_in_customer') );
+		if (is_admin()) {
+			add_filter('posts_where', array(&$this, 'wpshop_search_where_in_customer'));
 		}
 	}
 
-	public function wpshop_search_where_in_customer( $where ) {
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$s = !empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-		$entity_filter = !empty( $_GET['filter'] ) ? sanitize_text_field( $_GET['filter'] ) : '';
+	public function wpshop_search_where_in_customer($where) {
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$s = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
+		$entity_filter = !empty($_GET['filter']) ? sanitize_text_field($_GET['filter']) : '';
 
-		if( is_admin() && ( !empty($post_type) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) ) && ( !empty( $s ) || !empty( $entity_filter ) ) ) {
+		if (is_admin() && (!empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS)) && (!empty($s) || !empty($entity_filter))) {
 			global $wpdb;
 
 			$where = "	AND {$wpdb->posts}.post_type = '" . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "'";
 
-			if( !empty( $entity_filter ) ) {
-				switch ( $entity_filter ) {
+			if (!empty($entity_filter)) {
+				switch ($entity_filter) {
 					case 'orders':
 						$operator = 'IN';
 						break;
@@ -35,9 +35,9 @@ 
 								)";
 			}
 
-			if( !empty( $s ) ) {
-				$s_soundex = soundex( $s );
-				$s = strtoupper( $s );
+			if (!empty($s)) {
+				$s_soundex = soundex($s);
+				$s = strtoupper($s);
 				$where .= "	AND ( 	{$wpdb->posts}.ID = '{$s}'
 									OR UPPER( {$wpdb->posts}.post_title ) LIKE '%{$s}%'
 									OR SOUNDEX( {$wpdb->posts}.post_title ) = '{$s_soundex}'
@@ -93,6 +93,6 @@ 
 
 }
 
-if ( class_exists("wpshop_customer_search") ) {
+if (class_exists("wpshop_customer_search")) {
 	$wpshop_customer_search = new wpshop_customer_search();
 }

includes/modules/wps_search/controller/wpshop_entity_filter.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /** Check if the plugin version is defined. If not defined script will be stopped here */
 if ( !defined( 'WPSHOP_VERSION' ) ) {

Spacing +19 added lines, -19 removed lines

@@ -1,11 +1,11 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /** Check if the plugin version is defined. If not defined script will be stopped here */
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __("You are not allowed to use this service.", 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__("You are not allowed to use this service.", 'wpshop'));
 }
 
-if ( !class_exists("wpshop_entity_filter") ) {
+if (!class_exists("wpshop_entity_filter")) {
 	class wpshop_entity_filter {
 		function __construct() {
 			add_action('restrict_manage_posts', array(&$this, 'wpshop_entity_filter'));
@@ -13,8 +13,8 @@ 
 		}
 
 		function wpshop_entity_filter() {
-			$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-			$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
+			$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+			$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
 
 			if (isset($post_type)) {
 				if (post_type_exists($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)) {
@@ -33,13 +33,13 @@ 
 		function wpshop_entity_filter_parse_query($query) {
 			global $pagenow, $wpdb;
 
-			$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-			$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
+			$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+			$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
 
-			if ( is_admin() && ($pagenow == 'edit.php') && !empty( $post_type ) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) && !empty( $entity_filter ) ) {
+			if (is_admin() && ($pagenow == 'edit.php') && !empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) && !empty($entity_filter)) {
 
 				$check = null;
-				switch ( $entity_filter ) {
+				switch ($entity_filter) {
 					case 'no_picture':
 						$sql_query = $wpdb->prepare("SELECT post_id FROM {$wpdb->postmeta} pm WHERE meta_key = %s ", '_thumbnail_id');
 						$check = 'post__not_in';
@@ -49,7 +49,7 @@ 
 // 						$price_attribute = wpshop_attributes::getElement( WPSHOP_PRODUCT_PRICE_TTC, "'valid'", 'code');
 // 						$sql_query = $wpdb->prepare("SELECT DISTINCT ID as post_id FROM {$wpdb->posts} WHERE post_type = %s AND ID NOT IN (SELECT entity_id FROM {$table_attribute_decimal} WHERE value > 0 AND attribute_id = %d)", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $price_attribute->id);
 // 						$check = 'post__in';
-						$query->set( 'meta_query' , array(
+						$query->set('meta_query', array(
 							array(
 								'key' => '_displayed_price',
 								'value' => '',
@@ -89,20 +89,20 @@ 
 								WHERE meta_key = %s
 							) AND post_type = %s"
 							, "_barcode", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "_barcode", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "_barcode", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION );
-						$options_product_without_barcode = $wpdb->get_results( $the_query );
-						if ( !empty( $options_product_without_barcode ) ) {
-							foreach ( $options_product_without_barcode as $post ) {
+						$options_product_without_barcode = $wpdb->get_results($the_query);
+						if (!empty($options_product_without_barcode)) {
+							foreach ($options_product_without_barcode as $post) {
 								$post_to_get[] = $post->post_parent;
 							}
 						}
 						/**	If there are post that have variations without barcode => add them to the post list to get	*/
-						if ( !empty( $post_to_get ) ) {
-							$query->query_vars[ 'post__in' ] = $post_to_get;
+						if (!empty($post_to_get)) {
+							$query->query_vars['post__in'] = $post_to_get;
 						}
 					break;
 					case 'no_barcode_products':
 						/**	Check all product that don't have a barcode or having a barcode containing PDCT	*/
-						$query->set( 'meta_query' , array(
+						$query->set('meta_query', array(
 							'relation' => 'OR',
 							array(
 								'key' => '_barcode',
@@ -118,10 +118,10 @@ 
 					break;
 				}
 
-				if ( !empty( $check ) ) {
+				if (!empty($check)) {
 					$results = $wpdb->get_results($sql_query);
 					$post_id_list = array();
-					foreach($results as $item){
+					foreach ($results as $item) {
 						$post_id_list[] = $item->post_id;
 					}
 					$query->query_vars[$check] = $post_id_list;

includes/modules/wps_search/controller/wps_filter_search.php

Indentation +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 class wps_filter_search {
 
 	/** Define the main directory containing the template for the current plugin
-	* @var string
-	*/
+	 * @var string
+	 */
 	private $template_dir;
 	/**
 	 * Define the directory name for the module in order to check into frontend

Spacing +230 added lines, -230 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_filter_search {
 
 	/** Define the main directory containing the template for the current plugin
@@ -16,24 +16,24 @@ 
 		// Template Load
 		$this->template_dir = WPS_SEARCH_PATH . WPS_SEARCH_DIR . "/templates/";
 		// Display Filter search
-		add_shortcode('wpshop_filter_search', array( $this, 'display_filter_search'));
+		add_shortcode('wpshop_filter_search', array($this, 'display_filter_search'));
 
 		// WP General actions
 		add_action('save_post', 'wps_filter_search::save_displayed_price_meta');
 		add_action('save_post', array(&$this, 'stock_values_for_attribute'));
 
 		// Add scripts
-		add_action( 'wp_enqueue_scripts', array( &$this, 'add_frontend_scripts' ) );
+		add_action('wp_enqueue_scripts', array(&$this, 'add_frontend_scripts'));
 
 		// Ajax Actions
-		add_action('wp_ajax_filter_search_action',array(&$this, 'wpshop_ajax_filter_search_action'));
-		add_action('wp_ajax_nopriv_filter_search_action',array(&$this, 'wpshop_ajax_filter_search_action'));
+		add_action('wp_ajax_filter_search_action', array(&$this, 'wpshop_ajax_filter_search_action'));
+		add_action('wp_ajax_nopriv_filter_search_action', array(&$this, 'wpshop_ajax_filter_search_action'));
 	}
 
 
 	function add_frontend_scripts() {
-		wp_enqueue_script( 'wpshop_filter_search_chosen', WPSHOP_JS_URL.'jquery-libs/chosen.jquery.min.js' );
-		wp_enqueue_script( 'wpshop_filter_search_js', WPS_SEARCH_URL.WPS_SEARCH_DIR.'/assets/filter_search/js/wpshop_filter_search.js' );
+		wp_enqueue_script('wpshop_filter_search_chosen', WPSHOP_JS_URL . 'jquery-libs/chosen.jquery.min.js');
+		wp_enqueue_script('wpshop_filter_search_js', WPS_SEARCH_URL . WPS_SEARCH_DIR . '/assets/filter_search/js/wpshop_filter_search.js');
 	}
 
 
@@ -41,14 +41,14 @@ 
 	 * Display Filter search interface
 	 * @return string
 	 */
-	function display_filter_search () {
+	function display_filter_search() {
 		global $wp_query;
 		$output = '';
-		if ( !empty($wp_query) && !empty($wp_query->queried_object_id) ) {
+		if (!empty($wp_query) && !empty($wp_query->queried_object_id)) {
 			$category_id = $wp_query->queried_object_id;
-			$category_option =  get_option('wpshop_product_category_'.$category_id);
-			if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) ) {
-				$output = $this->construct_wpshop_filter_search_interface( $category_id );
+			$category_option = get_option('wpshop_product_category_' . $category_id);
+			if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes'])) {
+				$output = $this->construct_wpshop_filter_search_interface($category_id);
 			}
 		}
 		return $output;
@@ -59,19 +59,19 @@ 
 	 * @param integer $category_id
 	 * @return string
 	 */
-	function construct_wpshop_filter_search_interface ( $category_id ) {
+	function construct_wpshop_filter_search_interface($category_id) {
 		global $wpdb;
 		$filter_elements = '';
-		if ( !empty($category_id) ) {
-			$category_option =  get_option('wpshop_product_category_'.$category_id);
-			if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && is_array($category_option['wpshop_category_filterable_attributes']) ) {
-				foreach ( $category_option['wpshop_category_filterable_attributes'] as $k => $attribute ) {
+		if (!empty($category_id)) {
+			$category_option = get_option('wpshop_product_category_' . $category_id);
+			if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && is_array($category_option['wpshop_category_filterable_attributes'])) {
+				foreach ($category_option['wpshop_category_filterable_attributes'] as $k => $attribute) {
 					$attribute_def = wpshop_attributes::getElement($k);
-					$filter_elements .= $this->construct_element( $attribute_def, $category_id );
+					$filter_elements .= $this->construct_element($attribute_def, $category_id);
 					$unity = '';
-					if ( !empty($attribute_def->_default_unit) ) {
-						$query = $wpdb->prepare('SELECT unit FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id= %d', $attribute_def->_default_unit);
-						$unity = $wpdb->get_var( $query );
+					if (!empty($attribute_def->_default_unit)) {
+						$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id= %d', $attribute_def->_default_unit);
+						$unity = $wpdb->get_var($query);
 					}
 
 					//$tpl_component['DEFAULT_UNITY'.'_'.$attribute_def->code] = $unity;
@@ -79,7 +79,7 @@ 
 			}
 		}
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_search_interface") );
+		require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_search_interface"));
 		$filter_search_interface = ob_get_contents();
 		ob_end_clean();
 		return $filter_search_interface;
@@ -91,7 +91,7 @@ 
 	 * @param integer $category_id
 	 * @return string
 	 */
-	function construct_element ( $attribute_def, $category_id ) {
+	function construct_element($attribute_def, $category_id) {
 		global $wpdb;
 		$current_category_children = array();
 		$args = array(
@@ -101,27 +101,27 @@ 
 		);
 		$current_category_children = get_categories($args);
 
-		if ( !empty( $attribute_def ) ) {
-			switch ( $attribute_def->frontend_input ) {
+		if (!empty($attribute_def)) {
+			switch ($attribute_def->frontend_input) {
 				case 'text' :
-					if ( $attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
-						return $this->get_filter_element_for_integer_data( $attribute_def, $category_id, $current_category_children );
+					if ($attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
+						return $this->get_filter_element_for_integer_data($attribute_def, $category_id, $current_category_children);
 					}
 					else {
-						return $this->get_filter_element_for_text_data( $attribute_def, $category_id, $current_category_children );
+						return $this->get_filter_element_for_text_data($attribute_def, $category_id, $current_category_children);
 					}
 					break;
 
 				case 'select' : case 'multiple-select' :
-					return $this->get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'select');
+					return $this->get_filter_element_for_list_data($attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'select');
 				break;
 
 				case 'checkbox' :
-					return $this->get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'checkbox');
+					return $this->get_filter_element_for_list_data($attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'checkbox');
 				break;
 
 				case 'radio' :
-					return $this->get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'radio' );
+					return $this->get_filter_element_for_list_data($attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'radio');
 				break;
 
 			}
@@ -133,20 +133,20 @@ 
 	 * @param StdObject $attribute_def
 	 * @return string
 	 */
-	function get_filter_element_for_text_data( $attribute_def, $category_id, $current_category_child  ) {
+	function get_filter_element_for_text_data($attribute_def, $category_id, $current_category_child) {
 		global $wpdb;
 		$output = '';
-		$category_option = get_option('wpshop_product_category_'.$category_id);
+		$category_option = get_option('wpshop_product_category_' . $category_id);
 		$list_values = '';
 
-		if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) && is_array($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
-			foreach( $category_option['wpshop_category_filterable_attributes'][$attribute_def->id] as $attribute_value ) {
-				$list_values .= '<option value="' .$attribute_value. '">' .$attribute_value. '</option>';
+		if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) && is_array($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
+			foreach ($category_option['wpshop_category_filterable_attributes'][$attribute_def->id] as $attribute_value) {
+				$list_values .= '<option value="' . $attribute_value . '">' . $attribute_value . '</option>';
 			}
 
 		}
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox") );
+		require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -157,77 +157,77 @@ 
 	 * @param StdObject $attribute_def
 	 * @return string
 	 */
-	function get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_child, $field_type, $type = 'select') {
+	function get_filter_element_for_list_data($attribute_def, $category_id, $current_category_child, $field_type, $type = 'select') {
 		global $wpdb;
 		$output = $list_values = '';
-		$category_option = get_option('wpshop_product_category_'.$category_id);
-		if ( !empty( $attribute_def) ){
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		if (!empty($attribute_def)) {
 			// Recovery values
-			if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && isset($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
+			if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && isset($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
 				$available_attribute_values = $category_option['wpshop_category_filterable_attributes'][$attribute_def->id];
 			}
 
 			// Store options for attribute
 			$stored_available_attribute_values = array();
-			$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS .' WHERE attribute_id = %d ORDER BY position ASC', $attribute_def->id);
-			$attributes_options = $wpdb->get_results( $query );
-			if ( $attribute_def->data_type_to_use == 'internal') {
-				if ( !empty( $attribute_def->default_value ) ) {
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d ORDER BY position ASC', $attribute_def->id);
+			$attributes_options = $wpdb->get_results($query);
+			if ($attribute_def->data_type_to_use == 'internal') {
+				if (!empty($attribute_def->default_value)) {
 					$attribute_default_value = $attribute_def->default_value;
 					$attribute_default_value = unserialize($attribute_default_value);
 
-					$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts. ' WHERE post_type = %s ORDER BY menu_order ASC', $attribute_default_value['default_value']);
-					$elements = $wpdb->get_results( $query );
+					$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s ORDER BY menu_order ASC', $attribute_default_value['default_value']);
+					$elements = $wpdb->get_results($query);
 
-					if ( !empty( $elements) ) {
-						foreach ( $elements as $element ) {
-							if ( array_key_exists($element->ID,$available_attribute_values ) ) {
-								$stored_available_attribute_values[] = array( 'option_id' => $element->ID, 'option_label' => $element->post_title );
+					if (!empty($elements)) {
+						foreach ($elements as $element) {
+							if (array_key_exists($element->ID, $available_attribute_values)) {
+								$stored_available_attribute_values[] = array('option_id' => $element->ID, 'option_label' => $element->post_title);
 							}
 						}
 					}
 				}
 			}
 			else {
-				foreach ( $attributes_options as $attributes_option ) {
-					if ( in_array($attributes_option->label, $available_attribute_values) ) {
-						$key_value = array_search( $attributes_option->label, $available_attribute_values);
-						$stored_available_attribute_values[] = array('option_id' => $key_value, 'option_label' => $attributes_option->label );
+				foreach ($attributes_options as $attributes_option) {
+					if (in_array($attributes_option->label, $available_attribute_values)) {
+						$key_value = array_search($attributes_option->label, $available_attribute_values);
+						$stored_available_attribute_values[] = array('option_id' => $key_value, 'option_label' => $attributes_option->label);
 					}
 				}
 			}
 			// Sort Stored values
-			ksort( $stored_available_attribute_values);
-			if ( !empty($stored_available_attribute_values) && is_array($stored_available_attribute_values) ) {
+			ksort($stored_available_attribute_values);
+			if (!empty($stored_available_attribute_values) && is_array($stored_available_attribute_values)) {
 				// Construct List values
-				foreach( $stored_available_attribute_values as $stored_available_attribute_value ) {
-					$list_values .= '<option value="' .$stored_available_attribute_value['option_id']. '">' .$stored_available_attribute_value['option_label']. '</option>';
+				foreach ($stored_available_attribute_values as $stored_available_attribute_value) {
+					$list_values .= '<option value="' . $stored_available_attribute_value['option_id'] . '">' . $stored_available_attribute_value['option_label'] . '</option>';
 				}
 
 				// Display the good template file
-				switch( $type ) {
+				switch ($type) {
 					case 'radio' :
 						ob_start();
-						require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_radiobox") );
+						require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_radiobox"));
 						$output = ob_get_contents();
 						ob_end_clean();
 					break;
 					case 'checkbox' :
 						ob_start();
-						require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_checkbox") );
+						require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_checkbox"));
 						$output = ob_get_contents();
 						ob_end_clean();
 						break;
 					default :
-						if ( $field_type == 'multiple-select' ) {
+						if ($field_type == 'multiple-select') {
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_multiple_select") );
+							require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_multiple_select"));
 							$output = ob_get_contents();
 							ob_end_clean();
 						}
 						else {
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox") );
+							require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox"));
 							$output = ob_get_contents();
 							ob_end_clean();
 						}
@@ -243,20 +243,20 @@ 
 	 * @param StdObject $attribute_def
 	 * @return string
 	 */
-	function get_filter_element_for_integer_data ( $attribute_def, $category_id, $current_category_children  ) {
+	function get_filter_element_for_integer_data($attribute_def, $category_id, $current_category_children) {
 		$min_value = $max_value = 0;
 		$sub_tpl_component = array();
 		$output = '';
 		$first  = true;
 		/** Get allproducts of category **/
-		$category_product_ids = wpshop_categories::get_product_of_category( $category_id );
-		$category_option = get_option('wpshop_product_category_'.$category_id );
-		$amount_min =  ( !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['min']) ) ? number_format($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['min'],2, '.', '') : 0;
-		$amount_max =  ( !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['max']) ) ? number_format($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['max'],2, '.', '') : 0;
+		$category_product_ids = wpshop_categories::get_product_of_category($category_id);
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		$amount_min = (!empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['min'])) ? number_format($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['min'], 2, '.', '') : 0;
+		$amount_max = (!empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['max'])) ? number_format($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['max'], 2, '.', '') : 0;
 
-		if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
+		if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_slider") );
+			require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_slider"));
 			$output = ob_get_contents();
 			ob_end_clean();
 
@@ -270,17 +270,17 @@ 
 	 * @param std_object $attribute_def
 	 * @param array $current_category_child
 	 */
-	function save_values_for_list_filterable_attribute( $category_id, $attribute_def, $current_category_children ) {
+	function save_values_for_list_filterable_attribute($category_id, $attribute_def, $current_category_children) {
 		global $wpdb;
-		$category_option = get_option('wpshop_product_category_'.$category_id);
-		$products = wpshop_categories::get_product_of_category( $category_id );
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		$products = wpshop_categories::get_product_of_category($category_id);
 		/** If there are sub-categories take all products of sub-categories **/
-		if ( !empty($current_category_children) ) {
-			foreach ( $current_category_children as $current_category_child ) {
-				$sub_categories_product_ids = wpshop_categories::get_product_of_category( $current_category_child->term_taxonomy_id );
-				if ( !empty($sub_categories_product_ids) ) {
-					foreach ( $sub_categories_product_ids as $sub_categories_product_id ) {
-						if ( !in_array($sub_categories_product_id, $products) ) {
+		if (!empty($current_category_children)) {
+			foreach ($current_category_children as $current_category_child) {
+				$sub_categories_product_ids = wpshop_categories::get_product_of_category($current_category_child->term_taxonomy_id);
+				if (!empty($sub_categories_product_ids)) {
+					foreach ($sub_categories_product_ids as $sub_categories_product_id) {
+						if (!in_array($sub_categories_product_id, $products)) {
 							$products[] = $sub_categories_product_id;
 						}
 					}
@@ -289,33 +289,33 @@ 
 		}
 
 
-		if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
+		if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
 			$category_option['wpshop_category_filterable_attributes'][$attribute_def->id] = array();
 		}
 
 
-		if ( !empty( $attribute_def) ){
+		if (!empty($attribute_def)) {
 			$available_attribute_values = array();
 			$test = array();
-			foreach ( $products as $product ) {
-				$available_attribute_values = array_merge( $available_attribute_values, wpshop_attributes::get_affected_value_for_list( $attribute_def->code, $product, $attribute_def->data_type_to_use) ) ;
+			foreach ($products as $product) {
+				$available_attribute_values = array_merge($available_attribute_values, wpshop_attributes::get_affected_value_for_list($attribute_def->code, $product, $attribute_def->data_type_to_use));
 			}
 
 			$available_attribute_values = array_flip($available_attribute_values);
 			$data_to_save = array();
-			if ( !empty($available_attribute_values) ) {
+			if (!empty($available_attribute_values)) {
 				$data_to_save = array();
-				foreach( $available_attribute_values as $k => $available_attribute_value ) {
-					if (  $attribute_def->data_type_to_use == 'internal' ) {
-						$attribute_name = get_the_title( $k );
+				foreach ($available_attribute_values as $k => $available_attribute_value) {
+					if ($attribute_def->data_type_to_use == 'internal') {
+						$attribute_name = get_the_title($k);
 					}
 					else {
-						$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d AND id = %d', $attribute_def->id, $k);
+						$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND id = %d', $attribute_def->id, $k);
 
-						$attribute_name = $wpdb->get_var( $query );
+						$attribute_name = $wpdb->get_var($query);
 					}
-					if (!empty($attribute_name) && !empty($k) ) {
-						if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && isset($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
+					if (!empty($attribute_name) && !empty($k)) {
+						if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && isset($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
 							$data_to_save[$k] = $attribute_name;
 							$category_option['wpshop_category_filterable_attributes'][$attribute_def->id] = $data_to_save;
 						}
@@ -323,7 +323,7 @@ 
 				}
 			}
 		}
-		update_option('wpshop_product_category_'.$category_id, $category_option);
+		update_option('wpshop_product_category_' . $category_id, $category_option);
 	}
 
 	/**
@@ -332,18 +332,18 @@ 
 	 * @param std_object $attribute_def
 	 * @param array $current_category_child
 	 */
-	function save_values_for_integer_filterable_attribute ( $category_id, $attribute_def, $current_category_child ) {
+	function save_values_for_integer_filterable_attribute($category_id, $attribute_def, $current_category_child) {
 		$first = true;
-		$category_option = get_option('wpshop_product_category_'.$category_id);
-		$category_product_ids = wpshop_categories::get_product_of_category( $category_id );
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		$category_product_ids = wpshop_categories::get_product_of_category($category_id);
 		$min_value = $max_value = 0;
 		/** If there are sub-categories take all products of sub-categories **/
-		if ( !empty($current_category_children) ) {
-			foreach ( $current_category_children as $current_category_child ) {
-				$sub_categories_product_ids = wpshop_categories::get_product_of_category( $current_category_child->term_taxonomy_id );
-				if ( !empty($sub_categories_product_ids) ) {
-					foreach ( $sub_categories_product_ids as $sub_categories_product_id ) {
-						if ( !in_array($sub_categories_product_id, $category_product_ids) ) {
+		if (!empty($current_category_children)) {
+			foreach ($current_category_children as $current_category_child) {
+				$sub_categories_product_ids = wpshop_categories::get_product_of_category($current_category_child->term_taxonomy_id);
+				if (!empty($sub_categories_product_ids)) {
+					foreach ($sub_categories_product_ids as $sub_categories_product_id) {
+						if (!in_array($sub_categories_product_id, $category_product_ids)) {
 							$category_product_ids[] = $sub_categories_product_id;
 						}
 					}
@@ -352,45 +352,45 @@ 
 		}
 
 		/** For each product of category check the value **/
-		if ( !empty( $category_product_ids ) ) {
+		if (!empty($category_product_ids)) {
 			$price_piloting_option = get_option('wpshop_shop_price_piloting');
 			foreach ($category_product_ids as $category_product_id) {
 
-				if ( $attribute_def->code == WPSHOP_PRODUCT_PRICE_TTC || $attribute_def->code == WPSHOP_PRODUCT_PRICE_HT ) {
+				if ($attribute_def->code == WPSHOP_PRODUCT_PRICE_TTC || $attribute_def->code == WPSHOP_PRODUCT_PRICE_HT) {
 
 					$product_infos = wpshop_products::get_product_data($category_product_id);
 					$product_price_infos = wpshop_prices::check_product_price($product_infos);
-					if (!empty($product_price_infos) && !empty($product_price_infos['fork_price']) && !empty($product_price_infos['fork_price']['have_fork_price']) && $product_price_infos['fork_price']['have_fork_price'] ) {
+					if (!empty($product_price_infos) && !empty($product_price_infos['fork_price']) && !empty($product_price_infos['fork_price']['have_fork_price']) && $product_price_infos['fork_price']['have_fork_price']) {
 
 
-						$max_value = ( !empty($product_price_infos['fork_price']['max_product_price']) && $product_price_infos['fork_price']['max_product_price'] > $max_value ) ? $product_price_infos['fork_price']['max_product_price'] : $max_value;
-						$min_value = (!empty($product_price_infos['fork_price']['min_product_price']) && ( ( $product_price_infos['fork_price']['min_product_price'] < $min_value) || $first ) ) ?  $product_price_infos['fork_price']['min_product_price'] : $min_value;
+						$max_value = (!empty($product_price_infos['fork_price']['max_product_price']) && $product_price_infos['fork_price']['max_product_price'] > $max_value) ? $product_price_infos['fork_price']['max_product_price'] : $max_value;
+						$min_value = (!empty($product_price_infos['fork_price']['min_product_price']) && (($product_price_infos['fork_price']['min_product_price'] < $min_value) || $first)) ? $product_price_infos['fork_price']['min_product_price'] : $min_value;
 					}
 					else {
-						if (!empty($product_price_infos) && !empty($product_price_infos['discount']) && !empty($product_price_infos['discount']['discount_exist'] ) && $product_price_infos['discount']['discount_exist'] ) {
-							$product_data = (!empty($price_piloting_option) &&  $price_piloting_option == 'HT')  ? $product_price_infos['discount']['discount_et_price'] : $product_price_infos['discount']['discount_ati_price'];
+						if (!empty($product_price_infos) && !empty($product_price_infos['discount']) && !empty($product_price_infos['discount']['discount_exist']) && $product_price_infos['discount']['discount_exist']) {
+							$product_data = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $product_price_infos['discount']['discount_et_price'] : $product_price_infos['discount']['discount_ati_price'];
 
 						}
 						else {
 
-							$product_data = (!empty($price_piloting_option) &&  $price_piloting_option == 'HT')  ? $product_price_infos['et'] : $product_price_infos['ati'];
+							$product_data = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $product_price_infos['et'] : $product_price_infos['ati'];
 						}
-						$max_value = ( !empty($product_data) && $product_data > $max_value ) ? $product_data : $max_value;
-						$min_value = (!empty($product_data) && ( ( $product_data < $min_value) || $first )  ) ?  $product_data : $min_value;
+						$max_value = (!empty($product_data) && $product_data > $max_value) ? $product_data : $max_value;
+						$min_value = (!empty($product_data) && (($product_data < $min_value) || $first)) ? $product_data : $min_value;
 					}
 				}
 				else {
 					$product_postmeta = get_post_meta($category_product_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
 					$product_data = $product_postmeta[$attribute_def->code];
-					$max_value = ( !empty($product_data) && $product_data > $max_value ) ? $product_data : $max_value;
-					$min_value = (!empty($product_data) && ( ( $product_data < $min_value) || $first ) ) ?  $product_data : $min_value;
+					$max_value = (!empty($product_data) && $product_data > $max_value) ? $product_data : $max_value;
+					$min_value = (!empty($product_data) && (($product_data < $min_value) || $first)) ? $product_data : $min_value;
 				}
 				$first = false;
 			}
 			$category_option['wpshop_category_filterable_attributes'][$attribute_def->id] = array('min' => $min_value, 'max' => $max_value);
 		}
 		/** Update the category option **/
-		update_option('wpshop_product_category_'.$category_id, $category_option);
+		update_option('wpshop_product_category_' . $category_id, $category_option);
 	}
 
 	/**
@@ -399,66 +399,66 @@ 
 	 * @param std_object $attribute_def
 	 * @param array $current_category_child
 	 */
-	function save_values_for_text_filterable_attribute ( $category_id, $attribute_def, $current_category_child ) {
-		$category_option = get_option('wpshop_product_category_'.$category_id);
-		$category_product_ids = wpshop_categories::get_product_of_category( $category_id );
+	function save_values_for_text_filterable_attribute($category_id, $attribute_def, $current_category_child) {
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		$category_product_ids = wpshop_categories::get_product_of_category($category_id);
 		/** If there are sub-categories take all products of sub-categories **/
 		$list_values = array();
-		if ( !empty($current_category_children) ) {
-			foreach ( $current_category_children as $current_category_child ) {
-				$sub_categories_product_ids = wpshop_categories::get_product_of_category( $current_category_child->term_taxonomy_id );
-				if ( !empty($sub_categories_product_ids) ) {
-					foreach ( $sub_categories_product_ids as $sub_categories_product_id ) {
-						if ( !in_array($sub_categories_product_id, $category_product_ids) ) {
+		if (!empty($current_category_children)) {
+			foreach ($current_category_children as $current_category_child) {
+				$sub_categories_product_ids = wpshop_categories::get_product_of_category($current_category_child->term_taxonomy_id);
+				if (!empty($sub_categories_product_ids)) {
+					foreach ($sub_categories_product_ids as $sub_categories_product_id) {
+						if (!in_array($sub_categories_product_id, $category_product_ids)) {
 							$category_product_ids[] = $sub_categories_product_id;
 						}
 					}
 				}
 			}
 		}
-		if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
-			if ( !empty( $category_product_ids ) ) {
+		if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
+			if (!empty($category_product_ids)) {
 				$product_data = '';
-				foreach ( $category_product_ids as $category_product_id ) {
+				foreach ($category_product_ids as $category_product_id) {
 					$product_postmeta = get_post_meta($category_product_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
-					$product_data = ( !empty($product_postmeta[$attribute_def->code]) ) ? $product_postmeta[$attribute_def->code] : '';
-					if ( !in_array( $product_data,  $list_values) ) {
+					$product_data = (!empty($product_postmeta[$attribute_def->code])) ? $product_postmeta[$attribute_def->code] : '';
+					if (!in_array($product_data, $list_values)) {
 						$list_values[] = $product_data;
-						if ( !empty($product_data) ) {
+						if (!empty($product_data)) {
 							$category_option['wpshop_category_filterable_attributes'][$attribute_def->id][] = $product_data;
 						}
 					}
 				}
 			}
 		}
-		update_option('wpshop_product_category_'.$category_id, $category_option);
+		update_option('wpshop_product_category_' . $category_id, $category_option);
 	}
 
 	/**
 	 * Save the price which is displayed on website
 	 */
-	public static function save_displayed_price_meta( $product_id = 0 ) {
-		$ID = !empty( $_POST['ID'] ) ? (int) $_POST['ID'] : 0;
-		$post_type = !empty( $_POST['post_type'] ) ? sanitize_text_field( $_POST['post_type'] ) : '';
+	public static function save_displayed_price_meta($product_id = 0) {
+		$ID = !empty($_POST['ID']) ? (int)$_POST['ID'] : 0;
+		$post_type = !empty($_POST['post_type']) ? sanitize_text_field($_POST['post_type']) : '';
 
-		if ( !empty( $product_id ) || ( !empty( $ID ) && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) ) {
-			$product_id = !empty( $product_id ) ? $product_id : $ID;
+		if (!empty($product_id) || (!empty($ID) && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)) {
+			$product_id = !empty($product_id) ? $product_id : $ID;
 
 			$price_piloting = get_option('wpshop_shop_price_piloting');
 			$product_data = wpshop_products::get_product_data($product_id);
 			$price_infos = wpshop_prices::check_product_price($product_data);
 
-			if ( !empty($price_infos) ) {
-				if ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) ) {
-					$displayed_price = ( !empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['discount']['discount_et_price'] : $price_infos['discount']['discount_ati_price'];
+			if (!empty($price_infos)) {
+				if (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist'])) {
+					$displayed_price = (!empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['discount']['discount_et_price'] : $price_infos['discount']['discount_ati_price'];
 				}
-				else if( !empty($price_infos['fork_price']) && !empty($price_infos['fork_price']['have_fork_price']) ) {
+				else if (!empty($price_infos['fork_price']) && !empty($price_infos['fork_price']['have_fork_price'])) {
 					$displayed_price = $price_infos['fork_price']['min_product_price'];
 				}
 				else {
-					$displayed_price = ( !empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['et'] : $price_infos['ati'];
+					$displayed_price = (!empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['et'] : $price_infos['ati'];
 				}
-				update_post_meta($product_id, '_wpshop_displayed_price', number_format($displayed_price,2, '.','') );
+				update_post_meta($product_id, '_wpshop_displayed_price', number_format($displayed_price, 2, '.', ''));
 			}
 		}
 	}
@@ -467,19 +467,19 @@ 
 	 * Save values for attributes
 	 * @param unknown_type $values
 	 */
-	function stock_values_for_attribute( $categories_id = array() ) {
-		@set_time_limit( 900 );
+	function stock_values_for_attribute($categories_id = array()) {
+		@set_time_limit(900);
 
-		$tax_input = ( !empty( $_POST['tax_input'] ) && !empty( $_POST['tax_input']['wpshop_product_category'] ) ) ? (int) $_POST['tax_input']['wpshop_product_category'] : '';
-		$post_type = !empty( $_POST['post_type'] ) ? sanitize_text_field( $_POST['post_type'] ) : '';
-		if (  !empty( $tax_input ) && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
+		$tax_input = (!empty($_POST['tax_input']) && !empty($_POST['tax_input']['wpshop_product_category'])) ? (int)$_POST['tax_input']['wpshop_product_category'] : '';
+		$post_type = !empty($_POST['post_type']) ? sanitize_text_field($_POST['post_type']) : '';
+		if (!empty($tax_input) && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
 			$categories_id = $tax_input;
 		}
 
-		if ( !empty( $categories_id )  ) {
-			if ( $categories_id && is_array($categories_id) ) {
-				foreach( $categories_id as $taxonomy_id ) {
-					if ( $taxonomy_id != 0 ) {
+		if (!empty($categories_id)) {
+			if ($categories_id && is_array($categories_id)) {
+				foreach ($categories_id as $taxonomy_id) {
+					if ($taxonomy_id != 0) {
 						$current_category_children = array();
 						$args = array(
 								'type'		=> WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
@@ -488,23 +488,23 @@ 
 						);
 						$current_category_children = get_categories($args);
 
-						$category_option = get_option('wpshop_product_category_'.$taxonomy_id);
-						if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && is_array($category_option['wpshop_category_filterable_attributes']) ) {
-							foreach ( $category_option['wpshop_category_filterable_attributes'] as $k => $filterable_attribute ) {
+						$category_option = get_option('wpshop_product_category_' . $taxonomy_id);
+						if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && is_array($category_option['wpshop_category_filterable_attributes'])) {
+							foreach ($category_option['wpshop_category_filterable_attributes'] as $k => $filterable_attribute) {
 								$attribute_def = wpshop_attributes::getElement($k);
-								if ( !empty( $attribute_def) ) {
-									switch ( $attribute_def->frontend_input ) {
+								if (!empty($attribute_def)) {
+									switch ($attribute_def->frontend_input) {
 										case 'text' :
-											if ( $attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
-												$this->save_values_for_integer_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
+											if ($attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
+												$this->save_values_for_integer_filterable_attribute($taxonomy_id, $attribute_def, $current_category_children);
 											}
 											else {
-												$this->save_values_for_text_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
+												$this->save_values_for_text_filterable_attribute($taxonomy_id, $attribute_def, $current_category_children);
 											}
 											break;
 
 										case 'select' : case 'checkbox' : case 'radio' : case 'multiple-select' :
-											$this->save_values_for_list_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
+											$this->save_values_for_list_filterable_attribute($taxonomy_id, $attribute_def, $current_category_children);
 											break;
 
 									}
@@ -522,22 +522,22 @@ 
 	 * @param integer $category_id
 	 * @return array
 	 */
-	function pick_up_filter_search_elements_type ( $category_id ) {
+	function pick_up_filter_search_elements_type($category_id) {
 		$filter_search_elements = array();
-		if ( !empty($category_id) ) {
-			$category_option =  get_option('wpshop_product_category_'.$category_id);
-			if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) ) {
-				foreach ( $category_option['wpshop_category_filterable_attributes'] as $k => $attribute ) {
+		if (!empty($category_id)) {
+			$category_option = get_option('wpshop_product_category_' . $category_id);
+			if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes'])) {
+				foreach ($category_option['wpshop_category_filterable_attributes'] as $k => $attribute) {
 					$attribute_def = wpshop_attributes::getElement($k);
-					if ( !empty($attribute_def) ) {
-						if ( $attribute_def->frontend_input == 'text' ) {
-							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'fork_values');
+					if (!empty($attribute_def)) {
+						if ($attribute_def->frontend_input == 'text') {
+							$filter_search_elements['_' . $attribute_def->code] = array('type' => 'fork_values');
 						}
-						elseif( in_array( $attribute_def->frontend_input, array('checkbox', 'multiple-select', 'radio', 'select') ) ) {
-							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'multiple_select_value');
+						elseif (in_array($attribute_def->frontend_input, array('checkbox', 'multiple-select', 'radio', 'select'))) {
+							$filter_search_elements['_' . $attribute_def->code] = array('type' => 'multiple_select_value');
 						}
-						elseif ( !in_array($attribute_def->frontend_input, array('hidden', 'textarea', 'password') ) )  {
-							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'select_value');
+						elseif (!in_array($attribute_def->frontend_input, array('hidden', 'textarea', 'password'))) {
+							$filter_search_elements['_' . $attribute_def->code] = array('type' => 'select_value');
 						}
 					}
 				}
@@ -549,28 +549,28 @@ 
 	/**
 	 * AJAX - Action to search with selected attributes values
 	 */
-	function wpshop_ajax_filter_search_action () {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+	function wpshop_ajax_filter_search_action() {
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_filter_search_action' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wpshop_ajax_filter_search_action'))
 			wp_die();
 
 		global $wpdb;
-		$category_id =  !empty($_POST['wpshop_filter_search_category_id']) ? wpshop_tools::varSanitizer( $_POST['wpshop_filter_search_category_id'] ) : 0;
+		$category_id = !empty($_POST['wpshop_filter_search_category_id']) ? wpshop_tools::varSanitizer($_POST['wpshop_filter_search_category_id']) : 0;
 		$filter_search_elements = $this->pick_up_filter_search_elements_type($category_id);
-		$page_id = ( !empty( $_POST['wpshop_filter_search_current_page_id']) ) ? wpshop_tools::varSanitizer( $_POST['wpshop_filter_search_current_page_id'] ) : 1;
+		$page_id = (!empty($_POST['wpshop_filter_search_current_page_id'])) ? wpshop_tools::varSanitizer($_POST['wpshop_filter_search_current_page_id']) : 1;
 		$request_cmd = '';
 		$status = false;
 		$data = array();
-		foreach ( $filter_search_elements as $k=>$filter_search_element) {
-			$search = isset( $_REQUEST['filter_search'.$k] ) ? sanitize_text_field( $_REQUEST['filter_search'.$k] ) : '';
-			$amount_min = !isset( $_REQUEST['amount_min'.$k] ) ? 0 : sanitize_text_field( $_REQUEST['amount_min'.$k] );
-			$amount_max = !isset( $_REQUEST['amount_max'.$k] ) ? 0 : sanitize_text_field( $_REQUEST['amount_max'.$k] );
-			$datatype_element = array( 'select_value', 'multiple_select_value', 'fork_values');
-			if ( (in_array($filter_search_element['type'], $datatype_element) && ( isset($search) && $search == 'all_attribute_values' ) ) ||
-				( ($filter_search_element['type'] == 'select_value' || $filter_search_element['type'] == 'multiple_select_value' ) &&  $search == '' ) ||
-				( $filter_search_element['type'] == 'fork_values' && ( $amount_min == 0 || $amount_max == 0 ) ) ) {
-				unset( $filter_search_elements[$k]);
+		foreach ($filter_search_elements as $k=>$filter_search_element) {
+			$search = isset($_REQUEST['filter_search' . $k]) ? sanitize_text_field($_REQUEST['filter_search' . $k]) : '';
+			$amount_min = !isset($_REQUEST['amount_min' . $k]) ? 0 : sanitize_text_field($_REQUEST['amount_min' . $k]);
+			$amount_max = !isset($_REQUEST['amount_max' . $k]) ? 0 : sanitize_text_field($_REQUEST['amount_max' . $k]);
+			$datatype_element = array('select_value', 'multiple_select_value', 'fork_values');
+			if ((in_array($filter_search_element['type'], $datatype_element) && (isset($search) && $search == 'all_attribute_values')) ||
+				(($filter_search_element['type'] == 'select_value' || $filter_search_element['type'] == 'multiple_select_value') && $search == '') ||
+				($filter_search_element['type'] == 'fork_values' && ($amount_min == 0 || $amount_max == 0))) {
+				unset($filter_search_elements[$k]);
 			}
 		}
 		$request_cmd = '';
@@ -589,8 +589,8 @@ 
 		/** Construct the array for SELECT query IN **/
 		$categories_id = array();
 		$categories_id[] = $category_id;
-		if ( !empty($current_category_children) ) {
-			foreach ( $current_category_children as $current_category_child ) {
+		if (!empty($current_category_children)) {
+			foreach ($current_category_children as $current_category_child) {
 				$categories_id[] = $current_category_child->term_taxonomy_id;
 			}
 		}
@@ -599,55 +599,55 @@ 
 		$array_for_query = implode(',', $categories_id);
 
 		/** SQL request Construct for pick up all product with one of filter search element value **/
-		if ( !empty( $filter_search_elements ) ) {
-			foreach ( $filter_search_elements as $k=>$filter_search_element ) {
-				$search = isset( $_REQUEST['filter_search'.$k] ) ? $_REQUEST['filter_search'.$k] : '';
-				$amount_min = !isset( $_REQUEST['amount_min'.$k] ) ? 0 : sanitize_text_field( $_REQUEST['amount_min'.$k] );
-				$amount_max = !isset( $_REQUEST['amount_max'.$k] ) ? 0 : sanitize_text_field( $_REQUEST['amount_max'.$k] );
-
-				if ( !empty($filter_search_element['type']) && !empty($search) && $filter_search_element['type'] == 'select_value' && $search != 'all_attribute_values') {
-					$request_cmd .= 'SELECT meta_key, post_id FROM ' .$wpdb->postmeta. ' INNER JOIN ' .$wpdb->posts. ' ON  post_id = ID WHERE (meta_key = "'.$k.'" AND meta_value = "'.$search.'") AND post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'" AND post_status = "publish" ';
-					$request_cmd .= ' AND post_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
+		if (!empty($filter_search_elements)) {
+			foreach ($filter_search_elements as $k=>$filter_search_element) {
+				$search = isset($_REQUEST['filter_search' . $k]) ? $_REQUEST['filter_search' . $k] : '';
+				$amount_min = !isset($_REQUEST['amount_min' . $k]) ? 0 : sanitize_text_field($_REQUEST['amount_min' . $k]);
+				$amount_max = !isset($_REQUEST['amount_max' . $k]) ? 0 : sanitize_text_field($_REQUEST['amount_max' . $k]);
+
+				if (!empty($filter_search_element['type']) && !empty($search) && $filter_search_element['type'] == 'select_value' && $search != 'all_attribute_values') {
+					$request_cmd .= 'SELECT meta_key, post_id FROM ' . $wpdb->postmeta . ' INNER JOIN ' . $wpdb->posts . ' ON  post_id = ID WHERE (meta_key = "' . $k . '" AND meta_value = "' . $search . '") AND post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '" AND post_status = "publish" ';
+					$request_cmd .= ' AND post_id IN (SELECT object_id FROM ' . $wpdb->term_relationships . ' WHERE term_taxonomy_id IN (' . $array_for_query . ') ) ';
 				}
-				else if($filter_search_element['type'] == 'fork_values') {
-					$request_cmd .= 'SELECT meta_key, post_id FROM ' .$wpdb->postmeta. ' INNER JOIN ' .$wpdb->posts. ' ON  post_id = ID WHERE (meta_key = "'.( ( !empty($k) && $k == '_product_price' ) ? '_wpshop_displayed_price' : $k).'" AND meta_value BETWEEN '.$amount_min.' AND '.$amount_max.') AND post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'" AND post_status = "publish"';
-					$request_cmd .= ' AND post_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
+				else if ($filter_search_element['type'] == 'fork_values') {
+					$request_cmd .= 'SELECT meta_key, post_id FROM ' . $wpdb->postmeta . ' INNER JOIN ' . $wpdb->posts . ' ON  post_id = ID WHERE (meta_key = "' . ((!empty($k) && $k == '_product_price') ? '_wpshop_displayed_price' : $k) . '" AND meta_value BETWEEN ' . $amount_min . ' AND ' . $amount_max . ') AND post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '" AND post_status = "publish"';
+					$request_cmd .= ' AND post_id IN (SELECT object_id FROM ' . $wpdb->term_relationships . ' WHERE term_taxonomy_id IN (' . $array_for_query . ') ) ';
 				}
-				else if( $filter_search_element['type'] == 'multiple_select_value' ) {
+				else if ($filter_search_element['type'] == 'multiple_select_value') {
 					/** Check the attribute id **/
 					$attribute_def = wpshop_attributes::getElement(substr($k, 1), "'valid'", 'code');
-					if ( !empty($attribute_def) ) {
-						$request_cmd .= 'SELECT CONCAT("_", code) AS meta_key, ATT_INT.entity_id AS post_id FROM ' .WPSHOP_DBT_ATTRIBUTE. ', '.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER.' AS ATT_INT WHERE attribute_id = id AND attribute_id = '.$attribute_def->id;
+					if (!empty($attribute_def)) {
+						$request_cmd .= 'SELECT CONCAT("_", code) AS meta_key, ATT_INT.entity_id AS post_id FROM ' . WPSHOP_DBT_ATTRIBUTE . ', ' . WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . ' AS ATT_INT WHERE attribute_id = id AND attribute_id = ' . $attribute_def->id;
 						$first = true;
-						if ( !empty($search) && is_array($search) ){
-							foreach ( $search as $r ) {
-								if ( $first) {
-									$request_cmd .= ' AND (value ="' . $r. '"';
+						if (!empty($search) && is_array($search)) {
+							foreach ($search as $r) {
+								if ($first) {
+									$request_cmd .= ' AND (value ="' . $r . '"';
 									$first = false;
 								}
 								else {
-									$request_cmd .= ' OR value ="' . $r. '"';
+									$request_cmd .= ' OR value ="' . $r . '"';
 								}
 							}
 							$request_cmd .= ')';
 						}
-						elseif(  !empty($search) )  {
+						elseif (!empty($search)) {
 							$request_cmd .= ' AND (value ="' . $search . '" )';
 						}
-						$request_cmd .= ' AND ATT_INT.entity_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
+						$request_cmd .= ' AND ATT_INT.entity_id IN (SELECT object_id FROM ' . $wpdb->term_relationships . ' WHERE term_taxonomy_id IN (' . $array_for_query . ') ) ';
 
 
 					}
 				}
 
 
-				if ($i < count($filter_search_elements) ) {
+				if ($i < count($filter_search_elements)) {
 					$request_cmd .= ' UNION ';
 				}
 				$i++;
 			}
 		} else {
-			$request_cmd .= 'SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.')';
+			$request_cmd .= 'SELECT object_id FROM ' . $wpdb->term_relationships . ' WHERE term_taxonomy_id IN (' . $array_for_query . ')';
 		}
 		/** SQL Request execution **/
 		$query = $wpdb->prepare($request_cmd, '');
@@ -661,9 +661,9 @@ 
 
 		$last = '';
 		/** Transform the query result array **/
-		foreach ( $results as $result ) {
-			$result->meta_key = ( !empty($result->meta_key) && $result->meta_key == '_wpshop_displayed_price' ) ? '_product_price' : $result->meta_key;
-			if ( $last != $result->meta_key ){
+		foreach ($results as $result) {
+			$result->meta_key = (!empty($result->meta_key) && $result->meta_key == '_wpshop_displayed_price') ? '_product_price' : $result->meta_key;
+			if ($last != $result->meta_key) {
 				$filter_search_elements[$result->meta_key]['count'] = 1;
 				$last = $result->meta_key;
 			}
@@ -677,12 +677,12 @@ 
 		/** Check the smaller array of attributes **/
 		$smaller_array = '';
 		$smaller_array_count = -1;
-		foreach ( $filter_search_elements as $k=>$filter_search_element ) {
-			if ( empty($filter_search_element['count']) ) {
+		foreach ($filter_search_elements as $k=>$filter_search_element) {
+			if (empty($filter_search_element['count'])) {
 				$smaller_array_count = 0;
 				$smaller_array = $k;
 			}
-			elseif( $smaller_array_count == -1 || $filter_search_element['count'] <= $smaller_array_count ) {
+			elseif ($smaller_array_count == -1 || $filter_search_element['count'] <= $smaller_array_count) {
 				$smaller_array_count = $filter_search_element['count'];
 				$smaller_array = $k;
 			}
@@ -690,21 +690,21 @@ 
 		}
 
 		/** Compare the smaller array with the others **/
-		if ( !empty($smaller_array_count) ) {
+		if (!empty($smaller_array_count)) {
 			$temp_tab = $filter_search_elements[$smaller_array]['values'];
-			foreach ( $filter_search_elements as $filter_search) {
-				foreach ( $temp_tab as $value ) {
-					if ( !in_array($value, $filter_search['values']) ) {
+			foreach ($filter_search_elements as $filter_search) {
+				foreach ($temp_tab as $value) {
+					if (!in_array($value, $filter_search['values'])) {
 						/** If value don't exist in the smaller array, delete it **/
 						$key = array_key_exists($value, $temp_tab);
-						if ( $key ) {
+						if ($key) {
 							unset($temp_tab[$value]);
 						}
 					}
 				}
 			}
 			/** Final result to display the products **/
-			if ( !empty( $temp_tab) ) {
+			if (!empty($temp_tab)) {
 				$final_result = $temp_tab;
 			}
 		}
@@ -713,21 +713,21 @@ 
 		}
 
 		$products_count = count($final_result);
-		$products_count = sprintf(__('%s products corresponds to your search.', 'wpshop'),$products_count) ;
+		$products_count = sprintf(__('%s products corresponds to your search.', 'wpshop'), $products_count);
 
 		/** If there is products for this filter search **/
 		$status = true;
-		if ( !empty($final_result) ) {
+		if (!empty($final_result)) {
 			$data['status'] = true;
-			$data['result']  = do_shortcode( '[wpshop_products pid="' . implode(',', $final_result) . '" cid="' . $category_id . '" container="no" ]' ) ;
+			$data['result'] = do_shortcode('[wpshop_products pid="' . implode(',', $final_result) . '" cid="' . $category_id . '" container="no" ]');
 			$data['products_count'] = $products_count;
 		}
 		else {
 			$data['status'] = false;
-			$data['result'] = '<div class="container_product_listing">'.__('There is no product for this filter search.', 'wpshop').'</div>';
+			$data['result'] = '<div class="container_product_listing">' . __('There is no product for this filter search.', 'wpshop') . '</div>';
 			$data['products_count'] = __('No products corresponds to your search', 'wpshop');
 		}
-		echo json_encode( $data );
+		echo json_encode($data);
 		die();
 	}
 }

Braces +27 added lines, -43 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_filter_search {
 
 	/** Define the main directory containing the template for the current plugin
@@ -106,8 +108,7 @@ 
 				case 'text' :
 					if ( $attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
 						return $this->get_filter_element_for_integer_data( $attribute_def, $category_id, $current_category_children );
-					}
-					else {
+					} else {
 						return $this->get_filter_element_for_text_data( $attribute_def, $category_id, $current_category_children );
 					}
 					break;
@@ -187,8 +188,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				foreach ( $attributes_options as $attributes_option ) {
 					if ( in_array($attributes_option->label, $available_attribute_values) ) {
 						$key_value = array_search( $attributes_option->label, $available_attribute_values);
@@ -224,8 +224,7 @@ 
 							require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_multiple_select") );
 							$output = ob_get_contents();
 							ob_end_clean();
-						}
-						else {
+						} else {
 							ob_start();
 							require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox") );
 							$output = ob_get_contents();
@@ -308,8 +307,7 @@ 
 				foreach( $available_attribute_values as $k => $available_attribute_value ) {
 					if (  $attribute_def->data_type_to_use == 'internal' ) {
 						$attribute_name = get_the_title( $k );
-					}
-					else {
+					} else {
 						$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d AND id = %d', $attribute_def->id, $k);
 
 						$attribute_name = $wpdb->get_var( $query );
@@ -365,21 +363,18 @@ 
 
 						$max_value = ( !empty($product_price_infos['fork_price']['max_product_price']) && $product_price_infos['fork_price']['max_product_price'] > $max_value ) ? $product_price_infos['fork_price']['max_product_price'] : $max_value;
 						$min_value = (!empty($product_price_infos['fork_price']['min_product_price']) && ( ( $product_price_infos['fork_price']['min_product_price'] < $min_value) || $first ) ) ?  $product_price_infos['fork_price']['min_product_price'] : $min_value;
-					}
-					else {
+					} else {
 						if (!empty($product_price_infos) && !empty($product_price_infos['discount']) && !empty($product_price_infos['discount']['discount_exist'] ) && $product_price_infos['discount']['discount_exist'] ) {
 							$product_data = (!empty($price_piloting_option) &&  $price_piloting_option == 'HT')  ? $product_price_infos['discount']['discount_et_price'] : $product_price_infos['discount']['discount_ati_price'];
 
-						}
-						else {
+						} else {
 
 							$product_data = (!empty($price_piloting_option) &&  $price_piloting_option == 'HT')  ? $product_price_infos['et'] : $product_price_infos['ati'];
 						}
 						$max_value = ( !empty($product_data) && $product_data > $max_value ) ? $product_data : $max_value;
 						$min_value = (!empty($product_data) && ( ( $product_data < $min_value) || $first )  ) ?  $product_data : $min_value;
 					}
-				}
-				else {
+				} else {
 					$product_postmeta = get_post_meta($category_product_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
 					$product_data = $product_postmeta[$attribute_def->code];
 					$max_value = ( !empty($product_data) && $product_data > $max_value ) ? $product_data : $max_value;
@@ -451,11 +446,9 @@ 
 			if ( !empty($price_infos) ) {
 				if ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) ) {
 					$displayed_price = ( !empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['discount']['discount_et_price'] : $price_infos['discount']['discount_ati_price'];
-				}
-				else if( !empty($price_infos['fork_price']) && !empty($price_infos['fork_price']['have_fork_price']) ) {
+				} else if( !empty($price_infos['fork_price']) && !empty($price_infos['fork_price']['have_fork_price']) ) {
 					$displayed_price = $price_infos['fork_price']['min_product_price'];
-				}
-				else {
+				} else {
 					$displayed_price = ( !empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['et'] : $price_infos['ati'];
 				}
 				update_post_meta($product_id, '_wpshop_displayed_price', number_format($displayed_price,2, '.','') );
@@ -497,8 +490,7 @@ 
 										case 'text' :
 											if ( $attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
 												$this->save_values_for_integer_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
-											}
-											else {
+											} else {
 												$this->save_values_for_text_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
 											}
 											break;
@@ -532,11 +524,9 @@ 
 					if ( !empty($attribute_def) ) {
 						if ( $attribute_def->frontend_input == 'text' ) {
 							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'fork_values');
-						}
-						elseif( in_array( $attribute_def->frontend_input, array('checkbox', 'multiple-select', 'radio', 'select') ) ) {
+						} elseif( in_array( $attribute_def->frontend_input, array('checkbox', 'multiple-select', 'radio', 'select') ) ) {
 							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'multiple_select_value');
-						}
-						elseif ( !in_array($attribute_def->frontend_input, array('hidden', 'textarea', 'password') ) )  {
+						} elseif ( !in_array($attribute_def->frontend_input, array('hidden', 'textarea', 'password') ) )  {
 							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'select_value');
 						}
 					}
@@ -552,8 +542,9 @@ 
 	function wpshop_ajax_filter_search_action () {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_filter_search_action' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_filter_search_action' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$category_id =  !empty($_POST['wpshop_filter_search_category_id']) ? wpshop_tools::varSanitizer( $_POST['wpshop_filter_search_category_id'] ) : 0;
@@ -608,12 +599,10 @@ 
 				if ( !empty($filter_search_element['type']) && !empty($search) && $filter_search_element['type'] == 'select_value' && $search != 'all_attribute_values') {
 					$request_cmd .= 'SELECT meta_key, post_id FROM ' .$wpdb->postmeta. ' INNER JOIN ' .$wpdb->posts. ' ON  post_id = ID WHERE (meta_key = "'.$k.'" AND meta_value = "'.$search.'") AND post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'" AND post_status = "publish" ';
 					$request_cmd .= ' AND post_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
-				}
-				else if($filter_search_element['type'] == 'fork_values') {
+				} else if($filter_search_element['type'] == 'fork_values') {
 					$request_cmd .= 'SELECT meta_key, post_id FROM ' .$wpdb->postmeta. ' INNER JOIN ' .$wpdb->posts. ' ON  post_id = ID WHERE (meta_key = "'.( ( !empty($k) && $k == '_product_price' ) ? '_wpshop_displayed_price' : $k).'" AND meta_value BETWEEN '.$amount_min.' AND '.$amount_max.') AND post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'" AND post_status = "publish"';
 					$request_cmd .= ' AND post_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
-				}
-				else if( $filter_search_element['type'] == 'multiple_select_value' ) {
+				} else if( $filter_search_element['type'] == 'multiple_select_value' ) {
 					/** Check the attribute id **/
 					$attribute_def = wpshop_attributes::getElement(substr($k, 1), "'valid'", 'code');
 					if ( !empty($attribute_def) ) {
@@ -624,14 +613,12 @@ 
 								if ( $first) {
 									$request_cmd .= ' AND (value ="' . $r. '"';
 									$first = false;
-								}
-								else {
+								} else {
 									$request_cmd .= ' OR value ="' . $r. '"';
 								}
 							}
 							$request_cmd .= ')';
-						}
-						elseif(  !empty($search) )  {
+						} elseif(  !empty($search) )  {
 							$request_cmd .= ' AND (value ="' . $search . '" )';
 						}
 						$request_cmd .= ' AND ATT_INT.entity_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
@@ -666,9 +653,9 @@ 
 			if ( $last != $result->meta_key ){
 				$filter_search_elements[$result->meta_key]['count'] = 1;
 				$last = $result->meta_key;
+			} else {
+							$filter_search_elements[$result->meta_key]['count']++;
 			}
-			else
-				$filter_search_elements[$result->meta_key]['count']++;
 
 			$filter_search_elements[$result->meta_key]['values'][$result->post_id] = $result->post_id;
 		}
@@ -681,8 +668,7 @@ 
 			if ( empty($filter_search_element['count']) ) {
 				$smaller_array_count = 0;
 				$smaller_array = $k;
-			}
-			elseif( $smaller_array_count == -1 || $filter_search_element['count'] <= $smaller_array_count ) {
+			} elseif( $smaller_array_count == -1 || $filter_search_element['count'] <= $smaller_array_count ) {
 				$smaller_array_count = $filter_search_element['count'];
 				$smaller_array = $k;
 			}
@@ -707,8 +693,7 @@ 
 			if ( !empty( $temp_tab) ) {
 				$final_result = $temp_tab;
 			}
-		}
-		else {
+		} else {
 			$final_result = array();
 		}
 
@@ -721,8 +706,7 @@ 
 			$data['status'] = true;
 			$data['result']  = do_shortcode( '[wpshop_products pid="' . implode(',', $final_result) . '" cid="' . $category_id . '" container="no" ]' ) ;
 			$data['products_count'] = $products_count;
-		}
-		else {
+		} else {
 			$data['status'] = false;
 			$data['result'] = '<div class="container_product_listing">'.__('There is no product for this filter search.', 'wpshop').'</div>';
 			$data['products_count'] = __('No products corresponds to your search', 'wpshop');