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 +101 added lines, -101 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,26 +31,26 @@ 
 		$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 ) {
-		wp_enqueue_script( 'wps_backend_product_js', WPS_PRODUCT_URL . '/asset/js/backend-product.js', array( "jquery", "jquery-form" ), WPS_PRODUCT_VERSION );
-		if( $hook != 'tools_page_wpshop_tools' )
+	public function callback_admin_enqueue_scripts($hook) {
+		wp_enqueue_script('wps_backend_product_js', WPS_PRODUCT_URL . '/asset/js/backend-product.js', array("jquery", "jquery-form"), WPS_PRODUCT_VERSION);
+		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);
 	}
 
 	/**
@@ -58,14 +58,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();
 			}
@@ -78,14 +78,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();
 			}
@@ -103,39 +103,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;
@@ -148,18 +148,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
@@ -172,15 +172,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);
@@ -188,35 +188,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]);
 					}
 
@@ -234,13 +234,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;
@@ -253,9 +253,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);
 				}
 			}
@@ -279,7 +279,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)
@@ -305,13 +305,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;
@@ -322,16 +322,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);
 	}
 
 	/**
@@ -341,12 +341,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;
@@ -361,20 +361,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;
@@ -384,19 +384,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 {
 
 	/**
@@ -47,8 +49,9 @@ 
 
 	public function callback_admin_enqueue_scripts( $hook ) {
 		wp_enqueue_script( 'wps_backend_product_js', WPS_PRODUCT_URL . '/asset/js/backend-product.js', array( "jquery", "jquery-form" ), WPS_PRODUCT_VERSION );
-		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 );
 	}
@@ -139,8 +142,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');
 			}
 		}
@@ -180,8 +182,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];
@@ -235,13 +238,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;
 	}
@@ -285,8 +290,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,
@@ -397,8 +401,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_customer/templates/backend/customer_listtable/customer-contacts.php

Spacing +12 added lines, -12 removed lines

@@ -9,29 +9,29 @@
  * @version 3.0.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 $WPS_Customers_Contacts = new WPS_Customers_Contacts();
-$contacts = $WPS_Customers_Contacts->get_customer_contact_list( $customer_post );
+$contacts = $WPS_Customers_Contacts->get_customer_contact_list($customer_post);
 
 ?>
-<?php foreach ( $contacts as $user_id => $user ) : ?>
-<?php $current_user_datas = get_userdata( $user_id ); ?>
+<?php foreach ($contacts as $user_id => $user) : ?>
+<?php $current_user_datas = get_userdata($user_id); ?>
 <div class="wps-customer-name-container" >
-	<a target="_wps_wpuser_edition_page" href="<?php echo esc_url( admin_url( 'user-edit.php?user_id=' . $user_id ) ); ?>" ><?php echo esc_html( $current_user_datas->user_email ); ?></a>
+	<a target="_wps_wpuser_edition_page" href="<?php echo esc_url(admin_url('user-edit.php?user_id=' . $user_id)); ?>" ><?php echo esc_html($current_user_datas->user_email); ?></a>
 	<?php
 	$contact_names = '';
-	if ( ! empty( $current_user_datas->last_name ) ) {
-		$contact_names .= strtoupper( $current_user_datas->last_name );
+	if (!empty($current_user_datas->last_name)) {
+		$contact_names .= strtoupper($current_user_datas->last_name);
 	}
-	if ( ! empty( $current_user_datas->first_name ) ) {
-		$contact_names .= empty( $contact_names ) ? '' : ' ';
-		$contact_names .= ucfirst( strtolower( $current_user_datas->first_name ) );
+	if (!empty($current_user_datas->first_name)) {
+		$contact_names .= empty($contact_names) ? '' : ' ';
+		$contact_names .= ucfirst(strtolower($current_user_datas->first_name));
 	}
-	$contact_names = empty( $contact_names ) ? $contact_names : ' - ' . $contact_names;
-	echo esc_html( $contact_names );
+	$contact_names = empty($contact_names) ? $contact_names : ' - ' . $contact_names;
+	echo esc_html($contact_names);
 	?>
 </div>
 <?php endforeach; ?>

includes/modules/wps_customer_contacts/templates/backend/contacts.php

Spacing +16 added lines, -16 removed lines

@@ -9,28 +9,28 @@ 
  * @version 3.0.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 $default_user = 0;
 ob_start();
-require( wpshop_tools::get_template_part( WPS_CUST_CONTACT_DIR, WPS_CUST_CONTACT_TPL, 'backend', 'contact' ) );
+require(wpshop_tools::get_template_part(WPS_CUST_CONTACT_DIR, WPS_CUST_CONTACT_TPL, 'backend', 'contact'));
 $output = ob_get_clean();
 
 ?><table class="wp-list-table widefat fixed striped users"
-	data-dissociate-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_customer_contacts_dissociate' ) ); ?>"
-	data-change-default-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_customer_contacts_change_default' ) ); ?>"
-	data-default-user-id="<?php echo esc_attr( $default_user ); ?>"  >
+	data-dissociate-nonce="<?php echo esc_attr(wp_create_nonce('wps_customer_contacts_dissociate')); ?>"
+	data-change-default-nonce="<?php echo esc_attr(wp_create_nonce('wps_customer_contacts_change_default')); ?>"
+	data-default-user-id="<?php echo esc_attr($default_user); ?>"  >
 
 	<thead>
-		<tr data-customer-id="<?php echo esc_attr( $customer->ID ); ?>" data-user-id="<?php echo esc_attr( $user_id ); ?>" >
-			<td><?php esc_html_e( 'ID', 'wpshop' ); ?></td>
-			<td><?php esc_html_e( 'Last name', 'wpshop' ); ?></td>
-			<td><?php esc_html_e( 'First name', 'wpshop' ); ?></td>
-			<td><?php esc_html_e( 'Display name' ); ?></td>
-			<td><?php esc_html_e( 'Email' ); ?></td>
-			<td><?php esc_html_e( 'Phone', 'wpshop' ); ?></td>
+		<tr data-customer-id="<?php echo esc_attr($customer->ID); ?>" data-user-id="<?php echo esc_attr($user_id); ?>" >
+			<td><?php esc_html_e('ID', 'wpshop'); ?></td>
+			<td><?php esc_html_e('Last name', 'wpshop'); ?></td>
+			<td><?php esc_html_e('First name', 'wpshop'); ?></td>
+			<td><?php esc_html_e('Display name'); ?></td>
+			<td><?php esc_html_e('Email'); ?></td>
+			<td><?php esc_html_e('Phone', 'wpshop'); ?></td>
 			<td class="wps-customer-contacts-actions" >&nbsp;</td>
 		</tr>
 	</thead>
@@ -43,11 +43,11 @@ 
 		<tr>
 			<td colspan="7" class="wps-customer-associate-contact-container" >
 				<span class="wps-customer-contact-association-opener" ><i class="dashicons dashicons-plus" ></i></span>
-				<input type="text" class="wps-customer-autocomplete-input hidden" placeholder="<?php esc_html_e( 'Start typing for user searching', 'wpshop' ); ?>"
-					data-search-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_customer_search' ) ); ?>"
+				<input type="text" class="wps-customer-autocomplete-input hidden" placeholder="<?php esc_html_e('Start typing for user searching', 'wpshop'); ?>"
+					data-search-nonce="<?php echo esc_attr(wp_create_nonce('wps_customer_search')); ?>"
 					data-types="users"
-					data-customer="<?php echo esc_attr( $customer->ID ); ?>"
-					data-associate-nonce="<?php echo esc_attr( wp_create_nonce( 'wps_customer_contacts_associate' ) ); ?>" />
+					data-customer="<?php echo esc_attr($customer->ID); ?>"
+					data-associate-nonce="<?php echo esc_attr(wp_create_nonce('wps_customer_contacts_associate')); ?>" />
 			</td>
 		</tr>
 	</tfoot>

includes/modules/wps_customer_contacts/templates/backend/contact.php

Spacing +19 added lines, -19 removed lines

@@ -9,38 +9,38 @@
  * @version 3.0.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 ?>
-<?php foreach ( $users as $user_id => $user ) : ?>
-	<?php if ( 0 !== $user_id ) : ?>
-		<?php if ( true === $user['is_default'] ) : ?>
+<?php foreach ($users as $user_id => $user) : ?>
+	<?php if (0 !== $user_id) : ?>
+		<?php if (true === $user['is_default']) : ?>
 			<?php $default_user = $user_id; ?>
 		<?php endif; ?>
-	<tr data-customer-id="<?php echo esc_attr( $customer->ID ); ?>" data-user-id="<?php echo esc_attr( $user_id ); ?>" >
-		<td>#<?php echo esc_html( $user_id ); ?></td>
-		<td><?php echo empty( $user['last_name'] ) ? '&mdash;' : esc_html( $user['last_name'] ); ?></td>
-		<td><?php echo empty( $user['first_name'] ) ? '&mdash;' : esc_html( $user['first_name'] ); ?></td>
-		<td><?php echo esc_html( $user['display_name'] ); ?></td>
-		<td><?php echo esc_html( $user['user_email'] ); ?></td>
-		<td><?php echo ( isset( $user['metas']['wps_phone'] ) && ! empty( $user['metas']['wps_phone'] ) ? esc_html( implode( ',', $user['metas']['wps_phone'] ) ) : '&mdash;' ); ?></td>
+	<tr data-customer-id="<?php echo esc_attr($customer->ID); ?>" data-user-id="<?php echo esc_attr($user_id); ?>" >
+		<td>#<?php echo esc_html($user_id); ?></td>
+		<td><?php echo empty($user['last_name']) ? '&mdash;' : esc_html($user['last_name']); ?></td>
+		<td><?php echo empty($user['first_name']) ? '&mdash;' : esc_html($user['first_name']); ?></td>
+		<td><?php echo esc_html($user['display_name']); ?></td>
+		<td><?php echo esc_html($user['user_email']); ?></td>
+		<td><?php echo (isset($user['metas']['wps_phone']) && !empty($user['metas']['wps_phone']) ? esc_html(implode(',', $user['metas']['wps_phone'])) : '&mdash;'); ?></td>
 
 		<td class="wps-customer-contacts-actions" >
-			<?php do_action( 'wps_customer_contacts_list_action', $user_id ); ?>
+			<?php do_action('wps_customer_contacts_list_action', $user_id); ?>
 
-		<?php if ( true === $user['is_default'] ) : ?>
-			<i title="<?php esc_attr_e( 'This is the main contact / customer creator', 'wpshop' ); ?>" class="dashicons dashicons-star-filled" ></i>
+		<?php if (true === $user['is_default']) : ?>
+			<i title="<?php esc_attr_e('This is the main contact / customer creator', 'wpshop'); ?>" class="dashicons dashicons-star-filled" ></i>
 		<?php else : ?>
-			<i title="<?php esc_attr_e( 'Change to default customer', 'wpshop' ); ?>" class="dashicons dashicons-star-empty" ></i>
+			<i title="<?php esc_attr_e('Change to default customer', 'wpshop'); ?>" class="dashicons dashicons-star-empty" ></i>
 		<?php endif; ?>
 
-			<a title="<?php esc_attr_e( 'User account edition', 'wpshop' ); ?>" href="<?php echo esc_url( get_edit_user_link( $user_id ) ); ?>" target="wps_contact_edition" ><i class="dashicons dashicons-edit" ></i></a>
+			<a title="<?php esc_attr_e('User account edition', 'wpshop'); ?>" href="<?php echo esc_url(get_edit_user_link($user_id)); ?>" target="wps_contact_edition" ><i class="dashicons dashicons-edit" ></i></a>
 
-		<?php if ( true === $user['is_default'] ) : ?>
-			<i title="<?php esc_attr_e( 'This is the main contact, you can\'t unlink it', 'wpshop' ); ?>" class="dashicons dashicons-lock" ></i>
+		<?php if (true === $user['is_default']) : ?>
+			<i title="<?php esc_attr_e('This is the main contact, you can\'t unlink it', 'wpshop'); ?>" class="dashicons dashicons-lock" ></i>
 		<?php else : ?>
-			<i title="<?php esc_attr_e( 'Unlink this user', 'wpshop' ); ?>" class="dashicons dashicons-editor-unlink" ></i>
+			<i title="<?php esc_attr_e('Unlink this user', 'wpshop'); ?>" class="dashicons dashicons-editor-unlink" ></i>
 		<?php endif; ?>
 		</td>
 	</tr>

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

Spacing +22 added lines, -22 removed lines

@@ -1,19 +1,19 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($messages_histo) && is_array($messages_histo) ) :?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($messages_histo) && is_array($messages_histo)) :?>
 	<div class="wps-table wps-my-message">
 		<div class="wps-table-header wps-table-row">
-			<div class="wps-table-cell"><?php _e( 'Message title', 'wpshop' ); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Send date', 'wpshop' ); ?></div>
+			<div class="wps-table-cell"><?php _e('Message title', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Send date', 'wpshop'); ?></div>
 		</div>
-		<?php $page_message_histo = isset( $_GET['page_message_histo'] ) ? (int) $_GET['page_message_histo'] : 1;
-		$nb_pages_messages_histo = ceil( count( $messages_histo ) / wps_message_ctr::$mails_display );
-		$messages_histo = array_slice( $messages_histo, ( $page_message_histo - 1 ) * wps_message_ctr::$mails_display, wps_message_ctr::$mails_display );
-		reset( $messages_histo );
-		while( $messages = current( $messages_histo ) ) :
-			$first_send_date = key( $messages_histo );
-			reset( $messages );
-			while( $message = current( $messages ) ) :
-				$key = key( $messages ); ?>
+		<?php $page_message_histo = isset($_GET['page_message_histo']) ? (int)$_GET['page_message_histo'] : 1;
+		$nb_pages_messages_histo = ceil(count($messages_histo) / wps_message_ctr::$mails_display);
+		$messages_histo = array_slice($messages_histo, ($page_message_histo - 1) * wps_message_ctr::$mails_display, wps_message_ctr::$mails_display);
+		reset($messages_histo);
+		while ($messages = current($messages_histo)) :
+			$first_send_date = key($messages_histo);
+			reset($messages);
+			while ($message = current($messages)) :
+				$key = key($messages); ?>
 		<div class="wps-table-content wps-table-row" data-date="<?php echo substr($first_send_date, 0, 7); ?>" >
 			<div class="wps-table-cell wps-message-title-container">
 				<?php $message_special_id = rand(); ?>
@@ -21,18 +21,18 @@ 
 				<div id="wps-customer-message-<?php echo $message_special_id; ?>" style="display:none;" ><?php echo $message['message']; ?></div>
 			</div>
 			<div class="wps-table-cell">
-			<?php if( !empty($message['dates']) ) : ?>
+			<?php if (!empty($message['dates'])) : ?>
 				<ul>
-				<?php foreach( $message['dates'] as $date ) : ?>
-					<li><?php echo mysql2date( get_option('date_format') . ' ' . get_option('time_format') , $date, true ); ?></li>
+				<?php foreach ($message['dates'] as $date) : ?>
+					<li><?php echo mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $date, true); ?></li>
 				<?php endforeach; ?>
 				</ul>
 			<?php endif; ?>
 			</div>
 		</div>
-		<?php	next( $messages );
+		<?php	next($messages);
 			endwhile;
-			next( $messages_histo );
+			next($messages_histo);
 		endwhile; ?>
 	</div>
 	<div class="wps-my-message tablenav-pages" style="margin: 7px;text-align: right;">
@@ -46,13 +46,13 @@ 
 			'base'               => '%_%',
 			'format'             => '?page_message_histo=%#%',
 			'total'              => $nb_pages_messages_histo,
-			'current'            => max( 1, $page_message_histo ),
+			'current'            => max(1, $page_message_histo),
 			'show_all'           => false,
 			'end_size'           => 1,
 			'mid_size'           => 2,
 			'prev_next'          => true,
-			'prev_text'          => esc_html__( '« Previous' ),
-			'next_text'          => esc_html__( 'Next »' ),
+			'prev_text'          => esc_html__('« Previous'),
+			'next_text'          => esc_html__('Next »'),
 			'type'               => 'plain',
 			'add_args'           => false,
 			'add_fragment'       => '',
@@ -64,6 +64,6 @@ 
 	</div>
 <?php else: ?>
 	<div class="wps-alert-info">
-		<?php _e( 'No email was sent.', 'wpshop' ); ?>
+		<?php _e('No email was sent.', 'wpshop'); ?>
 	</div>
 <?php endif; ?>

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !empty($messages_histo) && is_array($messages_histo) ) :?>
 	<div class="wps-table wps-my-message">
 		<div class="wps-table-header wps-table-row">
@@ -62,8 +64,11 @@ 
 	);
 	?>
 	</div>
-<?php else: ?>
+<?php else {
+	: ?>
 	<div class="wps-alert-info">
-		<?php _e( 'No email was sent.', 'wpshop' ); ?>
+		<?php _e( 'No email was sent.', 'wpshop' );
+}
+?>
 	</div>
 <?php endif; ?>