Eoxia / wpshop

includes/modules/wps_product/controller/wps_product_ctr.php

Doc Comments -2 removed lines

@@ -257,8 +257,6 @@
 	 *
 	 * @param int $product_id L'id du produit
 	 * @param string $type Peut être varchar, integer, text, options, decimal, datetime
-	 * @param string $attribute_name Le code d'un attribut
-	 * @param string $attribute_value La valeur à mêttre à jour
 	 */
 	public function update_the_attribute_for_product($product_id, $type, $name_attribute, $value_attribute) {
 		global $wpdb;

Spacing +100 added lines, -100 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_product_ctr {
 
 	/**
@@ -8,19 +8,19 @@ 
 	 * @return void
 	 */
 	function __construct() {
-		add_action( 'admin_enqueue_scripts', array( &$this, 'callback_admin_enqueue_scripts' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'callback_admin_enqueue_scripts'));
 
-		add_shortcode( 'wps_product_caracteristics', array( $this, 'display_product_caracteristics_tab' ) );
-		add_shortcode( 'wpshop_product_caracteristics', array( $this, 'display_product_caracteristics_tab' ) );
-		add_shortcode( 'wps_product_discount_chip', array( $this, 'display_discount_chip' ) );
-		add_shortcode( 'wpshop_product_discount_chip', array( $this, 'display_discount_chip' ) );
+		add_shortcode('wps_product_caracteristics', array($this, 'display_product_caracteristics_tab'));
+		add_shortcode('wpshop_product_caracteristics', array($this, 'display_product_caracteristics_tab'));
+		add_shortcode('wps_product_discount_chip', array($this, 'display_discount_chip'));
+		add_shortcode('wpshop_product_discount_chip', array($this, 'display_discount_chip'));
 
-		add_shortcode( 'wpshop_product_title', array( $this, 'wpshop_product_title' ) );
-		add_shortcode( 'wpshop_product_content', array( $this, 'wpshop_product_content' ) );
-		add_shortcode( 'wpshop_product_thumbnail', array( $this, 'wpshop_product_thumbnail' ) );
+		add_shortcode('wpshop_product_title', array($this, 'wpshop_product_title'));
+		add_shortcode('wpshop_product_content', array($this, 'wpshop_product_content'));
+		add_shortcode('wpshop_product_thumbnail', array($this, 'wpshop_product_thumbnail'));
 
 		/** Product sheet Page **/
-		add_action( 'admin_post_wps_product_sheet', array( $this, 'wpshop_product_sheet_output' ) );
+		add_action('admin_post_wps_product_sheet', array($this, 'wpshop_product_sheet_output'));
 	}
 
 	/**
@@ -31,25 +31,25 @@ 
 		$module_folder = WPS_PRODUCT_PATH . '/modules/';
 
 		/**	Check if the defined directory exists for reading and including the different modules	*/
-		if( is_dir( $module_folder ) ) {
-			$parent_folder_content = scandir( $module_folder );
-			foreach ( $parent_folder_content as $folder ) {
-				if ( $folder && substr( $folder, 0, 1) != '.' && is_dir( $module_folder . $folder ) ) {
-					$child_folder_content = scandir( $module_folder . $folder );
-					if ( file_exists( $module_folder . $folder . '/' . $folder . '.php') ) {
-						$f =  $module_folder . $folder . '/' . $folder . '.php';
-						include( $f );
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
+			foreach ($parent_folder_content as $folder) {
+				if ($folder && substr($folder, 0, 1) != '.' && is_dir($module_folder . $folder)) {
+					$child_folder_content = scandir($module_folder . $folder);
+					if (file_exists($module_folder . $folder . '/' . $folder . '.php')) {
+						$f = $module_folder . $folder . '/' . $folder . '.php';
+						include($f);
 					}
 				}
 			}
 		}
 	}
 
-	public function callback_admin_enqueue_scripts( $hook ) {
-		if( $hook != 'tools_page_wpshop_tools' )
+	public function callback_admin_enqueue_scripts($hook) {
+		if ($hook != 'tools_page_wpshop_tools')
 			return;
 
-		wp_enqueue_script( 'wps_product_js', WPS_PRODUCT_URL . '/asset/js/backend.js', array( "jquery", "jquery-form" ), WPS_PRODUCT_VERSION );
+		wp_enqueue_script('wps_product_js', WPS_PRODUCT_URL . '/asset/js/backend.js', array("jquery", "jquery-form"), WPS_PRODUCT_VERSION);
 	}
 
 	/**
@@ -57,14 +57,14 @@ 
 	 * @param array $args
 	 * @return string
 	 */
-	function display_product_caracteristics_tab( $args ) {
+	function display_product_caracteristics_tab($args) {
 		$output = '';
-		if( !empty($args) && !empty($args['pid']) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 			$wps_product_mdl = new wps_product_mdl();
-			$product_atts_def = $wps_product_mdl->get_product_atts_def( $args['pid'] );
-			if( !empty($product_atts_def) ) {
+			$product_atts_def = $wps_product_mdl->get_product_atts_def($args['pid']);
+			if (!empty($product_atts_def)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_caracteristics_tab") );
+				require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_caracteristics_tab"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -77,14 +77,14 @@ 
 	 * @param array $args
 	 * @return string
 	 */
-	function display_discount_chip( $args ) {
+	function display_discount_chip($args) {
 		$output = '';
-		if( !empty($args) && !empty($args['pid']) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 			$wps_price = new wpshop_prices();
-			$discount_data = wpshop_prices::check_discount_for_product( $args['pid'] );
-			if( !empty($discount_data) ) {
+			$discount_data = wpshop_prices::check_discount_for_product($args['pid']);
+			if (!empty($discount_data)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_discount_chip") );
+				require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_discount_chip"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -102,39 +102,39 @@ 
 	 */
 	function check_stock($product_id, $cart_asked_quantity, $combined_variation_id = '') {
 		// Checking if combined variation ID exist and it is a simple option
-		if( !empty($combined_variation_id) && ( strpos($combined_variation_id, '__') !== false ) ) {
-			$var_id = explode( '__', $combined_variation_id);
+		if (!empty($combined_variation_id) && (strpos($combined_variation_id, '__') !== false)) {
+			$var_id = explode('__', $combined_variation_id);
 			$combined_variation_id = $var_id[1];
 		}
 
 
-		if ( !empty($combined_variation_id) ) {
+		if (!empty($combined_variation_id)) {
 
-			$variation_metadata = get_post_meta( $combined_variation_id, '_wpshop_product_metadata', true );
-			if ( isset($variation_metadata['product_stock']) ) {
+			$variation_metadata = get_post_meta($combined_variation_id, '_wpshop_product_metadata', true);
+			if (isset($variation_metadata['product_stock'])) {
 				$product_id = $combined_variation_id;
 			} else {
-				$product_id = wp_get_post_parent_id( $combined_variation_id );
-				$product_id = ( $product_id ) ? $product_id : $combined_variation_id;
+				$product_id = wp_get_post_parent_id($combined_variation_id);
+				$product_id = ($product_id) ? $product_id : $combined_variation_id;
 			}
 		}
 		$product_data = wpshop_products::get_product_data($product_id, false, '"publish", "free_product"');
 
-		if(!empty($product_data)) {
+		if (!empty($product_data)) {
 			$manage_stock = !empty($product_data['manage_stock']) ? $product_data['manage_stock'] : '';
 
-			$product_post_type = get_post_type( $product_id );
+			$product_post_type = get_post_type($product_id);
 
-			if ( $product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-				$parent_def = wpshop_products::get_parent_variation( $product_id );
-				if ( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+			if ($product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+				$parent_def = wpshop_products::get_parent_variation($product_id);
+				if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 					$parent_post = $parent_def['parent_post'];
 					$parent_product_data = wpshop_products::get_product_data($parent_post->ID);
-					$manage_stock = empty( $manage_stock ) ? $parent_product_data['manage_stock'] : $manage_stock;
+					$manage_stock = empty($manage_stock) ? $parent_product_data['manage_stock'] : $manage_stock;
 				}
 			}
-			$manage_stock_is_activated = (!empty($manage_stock) && ( strtolower(__($manage_stock, 'wpshop')) == strtolower(__('Yes', 'wpshop')) )) ? true : false;
-			$the_qty_is_in_stock = ( !empty($product_data['product_stock']) && $product_data['product_stock'] >= $cart_asked_quantity ) ? true : false ;
+			$manage_stock_is_activated = (!empty($manage_stock) && (strtolower(__($manage_stock, 'wpshop')) == strtolower(__('Yes', 'wpshop')))) ? true : false;
+			$the_qty_is_in_stock = (!empty($product_data['product_stock']) && $product_data['product_stock'] >= $cart_asked_quantity) ? true : false;
 
 			if (($manage_stock_is_activated && $the_qty_is_in_stock) OR !$manage_stock_is_activated) {
 				return true;
@@ -147,18 +147,18 @@ 
 	}
 
 	public static function get_inconsistent_product() {
-		$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
+		$price_piloting_option = get_option('wpshop_shop_price_piloting');
 
-		$entity_id 		= wpshop_entities::get_entity_identifier_from_code( 'wpshop_product' );
+		$entity_id = wpshop_entities::get_entity_identifier_from_code('wpshop_product');
 
-		$attribute_def	= wpshop_attributes::getElement( ( $price_piloting_option == 'TTC' ) ? 'product_price' : 'price_ht', "'valid'", 'code' );
-		$attribute_id	= $attribute_def->id;
+		$attribute_def = wpshop_attributes::getElement(($price_piloting_option == 'TTC') ? 'product_price' : 'price_ht', "'valid'", 'code');
+		$attribute_id = $attribute_def->id;
 
 		global $wpdb;
 
 		$wpdb->query('SET SESSION group_concat_max_len = 10000');
 
-		$query			= "
+		$query = "
 		SELECT 		post.ID, post.post_title, attr_val_dec.value as price_attribute, GROUP_CONCAT(postmeta.meta_key, '&sep&', postmeta.meta_value, '&&' ORDER BY postmeta.meta_key) as price
 			FROM 		$wpdb->posts as post
 		JOIN		$wpdb->postmeta as postmeta
@@ -171,15 +171,15 @@ 
 			AND			postmeta.meta_key IN( '_product_price', '_wps_price_infos', '_wpshop_displayed_price', '_wpshop_product_metadata' )
 		GROUP BY	post.ID";
 
-		$list_product	= $wpdb->get_results( $wpdb->prepare( $query, array( $entity_id, $attribute_id ) ) );
+		$list_product = $wpdb->get_results($wpdb->prepare($query, array($entity_id, $attribute_id)));
 
-		if( !empty( $list_product ) ) {
-			foreach( $list_product as $key_product => &$product ) {
+		if (!empty($list_product)) {
+			foreach ($list_product as $key_product => &$product) {
 				$product->price = explode('&&,', $product->price);
-				if(!empty($product->price) && is_array($product->price)) {
+				if (!empty($product->price) && is_array($product->price)) {
 					$array_price = array();
-					foreach($product->price as &$price) {
-						if(strpos( $price, '&&' ))
+					foreach ($product->price as &$price) {
+						if (strpos($price, '&&'))
 							$price = substr($price, 0, -2);
 
 						$tmp_price = explode('&sep&', $price);
@@ -187,35 +187,35 @@ 
 						$price = maybe_unserialize($tmp_price[1]);
 
 						/** _wpshop_product_metadata */
-						if( $key == '_wpshop_product_metadata' ) {
-							$array_price[$key] =  ( $price_piloting_option == 'TTC' ) ? $price['product_price'] : $price['price_ht'];
+						if ($key == '_wpshop_product_metadata') {
+							$array_price[$key] = ($price_piloting_option == 'TTC') ? $price['product_price'] : $price['price_ht'];
 						}
 
 						/** _wps_price_infos */
-						if( $key == '_wps_price_infos' ) {
-							$array_price[$key] = !empty( $price['PRODUCT_PRICE'] ) ? $price['PRODUCT_PRICE'] : '-';
+						if ($key == '_wps_price_infos') {
+							$array_price[$key] = !empty($price['PRODUCT_PRICE']) ? $price['PRODUCT_PRICE'] : '-';
 						}
 
-						if( $key == '_product_price' ) {
-							$array_price[$key] = ( $price_piloting_option == 'TTC' ) ? $price : '-';
+						if ($key == '_product_price') {
+							$array_price[$key] = ($price_piloting_option == 'TTC') ? $price : '-';
 						}
 
-						if ( $key == '_wpshop_displayed_price' ) {
+						if ($key == '_wpshop_displayed_price') {
 							$array_price[$key] = $price;
 						}
 						unset($price);
 					}
 
-					$array_meta_list = array( '_product_price', '_wps_price_infos', '_wpshop_displayed_price', '_wpshop_product_metadata', );
+					$array_meta_list = array('_product_price', '_wps_price_infos', '_wpshop_displayed_price', '_wpshop_product_metadata',);
 
-					foreach( $array_meta_list as $meta_list ) {
-						if( !array_key_exists( $meta_list, $array_price ) ) {
+					foreach ($array_meta_list as $meta_list) {
+						if (!array_key_exists($meta_list, $array_price)) {
 							$array_price[$meta_list] = 0;
 						}
 					}
 
 					$product->price = $array_price;
-					if( $product->price_attribute === $product->price['_wpshop_product_metadata'] ) {
+					if ($product->price_attribute === $product->price['_wpshop_product_metadata']) {
 						unset($list_product[$key_product]);
 					}
 
@@ -233,13 +233,13 @@ 
 	 * @param int $pid L'id du produit
 	 * @return WP_Post
 	 */
-	public function get_thumbnail ( $pid ) {
-		if( empty( $pid ) )
+	public function get_thumbnail($pid) {
+		if (empty($pid))
 			return null;
 
-		$thumbnail_id = get_post_meta( $pid, '_thumbnail_id', true );
+		$thumbnail_id = get_post_meta($pid, '_thumbnail_id', true);
 
-		if( empty( $thumbnail_id ) )
+		if (empty($thumbnail_id))
 			return null;
 
 		return $thumbnail_id;
@@ -252,9 +252,9 @@ 
 	 * @param array $array_data The array data [integer][barcode] = 0111100001
 	 */
 	public function update_attributes_for_product($product_id, $array_data) {
-		if(!empty($array_data)) {
-			foreach($array_data as $type => $array) {
-				foreach($array as $name_attribute => $value_attribute) {
+		if (!empty($array_data)) {
+			foreach ($array_data as $type => $array) {
+				foreach ($array as $name_attribute => $value_attribute) {
 					$this->update_the_attribute_for_product($product_id, $type, $name_attribute, $value_attribute);
 				}
 			}
@@ -278,7 +278,7 @@ 
 		$attribute_id = $wpdb->get_var($wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code="%s"', array($name_attribute)));
 
 		/** On vérifie s'il existe si c'est le cas, on update sinon on insert */
-		if(count($wpdb->get_row($wpdb->prepare('SELECT value_id FROM ' . WPSHOP_DBT_ATTRIBUTE . '_value_' . $type . ' WHERE entity_id=%d AND attribute_id IN(SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code="%s")', array($product_id, $name_attribute)))) > 0) {
+		if (count($wpdb->get_row($wpdb->prepare('SELECT value_id FROM ' . WPSHOP_DBT_ATTRIBUTE . '_value_' . $type . ' WHERE entity_id=%d AND attribute_id IN(SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code="%s")', array($product_id, $name_attribute)))) > 0) {
 			$wpdb->query(
 				$wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . '_value_' . $type . ' SET value="%s" WHERE entity_id=%d AND attribute_id=%d',
 					array($value_attribute, $product_id, $attribute_id)
@@ -304,13 +304,13 @@ 
 	 * @param array $args [ 'id' ] L'id du produit
 	 * @return string
 	 */
-	public function wpshop_product_title( $args ) {
-		$output = __( 'No product has been found.', 'wpshop' );
+	public function wpshop_product_title($args) {
+		$output = __('No product has been found.', 'wpshop');
 
-		if ( !empty( $args ) && !empty( $args['pid'] ) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 			global $wpdb;
 			$query = "SELECT post_title FROM {$wpdb->posts} WHERE ID = %d";
-			$output = $wpdb->get_var( $wpdb->prepare( $query, $args['pid'] ) );
+			$output = $wpdb->get_var($wpdb->prepare($query, $args['pid']));
 		}
 
 		return $output;
@@ -321,16 +321,16 @@ 
 	 * @param array $args [ 'id' ] L'id du produit
 	 * @return string
 	 */
-	public function wpshop_product_content( $args ) {
-		$output = __( 'No product has been found.', 'wpshop' );
+	public function wpshop_product_content($args) {
+		$output = __('No product has been found.', 'wpshop');
 
-		if ( !empty( $args ) && !empty( $args['pid'] ) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 			global $wpdb;
 			$query = "SELECT post_content FROM {$wpdb->posts} WHERE ID = %d";
-			$output = $wpdb->get_var( $wpdb->prepare( $query, $args['pid'] ) );
+			$output = $wpdb->get_var($wpdb->prepare($query, $args['pid']));
 		}
 
-		return nl2br( $output );
+		return nl2br($output);
 	}
 
 	/**
@@ -340,12 +340,12 @@ 
 	 * 						[ size ] La taille de l'image. Peut être défini comme : small, medium ou full
 	 * @return string
 	 */
-	public function wpshop_product_thumbnail( $args ) {
+	public function wpshop_product_thumbnail($args) {
 		$url_thumbnail = WPSHOP_DEFAULT_PRODUCT_PICTURE;
 		$size = '20%';
 
-		if ( !empty( $args ) && !empty( $args['size'] ) ) {
-			switch ( $args['size'] ) {
+		if (!empty($args) && !empty($args['size'])) {
+			switch ($args['size']) {
 				case 'small':
 					$size = '20%';
 					break;
@@ -360,20 +360,20 @@ 
 			}
 		}
 
-		if ( !empty( $args ) && !empty( $args['pid'] ) ) {
-			$thumbnail_id = $this->get_thumbnail( $args['pid'] );
+		if (!empty($args) && !empty($args['pid'])) {
+			$thumbnail_id = $this->get_thumbnail($args['pid']);
 
-			if( !empty( $thumbnail_id ) ) {
-				$attachment = get_post( $thumbnail_id );
+			if (!empty($thumbnail_id)) {
+				$attachment = get_post($thumbnail_id);
 
-				if( !empty( $attachment ) && !empty( $attachment->guid ) ) {
+				if (!empty($attachment) && !empty($attachment->guid)) {
 					$url_thumbnail = $attachment->guid;
 				}
 			}
 		}
 
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_thumbnail" ) );
+		require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_thumbnail"));
 		$output = ob_get_clean();
 
 		return $output;
@@ -383,19 +383,19 @@ 
 	 *	Output product sheet to PDF
 	 */
 	public function wpshop_product_sheet_output() {
-		$product_id = ( !empty($_GET['pid']) ) ? (int) $_GET['pid'] : null;
+		$product_id = (!empty($_GET['pid'])) ? (int)$_GET['pid'] : null;
 		$user_id = get_current_user_id();
-		if( !empty($product_id) && get_post_type( $product_id ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && $user_id != 0 && current_user_can( 'manage_options' ) ) {
+		if (!empty($product_id) && get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && $user_id != 0 && current_user_can('manage_options')) {
 			$wps_product_administration_ctr = new wps_product_administration_ctr();
-			$html_content = $wps_product_administration_ctr->generate_product_sheet_datas( $product_id );
-			$product_post = get_post( $product_id );
-			require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+			$html_content = $wps_product_administration_ctr->generate_product_sheet_datas($product_id);
+			$product_post = get_post($product_id);
+			require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 			try {
 				$html2pdf = new HTML2PDF('P', 'A4', 'fr');
 				$html2pdf->pdf->SetDisplayMode('fullpage');
 				$html2pdf->setDefaultFont('Arial');
 				$html2pdf->writeHTML($html_content);
-				$html2pdf->Output('product-' .$product_id.'-'.$product_post->post_name.'.pdf', 'D');
+				$html2pdf->Output('product-' . $product_id . '-' . $product_post->post_name . '.pdf', 'D');
 			}
 			catch (HTML2PDF_exception $e) {
 				echo $e;

Braces +18 added lines, -15 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_product_ctr {
 
 	/**
@@ -46,8 +48,9 @@ 
 	}
 
 	public function callback_admin_enqueue_scripts( $hook ) {
-		if( $hook != 'tools_page_wpshop_tools' )
-			return;
+		if( $hook != 'tools_page_wpshop_tools' ) {
+					return;
+		}
 
 		wp_enqueue_script( 'wps_product_js', WPS_PRODUCT_URL . '/asset/js/backend.js', array( "jquery", "jquery-form" ), WPS_PRODUCT_VERSION );
 	}
@@ -138,8 +141,7 @@ 
 
 			if (($manage_stock_is_activated && $the_qty_is_in_stock) OR !$manage_stock_is_activated) {
 				return true;
-			}
-			else {
+			} else {
 				return __('You cannot add that amount to the cart since there is not enough stock.', 'wpshop');
 			}
 		}
@@ -179,8 +181,9 @@ 
 				if(!empty($product->price) && is_array($product->price)) {
 					$array_price = array();
 					foreach($product->price as &$price) {
-						if(strpos( $price, '&&' ))
-							$price = substr($price, 0, -2);
+						if(strpos( $price, '&&' )) {
+													$price = substr($price, 0, -2);
+						}
 
 						$tmp_price = explode('&sep&', $price);
 						$key = $tmp_price[0];
@@ -234,13 +237,15 @@ 
 	 * @return WP_Post
 	 */
 	public function get_thumbnail ( $pid ) {
-		if( empty( $pid ) )
-			return null;
+		if( empty( $pid ) ) {
+					return null;
+		}
 
 		$thumbnail_id = get_post_meta( $pid, '_thumbnail_id', true );
 
-		if( empty( $thumbnail_id ) )
-			return null;
+		if( empty( $thumbnail_id ) ) {
+					return null;
+		}
 
 		return $thumbnail_id;
 	}
@@ -284,8 +289,7 @@ 
 					array($value_attribute, $product_id, $attribute_id)
 				)
 			);
-		}
-		else {
+		} else {
 			/** Insert avec toutes les informations requise */
 			$wpdb->insert(WPSHOP_DBT_ATTRIBUTE . '_value_' . $type, array(
 					'attribute_id' 			=> $attribute_id,
@@ -396,8 +400,7 @@ 
 				$html2pdf->setDefaultFont('Arial');
 				$html2pdf->writeHTML($html_content);
 				$html2pdf->Output('product-' .$product_id.'-'.$product_post->post_name.'.pdf', 'D');
-			}
-			catch (HTML2PDF_exception $e) {
+			} catch (HTML2PDF_exception $e) {
 				echo $e;
 			}
 		}

includes/modules/wps_product/modules/wps_product_mass_interface/controller/wps_product_mass_interface_ctr.php

Doc Comments +4 added lines

@@ -158,6 +158,7 @@ 
 	/**
 	 * Display pagination
 	 *
+	 * @param integer $current_page
 	 * @return string
 	 */
 	function get_products_pagination( $current_page, $attribute_set_id = 1 ) {
@@ -201,6 +202,9 @@ 
 			return $output;
 			}
 
+	/**
+	 * @param integer $product_id
+	 */
 	function wps_product_attached_files( $product_id ) {
 		global $wpdb;
 		$output = '';

Indentation +4 added lines, -4 removed lines

@@ -370,8 +370,8 @@ 
 	}
 
 	/**
-	* Delete product list
-	**/
+	 * Delete product list
+	 **/
 	function wps_mass_delete_file() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
@@ -389,8 +389,8 @@ 
 	}
 
 	/**
-	* Update product files list
-	*/
+	 * Update product files list
+	 */
 	function wps_mass_edit_update_files_list() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 

Braces +21 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for product mass modification module
  *
@@ -222,8 +224,9 @@ 
 	function wps_mass_edit_change_page() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_change_page' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_change_page' ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$page = ( !empty($_POST['page_id']) ) ? intval( $_POST['page_id'] ) - 1 : 0;
@@ -246,8 +249,9 @@ 
 	function wps_mass_interface_new_product_creation() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_interface_new_product_creation' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_interface_new_product_creation' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$output = $pagination = '';
@@ -277,8 +281,9 @@ 
 	function wps_save_product_quick_interface() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_product_quick_interface' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_product_quick_interface' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$response = ''; $status = false;
@@ -306,8 +311,7 @@ 
 						if($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
 							wp_update_post( array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post) );
 							update_post_meta( $updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture'] );
-						}
-						elseif($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
+						} elseif($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
 							delete_post_meta( $updated_post, '_thumbnail_id' );
 						}
 					}
@@ -355,12 +359,10 @@ 
 
 		if( $status ) {
 			$response = sprintf( __( '%d products have been successfully updated', 'wpshop'), $total_updated_products );
-		}
-		else {
+		} else {
 			if( !empty($total_updated_products) ) {
 				$response = sprintf( __( 'All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update );
-			}
-			else {
+			} else {
 				$response = __( 'No product have been updated', 'wpshop');
 			}
 		}
@@ -375,8 +377,9 @@ 
 	function wps_mass_delete_file() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_delete_file' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_delete_file' ) ) {
+					wp_die();
+		}
 
 		$status = false;
 		$file_id = (!empty($_POST['file_id']) ) ? intval($_POST['file_id']) : null;
@@ -394,8 +397,9 @@ 
 	function wps_mass_edit_update_files_list() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_update_files_list' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_update_files_list' ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$product_id = ( !empty($_POST['product_id']) ) ? intval($_POST['product_id']) : null;

Spacing +144 added lines, -144 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -21,29 +21,29 @@ 
 	 */
 	function __construct() {
 		// Add submenu
-		add_action('admin_menu', array( $this, 'register_mass_products_edit_submenu' ), 350 );
+		add_action('admin_menu', array($this, 'register_mass_products_edit_submenu'), 350);
 
 		// Trigger ajax action
-		add_action( 'wp_ajax_wps_mass_edit_change_page', array( $this, 'wps_mass_edit_change_page') );
-		add_action( 'wp_ajax_wps_mass_edit_product_save_action', array( $this, 'wps_save_product_quick_interface') );
-		add_action( 'wp_ajax_wps_mass_interface_new_product_creation', array( $this, 'wps_mass_interface_new_product_creation' ) );
-		add_action( 'wp_ajax_wps_mass_delete_file', array( $this, 'wps_mass_delete_file' ) );
-		add_action( 'wp_ajax_wps_mass_edit_update_files_list', array( $this, 'wps_mass_edit_update_files_list' ) );
+		add_action('wp_ajax_wps_mass_edit_change_page', array($this, 'wps_mass_edit_change_page'));
+		add_action('wp_ajax_wps_mass_edit_product_save_action', array($this, 'wps_save_product_quick_interface'));
+		add_action('wp_ajax_wps_mass_interface_new_product_creation', array($this, 'wps_mass_interface_new_product_creation'));
+		add_action('wp_ajax_wps_mass_delete_file', array($this, 'wps_mass_delete_file'));
+		add_action('wp_ajax_wps_mass_edit_update_files_list', array($this, 'wps_mass_edit_update_files_list'));
 		// add_action( 'wap_ajax_wps_mass_delete_post', array( $this, 'wps_mass_delete_post' ) );
 	}
 
 	function register_mass_products_edit_submenu() {
-		$this->submenu = add_submenu_page( 'edit.php?post_type=wpshop_product', __( 'Mass product edit', 'wpshop' ), __( 'Mass product edit', 'wpshop' ), 'manage_options', 'mass_edit_interface', array($this, 'wps_display_mass_edit_interface' ) );
+		$this->submenu = add_submenu_page('edit.php?post_type=wpshop_product', __('Mass product edit', 'wpshop'), __('Mass product edit', 'wpshop'), 'manage_options', 'mass_edit_interface', array($this, 'wps_display_mass_edit_interface'));
 		// Declare Styles and JS Files.
-		add_action( 'admin_print_styles-' . $this->submenu, array( $this, 'admin_print_styles' ) );
-		add_action( 'admin_print_scripts-' . $this->submenu, array( $this, 'admin_print_scripts' ) );
+		add_action('admin_print_styles-' . $this->submenu, array($this, 'admin_print_styles'));
+		add_action('admin_print_scripts-' . $this->submenu, array($this, 'admin_print_scripts'));
 	}
 
 	/**
 	 * Add css to administration
 	 */
 	function admin_print_styles() {
-		wp_enqueue_style( 'wps-mass-product-update', WPS_PDCT_MASS_URL . '/assets/css/backend.css' );
+		wp_enqueue_style('wps-mass-product-update', WPS_PDCT_MASS_URL . '/assets/css/backend.css');
 	}
 
 	/**
@@ -51,12 +51,12 @@ 
 	 */
 	function admin_print_scripts() {
 		wp_enqueue_media();
-		wp_enqueue_script( 'admin_product_js', WPS_PDCT_MASS_URL . '/assets/js/backend.js', '', WPS_PDCT_MASS_VERSION, true );
+		wp_enqueue_script('admin_product_js', WPS_PDCT_MASS_URL . '/assets/js/backend.js', '', WPS_PDCT_MASS_VERSION, true);
 		$output = '<script type="text/javascript">';
-		$output .= 'var WPS_MASS_ERROR_INIT = "' .__( 'An error has occured, the page cannot be initialized', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_ERROR_PRODUCT_CREATION = "' .__( 'An error was occured, the new product cannot be created', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_ERROR_PRODUCT_SAVE = "' .__( 'You must select product to save', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_CONFIRMATION_NEW_PRODUCT = "' .__( 'You will save selected products, are you sure to continue ?', 'wpshop' ). '";';
+		$output .= 'var WPS_MASS_ERROR_INIT = "' . __('An error has occured, the page cannot be initialized', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_ERROR_PRODUCT_CREATION = "' . __('An error was occured, the new product cannot be created', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_ERROR_PRODUCT_SAVE = "' . __('You must select product to save', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_CONFIRMATION_NEW_PRODUCT = "' . __('You will save selected products, are you sure to continue ?', 'wpshop') . '";';
 		$output .= '</script>';
 		echo $output;
 	}
@@ -68,15 +68,15 @@ 
 	 *
 	 * @return array
 	 */
-	function check_attribute_to_display_for_quick_add( $attribute_list, $quick_add_form_attributes = array() ) {
-
-		if ( !empty( $attribute_list ) ) {
-			foreach( $attribute_list as $attributes_group ) {
-				foreach( $attributes_group as $attributes_sections ) {
-					if( !empty($attributes_sections) && !empty($attributes_sections['attributes']) ) {
-						foreach( $attributes_sections['attributes'] as $attribute_id => $att_def ) {
-							if( !empty($att_def) && !empty($att_def['is_used_in_quick_add_form']) && $att_def['is_used_in_quick_add_form'] == 'yes' ) {
-								$quick_add_form_attributes[ $attribute_id ] = $att_def;
+	function check_attribute_to_display_for_quick_add($attribute_list, $quick_add_form_attributes = array()) {
+
+		if (!empty($attribute_list)) {
+			foreach ($attribute_list as $attributes_group) {
+				foreach ($attributes_group as $attributes_sections) {
+					if (!empty($attributes_sections) && !empty($attributes_sections['attributes'])) {
+						foreach ($attributes_sections['attributes'] as $attribute_id => $att_def) {
+							if (!empty($att_def) && !empty($att_def['is_used_in_quick_add_form']) && $att_def['is_used_in_quick_add_form'] == 'yes') {
+								$quick_add_form_attributes[$attribute_id] = $att_def;
 							}
 						}
 					}
@@ -93,29 +93,29 @@ 
 	 * @param integer $page
 	 * @return string
 	 */
-	function display_products_list( $default = 1, $page = 0, $order_by = 'date', $order = 'ASC' ) {
+	function display_products_list($default = 1, $page = 0, $order_by = 'date', $order = 'ASC') {
 		global $wpdb;
 		// Product entity
-		$product_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
+		$product_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 
 		$user_id = get_current_user_id();
 		// Check product limit
-		$product_limit = get_user_meta( $user_id, 'edit_wpshop_product_per_page', true );
-		$product_limit = ( !empty($product_limit) ) ? $product_limit : 20;
+		$product_limit = get_user_meta($user_id, 'edit_wpshop_product_per_page', true);
+		$product_limit = (!empty($product_limit)) ? $product_limit : 20;
 
 		// Get products for the current page
 		$wps_product_mass_interface_mdl = new wps_product_mass_interface_mdl();
-		$products = $wps_product_mass_interface_mdl->get_quick_interface_products( $default, $page, $product_limit );
+		$products = $wps_product_mass_interface_mdl->get_quick_interface_products($default, $page, $product_limit);
 
 		// Construct Table Head Data
 		$quick_add_form_attributes = array();
 		$get_attributes_quick_add_form = $wps_product_mass_interface_mdl->get_attributes_quick_add_form();
-		foreach( $get_attributes_quick_add_form as $quick_add_form_attribute ) {
+		foreach ($get_attributes_quick_add_form as $quick_add_form_attribute) {
 			$quick_add_form_attributes[$quick_add_form_attribute['id']] = $quick_add_form_attribute;
 		}
 
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_list" ) );
+		require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_list"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -131,27 +131,27 @@ 
 		$products_attributes_groups = $wps_product_mass_interface_mdl->get_product_attributes_sets();
 
 		$default = '';
-		if( !empty($products_attributes_groups) ) {
-			foreach( $products_attributes_groups as $key => $products_attributes_group ) {
-				if( $products_attributes_group->slug == 'free_product' ) {
-					unset( $products_attributes_groups[$key] );
+		if (!empty($products_attributes_groups)) {
+			foreach ($products_attributes_groups as $key => $products_attributes_group) {
+				if ($products_attributes_group->slug == 'free_product') {
+					unset($products_attributes_groups[$key]);
 				}
-				if( !empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes' ) {
+				if (!empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes') {
 					$default = $products_attributes_group->id;
 				}
 			}
 		}
 		// Check page
-		$page = ( !empty( $_GET[ 'page' ] ) && is_int( (int)$_GET[ 'page' ] ) && $_GET[ 'page' ] > 0 ) ? (int)($_GET[ 'page' ] - 1) : 0;
+		$page = (!empty($_GET['page']) && is_int((int)$_GET['page']) && $_GET['page'] > 0) ? (int)($_GET['page'] - 1) : 0;
 		// Display product tab
-		$order_by = !empty( $_GET[ 'order_by' ] ) ? sanitize_title( $_GET[ 'order_by' ] ) : 'date';
-		$order = !empty( $_GET[ 'order' ] ) ? sanitize_title( $_GET[ 'order' ] ) : 'ASC';
-		$product_list_interface = $this->display_products_list( $default, $page, $order_by, $order );
+		$order_by = !empty($_GET['order_by']) ? sanitize_title($_GET['order_by']) : 'date';
+		$order = !empty($_GET['order']) ? sanitize_title($_GET['order']) : 'ASC';
+		$product_list_interface = $this->display_products_list($default, $page, $order_by, $order);
 
 		// Get pagination
-		$pagination = $this->get_products_pagination( $page, $default );
+		$pagination = $this->get_products_pagination($page, $default);
 
-		require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface" ) );
+		require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface"));
 	}
 
 	/**
@@ -159,13 +159,13 @@ 
 	 *
 	 * @return string
 	 */
-	function get_products_pagination( $current_page, $attribute_set_id = 1 ) {
+	function get_products_pagination($current_page, $attribute_set_id = 1) {
 		global $wpdb;
 		$user_id = get_current_user_id();
 		$output = '';
 		/**	Define the element number per page. If the user change the default value, take this value	*/
-		$one_page_limit = get_user_meta( $user_id, 'edit_wpshop_product_per_page', true );
-		$one_page_limit = ( !empty($one_page_limit) ) ? $one_page_limit : 20;
+		$one_page_limit = get_user_meta($user_id, 'edit_wpshop_product_per_page', true);
+		$one_page_limit = (!empty($one_page_limit)) ? $one_page_limit : 20;
 
 		/**	Count the number of product existing in the shop	*/
 		$query = $wpdb->prepare(
@@ -177,37 +177,37 @@ 
 				AND meta_value = %s
 				AND post_status IN ( 'publish', 'draft' )",
 				WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, '_wpshop_product_attribute_set_id', $attribute_set_id);
-		$products = $wpdb->get_var( $query );
+		$products = $wpdb->get_var($query);
 
-			if( !empty($products) ) {
+			if (!empty($products)) {
 			$args = array(
 			'base' => '%_%',
-			'format' => admin_url( 'admin-ajax.php?action=wps_add_quick_interface&page=%#%' ),
-				'current' => ( $current_page + 1 ),
-				'total' => ceil( $products / $one_page_limit ),
+			'format' => admin_url('admin-ajax.php?action=wps_add_quick_interface&page=%#%'),
+				'current' => ($current_page + 1),
+				'total' => ceil($products / $one_page_limit),
 					'type' => 'array',
 					'prev_next' => false,
 					'show_all' => true,
 			);
-			$paginate = paginate_links( $args );
+			$paginate = paginate_links($args);
 
 				$wps_product_ctr = new wps_product_ctr();
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface_pagination" ) );
+				require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface_pagination"));
 				$output = ob_get_contents();
 			ob_end_clean();
 			}
 			return $output;
 			}
 
-	function wps_product_attached_files( $product_id ) {
+	function wps_product_attached_files($product_id) {
 		global $wpdb;
 		$output = '';
-		$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts. ' WHERE post_parent = %d AND post_type = %s AND post_mime_type LIKE %s', $product_id, 'attachment', 'application%' );
-		$files = $wpdb->get_results( $query );
-		if( !empty($files) ) {
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_parent = %d AND post_type = %s AND post_mime_type LIKE %s', $product_id, 'attachment', 'application%');
+		$files = $wpdb->get_results($query);
+		if (!empty($files)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "attached_files_list" ) );
+			require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "attached_files_list"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -219,23 +219,23 @@ 
 	 * AJAX - Change page action on mass edit product interface
 	 */
 	function wps_mass_edit_change_page() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_change_page' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_edit_change_page'))
 			wp_die();
 
 		$status = false; $response = '';
-		$page = ( !empty($_POST['page_id']) ) ? intval( $_POST['page_id'] ) - 1 : 0;
-		$attribute_set_id = ( !empty($_POST['att_set_id']) ) ? intval( $_POST['att_set_id'] ) : 1;
-		if( !empty($attribute_set_id) ) {
+		$page = (!empty($_POST['page_id'])) ? intval($_POST['page_id']) - 1 : 0;
+		$attribute_set_id = (!empty($_POST['att_set_id'])) ? intval($_POST['att_set_id']) : 1;
+		if (!empty($attribute_set_id)) {
 			// Get tab
-			$response = $this->display_products_list( $attribute_set_id, $page );
-			$pagination = $this->get_products_pagination( $page, $attribute_set_id );
-			if( !empty($response) ) {
+			$response = $this->display_products_list($attribute_set_id, $page);
+			$pagination = $this->get_products_pagination($page, $attribute_set_id);
+			if (!empty($response)) {
 				$status = true;
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response, 'pagination' => $pagination ) );
+		echo json_encode(array('status' => $status, 'response' => $response, 'pagination' => $pagination));
 		wp_die();
 	}
 
@@ -243,30 +243,30 @@ 
 	 * AJAX - Create a draft product and display the line allowing to edit informations for this product
 	 */
 	function wps_mass_interface_new_product_creation() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_interface_new_product_creation' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_interface_new_product_creation'))
 			wp_die();
 
 		global $wpdb;
 		$output = $pagination = '';
 		$status = false;
 
-		$new_product_id = wp_insert_post( array(
+		$new_product_id = wp_insert_post(array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
 				'post_status' => 'publish',
-				'post_title' => __( 'New product', 'wpshop' ),
-		) );
+				'post_title' => __('New product', 'wpshop'),
+		));
 
-		if( !is_object($new_product_id) ) {
+		if (!is_object($new_product_id)) {
 			$status = true;
 		}
-		if ( !empty( $new_product_id ) ) {
-			$product_attribute_set_id = ( !empty($_POST['attributes_set']) ) ? intval( $_POST['attributes_set'] ) : 1;
-			update_post_meta( $new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $product_attribute_set_id );
+		if (!empty($new_product_id)) {
+			$product_attribute_set_id = (!empty($_POST['attributes_set'])) ? intval($_POST['attributes_set']) : 1;
+			update_post_meta($new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $product_attribute_set_id);
 		}
 
-		echo json_encode( array( 'status' => $status, 'response' => $output, 'pagination' => $pagination ) );
+		echo json_encode(array('status' => $status, 'response' => $output, 'pagination' => $pagination));
 		wp_die();
 	}
 
@@ -274,32 +274,32 @@ 
 	 * AJAX - Save datas
 	 */
 	function wps_save_product_quick_interface() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_product_quick_interface' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_save_product_quick_interface'))
 			wp_die();
 
 		global $wpdb;
 		$response = ''; $status = false;
 		$count_products_to_update = 0; $total_updated_products = 0;
 
-		$wps_product_quick_save = !empty( $_REQUEST['wps_product_quick_save'] ) ? (array) $_REQUEST['wps_product_quick_save'] : array();
-		$wps_mass_interface = !empty( $_REQUEST['wps_mass_interface'] ) ? (array) $_REQUEST['wps_mass_interface'] : array();
-		$wpshop_product_attribute = !empty( $_REQUEST['wpshop_product_attribute'] ) ? (array) $_REQUEST['wpshop_product_attribute'] : array();
+		$wps_product_quick_save = !empty($_REQUEST['wps_product_quick_save']) ? (array)$_REQUEST['wps_product_quick_save'] : array();
+		$wps_mass_interface = !empty($_REQUEST['wps_mass_interface']) ? (array)$_REQUEST['wps_mass_interface'] : array();
+		$wpshop_product_attribute = !empty($_REQUEST['wpshop_product_attribute']) ? (array)$_REQUEST['wpshop_product_attribute'] : array();
 
 		// ------------------------------------------------------------------------------------------------------
 
-		foreach( $_REQUEST['concur'] as $post_id => $columns ) {
+		foreach ($_REQUEST['concur'] as $post_id => $columns) {
 			$concur = array();
-			for( $i = $count = 0; $i <= $count; $i++ ) {
-				foreach( $columns as $key => $rows ) {
-					$count = count( $rows )-1;
+			for ($i = $count = 0; $i <= $count; $i++) {
+				foreach ($columns as $key => $rows) {
+					$count = count($rows) - 1;
 					$concur[$i][$key] = $rows[$i];
 				}
-				if( empty( $concur[$i]['is_row'] ) ) {
-					unset( $concur[$i] );
+				if (empty($concur[$i]['is_row'])) {
+					unset($concur[$i]);
 				} else {
-					unset( $concur[$i]['is_row'] );
+					unset($concur[$i]['is_row']);
 
 					$dotPos = strrpos($concur[$i]['price'], '.');
 					$commaPos = strrpos($concur[$i]['price'], ',');
@@ -309,7 +309,7 @@ 
 					} else {
 						$concur[$i]['price'] = floatval(
 							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], 0, $sep)) . '.' .
-							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], $sep+1, strlen($concur[$i]['price'])))
+							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], $sep + 1, strlen($concur[$i]['price'])))
 						);
 					}
 
@@ -317,51 +317,51 @@ 
 					$concur[$i]['price'] = $concur[$i]['price'];
 				}
 			}
-			update_post_meta( $post_id, '_concur', $concur );
+			update_post_meta($post_id, '_concur', $concur);
 		}
 
 		// ------------------------------------------------------------------------------------------------------
 
-		if( !empty($wps_product_quick_save) ) {
-			$count_products_to_update = count( $wps_product_quick_save );
-			foreach( $wps_product_quick_save as $product_to_save ) {
+		if (!empty($wps_product_quick_save)) {
+			$count_products_to_update = count($wps_product_quick_save);
+			foreach ($wps_product_quick_save as $product_to_save) {
 				$data_to_save = array();
 				// Update post
-				$updated_post = wp_update_post( array( 'ID' => $product_to_save,
-						'post_title' => sanitize_text_field( $wps_mass_interface[$product_to_save]['post_title'] ),
-						'post_content' => wp_kses_post( $wps_mass_interface[$product_to_save]['post_content'] ),
+				$updated_post = wp_update_post(array('ID' => $product_to_save,
+						'post_title' => sanitize_text_field($wps_mass_interface[$product_to_save]['post_title']),
+						'post_content' => wp_kses_post($wps_mass_interface[$product_to_save]['post_content']),
 						)
 				);
 				// Update attributes
-				if( !empty($updated_post) ) {
+				if (!empty($updated_post)) {
 					// Update Featured picture
-					if( !empty($wps_mass_interface[$product_to_save]['picture']) ) {
-						$thumbnail_exist = get_post_meta( $updated_post, '_thumbnail_id', true );
-						if($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
-							wp_update_post( array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post) );
-							update_post_meta( $updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture'] );
+					if (!empty($wps_mass_interface[$product_to_save]['picture'])) {
+						$thumbnail_exist = get_post_meta($updated_post, '_thumbnail_id', true);
+						if ($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
+							wp_update_post(array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post));
+							update_post_meta($updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture']);
 						}
-						elseif($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
-							delete_post_meta( $updated_post, '_thumbnail_id' );
+						elseif ($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
+							delete_post_meta($updated_post, '_thumbnail_id');
 						}
 					}
 
 					// Update files datas
-					if( !empty($wps_mass_interface[$product_to_save]['files']) ) {
-						$files_data = explode( ',', sanitize_text_field( $_REQUEST['wps_mass_interface'][$product_to_save]['files'] ) );
-						if( !empty($files_data) && is_array($files_data) ) {
-							foreach( $files_data as $file_id ) {
-								if( !empty($file_id) ) {
-									wp_update_post( array('ID' => $file_id, 'post_parent' => $updated_post) );
+					if (!empty($wps_mass_interface[$product_to_save]['files'])) {
+						$files_data = explode(',', sanitize_text_field($_REQUEST['wps_mass_interface'][$product_to_save]['files']));
+						if (!empty($files_data) && is_array($files_data)) {
+							foreach ($files_data as $file_id) {
+								if (!empty($file_id)) {
+									wp_update_post(array('ID' => $file_id, 'post_parent' => $updated_post));
 								}
 							}
 						}
 					}
 
-					$data_to_save['post_ID'] = $data_to_save['product_id'] = intval( $product_to_save );
-					$data_to_save['wpshop_product_attribute'] = ( !empty($wpshop_product_attribute[ $product_to_save ]) ) ? $wpshop_product_attribute[ $product_to_save ] : array();
+					$data_to_save['post_ID'] = $data_to_save['product_id'] = intval($product_to_save);
+					$data_to_save['wpshop_product_attribute'] = (!empty($wpshop_product_attribute[$product_to_save])) ? $wpshop_product_attribute[$product_to_save] : array();
 
-					if(empty($data_to_save['wpshop_product_attribute']['varchar']['barcode'])) {
+					if (empty($data_to_save['wpshop_product_attribute']['varchar']['barcode'])) {
 						// Get current barcode
 						$wps_product_mdl = new wps_product_mdl();
 						$attid = wpshop_attributes::getElement('barcode', "'valid'", 'code')->id;
@@ -372,34 +372,34 @@ 
 					$data_to_save['user_ID'] = get_current_user_id();
 					$data_to_save['action'] = 'editpost';
 
-					if( !empty($wps_mass_interface[$product_to_save]['post_delete']) && $wps_mass_interface[$product_to_save]['post_delete'] == "true" ) {
-						wp_trash_post( $product_to_save );
+					if (!empty($wps_mass_interface[$product_to_save]['post_delete']) && $wps_mass_interface[$product_to_save]['post_delete'] == "true") {
+						wp_trash_post($product_to_save);
 					}
 
-					if( !empty($product_to_save) && !empty( $data_to_save['user_ID'] ) ) {
+					if (!empty($product_to_save) && !empty($data_to_save['user_ID'])) {
 						$product_class = new wpshop_products();
-						$product_class->save_product_custom_informations( $product_to_save, $data_to_save );
+						$product_class->save_product_custom_informations($product_to_save, $data_to_save);
 						$total_updated_products++;
 					}
 				}
 			}
 		}
 		// Checking status
-		$status = ( $total_updated_products == $count_products_to_update ) ? true : false;
+		$status = ($total_updated_products == $count_products_to_update) ? true : false;
 
-		if( $status ) {
-			$response = sprintf( __( '%d products have been successfully updated', 'wpshop'), $total_updated_products );
+		if ($status) {
+			$response = sprintf(__('%d products have been successfully updated', 'wpshop'), $total_updated_products);
 		}
 		else {
-			if( !empty($total_updated_products) ) {
-				$response = sprintf( __( 'All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update );
+			if (!empty($total_updated_products)) {
+				$response = sprintf(__('All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update);
 			}
 			else {
-				$response = __( 'No product have been updated', 'wpshop');
+				$response = __('No product have been updated', 'wpshop');
 			}
 		}
 
-		echo json_encode( array('status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -407,18 +407,18 @@ 
 	* Delete product list
 	**/
 	function wps_mass_delete_file() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_delete_file' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_delete_file'))
 			wp_die();
 
 		$status = false;
-		$file_id = (!empty($_POST['file_id']) ) ? intval($_POST['file_id']) : null;
-		if( !empty($file_id) ) {
-			wp_update_post( array('ID' => $file_id, 'post_parent' => 0) );
+		$file_id = (!empty($_POST['file_id'])) ? intval($_POST['file_id']) : null;
+		if (!empty($file_id)) {
+			wp_update_post(array('ID' => $file_id, 'post_parent' => 0));
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status ) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 
@@ -426,32 +426,32 @@ 
 	* Update product files list
 	*/
 	function wps_mass_edit_update_files_list() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_update_files_list' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_edit_update_files_list'))
 			wp_die();
 
 		$status = false; $response = '';
-		$product_id = ( !empty($_POST['product_id']) ) ? intval($_POST['product_id']) : null;
-		$files = ( !empty($_POST['files']) ) ? intval($_POST['files']) : null;
-		if( !empty($product_id ) ) {
+		$product_id = (!empty($_POST['product_id'])) ? intval($_POST['product_id']) : null;
+		$files = (!empty($_POST['files'])) ? intval($_POST['files']) : null;
+		if (!empty($product_id)) {
 			// Update files datas
-			if( !empty($files) ) {
-				$files_data = explode( ',', $files );
-				if( !empty($files_data) && is_array($files_data) ) {
-					foreach( $files_data as $file_id ) {
-						if( !empty($file_id) ) {
-							wp_update_post( array('ID' => $file_id, 'post_parent' => $product_id) );
+			if (!empty($files)) {
+				$files_data = explode(',', $files);
+				if (!empty($files_data) && is_array($files_data)) {
+					foreach ($files_data as $file_id) {
+						if (!empty($file_id)) {
+							wp_update_post(array('ID' => $file_id, 'post_parent' => $product_id));
 						}
 					}
 				}
 			}
 
 
-			$response = $this->wps_product_attached_files( $product_id );
+			$response = $this->wps_product_attached_files($product_id);
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 

includes/modules/wps_rewrites/wps_rewrites.php

Doc Comments +20 added lines

@@ -78,6 +78,11 @@ 
 			}
 		}
 	}
+
+	/**
+	 * @param string $slug
+	 * @param string $separator
+	 */
 	private function rewrite_term_hierarchy( $parent, &$rewrite, $slug, $separator ) {
 		$childs = get_terms( $this->taxonomy, array( 'parent' => $parent->term_id, 'hide_empty' => false ) );
 		foreach( $childs as $child ) {
@@ -115,6 +120,11 @@ 
 		}
 		return $permalink;
 	}
+
+	/**
+	 * @param string $permalink
+	 * @param string $separator
+	 */
 	private function permalink_term_hierarchy( $term, &$permalink, $taxonomy, $separator ) {
 		if( $term->parent == 0 ) {
 			$permalink = $term->slug . $separator . $permalink;
@@ -220,6 +230,11 @@ 
 			}
 		}
 	}
+
+	/**
+	 * @param string $slug
+	 * @param string $separator
+	 */
 	private function rewrite_term_hierarchy( $parent, &$rewrite, $slug, $separator ) {
 		$rewrite[] = $slug . $parent->slug . $separator;
 		$childs = get_terms( $this->taxonomy, array( 'parent' => $parent->term_id, 'hide_empty' => false ) );
@@ -281,6 +296,11 @@ 
 		}
 		return $permalink;
 	}
+
+	/**
+	 * @param string $permalink
+	 * @param string $separator
+	 */
 	private function permalink_term_hierarchy( $term, &$permalink, $taxonomy, $separator ) {
 		if( $term->parent == 0 ) {
 			$permalink = $term->slug . $separator . $permalink;

Spacing +139 added lines, -139 removed lines

@@ -1,15 +1,15 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 // Rewrite wpshop_categories
-$options = get_option( 'wpshop_catalog_categories_option', null );
+$options = get_option('wpshop_catalog_categories_option', null);
 $slug = !empty($options['wpshop_catalog_categories_slug']) ? $options['wpshop_catalog_categories_slug'] : WPSHOP_CATALOG_PRODUCT_NO_CATEGORY;
-( empty( $options['wpshop_catalog_categories_slug'] ) || $options['wpshop_catalog_categories_slug'] == '/' ) ? new Custom_Taxonomy_Rewrite( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $slug, false ) : false;
+(empty($options['wpshop_catalog_categories_slug']) || $options['wpshop_catalog_categories_slug'] == '/') ? new Custom_Taxonomy_Rewrite(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $slug, false) : false;
 
 // Rewrite wpshop_products
-$options = get_option( 'wpshop_catalog_product_option', null );
-$slug = !empty( $options['wpshop_catalog_product_slug'] ) ? $options['wpshop_catalog_product_slug'] : '/';
-$categories = !empty( $options['wpshop_catalog_product_slug_with_category'] );
-( empty( $options['wpshop_catalog_product_slug'] ) || $options['wpshop_catalog_product_slug'] == '/' ) ? new Custom_Post_Type_Rewrite( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, $slug, $categories ) : false;
+$options = get_option('wpshop_catalog_product_option', null);
+$slug = !empty($options['wpshop_catalog_product_slug']) ? $options['wpshop_catalog_product_slug'] : '/';
+$categories = !empty($options['wpshop_catalog_product_slug_with_category']);
+(empty($options['wpshop_catalog_product_slug']) || $options['wpshop_catalog_product_slug'] == '/') ? new Custom_Post_Type_Rewrite(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, $slug, $categories) : false;
 
 class Custom_Taxonomy_Rewrite {
 	private $post_type;
@@ -17,95 +17,95 @@ 
 	private $enable_rewrites;
 	private $use_slug;
 	private $use_hierarchy_cat_slug;
-	public function __construct( $taxonomy, $post_type, $slug = '/', $hierarchy = false ) {
+	public function __construct($taxonomy, $post_type, $slug = '/', $hierarchy = false) {
 		$this->post_type = $post_type;
 		$this->taxonomy = $taxonomy;
 		$this->use_slug = $slug;
 		$this->use_hierarchy_cat_slug = $hierarchy;
-		add_action( 'init', array( $this, 'rewrite' ), 11 );
-		add_action( 'created_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_action( 'edited_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_action( 'delete_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_filter( 'term_link', array( $this, 'permalink' ), 10, 3 );
+		add_action('init', array($this, 'rewrite'), 11);
+		add_action('created_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_action('edited_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_action('delete_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_filter('term_link', array($this, 'permalink'), 10, 3);
 	}
 	public function rewrite() {
 		global $wp_rewrite;
 		$this->enable_rewrites = $wp_rewrite->use_trailing_slashes;
-		if( $this->enable_rewrites ) {
-			if( empty( $this->use_slug ) || $this->use_slug == '/' ) {
-				if( $this->use_hierarchy_cat_slug ) {
+		if ($this->enable_rewrites) {
+			if (empty($this->use_slug) || $this->use_slug == '/') {
+				if ($this->use_hierarchy_cat_slug) {
 					$slug = '';
 					$rewrite = array();
-					$terms = get_terms( $this->taxonomy, array( 'parent' => 0, 'hide_empty' => false ) );
-					foreach( $terms as $term ) {
-						$this->rewrite_term_hierarchy( $term, $rewrite, $slug, '/' );
+					$terms = get_terms($this->taxonomy, array('parent' => 0, 'hide_empty' => false));
+					foreach ($terms as $term) {
+						$this->rewrite_term_hierarchy($term, $rewrite, $slug, '/');
 					}
-					foreach( $rewrite as $way ) {
-						add_rewrite_rule( $way . 'feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( $way . '(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( $way . 'page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top' );
-						add_rewrite_rule( $way . '?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top' );
+					foreach ($rewrite as $way) {
+						add_rewrite_rule($way . 'feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule($way . '(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule($way . 'page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top');
+						add_rewrite_rule($way . '?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top');
 					}
 				} else {
-					$terms = get_terms( $this->taxonomy, array( 'fields' => 'id=>slug', 'hide_empty' => false ) );
-					foreach( $terms as $term ) {
-						add_rewrite_rule( '(' . $term . ')/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( '(' . $term . ')/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( '(' . $term . ')/page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top' );
-						add_rewrite_rule( '(' . $term . ')/?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top' );
+					$terms = get_terms($this->taxonomy, array('fields' => 'id=>slug', 'hide_empty' => false));
+					foreach ($terms as $term) {
+						add_rewrite_rule('(' . $term . ')/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule('(' . $term . ')/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule('(' . $term . ')/page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top');
+						add_rewrite_rule('(' . $term . ')/?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top');
 					}
 				}
 			} else {
-				if( $this->use_hierarchy_cat_slug ) {
+				if ($this->use_hierarchy_cat_slug) {
 					$slug = '/';
 					$rewrite = array();
-					$terms = get_terms( $this->taxonomy, array( 'parent' => 0, 'hide_empty' => false ) );
-					foreach( $terms as $term ) {
-						$this->rewrite_term_hierarchy( $term, $rewrite, $slug, '/' );
+					$terms = get_terms($this->taxonomy, array('parent' => 0, 'hide_empty' => false));
+					foreach ($terms as $term) {
+						$this->rewrite_term_hierarchy($term, $rewrite, $slug, '/');
 					}
-					foreach( $rewrite as $way ) {
-						add_rewrite_rule( $this->use_slug . $way . 'feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( $this->use_slug . $way . '(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( $this->use_slug . $way . 'page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top' );
-						add_rewrite_rule( $this->use_slug . $way . '?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top' );
+					foreach ($rewrite as $way) {
+						add_rewrite_rule($this->use_slug . $way . 'feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule($this->use_slug . $way . '(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule($this->use_slug . $way . 'page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top');
+						add_rewrite_rule($this->use_slug . $way . '?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top');
 					}
 				} else {
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top' );
+					add_rewrite_rule($this->use_slug . '/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top');
 				}
 			}
 		}
 	}
-	private function rewrite_term_hierarchy( $parent, &$rewrite, $slug, $separator ) {
-		$childs = get_terms( $this->taxonomy, array( 'parent' => $parent->term_id, 'hide_empty' => false ) );
-		foreach( $childs as $child ) {
-			$this->rewrite_term_hierarchy( $child, $rewrite, $slug . $parent->slug . $separator, $separator );
+	private function rewrite_term_hierarchy($parent, &$rewrite, $slug, $separator) {
+		$childs = get_terms($this->taxonomy, array('parent' => $parent->term_id, 'hide_empty' => false));
+		foreach ($childs as $child) {
+			$this->rewrite_term_hierarchy($child, $rewrite, $slug . $parent->slug . $separator, $separator);
 		}
 		$rewrite[] = $slug . '(' . $parent->slug . ')' . $separator;
 	}
 	public function flush_rewrite() {
-		if( $this->enable_rewrites ) {
+		if ($this->enable_rewrites) {
 			$this->rewrite();
 			flush_rewrite_rules();
 		}
 	}
-	public function permalink( $permalink, $term, $taxonomy ) {
-		if( $this->enable_rewrites ) {
-			if( $taxonomy === $this->taxonomy ) {
-				if( empty( $this->use_slug ) || $this->use_slug == '/' ) {
-					if( $this->use_hierarchy_cat_slug ) {
+	public function permalink($permalink, $term, $taxonomy) {
+		if ($this->enable_rewrites) {
+			if ($taxonomy === $this->taxonomy) {
+				if (empty($this->use_slug) || $this->use_slug == '/') {
+					if ($this->use_hierarchy_cat_slug) {
 						$term_permalink = '';
-						$this->permalink_term_hierarchy( $term, $term_permalink, $taxonomy, '/' );
+						$this->permalink_term_hierarchy($term, $term_permalink, $taxonomy, '/');
 						$permalink = get_site_url() . '/' . $term_permalink;
 					} else {
 						$permalink = get_site_url() . '/' . $term->slug;
 					}
 				} else {
-					if( $this->use_hierarchy_cat_slug ) {
+					if ($this->use_hierarchy_cat_slug) {
 						$term_permalink = '';
-						$this->permalink_term_hierarchy( $term, $term_permalink, $taxonomy, '/' );
+						$this->permalink_term_hierarchy($term, $term_permalink, $taxonomy, '/');
 						$permalink = get_site_url() . '/' . $this->use_slug . '/' . $term_permalink;
 					} else {
 						$permalink = get_site_url() . '/' . $this->use_slug . '/' . $term->slug;
@@ -115,13 +115,13 @@ 
 		}
 		return $permalink;
 	}
-	private function permalink_term_hierarchy( $term, &$permalink, $taxonomy, $separator ) {
-		if( $term->parent == 0 ) {
+	private function permalink_term_hierarchy($term, &$permalink, $taxonomy, $separator) {
+		if ($term->parent == 0) {
 			$permalink = $term->slug . $separator . $permalink;
 		} else {
 			$permalink = $term->slug . $separator . $permalink;
-			$term_parent = get_term( $term->parent, $taxonomy );
-			$this->permalink_term_hierarchy( $term_parent, $permalink, $taxonomy, $separator );
+			$term_parent = get_term($term->parent, $taxonomy);
+			$this->permalink_term_hierarchy($term_parent, $permalink, $taxonomy, $separator);
 		}
 	}
 }
@@ -133,122 +133,122 @@ 
 	private $use_slug;
 	private $use_cat_slug;
 	private $use_hierarchy_cat_slug;
-	public function __construct( $post_type, $taxonomy, $slug = '/', $categories = false ) {
+	public function __construct($post_type, $taxonomy, $slug = '/', $categories = false) {
 		$this->post_type = $post_type;
 		$this->taxonomy = $taxonomy;
 		$this->use_slug = $slug;
-		if( is_bool( $categories ) ) {
+		if (is_bool($categories)) {
 			$this->use_cat_slug = $categories;
 			$this->use_hierarchy_cat_slug = false;
-		} elseif( $categories == 'hierarchy' ) {
+		} elseif ($categories == 'hierarchy') {
 			$this->use_cat_slug = true;
 			$this->use_hierarchy_cat_slug = true;
 		}
-		add_action( 'init', array( $this, 'rewrite' ), 11 );
-		add_action( 'created_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_action( 'edited_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_action( 'delete_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_filter( 'post_type_link', array( $this, 'permalink' ), 10, 3 );
-		add_action( 'pre_get_posts', array( $this, 'query' ) );
+		add_action('init', array($this, 'rewrite'), 11);
+		add_action('created_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_action('edited_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_action('delete_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_filter('post_type_link', array($this, 'permalink'), 10, 3);
+		add_action('pre_get_posts', array($this, 'query'));
 	}
 	public function rewrite() {
 		global $wp_rewrite;
 		$this->enable_rewrites = $wp_rewrite->use_trailing_slashes;
-		if( $this->enable_rewrites ) {
-			if( empty( $this->use_slug ) || $this->use_slug == '/' ) {
-				if( $this->use_cat_slug ) {
-					if( $this->use_hierarchy_cat_slug ) {
+		if ($this->enable_rewrites) {
+			if (empty($this->use_slug) || $this->use_slug == '/') {
+				if ($this->use_cat_slug) {
+					if ($this->use_hierarchy_cat_slug) {
 						add_rewrite_tag('%taxonomies%', '(.*)');
 						$slug = '(';
 						$rewrite = array();
-						$terms = get_terms( $this->taxonomy, array( 'parent' => 0, 'hide_empty' => false ) );
-						foreach( $terms as $term ) {
-							$this->rewrite_term_hierarchy( $term, $rewrite, $slug, '/' );
+						$terms = get_terms($this->taxonomy, array('parent' => 0, 'hide_empty' => false));
+						foreach ($terms as $term) {
+							$this->rewrite_term_hierarchy($term, $rewrite, $slug, '/');
 						}
-						foreach( array_reverse( $rewrite ) as $way ) {
-							add_rewrite_rule( $way . ')([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $way . ')([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $way . ')([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top' );
-							add_rewrite_rule( $way . ')([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top' );
+						foreach (array_reverse($rewrite) as $way) {
+							add_rewrite_rule($way . ')([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($way . ')([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($way . ')([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top');
+							add_rewrite_rule($way . ')([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top');
 						}
 					} else {
 						add_rewrite_tag('%taxonomies%', '(.*)');
-						$terms = get_terms( $this->taxonomy, array( 'fields' => 'id=>slug', 'hide_empty' => false ) );
-						foreach( $terms as $term ) {
-							add_rewrite_rule( '(' . $term . ')/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( '(' . $term . ')/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( '(' . $term . ')/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top' );
-							add_rewrite_rule( '(' . $term . ')/([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top' );
+						$terms = get_terms($this->taxonomy, array('fields' => 'id=>slug', 'hide_empty' => false));
+						foreach ($terms as $term) {
+							add_rewrite_rule('(' . $term . ')/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule('(' . $term . ')/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule('(' . $term . ')/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top');
+							add_rewrite_rule('(' . $term . ')/([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top');
 						}
 					}
 				} /*else {
 					Only in the query func
 				} */
 			} else {
-				if( $this->use_cat_slug ) {
-					if( $this->use_hierarchy_cat_slug ) {
+				if ($this->use_cat_slug) {
+					if ($this->use_hierarchy_cat_slug) {
 						add_rewrite_tag('%taxonomies%', '(.*)');
 						$slug = '/(';
 						$rewrite = array();
-						$terms = get_terms( $this->taxonomy, array( 'parent' => 0, 'hide_empty' => false ) );
-						foreach( $terms as $term ) {
-							$this->rewrite_term_hierarchy( $term, $rewrite, $slug, '/' );
+						$terms = get_terms($this->taxonomy, array('parent' => 0, 'hide_empty' => false));
+						foreach ($terms as $term) {
+							$this->rewrite_term_hierarchy($term, $rewrite, $slug, '/');
 						}
-						foreach( array_reverse( $rewrite ) as $way ) {
-							add_rewrite_rule( $this->use_slug . $way . ')([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . $way . ')([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . $way . ')([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . $way . ')([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top' );
+						foreach (array_reverse($rewrite) as $way) {
+							add_rewrite_rule($this->use_slug . $way . ')([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . $way . ')([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . $way . ')([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . $way . ')([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top');
 						}
 					} else {
 						add_rewrite_tag('%taxonomies%', '(.*)');
-						$terms = get_terms( $this->taxonomy, array( 'fields' => 'id=>slug', 'hide_empty' => false ) );
-						foreach( $terms as $term ) {
-							add_rewrite_rule( $this->use_slug . '/(' . $term . ')/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . '/(' . $term . ')/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . '/(' . $term . ')/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . '/(' . $term . ')/([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top' );
+						$terms = get_terms($this->taxonomy, array('fields' => 'id=>slug', 'hide_empty' => false));
+						foreach ($terms as $term) {
+							add_rewrite_rule($this->use_slug . '/(' . $term . ')/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . '/(' . $term . ')/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . '/(' . $term . ')/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . '/(' . $term . ')/([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top');
 						}
 					}
 				} else {
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->post_type . '=$matches[1]&feed=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->post_type . '=$matches[1]&feed=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?' . $this->post_type . '=$matches[1]&paged=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/?$', 'index.php?' . $this->post_type . '=$matches[1]', 'top' );
+					add_rewrite_rule($this->use_slug . '/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->post_type . '=$matches[1]&feed=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->post_type . '=$matches[1]&feed=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?' . $this->post_type . '=$matches[1]&paged=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/?$', 'index.php?' . $this->post_type . '=$matches[1]', 'top');
 					//'rewrite' => array( 'slug' => $this->post_type ) || true
 				}
 			}
 		}
 	}
-	private function rewrite_term_hierarchy( $parent, &$rewrite, $slug, $separator ) {
+	private function rewrite_term_hierarchy($parent, &$rewrite, $slug, $separator) {
 		$rewrite[] = $slug . $parent->slug . $separator;
-		$childs = get_terms( $this->taxonomy, array( 'parent' => $parent->term_id, 'hide_empty' => false ) );
-		foreach( $childs as $child ) {
-			$this->rewrite_term_hierarchy( $child, $rewrite, $slug . $parent->slug . $separator, $separator );
+		$childs = get_terms($this->taxonomy, array('parent' => $parent->term_id, 'hide_empty' => false));
+		foreach ($childs as $child) {
+			$this->rewrite_term_hierarchy($child, $rewrite, $slug . $parent->slug . $separator, $separator);
 		}
 	}
 	public function flush_rewrite() {
-		if( $this->enable_rewrites ) {
+		if ($this->enable_rewrites) {
 			$this->rewrite();
 			flush_rewrite_rules();
 		}
 	}
-	public function permalink( $permalink, $post, $leavename ) {
-		if( $this->enable_rewrites ) {
-			if( $post->post_type == $this->post_type ) {
-				if( empty( $this->use_slug ) || $this->use_slug == '/' ) {
-					if( $this->use_cat_slug ) {
-						if( $this->use_hierarchy_cat_slug ) {
-							$terms = get_the_terms( $post->ID, $this->taxonomy );
-							if( !empty( $terms ) ) {
+	public function permalink($permalink, $post, $leavename) {
+		if ($this->enable_rewrites) {
+			if ($post->post_type == $this->post_type) {
+				if (empty($this->use_slug) || $this->use_slug == '/') {
+					if ($this->use_cat_slug) {
+						if ($this->use_hierarchy_cat_slug) {
+							$terms = get_the_terms($post->ID, $this->taxonomy);
+							if (!empty($terms)) {
 								$term = $terms[0];
 								$post_permalink = '';
-								$this->permalink_term_hierarchy( $term, $post_permalink, $this->taxonomy, '/' );
+								$this->permalink_term_hierarchy($term, $post_permalink, $this->taxonomy, '/');
 								$permalink = get_site_url() . '/' . $post_permalink . $post->post_name . '/';
 							}
 						} else {
-							$terms = get_the_terms( $post->ID, $this->taxonomy );
-							if( !empty( $terms ) ) {
+							$terms = get_the_terms($post->ID, $this->taxonomy);
+							if (!empty($terms)) {
 								$term = $terms[0];
 								$permalink = get_site_url() . '/' . $term->slug . '/' . $post->post_name . '/';
 							}
@@ -257,18 +257,18 @@ 
 						$permalink = get_site_url() . '/' . $post->post_name . '/';
 					}
 				} else {
-					if( $this->use_cat_slug ) {
-						if( $this->use_hierarchy_cat_slug ) {
-							$terms = get_the_terms( $post->ID, $this->taxonomy );
-							if( !empty( $terms ) ) {
+					if ($this->use_cat_slug) {
+						if ($this->use_hierarchy_cat_slug) {
+							$terms = get_the_terms($post->ID, $this->taxonomy);
+							if (!empty($terms)) {
 								$term = $terms[0];
 								$post_permalink = '';
-								$this->permalink_term_hierarchy( $term, $post_permalink, $this->taxonomy, '/' );
+								$this->permalink_term_hierarchy($term, $post_permalink, $this->taxonomy, '/');
 								$permalink = get_site_url() . '/' . $this->use_slug . '/' . $post_permalink . $post->post_name . '/';
 							}
 						} else {
-							$terms = get_the_terms( $post->ID, $this->taxonomy );
-							if( !empty( $terms ) ) {
+							$terms = get_the_terms($post->ID, $this->taxonomy);
+							if (!empty($terms)) {
 								$term = $terms[0];
 								$permalink = get_site_url() . '/' . $this->use_slug . '/' . $term->slug . '/' . $post->post_name . '/';
 							}
@@ -281,20 +281,20 @@ 
 		}
 		return $permalink;
 	}
-	private function permalink_term_hierarchy( $term, &$permalink, $taxonomy, $separator ) {
-		if( $term->parent == 0 ) {
+	private function permalink_term_hierarchy($term, &$permalink, $taxonomy, $separator) {
+		if ($term->parent == 0) {
 			$permalink = $term->slug . $separator . $permalink;
 		} else {
 			$permalink = $term->slug . $separator . $permalink;
-			$term_parent = get_term( $term->parent, $taxonomy );
-			$this->permalink_term_hierarchy( $term_parent, $permalink, $taxonomy, $separator );
+			$term_parent = get_term($term->parent, $taxonomy);
+			$this->permalink_term_hierarchy($term_parent, $permalink, $taxonomy, $separator);
 		}
 	}
-	public function query( $query ) {
-		if( $this->enable_rewrites ) {
-			if ( empty( $this->use_slug ) || $this->use_slug == '/' && !$this->use_cat_slug ) {
-				if ( !is_admin() && $query->is_main_query() && !isset( $query->page ) && count( $query->query ) == 2 ) {
-					$query->set('post_type', array( 'page', 'post', $this->post_type ) );
+	public function query($query) {
+		if ($this->enable_rewrites) {
+			if (empty($this->use_slug) || $this->use_slug == '/' && !$this->use_cat_slug) {
+				if (!is_admin() && $query->is_main_query() && !isset($query->page) && count($query->query) == 2) {
+					$query->set('post_type', array('page', 'post', $this->post_type));
 				}
 			}
 		}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 // Rewrite wpshop_categories
 $options = get_option( 'wpshop_catalog_categories_option', null );

includes/modules/wps_search/controller/wps_filter_search.php

Doc Comments +4 added lines, -2 removed lines

@@ -131,6 +131,7 @@ 
 	/**
 	 * Construct the element when it's a text Data
 	 * @param StdObject $attribute_def
+	 * @param integer $category_id
 	 * @return string
 	 */
 	function get_filter_element_for_text_data( $attribute_def, $category_id, $current_category_child  ) {
@@ -155,6 +156,7 @@ 
 	/**
 	 * Construct the element when it's a list Data
 	 * @param StdObject $attribute_def
+	 * @param integer $category_id
 	 * @return string
 	 */
 	function get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_child, $field_type, $type = 'select') {
@@ -241,6 +243,7 @@ 
 	/**
 	 * Construct the element when it's a decimal Data
 	 * @param StdObject $attribute_def
+	 * @param integer $category_id
 	 * @return string
 	 */
 	function get_filter_element_for_integer_data ( $attribute_def, $category_id, $current_category_children  ) {
@@ -268,7 +271,7 @@ 
 	 * Save Products attribute values for List attribute data for a products category
 	 * @param integer $category_id
 	 * @param std_object $attribute_def
-	 * @param array $current_category_child
+	 * @param array $current_category_children
 	 */
 	function save_values_for_list_filterable_attribute( $category_id, $attribute_def, $current_category_children ) {
 		global $wpdb;
@@ -462,7 +465,6 @@ 
 
 	/**
 	 * Save values for attributes
-	 * @param unknown_type $values
 	 */
 	function stock_values_for_attribute( $categories_id = array() ) {
 		@set_time_limit( 900 );

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');

includes/modules/wpshop_prices/wpshop_prices.php

Doc Comments +4 added lines

@@ -166,6 +166,9 @@ 
 			return $price_infos;
 		}
 
+		/**
+		 * @param string $return_type
+		 */
 		public static function get_product_price($product, $return_type, $output_type = '', $only_price = false, $price_checking_done = false) {
 			$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
 // 			$wpshop_price_piloting_option = 'TTC';
@@ -458,6 +461,7 @@ 
 
 		/**
 		 * Check if isset Required attributes
+		 * @param integer $product_id
 		 */
 		public static function check_required_attributes( $product_id ) {
 			$required_attributes_list = array();

Braces +39 added lines, -63 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * WPSHOP Prices bootstrap file
@@ -65,8 +67,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				/** Desactivate Discount Attributes **/
 				if ( !empty($discount_attributes) ) {
 					foreach ( $discount_attributes as $discount_attribute ) {
@@ -113,14 +114,12 @@ 
 							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
 							$product['tva'] = $product['price_ht'] * ( $product['tx_tva'] / 100);
-						}
-						elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
+						} elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
 							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] - $discount_config['value'] ) : ( ( $product['price_ttc_before_discount'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] - $discount_config['value'];
 							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
 
-						}
-						elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+						} elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
 							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] * ( 1 -  $discount_config['value'] / 100) ) : ( ( $product['price_ttc_before_discount']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] * ( 1 - ( $discount_config['value'] / 100 ) );
 							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
@@ -136,16 +135,14 @@ 
 						$price_infos['discount']['discount_ati_price'] = ( !empty($product['price_ttc_before_discount']) ) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
 						$price_infos['discount']['discount_et_price'] = ( !empty($product['price_ht_before_discount']) ) ? number_format( (float)$product['price_ht'], 2, '.', '' ) : 0;
 						$price_infos['discount']['discount_tva'] = ( !empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount']) ) ? number_format( ($price_infos['discount']['discount_ati_price'] - $price_infos['discount']['discount_et_price']), 2, '.', '') : 0;
-					}
-					else {
+					} else {
 						$price_infos['ati'] = ( !empty($product['product_price'] )) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
 						$price_infos['et'] = ( !empty($product['price_ht'] ) ) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
 						$price_infos['tva'] =  ( !empty($product['tva'] ) ) ? $product['tva'] : 0;
 					}
 
 
-				}
-				else {
+				} else {
 					if ( !empty( $product['price_ttc_before_discount']) && !empty( $product['price_ht_before_discount'] ) ) {
 						$price_infos['discount']['discount_exist'] = ( !empty($product['price_ttc_before_discount'])  && !empty($product['price_ht_before_discount'] ) ) ? true : false;
 						$price_infos['discount']['discount_ati_price'] = ( !empty($product['product_price']) ) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
@@ -155,8 +152,7 @@ 
 						$price_infos['ati'] = ( !empty($product['price_ttc_before_discount'] )) ? number_format((float)$product['price_ttc_before_discount'], 5, '.', '') : 0;
 						$price_infos['et'] = ( !empty($product['price_ht_before_discount']) ) ? number_format((float)$product['price_ht_before_discount'], 5, '.', '') : 0;
 						$price_infos['tva'] =  $price_infos['ati'] - $price_infos['et'];
-					}
-					else {
+					} else {
 						$price_infos['ati'] = ( !empty($product['product_price'] )) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
 						$price_infos['et'] = ( !empty($product['price_ht'] ) ) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
 						$price_infos['tva'] =  ( !empty($product['tva'] ) ) ? $product['tva'] : 0;
@@ -199,8 +195,7 @@ 
 					if ( !empty($product_with_variation[$product['product_id']]['variation_priority']) ) {
 						$product =  wpshop_products::get_variation_price_behaviour( $product, $product_with_variation[$product['product_id']]['variations'], $product['product_id'], array('type' => $product_with_variation[$product['product_id']]['variation_priority'], 'text_from' => !empty($product_with_variation['text_from']) ? 'on' : '' ) );
 					}
-				}
-				else {
+				} else {
 					/** It's Simple product Check Discounts for products **/
 					$discount_config = self::check_discount_for_product( $product['product_id'] );
 					if ( !empty($discount_config) ) {
@@ -211,8 +206,7 @@ 
 							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
 							$product['tva'] = $product['price_ht'] * ( $product['tx_tva'] / 100);
-						}
-						elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
+						} elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
@@ -220,8 +214,7 @@ 
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] - $discount_config['value'];
 							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
 
-						}
-						elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+						} elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
@@ -244,13 +237,16 @@ 
 			if ( !empty($price_infos) ) {
 				if ( $return_type == 'check_only' ) {
 					/** Check if the product price has been set	*/
-					if( isset($price_infos['ati']) && $price_infos['ati'] === '') return __('This product cannot be purchased - the price is not yet announced', 'wpshop');
+					if( isset($price_infos['ati']) && $price_infos['ati'] === '') {
+						return __('This product cannot be purchased - the price is not yet announced', 'wpshop');
+					}
 					/** Check if the product price is coherent (not less than 0)	*/
-					if( isset($price_infos['ati']) && $price_infos['ati'] < 0) return __('This product cannot be purchased - its price is negative', 'wpshop');
+					if( isset($price_infos['ati']) && $price_infos['ati'] < 0) {
+						return __('This product cannot be purchased - its price is negative', 'wpshop');
+					}
 
 					return true;
-				}
-				elseif( $return_type == 'just_price_infos' ) {
+				} elseif( $return_type == 'just_price_infos' ) {
 					$tpl_component = array();
 
 					$price = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
@@ -269,8 +265,7 @@ 
 						$tpl_component['CROSSED_OUT_PRICE'] = $crossed_out_price;
 						if(!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') {
 							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_et_price'],2, '.', ''));
-						}
-						else {
+						} else {
 							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_ati_price'],2, '.', ''));
 						}
 
@@ -278,16 +273,14 @@ 
 						$tpl_component['PRODUCT_PRICE'] = '<span class="wps-absolute-price">'.$discount_price.'</span> '.$productCurrency;
 
 						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money( $price_infos );
-					}
-					else {
+					} else {
 						$tpl_component['PRODUCT_PRICE'] = $price.' '.$productCurrency;
 					}
 
 					$post_type = get_post_type( $product['product_id'] );
 					if (  $post_type ==  WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
 						$price_display_attribute = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
-					}
-					elseif( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+					} elseif( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
 						$parent_def = wpshop_products::get_parent_variation ( $product['product_id'] );
 						if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
 							$parent_post = $parent_def['parent_post'];
@@ -298,8 +291,7 @@ 
 					$tpl_component['PRICE_FROM'] = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) ) ? 'on' : '';
 
 					return $tpl_component;
-				}
-				else if ( $return_type == 'price_display' ) {
+				} else if ( $return_type == 'price_display' ) {
 					$tpl_component = array();
 					$price = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
 
@@ -323,8 +315,7 @@ 
 								$parent_post = $parent_def['parent_post'];
 								$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
 							}
-						}
-						else {
+						} else {
 							$price_display_attribute = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
 						}
 						$text_from = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) && !empty($product['text_from']) ) ? true : false;
@@ -342,14 +333,12 @@ 
 						$tpl_component['PRODUCT_PRICE'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? '<span class="wps-absolute-price">'. $price_infos['discount']['discount_et_price'].'</span> '.$productCurrency : '<span class="wps-absolute-price">'.$price_infos['discount']['discount_ati_price'].'</span> '.$productCurrency;
 						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money( $price_data );
 
-					}
-					else {
+					} else {
 						if( get_post_type($product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
 							$parent_def = wpshop_products::get_parent_variation( $product['product_id'] );
 							$pid = $parent_def['parent_post'];
 							$pid = $pid->ID;
-						}
-						else {
+						} else {
 							$pid = $product['product_id'];
 						}
 
@@ -362,8 +351,7 @@ 
 								$parent_post = $parent_def['parent_post'];
 								$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
 							}
-						}
-						else {
+						} else {
 							$price_display_attribute = get_post_meta( $pid, '_wpshop_variation_defining', true );
 						}
 
@@ -381,8 +369,7 @@ 
 
 					if ( $output_type == 'complete_sheet' ) {
 						$price_tpl = wpshop_display::display_template_element('product_price_template_complete_sheet', $tpl_component );
-					}
-					elseif ( $output_type == 'mini_output' || in_array('mini_output', $output_type ) ) {
+					} elseif ( $output_type == 'mini_output' || in_array('mini_output', $output_type ) ) {
 						$price_tpl = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component );
 					}
 					return $price_tpl;
@@ -527,8 +514,7 @@ 
 											$tx_tva = $wpdb->get_var( $query );
 											$variation_price =  $variation['variation_dif']['price_ht'] / ( 1 + ($variation['variation_dif']['discount_rate'] / 100 ) );
 											$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
-										}
-										elseif( empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_amount']) && $variation['variation_dif']['discount_amount'] > 0 ) {
+										} elseif( empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_amount']) && $variation['variation_dif']['discount_amount'] > 0 ) {
 											$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $variation['variation_dif']['tx_tva'] );
 											$tx_tva = $wpdb->get_var( $query );
 											$variation_price =  $variation['variation_dif']['price_ht'] - $variation['variation_dif']['discount_amount'];
@@ -548,8 +534,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				if ( !empty($product_id) ) {
 					if( !empty($variations) ) {
 
@@ -589,14 +574,12 @@ 
 					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
 					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
 					$product['tva'] = $product['product_price'] - $product['price_ht'];
-				}
-				elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
+				} elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
 					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht'] - $discount_config['value'] ) : ( ( $product['product_price'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
 					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['product_price'] - $discount_config['value'];
 					$product['tva'] =  $product['product_price'] - $product['price_ht'];
 
-				}
-				elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+				} elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
 					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht'] * ( 1 -  $discount_config['value'] / 100) ) : ( ( $product['product_price']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
 					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['product_price'] * ( 1 - ( $discount_config['value'] / 100 ) );
 					$product['tva'] =   $product['product_price'] - $product['price_ht'];
@@ -618,8 +601,7 @@ 
 					$product_discount_date_to = ( !empty($product_meta['special_to']) ) ? $product_meta['special_to'] : 0;
 
 					$product_meta = get_post_meta( $product_id, '_wpshop_product_metadata', true );
-				}
-				else {
+				} else {
 					$product_meta = get_post_meta( $product_id, '_wpshop_product_metadata', true );
 					$product_discount_date_from = ( !empty($product_meta['special_from']) ) ? $product_meta['special_from'] : 0;
 					$product_discount_date_to = ( !empty($product_meta['special_to']) ) ? $product_meta['special_to'] : 0;
@@ -634,12 +616,10 @@ 
 						if ( !empty($product_meta['special_price']) && $product_meta['special_price'] > 0 ) {
 							$discount_config['type'] = 'special_price';
 							$discount_config['value'] = $product_meta['special_price'];
-						}
-						elseif( !empty($product_meta['discount_amount']) && $product_meta['discount_amount'] > 0) {
+						} elseif( !empty($product_meta['discount_amount']) && $product_meta['discount_amount'] > 0) {
 							$discount_config['type'] = 'discount_amount';
 							$discount_config['value'] = $product_meta['discount_amount'];
-						}
-						elseif( !empty($product_meta['discount_rate']) && $product_meta['discount_rate'] > 0 ) {
+						} elseif( !empty($product_meta['discount_rate']) && $product_meta['discount_rate'] > 0 ) {
 							$discount_config['type'] = 'discount_rate';
 							$discount_config['value'] = $product_meta['discount_rate'];
 						}
@@ -725,8 +705,7 @@ 
 											$p = wpshop_products::get_product_data($product->ID);
 											$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type) );
 											update_post_meta( $product->ID, '_wps_price_infos', $price );
-										}
-										else {
+										} else {
 											/** Update post meta **/
 											$product_data['product_price'] = (float)str_replace( ',', '.', $product_data['product_price'] );
 											$product_data['price_ht'] = $product_data['product_price'] / ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
@@ -773,8 +752,7 @@ 
 											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID) );
 											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID) );
 											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID) );
-										}
-										else {
+										} else {
 											/** Update post meta **/
 											$product_data['product_price'] = (float)str_replace( ',', '.', $product_data['product_price'] );
 											$product_data['price_ht'] = $product_data['product_price'] / ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
@@ -795,12 +773,10 @@ 
 
 					$result = __('Prices updated', 'wpshop');
 					$status = true;
-				}
-				else {
+				} else {
 					$result = __('No VAT rates was found', 'wpshop');
 				}
-			}
-			else {
+			} else {
 				$result = __( 'VAT rate attribute was not found', 'wpshop' );
 			}
 			return array( $status, $result );

Spacing +325 added lines, -325 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * WPSHOP Prices bootstrap file
@@ -9,17 +9,17 @@ 
  *
  */
 
-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_prices") ) {
+if (!class_exists("wpshop_prices")) {
 	class wpshop_prices {
 
 		function __construct() {
 			add_action('wsphop_options', array('wpshop_prices', 'declare_options'));
 		}
 
-		public static function declare_options () {
+		public static function declare_options() {
 			register_setting('wpshop_options', 'wpshop_catalog_product_option', array('wpshop_prices', 'wpshop_options_validate_prices'));
 			add_settings_field('wpshop_catalog_product_option_discount', __('Activate the discount on products', 'wpshop'), array('wpshop_prices', 'wpshop_activate_discount_prices_field'), 'wpshop_catalog_product_option', 'wpshop_catalog_product_section');
 		}
@@ -29,37 +29,37 @@ 
 
 			/** Price attribute Def **/
 			$price_piloting_option = get_option('wpshop_shop_price_piloting');
-			$price_attribute_def = wpshop_attributes::getElement( ( (!empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? 'price_ht' : 'product_price' ), "'valid'", 'code');
+			$price_attribute_def = wpshop_attributes::getElement(((!empty($price_piloting_option) && $price_piloting_option == 'HT') ? 'price_ht' : 'product_price'), "'valid'", 'code');
 
 			/** Discount attributes **/
-			$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s OR code = %s OR  code = %s OR code = %s OR code = %s', 'discount_amount', 'discount_rate', 'special_price', 'special_from', 'special_to' );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s OR  code = %s OR code = %s OR code = %s', 'discount_amount', 'discount_rate', 'special_price', 'special_from', 'special_to');
 			$discount_attributes = $wpdb->get_results($query);
 
 			/** Check if discount is actived **/
-			if ( !empty( $input) && !empty($input['discount']) ) {
+			if (!empty($input) && !empty($input['discount'])) {
 				/** Activate the attributes **/
-				if ( !empty($discount_attributes) ) {
-					foreach ( $discount_attributes as $discount_attribute ) {
-						$update = $wpdb->prepare('UPDATE ' .WPSHOP_DBT_ATTRIBUTE. ' SET status = "valid" WHERE code = %s', $discount_attribute->code);
+				if (!empty($discount_attributes)) {
+					foreach ($discount_attributes as $discount_attribute) {
+						$update = $wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET status = "valid" WHERE code = %s', $discount_attribute->code);
 						$wpdb->query($update);
 					}
 				}
 
 				/** Affect discount attributes to All Attributes Set section where there is a Price attribute **/
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_id = %d', $price_attribute_def->id);
-				$attributes_sections = $wpdb->get_results( $query );
-				if ( !empty($attributes_sections) ) {
-					foreach ( $attributes_sections as $attributes_section ) {
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %d', $price_attribute_def->id);
+				$attributes_sections = $wpdb->get_results($query);
+				if (!empty($attributes_sections)) {
+					foreach ($attributes_sections as $attributes_section) {
 						/** Check the Max Position for the Attribute section */
-						$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_set_id = %d AND attribute_group_id = %d AND entity_type_id = %s', $attributes_section->attribute_set_id, $attributes_section->attribute_group_id, $attributes_section->entity_type_id);
-						$max_position = $wpdb->get_var( $query );
-						$max_position = ( !empty($max_position) ) ? $max_position : 0;
+						$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND attribute_group_id = %d AND entity_type_id = %s', $attributes_section->attribute_set_id, $attributes_section->attribute_group_id, $attributes_section->entity_type_id);
+						$max_position = $wpdb->get_var($query);
+						$max_position = (!empty($max_position)) ? $max_position : 0;
 						/** Affect the discount attributes **/
-						foreach ( $discount_attributes as $discount_attribute) {
-							$query = $wpdb->prepare(' SELECT COUNT(*) AS count_attributes_affect FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_set_id = %d AND attribute_group_id = %d AND entity_type_id = %s AND attribute_id = %d', $attributes_section->attribute_set_id, $attributes_section->attribute_group_id, $attributes_section->entity_type_id, $discount_attribute->id);
-							$count_attribute_affectation = $wpdb->get_row( $query );
-							if ( !empty($count_attribute_affectation) && ( empty($count_attribute_affectation->count_attributes_affect) || $count_attribute_affectation->count_attributes_affect == 0 ) ) {
-								$result = $wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array( 'status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attributes_section->entity_type_id, 'attribute_set_id' => $attributes_section->attribute_set_id, 'attribute_group_id' => $attributes_section->attribute_group_id, 'attribute_id' => $discount_attribute->id, 'position' => $max_position) );
+						foreach ($discount_attributes as $discount_attribute) {
+							$query = $wpdb->prepare(' SELECT COUNT(*) AS count_attributes_affect FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND attribute_group_id = %d AND entity_type_id = %s AND attribute_id = %d', $attributes_section->attribute_set_id, $attributes_section->attribute_group_id, $attributes_section->entity_type_id, $discount_attribute->id);
+							$count_attribute_affectation = $wpdb->get_row($query);
+							if (!empty($count_attribute_affectation) && (empty($count_attribute_affectation->count_attributes_affect) || $count_attribute_affectation->count_attributes_affect == 0)) {
+								$result = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attributes_section->entity_type_id, 'attribute_set_id' => $attributes_section->attribute_set_id, 'attribute_group_id' => $attributes_section->attribute_group_id, 'attribute_id' => $discount_attribute->id, 'position' => $max_position));
 								$max_position += 1;
 							}
 						}
@@ -68,21 +68,21 @@ 
 			}
 			else {
 				/** Desactivate Discount Attributes **/
-				if ( !empty($discount_attributes) ) {
-					foreach ( $discount_attributes as $discount_attribute ) {
-						$update = $wpdb->prepare('UPDATE ' .WPSHOP_DBT_ATTRIBUTE. ' SET status = "notused" WHERE code = %s', $discount_attribute->code);
+				if (!empty($discount_attributes)) {
+					foreach ($discount_attributes as $discount_attribute) {
+						$update = $wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET status = "notused" WHERE code = %s', $discount_attribute->code);
 						$wpdb->query($update);
 					}
 				}
 
 				/** Delete the Price attribute set section affectation **/
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_id = %d', $price_attribute_def->id);
-				$attributes_sections = $wpdb->get_results( $query );
-				if ( !empty($attributes_sections) ) {
-					foreach ( $attributes_sections as $attributes_section ) {
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %d', $price_attribute_def->id);
+				$attributes_sections = $wpdb->get_results($query);
+				if (!empty($attributes_sections)) {
+					foreach ($attributes_sections as $attributes_section) {
 						/** Affect the discount attributes **/
-						foreach ( $discount_attributes as $discount_attribute) {
-							$wpdb->delete( WPSHOP_DBT_ATTRIBUTE_DETAILS, array( 'entity_type_id' => $attributes_section->entity_type_id, 'attribute_set_id' => $attributes_section->attribute_set_id, 'attribute_group_id' => $attributes_section->attribute_group_id, 'attribute_id' => $discount_attribute->id ) );
+						foreach ($discount_attributes as $discount_attribute) {
+							$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('entity_type_id' => $attributes_section->entity_type_id, 'attribute_set_id' => $attributes_section->attribute_set_id, 'attribute_group_id' => $attributes_section->attribute_group_id, 'attribute_id' => $discount_attribute->id));
 						}
 					}
 				}
@@ -94,72 +94,72 @@ 
 		public static function wpshop_activate_discount_prices_field() {
 			$product_discount_option = get_option('wpshop_catalog_product_option');
 
-			$output  = '<input type="checkbox" id="wpshop_catalog_product_option_discount" name="wpshop_catalog_product_option[discount]" ' .( (!empty($product_discount_option) && !empty($product_discount_option['discount'])) ? 'checked="checked"' : '' ). ' />';
-			$output .= '<a class="wpshop_infobulle_marker" title="' .__('Activate the possibility to create discount on products', 'wpshop'). '" href="#">?</a>';
+			$output  = '<input type="checkbox" id="wpshop_catalog_product_option_discount" name="wpshop_catalog_product_option[discount]" ' . ((!empty($product_discount_option) && !empty($product_discount_option['discount'])) ? 'checked="checked"' : '') . ' />';
+			$output .= '<a class="wpshop_infobulle_marker" title="' . __('Activate the possibility to create discount on products', 'wpshop') . '" href="#">?</a>';
 			echo $output;
 		}
 
-		public static function check_product_price( $product, $cart = false ) {
+		public static function check_product_price($product, $cart = false) {
 			$price_infos = array();
 			$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
-			if ( !empty($product) ) {
-				if ( $cart ) {
-					$discount_config = self::check_discount_for_product($product['product_id'] );
-					if ( !empty($discount_config) ) {
+			if (!empty($product)) {
+				if ($cart) {
+					$discount_config = self::check_discount_for_product($product['product_id']);
+					if (!empty($discount_config)) {
 						$product['price_ttc_before_discount'] = $product['product_price'];
 						$product['price_ht_before_discount'] = $product['price_ht'];
 
-						if ( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price' ) {
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
-							$product['tva'] = $product['price_ht'] * ( $product['tx_tva'] / 100);
+						if (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price') {
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] / 100);
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] / 100) : $discount_config['value'];
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 						}
-						elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] - $discount_config['value'] ) : ( ( $product['price_ttc_before_discount'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] - $discount_config['value'];
-							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
+						elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount') {
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht_before_discount'] - $discount_config['value']) : (($product['price_ttc_before_discount'] - $discount_config['value']) / (1 + $product['tx_tva'] / 100));
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['price_ttc_before_discount'] - $discount_config['value'];
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 
 						}
-						elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] * ( 1 -  $discount_config['value'] / 100) ) : ( ( $product['price_ttc_before_discount']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] * ( 1 - ( $discount_config['value'] / 100 ) );
-							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
+						elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht_before_discount'] * (1 - $discount_config['value'] / 100)) : (($product['price_ttc_before_discount'] * (1 - ($discount_config['value'] / 100))) / (1 + $product['tx_tva'] / 100));
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['price_ttc_before_discount'] * (1 - ($discount_config['value'] / 100));
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 
 						}
 
 
-						$price_infos['ati'] = ( !empty($product['price_ttc_before_discount'] )) ? number_format((float)$product['price_ttc_before_discount'], 2, '.', '') : number_format((float)$product['product_price'], 2, '.', '');
-						$price_infos['et'] = ( !empty($product['price_ht_before_discount'] ) ) ? number_format((float)$product['price_ht_before_discount'], 2, '.', '') : number_format((float)$product['price_ht'], 2, '.', '');
-						$price_infos['tva'] = $price_infos['et'] * ( $product['tx_tva'] / 100);
+						$price_infos['ati'] = (!empty($product['price_ttc_before_discount'])) ? number_format((float)$product['price_ttc_before_discount'], 2, '.', '') : number_format((float)$product['product_price'], 2, '.', '');
+						$price_infos['et'] = (!empty($product['price_ht_before_discount'])) ? number_format((float)$product['price_ht_before_discount'], 2, '.', '') : number_format((float)$product['price_ht'], 2, '.', '');
+						$price_infos['tva'] = $price_infos['et'] * ($product['tx_tva'] / 100);
 
-						$price_infos['discount']['discount_exist'] = ( !empty($product['price_ttc_before_discount'])  && !empty($product['price_ht_before_discount'] ) ) ? true : false;
-						$price_infos['discount']['discount_ati_price'] = ( !empty($product['price_ttc_before_discount']) ) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
-						$price_infos['discount']['discount_et_price'] = ( !empty($product['price_ht_before_discount']) ) ? number_format( (float)$product['price_ht'], 2, '.', '' ) : 0;
-						$price_infos['discount']['discount_tva'] = ( !empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount']) ) ? number_format( ($price_infos['discount']['discount_ati_price'] - $price_infos['discount']['discount_et_price']), 2, '.', '') : 0;
+						$price_infos['discount']['discount_exist'] = (!empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount'])) ? true : false;
+						$price_infos['discount']['discount_ati_price'] = (!empty($product['price_ttc_before_discount'])) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
+						$price_infos['discount']['discount_et_price'] = (!empty($product['price_ht_before_discount'])) ? number_format((float)$product['price_ht'], 2, '.', '') : 0;
+						$price_infos['discount']['discount_tva'] = (!empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount'])) ? number_format(($price_infos['discount']['discount_ati_price'] - $price_infos['discount']['discount_et_price']), 2, '.', '') : 0;
 					}
 					else {
-						$price_infos['ati'] = ( !empty($product['product_price'] )) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
-						$price_infos['et'] = ( !empty($product['price_ht'] ) ) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
-						$price_infos['tva'] =  ( !empty($product['tva'] ) ) ? $product['tva'] : 0;
+						$price_infos['ati'] = (!empty($product['product_price'])) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
+						$price_infos['et'] = (!empty($product['price_ht'])) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
+						$price_infos['tva'] = (!empty($product['tva'])) ? $product['tva'] : 0;
 					}
 
 
 				}
 				else {
-					if ( !empty( $product['price_ttc_before_discount']) && !empty( $product['price_ht_before_discount'] ) ) {
-						$price_infos['discount']['discount_exist'] = ( !empty($product['price_ttc_before_discount'])  && !empty($product['price_ht_before_discount'] ) ) ? true : false;
-						$price_infos['discount']['discount_ati_price'] = ( !empty($product['product_price']) ) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
-						$price_infos['discount']['discount_et_price'] = ( !empty($product['price_ht']) ) ? number_format( (float)$product['price_ht'], 2, '.', '' ) : 0;
-						$price_infos['discount']['discount_tva'] = ( !empty($product['tva']) ) ? $product['tva'] : 0;
-
-						$price_infos['ati'] = ( !empty($product['price_ttc_before_discount'] )) ? number_format((float)$product['price_ttc_before_discount'], 5, '.', '') : 0;
-						$price_infos['et'] = ( !empty($product['price_ht_before_discount']) ) ? number_format((float)$product['price_ht_before_discount'], 5, '.', '') : 0;
-						$price_infos['tva'] =  $price_infos['ati'] - $price_infos['et'];
+					if (!empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount'])) {
+						$price_infos['discount']['discount_exist'] = (!empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount'])) ? true : false;
+						$price_infos['discount']['discount_ati_price'] = (!empty($product['product_price'])) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
+						$price_infos['discount']['discount_et_price'] = (!empty($product['price_ht'])) ? number_format((float)$product['price_ht'], 2, '.', '') : 0;
+						$price_infos['discount']['discount_tva'] = (!empty($product['tva'])) ? $product['tva'] : 0;
+
+						$price_infos['ati'] = (!empty($product['price_ttc_before_discount'])) ? number_format((float)$product['price_ttc_before_discount'], 5, '.', '') : 0;
+						$price_infos['et'] = (!empty($product['price_ht_before_discount'])) ? number_format((float)$product['price_ht_before_discount'], 5, '.', '') : 0;
+						$price_infos['tva'] = $price_infos['ati'] - $price_infos['et'];
 					}
 					else {
-						$price_infos['ati'] = ( !empty($product['product_price'] )) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
-						$price_infos['et'] = ( !empty($product['price_ht'] ) ) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
-						$price_infos['tva'] =  ( !empty($product['tva'] ) ) ? $product['tva'] : 0;
+						$price_infos['ati'] = (!empty($product['product_price'])) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
+						$price_infos['et'] = (!empty($product['price_ht'])) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
+						$price_infos['tva'] = (!empty($product['tva'])) ? $product['tva'] : 0;
 					}
 				}
 			}
@@ -170,65 +170,65 @@ 
 			$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
 // 			$wpshop_price_piloting_option = 'TTC';
  			/** Price for Mini-output **/
-			if( !empty($product['product_id']) && !$price_checking_done ) {
+			if (!empty($product['product_id']) && !$price_checking_done) {
 
 				/** Checking if it's a product with variation **/
-				$variation_option_checking = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
+				$variation_option_checking = get_post_meta($product['product_id'], '_wpshop_variation_defining', true);
 
-				if( !empty($variation_option_checking) ) {
-					$variations_exists = wpshop_products::get_variation( $product['product_id'], 'publish' );
+				if (!empty($variation_option_checking)) {
+					$variations_exists = wpshop_products::get_variation($product['product_id'], 'publish');
 				}
 
-				if( !empty($variation_option_checking) && !empty($variations_exists) ) {
-					if ( !empty( $variation_option_checking['attributes']) ) {
-						foreach( $variation_option_checking['attributes'] as $attribute ) {
+				if (!empty($variation_option_checking) && !empty($variations_exists)) {
+					if (!empty($variation_option_checking['attributes'])) {
+						foreach ($variation_option_checking['attributes'] as $attribute) {
 							$selected_variation[$attribute] = 0;
-							if( !empty( $variation_option_checking['options'] ) && !empty( $variation_option_checking['options']['attributes_default_value'] ) && array_key_exists( $attribute, $variation_option_checking['options']['attributes_default_value']) ){
-								if ( $variation_option_checking['options']['attributes_default_value'][$attribute] != 'none') {
+							if (!empty($variation_option_checking['options']) && !empty($variation_option_checking['options']['attributes_default_value']) && array_key_exists($attribute, $variation_option_checking['options']['attributes_default_value'])) {
+								if ($variation_option_checking['options']['attributes_default_value'][$attribute] != 'none') {
 									$selected_variation[$attribute] = $variation_option_checking['options']['attributes_default_value'][$attribute];
 								}
 							}
 						}
 					}
-					if ( !empty($selected_variation) ) {
-						$product_with_variation = wpshop_products::get_variation_by_priority( $selected_variation, $product['product_id'] );
+					if (!empty($selected_variation)) {
+						$product_with_variation = wpshop_products::get_variation_by_priority($selected_variation, $product['product_id']);
 					}
-					if( empty($product_with_variation[$product['product_id']]['variations']) ) {
+					if (empty($product_with_variation[$product['product_id']]['variations'])) {
 						$product_with_variation[$product['product_id']]['variations'] = array();
 					}
-					if ( !empty($product_with_variation[$product['product_id']]['variation_priority']) ) {
-						$product =  wpshop_products::get_variation_price_behaviour( $product, $product_with_variation[$product['product_id']]['variations'], $product['product_id'], array('type' => $product_with_variation[$product['product_id']]['variation_priority'], 'text_from' => !empty($product_with_variation['text_from']) ? 'on' : '' ) );
+					if (!empty($product_with_variation[$product['product_id']]['variation_priority'])) {
+						$product = wpshop_products::get_variation_price_behaviour($product, $product_with_variation[$product['product_id']]['variations'], $product['product_id'], array('type' => $product_with_variation[$product['product_id']]['variation_priority'], 'text_from' => !empty($product_with_variation['text_from']) ? 'on' : ''));
 					}
 				}
 				else {
 					/** It's Simple product Check Discounts for products **/
-					$discount_config = self::check_discount_for_product( $product['product_id'] );
-					if ( !empty($discount_config) ) {
-						if ( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price' ) {
+					$discount_config = self::check_discount_for_product($product['product_id']);
+					if (!empty($discount_config)) {
+						if (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price') {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
-							$product['tva'] = $product['price_ht'] * ( $product['tx_tva'] / 100);
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] / 100);
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] / 100) : $discount_config['value'];
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 						}
-						elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
+						elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount') {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] - $discount_config['value'] ) : ( ( $product['price_ttc_before_discount'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] - $discount_config['value'];
-							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht_before_discount'] - $discount_config['value']) : (($product['price_ttc_before_discount'] - $discount_config['value']) / (1 + $product['tx_tva'] / 100));
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['price_ttc_before_discount'] - $discount_config['value'];
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 
 						}
-						elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+						elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
 
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] * ( 1 - $discount_config['value'] / 100) ) : ( ( $product['price_ttc_before_discount']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] * ( 1 - ( $discount_config['value'] / 100 ) );
-							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht_before_discount'] * (1 - $discount_config['value'] / 100)) : (($product['price_ttc_before_discount'] * (1 - ($discount_config['value'] / 100))) / (1 + $product['tx_tva'] / 100));
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['price_ttc_before_discount'] * (1 - ($discount_config['value'] / 100));
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 
 						}
 					}
@@ -236,116 +236,116 @@ 
 
 			}
 
-			$price_infos = self::check_product_price( $product );
-			$productCurrency = '<span class="wps-currency">'.wpshop_tools::wpshop_get_currency().'</span>';
+			$price_infos = self::check_product_price($product);
+			$productCurrency = '<span class="wps-currency">' . wpshop_tools::wpshop_get_currency() . '</span>';
 
 			$wps_marketing_tools = new wps_marketing_tools_ctr();
 
-			if ( !empty($price_infos) ) {
-				if ( $return_type == 'check_only' ) {
+			if (!empty($price_infos)) {
+				if ($return_type == 'check_only') {
 					/** Check if the product price has been set	*/
-					if( isset($price_infos['ati']) && $price_infos['ati'] === '') return __('This product cannot be purchased - the price is not yet announced', 'wpshop');
+					if (isset($price_infos['ati']) && $price_infos['ati'] === '') return __('This product cannot be purchased - the price is not yet announced', 'wpshop');
 					/** Check if the product price is coherent (not less than 0)	*/
-					if( isset($price_infos['ati']) && $price_infos['ati'] < 0) return __('This product cannot be purchased - its price is negative', 'wpshop');
+					if (isset($price_infos['ati']) && $price_infos['ati'] < 0) return __('This product cannot be purchased - its price is negative', 'wpshop');
 
 					return true;
 				}
-				elseif( $return_type == 'just_price_infos' ) {
+				elseif ($return_type == 'just_price_infos') {
 					$tpl_component = array();
 
-					$price = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
-					$exploded_price = explode('.', number_format($price,2, '.', ''));
-					$price = '<span class="wps-absolute-price">'.$exploded_price[0].'</span><span class="wpshop_price_centimes_display">,'.( (!empty($exploded_price[1]) ) ? $exploded_price[1] : '').'</span>';
+					$price = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
+					$exploded_price = explode('.', number_format($price, 2, '.', ''));
+					$price = '<span class="wps-absolute-price">' . $exploded_price[0] . '</span><span class="wpshop_price_centimes_display">,' . ((!empty($exploded_price[1])) ? $exploded_price[1] : '') . '</span>';
 
-					$tpl_component['TAX_PILOTING'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT')  ? __('ET', 'wpshop') : '';
+					$tpl_component['TAX_PILOTING'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? __('ET', 'wpshop') : '';
 
 					$tpl_component['CROSSED_OUT_PRICE'] = '';
 					$tpl_component['MESSAGE_SAVE_MONEY'] = '';
 
 
 
-					if( !empty($price_infos['discount']['discount_exist']) ) {
-						$crossed_out_price = ( (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? number_format($price_infos['et'], 2) : number_format($price_infos['ati'], 2) ).' '. $productCurrency;
+					if (!empty($price_infos['discount']['discount_exist'])) {
+						$crossed_out_price = ((!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? number_format($price_infos['et'], 2) : number_format($price_infos['ati'], 2)) . ' ' . $productCurrency;
 						$tpl_component['CROSSED_OUT_PRICE'] = $crossed_out_price;
-						if(!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') {
-							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_et_price'],2, '.', ''));
+						if (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') {
+							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_et_price'], 2, '.', ''));
 						}
 						else {
-							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_ati_price'],2, '.', ''));
+							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_ati_price'], 2, '.', ''));
 						}
 
-						$discount_price = $exploded_discount_price[0].'<span class="wpshop_price_centimes_display">,'.( (!empty($exploded_discount_price[1]) ) ? $exploded_discount_price[1] : '').'</span>';
-						$tpl_component['PRODUCT_PRICE'] = '<span class="wps-absolute-price">'.$discount_price.'</span> '.$productCurrency;
+						$discount_price = $exploded_discount_price[0] . '<span class="wpshop_price_centimes_display">,' . ((!empty($exploded_discount_price[1])) ? $exploded_discount_price[1] : '') . '</span>';
+						$tpl_component['PRODUCT_PRICE'] = '<span class="wps-absolute-price">' . $discount_price . '</span> ' . $productCurrency;
 
-						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money( $price_infos );
+						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money($price_infos);
 					}
 					else {
-						$tpl_component['PRODUCT_PRICE'] = $price.' '.$productCurrency;
+						$tpl_component['PRODUCT_PRICE'] = $price . ' ' . $productCurrency;
 					}
 
-					$post_type = get_post_type( $product['product_id'] );
-					if (  $post_type ==  WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
-						$price_display_attribute = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
+					$post_type = get_post_type($product['product_id']);
+					if ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
+						$price_display_attribute = get_post_meta($product['product_id'], '_wpshop_variation_defining', true);
 					}
-					elseif( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-						$parent_def = wpshop_products::get_parent_variation ( $product['product_id'] );
-						if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+					elseif ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+						$parent_def = wpshop_products::get_parent_variation($product['product_id']);
+						if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 							$parent_post = $parent_def['parent_post'];
-							$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
+							$price_display_attribute = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
 						}
 					}
-					$price_display_option = get_option( 'wpshop_catalog_product_option' );
-					$tpl_component['PRICE_FROM'] = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) ) ? 'on' : '';
+					$price_display_option = get_option('wpshop_catalog_product_option');
+					$tpl_component['PRICE_FROM'] = ((!empty($price_display_attribute) && empty($price_display_attribute['options']) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])) || ((!empty($price_display_attribute) && (!empty($price_display_attribute['options']) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from'])))))) ? 'on' : '';
 
 					return $tpl_component;
 				}
-				else if ( $return_type == 'price_display' ) {
+				else if ($return_type == 'price_display') {
 					$tpl_component = array();
-					$price = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
+					$price = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
 
 					$price_data = $price_infos;
 
-					$exploded_price = explode('.', number_format($price,2, '.', ''));
-					$price = '<span class="wps-absolute-price">'.$exploded_price[0].'</span><span class="wpshop_price_centimes_display">.'.( (!empty($exploded_price[1]) ) ? $exploded_price[1] : '').'</span>';
+					$exploded_price = explode('.', number_format($price, 2, '.', ''));
+					$price = '<span class="wps-absolute-price">' . $exploded_price[0] . '</span><span class="wpshop_price_centimes_display">.' . ((!empty($exploded_price[1])) ? $exploded_price[1] : '') . '</span>';
 
-					$tpl_component['TAX_PILOTING'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT')  ? __('ET', 'wpshop') : '';
+					$tpl_component['TAX_PILOTING'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? __('ET', 'wpshop') : '';
 
 					$tpl_component['CROSSED_OUT_PRICE'] = '';
 					$tpl_component['MESSAGE_SAVE_MONEY'] = '';
 
-					if( !empty($price_infos['discount']['discount_exist']) ) {
+					if (!empty($price_infos['discount']['discount_exist'])) {
 						$text_from = false;
 						/** Get variation defining **/
-						$post_type = get_post_type( $product['product_id'] );
-						if( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation ( $product['product_id'] );
-							if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+						$post_type = get_post_type($product['product_id']);
+						if ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($product['product_id']);
+							if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 								$parent_post = $parent_def['parent_post'];
-								$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
+								$price_display_attribute = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
 							}
 						}
 						else {
-							$price_display_attribute = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
+							$price_display_attribute = get_post_meta($product['product_id'], '_wpshop_variation_defining', true);
 						}
-						$text_from = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) && !empty($product['text_from']) ) ? true : false;
+						$text_from = ((!empty($price_display_attribute) && empty($price_display_attribute['options']) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])) || ((!empty($price_display_attribute) && (!empty($price_display_attribute['options']) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']))))) && !empty($product['text_from'])) ? true : false;
 
 
-						$exploded_price = explode('.', number_format($price_infos['discount']['discount_et_price'],2, '.', ''));
-						$price_infos['discount']['discount_et_price'] = '<span class="wps-absolute-price">'.$exploded_price[0].'</span><span class="wpshop_price_centimes_display">.'.( (!empty($exploded_price[1]) ) ? $exploded_price[1] : '').'</span>';
+						$exploded_price = explode('.', number_format($price_infos['discount']['discount_et_price'], 2, '.', ''));
+						$price_infos['discount']['discount_et_price'] = '<span class="wps-absolute-price">' . $exploded_price[0] . '</span><span class="wpshop_price_centimes_display">.' . ((!empty($exploded_price[1])) ? $exploded_price[1] : '') . '</span>';
 
-						$exploded_price = explode('.', number_format($price_infos['discount']['discount_ati_price'],2, '.', ''));
-						$price_infos['discount']['discount_ati_price'] = '<span class="wps-absolute-price">'.$exploded_price[0].'</span><span class="wpshop_price_centimes_display">.'.( (!empty($exploded_price[1]) ) ? $exploded_price[1] : '').'</span>';
+						$exploded_price = explode('.', number_format($price_infos['discount']['discount_ati_price'], 2, '.', ''));
+						$price_infos['discount']['discount_ati_price'] = '<span class="wps-absolute-price">' . $exploded_price[0] . '</span><span class="wpshop_price_centimes_display">.' . ((!empty($exploded_price[1])) ? $exploded_price[1] : '') . '</span>';
 
 
-						$crossed_out_price = ( (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? number_format($price_infos['et'], 2) : number_format($price_infos['ati'], 2) ).' '. $productCurrency;
-						$tpl_component['CROSSED_OUT_PRICE'] = str_replace( '.', ',', ( ( $text_from ) ? __('Price from', 'wpshop') . ' ' : '' ). wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $crossed_out_price)) );
-						$tpl_component['PRODUCT_PRICE'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? '<span class="wps-absolute-price">'. $price_infos['discount']['discount_et_price'].'</span> '.$productCurrency : '<span class="wps-absolute-price">'.$price_infos['discount']['discount_ati_price'].'</span> '.$productCurrency;
-						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money( $price_data );
+						$crossed_out_price = ((!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? number_format($price_infos['et'], 2) : number_format($price_infos['ati'], 2)) . ' ' . $productCurrency;
+						$tpl_component['CROSSED_OUT_PRICE'] = str_replace('.', ',', (($text_from) ? __('Price from', 'wpshop') . ' ' : '') . wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $crossed_out_price)));
+						$tpl_component['PRODUCT_PRICE'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? '<span class="wps-absolute-price">' . $price_infos['discount']['discount_et_price'] . '</span> ' . $productCurrency : '<span class="wps-absolute-price">' . $price_infos['discount']['discount_ati_price'] . '</span> ' . $productCurrency;
+						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money($price_data);
 
 					}
 					else {
-						if( get_post_type($product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation( $product['product_id'] );
+						if (get_post_type($product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($product['product_id']);
 							$pid = $parent_def['parent_post'];
 							$pid = $pid->ID;
 						}
@@ -355,35 +355,35 @@ 
 
 						$text_from = false;
 						/** Get variation defining **/
-						$post_type = get_post_type( $pid );
-						if( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation ( $pid );
-							if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+						$post_type = get_post_type($pid);
+						if ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($pid);
+							if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 								$parent_post = $parent_def['parent_post'];
-								$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
+								$price_display_attribute = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
 							}
 						}
 						else {
-							$price_display_attribute = get_post_meta( $pid, '_wpshop_variation_defining', true );
+							$price_display_attribute = get_post_meta($pid, '_wpshop_variation_defining', true);
 						}
 
-						$price_display_attribute = get_post_meta( $pid, '_wpshop_variation_defining', true );
+						$price_display_attribute = get_post_meta($pid, '_wpshop_variation_defining', true);
 
-						$text_from = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) ) ? true : false;
+						$text_from = ((!empty($price_display_attribute) && empty($price_display_attribute['options']) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])) || ((!empty($price_display_attribute) && (!empty($price_display_attribute['options']) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from'])))))) ? true : false;
 
-						$tpl_component['PRODUCT_PRICE']  = ( $text_from && !empty($product['text_from']) ) ? __('Price from', 'wpshop') . ' ' : '';
-						$tpl_component['PRODUCT_PRICE'] .= $price.' '.$productCurrency;
+						$tpl_component['PRODUCT_PRICE']  = ($text_from && !empty($product['text_from'])) ? __('Price from', 'wpshop') . ' ' : '';
+						$tpl_component['PRODUCT_PRICE'] .= $price . ' ' . $productCurrency;
 					}
 
 
 					// Replace . by ,
-					$tpl_component['PRODUCT_PRICE'] = str_replace( '.',',', $tpl_component['PRODUCT_PRICE'] );
+					$tpl_component['PRODUCT_PRICE'] = str_replace('.', ',', $tpl_component['PRODUCT_PRICE']);
 
-					if ( $output_type == 'complete_sheet' ) {
-						$price_tpl = wpshop_display::display_template_element('product_price_template_complete_sheet', $tpl_component );
+					if ($output_type == 'complete_sheet') {
+						$price_tpl = wpshop_display::display_template_element('product_price_template_complete_sheet', $tpl_component);
 					}
-					elseif ( $output_type == 'mini_output' || in_array('mini_output', $output_type ) ) {
-						$price_tpl = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component );
+					elseif ($output_type == 'mini_output' || in_array('mini_output', $output_type)) {
+						$price_tpl = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component);
 					}
 					return $price_tpl;
 				}
@@ -403,7 +403,7 @@ 
 		 * @return stdClass ( value, id ) L'id de l'attribut et le taux de TVA /
 		 * Attribute ID and the VAT rate
 		 */
-		public static function get_rate_vat( $product_id ) {
+		public static function get_rate_vat($product_id) {
 			global $wpdb;
 
 			/**
@@ -417,18 +417,18 @@ 
 						INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . " as ATTR_VAL_INT ON ( ATTR_VAL_INT.attribute_id = ATTR.id AND ATTR_VAL_OPTIONS.id=ATTR_VAL_INT.value )
 					WHERE ATTR.code=%s AND ATTR_VAL_INT.entity_id=%d";
 
-			$request = $wpdb->prepare( $query, array( 'tx_tva',  $product_id ) );
-			$rate_vat = $wpdb->get_row( $request );
+			$request = $wpdb->prepare($query, array('tx_tva', $product_id));
+			$rate_vat = $wpdb->get_row($request);
 
 			/**
 			 * Vérifie ensuite si elle est vide, si elle est vide met la valeur par
 			 * défaut / Then checks if it is empty , if empty the value put the
 			 * default value
 			 */
-			if( empty( $rate_vat ) ) {
-				wpeologs_ctr::log_datas_in_files( 'wps_product', array(
+			if (empty($rate_vat)) {
+				wpeologs_ctr::log_datas_in_files('wps_product', array(
 					'object_id' 	=> $product_id,
-					'message' 		=> __( 'Use the default VAT rate', 'wpshop' ) ), 0
+					'message' 		=> __('Use the default VAT rate', 'wpshop') ), 0
 				);
 
 				$query = "
@@ -437,8 +437,8 @@ 
 							INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " as ATTR_VAL_OPTIONS ON ATTR_VAL_OPTIONS.attribute_id = ATTR.id
 						WHERE ATTR.code=%s AND ATTR_VAL_OPTIONS.id=ATTR.default_value";
 
-				$request = $wpdb->prepare( $query, array( 'tx_tva' ) );
-				$rate_vat = $wpdb->get_row( $request );
+				$request = $wpdb->prepare($query, array('tx_tva'));
+				$rate_vat = $wpdb->get_row($request);
 			}
 
 			/**
@@ -446,10 +446,10 @@ 
 			 * dans ce cas la on utilise le log / If it is still empty , it means that no
 			 * VAT rate found in this case the log is used
 			 */
-			if( empty( $rate_vat ) ) {
-				wpeologs_ctr::log_datas_in_files( 'wps_product', array(
+			if (empty($rate_vat)) {
+				wpeologs_ctr::log_datas_in_files('wps_product', array(
 					'object_id' 	=> $product_id,
-					'message' 		=> __( 'No VAT rate in the product and no default VAT rate found', 'wpshop' ) ), 2
+					'message' 		=> __('No VAT rate in the product and no default VAT rate found', 'wpshop') ), 2
 				);
 			}
 
@@ -459,19 +459,19 @@ 
 		/**
 		 * Check if isset Required attributes
 		 */
-		public static function check_required_attributes( $product_id ) {
+		public static function check_required_attributes($product_id) {
 			$required_attributes_list = array();
-			$variation_option = get_post_meta( $product_id, '_wpshop_variation_defining', true);
-			if ( !empty($variation_option) && !empty($variation_option['attributes']) ) {
-				if( !empty($variation_option['options']) && !empty($variation_option['options']['required_attributes']) ) {
-					foreach( $variation_option['options']['required_attributes'] as $required_attribute ) {
-						$required_attributes_list[ $required_attribute ] = $required_attribute;
+			$variation_option = get_post_meta($product_id, '_wpshop_variation_defining', true);
+			if (!empty($variation_option) && !empty($variation_option['attributes'])) {
+				if (!empty($variation_option['options']) && !empty($variation_option['options']['required_attributes'])) {
+					foreach ($variation_option['options']['required_attributes'] as $required_attribute) {
+						$required_attributes_list[$required_attribute] = $required_attribute;
 					}
 				}
 				/** Check the attribute configuration **/
-				foreach ( $variation_option['attributes'] as $variation ) {
-					$attribute_def = wpshop_attributes::getElement( $variation, '"valid"', 'code' );
-					if ( is_object($attribute_def) && !empty($attribute_def->is_required) && $attribute_def->is_required == 'yes' ) {
+				foreach ($variation_option['attributes'] as $variation) {
+					$attribute_def = wpshop_attributes::getElement($variation, '"valid"', 'code');
+					if (is_object($attribute_def) && !empty($attribute_def->is_required) && $attribute_def->is_required == 'yes') {
 						$required_attributes_list[$attribute_def->code] = $attribute_def->code;
 					}
 				}
@@ -483,60 +483,60 @@ 
 		}
 
 		/** Check the Product lower price **/
-		public static function check_product_lower_price ( $product_id ) {
+		public static function check_product_lower_price($product_id) {
 			global $wpdb;
-			$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
+			$price_piloting_option = get_option('wpshop_shop_price_piloting');
 			$lower_price_product = $min_price = 0;
-			$variations = wpshop_products::get_variation( $product_id, 'publish' );
+			$variations = wpshop_products::get_variation($product_id, 'publish');
 			$single_variations = $lower_price_product_combinaison = array();
 			$first = true;
 
 			/** Check variations type **/
-			$query = $wpdb->prepare( 'SELECT DISTINCT( SUBSTRING( m.meta_value, 3,1 ) ) AS attributes_count FROM ' .$wpdb->postmeta .' AS m INNER JOIN ' .$wpdb->posts. ' AS P ON ((P.ID = m.post_id) AND (P.post_parent = %d)) WHERE meta_key LIKE %s', $product_id, '_wpshop_variations_attribute_def' );
-			$variation_type = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT DISTINCT( SUBSTRING( m.meta_value, 3,1 ) ) AS attributes_count FROM ' . $wpdb->postmeta . ' AS m INNER JOIN ' . $wpdb->posts . ' AS P ON ((P.ID = m.post_id) AND (P.post_parent = %d)) WHERE meta_key LIKE %s', $product_id, '_wpshop_variations_attribute_def');
+			$variation_type = $wpdb->get_results($query);
 
 
 			/** Check which type of variation contains the product **/
 			$contains_simple_variation = false;
-			if ( !empty($variation_type) ) {
-				foreach( $variation_type as $k => $value ) {
-					if( $value->attributes_count == '1' ) {
+			if (!empty($variation_type)) {
+				foreach ($variation_type as $k => $value) {
+					if ($value->attributes_count == '1') {
 						$contains_simple_variation = true;
 					}
 				}
 			}
 
-			if ( $contains_simple_variation ) {
+			if ($contains_simple_variation) {
 
-				if( !empty($variations) ) {
-					$attributes = get_post_meta( $product_id, '_wpshop_variation_defining', true);
-					if ( !empty($attributes) && !empty($attributes['attributes']) ) {
+				if (!empty($variations)) {
+					$attributes = get_post_meta($product_id, '_wpshop_variation_defining', true);
+					if (!empty($attributes) && !empty($attributes['attributes'])) {
 						/** Construct an array with all cheaper attributes **/
-						foreach( $attributes['attributes'] as $key=>$attribute ) {
+						foreach ($attributes['attributes'] as $key=>$attribute) {
 							$min_price = 0;
 							$first = true;
-							foreach( $variations as $k => $variation) {
-								if ( !empty($variation['variation_def']) && count($variation['variation_def']) == 1 ) {
-									if( array_key_exists($attribute, $variation['variation_def'] ) ) {
-										$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? $variation['variation_dif']['price_ht'] : !empty( $variation['variation_dif']['product_price'] ) ? $variation['variation_dif']['product_price'] : 0;
+							foreach ($variations as $k => $variation) {
+								if (!empty($variation['variation_def']) && count($variation['variation_def']) == 1) {
+									if (array_key_exists($attribute, $variation['variation_def'])) {
+										$variation_price = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $variation['variation_dif']['price_ht'] : !empty($variation['variation_dif']['product_price']) ? $variation['variation_dif']['product_price'] : 0;
 
 										/** Check Discount **/
-										$variation_price = ( !empty( $variation['variation_dif']['special_price'] ) && $variation['variation_dif']['special_price'] > 0 ) ? $variation['variation_dif']['special_price'] : $variation_price;
-										if( empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_rate']) && $variation['variation_dif']['discount_rate'] > 0) {
-											$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $variation['variation_dif']['tx_tva'] );
-											$tx_tva = $wpdb->get_var( $query );
-											$variation_price =  $variation['variation_dif']['price_ht'] / ( 1 + ($variation['variation_dif']['discount_rate'] / 100 ) );
-											$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
+										$variation_price = (!empty($variation['variation_dif']['special_price']) && $variation['variation_dif']['special_price'] > 0) ? $variation['variation_dif']['special_price'] : $variation_price;
+										if (empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_rate']) && $variation['variation_dif']['discount_rate'] > 0) {
+											$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $variation['variation_dif']['tx_tva']);
+											$tx_tva = $wpdb->get_var($query);
+											$variation_price = $variation['variation_dif']['price_ht'] / (1 + ($variation['variation_dif']['discount_rate'] / 100));
+											$variation_price = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
 										}
-										elseif( empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_amount']) && $variation['variation_dif']['discount_amount'] > 0 ) {
-											$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $variation['variation_dif']['tx_tva'] );
-											$tx_tva = $wpdb->get_var( $query );
-											$variation_price =  $variation['variation_dif']['price_ht'] - $variation['variation_dif']['discount_amount'];
-											$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
+										elseif (empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_amount']) && $variation['variation_dif']['discount_amount'] > 0) {
+											$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $variation['variation_dif']['tx_tva']);
+											$tx_tva = $wpdb->get_var($query);
+											$variation_price = $variation['variation_dif']['price_ht'] - $variation['variation_dif']['discount_amount'];
+											$variation_price = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
 										}
 
 										/** Check the Min-price **/
-										if( $first|| $min_price >= $variation_price ) {
+										if ($first || $min_price >= $variation_price) {
 											$first = false;
 											$min_price = $variation_price;
 											$lower_price_product_combinaison['variations'][$attribute] = $k;
@@ -550,22 +550,22 @@ 
 				}
 			}
 			else {
-				if ( !empty($product_id) ) {
-					if( !empty($variations) ) {
+				if (!empty($product_id)) {
+					if (!empty($variations)) {
 
-						foreach( $variations as $variation_id => $variation) {
-							if ( !empty($variation['variation_dif']) && !empty($variation['variation_def']) && count($variation['variation_def']) > 1) {
-								$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? ( ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0) : ( ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0);
+						foreach ($variations as $variation_id => $variation) {
+							if (!empty($variation['variation_dif']) && !empty($variation['variation_def']) && count($variation['variation_def']) > 1) {
+								$variation_price = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? ((!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0) : ((!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0);
 								/** Check the Min-price **/
-								if( $min_price >= $variation_price || $first ) {
+								if ($min_price >= $variation_price || $first) {
 									$min_price = $variation_price;
 									$var_id = $variation_id;
 								}
 							}
-							$first  = false;
+							$first = false;
 						}
 
-						if ( !empty($var_id) ) {
+						if (!empty($var_id)) {
 							$lower_price_product_combinaison['variations'][] = $var_id;
 							$lower_price_product_combinaison['variation_priority'] = 'combined';
 						}
@@ -581,25 +581,25 @@ 
 		 * @param array $discount_config
 		 * @return array
 		 */
-		public static function calcul_discounted_price( $product, $discount_config ) {
-			$wpshop_price_piloting_option = get_option( 'wpshop_shop_price_piloting');
-			if( !empty($discount_config) ) {
+		public static function calcul_discounted_price($product, $discount_config) {
+			$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
+			if (!empty($discount_config)) {
 
-				if ( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price' ) {
-					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
-					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
+				if (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price') {
+					$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] / 100);
+					$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] / 100) : $discount_config['value'];
 					$product['tva'] = $product['product_price'] - $product['price_ht'];
 				}
-				elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
-					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht'] - $discount_config['value'] ) : ( ( $product['product_price'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
-					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['product_price'] - $discount_config['value'];
-					$product['tva'] =  $product['product_price'] - $product['price_ht'];
+				elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount') {
+					$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht'] - $discount_config['value']) : (($product['product_price'] - $discount_config['value']) / (1 + $product['tx_tva'] / 100));
+					$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['product_price'] - $discount_config['value'];
+					$product['tva'] = $product['product_price'] - $product['price_ht'];
 
 				}
-				elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
-					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht'] * ( 1 -  $discount_config['value'] / 100) ) : ( ( $product['product_price']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
-					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['product_price'] * ( 1 - ( $discount_config['value'] / 100 ) );
-					$product['tva'] =   $product['product_price'] - $product['price_ht'];
+				elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+					$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht'] * (1 - $discount_config['value'] / 100)) : (($product['product_price'] * (1 - ($discount_config['value'] / 100))) / (1 + $product['tx_tva'] / 100));
+					$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['product_price'] * (1 - ($discount_config['value'] / 100));
+					$product['tva'] = $product['product_price'] - $product['price_ht'];
 				}
 			}
 			return $product;
@@ -607,39 +607,39 @@ 
 
 
 		/** Check Discount for Product **/
-		public static function check_discount_for_product( $product_id, $head_product_id = 0 ) {
+		public static function check_discount_for_product($product_id, $head_product_id = 0) {
 			$discount_config = array();
 			$time_def = array('0000-00-00 00:00:00', '0000-00-00');
 
-			if( !empty($product_id) ) {
-				if ( !empty($head_product_id) ) {
-					$product_meta = get_post_meta( $head_product_id, '_wpshop_product_metadata', true );
-					$product_discount_date_from = ( !empty($product_meta['special_from']) ) ? $product_meta['special_from'] : 0;
-					$product_discount_date_to = ( !empty($product_meta['special_to']) ) ? $product_meta['special_to'] : 0;
+			if (!empty($product_id)) {
+				if (!empty($head_product_id)) {
+					$product_meta = get_post_meta($head_product_id, '_wpshop_product_metadata', true);
+					$product_discount_date_from = (!empty($product_meta['special_from'])) ? $product_meta['special_from'] : 0;
+					$product_discount_date_to = (!empty($product_meta['special_to'])) ? $product_meta['special_to'] : 0;
 
-					$product_meta = get_post_meta( $product_id, '_wpshop_product_metadata', true );
+					$product_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
 				}
 				else {
-					$product_meta = get_post_meta( $product_id, '_wpshop_product_metadata', true );
-					$product_discount_date_from = ( !empty($product_meta['special_from']) ) ? $product_meta['special_from'] : 0;
-					$product_discount_date_to = ( !empty($product_meta['special_to']) ) ? $product_meta['special_to'] : 0;
+					$product_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
+					$product_discount_date_from = (!empty($product_meta['special_from'])) ? $product_meta['special_from'] : 0;
+					$product_discount_date_to = (!empty($product_meta['special_to'])) ? $product_meta['special_to'] : 0;
 				}
 
 				$current_date = date('Y-m-d');
 
-				if ( !empty( $product_meta ) ) {
+				if (!empty($product_meta)) {
 
-					if( ( empty($product_discount_date_from) && empty($product_discount_date_to) ) || ( in_array($product_discount_date_from, $time_def)  && in_array( $product_discount_date_to, $time_def) ) || (strtotime($product_discount_date_from) < strtotime($current_date) && strtotime($current_date) < strtotime($product_discount_date_to) ) ) {
+					if ((empty($product_discount_date_from) && empty($product_discount_date_to)) || (in_array($product_discount_date_from, $time_def) && in_array($product_discount_date_to, $time_def)) || (strtotime($product_discount_date_from) < strtotime($current_date) && strtotime($current_date) < strtotime($product_discount_date_to))) {
 						/** Special Price **/
-						if ( !empty($product_meta['special_price']) && $product_meta['special_price'] > 0 ) {
+						if (!empty($product_meta['special_price']) && $product_meta['special_price'] > 0) {
 							$discount_config['type'] = 'special_price';
 							$discount_config['value'] = $product_meta['special_price'];
 						}
-						elseif( !empty($product_meta['discount_amount']) && $product_meta['discount_amount'] > 0) {
+						elseif (!empty($product_meta['discount_amount']) && $product_meta['discount_amount'] > 0) {
 							$discount_config['type'] = 'discount_amount';
 							$discount_config['value'] = $product_meta['discount_amount'];
 						}
-						elseif( !empty($product_meta['discount_rate']) && $product_meta['discount_rate'] > 0 ) {
+						elseif (!empty($product_meta['discount_rate']) && $product_meta['discount_rate'] > 0) {
 							$discount_config['type'] = 'discount_rate';
 							$discount_config['value'] = $product_meta['discount_rate'];
 						}
@@ -652,13 +652,13 @@ 
 		/**
 		 * Check the parent product price
 		 */
-		function check_parent_product_price( $product ) {
+		function check_parent_product_price($product) {
 			$price_infos = array();
-			if( !empty($product) ) {
+			if (!empty($product)) {
 				$price_infos['ati'] = $product['product_price'];
 				$price_infos['et'] = $product['price_ht'];
 				$price_infos['tva'] = $product['tva'];
-				$price_infos['fork_price'] = array( 'have_fork_price' => false, 'min_product_price' => '', 'max_product_price' => '');
+				$price_infos['fork_price'] = array('have_fork_price' => false, 'min_product_price' => '', 'max_product_price' => '');
 			}
 			return $price_infos;
 		}
@@ -668,81 +668,81 @@ 
 			global $wpdb;
 			$status = false; $result = '';
 			@ini_set('max_execution_time', '500');
-			$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
-			$output_type_option = get_option( 'wpshop_display_option' );
+			$price_piloting_option = get_option('wpshop_shop_price_piloting');
+			$output_type_option = get_option('wpshop_display_option');
 			$output_type = $output_type_option['wpshop_display_list_type'];
 
 			/** Get tx_tva attribute_id **/
-			$query = $wpdb->prepare( 'SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s', 'tx_tva' );
-			$tx_tva_attribute_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', 'tx_tva');
+			$tx_tva_attribute_id = $wpdb->get_var($query);
 
 			/** Product entity Definition **/
-			$product_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
+			$product_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 
 			/** Attributes def **/
-			$tva_attribute_def = wpshop_attributes::getElement('tva',"'valid'", 'code');
-			$product_price_attribute_def = wpshop_attributes::getElement('product_price',"'valid'", 'code');
-			$price_ht_attribute_def = wpshop_attributes::getElement('price_ht',"'valid'", 'code');
+			$tva_attribute_def = wpshop_attributes::getElement('tva', "'valid'", 'code');
+			$product_price_attribute_def = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+			$price_ht_attribute_def = wpshop_attributes::getElement('price_ht', "'valid'", 'code');
 
-			if ( !empty($tx_tva_attribute_id) ) {
-				$query = $wpdb->prepare( 'SELECT id, value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d', $tx_tva_attribute_id, 'valid' );
-				$tx_tva = $wpdb->get_results( $query );
+			if (!empty($tx_tva_attribute_id)) {
+				$query = $wpdb->prepare('SELECT id, value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $tx_tva_attribute_id, 'valid');
+				$tx_tva = $wpdb->get_results($query);
 
 				$tva_array = array();
 				/** Transform array to easy teatment **/
-				foreach( $tx_tva as $t ) {
-					$tva_array[ $t->id ] = $t->value;
+				foreach ($tx_tva as $t) {
+					$tva_array[$t->id] = $t->value;
 				}
 
-				if ( !empty($tx_tva) ) {
+				if (!empty($tx_tva)) {
 
 					$count_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 
-					for( $i = 0; $i <= $count_products->publish; $i+= 100 ) {
-					$query = $wpdb->prepare( 'SELECT * FROM '. $wpdb->posts .' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT '.$i.', 150', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish' );
-					$products = $wpdb->get_results( $query );
+					for ($i = 0; $i <= $count_products->publish; $i += 100) {
+					$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT ' . $i . ', 150', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
+					$products = $wpdb->get_results($query);
 
-						if( !empty($products) ){
-	 						foreach( $products as $product ) {
-								$product_data = get_post_meta( $product->ID, '_wpshop_product_metadata', true);
-								if ( !empty($product_data) ) {
-									if ( !empty($product_data['tx_tva']) && array_key_exists( $product_data['tx_tva'], $tva_array) ) {
+						if (!empty($products)) {
+	 						foreach ($products as $product) {
+								$product_data = get_post_meta($product->ID, '_wpshop_product_metadata', true);
+								if (!empty($product_data)) {
+									if (!empty($product_data['tx_tva']) && array_key_exists($product_data['tx_tva'], $tva_array)) {
 
-										if ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) {
+										if (!empty($price_piloting_option) && $price_piloting_option == 'HT') {
 											/** Update post meta **/
-											$product_data['price_ht'] = (float)str_replace( ',', '.', $product_data['price_ht'] );
-											$product_data['product_price'] = $product_data['price_ht'] * ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											$product_data['tva'] = $product_data['price_ht'] * ( ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											update_post_meta( $product->ID, '_wpshop_product_metadata', $product_data);
+											$product_data['price_ht'] = (float)str_replace(',', '.', $product_data['price_ht']);
+											$product_data['product_price'] = $product_data['price_ht'] * (1 + ($tva_array[$product_data['tx_tva']] / 100));
+											$product_data['tva'] = $product_data['price_ht'] * (($tva_array[$product_data['tx_tva']] / 100));
+											update_post_meta($product->ID, '_wpshop_product_metadata', $product_data);
 
 
 											/** Update attributes values **/
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product->ID) );
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['price_ht']), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['product_price']), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['tva']), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product->ID));
 
 											/** Update Display price meta **/
 											$p = wpshop_products::get_product_data($product->ID);
-											$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type) );
-											update_post_meta( $product->ID, '_wps_price_infos', $price );
+											$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type));
+											update_post_meta($product->ID, '_wps_price_infos', $price);
 										}
 										else {
 											/** Update post meta **/
-											$product_data['product_price'] = (float)str_replace( ',', '.', $product_data['product_price'] );
-											$product_data['price_ht'] = $product_data['product_price'] / ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											$product_data['tva'] = $product_data['price_ht'] * ( ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											update_post_meta( $product->ID, '_wpshop_product_metadata', $product_data);
+											$product_data['product_price'] = (float)str_replace(',', '.', $product_data['product_price']);
+											$product_data['price_ht'] = $product_data['product_price'] / (1 + ($tva_array[$product_data['tx_tva']] / 100));
+											$product_data['tva'] = $product_data['price_ht'] * (($tva_array[$product_data['tx_tva']] / 100));
+											update_post_meta($product->ID, '_wpshop_product_metadata', $product_data);
 
 											/** Update attributes values **/
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product->ID) );
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht']), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva']), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price']), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product->ID));
 
 
 											/** Update Display price meta **/
 											$p = wpshop_products::get_product_data($product->ID);
-											$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type) );
-											update_post_meta( $product->ID, '_wps_price_infos', $price );
+											$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type));
+											update_post_meta($product->ID, '_wps_price_infos', $price);
 										}
 									}
 								}
@@ -750,41 +750,41 @@ 
 
 						}
 					}
-					unset( $products );
+					unset($products);
 
 					$count_variations = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION);
-					for( $i = 0; $i <= $count_variations->publish; $i+= 100 ) {
-						$query = $wpdb->prepare( 'SELECT * FROM '. $wpdb->posts .' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT '.$i.', 100', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'publish' );
-						$product_variations = $wpdb->get_results( $query );
+					for ($i = 0; $i <= $count_variations->publish; $i += 100) {
+						$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT ' . $i . ', 100', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'publish');
+						$product_variations = $wpdb->get_results($query);
 						/** Update Products Variations **/
-						if ( !empty($product_variations) ) {
-							foreach( $product_variations as $product_variation ) {
-								$product_data = get_post_meta( $product_variation->ID, '_wpshop_product_metadata', true);
-								if ( !empty($product_data) ) {
-									if ( !empty($product_data['tx_tva']) && array_key_exists( $product_data['tx_tva'], $tva_array) ) {
-										if ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) {
+						if (!empty($product_variations)) {
+							foreach ($product_variations as $product_variation) {
+								$product_data = get_post_meta($product_variation->ID, '_wpshop_product_metadata', true);
+								if (!empty($product_data)) {
+									if (!empty($product_data['tx_tva']) && array_key_exists($product_data['tx_tva'], $tva_array)) {
+										if (!empty($price_piloting_option) && $price_piloting_option == 'HT') {
 											/** Update post meta **/
-											$product_data['price_ht'] = (float)str_replace( ',', '.', $product_data['price_ht'] );
-											$product_data['product_price'] = $product_data['price_ht'] * ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											$product_data['tva'] = $product_data['price_ht'] * ( ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											update_post_meta( $product_variation->ID, '_wpshop_product_metadata', $product_data);
+											$product_data['price_ht'] = (float)str_replace(',', '.', $product_data['price_ht']);
+											$product_data['product_price'] = $product_data['price_ht'] * (1 + ($tva_array[$product_data['tx_tva']] / 100));
+											$product_data['tva'] = $product_data['price_ht'] * (($tva_array[$product_data['tx_tva']] / 100));
+											update_post_meta($product_variation->ID, '_wpshop_product_metadata', $product_data);
 
 											/** Update attributes values **/
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID) );
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht']), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price']), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva']), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID));
 										}
 										else {
 											/** Update post meta **/
-											$product_data['product_price'] = (float)str_replace( ',', '.', $product_data['product_price'] );
-											$product_data['price_ht'] = $product_data['product_price'] / ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											$product_data['tva'] = $product_data['price_ht'] * ( ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											update_post_meta( $product_variation->ID, '_wpshop_product_metadata', $product_data);
+											$product_data['product_price'] = (float)str_replace(',', '.', $product_data['product_price']);
+											$product_data['price_ht'] = $product_data['product_price'] / (1 + ($tva_array[$product_data['tx_tva']] / 100));
+											$product_data['tva'] = $product_data['price_ht'] * (($tva_array[$product_data['tx_tva']] / 100));
+											update_post_meta($product_variation->ID, '_wpshop_product_metadata', $product_data);
 
 											/** Update attributes values **/
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID) );
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht']), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva']), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price']), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID));
 										}
 									}
 								}
@@ -801,15 +801,15 @@ 
 				}
 			}
 			else {
-				$result = __( 'VAT rate attribute was not found', 'wpshop' );
+				$result = __('VAT rate attribute was not found', 'wpshop');
 			}
-			return array( $status, $result );
+			return array($status, $result);
 		}
 
 	}
 
 }
 /**	Instanciate the module utilities if not	*/
-if ( class_exists("wpshop_prices") ) {
+if (class_exists("wpshop_prices")) {
 	$wpshop_prices = new wpshop_prices();
 }

script/wp-emulator.script.php

Doc Comments +12 added lines

@@ -110,11 +110,17 @@ 
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	function add_filter( $name, $fn, $nbr = "")
 	{
 		echo "[+] Adding filter -> " . $name . " X" . $nbr . PHP_EOL;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	function add_shortcode( $name )
 	{
 		echo "[+] Adding shortcode -> " . $name . PHP_EOL;
@@ -150,6 +156,9 @@ 
 		echo "[+] Loading text domain" . PHP_EOL;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	function plugin_dir_path($path)
 	{
 		echo "[+] Plugin path -> " . $path . PHP_EOL;
@@ -249,6 +258,9 @@ 
 		return "";
 	}
 
+	/**
+	 * @param string $str
+	 */
 	function current_time( $str )
 	{
 		$time = " 2005-08-05 10:41:13";

Indentation +3 added lines, -3 removed lines

@@ -158,12 +158,12 @@ 
 
 	function trailingslashit( $string )
 	{
-	    return untrailingslashit( $string ) . '/';
+		return untrailingslashit( $string ) . '/';
 	}
 
 	function untrailingslashit( $string )
 	{
-	        return rtrim( $string, '/\\' );
+			return rtrim( $string, '/\\' );
 	}
 
 	function site_url()
@@ -288,7 +288,7 @@ 
 		public $term_relationships = "term_relationship";
 		public $term_taxonomy = "term_taxonomy";
 
-    }
+	}
 
 	class WP_Widget
 	{

Spacing +35 added lines, -35 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 	define('ABSPATH', dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR);
-	define('WP_PLUGIN_DIR', dirname(dirname(dirname(__FILE__))) );
+	define('WP_PLUGIN_DIR', dirname(dirname(dirname(__FILE__))));
 	define('WP_LANG_DIR', 'FR');
 	define('WP_CONTENT_DIR', 'wp-content');
 
-	function __( $str )
+	function __($str)
 	{
 		$translate = "Result Testing text";
 		echo "[+] Requesting __ -> " . $str . PHP_EOL;
 		return $translate;
 	}
 
-	function add_action( $init, $object )
+	function add_action($init, $object)
 	{
 		$length = 0;
 		$hooked = "";
 		$oType = gettype($object);
-		if($oType == "object" || $oType == "array")
+		if ($oType == "object" || $oType == "array")
 		{
 			$hooked = "[";
-			foreach($object as $hook)
+			foreach ($object as $hook)
 			{
 				$length++;
 				$type = gettype($hook);
 
-				switch($type)
+				switch ($type)
 				{
 					case "integer":
 					case "boolean":
@@ -37,27 +37,27 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if ($length > 0) $hooked = rtrim($hooked, ",");
 			$hooked .= "]";
 		}
 		else $hooked .= $object;
 		echo "[+] Adding action -> " . $init . " in " . $hooked . PHP_EOL;
 	}
 
-	function register_activation_hook( $file , $object )
+	function register_activation_hook($file, $object)
 	{
 		$length = 0;
 		$hooked = "";
 		$oType = gettype($object);
-		if($oType == "object" || $oType == "array")
+		if ($oType == "object" || $oType == "array")
 		{
 			$hooked = "[";
-			foreach($object as $hook)
+			foreach ($object as $hook)
 			{
 				$length++;
 				$type = gettype($hook);
 
-				switch($type)
+				switch ($type)
 				{
 					case "integer":
 					case "boolean":
@@ -70,27 +70,27 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if ($length > 0) $hooked = rtrim($hooked, ",");
 			$hooked .= "]";
 		}
 		else $hooked .= $object;
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 
-	function register_deactivation_hook( $file , $object )
+	function register_deactivation_hook($file, $object)
 	{
 		$length = 0;
 		$hooked = "";
 		$oType = gettype($object);
-		if($oType == "object" || $oType == "array")
+		if ($oType == "object" || $oType == "array")
 		{
 			$hooked = "[";
-			foreach($object as $hook)
+			foreach ($object as $hook)
 			{
 				$length++;
 				$type = gettype($hook);
 
-				switch($type)
+				switch ($type)
 				{
 					case "integer":
 					case "boolean":
@@ -103,29 +103,29 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if ($length > 0) $hooked = rtrim($hooked, ",");
 			$hooked .= "]";
 		}
 		else $hooked .= $object;
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 
-	function add_filter( $name, $fn, $nbr = "")
+	function add_filter($name, $fn, $nbr = "")
 	{
 		echo "[+] Adding filter -> " . $name . " X" . $nbr . PHP_EOL;
 	}
 
-	function add_shortcode( $name )
+	function add_shortcode($name)
 	{
 		echo "[+] Adding shortcode -> " . $name . PHP_EOL;
 	}
 
-	function add_option( $name, $conf)
+	function add_option($name, $conf)
 	{
 		echo "[+] Adding option -> " . $name . " conf:" . $conf . PHP_EOL;
 	}
 
-	function update_option( $name, $conf)
+	function update_option($name, $conf)
 	{
 		echo "[+] Updating option -> " . $name . " conf:" . $conf . PHP_EOL;
 	}
@@ -153,17 +153,17 @@ 
 	function plugin_dir_path($path)
 	{
 		echo "[+] Plugin path -> " . $path . PHP_EOL;
-		return trailingslashit( dirname( $path ) );
+		return trailingslashit(dirname($path));
 	}
 
-	function trailingslashit( $string )
+	function trailingslashit($string)
 	{
-	    return untrailingslashit( $string ) . '/';
+	    return untrailingslashit($string) . '/';
 	}
 
-	function untrailingslashit( $string )
+	function untrailingslashit($string)
 	{
-	        return rtrim( $string, '/\\' );
+	        return rtrim($string, '/\\');
 	}
 
 	function site_url()
@@ -215,12 +215,12 @@ 
 		return $dir;
 	}
 
-	function add_theme_support( $theme )
+	function add_theme_support($theme)
 	{
 		echo "[+] Adding theme support -> " . $theme . PHP_EOL;
 	}
 
-	function add_image_size( $image, $x, $y, $bool )
+	function add_image_size($image, $x, $y, $bool)
 	{
 		echo "[+] Adding image size -> " . $image . " x:" . $x . " y:" . $y . " bool:" . $bool . PHP_EOL;
 	}
@@ -232,24 +232,24 @@ 
 		return $lang;
 	}
 
-	function load_plugin_textdomain( $name, $bool, $dir)
+	function load_plugin_textdomain($name, $bool, $dir)
 	{
 		echo "[+] Loading plugin textdomain -> " . $name . " bool:" . $bool . " dir:" . $dir . PHP_EOL;
 	}
 
-	function get_option( $name, $int = 0 )
+	function get_option($name, $int = 0)
 	{
 		echo "[+] Getting option -> " . $name . " int:" . $int . PHP_EOL;
 		return "";
 	}
 
-	function get_site_option( $name, $int = 0 )
+	function get_site_option($name, $int = 0)
 	{
 		echo "[+] Getting site option -> " . $name . " int:" . $int . PHP_EOL;
 		return "";
 	}
 
-	function current_time( $str )
+	function current_time($str)
 	{
 		$time = " 2005-08-05 10:41:13";
 		echo "[+] Requesting current_time -> " . $str . PHP_EOL;
@@ -258,17 +258,17 @@ 
 
 	class WPDB
 	{
-		function prepare( $request = "" )
+		function prepare($request = "")
 		{
 			echo "[+] Preparing -> " . $request . PHP_EOL;
 		}
 
-		public static function get_var( $request = "" )
+		public static function get_var($request = "")
 		{
 			echo "[+] Requesting get var -> " . $request . PHP_EOL;
 		}
 
-		public static function get_charset_collate( $request = "" )
+		public static function get_charset_collate($request = "")
 		{
 			echo "[+] Requesting get charset collate -> " . $request . PHP_EOL;
 		}

Braces +15 added lines, -6 removed lines

@@ -37,10 +37,13 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if($length > 0) {
+				$hooked = rtrim($hooked, ",");
+			}
 			$hooked .= "]";
+		} else {
+			$hooked .= $object;
 		}
-		else $hooked .= $object;
 		echo "[+] Adding action -> " . $init . " in " . $hooked . PHP_EOL;
 	}
 
@@ -70,10 +73,13 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if($length > 0) {
+				$hooked = rtrim($hooked, ",");
+			}
 			$hooked .= "]";
+		} else {
+			$hooked .= $object;
 		}
-		else $hooked .= $object;
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 
@@ -103,10 +109,13 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if($length > 0) {
+				$hooked = rtrim($hooked, ",");
+			}
 			$hooked .= "]";
+		} else {
+			$hooked .= $object;
 		}
-		else $hooked .= $object;
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 

script/unit.script.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 $unitList = searchFiles('.' . DIRECTORY_SEPARATOR, END_TEST);
 
 // Loop on unitList
-foreach($unitList as $test)
+foreach ($unitList as $test)
 {
 	echo "[+] Testing -> " . $test . PHP_EOL;
 	include($test);
@@ -28,7 +28,7 @@ 
 	$ite = new RecursiveIteratorIterator($dir);
 	$files = new RegexIterator($ite, $pattern, RegexIterator::GET_MATCH);
 	$fileList = array();
-	foreach($files as $file)
+	foreach ($files as $file)
 	{
 		$fileList[] = $file[0];
 	}

includes/librairies/eav/wp_list_custom_attributes.class.php

Indentation +8 added lines, -8 removed lines

@@ -314,7 +314,7 @@ 
 		 * to keep hidden, and a list of columns that are sortable. Each of these
 		 * can be defined in another method (as we've done here) before being
 		 * used to build the value for our _column_headers property.
-		*/
+		 */
 		$columns = $this->get_columns();
 		$hidden = array();
 		$sortable = $this->get_sortable_columns();
@@ -324,13 +324,13 @@ 
 		 * headers. The $this->_column_headers property takes an array which contains
 		 * 3 other arrays. One for all columns, one for hidden columns, and one
 		 * for sortable columns.
-		*/
+		 */
 		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		/**
 		 * Optional. You can handle your bulk actions however you see fit. In this
 		 * case, we'll handle them within our package just to keep things clean.
-		*/
+		 */
 		$this->process_bulk_action();
 
 		/**
@@ -341,14 +341,14 @@ 
 		 * our data. In a real-world implementation, you will probably want to
 		 * use sort and pagination data to build a custom query instead, as you'll
 		 * be able to use your precisely-queried data immediately.
-		*/
+		 */
 		$data = $this->datas;
 
 		/**
 		 * REQUIRED for pagination. Let's figure out what page the user is currently
 		 * looking at. We'll need this later, so you should always include it in
 		 * your own package classes.
-		*/
+		 */
 		$current_page = $this->get_pagenum();
 
 		/**
@@ -356,20 +356,20 @@ 
 		 * In real-world use, this would be the total number of items in your database,
 		 * without filtering. We'll need this later, so you should always include it
 		 * in your own package classes.
-		*/
+		 */
 		$total_items = count($data);
 
 		/**
 		 * The WP_List_Table class does not handle pagination for us, so we need
 		 * to ensure that the data is trimmed to only the current page. We can use
 		 * array_slice() to
-		*/
+		 */
 		$data = array_slice($data,(($current_page-1)*$per_page),$per_page);
 
 		/**
 		 * REQUIRED. Now we can add our *sorted* data to the items property, where
 		 * it can be used by the rest of the class.
-		*/
+		 */
 		$this->items = $data;
 
 		/*	REQUIRED. We also have to register our pagination options & calculations.	*/

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {

Spacing +49 added lines, -49 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 
@@ -12,38 +12,38 @@ 
  * @package wpshop
  * @subpackage librairies
  */
-class wpshop_attributes_custom_List_table extends WP_List_Table{
+class wpshop_attributes_custom_List_table extends WP_List_Table {
 	var $datas;
 
 	/** ************************************************************************
 	 * REQUIRED. Set up a constructor that references the parent constructor. We
 	 * use the parent reference to set some default configs.
 	 ***************************************************************************/
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		//Set parent defaults
-		parent::__construct( array(
-			'singular'  => __('attribute\'s', 'wpshop'),    //singular name of the listed records
-			'plural'    => __('attributes\'', 'wpshop'),    //plural name of the listed records
+		parent::__construct(array(
+			'singular'  => __('attribute\'s', 'wpshop'), //singular name of the listed records
+			'plural'    => __('attributes\'', 'wpshop'), //plural name of the listed records
 			'ajax'     => true       //does this table support ajax?
-		) );
+		));
 	}
 
 	/*	Allows to set different listings for attributes	*/
-	function get_views(){
+	function get_views() {
 		$wpshop_attribute_links = array();
 
 		$active_nb = wpshop_attributes::getElement('', "'valid'");
 		$unactive_nb = wpshop_attributes::getElement('', "'moderated', 'notused'");
 		$deleted_nb = wpshop_attributes::getElement('', "'deleted'");
 
-		$attribute_status = !empty( $_REQUEST['attribute_status'] ) ? sanitize_text_field( $_REQUEST['attribute_status'] ) : '';
+		$attribute_status = !empty($_REQUEST['attribute_status']) ? sanitize_text_field($_REQUEST['attribute_status']) : '';
 
-		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_valid'.(empty($attribute_status)?' current':'')] = '<a href="'.admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING).'" >'.__('Used attributes', 'wpshop').' ('.count($active_nb).')</a>';
-		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_moderated'.(!empty($attribute_status) && ($attribute_status=='unactive')?' current':'')] = '<a href="'.admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING.'&attribute_status=unactive').'" >'.__('Unactive attributes', 'wpshop').' ('.count($unactive_nb).')</a>';
-		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_deleted'.(!empty($attribute_status) && ($attribute_status=='deleted')?' current':'')] = '<a href="'.admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING.'&attribute_status=deleted').'" >'.__('Trashed attributes', 'wpshop').' ('.count($deleted_nb).')</a>';
-		$wpshop_attribute_links['unit_management_link'] = '<a href="#" id="wpshop_attribute_unit_manager_opener" data-nonce="' . wp_create_nonce( 'load_unit_interface' ) . '">'.__('Unit management', 'wpshop').'</a>';
+		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_valid' . (empty($attribute_status) ? ' current' : '')] = '<a href="' . admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING) . '" >' . __('Used attributes', 'wpshop') . ' (' . count($active_nb) . ')</a>';
+		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_moderated' . (!empty($attribute_status) && ($attribute_status == 'unactive') ? ' current' : '')] = '<a href="' . admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING . '&attribute_status=unactive') . '" >' . __('Unactive attributes', 'wpshop') . ' (' . count($unactive_nb) . ')</a>';
+		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_deleted' . (!empty($attribute_status) && ($attribute_status == 'deleted') ? ' current' : '')] = '<a href="' . admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING . '&attribute_status=deleted') . '" >' . __('Trashed attributes', 'wpshop') . ' (' . count($deleted_nb) . ')</a>';
+		$wpshop_attribute_links['unit_management_link'] = '<a href="#" id="wpshop_attribute_unit_manager_opener" data-nonce="' . wp_create_nonce('load_unit_interface') . '">' . __('Unit management', 'wpshop') . '</a>';
 		$wpshop_attribute_links['unit_management_dialog'] = '<div id="wpshop_attribute_unit_manager"title="' . __('Unit management', 'wpshop') . '" class="wpshopHide" ><div class="loading_picture_container" id="product_chooser_picture" ><img src="' . WPSHOP_LOADING_ICON . '" alt="loading..." /></div></div>';
 		return $wpshop_attribute_links;
 	}
@@ -61,9 +61,9 @@ 
 	 * @see WP_List_Table::::single_row_columns()
 	 * @return array An associative array containing column information: 'slugs'=>'Visible Titles'
 	 **************************************************************************/
-	function get_columns(){
+	function get_columns() {
 		$columns = array(
-			'cb'       	=> '',//'<input type="checkbox" />', //Render a checkbox instead of text
+			'cb'       	=> '', //'<input type="checkbox" />', //Render a checkbox instead of text
 			'id'       	=> __('Id.', 'wpshop'),
 			'name'    	=> __('Name', 'wpshop'),
 			'status'    => __('Status', 'wpshop'),
@@ -94,10 +94,10 @@ 
 	 * @param array $column_name The name/slug of the column to be processed
 	 * @return string Text or HTML to be placed inside the column <td>
 	 **************************************************************************/
-	function column_default($item, $column_name){
-		switch($column_name){
+	function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return print_r($item,true); //Show the whole array for troubleshooting purposes
+				return print_r($item, true); //Show the whole array for troubleshooting purposes
 		}
 	}
 
@@ -117,7 +117,7 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_id($item){
+	function column_id($item) {
 		return $item['id'];
 	}
 	/** ************************************************************************
@@ -136,7 +136,7 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_status($item){
+	function column_status($item) {
 		return __($item['status'], 'wpshop');
 	}
 	/** ************************************************************************
@@ -155,7 +155,7 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_code($item){
+	function column_code($item) {
 		return $item['code'];
 	}
 	/** ************************************************************************
@@ -174,8 +174,8 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_entity($item){
-		return __($item['entity'],'wpshop');
+	function column_entity($item) {
+		return __($item['entity'], 'wpshop');
 	}
 	/** ************************************************************************
 	 * Recommended. This is a custom column method and is responsible for what
@@ -193,28 +193,28 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_name($item){
+	function column_name($item) {
 		$attribute_undeletable = unserialize(WPSHOP_ATTRIBUTE_UNDELETABLE);
 
-		$link_format = admin_url('admin.php').'?page=%2$s&amp;action=%3$s&amp;id=%4$s';
-		$default_action='edit';
-		$default_action_text=__('Edit', 'wpshop');
-		$attribute_status = !empty( $_REQUEST['attribute_status'] ) ? sanitize_text_field( $_REQUEST['attribute_status'] ) : '';
-		if(!empty($attribute_status) && ($attribute_status=='deleted')){
-			$default_action='activate';
-			$default_action_text=__('Restore', 'wpshop');
+		$link_format = admin_url('admin.php') . '?page=%2$s&amp;action=%3$s&amp;id=%4$s';
+		$default_action = 'edit';
+		$default_action_text = __('Edit', 'wpshop');
+		$attribute_status = !empty($_REQUEST['attribute_status']) ? sanitize_text_field($_REQUEST['attribute_status']) : '';
+		if (!empty($attribute_status) && ($attribute_status == 'deleted')) {
+			$default_action = 'activate';
+			$default_action_text = __('Restore', 'wpshop');
 		}
 		//Build row actions
 		$actions = array(
-			'edit'     => sprintf('<a href="'.$link_format.'">'.$default_action_text.'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING,$default_action,$item['id'])
+			'edit'     => sprintf('<a href="' . $link_format . '">' . $default_action_text . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, $default_action, $item['id'])
 		);
-		if(empty($attribute_status) && (!in_array($item['code'], $attribute_undeletable))){
-			$actions['delete'] = sprintf('<a href="'.$link_format.'">'.__('Delete', 'wpshop').'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING,'delete',$item['id']);
+		if (empty($attribute_status) && (!in_array($item['code'], $attribute_undeletable))) {
+			$actions['delete'] = sprintf('<a href="' . $link_format . '">' . __('Delete', 'wpshop') . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, 'delete', $item['id']);
 		}
 
 		//Return the title contents
 		return sprintf('%1$s%2$s',
-			/*$1%s*/ sprintf('<a href="'.$link_format.'">'.__($item['name'], 'wpshop').'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING,$default_action,$item['id']),
+			/*$1%s*/ sprintf('<a href="' . $link_format . '">' . __($item['name'], 'wpshop') . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, $default_action, $item['id']),
 			/*$3%s*/ $this->row_actions($actions)
 		);
 	}
@@ -227,11 +227,11 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_cb($item){
+	function column_cb($item) {
 		return '';
 		return sprintf(
 			'<input type="checkbox" name="%1$s[]" value="%2$s" />',
-			/*$1%s*/ $this->_args['singular'],  //Let's simply repurpose the table's singular label ("movie")
+			/*$1%s*/ $this->_args['singular'], //Let's simply repurpose the table's singular label ("movie")
 			/*$2%s*/ $item['id']             //The value of the checkbox should be the record's id
 		);
 	}
@@ -252,8 +252,8 @@ 
 	 **************************************************************************/
 	function get_sortable_columns() {
 		$sortable_columns = array(
-			'name'    => array('frontend_label',true),    //true means its already sorted
-			'status'  => array('status',true)
+			'name'    => array('frontend_label', true), //true means its already sorted
+			'status'  => array('status', true)
 		);
 		return $sortable_columns;
 	}
@@ -288,7 +288,7 @@ 
 	 **************************************************************************/
 	function process_bulk_action() {
 		//Detect when a bulk action is being triggered...
-		if( 'delete'===$this->current_action() ) {
+		if ('delete' === $this->current_action()) {
 			wp_die('Items deleted (or they would be if we had items to delete)!');
 		}
 	}
@@ -309,7 +309,7 @@ 
 	 **************************************************************************/
 	function prepare_items() {
 		/*	First, lets decide how many records per page to show	*/
-		$per_page = 10;//$this->get_items_per_page('attributes_per_page', 10);
+		$per_page = 10; //$this->get_items_per_page('attributes_per_page', 10);
 
 		/**
 		 * REQUIRED. Now we need to define our column headers. This includes a complete
@@ -367,7 +367,7 @@ 
 		 * to ensure that the data is trimmed to only the current page. We can use
 		 * array_slice() to
 		*/
-		$data = array_slice($data,(($current_page-1)*$per_page),$per_page);
+		$data = array_slice($data, (($current_page - 1) * $per_page), $per_page);
 
 		/**
 		 * REQUIRED. Now we can add our *sorted* data to the items property, where
@@ -376,10 +376,10 @@ 
 		$this->items = $data;
 
 		/*	REQUIRED. We also have to register our pagination options & calculations.	*/
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,               		//WE have to calculate the total number of items
-			'per_page'    => $per_page,                 		//WE have to determine how many items to show on a page
-			'total_pages' => ceil($total_items/$per_page)   //WE have to calculate the total number of pages
-		) );
+		$this->set_pagination_args(array(
+			'total_items' => $total_items, //WE have to calculate the total number of items
+			'per_page'    => $per_page, //WE have to determine how many items to show on a page
+			'total_pages' => ceil($total_items / $per_page)   //WE have to calculate the total number of pages
+		));
 	}
 }

includes/librairies/eav/wp_list_custom_attributes_set.class.php

Indentation +203 added lines, -203 removed lines

@@ -16,9 +16,9 @@ 
 	var $datas;
 
 	/** ************************************************************************
-	* REQUIRED. Set up a constructor that references the parent constructor. We
-	* use the parent reference to set some default configs.
-	***************************************************************************/
+	 * REQUIRED. Set up a constructor that references the parent constructor. We
+	 * use the parent reference to set some default configs.
+	 ***************************************************************************/
 	function __construct(){
 		global $status, $page;
 
@@ -44,18 +44,18 @@ 
 	}
 
 	/** ************************************************************************
-	* REQUIRED! This method dictates the table's columns and titles. This should
-	* return an array where the key is the column slug (and class) and the value
-	* is the column's title text. If you need a checkbox for bulk actions, refer
-	* to the $columns array below.
-	*
-	* The 'cb' column is treated differently than the rest. If including a checkbox
-	* column in your table you must create a column_cb() method. If you don't need
-	* bulk actions or checkboxes, simply leave the 'cb' entry out of your array.
-	*
-	* @see WP_List_Table::::single_row_columns()
-	* @return array An associative array containing column information: 'slugs'=>'Visible Titles'
-	**************************************************************************/
+	 * REQUIRED! This method dictates the table's columns and titles. This should
+	 * return an array where the key is the column slug (and class) and the value
+	 * is the column's title text. If you need a checkbox for bulk actions, refer
+	 * to the $columns array below.
+	 *
+	 * The 'cb' column is treated differently than the rest. If including a checkbox
+	 * column in your table you must create a column_cb() method. If you don't need
+	 * bulk actions or checkboxes, simply leave the 'cb' entry out of your array.
+	 *
+	 * @see WP_List_Table::::single_row_columns()
+	 * @return array An associative array containing column information: 'slugs'=>'Visible Titles'
+	 **************************************************************************/
 	function get_columns(){
 		$columns = array(
 			'cb'       => '',//'<input type="checkbox" />', //Render a checkbox instead of text
@@ -69,26 +69,26 @@ 
 	}
 
 	/** ************************************************************************
-	* Recommended. This method is called when the parent class can't find a method
-	* specifically build for a given column. Generally, it's recommended to include
-	* one method for each column you want to render, keeping your package class
-	* neat and organized. For example, if the class needs to process a column
-	* named 'title', it would first see if a method named $this->column_title()
-	* exists - if it does, that method will be used. If it doesn't, this one will
-	* be used. Generally, you should try to use custom column methods as much as
-	* possible.
-	*
-	* Since we have defined a column_title() method later on, this method doesn't
-	* need to concern itself with any column with a name of 'title'. Instead, it
-	* needs to handle everything else.
-	*
-	* For more detailed insight into how columns are handled, take a look at
-	* WP_List_Table::single_row_columns()
-	*
-	* @param array $item A singular item (one full row's worth of data)
-	* @param array $column_name The name/slug of the column to be processed
-	* @return string Text or HTML to be placed inside the column <td>
-	**************************************************************************/
+	 * Recommended. This method is called when the parent class can't find a method
+	 * specifically build for a given column. Generally, it's recommended to include
+	 * one method for each column you want to render, keeping your package class
+	 * neat and organized. For example, if the class needs to process a column
+	 * named 'title', it would first see if a method named $this->column_title()
+	 * exists - if it does, that method will be used. If it doesn't, this one will
+	 * be used. Generally, you should try to use custom column methods as much as
+	 * possible.
+	 *
+	 * Since we have defined a column_title() method later on, this method doesn't
+	 * need to concern itself with any column with a name of 'title'. Instead, it
+	 * needs to handle everything else.
+	 *
+	 * For more detailed insight into how columns are handled, take a look at
+	 * WP_List_Table::single_row_columns()
+	 *
+	 * @param array $item A singular item (one full row's worth of data)
+	 * @param array $column_name The name/slug of the column to be processed
+	 * @return string Text or HTML to be placed inside the column <td>
+	 **************************************************************************/
 	function column_default($item, $column_name){
 		switch($column_name){
 			default:
@@ -97,97 +97,97 @@ 
 	}
 
 	/** ************************************************************************
-	* Recommended. This is a custom column method and is responsible for what
-	* is rendered in any column with a name/slug of 'title'. Every time the class
-	* needs to render a column, it first looks for a method named
-	* column_{$column_title} - if it exists, that method is run. If it doesn't
-	* exist, column_default() is called instead.
-	*
-	* This example also illustrates how to implement rollover actions. Actions
-	* should be an associative array formatted as 'slug'=>'link html' - and you
-	* will need to generate the URLs yourself. You could even ensure the links
-	*
-	*
-	* @see WP_List_Table::::single_row_columns()
-	* @param array $item A singular item (one full row's worth of data)
-	* @return string Text to be placed inside the column <td> (movie title only)
-	**************************************************************************/
+	 * Recommended. This is a custom column method and is responsible for what
+	 * is rendered in any column with a name/slug of 'title'. Every time the class
+	 * needs to render a column, it first looks for a method named
+	 * column_{$column_title} - if it exists, that method is run. If it doesn't
+	 * exist, column_default() is called instead.
+	 *
+	 * This example also illustrates how to implement rollover actions. Actions
+	 * should be an associative array formatted as 'slug'=>'link html' - and you
+	 * will need to generate the URLs yourself. You could even ensure the links
+	 *
+	 *
+	 * @see WP_List_Table::::single_row_columns()
+	 * @param array $item A singular item (one full row's worth of data)
+	 * @return string Text to be placed inside the column <td> (movie title only)
+	 **************************************************************************/
 	function column_id($item){
 		return $item['id'];
 	}
 	/** ************************************************************************
-	* Recommended. This is a custom column method and is responsible for what
-	* is rendered in any column with a name/slug of 'title'. Every time the class
-	* needs to render a column, it first looks for a method named
-	* column_{$column_title} - if it exists, that method is run. If it doesn't
-	* exist, column_default() is called instead.
-	*
-	* This example also illustrates how to implement rollover actions. Actions
-	* should be an associative array formatted as 'slug'=>'link html' - and you
-	* will need to generate the URLs yourself. You could even ensure the links
-	*
-	*
-	* @see WP_List_Table::::single_row_columns()
-	* @param array $item A singular item (one full row's worth of data)
-	* @return string Text to be placed inside the column <td> (movie title only)
-	**************************************************************************/
+	 * Recommended. This is a custom column method and is responsible for what
+	 * is rendered in any column with a name/slug of 'title'. Every time the class
+	 * needs to render a column, it first looks for a method named
+	 * column_{$column_title} - if it exists, that method is run. If it doesn't
+	 * exist, column_default() is called instead.
+	 *
+	 * This example also illustrates how to implement rollover actions. Actions
+	 * should be an associative array formatted as 'slug'=>'link html' - and you
+	 * will need to generate the URLs yourself. You could even ensure the links
+	 *
+	 *
+	 * @see WP_List_Table::::single_row_columns()
+	 * @param array $item A singular item (one full row's worth of data)
+	 * @return string Text to be placed inside the column <td> (movie title only)
+	 **************************************************************************/
 	function column_status($item){
 		return __($item['status'], 'wpshop');
 	}
 	/** ************************************************************************
-	* Recommended. This is a custom column method and is responsible for what
-	* is rendered in any column with a name/slug of 'title'. Every time the class
-	* needs to render a column, it first looks for a method named
-	* column_{$column_title} - if it exists, that method is run. If it doesn't
-	* exist, column_default() is called instead.
-	*
-	* This example also illustrates how to implement rollover actions. Actions
-	* should be an associative array formatted as 'slug'=>'link html' - and you
-	* will need to generate the URLs yourself. You could even ensure the links
-	*
-	*
-	* @see WP_List_Table::::single_row_columns()
-	* @param array $item A singular item (one full row's worth of data)
-	* @return string Text to be placed inside the column <td> (movie title only)
-	**************************************************************************/
+	 * Recommended. This is a custom column method and is responsible for what
+	 * is rendered in any column with a name/slug of 'title'. Every time the class
+	 * needs to render a column, it first looks for a method named
+	 * column_{$column_title} - if it exists, that method is run. If it doesn't
+	 * exist, column_default() is called instead.
+	 *
+	 * This example also illustrates how to implement rollover actions. Actions
+	 * should be an associative array formatted as 'slug'=>'link html' - and you
+	 * will need to generate the URLs yourself. You could even ensure the links
+	 *
+	 *
+	 * @see WP_List_Table::::single_row_columns()
+	 * @param array $item A singular item (one full row's worth of data)
+	 * @return string Text to be placed inside the column <td> (movie title only)
+	 **************************************************************************/
 	function column_content($item){
 		return $item['content'];
 	}
 	/** ************************************************************************
-	* Recommended. This is a custom column method and is responsible for what
-	* is rendered in any column with a name/slug of 'title'. Every time the class
-	* needs to render a column, it first looks for a method named
-	* column_{$column_title} - if it exists, that method is run. If it doesn't
-	* exist, column_default() is called instead.
-	*
-	* This example also illustrates how to implement rollover actions. Actions
-	* should be an associative array formatted as 'slug'=>'link html' - and you
-	* will need to generate the URLs yourself. You could even ensure the links
-	*
-	*
-	* @see WP_List_Table::::single_row_columns()
-	* @param array $item A singular item (one full row's worth of data)
-	* @return string Text to be placed inside the column <td> (movie title only)
-	**************************************************************************/
+	 * Recommended. This is a custom column method and is responsible for what
+	 * is rendered in any column with a name/slug of 'title'. Every time the class
+	 * needs to render a column, it first looks for a method named
+	 * column_{$column_title} - if it exists, that method is run. If it doesn't
+	 * exist, column_default() is called instead.
+	 *
+	 * This example also illustrates how to implement rollover actions. Actions
+	 * should be an associative array formatted as 'slug'=>'link html' - and you
+	 * will need to generate the URLs yourself. You could even ensure the links
+	 *
+	 *
+	 * @see WP_List_Table::::single_row_columns()
+	 * @param array $item A singular item (one full row's worth of data)
+	 * @return string Text to be placed inside the column <td> (movie title only)
+	 **************************************************************************/
 	function column_entity($item){
 		return __($item['entity'],'wpshop');
 	}
 	/** ************************************************************************
-	* Recommended. This is a custom column method and is responsible for what
-	* is rendered in any column with a name/slug of 'title'. Every time the class
-	* needs to render a column, it first looks for a method named
-	* column_{$column_title} - if it exists, that method is run. If it doesn't
-	* exist, column_default() is called instead.
-	*
-	* This example also illustrates how to implement rollover actions. Actions
-	* should be an associative array formatted as 'slug'=>'link html' - and you
-	* will need to generate the URLs yourself. You could even ensure the links
-	*
-	*
-	* @see WP_List_Table::::single_row_columns()
-	* @param array $item A singular item (one full row's worth of data)
-	* @return string Text to be placed inside the column <td> (movie title only)
-	**************************************************************************/
+	 * Recommended. This is a custom column method and is responsible for what
+	 * is rendered in any column with a name/slug of 'title'. Every time the class
+	 * needs to render a column, it first looks for a method named
+	 * column_{$column_title} - if it exists, that method is run. If it doesn't
+	 * exist, column_default() is called instead.
+	 *
+	 * This example also illustrates how to implement rollover actions. Actions
+	 * should be an associative array formatted as 'slug'=>'link html' - and you
+	 * will need to generate the URLs yourself. You could even ensure the links
+	 *
+	 *
+	 * @see WP_List_Table::::single_row_columns()
+	 * @param array $item A singular item (one full row's worth of data)
+	 * @return string Text to be placed inside the column <td> (movie title only)
+	 **************************************************************************/
 	function column_name($item){
 		//Build row actions
 		$default_action='edit';
@@ -208,14 +208,14 @@ 
 		);
 	}
 	/** ************************************************************************
-	* REQUIRED if displaying checkboxes or using bulk actions! The 'cb' column
-	* is given special treatment when columns are processed. It ALWAYS needs to
-	* have it's own method.
-	*
-	* @see WP_List_Table::::single_row_columns()
-	* @param array $item A singular item (one full row's worth of data)
-	* @return string Text to be placed inside the column <td> (movie title only)
-	**************************************************************************/
+	 * REQUIRED if displaying checkboxes or using bulk actions! The 'cb' column
+	 * is given special treatment when columns are processed. It ALWAYS needs to
+	 * have it's own method.
+	 *
+	 * @see WP_List_Table::::single_row_columns()
+	 * @param array $item A singular item (one full row's worth of data)
+	 * @return string Text to be placed inside the column <td> (movie title only)
+	 **************************************************************************/
 	function column_cb($item){
 		return '';
 		return sprintf(
@@ -226,19 +226,19 @@ 
 	}
 
 	/** ************************************************************************
-	* Optional. If you want one or more columns to be sortable (ASC/DESC toggle),
-	* you will need to register it here. This should return an array where the
-	* key is the column that needs to be sortable, and the value is db column to
-	* sort by. Often, the key and value will be the same, but this is not always
-	* the case (as the value is a column name from the database, not the list table).
-	*
-	* This method merely defines which columns should be sortable and makes them
-	* clickable - it does not handle the actual sorting. You still need to detect
-	* the ORDERBY and ORDER querystring variables within prepare_items() and sort
-	* your data accordingly (usually by modifying your query).
-	*
-	* @return array An associative array containing all the columns that should be sortable: 'slugs'=>array('data_values',bool)
-	**************************************************************************/
+	 * Optional. If you want one or more columns to be sortable (ASC/DESC toggle),
+	 * you will need to register it here. This should return an array where the
+	 * key is the column that needs to be sortable, and the value is db column to
+	 * sort by. Often, the key and value will be the same, but this is not always
+	 * the case (as the value is a column name from the database, not the list table).
+	 *
+	 * This method merely defines which columns should be sortable and makes them
+	 * clickable - it does not handle the actual sorting. You still need to detect
+	 * the ORDERBY and ORDER querystring variables within prepare_items() and sort
+	 * your data accordingly (usually by modifying your query).
+	 *
+	 * @return array An associative array containing all the columns that should be sortable: 'slugs'=>array('data_values',bool)
+	 **************************************************************************/
 	function get_sortable_columns() {
 		$sortable_columns = array(
 			//'name'    => array('name',true)    //true means its already sorted
@@ -247,19 +247,19 @@ 
 	}
 
 	/** ************************************************************************
-	* Optional. If you need to include bulk actions in your list table, this is
-	* the place to define them. Bulk actions are an associative array in the format
-	* 'slug'=>'Visible Title'
-	*
-	* If this method returns an empty value, no bulk action will be rendered. If
-	* you specify any bulk actions, the bulk actions box will be rendered with
-	* the table automatically on display().
-	*
-	* Also note that list tables are not automatically wrapped in <form> elements,
-	* so you will need to create those manually in order for bulk actions to function.
-	*
-	* @return array An associative array containing all the bulk actions: 'slugs'=>'Visible Titles'
-	**************************************************************************/
+	 * Optional. If you need to include bulk actions in your list table, this is
+	 * the place to define them. Bulk actions are an associative array in the format
+	 * 'slug'=>'Visible Title'
+	 *
+	 * If this method returns an empty value, no bulk action will be rendered. If
+	 * you specify any bulk actions, the bulk actions box will be rendered with
+	 * the table automatically on display().
+	 *
+	 * Also note that list tables are not automatically wrapped in <form> elements,
+	 * so you will need to create those manually in order for bulk actions to function.
+	 *
+	 * @return array An associative array containing all the bulk actions: 'slugs'=>'Visible Titles'
+	 **************************************************************************/
 	function get_bulk_actions() {
 		$actions = array(
 			// 'delete'    => __('Delete','wpshop')
@@ -268,12 +268,12 @@ 
 	}
 
 	/** ************************************************************************
-	* Optional. You can handle your bulk actions anywhere or anyhow you prefer.
-	* For this example package, we will handle it in the class to keep things
-	* clean and organized.
-	*
-	* @see $this->prepare_items()
-	**************************************************************************/
+	 * Optional. You can handle your bulk actions anywhere or anyhow you prefer.
+	 * For this example package, we will handle it in the class to keep things
+	 * clean and organized.
+	 *
+	 * @see $this->prepare_items()
+	 **************************************************************************/
 	function process_bulk_action() {
 		//Detect when a bulk action is being triggered...
 		if( 'delete'===$this->current_action() ) {
@@ -282,90 +282,90 @@ 
 	}
 
 	/** ************************************************************************
-	* REQUIRED! This is where you prepare your data for display. This method will
-	* usually be used to query the database, sort and filter the data, and generally
-	* get it ready to be displayed. At a minimum, we should set $this->items and
-	* $this->set_pagination_args(), although the following properties and methods
-	* are frequently interacted with here...
-	*
-	* @uses $this->_column_headers
-	* @uses $this->items
-	* @uses $this->get_columns()
-	* @uses $this->get_sortable_columns()
-	* @uses $this->get_pagenum()
-	* @uses $this->set_pagination_args()
-	**************************************************************************/
+	 * REQUIRED! This is where you prepare your data for display. This method will
+	 * usually be used to query the database, sort and filter the data, and generally
+	 * get it ready to be displayed. At a minimum, we should set $this->items and
+	 * $this->set_pagination_args(), although the following properties and methods
+	 * are frequently interacted with here...
+	 *
+	 * @uses $this->_column_headers
+	 * @uses $this->items
+	 * @uses $this->get_columns()
+	 * @uses $this->get_sortable_columns()
+	 * @uses $this->get_pagenum()
+	 * @uses $this->set_pagination_args()
+	 **************************************************************************/
 	function prepare_items() {
 		/*	First, lets decide how many records per page to show	*/
 		$per_page = 10;
 
 		/**
-		* REQUIRED. Now we need to define our column headers. This includes a complete
-		* array of columns to be displayed (slugs & titles), a list of columns
-		* to keep hidden, and a list of columns that are sortable. Each of these
-		* can be defined in another method (as we've done here) before being
-		* used to build the value for our _column_headers property.
-		*/
+		 * REQUIRED. Now we need to define our column headers. This includes a complete
+		 * array of columns to be displayed (slugs & titles), a list of columns
+		 * to keep hidden, and a list of columns that are sortable. Each of these
+		 * can be defined in another method (as we've done here) before being
+		 * used to build the value for our _column_headers property.
+		 */
 		$columns = $this->get_columns();
 		$hidden = array();
 		$sortable = $this->get_sortable_columns();
 
 		/**
-		* REQUIRED. Finally, we build an array to be used by the class for column
-		* headers. The $this->_column_headers property takes an array which contains
-		* 3 other arrays. One for all columns, one for hidden columns, and one
-		* for sortable columns.
-		*/
+		 * REQUIRED. Finally, we build an array to be used by the class for column
+		 * headers. The $this->_column_headers property takes an array which contains
+		 * 3 other arrays. One for all columns, one for hidden columns, and one
+		 * for sortable columns.
+		 */
 		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		/**
-		* Optional. You can handle your bulk actions however you see fit. In this
-		* case, we'll handle them within our package just to keep things clean.
-		*/
+		 * Optional. You can handle your bulk actions however you see fit. In this
+		 * case, we'll handle them within our package just to keep things clean.
+		 */
 		$this->process_bulk_action();
 
 		/**
-		* Instead of querying a database, we're going to fetch the example data
-		* property we created for use in this plugin. This makes this example
-		* package slightly different than one you might build on your own. In
-		* this example, we'll be using array manipulation to sort and paginate
-		* our data. In a real-world implementation, you will probably want to
-		* use sort and pagination data to build a custom query instead, as you'll
-		* be able to use your precisely-queried data immediately.
-		*/
+		 * Instead of querying a database, we're going to fetch the example data
+		 * property we created for use in this plugin. This makes this example
+		 * package slightly different than one you might build on your own. In
+		 * this example, we'll be using array manipulation to sort and paginate
+		 * our data. In a real-world implementation, you will probably want to
+		 * use sort and pagination data to build a custom query instead, as you'll
+		 * be able to use your precisely-queried data immediately.
+		 */
 		$data = $this->datas;
 
 		/**
-		* REQUIRED for pagination. Let's figure out what page the user is currently
-		* looking at. We'll need this later, so you should always include it in
-		* your own package classes.
-		*/
+		 * REQUIRED for pagination. Let's figure out what page the user is currently
+		 * looking at. We'll need this later, so you should always include it in
+		 * your own package classes.
+		 */
 		$current_page = $this->get_pagenum();
 
 		/**
-		* REQUIRED for pagination. Let's check how many items are in our data array.
-		* In real-world use, this would be the total number of items in your database,
-		* without filtering. We'll need this later, so you should always include it
-		* in your own package classes.
-		*/
+		 * REQUIRED for pagination. Let's check how many items are in our data array.
+		 * In real-world use, this would be the total number of items in your database,
+		 * without filtering. We'll need this later, so you should always include it
+		 * in your own package classes.
+		 */
 		$total_items = count($data);
 
 		/**
-		* The WP_List_Table class does not handle pagination for us, so we need
-		* to ensure that the data is trimmed to only the current page. We can use
-		* array_slice() to
-		*/
+		 * The WP_List_Table class does not handle pagination for us, so we need
+		 * to ensure that the data is trimmed to only the current page. We can use
+		 * array_slice() to
+		 */
 		$data = array_slice($data,(($current_page-1)*$per_page),$per_page);
 
 		/**
-		* REQUIRED. Now we can add our *sorted* data to the items property, where
-		* it can be used by the rest of the class.
-		*/
+		 * REQUIRED. Now we can add our *sorted* data to the items property, where
+		 * it can be used by the rest of the class.
+		 */
 		$this->items = $data;
 
 		/**
-		* REQUIRED. We also have to register our pagination options & calculations.
-		*/
+		 * REQUIRED. We also have to register our pagination options & calculations.
+		 */
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,               		//WE have to calculate the total number of items
 			'per_page'    => $per_page,                 		//WE have to determine how many items to show on a page

Spacing +42 added lines, -42 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 
@@ -11,7 +11,7 @@ 
 * @package wpshop
 * @subpackage librairies
 */
-class wpshop_attributes_set_custom_List_table extends WP_List_Table{
+class wpshop_attributes_set_custom_List_table extends WP_List_Table {
 
 	var $datas;
 
@@ -19,28 +19,28 @@ 
 	* REQUIRED. Set up a constructor that references the parent constructor. We
 	* use the parent reference to set some default configs.
 	***************************************************************************/
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		//Set parent defaults
-		parent::__construct( array(
-			'singular'  => __('attribute\'s set', 'wpshop'),    //singular name of the listed records
-			'plural'    => __('attributes\' set', 'wpshop'),    //plural name of the listed records
+		parent::__construct(array(
+			'singular'  => __('attribute\'s set', 'wpshop'), //singular name of the listed records
+			'plural'    => __('attributes\' set', 'wpshop'), //plural name of the listed records
 			'ajax'     => true       //does this table support ajax?
-		) );
+		));
 	}
 
 	/*	Allows to set different listings for attributes	*/
-	function get_views(){
+	function get_views() {
 		$wpshop_attribute_links = array();
 
 		$active_nb = wpshop_attributes_set::getElement('', "'moderated','valid'");
 		$deleted_nb = wpshop_attributes_set::getElement('', "'deleted'");
 
-		$attribute_group_status = !empty( $_REQUEST['attribute_groups_status'] ) ? sanitize_text_field( $_REQUEST['attribute_groups_status'] ) : '';
+		$attribute_group_status = !empty($_REQUEST['attribute_groups_status']) ? sanitize_text_field($_REQUEST['attribute_groups_status']) : '';
 
-		$wpshop_attribute_links['wpshop_attribute_groups_links wpshop_attribute_groups_links_valid'.(empty($attribute_group_status)?' current':'')] = '<a href="'.admin_url('admin.php?page='.wpshop_attributes_set::getEditionSlug()).'" >'.__('Attribute groups', 'wpshop').' ('.count($active_nb).')</a>';
-		$wpshop_attribute_links['wpshop_attribute_groups_links wpshop_attribute_groups_links_deleted'.(!empty($attribute_group_status) && ($attribute_group_status=='deleted')?' current':'')] = '<a href="'.admin_url('admin.php?page='.wpshop_attributes_set::getEditionSlug().'&attribute_groups_status=deleted').'" >'.__('Trashed attribute groups', 'wpshop').' ('.count($deleted_nb).')</a>';
+		$wpshop_attribute_links['wpshop_attribute_groups_links wpshop_attribute_groups_links_valid' . (empty($attribute_group_status) ? ' current' : '')] = '<a href="' . admin_url('admin.php?page=' . wpshop_attributes_set::getEditionSlug()) . '" >' . __('Attribute groups', 'wpshop') . ' (' . count($active_nb) . ')</a>';
+		$wpshop_attribute_links['wpshop_attribute_groups_links wpshop_attribute_groups_links_deleted' . (!empty($attribute_group_status) && ($attribute_group_status == 'deleted') ? ' current' : '')] = '<a href="' . admin_url('admin.php?page=' . wpshop_attributes_set::getEditionSlug() . '&attribute_groups_status=deleted') . '" >' . __('Trashed attribute groups', 'wpshop') . ' (' . count($deleted_nb) . ')</a>';
 
 		return $wpshop_attribute_links;
 	}
@@ -58,9 +58,9 @@ 
 	* @see WP_List_Table::::single_row_columns()
 	* @return array An associative array containing column information: 'slugs'=>'Visible Titles'
 	**************************************************************************/
-	function get_columns(){
+	function get_columns() {
 		$columns = array(
-			'cb'       => '',//'<input type="checkbox" />', //Render a checkbox instead of text
+			'cb'       => '', //'<input type="checkbox" />', //Render a checkbox instead of text
 			'id'       => 'Id.',
 			'name'    => 'Nom',
 			'status'    => 'Statut',
@@ -91,10 +91,10 @@ 
 	* @param array $column_name The name/slug of the column to be processed
 	* @return string Text or HTML to be placed inside the column <td>
 	**************************************************************************/
-	function column_default($item, $column_name){
-		switch($column_name){
+	function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return print_r($item,true); //Show the whole array for troubleshooting purposes
+				return print_r($item, true); //Show the whole array for troubleshooting purposes
 		}
 	}
 
@@ -114,7 +114,7 @@ 
 	* @param array $item A singular item (one full row's worth of data)
 	* @return string Text to be placed inside the column <td> (movie title only)
 	**************************************************************************/
-	function column_id($item){
+	function column_id($item) {
 		return $item['id'];
 	}
 	/** ************************************************************************
@@ -133,7 +133,7 @@ 
 	* @param array $item A singular item (one full row's worth of data)
 	* @return string Text to be placed inside the column <td> (movie title only)
 	**************************************************************************/
-	function column_status($item){
+	function column_status($item) {
 		return __($item['status'], 'wpshop');
 	}
 	/** ************************************************************************
@@ -152,7 +152,7 @@ 
 	* @param array $item A singular item (one full row's worth of data)
 	* @return string Text to be placed inside the column <td> (movie title only)
 	**************************************************************************/
-	function column_content($item){
+	function column_content($item) {
 		return $item['content'];
 	}
 	/** ************************************************************************
@@ -171,8 +171,8 @@ 
 	* @param array $item A singular item (one full row's worth of data)
 	* @return string Text to be placed inside the column <td> (movie title only)
 	**************************************************************************/
-	function column_entity($item){
-		return __($item['entity'],'wpshop');
+	function column_entity($item) {
+		return __($item['entity'], 'wpshop');
 	}
 	/** ************************************************************************
 	* Recommended. This is a custom column method and is responsible for what
@@ -190,23 +190,23 @@ 
 	* @param array $item A singular item (one full row's worth of data)
 	* @return string Text to be placed inside the column <td> (movie title only)
 	**************************************************************************/
-	function column_name($item){
+	function column_name($item) {
 		//Build row actions
-		$default_action='edit';
-		$default_action_text=__('Edit', 'wpshop');
-		$attribute_groups_status = !empty( $_REQUEST['attribute_groups_status'] ) ? sanitize_text_field( $_REQUEST['attribute_groups_status'] ) : '';
-		if( !empty( $attribute_groups_status ) && ( $attribute_groups_status=='deleted' ) ){
-			$default_action='activate';
-			$default_action_text=__('Restore', 'wpshop');
+		$default_action = 'edit';
+		$default_action_text = __('Edit', 'wpshop');
+		$attribute_groups_status = !empty($_REQUEST['attribute_groups_status']) ? sanitize_text_field($_REQUEST['attribute_groups_status']) : '';
+		if (!empty($attribute_groups_status) && ($attribute_groups_status == 'deleted')) {
+			$default_action = 'activate';
+			$default_action_text = __('Restore', 'wpshop');
 		}
-		$actions['edit']=sprintf('<a href="'.admin_url('admin.php').'?page=%2$s&amp;action=%3$s&amp;id=%4$s">'.$default_action_text.'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING,$default_action,$item['id']);
+		$actions['edit'] = sprintf('<a href="' . admin_url('admin.php') . '?page=%2$s&amp;action=%3$s&amp;id=%4$s">' . $default_action_text . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING, $default_action, $item['id']);
 
 		if (empty($attribute_groups_status))
-			$actions['delete']=sprintf('<a href="'.admin_url('admin.php').'?page=%2$s&amp;action=%3$s&amp;id=%4$s">'.__('Delete', 'wpshop').'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING,'delete',$item['id']);
+			$actions['delete'] = sprintf('<a href="' . admin_url('admin.php') . '?page=%2$s&amp;action=%3$s&amp;id=%4$s">' . __('Delete', 'wpshop') . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING, 'delete', $item['id']);
 
 		//Return the title contents
 		return sprintf('%1$s%2$s',
-			/*$1%s*/ sprintf('<a href="'.admin_url('admin.php').'?page=%2$s&amp;action=%3$s&amp;id=%4$s">'.__($item['name'], 'wpshop').'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING,'edit',$item['id']),
+			/*$1%s*/ sprintf('<a href="' . admin_url('admin.php') . '?page=%2$s&amp;action=%3$s&amp;id=%4$s">' . __($item['name'], 'wpshop') . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING, 'edit', $item['id']),
 			/*$3%s*/ $this->row_actions($actions)
 		);
 	}
@@ -219,11 +219,11 @@ 
 	* @param array $item A singular item (one full row's worth of data)
 	* @return string Text to be placed inside the column <td> (movie title only)
 	**************************************************************************/
-	function column_cb($item){
+	function column_cb($item) {
 		return '';
 		return sprintf(
 			'<input type="checkbox" name="%1$s[]" value="%2$s" />',
-			/*$1%s*/ $this->_args['singular'],  //Let's simply repurpose the table's singular label ("movie")
+			/*$1%s*/ $this->_args['singular'], //Let's simply repurpose the table's singular label ("movie")
 			/*$2%s*/ $item['id']             //The value of the checkbox should be the record's id
 		);
 	}
@@ -279,7 +279,7 @@ 
 	**************************************************************************/
 	function process_bulk_action() {
 		//Detect when a bulk action is being triggered...
-		if( 'delete'===$this->current_action() ) {
+		if ('delete' === $this->current_action()) {
 			wp_die('Items deleted (or they would be if we had items to delete)!');
 		}
 	}
@@ -358,7 +358,7 @@ 
 		* to ensure that the data is trimmed to only the current page. We can use
 		* array_slice() to
 		*/
-		$data = array_slice($data,(($current_page-1)*$per_page),$per_page);
+		$data = array_slice($data, (($current_page - 1) * $per_page), $per_page);
 
 		/**
 		* REQUIRED. Now we can add our *sorted* data to the items property, where
@@ -369,11 +369,11 @@ 
 		/**
 		* REQUIRED. We also have to register our pagination options & calculations.
 		*/
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,               		//WE have to calculate the total number of items
-			'per_page'    => $per_page,                 		//WE have to determine how many items to show on a page
-			'total_pages' => ceil($total_items/$per_page)   //WE have to calculate the total number of pages
-		) );
+		$this->set_pagination_args(array(
+			'total_items' => $total_items, //WE have to calculate the total number of items
+			'per_page'    => $per_page, //WE have to determine how many items to show on a page
+			'total_pages' => ceil($total_items / $per_page)   //WE have to calculate the total number of pages
+		));
 	}
 
 }

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -201,8 +203,9 @@ 
 		}
 		$actions['edit']=sprintf('<a href="'.admin_url('admin.php').'?page=%2$s&amp;action=%3$s&amp;id=%4$s">'.$default_action_text.'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING,$default_action,$item['id']);
 
-		if (empty($attribute_groups_status))
-			$actions['delete']=sprintf('<a href="'.admin_url('admin.php').'?page=%2$s&amp;action=%3$s&amp;id=%4$s">'.__('Delete', 'wpshop').'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING,'delete',$item['id']);
+		if (empty($attribute_groups_status)) {
+					$actions['delete']=sprintf('<a href="'.admin_url('admin.php').'?page=%2$s&amp;action=%3$s&amp;id=%4$s">'.__('Delete', 'wpshop').'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING,'delete',$item['id']);
+		}
 
 		//Return the title contents
 		return sprintf('%1$s%2$s',