Eoxia / wpshop

core/module_management/controller/module_management.ctr.php

Doc Comments -1 removed lines

@@ -51,7 +51,6 @@
 	/**
 	 * OPTIONS -
 	 *
-	 * @param array $input
 	 *
 	 * @return array
 	 */

Spacing +58 added lines, -58 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier du controleur principal pour la gestion des modules internes dans les extensions wordpress / Main controller file for internal modules management into wordpress plugins
  *
@@ -7,8 +7,8 @@ 
  */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -24,28 +24,28 @@ 
 	 */
 	function __construct() {
 		/**	Ajoute une interface aux options pour gérer les modules / Add an interface to plugin options screen in order to manage modules	*/
-		add_action( 'admin_init', array( $this, 'declare_options' ), 11 );
+		add_action('admin_init', array($this, 'declare_options'), 11);
 
 		/**	Appel des styles pour l'administration / Call style for administration	*/
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_assets' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_assets'));
 	}
 
 	/**
 	 * Inclusion des feuilles de styles pour l'administration / Admin css enqueue
 	 */
 	function admin_assets() {
-		wp_register_style( 'eomodmanager-admin-css', EOMODMAN_URL . '/assets/css/backend.css', '', EOMODMAN_VERSION );
-		wp_enqueue_style( 'eomodmanager-admin-css' );
+		wp_register_style('eomodmanager-admin-css', EOMODMAN_URL . '/assets/css/backend.css', '', EOMODMAN_VERSION);
+		wp_enqueue_style('eomodmanager-admin-css');
 	}
 
 	/**
 	 * OPTIONS - Déclare les options permettant de gérer les statuts des modules / Declare add-on configuration panel for managing modules status
 	 */
 	function declare_options() {
-		add_settings_section( 'wps_internal_modules', '<i class="dashicons dashicons-admin-plugins"></i>' . __( 'Internal modules management', 'eo-modmanager-i18n' ), '', 'wpshop_addons_options' );
-		register_setting( 'wpshop_options', 'wpshop_modules', array( &$this, 'validate_options' ) );
+		add_settings_section('wps_internal_modules', '<i class="dashicons dashicons-admin-plugins"></i>' . __('Internal modules management', 'eo-modmanager-i18n'), '', 'wpshop_addons_options');
+		register_setting('wpshop_options', 'wpshop_modules', array(&$this, 'validate_options'));
 
-		add_settings_field( 'wpshop_opinions_field', __( 'Internal modules management', 'eo-modmanager-i18n' ), array( &$this, 'module_listing' ), 'wpshop_addons_options', 'wps_internal_modules' );
+		add_settings_field('wpshop_opinions_field', __('Internal modules management', 'eo-modmanager-i18n'), array(&$this, 'module_listing'), 'wpshop_addons_options', 'wps_internal_modules');
 	}
 
 	/**
@@ -55,41 +55,41 @@ 
 	 *
 	 * @return array
 	 */
-	function validate_options( $settings ) {
-		if ( is_array( $settings ) ) {
-			$module_option = get_option( 'wpshop_modules' );
+	function validate_options($settings) {
+		if (is_array($settings)) {
+			$module_option = get_option('wpshop_modules');
 			$log_error = array();
-			foreach ( $settings as $module => $module_state ) {
-				if ( !array_key_exists( 'activated', $module_state ) && ( 'on' == $module_state[ 'old_activated' ] ) ) {
-					$module_option[ $module ][ 'activated' ] = 'off';
-					$module_option[ $module ][ 'date_off' ] = gmdate( "Y-m-d H:i:s", time() );
-					$module_option[ $module ][ 'author_off' ] = get_current_user_id();
-					$settings[ $module ] = $module_option[ $module ];
+			foreach ($settings as $module => $module_state) {
+				if (!array_key_exists('activated', $module_state) && ('on' == $module_state['old_activated'])) {
+					$module_option[$module]['activated'] = 'off';
+					$module_option[$module]['date_off'] = gmdate("Y-m-d H:i:s", time());
+					$module_option[$module]['author_off'] = get_current_user_id();
+					$settings[$module] = $module_option[$module];
 
 					/**	Log module activation	*/
-					$user = get_userdata( $module_option[ $folder ][ 'author_on' ] );
+					$user = get_userdata($module_option[$folder]['author_on']);
 					$author = $user->display_name;
-					$log_error[ 'message' ] = sprintf( __( 'Activation made on %1$s by %2$s', 'eo-modmanager-i18n' ), mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $settings[ $module ][ 'date_on' ], true ), $author);
+					$log_error['message'] = sprintf(__('Activation made on %1$s by %2$s', 'eo-modmanager-i18n'), mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $settings[$module]['date_on'], true), $author);
 				}
-				else if ( array_key_exists( 'activated', $module_state ) && ( 'off' == $module_state[ 'old_activated' ] ) ) {
-					$module_option[ $module ][ 'activated' ] = 'on';
-					$module_option[ $module ][ 'date_on' ] = gmdate( "Y-m-d H:i:s", time() );
-					$module_option[ $module ][ 'author_on' ] = get_current_user_id();
-					$settings[ $module ] = $module_option[ $module ];
+				else if (array_key_exists('activated', $module_state) && ('off' == $module_state['old_activated'])) {
+					$module_option[$module]['activated'] = 'on';
+					$module_option[$module]['date_on'] = gmdate("Y-m-d H:i:s", time());
+					$module_option[$module]['author_on'] = get_current_user_id();
+					$settings[$module] = $module_option[$module];
 
 					/**	Log module activation	*/
-					$user = get_userdata( $module_option[ $folder ][ 'author_off' ] );
+					$user = get_userdata($module_option[$folder]['author_off']);
 					$author = $user->display_name;
-					$log_error[ 'message' ] = sprintf( __( 'Deactivation made on %1$s by %2$s', 'eo-modmanager-i18n' ), mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $settings[ $module ][ 'date_off' ], true ), $author);
+					$log_error['message'] = sprintf(__('Deactivation made on %1$s by %2$s', 'eo-modmanager-i18n'), mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $settings[$module]['date_off'], true), $author);
 				}
 				else {
-					$settings[ $module ] = $module_option[ $module ];
+					$settings[$module] = $module_option[$module];
 				}
-				unset( $settings[ $module ][ 'old_activated' ] );
-				$log_error[ 'object_id' ] = $module;
+				unset($settings[$module]['old_activated']);
+				$log_error['object_id'] = $module;
 			}
 
-			wpeologs_ctr::log_datas_in_files( 'wps_addon', $log_error, 0 );
+			wpeologs_ctr::log_datas_in_files('wps_addon', $log_error, 0);
 
 		}
 
@@ -104,16 +104,16 @@ 
 		$module_folder = WPSHOP_MODULES_DIR;
 
 		/**	Get	current modules options to know if they are activated or not */
-		$module_option = get_option( 'wpshop_modules' );
+		$module_option = get_option('wpshop_modules');
 
 		/**	Check if the defined directory exists for reading and displaying an input to activate/deactivate the module	*/
-		if( is_dir( $module_folder ) ) {
-			$parent_folder_content = scandir( $module_folder );
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
 
-			require_once( wpshop_tools::get_template_part( EOMODMAN_DIR, EOMODMAN_TEMPLATES_MAIN_DIR, 'backend', 'settings' ) );
+			require_once(wpshop_tools::get_template_part(EOMODMAN_DIR, EOMODMAN_TEMPLATES_MAIN_DIR, 'backend', 'settings'));
 		}
 		else {
-			_e( 'There is no modules to include into current plugin', 'eo-modmanager-i18n' );
+			_e('There is no modules to include into current plugin', 'eo-modmanager-i18n');
 		}
 
 	}
@@ -126,13 +126,13 @@ 
 		$module_folder = WPSHOP_DIR . '/core/';
 
 		/**	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) != '.' && ( EOMODMAN_DIR != $folder ) ) {
-					if ( file_exists( $module_folder . $folder . '/' . $folder . '.php') ) {
-						$f =  $module_folder . $folder . '/' . $folder . '.php';
-						require( $f );
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
+			foreach ($parent_folder_content as $folder) {
+				if ($folder && substr($folder, 0, 1) != '.' && (EOMODMAN_DIR != $folder)) {
+					if (file_exists($module_folder . $folder . '/' . $folder . '.php')) {
+						$f = $module_folder . $folder . '/' . $folder . '.php';
+						require($f);
 					}
 				}
 			}
@@ -147,23 +147,23 @@ 
 		$module_folder = WPSHOP_MODULES_DIR;
 
 		/**	Get	current modules options to know if they are activated or not */
-		$module_option = get_option( 'wpshop_modules' );
+		$module_option = get_option('wpshop_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 );
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
 			$update_option = false;
-			foreach ( $parent_folder_content as $folder ) {
-				if ( $folder && substr( $folder, 0, 1) != '.' ) {
+			foreach ($parent_folder_content as $folder) {
+				if ($folder && substr($folder, 0, 1) != '.') {
 					$is_activated = false;
 					/**	Check current module state to know if we have to include it or not	*/
-					if ( !empty( $module_option ) && array_key_exists( $folder, $module_option ) && ( 'on' == $module_option[ $folder ][ 'activated' ] ) ) {
+					if (!empty($module_option) && array_key_exists($folder, $module_option) && ('on' == $module_option[$folder]['activated'])) {
 						$is_activated = true;
 					}
-					else if ( empty( $module_option ) || ( !empty( $module_option ) && !array_key_exists( $folder, $module_option ) ) ) {
-						$modules_option[ $folder ] = array(
+					else if (empty($module_option) || (!empty($module_option) && !array_key_exists($folder, $module_option))) {
+						$modules_option[$folder] = array(
 							'activated' => 'on',
-							'date_on' => gmdate( "Y-m-d H:i:s", time() ),
+							'date_on' => gmdate("Y-m-d H:i:s", time()),
 							'author_on' => 'auto',
 						);
 						$is_activated = true;
@@ -171,15 +171,15 @@ 
 					}
 
 					/**	Finaly include module if the state allow it	*/
-					if ( $is_activated && file_exists( $module_folder . $folder . '/' . $folder . '.php') ) {
-						$f =  $module_folder . $folder . '/' . $folder . '.php';
-						require( $f );
+					if ($is_activated && file_exists($module_folder . $folder . '/' . $folder . '.php')) {
+						$f = $module_folder . $folder . '/' . $folder . '.php';
+						require($f);
 					}
 				}
 			}
 			/**	Update option only if it is necessary	*/
-			if ( $update_option ) {
-				update_option( 'wpshop_modules', $modules_option );
+			if ($update_option) {
+				update_option('wpshop_modules', $modules_option);
 			}
 		}
 	}

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier du controleur principal pour la gestion des modules internes dans les extensions wordpress / Main controller file for internal modules management into wordpress plugins
  *
@@ -70,8 +72,7 @@ 
 					$user = get_userdata( $module_option[ $folder ][ 'author_on' ] );
 					$author = $user->display_name;
 					$log_error[ 'message' ] = sprintf( __( 'Activation made on %1$s by %2$s', 'eo-modmanager-i18n' ), mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $settings[ $module ][ 'date_on' ], true ), $author);
-				}
-				else if ( array_key_exists( 'activated', $module_state ) && ( 'off' == $module_state[ 'old_activated' ] ) ) {
+				} else if ( array_key_exists( 'activated', $module_state ) && ( 'off' == $module_state[ 'old_activated' ] ) ) {
 					$module_option[ $module ][ 'activated' ] = 'on';
 					$module_option[ $module ][ 'date_on' ] = gmdate( "Y-m-d H:i:s", time() );
 					$module_option[ $module ][ 'author_on' ] = get_current_user_id();
@@ -81,8 +82,7 @@ 
 					$user = get_userdata( $module_option[ $folder ][ 'author_off' ] );
 					$author = $user->display_name;
 					$log_error[ 'message' ] = sprintf( __( 'Deactivation made on %1$s by %2$s', 'eo-modmanager-i18n' ), mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $settings[ $module ][ 'date_off' ], true ), $author);
-				}
-				else {
+				} else {
 					$settings[ $module ] = $module_option[ $module ];
 				}
 				unset( $settings[ $module ][ 'old_activated' ] );
@@ -111,8 +111,7 @@ 
 			$parent_folder_content = scandir( $module_folder );
 
 			require_once( wpshop_tools::get_template_part( EOMODMAN_DIR, EOMODMAN_TEMPLATES_MAIN_DIR, 'backend', 'settings' ) );
-		}
-		else {
+		} else {
 			_e( 'There is no modules to include into current plugin', 'eo-modmanager-i18n' );
 		}
 
@@ -159,8 +158,7 @@ 
 					/**	Check current module state to know if we have to include it or not	*/
 					if ( !empty( $module_option ) && array_key_exists( $folder, $module_option ) && ( 'on' == $module_option[ $folder ][ 'activated' ] ) ) {
 						$is_activated = true;
-					}
-					else if ( empty( $module_option ) || ( !empty( $module_option ) && !array_key_exists( $folder, $module_option ) ) ) {
+					} else if ( empty( $module_option ) || ( !empty( $module_option ) && !array_key_exists( $folder, $module_option ) ) ) {
 						$modules_option[ $folder ] = array(
 							'activated' => 'on',
 							'date_on' => gmdate( "Y-m-d H:i:s", time() ),

core/wpeo_logs/controller/log.controller.01.php

Doc Comments +7 added lines, -3 removed lines

@@ -198,9 +198,9 @@ 
 		/**
 		 * DEBUG LOG - Save a file on the server with content for loggin different action sended
 		 *
-		 * @param string $service (Name module or post type)
 		 * @param array $array_message ('object_id', 'message')
 		 * @param int $criticality The message crit rate (0-2)
+		 * @param string $name
 		 */
 		public static function log_datas_in_files( $name, $array_message, $criticality ) {
 			$upload_dir = wp_upload_dir();
@@ -269,7 +269,8 @@ 
 		/**
 		* check_need_rotate  Checks if the file exceeds the maximum size
 		*
-		* @param string $file_link The file path to write
+		* @param string $name
+		* @param string $message
 		*/
 		public static function check_need_rotate( $service, $name, $message ) {
 			$upload_dir = wp_upload_dir();
@@ -355,6 +356,9 @@ 
 			return $getted_service;
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		public static function get_service_by_id( $id ) {
 			$array_service = get_option( '_wpeo_log_settings', array() );
 
@@ -381,7 +385,7 @@ 
 		 * @param float $input
 		 * @param string $format
 		 * @param boolean $convert
-		 * @return float|number
+		 * @return double
 		 */
 		function convert_to($input, $format, $convert = true) {
 			if($format == 'oc')

Indentation +4 added lines, -4 removed lines

@@ -267,10 +267,10 @@
 		}
 
 		/**
-		* check_need_rotate  Checks if the file exceeds the maximum size
-		*
-		* @param string $file_link The file path to write
-		*/
+		 * check_need_rotate  Checks if the file exceeds the maximum size
+		 *
+		 * @param string $file_link The file path to write
+		 */
 		public static function check_need_rotate( $service, $name, $message ) {
 			$upload_dir = wp_upload_dir();
 

Spacing +167 added lines, -167 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Main controller file for WP logs module
@@ -18,7 +18,7 @@ 
  * @subpackage controller
  */
 
-if ( !class_exists( "wpeologs_ctr" ) ) {
+if (!class_exists("wpeologs_ctr")) {
 
 	/**
 	 *
@@ -27,8 +27,8 @@ 
 	 * @param array $args
 	 * @param int $criticality default 0
 	 */
-	function eo_log( $service_name, $args, $criticality = 0 ) {
-		wpeologs_ctr::log_datas_in_files( $service_name, $args, $criticality );
+	function eo_log($service_name, $args, $criticality = 0) {
+		wpeologs_ctr::log_datas_in_files($service_name, $args, $criticality);
 	}
 
 	class wpeologs_ctr {
@@ -45,17 +45,17 @@ 
 		 * @return void
 		 */
 		public function __construct() {
-			add_action( 'admin_menu', array( &$this, 'admin_menu' ) );
+			add_action('admin_menu', array(&$this, 'admin_menu'));
 
 			// Service action
-			add_action( 'admin_post_add', 'wpeo_log::add' );
-			add_action( 'admin_post_add', 'wpeologs_ctr::add' );
-			add_action( 'admin_post_edit_service', array( $this, 'edit_service' ) );
-			add_action( 'admin_post_to_trash', array( $this, 'to_trash' ) );
-			add_action( 'admin_post_file_to_trash', array( $this, 'file_to_trash' ) );
+			add_action('admin_post_add', 'wpeo_log::add');
+			add_action('admin_post_add', 'wpeologs_ctr::add');
+			add_action('admin_post_edit_service', array($this, 'edit_service'));
+			add_action('admin_post_to_trash', array($this, 'to_trash'));
+			add_action('admin_post_file_to_trash', array($this, 'file_to_trash'));
 
 			/**	Call administration style definition	*/
-			add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
+			add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 
 			// Transfert des anciens services
 			$this->transfert();
@@ -67,7 +67,7 @@ 
 		 * @return void
 		 */
 		public function admin_menu() {
-			add_submenu_page( 'tools.php', __( 'Logs', 'wpeolog-i18n' ), __( 'Logs', 'wpeolog-i18n' ), 'manage_options', 'wpeo-log-page', array( &$this, 'render_add_submenu_page' ) );
+			add_submenu_page('tools.php', __('Logs', 'wpeolog-i18n'), __('Logs', 'wpeolog-i18n'), 'manage_options', 'wpeo-log-page', array(&$this, 'render_add_submenu_page'));
 		}
 
 		/**
@@ -79,115 +79,115 @@ 
 			$dir_file = $upload_dir['basedir'] . '/wpeolog/';
 
 			$array_size_format = $this->get_array_size_format();
-			$array_file_rotate_dropdown = array( 'on' => __( 'On', 'wpeolog-i18n' ), 'off' => __( 'Off', 'wpeolog-i18n' ) );
-			$array_service = get_option( '_wpeo_log_settings' );
-			$array_service = json_decode( $array_service, true );
+			$array_file_rotate_dropdown = array('on' => __('On', 'wpeolog-i18n'), 'off' => __('Off', 'wpeolog-i18n'));
+			$array_service = get_option('_wpeo_log_settings');
+			$array_service = json_decode($array_service, true);
 
 
-			if ( !empty( $array_service ) ) {
-				foreach ( $array_service as &$service ) {
-					$service['error'] = $this->open_log( $service['name'] . '-error' );
-					$service['warning'] = $this->open_log( $service['name'] . '-warning' );
+			if (!empty($array_service)) {
+				foreach ($array_service as &$service) {
+					$service['error'] = $this->open_log($service['name'] . '-error');
+					$service['warning'] = $this->open_log($service['name'] . '-warning');
 				}
 			}
-			unset( $service );
+			unset($service);
 
 			$count_service_active = 0;
 			$count_service_desactive = 0;
 
-			$page_transient = get_transient( 'log_message' );
-			if ( !empty( $page_transient ) ) {
-				delete_transient( 'log_message' );
-				$page_transient = json_decode( $page_transient, true );
+			$page_transient = get_transient('log_message');
+			if (!empty($page_transient)) {
+				delete_transient('log_message');
+				$page_transient = json_decode($page_transient, true);
 			}
 
 			$array_data = $this->check_page();
 
 			$count_warning = $array_data['count_warning'];
 			$count_error = $array_data['count_error'];
-			$count_info = count( $array_data['data']['data'] );
+			$count_info = count($array_data['data']['data']);
 
 			$file = $array_data['data']['data'];
 			$list_archive_file = $array_data['list_archive_file'];
 
-			require_once( wpeo_template_01::get_template_part( WPEO_LOGS_DIR, WPEO_LOGS_TEMPLATES_MAIN_DIR, 'backend', 'main' ) );
+			require_once(wpeo_template_01::get_template_part(WPEO_LOGS_DIR, WPEO_LOGS_TEMPLATES_MAIN_DIR, 'backend', 'main'));
 		}
 
 		private function check_page() {
-			if( empty( $_GET['action'] ) || empty( $_GET['type'] ) )
+			if (empty($_GET['action']) || empty($_GET['type']))
 				return false;
 
-			$action = sanitize_text_field( $_GET['action'] );
-			$type = sanitize_text_field( !empty( $_GET['type'] ) ?  $_GET['type'] : '' );
+			$action = sanitize_text_field($_GET['action']);
+			$type = sanitize_text_field(!empty($_GET['type']) ? $_GET['type'] : '');
 
-			if ( !isset( $_GET['service_id'] ) ) return false;
-			else $service_id = (int) $_GET['service_id'];
+			if (!isset($_GET['service_id'])) return false;
+			else $service_id = (int)$_GET['service_id'];
 
-			if ( isset( $_GET['key'] ) && 0 !== (int) $_GET['key'] ) $key = (int) $_GET['key'];
+			if (isset($_GET['key']) && 0 !== (int)$_GET['key']) $key = (int)$_GET['key'];
 
-			if ( 'view' == $action && isset( $service_id ) ) {
-				$service = self::get_service_by_id( $service_id );
+			if ('view' == $action && isset($service_id)) {
+				$service = self::get_service_by_id($service_id);
 
-				if( $service == null )
+				if ($service == null)
 					return false;
 
 				$service_name = $service['name'];
 
-				if ( !empty( $type ) ) {
+				if (!empty($type)) {
 					$service_name .= '-' . $type;
 				}
 
 				// Tous les fichiers
-				$list_archive_file = $this->get_archive_file( $service_name );
+				$list_archive_file = $this->get_archive_file($service_name);
 
-				if( !empty( $key ) ) {
+				if (!empty($key)) {
 					$service_name .= '_' . $key;
 				}
 
-				$count_warning = $this->open_log( $service['name'] . '-warning' );
-				$count_error = $this->open_log( $service['name'] . '-error' );
+				$count_warning = $this->open_log($service['name'] . '-warning');
+				$count_error = $this->open_log($service['name'] . '-error');
 
-				$array_data = $this->open_log( $service_name );
+				$array_data = $this->open_log($service_name);
 
-				return array( 'data' => $array_data, 'list_archive_file' => $list_archive_file, 'count_warning' => $count_warning['count'], 'count_error' => $count_error['count'] );
+				return array('data' => $array_data, 'list_archive_file' => $list_archive_file, 'count_warning' => $count_warning['count'], 'count_error' => $count_error['count']);
 			}
 		}
 
 		public function admin_enqueue_scripts() {
-			wp_register_script( 'wps_statistics_js_chart', WPEO_LOGS_URL . '/asset/js/chart.js');
-			wp_enqueue_script( 'wps_statistics_js_chart' );
+			wp_register_script('wps_statistics_js_chart', WPEO_LOGS_URL . '/asset/js/chart.js');
+			wp_enqueue_script('wps_statistics_js_chart');
 		}
 
-		private function open_log( $service_name ) {
+		private function open_log($service_name) {
 			$upload_dir = wp_upload_dir();
 			$dir_file = $upload_dir['basedir'] . '/wpeolog/' . $service_name . '.csv';
 
-			if ( file_exists( $dir_file ) ) {
-				$file = file( $dir_file );
+			if (file_exists($dir_file)) {
+				$file = file($dir_file);
 
 
 				// Remove the first case empty
-				array_shift( $file );
+				array_shift($file);
 
-				foreach( $file as &$data ) {
-					$data = explode( wpeologs_ctr::$file_separator, $data );
+				foreach ($file as &$data) {
+					$data = explode(wpeologs_ctr::$file_separator, $data);
 				}
 
-				return array( 'data' => $file, 'count' => count( $file ) );
+				return array('data' => $file, 'count' => count($file));
 			}
 			else {
-				return array( 'data' => null, 'count' => 0 );
+				return array('data' => null, 'count' => 0);
 			}
 		}
 
-		private function get_archive_file( $name ) {
+		private function get_archive_file($name) {
 			// Get archive
 			$upload_dir = wp_upload_dir();
 			$dir_file = $upload_dir['basedir'] . '/wpeolog/';
 
-			$array_glob_file = glob( $dir_file . $name . '*.csv' );
+			$array_glob_file = glob($dir_file . $name . '*.csv');
 
-			foreach( $array_glob_file as &$glob_file ) {
+			foreach ($array_glob_file as &$glob_file) {
 				$glob_file = explode('/', $glob_file);
 				$glob_file = $glob_file[count($glob_file) - 1];
 			}
@@ -202,22 +202,22 @@ 
 		 * @param array $array_message ('object_id', 'message')
 		 * @param int $criticality The message crit rate (0-2)
 		 */
-		public static function log_datas_in_files( $name, $array_message, $criticality ) {
+		public static function log_datas_in_files($name, $array_message, $criticality) {
 			$upload_dir = wp_upload_dir();
 
 			$backtrace = debug_backtrace();
 
 			// On récupère le service
-			$service = self::get_service_by_name( $name );
+			$service = self::get_service_by_name($name);
 
-			if( $service == null ) {
+			if ($service == null) {
 			/** Créer le service s'il n'existe pas */
-				$service = self::add( $name );
+				$service = self::add($name);
 			}
 
-			wp_mkdir_p( $upload_dir[ 'basedir' ] . '/wpeolog/' );
+			wp_mkdir_p($upload_dir['basedir'] . '/wpeolog/');
 
-			if( $service == null )
+			if ($service == null)
 				return null;
 
 			$message = "
@@ -225,44 +225,44 @@ 
 			$message .= current_time('mysql', 0) . self::$file_separator;
 			$message .= get_current_user_id() . self::$file_separator;
 			$message .= '"' . $name . '"' . self::$file_separator;
-			$message .= ( !empty( $array_message['object_id'] ) ? $array_message['object_id'] : 'Not found' ) . self::$file_separator;
+			$message .= (!empty($array_message['object_id']) ? $array_message['object_id'] : 'Not found') . self::$file_separator;
 
 			// For post type
-			if(!empty($array_message['previous_element'])) {
+			if (!empty($array_message['previous_element'])) {
 				$message .= '"' . base64_encode(serialize($array_message['previous_element'])) . '"' . self::$file_separator;
 				$message .= '"' . base64_encode(serialize($array_message['previous_element_metas'])) . '"' . self::$file_separator;
 			}
 
-			if(!empty($array_message['message'])) {
+			if (!empty($array_message['message'])) {
 				$message .= '"' . $array_message['message'] . '"' . self::$file_separator;
 			}
 			$message .= $criticality . self::$file_separator . $name . self::$file_separator;
 
-			if ( !empty( $backtrace ) ) {
-				foreach ( $backtrace as $t ) {
-					$message .= ( !empty( $t['file'] ) ? $t['file'] : '' ) . ' line ' . ( !empty( $t['line'] ) ? $t['line'] : '' ) . ' function ' . $t['function'] . '()<br />';
+			if (!empty($backtrace)) {
+				foreach ($backtrace as $t) {
+					$message .= (!empty($t['file']) ? $t['file'] : '') . ' line ' . (!empty($t['line']) ? $t['line'] : '') . ' function ' . $t['function'] . '()<br />';
 				}
 			}
 
-			self::check_need_rotate( $service, $name . '-info', $message);
+			self::check_need_rotate($service, $name . '-info', $message);
 
-			$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-info.csv', 'a');
+			$fp = fopen($upload_dir['basedir'] . '/wpeolog/' . $name . '-info.csv', 'a');
 			fwrite($fp, $message);
 			fclose($fp);
 
-			if( 2 <= $criticality ) {
-				self::check_need_rotate( $service, $name . '-error', $message);
+			if (2 <= $criticality) {
+				self::check_need_rotate($service, $name . '-error', $message);
 
-				$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-error.csv', 'a');
+				$fp = fopen($upload_dir['basedir'] . '/wpeolog/' . $name . '-error.csv', 'a');
 				fwrite($fp, $message);
 				fclose($fp);
 			}
-			else if( 1 == $criticality ) {
-				self::check_need_rotate( $service, $name . '-warning', $message);
+			else if (1 == $criticality) {
+				self::check_need_rotate($service, $name . '-warning', $message);
 
-				$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-warning.csv', 'a');
-				fwrite( $fp, $message );
-				fclose( $fp );
+				$fp = fopen($upload_dir['basedir'] . '/wpeolog/' . $name . '-warning.csv', 'a');
+				fwrite($fp, $message);
+				fclose($fp);
 			}
 		}
 
@@ -271,23 +271,23 @@ 
 		*
 		* @param string $file_link The file path to write
 		*/
-		public static function check_need_rotate( $service, $name, $message ) {
+		public static function check_need_rotate($service, $name, $message) {
 			$upload_dir = wp_upload_dir();
 
 			$max_size = $service['size'];
 
-			$file_link = $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '.csv';
+			$file_link = $upload_dir['basedir'] . '/wpeolog/' . $name . '.csv';
 
-			if( file_exists( $file_link ) ) {
+			if (file_exists($file_link)) {
 				// Get full message
-				$message = file_get_contents( $file_link ) . $message;
+				$message = file_get_contents($file_link) . $message;
 
-				$file_size = filesize( $file_link );
+				$file_size = filesize($file_link);
 
-				if($file_size >= $max_size)
-					self::rename_current_file( $service, $name, $file_link );
-				else if(strlen($message) >= $max_size)
-					self::rename_current_file( $service, $name, $file_link );
+				if ($file_size >= $max_size)
+					self::rename_current_file($service, $name, $file_link);
+				else if (strlen($message) >= $max_size)
+					self::rename_current_file($service, $name, $file_link);
 
 				return $file_link;
 			}
@@ -300,33 +300,33 @@ 
 		 * @param string $service
 		 * @param string $file_link
 		 */
-		public static function rename_current_file( $service, $name, $file_link ) {
+		public static function rename_current_file($service, $name, $file_link) {
 				$upload_dir = wp_upload_dir();
 
 				$number_archive = $service['number'];
 
-				if( file_exists ( $file_link ) ) {
+				if (file_exists($file_link)) {
 					$file_explode = explode('.csv', $file_link);
 					$get_all_file = glob($file_explode[0] . '*.csv');
 					array_shift($get_all_file);
 					arsort($get_all_file);
 
-					foreach($get_all_file as $full_file) {
+					foreach ($get_all_file as $full_file) {
 						$file = explode('/', $full_file);
 						$file_name = $file[count($file) - 1];
 						$file_name = explode('.', $file_name);
 
 						$file_name[0]++;
-						rename($full_file, $upload_dir[ 'basedir' ] . '/wpeolog/' . $file_name[0] . '.csv');
+						rename($full_file, $upload_dir['basedir'] . '/wpeolog/' . $file_name[0] . '.csv');
 
 						// Check if not execeed the number archive
 						$count = explode('_', $file_name[0]);
 
-						if($count[1] > $number_archive && file_exists($upload_dir[ 'basedir' ] . '/wpeolog/' . $file_name[0] . '.csv')) {
-							unlink($upload_dir[ 'basedir' ] . '/wpeolog/' . $file_name[0] . '.csv');
+						if ($count[1] > $number_archive && file_exists($upload_dir['basedir'] . '/wpeolog/' . $file_name[0] . '.csv')) {
+							unlink($upload_dir['basedir'] . '/wpeolog/' . $file_name[0] . '.csv');
 						}
 					}
-					rename( $file_link, $file_explode[0] . '_1.csv' );
+					rename($file_link, $file_explode[0] . '_1.csv');
 				}
 		}
 
@@ -336,16 +336,16 @@ 
 		 * @param string $name Le nom du service
 		 * @return array | null
 		 */
-		public static function get_service_by_name( $name ) {
-			$array_service = get_option( '_wpeo_log_settings', array() );
+		public static function get_service_by_name($name) {
+			$array_service = get_option('_wpeo_log_settings', array());
 
 			$getted_service = null;
 
-			if ( !empty( $array_service ) ) {
-				$array_service = !is_array( $array_service ) ? json_decode( $array_service, true ) : $array_service;
+			if (!empty($array_service)) {
+				$array_service = !is_array($array_service) ? json_decode($array_service, true) : $array_service;
 
-				foreach ( $array_service as $service ) {
-					if( $service['name'] == $name ) {
+				foreach ($array_service as $service) {
+					if ($service['name'] == $name) {
 						$getted_service = $service;
 						break;
 					}
@@ -355,16 +355,16 @@ 
 			return $getted_service;
 		}
 
-		public static function get_service_by_id( $id ) {
-			$array_service = get_option( '_wpeo_log_settings', array() );
+		public static function get_service_by_id($id) {
+			$array_service = get_option('_wpeo_log_settings', array());
 
 			$getted_service = null;
 
-			if ( !empty( $array_service ) ) {
-				$array_service = json_decode( $array_service, true );
+			if (!empty($array_service)) {
+				$array_service = json_decode($array_service, true);
 
-				foreach ( $array_service as $key => $service ) {
-					if( $key == $id ) {
+				foreach ($array_service as $key => $service) {
+					if ($key == $id) {
 						$getted_service = $service;
 						break;
 					}
@@ -384,19 +384,19 @@ 
 		 * @return float|number
 		 */
 		function convert_to($input, $format, $convert = true) {
-			if($format == 'oc')
+			if ($format == 'oc')
 				return $input;
 
 			$multiple = 0;
 
-			if($format == 'ko')
+			if ($format == 'ko')
 				$multiple = 1024;
-			else if($format == 'mo')
+			else if ($format == 'mo')
 				$multiple = 1048576;
-			else if($format == 'go')
+			else if ($format == 'go')
 				$multiple = 1073741824;
 
-			if($convert)
+			if ($convert)
 				return $input * $multiple;
 			else
 				return $input / $multiple;
@@ -419,113 +419,113 @@ 
 		 * @param string $name Le nom du service
 		 * @return void
 		 */
-		public static function add( $name ) {
+		public static function add($name) {
 			$data_service = array(
 					'active' 		=> true,
-					'name'			=> !empty( $name ) ? $name : 'new_log',
+					'name'			=> !empty($name) ? $name : 'new_log',
 					'size' 			=> '1000000',
 					'format' 		=> 'ko',
 					'rotate'		=> false,
 					'number' 		=> 0,
-					'created_date'	=> current_time( 'mysql' ),
+					'created_date'	=> current_time('mysql'),
 			);
 
-			$array_current_settings = get_option( '_wpeo_log_settings' );
-			if ( !empty( $array_current_settings ) ) {
-				$array_current_settings = json_decode( $array_current_settings, true );
+			$array_current_settings = get_option('_wpeo_log_settings');
+			if (!empty($array_current_settings)) {
+				$array_current_settings = json_decode($array_current_settings, true);
 			}
 			else {
 				$array_current_settings = array();
 			}
 
 			$array_current_settings[] = $data_service;
-			$success = update_option( '_wpeo_log_settings', json_encode( $array_current_settings ) );
+			$success = update_option('_wpeo_log_settings', json_encode($array_current_settings));
 
-			if ( $success ) {
-				set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'A new service has been created!', 'wpeolog-i18n' ) ) ) );
+			if ($success) {
+				set_transient('log_message', json_encode(array('type' => 'updated', 'message' => __('A new service has been created!', 'wpeolog-i18n'))));
 			}
 
-			if ( !empty( $name ) ) {
+			if (!empty($name)) {
 				return $data_service;
 			}
 			else {
-				wp_safe_redirect( wp_get_referer() );
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
 		}
 
 		public function edit_service() {
-			if ( empty( $_POST['service'] ) || !is_array( $_POST['service'] ) ) {
-				set_transient( 'log_message', json_encode( array( 'type' => 'error', 'message' => __( 'Invalid data to update service' ), 'wpeolog-i18n' ) ) );
-				wp_safe_redirect( wp_get_referer() );
+			if (empty($_POST['service']) || !is_array($_POST['service'])) {
+				set_transient('log_message', json_encode(array('type' => 'error', 'message' => __('Invalid data to update service'), 'wpeolog-i18n')));
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
 
-			foreach( $_POST['service'] as &$service ) {
+			foreach ($_POST['service'] as &$service) {
 				// sanitize
-				$service['active'] = sanitize_key( $service['active'] );
-				$service['name'] = sanitize_key( $service['name'] );
-				$service['format'] = sanitize_key( $service['format'] );
-				$service['rotate'] = sanitize_key( $service['rotate'] );
-				$service['number'] = ( int )$service['number'];
-				$service['size'] = ( int )$this->convert_to( $service['size'], $service['format'] );
+				$service['active'] = sanitize_key($service['active']);
+				$service['name'] = sanitize_key($service['name']);
+				$service['format'] = sanitize_key($service['format']);
+				$service['rotate'] = sanitize_key($service['rotate']);
+				$service['number'] = (int)$service['number'];
+				$service['size'] = (int)$this->convert_to($service['size'], $service['format']);
 			}
 
-			unset( $service );
+			unset($service);
 
 
-			$array_current_setting = get_option( '_wpeo_log_settings' );
-			$array_current_setting = json_decode( $array_current_setting, true );
+			$array_current_setting = get_option('_wpeo_log_settings');
+			$array_current_setting = json_decode($array_current_setting, true);
 
-			$array_current_setting = array_replace( $array_current_setting, $_POST['service'] );
+			$array_current_setting = array_replace($array_current_setting, $_POST['service']);
 
-			$success = update_option( '_wpeo_log_settings', json_encode( $array_current_setting ) );
+			$success = update_option('_wpeo_log_settings', json_encode($array_current_setting));
 
 
-			if( $success ) {
-				set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'The services has been updated!', 'wpeolog-i18n' ) ) ) );
+			if ($success) {
+				set_transient('log_message', json_encode(array('type' => 'updated', 'message' => __('The services has been updated!', 'wpeolog-i18n'))));
 			}
 
-			wp_safe_redirect( wp_get_referer() );
+			wp_safe_redirect(wp_get_referer());
 			die();
 		}
 
 		public function to_trash() {
-			if( empty( $_GET['_wpnonce'] ) ) {
-				wp_safe_redirect( wp_get_referer() );
+			if (empty($_GET['_wpnonce'])) {
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
-			$wpnonce = sanitize_text_field( $_GET['_wpnonce'] );
+			$wpnonce = sanitize_text_field($_GET['_wpnonce']);
 
-			if ( 0 === (int) $_GET['service_id'] ) {
-				wp_safe_redirect( wp_get_referer() );
+			if (0 === (int)$_GET['service_id']) {
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
 			else {
-				$service_id = (int) $_GET['service_id'];
+				$service_id = (int)$_GET['service_id'];
 			}
 
-			if ( !isset( $wpnonce ) || !wp_verify_nonce( $wpnonce, 'to_trash_' . $service_id ) ) {
-				wp_safe_redirect( wp_get_referer() );
+			if (!isset($wpnonce) || !wp_verify_nonce($wpnonce, 'to_trash_' . $service_id)) {
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
 
-			$array_current_setting = get_option( '_wpeo_log_settings' );
-			$array_current_setting = json_decode( $array_current_setting, true );
+			$array_current_setting = get_option('_wpeo_log_settings');
+			$array_current_setting = json_decode($array_current_setting, true);
 
-			if ( !empty( $array_current_setting[$service_id] ) ) {
-				unset( $array_current_setting[$service_id] );
-				$success = update_option( '_wpeo_log_settings', json_encode( $array_current_setting ) );
+			if (!empty($array_current_setting[$service_id])) {
+				unset($array_current_setting[$service_id]);
+				$success = update_option('_wpeo_log_settings', json_encode($array_current_setting));
 
-				if( $success ) {
-					set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( sprintf( 'The service %d has been deleted!', $service_id ), 'wpeolog-i18n' ) ) ) );
+				if ($success) {
+					set_transient('log_message', json_encode(array('type' => 'updated', 'message' => __(sprintf('The service %d has been deleted!', $service_id), 'wpeolog-i18n'))));
 				}
 			}
 			else {
-				set_transient( 'log_message', json_encode( array( 'type' => 'error', 'message' => __( sprintf( 'The service %d is invalid!', $service_id ), 'wpeolog-i18n' ) ) ) );
+				set_transient('log_message', json_encode(array('type' => 'error', 'message' => __(sprintf('The service %d is invalid!', $service_id), 'wpeolog-i18n'))));
 			}
 
-			wp_safe_redirect( wp_get_referer() );
+			wp_safe_redirect(wp_get_referer());
 			die();
 		}
 
@@ -539,22 +539,22 @@ 
 			$upload_dir = wp_upload_dir();
 			$dir_file = $upload_dir['basedir'] . '/wpeolog/';
 
-			$file_name = sanitize_file_name( $_GET['file_name'] );
+			$file_name = sanitize_file_name($_GET['file_name']);
 
-			$success = unlink( $dir_file . $file_name );
-			if ( $success )
-				set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'The file has been deleted!', 'wpeolog-i18n' ) ) ) );
-			wp_safe_redirect( wp_get_referer() );
+			$success = unlink($dir_file . $file_name);
+			if ($success)
+				set_transient('log_message', json_encode(array('type' => 'updated', 'message' => __('The file has been deleted!', 'wpeolog-i18n'))));
+			wp_safe_redirect(wp_get_referer());
 			die();
 		}
 
 		public function transfert() {
-			$array_service = get_option( '_wpeo_log_settings' );
+			$array_service = get_option('_wpeo_log_settings');
 
 			$new_array_service = array();
 
-			if( !empty( $array_service['my_services'] ) && is_array( $array_service['my_services'] ) ) {
-			  foreach ( $array_service['my_services'] as $element ) {
+			if (!empty($array_service['my_services']) && is_array($array_service['my_services'])) {
+			  foreach ($array_service['my_services'] as $element) {
 					$new_array_service[] = array(
 						"active" => $element["service_active"] == 1 ? true : false,
 						"name" => $element["service_name"],
@@ -562,12 +562,12 @@ 
 						"format" => $element["service_size_format"],
 						"rotate" => $element["service_rotate"] == 1 ? true : false,
 						"number" => $element["service_file"],
-						"created_date" => current_time( "mysql" )
+						"created_date" => current_time("mysql")
 					);
 				}
 
-				update_option( '_wpeo_log_settings', json_encode( $new_array_service ) );
-				update_option( '_wpeo_log_old_settings', $array_service );
+				update_option('_wpeo_log_settings', json_encode($new_array_service));
+				update_option('_wpeo_log_old_settings', $array_service);
 			}
 		}
 	}

Braces +50 added lines, -41 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Main controller file for WP logs module
@@ -114,22 +116,29 @@ 
 		}
 
 		private function check_page() {
-			if( empty( $_GET['action'] ) || empty( $_GET['type'] ) )
-				return false;
+			if( empty( $_GET['action'] ) || empty( $_GET['type'] ) ) {
+							return false;
+			}
 
 			$action = sanitize_text_field( $_GET['action'] );
 			$type = sanitize_text_field( !empty( $_GET['type'] ) ?  $_GET['type'] : '' );
 
-			if ( !isset( $_GET['service_id'] ) ) return false;
-			else $service_id = (int) $_GET['service_id'];
+			if ( !isset( $_GET['service_id'] ) ) {
+				return false;
+			} else {
+				$service_id = (int) $_GET['service_id'];
+			}
 
-			if ( isset( $_GET['key'] ) && 0 !== (int) $_GET['key'] ) $key = (int) $_GET['key'];
+			if ( isset( $_GET['key'] ) && 0 !== (int) $_GET['key'] ) {
+				$key = (int) $_GET['key'];
+			}
 
 			if ( 'view' == $action && isset( $service_id ) ) {
 				$service = self::get_service_by_id( $service_id );
 
-				if( $service == null )
-					return false;
+				if( $service == null ) {
+									return false;
+				}
 
 				$service_name = $service['name'];
 
@@ -174,8 +183,7 @@ 
 				}
 
 				return array( 'data' => $file, 'count' => count( $file ) );
-			}
-			else {
+			} else {
 				return array( 'data' => null, 'count' => 0 );
 			}
 		}
@@ -217,8 +225,9 @@ 
 
 			wp_mkdir_p( $upload_dir[ 'basedir' ] . '/wpeolog/' );
 
-			if( $service == null )
-				return null;
+			if( $service == null ) {
+							return null;
+			}
 
 			$message = "
 ";
@@ -256,8 +265,7 @@ 
 				$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-error.csv', 'a');
 				fwrite($fp, $message);
 				fclose($fp);
-			}
-			else if( 1 == $criticality ) {
+			} else if( 1 == $criticality ) {
 				self::check_need_rotate( $service, $name . '-warning', $message);
 
 				$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-warning.csv', 'a');
@@ -284,10 +292,11 @@ 
 
 				$file_size = filesize( $file_link );
 
-				if($file_size >= $max_size)
-					self::rename_current_file( $service, $name, $file_link );
-				else if(strlen($message) >= $max_size)
-					self::rename_current_file( $service, $name, $file_link );
+				if($file_size >= $max_size) {
+									self::rename_current_file( $service, $name, $file_link );
+				} else if(strlen($message) >= $max_size) {
+									self::rename_current_file( $service, $name, $file_link );
+				}
 
 				return $file_link;
 			}
@@ -384,22 +393,25 @@ 
 		 * @return float|number
 		 */
 		function convert_to($input, $format, $convert = true) {
-			if($format == 'oc')
-				return $input;
+			if($format == 'oc') {
+							return $input;
+			}
 
 			$multiple = 0;
 
-			if($format == 'ko')
-				$multiple = 1024;
-			else if($format == 'mo')
-				$multiple = 1048576;
-			else if($format == 'go')
-				$multiple = 1073741824;
-
-			if($convert)
-				return $input * $multiple;
-			else
-				return $input / $multiple;
+			if($format == 'ko') {
+							$multiple = 1024;
+			} else if($format == 'mo') {
+							$multiple = 1048576;
+			} else if($format == 'go') {
+							$multiple = 1073741824;
+			}
+
+			if($convert) {
+							return $input * $multiple;
+			} else {
+							return $input / $multiple;
+			}
 		}
 
 		/**
@@ -433,8 +445,7 @@ 
 			$array_current_settings = get_option( '_wpeo_log_settings' );
 			if ( !empty( $array_current_settings ) ) {
 				$array_current_settings = json_decode( $array_current_settings, true );
-			}
-			else {
+			} else {
 				$array_current_settings = array();
 			}
 
@@ -447,8 +458,7 @@ 
 
 			if ( !empty( $name ) ) {
 				return $data_service;
-			}
-			else {
+			} else {
 				wp_safe_redirect( wp_get_referer() );
 				die();
 			}
@@ -500,8 +510,7 @@ 
 			if ( 0 === (int) $_GET['service_id'] ) {
 				wp_safe_redirect( wp_get_referer() );
 				die();
-			}
-			else {
+			} else {
 				$service_id = (int) $_GET['service_id'];
 			}
 
@@ -520,8 +529,7 @@ 
 				if( $success ) {
 					set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( sprintf( 'The service %d has been deleted!', $service_id ), 'wpeolog-i18n' ) ) ) );
 				}
-			}
-			else {
+			} else {
 				set_transient( 'log_message', json_encode( array( 'type' => 'error', 'message' => __( sprintf( 'The service %d is invalid!', $service_id ), 'wpeolog-i18n' ) ) ) );
 			}
 
@@ -542,8 +550,9 @@ 
 			$file_name = sanitize_file_name( $_GET['file_name'] );
 
 			$success = unlink( $dir_file . $file_name );
-			if ( $success )
-				set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'The file has been deleted!', 'wpeolog-i18n' ) ) ) );
+			if ( $success ) {
+							set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'The file has been deleted!', 'wpeolog-i18n' ) ) ) );
+			}
 			wp_safe_redirect( wp_get_referer() );
 			die();
 		}

core/wpeo_model/controller/term_ctr.01.php

Doc Comments -1 removed lines

@@ -156,7 +156,6 @@
 	/**
 	 * Retourne une liste de taxinomies selon les paramètres donnés / Return a taxonomy list according to given parameters
 	 *
-	 * @param array $args_where Optionnal Les paramètres du filtre permettant de récupérer les taxinomies / Parameters allowing to retrieve taxonomies
 	 * @param boolean $cropped Optionnal Permet de choisir si il faut retourner la taxinomie complète ou uniquement les chamsp principaux / Allow to define if the taxonomy must be completly returned or just main fileds must be returned
 	 *
 	 * @return array La liste des taxinomies correspondantes aux paramètres / Taxonomies corresping to parameters

Spacing +39 added lines, -39 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier de gestion du modèle des taxinomies / File for term model management
  *
@@ -53,7 +53,7 @@ 
 	 */
 	public function __construct() {
 		/**	Ajout des routes personnalisées pour les éléments de type "term" / Add specific routes for "term" elements' type	*/
-		add_filter( 'json_endpoints', array( &$this, 'callback_register_route' ) );
+		add_filter('json_endpoints', array(&$this, 'callback_register_route'));
 	}
 
 	/**
@@ -63,20 +63,20 @@ 
 	 *
 	 * @return Object L'objet sauvegardé / The saved object
 	 */
-	public function update( $data ) {
+	public function update($data) {
 		$object = $data;
 
 		/**	Dans le cas d'un tableau on le lit pour construire l'objet / If passed data is an array read and build an object from it	*/
-		if( is_array( $data ) ) {
-			$object = new $this->model_name( $data, $this->meta_key );
+		if (is_array($data)) {
+			$object = new $this->model_name($data, $this->meta_key);
 		}
 
 		/**	Sauvegarde des données dans la base de données / Save data into database	*/
-		$wp_category_danger = wp_update_term( $object->id, $this->get_taxonomy(), $object->do_wp_object() );
-		if ( !is_wp_error( $wp_category_danger ) ) {
+		$wp_category_danger = wp_update_term($object->id, $this->get_taxonomy(), $object->do_wp_object());
+		if (!is_wp_error($wp_category_danger)) {
 			/** Mise à jour des options / Save options */
-			if( !empty( $object->option ) ) {
-				$object->save_meta_data( $object, 'update_term_meta', $this->meta_key );
+			if (!empty($object->option)) {
+				$object->save_meta_data($object, 'update_term_meta', $this->meta_key);
 			}
 		}
 
@@ -90,26 +90,26 @@ 
 	 *
 	 * @return Object L'objet sauvegardé / The saved object
 	 */
-	public function create( $data ) {
+	public function create($data) {
 		$object = $data;
 
-		if( is_array( $data ) ) {
-			$object = new $this->model_name( $data, $this->meta_key );
+		if (is_array($data)) {
+			$object = new $this->model_name($data, $this->meta_key);
 		}
 
-		$wp_category_danger = wp_insert_term( $object->name, $this->get_taxonomy(), array(
+		$wp_category_danger = wp_insert_term($object->name, $this->get_taxonomy(), array(
 			'description'	=> $object->description,
 			'slug'	=> $object->slug,
 			'parent'	=> $object->parent_id,
-		) );
+		));
 
-		if ( !is_wp_error( $wp_category_danger ) ) {
-			$object->id = $wp_category_danger[ 'term_id' ];
-			$object->term_taxonomy_id = $wp_category_danger[ 'term_taxonomy_id' ];
+		if (!is_wp_error($wp_category_danger)) {
+			$object->id = $wp_category_danger['term_id'];
+			$object->term_taxonomy_id = $wp_category_danger['term_taxonomy_id'];
 
 			/** Mise à jour des options / Save options */
-			if( !empty( $object->option ) ) {
-				$object->save_meta_data( $object, 'update_term_meta', $this->meta_key );
+			if (!empty($object->option)) {
+				$object->save_meta_data($object, 'update_term_meta', $this->meta_key);
 			}
 
 			return $object;
@@ -127,8 +127,8 @@ 
 	 *
 	 * @param integer $id L'identifiant de la taxinomie a supprimer / The taxonomy identifier to delete
 	 */
-	public function delete( $id ) {
-		wp_delete_term( $id );
+	public function delete($id) {
+		wp_delete_term($id);
 	}
 
 	/**
@@ -139,18 +139,18 @@ 
 	 *
 	 * @return object la taxinomie construite selon le modèle / The taxonomy builded according to the model
 	 */
-	public function show( $id, $cropped = false ) {
+	public function show($id, $cropped = false) {
 		/**	Récupération de la taxinomie depuis wordpress / Get the taxonomy from wordpress	*/
- 		$wp_term = get_term_by( 'id', $id, $this->taxonomy, OBJECT );
+ 		$wp_term = get_term_by('id', $id, $this->taxonomy, OBJECT);
 
  		/**	Construction de la taxinomie selon le modèle défini / Build the taxonomy according to the model	*/
-		$term = new $this->model_name( $wp_term, $this->meta_key, $cropped );
+		$term = new $this->model_name($wp_term, $this->meta_key, $cropped);
 
 		return $term;
 	}
 
 	public function show_model() {
-			return _e( 'Try to get the model definition', 'term_ctr_mdl' );
+			return _e('Try to get the model definition', 'term_ctr_mdl');
 	}
 
 	/**
@@ -161,15 +161,15 @@ 
 	 *
 	 * @return array La liste des taxinomies correspondantes aux paramètres / Taxonomies corresping to parameters
 	 */
-	public function index( $args = array(), $cropped = false ) {
+	public function index($args = array(), $cropped = false) {
 		$array_model = array();
 
-		$term_final_args = array_merge( $args, array( 'hide_empty' => false, ) );
-		$array_term = get_terms( $this->taxonomy, $term_final_args );
+		$term_final_args = array_merge($args, array('hide_empty' => false,));
+		$array_term = get_terms($this->taxonomy, $term_final_args);
 
-		if( !empty( $array_term ) ) {
-			foreach( $array_term as $key => $term ) {
-				$array_model[$key] = new $this->model_name( $term, $this->meta_key, $cropped );
+		if (!empty($array_term)) {
+			foreach ($array_term as $key => $term) {
+				$array_model[$key] = new $this->model_name($term, $this->meta_key, $cropped);
 			}
 		}
 
@@ -183,30 +183,30 @@ 
 	 *
 	 * @return array La liste des routes personnalisées ajoutées aux routes existantes / The personnalized routes added to existing
 	 */
-	public function callback_register_route( $array_route ) {
+	public function callback_register_route($array_route) {
 		/**	Récupération de la définition du model pour l'élément / Get model structure for element	*/
-		$array_route['/' . $this->version . '/show_model/' . $this->base ] = array(
-				array( array( $this, 'show_model' ), WP_JSON_Server::READABLE )
+		$array_route['/' . $this->version . '/show_model/' . $this->base] = array(
+				array(array($this, 'show_model'), WP_JSON_Server::READABLE)
 		);
 
 		/** Récupération de la liste complète des éléments / Get all existing elements */
-		$array_route['/' . $this->version . '/get/' . $this->base ] = array(
-				array( array( $this, 'index' ), WP_JSON_Server::READABLE | WP_JSON_Server::ACCEPT_JSON )
+		$array_route['/' . $this->version . '/get/' . $this->base] = array(
+				array(array($this, 'index'), WP_JSON_Server::READABLE | WP_JSON_Server::ACCEPT_JSON)
 		);
 
 		/** Récupération d'un élément donné / Get a given element */
 		$array_route['/' . $this->version . '/get/' . $this->base . '/(?P<id>\d+)'] = array(
-				array( array( $this, 'show' ), WP_JSON_Server::READABLE |  WP_JSON_Server::ACCEPT_JSON )
+				array(array($this, 'show'), WP_JSON_Server::READABLE | WP_JSON_Server::ACCEPT_JSON)
 		);
 
 		/** Mise à jour d'un élément / Update an element */
 		$array_route['/' . $this->version . '/post/' . $this->base . ''] = array(
-				array( array( $this, 'update' ), WP_JSON_Server::CREATABLE | WP_JSON_Server::ACCEPT_JSON ),
+				array(array($this, 'update'), WP_JSON_Server::CREATABLE | WP_JSON_Server::ACCEPT_JSON),
 		);
 
 		/** Suppression d'un élément / Delete an element */
 		$array_route['/' . $this->version . '/delete/' . $this->base . '/(?P<id>\d+)'] = array(
-				array( array( $this, 'delete' ), WP_JSON_Server::DELETABLE | WP_JSON_Server::ACCEPT_JSON ),
+				array(array($this, 'delete'), WP_JSON_Server::DELETABLE | WP_JSON_Server::ACCEPT_JSON),
 		);
 
 		return $array_route;

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de gestion du modèle des taxinomies / File for term model management
  *
@@ -113,8 +115,7 @@ 
 			}
 
 			return $object;
-		}
-		else {
+		} else {
 			/**
 			 * @todo return error when creation does not work
 			 */

core/wps_utils/wps_utils.php

Doc Comments +3 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 	 *	Return a variable with some basic treatment
 	 *
 	 *	@param mixed $varToSanitize The variable we want to treat for future use
-	 *	@param mixed $varDefaultValue The default value to set to the variable if the different test are not successfull
+	 *	@param string $varDefaultValue The default value to set to the variable if the different test are not successfull
 	 *	@param string $varType optionnal The type of the var for better verification
 	 *
 	 *	@return mixed $sanitizedVar The var after treatment
@@ -223,6 +223,7 @@ 
 	 * Return unit sigle
 	 * @param unknown_type $code
 	 * @param unknown_type $column_to_return
+	 * @return string
 	 */
 	public static function wpshop_get_sigle($code, $column_to_return = "unit") {
 		$tmp_code = (int)$code;
@@ -316,7 +317,7 @@ 
 	 *	Transform a given text with a specific pattern, send by the second parameter
 	 *
 	 *	@param string $toSlugify The string we want to "clean" for future use
-	 *	@param array|string $slugifyType The type of cleaning we are going to do on the input text
+	 *	@param string[] $slugifyType The type of cleaning we are going to do on the input text
 	 *
 	 *	@return string $slugified The input string that was slugified with the selected method
 	 */

Spacing +81 added lines, -81 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -28,56 +28,56 @@ 
 	 *
 	 * @return string The template file path to use
 	 */
-	public static function get_template_part( $plugin_dir_name, $main_template_dir, $side, $slug, $name=null, $debug = null ) {
+	public static function get_template_part($plugin_dir_name, $main_template_dir, $side, $slug, $name = null, $debug = null) {
 		$path = '';
 
 		$templates = array();
 		$name = (string)$name;
-		if ( '' !== $name )
+		if ('' !== $name)
 			$templates[] = "{$side}/{$slug}-{$name}.php";
 		$templates[] = "{$side}/{$slug}.php";
 
 		/**	Check if required template exists into current theme	*/
 		$check_theme_template = array();
-		foreach ( $templates as $template ) {
+		foreach ($templates as $template) {
 			$check_theme_template = $plugin_dir_name . "/" . $template;
-			$path = locate_template( $check_theme_template, false );
-			if( !empty($path) ) {
+			$path = locate_template($check_theme_template, false);
+			if (!empty($path)) {
 				break;
 			}
 		}
 
 		/**	Allow debugging	*/
-		if ( !empty( $debug ) ) {
+		if (!empty($debug)) {
 			echo '--- Debug mode ON - Start ---<br/>';
 			echo __FILE__ . '<br/>';
 			echo 'Debug for display method<br/>';
 			echo 'Asked path ' . $path . '<br/>';
 		}
 
-		if ( empty( $path ) ) {
-			foreach ( (array) $templates as $template_name ) {
-				if ( !$template_name )
+		if (empty($path)) {
+			foreach ((array)$templates as $template_name) {
+				if (!$template_name)
 					continue;
 
-				if ( !empty( $debug ) ) {
+				if (!empty($debug)) {
 					echo __LINE__ . ' - ' . $main_template_dir . $template_name . '<hr/>';
 				}
 
-				$file_exists = file_exists( $main_template_dir . $template_name );
-				if ( $file_exists ) {
+				$file_exists = file_exists($main_template_dir . $template_name);
+				if ($file_exists) {
 					$path = $main_template_dir . $template_name;
 					break;
 				}
 
-				if ( !empty( $debug ) ) {
+				if (!empty($debug)) {
 					echo __LINE__ . ' - ' . (bool)$file_exists . '<hr/>';
 				}
 			}
 		}
 
 		/**	Allow debugging	*/
-		if ( !empty( $debug ) ) {
+		if (!empty($debug)) {
 			echo '--- Debug mode ON - END ---<br/><br/>';
 		}
 
@@ -101,7 +101,7 @@ 
 	 *	@return mixed $sanitizedVar The var after treatment
 	 */
 	public static function varSanitizer($varToSanitize, $varDefaultValue = '', $varType = '') {
-		$sanitizedVar = is_string( $varToSanitize ) && (trim(strip_tags(stripslashes($varToSanitize))) != '') ? trim(strip_tags(stripslashes(($varToSanitize)))) : $varDefaultValue ;
+		$sanitizedVar = is_string($varToSanitize) && (trim(strip_tags(stripslashes($varToSanitize))) != '') ? trim(strip_tags(stripslashes(($varToSanitize)))) : $varDefaultValue;
 
 		return $sanitizedVar;
 	}
@@ -114,7 +114,7 @@ 
 	public static function forceDownload($Fichier_a_telecharger, $delete_after_download = false) {
 
 		$nom_fichier = basename($Fichier_a_telecharger);
-		switch(strrchr($nom_fichier, ".")) {
+		switch (strrchr($nom_fichier, ".")) {
 			case ".gz": $type = "application/x-gzip"; break;
 			case ".tgz": $type = "application/x-gzip"; break;
 			case ".zip": $type = "application/zip"; break;
@@ -131,14 +131,14 @@ 
 		header("Content-disposition: attachment; filename=$nom_fichier");
 		header("Content-Type: application/force-download");
 		header("Content-Transfer-Encoding: $type\n"); // Surtout ne pas enlever le \n
-		header("Content-Length: ".filesize($Fichier_a_telecharger));
+		header("Content-Length: " . filesize($Fichier_a_telecharger));
 		header("Pragma: no-cache");
 		header("Cache-Control: must-revalidate, post-check=0, pre-check=0, public");
 		header("Expires: 0");
 		ob_end_clean();
 		readfile($Fichier_a_telecharger);
-		if ( $delete_after_download ) {
-			unlink( $Fichier_a_telecharger );
+		if ($delete_after_download) {
+			unlink($Fichier_a_telecharger);
 		}
 		exit;
 	}
@@ -148,7 +148,7 @@ 
 	 * @return boolean
 	 */
 	public static function is_sendsms_actived() {
-		if(is_plugin_active('wordpress-send-sms/Send-SMS.php')) {
+		if (is_plugin_active('wordpress-send-sms/Send-SMS.php')) {
 			$configOption = get_option('sendsms_config', '');
 			$ligne = unserialize($configOption);
 			$nicOVH = $ligne['nicOVH'];
@@ -165,7 +165,7 @@ 
 	 * @param unknown_type $input
 	 * @return Ambigous <multitype:, multitype:multitype:unknown  >
 	 */
-	public static function search_all_possibilities( $input ) {
+	public static function search_all_possibilities($input) {
 		$result = array();
 
 		while (list($key, $values) = each($input)) {
@@ -174,17 +174,17 @@ 
 			}
 
 			if (empty($result)) {
-				foreach($values as $value) {
+				foreach ($values as $value) {
 					$result[] = array($key => $value);
 				}
 			}
 			else {
 				$append = array();
-				foreach($result as &$product) {
+				foreach ($result as &$product) {
 					$product[$key] = array_shift($values);
 					$copy = $product;
 
-					foreach($values as $item) {
+					foreach ($values as $item) {
 						$copy[$key] = $item;
 						$append[] = $copy;
 					}
@@ -204,14 +204,14 @@ 
 	 * @param boolean $code : false return sigle, true return code (€ or EUR)
 	 * @return string currency code or sigle
 	 */
-	public static function wpshop_get_currency($code=false) {
+	public static function wpshop_get_currency($code = false) {
 		// Currency
 		global $wpdb;
 		$current_currency = get_option('wpshop_shop_default_currency');
-		$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
-		$currency_infos = $wpdb->get_row( $query );
-		if ( !empty($currency_infos) ) {
-			$code = ($code) ?  $currency_infos->name : $currency_infos->unit;
+		$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id =%d ', $current_currency);
+		$currency_infos = $wpdb->get_row($query);
+		if (!empty($currency_infos)) {
+			$code = ($code) ? $currency_infos->name : $currency_infos->unit;
 			return $code;
 		}
 		else {
@@ -227,11 +227,11 @@ 
 	public static function wpshop_get_sigle($code, $column_to_return = "unit") {
 		$tmp_code = (int)$code;
 		$key_to_get = 'name';
-		if ( is_int($tmp_code) && !empty($tmp_code) ) {
+		if (is_int($tmp_code) && !empty($tmp_code)) {
 			$key_to_get = 'id';
 		}
 		$old_way_currencies = unserialize(WPSHOP_SHOP_CURRENCIES);
-		if ( array_key_exists( $code, $old_way_currencies)) {
+		if (array_key_exists($code, $old_way_currencies)) {
 			$code = $old_way_currencies[$code];
 			$key_to_get = 'name';
 		}
@@ -246,7 +246,7 @@ 
 	 * @param string $var : variable to clean
 	 * @return string
 	 */
-	public static function wpshop_clean( $var ) {
+	public static function wpshop_clean($var) {
 		return trim(strip_tags(stripslashes($var)));
 	}
 
@@ -255,8 +255,8 @@ 
 	 * @param   string	phone number
 	 * @return  boolean
 	 */
-	public static function is_phone( $phone ) {
-		if (strlen(trim(preg_replace('/[\s\#0-9_\-\+\(\)]/', '', $phone)))>0) return false;
+	public static function is_phone($phone) {
+		if (strlen(trim(preg_replace('/[\s\#0-9_\-\+\(\)]/', '', $phone))) > 0) return false;
 		else return true;
 	}
 
@@ -277,14 +277,14 @@ 
 	 *
 	 *	@return string $type The form input type to use for the given field
 	 */
-	public static function defineFieldType($dataFieldType, $input_type, $frontend_verification){
+	public static function defineFieldType($dataFieldType, $input_type, $frontend_verification) {
 		$type = 'text';
 
-		if ( $dataFieldType == 'datetime' ) {
+		if ($dataFieldType == 'datetime') {
 			$type = 'text';
 		}
 		else {
-			switch ( $frontend_verification ) {
+			switch ($frontend_verification) {
 				case 'phone':
 					$type = 'tel';
 					break;
@@ -304,7 +304,7 @@ 
 	 *
 	 * @return array The different element send by request method
 	 */
-	public static function getMethode(){
+	public static function getMethode() {
 		if ($_SERVER["REQUEST_METHOD"] == "GET")
 			return $_GET;
 		if ($_SERVER["REQUEST_METHOD"] == "POST")
@@ -320,36 +320,36 @@ 
 	 *
 	 *	@return string $slugified The input string that was slugified with the selected method
 	 */
-	public static function slugify($toSlugify, $slugifyType){
+	public static function slugify($toSlugify, $slugifyType) {
 		$slugified = '';
 
-		if($toSlugify != '')
+		if ($toSlugify != '')
 		{
 			$slugified = $toSlugify;
-			foreach($slugifyType as $type)
+			foreach ($slugifyType as $type)
 			{
-				if($type == 'noAccent')
+				if ($type == 'noAccent')
 				{
-					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/","/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
-					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U","e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
+					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
+					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U", "e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
 				}
-				elseif($type == 'noSpaces')
+				elseif ($type == 'noSpaces')
 				{
 					$pattern = array('/\s/');
 					$rep_pat = array('_');
 					$slugified = trim($slugified);
 				}
-				elseif($type == 'lowerCase')
+				elseif ($type == 'lowerCase')
 				{
 					$slugified = strtolower($slugified);
 				}
-				elseif($type == 'noPunctuation')
+				elseif ($type == 'noPunctuation')
 				{
 					$pattern = array("/#/", "/\{/", "/\[/", "/\(/", "/\)/", "/\]/", "/\}/", "/&/", "/~/", "/�/", "/`/", "/\^/", "/@/", "/=/", "/�/", "/�/", "/%/", "/�/", "/!/", "/�/", "/:/", "/\$/", "/;/", "/\./", "/,/", "/\?/", "/\\\/", "/\//");
 					$rep_pat = array("_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_");
 				}
 
-				if(is_array($pattern) && is_array($rep_pat))
+				if (is_array($pattern) && is_array($rep_pat))
 				{
 					$slugified = preg_replace($pattern, $rep_pat, utf8_decode($slugified));
 				}
@@ -368,17 +368,17 @@ 
 	 *	@return string $string The output string that was trunk if necessary
 	 */
 	public static function trunk($string, $maxlength) {
-		if(strlen($string)>$maxlength+3)
-			return substr($string,0,$maxlength).'...';
+		if (strlen($string) > $maxlength + 3)
+			return substr($string, 0, $maxlength) . '...';
 		else return $string;
 	}
 
 	/**
 	 * Run a safe redirect in javascript
 	 */
-	public static function wpshop_safe_redirect($url='') {
-		$url = empty($url) ? admin_url('admin.php?page='.WPSHOP_URL_SLUG_DASHBOARD) : $url;
-		echo '<script type="text/javascript">window.top.location.href = "'.$url.'"</script>';
+	public static function wpshop_safe_redirect($url = '') {
+		$url = empty($url) ? admin_url('admin.php?page=' . WPSHOP_URL_SLUG_DASHBOARD) : $url;
+		echo '<script type="text/javascript">window.top.location.href = "' . $url . '"</script>';
 		exit;
 	}
 
@@ -388,9 +388,9 @@ 
 	 * @param array $args : Hook arguments
 	 * @return string
 	 */
-	public static function create_custom_hook ($hook_name, $args = '') {
+	public static function create_custom_hook($hook_name, $args = '') {
 		ob_start();
-		if ( !empty($args) ) {
+		if (!empty($args)) {
 			do_action($hook_name, $args);
 		}
 		else {
@@ -409,16 +409,16 @@ 
 	 */
 	public static function get_plugin_validation_code($plugin_name, $encrypt_base_attribute) {
 		$code = '';
-		if ( !function_exists( 'get_plugin_data') )
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-		$plug = get_plugin_data( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php' );
+		if (!function_exists('get_plugin_data'))
+			require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+		$plug = get_plugin_data(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php');
 		$code_part = array();
-		$code_part[] = substr(hash ( "sha256" , $plugin_name ), WPSHOP_ADDONS_KEY_IS, 5);
-		$code_part[] = substr(hash ( "sha256" , $plug['Name'] ), WPSHOP_ADDONS_KEY_IS, 5);
-		$code_part[] = substr(hash ( "sha256" , 'addons' ), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", $plugin_name), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", $plug['Name']), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", 'addons'), WPSHOP_ADDONS_KEY_IS, 5);
 		$code = $code_part[1] . '-' . $code_part[2] . '-' . $code_part[0];
 		$att = $encrypt_base_attribute;
-		$code .= '-' . substr(hash ( "sha256" , $att ),  WPSHOP_ADDONS_KEY_IS, 5);
+		$code .= '-' . substr(hash("sha256", $att), WPSHOP_ADDONS_KEY_IS, 5);
 
 		return $code;
 	}
@@ -429,15 +429,15 @@ 
 	 * @param string $encrypt_base_attribute
 	 * @return boolean
 	 */
-	public static function check_plugin_activation_code( $plugin_name, $encrypt_base_attribute, $from = 'file') {
+	public static function check_plugin_activation_code($plugin_name, $encrypt_base_attribute, $from = 'file') {
 		$is_valid = false;
 		$valid_activation_code = self::get_plugin_validation_code($plugin_name, $encrypt_base_attribute);
-		$activation_code_filename = WP_PLUGIN_DIR .'/'. $plugin_name.'/encoder.txt';
-		if ( is_file($activation_code_filename) ) {
-			$activation_code_file = fopen($activation_code_filename, 'r' );
-			if ( $activation_code_file !== false) {
-				$activation_code = fread( $activation_code_file, filesize($activation_code_filename));
-				if ( $activation_code == $valid_activation_code ) {
+		$activation_code_filename = WP_PLUGIN_DIR . '/' . $plugin_name . '/encoder.txt';
+		if (is_file($activation_code_filename)) {
+			$activation_code_file = fopen($activation_code_filename, 'r');
+			if ($activation_code_file !== false) {
+				$activation_code = fread($activation_code_file, filesize($activation_code_filename));
+				if ($activation_code == $valid_activation_code) {
 					$is_valid = true;
 				}
 			}
@@ -450,12 +450,12 @@ 
 	 * @param unknown_type $number
 	 * @return string
 	 */
-	public static function formate_number( $number ) {
-		$number = number_format( $number, 2, '.', '' );
-		$exploded_number = explode( '.', $number );
+	public static function formate_number($number) {
+		$number = number_format($number, 2, '.', '');
+		$exploded_number = explode('.', $number);
 		$number = $exploded_number[0];
-		if( $exploded_number[1] != '00' ) {
-			$number .= '<span class="wps_number_cents">,' . $exploded_number[1]. '</span>';
+		if ($exploded_number[1] != '00') {
+			$number .= '<span class="wps_number_cents">,' . $exploded_number[1] . '</span>';
 		}
 		return $number;
 	}
@@ -465,12 +465,12 @@ 
 	 * @param int $page_id
 	 * @return int
 	 */
-	public static function get_page_id( $page_id ) {
-		if( !empty($page_id) ) {
-			if ( function_exists( 'icl_object_id' ) && defined('ICL_LANGUAGE_CODE') ) {
-				$element_post_type = get_post_type( $page_id );
-				$translated_element_id = icl_object_id( $page_id, $element_post_type, true, ICL_LANGUAGE_CODE );
-				if( !empty($translated_element_id) ) {
+	public static function get_page_id($page_id) {
+		if (!empty($page_id)) {
+			if (function_exists('icl_object_id') && defined('ICL_LANGUAGE_CODE')) {
+				$element_post_type = get_post_type($page_id);
+				$translated_element_id = icl_object_id($page_id, $element_post_type, true, ICL_LANGUAGE_CODE);
+				if (!empty($translated_element_id)) {
 					$page_id = $translated_element_id;
 				}
 			}

Braces +40 added lines, -32 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for product mass modification module
  *
@@ -33,8 +35,9 @@ 
 
 		$templates = array();
 		$name = (string)$name;
-		if ( '' !== $name )
-			$templates[] = "{$side}/{$slug}-{$name}.php";
+		if ( '' !== $name ) {
+					$templates[] = "{$side}/{$slug}-{$name}.php";
+		}
 		$templates[] = "{$side}/{$slug}.php";
 
 		/**	Check if required template exists into current theme	*/
@@ -57,8 +60,9 @@ 
 
 		if ( empty( $path ) ) {
 			foreach ( (array) $templates as $template_name ) {
-				if ( !$template_name )
-					continue;
+				if ( !$template_name ) {
+									continue;
+				}
 
 				if ( !empty( $debug ) ) {
 					echo __LINE__ . ' - ' . $main_template_dir . $template_name . '<hr/>';
@@ -177,8 +181,7 @@ 
 				foreach($values as $value) {
 					$result[] = array($key => $value);
 				}
-			}
-			else {
+			} else {
 				$append = array();
 				foreach($result as &$product) {
 					$product[$key] = array_shift($values);
@@ -213,8 +216,7 @@ 
 		if ( !empty($currency_infos) ) {
 			$code = ($code) ?  $currency_infos->name : $currency_infos->unit;
 			return $code;
-		}
-		else {
+		} else {
 			return '';
 		}
 	}
@@ -256,8 +258,11 @@ 
 	 * @return  boolean
 	 */
 	public static function is_phone( $phone ) {
-		if (strlen(trim(preg_replace('/[\s\#0-9_\-\+\(\)]/', '', $phone)))>0) return false;
-		else return true;
+		if (strlen(trim(preg_replace('/[\s\#0-9_\-\+\(\)]/', '', $phone)))>0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	/**
@@ -266,8 +271,11 @@ 
 	 * @return  boolean
 	 */
 	public static function is_postcode($postcode) {
-		if (strlen(trim(preg_replace('/[\s\-A-Za-z0-9]/', '', $postcode))) > 0) return false;
-		else return true;
+		if (strlen(trim(preg_replace('/[\s\-A-Za-z0-9]/', '', $postcode))) > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	/**
@@ -282,8 +290,7 @@ 
 
 		if ( $dataFieldType == 'datetime' ) {
 			$type = 'text';
-		}
-		else {
+		} else {
 			switch ( $frontend_verification ) {
 				case 'phone':
 					$type = 'tel';
@@ -305,10 +312,12 @@ 
 	 * @return array The different element send by request method
 	 */
 	public static function getMethode(){
-		if ($_SERVER["REQUEST_METHOD"] == "GET")
-			return $_GET;
-		if ($_SERVER["REQUEST_METHOD"] == "POST")
-			return $_POST;
+		if ($_SERVER["REQUEST_METHOD"] == "GET") {
+					return $_GET;
+		}
+		if ($_SERVER["REQUEST_METHOD"] == "POST") {
+					return $_POST;
+		}
 		die ('Invalid REQUEST_METHOD (not GET, not POST).');
 	}
 
@@ -332,18 +341,15 @@ 
 				{
 					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/","/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
 					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U","e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
-				}
-				elseif($type == 'noSpaces')
+				} elseif($type == 'noSpaces')
 				{
 					$pattern = array('/\s/');
 					$rep_pat = array('_');
 					$slugified = trim($slugified);
-				}
-				elseif($type == 'lowerCase')
+				} elseif($type == 'lowerCase')
 				{
 					$slugified = strtolower($slugified);
-				}
-				elseif($type == 'noPunctuation')
+				} elseif($type == 'noPunctuation')
 				{
 					$pattern = array("/#/", "/\{/", "/\[/", "/\(/", "/\)/", "/\]/", "/\}/", "/&/", "/~/", "/�/", "/`/", "/\^/", "/@/", "/=/", "/�/", "/�/", "/%/", "/�/", "/!/", "/�/", "/:/", "/\$/", "/;/", "/\./", "/,/", "/\?/", "/\\\/", "/\//");
 					$rep_pat = array("_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_");
@@ -368,9 +374,11 @@ 
 	 *	@return string $string The output string that was trunk if necessary
 	 */
 	public static function trunk($string, $maxlength) {
-		if(strlen($string)>$maxlength+3)
-			return substr($string,0,$maxlength).'...';
-		else return $string;
+		if(strlen($string)>$maxlength+3) {
+					return substr($string,0,$maxlength).'...';
+		} else {
+			return $string;
+		}
 	}
 
 	/**
@@ -392,8 +400,7 @@ 
 		ob_start();
 		if ( !empty($args) ) {
 			do_action($hook_name, $args);
-		}
-		else {
+		} else {
 			do_action($hook_name);
 		}
 		$content = ob_get_contents();
@@ -409,8 +416,9 @@ 
 	 */
 	public static function get_plugin_validation_code($plugin_name, $encrypt_base_attribute) {
 		$code = '';
-		if ( !function_exists( 'get_plugin_data') )
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		if ( !function_exists( 'get_plugin_data') ) {
+					require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		}
 		$plug = get_plugin_data( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php' );
 		$code_part = array();
 		$code_part[] = substr(hash ( "sha256" , $plugin_name ), WPSHOP_ADDONS_KEY_IS, 5);

includes/librairies/catalog/categories.class.php

Doc Comments +2 added lines, -6 removed lines

@@ -117,10 +117,7 @@ 
 	/**
 	*	Get the sub categories of a given category
 	*
-	*	@param integer $parent_category The main category we want to have the sub categories for
-	*	@param array $instance The current instance of the widget, allows to get the different selected parameters
-	*
-	* @return mixed $widget_content The widget content build from option
+	* @return string
 	*/
 	public static function category_tree_output($category_id = 0, $instance) {
 		global $category_has_sub_category;
@@ -285,7 +282,7 @@ 
 	*	@param object $category The category definition
 	*	@param string $output_type The output type defined from plugin option
 	*
-	*	@return mixed $content Output the category list
+	*	@return string $content Output the category list
 	*/
 	public static function category_mini_output($category, $output_type = 'list'){
 		$content = '';
@@ -420,7 +417,6 @@ 
 	 * @see wp_get_attachment_image_src
 	 * @param unknown_type $id
 	 * @param unknown_type $size
-	 * @param unknown_type $attr
 	 * @return (string or array)
 	 */
 	public static function get_the_category_thumbnail($id, $size = 'thumbnail', $icon = false) {

Indentation +54 added lines, -54 removed lines

@@ -24,11 +24,11 @@ 
 class wpshop_categories
 {
 	/**
-	* Retourne une liste de cat�gorie
-	* @param boolean $formated : formatage du r�sultat oui/non
-	* @param string $product_search : recherche demand�e
-	* @return mixed
-	**/
+	 * Retourne une liste de cat�gorie
+	 * @param boolean $formated : formatage du r�sultat oui/non
+	 * @param string $product_search : recherche demand�e
+	 * @return mixed
+	 **/
 	function product_list_cats($formated=false, $product_search=null) {
 		$where  = array('hide_empty' => false);
 		if(!empty($product_search))
@@ -54,8 +54,8 @@ 
 	}
 
 	/**
-	*	Call wordpress function that declare a new term type in order to define the product as wordpress term (taxonomy)
-	*/
+	 *	Call wordpress function that declare a new term type in order to define the product as wordpress term (taxonomy)
+	 */
 	public static function create_product_categories(){
 		$options = get_option('wpshop_catalog_categories_option', null);
 		$slug = array(
@@ -88,12 +88,12 @@ 
 	}
 
 	/**
-	*	Build a complete tree with the categories. Contains the complete tree for a given category and a children list for easy checking
-	*
-	*	@param integer $category_id The category identifier we want to get the tree element for
-	*
-	*	@return array $categories_list An array ordered by category with its children
-	*/
+	 *	Build a complete tree with the categories. Contains the complete tree for a given category and a children list for easy checking
+	 *
+	 *	@param integer $category_id The category identifier we want to get the tree element for
+	 *
+	 *	@return array $categories_list An array ordered by category with its children
+	 */
 	public static function category_tree($category_id = 0){
 		$categories_list = array();
 
@@ -115,13 +115,13 @@ 
 		return $categories_list;
 	}
 	/**
-	*	Get the sub categories of a given category
-	*
-	*	@param integer $parent_category The main category we want to have the sub categories for
-	*	@param array $instance The current instance of the widget, allows to get the different selected parameters
-	*
-	* @return mixed $widget_content The widget content build from option
-	*/
+	 *	Get the sub categories of a given category
+	 *
+	 *	@param integer $parent_category The main category we want to have the sub categories for
+	 *	@param array $instance The current instance of the widget, allows to get the different selected parameters
+	 *
+	 * @return mixed $widget_content The widget content build from option
+	 */
 	public static function category_tree_output($category_id = 0, $instance) {
 		global $category_has_sub_category;
 
@@ -148,8 +148,8 @@ 
 
 
 	/**
-	*	Add additionnal fields to the category edition form
-	*/
+	 *	Add additionnal fields to the category edition form
+	 */
 	public static function category_edit_fields(){
 		$category_id = wpshop_tools::varSanitizer($_REQUEST["tag_ID"]);
 		$category_meta_information = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
@@ -210,13 +210,13 @@ 
 	}
 
 	/**
-	*	Save the different extra fields added for the plugin
-	*
-	*	@param integer $category_id The category identifier we want to save extra fields for
-	*	@param mixed $tt_id
-	*
-	*	@return void
-	*/
+	 *	Save the different extra fields added for the plugin
+	 *
+	 *	@param integer $category_id The category identifier we want to save extra fields for
+	 *	@param mixed $tt_id
+	 *
+	 *	@return void
+	 */
 	public static function category_fields_saver($category_id, $tt_id){
 		global $wpdb;
 		$category_meta = array();
@@ -241,28 +241,28 @@ 
 	}
 
 	/**
-	*	Add extra column to categories listing interface
-	*
-	*	@param array $columns Actual columns to add extra columns to
-	*
-	*	@return array $columns The new array with additionnal colu
-	*/
+	 *	Add extra column to categories listing interface
+	 *
+	 *	@param array $columns Actual columns to add extra columns to
+	 *
+	 *	@return array $columns The new array with additionnal colu
+	 */
 	public static function category_manage_columns($columns){
-	    unset( $columns["cb"] );
+		unset( $columns["cb"] );
 
-	    $custom_array = array(
+		$custom_array = array(
 				'cb' => '<input type="checkbox" />',
 				'wpshop_category_thumbnail' => __('Thumbnail', 'wpshop')
-	    );
+		);
 
-	    $columns = array_merge( $custom_array, $columns );
+		$columns = array_merge( $custom_array, $columns );
 
-	    return $columns;
+		return $columns;
 	}
 
 	/**
-	*	Define the content of extra columns to add to categories listing interface
-	*/
+	 *	Define the content of extra columns to add to categories listing interface
+	 */
 	public static function category_manage_columns_content($string, $column_name, $category_id){
 		$category_meta_information = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
 		$category_thumbnail_preview = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
@@ -275,18 +275,18 @@ 
 		$name = $category->name;
 
 		$image = $category_thumbnail_preview;
-    	return $image;
+		return $image;
 	}
 
 
 	/**
-	*	Display a category in a list
-	*
-	*	@param object $category The category definition
-	*	@param string $output_type The output type defined from plugin option
-	*
-	*	@return mixed $content Output the category list
-	*/
+	 *	Display a category in a list
+	 *
+	 *	@param object $category The category definition
+	 *	@param string $output_type The output type defined from plugin option
+	 *
+	 *	@return mixed $content Output the category list
+	 */
 	public static function category_mini_output($category, $output_type = 'list'){
 		$content = '';
 		/*	Get the different informations for output	*/
@@ -347,10 +347,10 @@ 
 	}
 
 	/**
-	* Traduit le shortcode et affiche une cat�gorie
-	* @param array $atts : tableau de param�tre du shortcode
-	* @return mixed
-	**/
+	 * Traduit le shortcode et affiche une cat�gorie
+	 * @param array $atts : tableau de param�tre du shortcode
+	 * @return mixed
+	 **/
 	public static function wpshop_category_func($atts) {
 		global $wpdb;
 		$string = '';

Braces +19 added lines, -21 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * Products management method file
 *
@@ -31,8 +33,9 @@ 
 	**/
 	function product_list_cats($formated=false, $product_search=null) {
 		$where  = array('hide_empty' => false);
-		if(!empty($product_search))
-			$where = array_merge($where, array('name__like'=>$product_search));
+		if(!empty($product_search)) {
+					$where = array_merge($where, array('name__like'=>$product_search));
+		}
 
 		$data = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, $where);
 		$cats=array();
@@ -137,8 +140,7 @@ 
 					ob_end_clean();
 				}
 				$category_has_sub_category = true;
-			}
-			else{
+			} else{
 				$category_has_sub_category = false;
 			}
 		}
@@ -188,8 +190,7 @@ 
 									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_NAME'] =  __($product_attribute->frontend_label, 'wpshop');
 									if ( !empty($category_meta_information) && !empty($category_meta_information['wpshop_category_filterable_attributes']) && array_key_exists($product_attribute->attribute_id, $category_meta_information['wpshop_category_filterable_attributes']) ) {
 										$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_CHECKED'] = 'checked="checked"';
-									}
-									else {
+									} else {
 										$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_CHECKED'] = '';
 									}
 
@@ -201,8 +202,7 @@ 
 					}
 				}
 			}
-		 }
-		 else {
+		 } else {
 		 	$tpl_component['CATEGORY_TAG_ID'] = 1;
 		 }
 		 $output = wpshop_display::display_template_element('wpshop_category_edit_interface_admin', $tpl_component, array(), 'admin');
@@ -229,8 +229,7 @@ 
 
 		if ( !empty($_POST['filterable_attribute_for_category']) && is_array($_POST['filterable_attribute_for_category']) ) {
 			$category_option['wpshop_category_filterable_attributes'] = $_POST['filterable_attribute_for_category'];
-		}
-		else {
+		} else {
 			$category_option['wpshop_category_filterable_attributes'] = array();
 		}
 		update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id, $category_option);
@@ -336,8 +335,7 @@ 
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 			$content = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			//echo $template_part.'-'.$tpl_component.'<br>';
 			$content = wpshop_display::display_template_element($template_part, $tpl_component);
 		}
@@ -368,8 +366,7 @@ 
 					}
 				$string .= '
 					</div>';
-			}
-			else {
+			} else {
 				$sub_category_def = get_term($atts['cid'], WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 
 				if ( empty($atts['display']) || ($atts['display'] != 'only_products') ){
@@ -385,8 +382,7 @@ 
 					$string .= '</div>';
 				}
 			}
-		}
-		else {
+		} else {
 			$string .= __('No categories found for display', 'wpshop');
 		}
 
@@ -428,8 +424,9 @@ 
 		$array_option_category 	= get_option('wpshop_product_category_' . $id);
 		
 		/** If not attachment/post ID in the category, return "No thumbnail in the category" */
-		if(is_array($array_option_category) && empty($array_option_category['wpshop_category_picture']))
-			return __('No thumbnail in the category', 'wpshop');
+		if(is_array($array_option_category) && empty($array_option_category['wpshop_category_picture'])) {
+					return __('No thumbnail in the category', 'wpshop');
+		}
 		
 		/** Set attachment/post ID in $id_picture */
 		$id_picture = $array_option_category['wpshop_category_picture'];
@@ -440,8 +437,9 @@ 
 		 */
 		$post_thumbnail = wp_get_attachment_image_src($id_picture, $size, $icon);
 		
-		if(!$post_thumbnail)
-			return __('No thumbnail in this post', 'wpshop');
+		if(!$post_thumbnail) {
+					return __('No thumbnail in this post', 'wpshop');
+		}
 			
 		return $post_thumbnail;
 	}

Spacing +87 added lines, -87 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Products management method file
 *
@@ -10,8 +10,8 @@ 
 */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -29,51 +29,51 @@ 
 	* @param string $product_search : recherche demand�e
 	* @return mixed
 	**/
-	function product_list_cats($formated=false, $product_search=null) {
+	function product_list_cats($formated = false, $product_search = null) {
 		$where  = array('hide_empty' => false);
-		if(!empty($product_search))
+		if (!empty($product_search))
 			$where = array_merge($where, array('name__like'=>$product_search));
 
 		$data = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, $where);
-		$cats=array();
-		foreach($data as $d){
+		$cats = array();
+		foreach ($data as $d) {
 			$cats[$d->term_id] = $d->name;
 		}
 
 		// Si le formatage est demand�
-		if($formated) {
-			if(!empty($cats)):
-				$cats_string='';
-				foreach($cats as $key=>$value) {
-					$cats_string.= '
-					<li><input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_categories" value="'.$key.'" id="'.WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES.'-'.$key.'" name="cats[]" /><label for="'.WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES.'-'.$key.'" > '.$value.'</label></li>';
+		if ($formated) {
+			if (!empty($cats)):
+				$cats_string = '';
+				foreach ($cats as $key=>$value) {
+					$cats_string .= '
+					<li><input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_categories" value="'.$key . '" id="' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '-' . $key . '" name="cats[]" /><label for="' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '-' . $key . '" > ' . $value . '</label></li>';
 				}
 			endif;
 		}
-		return $formated?$cats_string:$cats;
+		return $formated ? $cats_string : $cats;
 	}
 
 	/**
 	*	Call wordpress function that declare a new term type in order to define the product as wordpress term (taxonomy)
 	*/
-	public static function create_product_categories(){
+	public static function create_product_categories() {
 		$options = get_option('wpshop_catalog_categories_option', null);
 		$slug = array(
 				'slug' => '',
 				'with_front' => true,
 				'hierarchical' => true,
 		);
-		( empty($options['wpshop_catalog_categories_slug']) || $options['wpshop_catalog_categories_slug'] == '/' ) ? $slug = false : $slug['slug'] = $options['wpshop_catalog_categories_slug'];
+		(empty($options['wpshop_catalog_categories_slug']) || $options['wpshop_catalog_categories_slug'] == '/') ? $slug = false : $slug['slug'] = $options['wpshop_catalog_categories_slug'];
 		register_taxonomy(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), array(
 			'labels' => array(
 				'name' => __('WPshop categories', 'wpshop'),
 				'singular_name' => __('WPshop category', 'wpshop'),
 				'add_new_item' => __('Add new wpshop category', 'wpshop'),
-				'add_new' => _x( 'Add new', 'admin menu: add new wpshop category', 'wpshop'),
+				'add_new' => _x('Add new', 'admin menu: add new wpshop category', 'wpshop'),
 				'add_new_item' => __('Add new wpshop category', 'wpshop'),
 				'edit_item' => __('Edit wpshop category', 'wpshop'),
 				'new_item' => __('New wpshop category', 'wpshop'),
-				'view_item' => __('View wpshop category', 'wpshop' ),
+				'view_item' => __('View wpshop category', 'wpshop'),
 				'search_items' => __('Search wpshop categories', 'wpshop'),
 				'not_found' =>  __('No wpshop categories found', 'wpshop'),
 				'not_found_in_trash' => __('No wpshop categories found in trash', 'wpshop'),
@@ -94,19 +94,19 @@ 
 	*
 	*	@return array $categories_list An array ordered by category with its children
 	*/
-	public static function category_tree($category_id = 0){
+	public static function category_tree($category_id = 0) {
 		$categories_list = array();
 
 		$categories = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, 'hide_empty=0&parent=' . $category_id);
-		if(count($categories) > 0){
-			foreach($categories as $category){
+		if (count($categories) > 0) {
+			foreach ($categories as $category) {
 				/*	If necessary un-comment this line in order to get the complete tree for the category	*/
 				// $categories_list[$category->term_id]['children_tree'] = self::category_tree($category->term_id);
 				$categories_list[$category->term_id]['children_category'] = get_term_children($category->term_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 
 				/*	Get the product list for the category	*/
 				$products = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES => $category->slug));
-				foreach($products as $product){
+				foreach ($products as $product) {
 					$categories_list[$category->term_id]['children_product'][] = $product->ID;
 				}
 			}
@@ -127,10 +127,10 @@ 
 
 		$widget_content = '';
 		$category_tree = wpshop_categories::category_tree($category_id);
-		if((!isset($instance['wpshop_widget_categories']) && !isset($instance['show_all_cat'])) || ($instance['show_all_cat'] == 'yes')){
+		if ((!isset($instance['wpshop_widget_categories']) && !isset($instance['show_all_cat'])) || ($instance['show_all_cat'] == 'yes')) {
 			$categories = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, 'hide_empty=0&parent=' . $category_id);
-			if(count($categories) > 0){
-				foreach($categories as $category){
+			if (count($categories) > 0) {
+				foreach ($categories as $category) {
 					ob_start();
 					require(wpshop_display::get_template_file('categories-widget.tpl.php'));
 					$widget_content .= ob_get_contents();
@@ -138,7 +138,7 @@ 
 				}
 				$category_has_sub_category = true;
 			}
-			else{
+			else {
 				$category_has_sub_category = false;
 			}
 		}
@@ -150,43 +150,43 @@ 
 	/**
 	*	Add additionnal fields to the category edition form
 	*/
-	public static function category_edit_fields(){
-		$category_id = (int) $_REQUEST["tag_ID"];
+	public static function category_edit_fields() {
+		$category_id = (int)$_REQUEST["tag_ID"];
 		$category_meta_information = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
 		$tpl_component = array();
-		$category_thumbnail_preview = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
+		$category_thumbnail_preview = '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview" />';
 		/*	Check if there is already a picture for the selected category	*/
 
-		if ( !empty($category_meta_information['wpshop_category_picture']) ) {
-			$image_post = wp_get_attachment_image( $category_meta_information['wpshop_category_picture'], 'thumbnail', false, array('class' => 'category_thumbnail_preview') );
-			$category_thumbnail_preview = ( !empty($image_post) ) ? $image_post : '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
+		if (!empty($category_meta_information['wpshop_category_picture'])) {
+			$image_post = wp_get_attachment_image($category_meta_information['wpshop_category_picture'], 'thumbnail', false, array('class' => 'category_thumbnail_preview'));
+			$category_thumbnail_preview = (!empty($image_post)) ? $image_post : '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview" />';
 		}
 
 
 		$tpl_component['CATEGORY_DELETE_PICTURE_BUTTON'] = '';
-		if( !empty($category_meta_information) && !empty($category_meta_information['wpshop_category_picture']) ) {
-			$tpl_component['CATEGORY_DELETE_PICTURE_BUTTON'] = '<a href="#" role="button" id="wps-delete-category-picture" class="wps-bton-second-mini-rounded">' .__( 'Delete the category picture', 'wpshop' ). '</a> ';
+		if (!empty($category_meta_information) && !empty($category_meta_information['wpshop_category_picture'])) {
+			$tpl_component['CATEGORY_DELETE_PICTURE_BUTTON'] = '<a href="#" role="button" id="wps-delete-category-picture" class="wps-bton-second-mini-rounded">' . __('Delete the category picture', 'wpshop') . '</a> ';
 		}
-		$tpl_component['CATEGORY_PICTURE_ID'] = ( ( !empty($category_meta_information['wpshop_category_picture']) ) ? $category_meta_information['wpshop_category_picture'] : '' );
+		$tpl_component['CATEGORY_PICTURE_ID'] = ((!empty($category_meta_information['wpshop_category_picture'])) ? $category_meta_information['wpshop_category_picture'] : '');
 
 		$tpl_component['CATEGORY_THUMBNAIL_PREVIEW'] = $category_thumbnail_preview;
-		if(isset($category_id)){
+		if (isset($category_id)) {
 			$tpl_component['CATEGORY_TAG_ID'] = $category_id;
 			$tpl_component['CATEGORY_FILTERABLE_ATTRIBUTES'] = '';
-			$wpshop_category_products = wpshop_categories::get_product_of_category( $category_id );
+			$wpshop_category_products = wpshop_categories::get_product_of_category($category_id);
 			$filterable_attributes_list = array();
-			foreach ( $wpshop_category_products as $wpshop_category_product ) {
+			foreach ($wpshop_category_products as $wpshop_category_product) {
 				$elementId = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-				if ( !empty($elementId) ) {
+				if (!empty($elementId)) {
 					$product_attributes = wpshop_attributes::get_attribute_list_for_item($elementId, $wpshop_category_product);
-					if ( !empty($product_attributes) ) {
-						foreach ( $product_attributes as $key => $product_attribute ) {
-							if ( !empty($product_attribute) && !empty($product_attribute->is_filterable) && strtolower(__($product_attribute->is_filterable, 'wpshop')) == strtolower(__('Yes', 'wpshop')) ) {
-								if  ( !array_key_exists($product_attribute->attribute_id, $filterable_attributes_list) ) {
+					if (!empty($product_attributes)) {
+						foreach ($product_attributes as $key => $product_attribute) {
+							if (!empty($product_attribute) && !empty($product_attribute->is_filterable) && strtolower(__($product_attribute->is_filterable, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
+								if (!array_key_exists($product_attribute->attribute_id, $filterable_attributes_list)) {
 									$filterable_attributes_list[$product_attribute->attribute_id] = $product_attribute;
-									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_ID'] =  $product_attribute->attribute_id;
-									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_NAME'] =  __($product_attribute->frontend_label, 'wpshop');
-									if ( !empty($category_meta_information) && !empty($category_meta_information['wpshop_category_filterable_attributes']) && array_key_exists($product_attribute->attribute_id, $category_meta_information['wpshop_category_filterable_attributes']) ) {
+									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_ID'] = $product_attribute->attribute_id;
+									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_NAME'] = __($product_attribute->frontend_label, 'wpshop');
+									if (!empty($category_meta_information) && !empty($category_meta_information['wpshop_category_filterable_attributes']) && array_key_exists($product_attribute->attribute_id, $category_meta_information['wpshop_category_filterable_attributes'])) {
 										$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_CHECKED'] = 'checked="checked"';
 									}
 									else {
@@ -217,20 +217,20 @@ 
 	*
 	*	@return void
 	*/
-	public static function category_fields_saver($category_id, $tt_id){
+	public static function category_fields_saver($category_id, $tt_id) {
 		global $wpdb;
 		$category_meta = array();
-		$category_option = get_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
+		$category_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
 
-		$wps_category_picture_id = !empty($_POST['wps_category_picture_id']) ? (int) $_POST['wps_category_picture_id'] : null;
-		$filterable_attribute_for_category = ( !empty($_POST['filterable_attribute_for_category']) && is_array($_POST['filterable_attribute_for_category']) ) ? (array) $_POST['filterable_attribute_for_category'] : null;
+		$wps_category_picture_id = !empty($_POST['wps_category_picture_id']) ? (int)$_POST['wps_category_picture_id'] : null;
+		$filterable_attribute_for_category = (!empty($_POST['filterable_attribute_for_category']) && is_array($_POST['filterable_attribute_for_category'])) ? (array)$_POST['filterable_attribute_for_category'] : null;
 
-		if ( isset( $wps_category_picture_id ) ) {
-			$attach_id = intval( $wps_category_picture_id );
+		if (isset($wps_category_picture_id)) {
+			$attach_id = intval($wps_category_picture_id);
 			$category_option['wpshop_category_picture'] = $attach_id;
 		}
 
-		if ( isset( $filterable_attribute_for_category ) ) {
+		if (isset($filterable_attribute_for_category)) {
 			$category_option['wpshop_category_filterable_attributes'] = $filterable_attribute_for_category;
 		}
 		else {
@@ -240,7 +240,7 @@ 
 
 		/** Update filter values **/
 		$wpshop_filter_search = new wps_filter_search();
-		$wpshop_filter_search->stock_values_for_attribute( array($category_id) );
+		$wpshop_filter_search->stock_values_for_attribute(array($category_id));
 	}
 
 	/**
@@ -250,15 +250,15 @@ 
 	*
 	*	@return array $columns The new array with additionnal colu
 	*/
-	public static function category_manage_columns($columns){
-	    unset( $columns["cb"] );
+	public static function category_manage_columns($columns) {
+	    unset($columns["cb"]);
 
 	    $custom_array = array(
 				'cb' => '<input type="checkbox" />',
 				'wpshop_category_thumbnail' => __('Thumbnail', 'wpshop')
 	    );
 
-	    $columns = array_merge( $custom_array, $columns );
+	    $columns = array_merge($custom_array, $columns);
 
 	    return $columns;
 	}
@@ -266,13 +266,13 @@ 
 	/**
 	*	Define the content of extra columns to add to categories listing interface
 	*/
-	public static function category_manage_columns_content($string, $column_name, $category_id){
+	public static function category_manage_columns_content($string, $column_name, $category_id) {
 		$category_meta_information = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
-		$category_thumbnail_preview = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
+		$category_thumbnail_preview = '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview" />';
 		/*	Check if there is already a picture for the selected category	*/
-		if ( !empty($category_meta_information['wpshop_category_picture']) ) {
-			$image_post = wp_get_attachment_image( $category_meta_information['wpshop_category_picture'], 'thumbnail', false, array('class' => 'category_thumbnail_preview') );
-			$category_thumbnail_preview = ( !empty($image_post) ) ? $image_post : '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
+		if (!empty($category_meta_information['wpshop_category_picture'])) {
+			$image_post = wp_get_attachment_image($category_meta_information['wpshop_category_picture'], 'thumbnail', false, array('class' => 'category_thumbnail_preview'));
+			$category_thumbnail_preview = (!empty($image_post)) ? $image_post : '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview" />';
 		}
 		$category = get_term_by('id', $category_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 		$name = $category->name;
@@ -290,21 +290,21 @@ 
 	*
 	*	@return mixed $content Output the category list
 	*/
-	public static function category_mini_output($category, $output_type = 'list'){
+	public static function category_mini_output($category, $output_type = 'list') {
 		$content = '';
 		/*	Get the different informations for output	*/
-		$category_meta_information = ( !empty($category) && !empty($category->term_id) ) ? get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category->term_id) : '';
-		$categoryThumbnail = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="wps-category-thumbnail" />';
+		$category_meta_information = (!empty($category) && !empty($category->term_id)) ? get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category->term_id) : '';
+		$categoryThumbnail = '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="wps-category-thumbnail" />';
 		/*	Check if there is already a picture for the selected category	*/
-		if ( !empty($category_meta_information['wpshop_category_picture']) ) {
-			$image_post = wp_get_attachment_image( $category_meta_information['wpshop_category_picture'], 'wps-categorie-display', false, array('class' => 'wps-category-thumbnail') );
-			$categoryThumbnail = ( !empty($image_post) ) ? $image_post : '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="wps-category-thumbnail" />';
+		if (!empty($category_meta_information['wpshop_category_picture'])) {
+			$image_post = wp_get_attachment_image($category_meta_information['wpshop_category_picture'], 'wps-categorie-display', false, array('class' => 'wps-category-thumbnail'));
+			$categoryThumbnail = (!empty($image_post)) ? $image_post : '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="wps-category-thumbnail" />';
 		}
 
 
-		$category_title = ( !empty($category) && !empty($category->name) ) ? $category->name : '';
-		$category_more_informations = ( !empty($category) && !empty($category->description) ) ? wp_trim_words( $category->description, 30, ' [...]' ) : '';
-		$category_link = ( !empty($category) && !empty($category->term_id) ) ?  get_term_link((int)$category->term_id , WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES) : '';
+		$category_title = (!empty($category) && !empty($category->name)) ? $category->name : '';
+		$category_more_informations = (!empty($category) && !empty($category->description)) ? wp_trim_words($category->description, 30, ' [...]') : '';
+		$category_link = (!empty($category) && !empty($category->term_id)) ? get_term_link((int)$category->term_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES) : '';
 
 		// $item_width = null;
 		// /*	Make some treatment in case we are in grid mode	*/
@@ -325,14 +325,14 @@ 
 		$tpl_component['CATEGORY_TITLE'] = $category_title;
 		$tpl_component['CATEGORY_DESCRIPTION'] = $category_more_informations;
 		//$tpl_component['ITEM_WIDTH'] = $item_width;
-		$tpl_component['CATEGORY_ID'] = ( !empty($category) && !empty($category->term_id) ) ? $category->term_id : '';
+		$tpl_component['CATEGORY_ID'] = (!empty($category) && !empty($category->term_id)) ? $category->term_id : '';
 		$tpl_component['CATEGORY_DISPLAY_TYPE'] = $output_type;
 
 		/*
 		 * Build template
 		 */
 		$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-		if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+		if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 			/*	Include the old way template part	*/
 
 			ob_start();
@@ -357,15 +357,15 @@ 
 	public static function wpshop_category_func($atts) {
 		global $wpdb;
 		$string = '';
-		if ( !empty($atts['cid']) ) {
-			$atts['type'] = (!empty($atts['type']) && in_array($atts['type'],array('grid','list'))) ? $atts['type'] : 'grid';
+		if (!empty($atts['cid'])) {
+			$atts['type'] = (!empty($atts['type']) && in_array($atts['type'], array('grid', 'list'))) ? $atts['type'] : 'grid';
 
 			$cat_list = explode(',', $atts['cid']);
 
-			if ( (count($cat_list) > 1) || ( !empty($atts['display']) && ($atts['display'] == 'only_cat') ) ) {
+			if ((count($cat_list) > 1) || (!empty($atts['display']) && ($atts['display'] == 'only_cat'))) {
 				$string .= '
 					<div class="wpshop_categories_' . $atts['type'] . '" >';
-					foreach( $cat_list as $cat_id ){
+					foreach ($cat_list as $cat_id) {
 						$sub_category_def = get_term($cat_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 						$string .= wpshop_categories::category_mini_output($sub_category_def, $atts['type']);
 					}
@@ -375,16 +375,16 @@ 
 			else {
 				$sub_category_def = get_term($atts['cid'], WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 
-				if ( empty($atts['display']) || ($atts['display'] != 'only_products') ){
+				if (empty($atts['display']) || ($atts['display'] != 'only_products')) {
 					$string .= wpshop_categories::category_mini_output($sub_category_def, $atts['type']);
 					$string .= '
 					<div class="category_product_' . $atts['type'] . '" >
-						<h2 class="category_content_part_title" >'.__('Category\'s product list', 'wpshop').'</h2>';
+						<h2 class="category_content_part_title" >'.__('Category\'s product list', 'wpshop') . '</h2>';
 				}
 
 				$string .= wpshop_products::wpshop_products_func($atts);
 
-				if ( empty($atts['display']) || ($atts['display'] != 'only_products') ){
+				if (empty($atts['display']) || ($atts['display'] != 'only_products')) {
 					$string .= '</div>';
 				}
 			}
@@ -396,14 +396,14 @@ 
 		return do_shortcode($string);
 	}
 
-	public static function get_product_of_category( $category_id ) {
+	public static function get_product_of_category($category_id) {
 		$product_id_list = array();
-		if ( !empty($category_id) ) {
+		if (!empty($category_id)) {
 			global $wpdb;
 			$query = $wpdb->prepare("SELECT T.* FROM " . $wpdb->term_relationships . " AS T INNER JOIN " . $wpdb->posts . " AS P ON ((P.ID = T.object_id) AND (P.post_status = %s)) WHERE T.term_taxonomy_id = %d ", 'publish', $category_id);
 			$relationships = $wpdb->get_results($query);
-			if ( !empty($relationships) ) {
-				foreach ( $relationships as $relationship ) {
+			if (!empty($relationships)) {
+				foreach ($relationships as $relationship) {
 					$product_id_list[] = $relationship->object_id;
 				}
 			}
@@ -428,10 +428,10 @@ 
 	 */
 	public static function get_the_category_thumbnail($id, $size = 'thumbnail', $icon = false) {
 		/** Get the attachment/post ID */
-		$array_option_category 	= get_option('wpshop_product_category_' . $id);
+		$array_option_category = get_option('wpshop_product_category_' . $id);
 		
 		/** If not attachment/post ID in the category, return "No thumbnail in the category" */
-		if(is_array($array_option_category) && empty($array_option_category['wpshop_category_picture']))
+		if (is_array($array_option_category) && empty($array_option_category['wpshop_category_picture']))
 			return __('No thumbnail in the category', 'wpshop');
 		
 		/** Set attachment/post ID in $id_picture */
@@ -443,7 +443,7 @@ 
 		 */
 		$post_thumbnail = wp_get_attachment_image_src($id_picture, $size, $icon);
 		
-		if(!$post_thumbnail)
+		if (!$post_thumbnail)
 			return __('No thumbnail in this post', 'wpshop');
 			
 		return $post_thumbnail;

includes/librairies/catalog/products.class.php

Doc Comments +10 added lines, -4 removed lines

@@ -773,6 +773,9 @@ 
 		return do_shortcode($string);
 	}
 
+	/**
+	 * @param integer $page_number
+	 */
 	public static function wpshop_get_product_by_criteria( $criteria = null, $cid=0, $pid=0, $display_type, $order='ASC', $page_number, $products_per_page=0, $nb_of_product_limit=0, $grid_element_nb_per_line=WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true ) {
 		global $wpdb;
 
@@ -1131,7 +1134,7 @@ 
 	/**
 	 * Add a product into the db. This function is used for the EDI
 	 * @param $name Name of the product
-	 * @param $description Description of the product
+	 * @param string $description Description of the product
 	 * @param $attrs List of the attributes and values of the product
 	 * @return boolean
 	*/
@@ -1450,10 +1453,10 @@ 
 	/**
 	*	Define output for product
 	*
-	*	@param mixed $initialContent The initial product content defined into wordpress basic admin interface
+	*	@param string $initialContent The initial product content defined into wordpress basic admin interface
 	*	@param integer $product_id The product identifier we want to get and output attribute for
 	*
-	*	@return mixed $content The content to add or to modify the product output in frontend
+	*	@return string $content The content to add or to modify the product output in frontend
 	*/
 	public static function product_complete_sheet_output($initialContent, $product_id) {
 		$content = $attributeContentOutput = '';
@@ -2508,7 +2511,7 @@ 
 
 	/**
 	 * Retrieve and display the variation for a given product
-	 * @param integer $product_id The product identifier to get variation for
+	 * @param integer $post_id The product identifier to get variation for
 	 */
 	public static function wpshop_variation( $post_id = '', $from_admin = false, $order_id = '', $qty = 1 ) {
 		global $wp_query;
@@ -3300,6 +3303,9 @@ 
 	}
 
 
+	/**
+	 * @param boolean $has_variation
+	 */
 	function wps_get_summary_variations_product( $product_id, $the_product, $has_variation ) {
 		global $wpdb, $wpshop_payment;
 		$output = '';

Indentation +37 added lines, -37 removed lines

@@ -23,8 +23,8 @@ 
  */
 class wpshop_products {
 	/**
-	*	Définition du code de la classe courante
-	*/
+	 *	Définition du code de la classe courante
+	 */
 	const currentPageCode = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
 	const current_page_variation_code = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION;
 
@@ -61,10 +61,10 @@ 
 
 
 	/**
-	*	Déclaration des produits et variations en tant que "post" de wordpress
-	*
-	*	@see register_post_type()
-	*/
+	 *	Déclaration des produits et variations en tant que "post" de wordpress
+	 *
+	 *	@see register_post_type()
+	 */
 	public static function create_wpshop_products_type() {
 
 		$options = get_option('wpshop_catalog_product_option', array());
@@ -176,8 +176,8 @@ 
 	}
 
 	/**
-	*	Create the different bow for the product management page looking for the attribute set to create the different boxes
-	*/
+	 *	Create the different bow for the product management page looking for the attribute set to create the different boxes
+	 */
 	public static function add_meta_boxes() {
 		global $post, $currentTabContent;
 
@@ -607,21 +607,21 @@ 
 	}
 
 	/**
-	* Display a list of product from a shortcode
-	*
-	* @param array $atts {
-	*	limit : The number of element to display
-	*	order : The information to order list by
-	*	sorting : List order (ASC | DESC)
-	*	display : Display size (normal | mini)
-	*	type : Display tyep (grid | list) only work with display=normal
-	*	pagination : The number of element per page
-	* display_pagination : Display the pagination or not
-	* }
-	*
-	* @return string
-	*
-	**/
+	 * Display a list of product from a shortcode
+	 *
+	 * @param array $atts {
+	 *	limit : The number of element to display
+	 *	order : The information to order list by
+	 *	sorting : List order (ASC | DESC)
+	 *	display : Display size (normal | mini)
+	 *	type : Display tyep (grid | list) only work with display=normal
+	 *	pagination : The number of element per page
+	 * display_pagination : Display the pagination or not
+	 * }
+	 *
+	 * @return string
+	 *
+	 **/
 	public static function wpshop_products_func($atts) {
 		global $wpdb, $wp_query;
 
@@ -1134,7 +1134,7 @@ 
 	 * @param $description Description of the product
 	 * @param $attrs List of the attributes and values of the product
 	 * @return boolean
-	*/
+	 */
 	function addProduct($name, $description, $attrs=array()) {
 		$new_product = wpshop_entities::create_new_entity(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $name, $description, $attrs);
 		return $new_product[0];
@@ -1448,13 +1448,13 @@ 
 
 
 	/**
-	*	Define output for product
-	*
-	*	@param mixed $initialContent The initial product content defined into wordpress basic admin interface
-	*	@param integer $product_id The product identifier we want to get and output attribute for
-	*
-	*	@return mixed $content The content to add or to modify the product output in frontend
-	*/
+	 *	Define output for product
+	 *
+	 *	@param mixed $initialContent The initial product content defined into wordpress basic admin interface
+	 *	@param integer $product_id The product identifier we want to get and output attribute for
+	 *
+	 *	@return mixed $content The content to add or to modify the product output in frontend
+	 */
 	public static function product_complete_sheet_output($initialContent, $product_id) {
 		$content = $attributeContentOutput = '';
 		$wps_product_ctr = new wps_product_ctr();
@@ -1754,12 +1754,12 @@ 
 
 
 	/**
-	*	Get the products (post) of a given category
-	*
-	*	@param string $category_slug The category slug we want to get the product list for
-	*
-	*	@return mixed $widget_content The output for the product list
-	*/
+	 *	Get the products (post) of a given category
+	 *
+	 *	@param string $category_slug The category slug we want to get the product list for
+	 *
+	 *	@return mixed $widget_content The output for the product list
+	 */
 	public static function get_product_of_category($category_slug, $category_id){
 		global $top_categories;
 		$widget_content = '';

Braces +89 added lines, -131 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * Products management method file
 *
@@ -200,8 +202,7 @@ 
 			if(((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))){
 				if((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))){
 					$post_attribute_set_id = $attributeEntitySetList[0]->id;
-				}
-				elseif(($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)){
+				} elseif(($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)){
 					$post_attribute_set_id = $attribute_set_id->value;
 				}
 
@@ -213,8 +214,9 @@ 
 					foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
 						if(!empty($currentTabContent['box'][$boxIdentifier.'_backend_display_type']) &&( $currentTabContent['box'][$boxIdentifier.'_backend_display_type'] == 'movable-tab')){
 							add_meta_box('wpshop_product_' . $boxIdentifier, __($boxTitle, 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default', array('boxIdentifier' => $boxIdentifier));
+						} else {
+							$fixed_box_exist = true;
 						}
-						else $fixed_box_exist = true;
 					}
 				}
 				if ( $fixed_box_exist ) {
@@ -228,8 +230,7 @@ 
 
 				/**	Product option	*/
 				add_meta_box('wpshop_product_options', __('Options', 'wpshop'), array('wpshop_products', 'product_options_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'side', 'default');
-			}
-			else if ( count($attributeEntitySetList) > 1 ) {
+			} else if ( count($attributeEntitySetList) > 1 ) {
 				$input_def['id'] = 'product_attribute_set_id';
 				$input_def['name'] = 'product_attribute_set_id';
 				$input_def['value'] = '';
@@ -477,8 +478,9 @@ 
 			$tpl_component = array();
 			$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] = '';
 			for ( $i=1; $i<=$column_count; $i++ ) {
-				if (!empty($sub_content[$i]))
-					$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
+				if (!empty($sub_content[$i])) {
+									$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
+				}
 			}
 			$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT_CLASS'] = empty($product_attribute_frontend_display_config) ? ' class="wpshopHide" ' : '';
 			$tpl_component['ADMIN_PRODUCT_ATTRIBUTE_FRONTEND_DISPLAY_MAIN_CHOICE_CHECK'] = empty($product_attribute_frontend_display_config) ? ' checked="checked"' : '';
@@ -501,7 +503,9 @@ 
 
 		$query = $wpdb->prepare("SELECT code, frontend_label FROM ".WPSHOP_DBT_ATTRIBUTE." WHERE is_used_for_sort_by = %s",  'yes');
 		$results = $wpdb->get_results($query, ARRAY_A);
-		if(!empty($results))$data = array_merge($data, $results);
+		if(!empty($results)) {
+			$data = array_merge($data, $results);
+		}
 
 		return $data;
 	}
@@ -516,12 +520,7 @@ 
 		if(!empty($data)) {
 			if ($data['data_type_to_use'] == 'custom' ) {
 				// Find which table to take
-				if($data['data_type']=='datetime') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME; }
-				elseif($data['data_type']=='decimal') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL; }
-				elseif($data['data_type']=='integer') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER; }
-				elseif($data['data_type']=='options') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS; }
-				elseif($data['data_type']=='text') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT; }
-				elseif($data['data_type']=='varchar') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR; }
+				if($data['data_type']=='datetime') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME; } elseif($data['data_type']=='decimal') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL; } elseif($data['data_type']=='integer') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER; } elseif($data['data_type']=='options') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS; } elseif($data['data_type']=='text') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT; } elseif($data['data_type']=='varchar') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR; }
 
 				if(isset($table_name)) {
 					// If the value is an id of a select, radio or checkbox
@@ -535,8 +534,7 @@ 
 							WHERE ATT.code=%s AND ( ATT_OPT.value=%s OR ATT_OPT.value=%s )", $attr_name, strtolower( __( $attr_value, 'wpshop' ) ), $attr_value
 						);
 						$data = $wpdb->get_results($query);
-					}
-					else {
+					} else {
 
 						$query = $wpdb->prepare("
 							SELECT ".$table_name.".entity_id FROM ".$table_name."
@@ -548,10 +546,10 @@ 
 						$data = $wpdb->get_results($query);
 
 					}
+				} else {
+					return __('Incorrect shortcode','wpshop');
 				}
-				else return __('Incorrect shortcode','wpshop');
-			}
-			elseif( $data['data_type_to_use'] == 'internal' )  {
+			} elseif( $data['data_type_to_use'] == 'internal' )  {
 				/** Check the ID of manufacturer **/
 				$default_value = unserialize( $data['default_value'] );
 				if( !empty($default_value) && !empty($default_value['default_value']) ) {
@@ -562,9 +560,13 @@ 
 						$data = $wpdb->get_results( $query );
 					}
 				}
-			}else return __('Incorrect shortcode','wpshop');
+			} else {
+				return __('Incorrect shortcode','wpshop');
+			}
 
-		} else return __('Incorrect shortcode','wpshop');
+		} else {
+			return __('Incorrect shortcode','wpshop');
+		}
 
 		if(!empty($data)) {
 			foreach($data as $p) {
@@ -591,7 +593,9 @@ 
 		global $wp_query;
 
 		$atts['product_type'] = 'related';
-		if(empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
+		if(empty($atts['pid'])) {
+			$atts['pid'] = $wp_query->posts[0]->ID;
+		}
 
 		$related_product_output = self::wpshop_products_func($atts);
 
@@ -651,9 +655,12 @@ 
 			// Foreach on the found products
 			if ( !empty($products) ) {
 				$pid = implode(',',$products);
-				if(empty($pid))$output_results = false;
+				if(empty($pid)) {
+					$output_results = false;
+				}
+			} else {
+				$output_results = false;
 			}
-			else $output_results = false;
 		}
 
 		/** Get related products	*/
@@ -712,8 +719,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$sorting = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				/*
 				 * Display hidden field every times
 				 */
@@ -745,8 +751,7 @@ 
 					$tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ?' active' : null;
 					$tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ?' active' : null;
 					$sorting = wpshop_display::display_template_element($template_part, $tpl_component);
-				}
-				else if ( !empty($atts['sorting']) && ($atts['sorting'] == 'no') ) {
+				} else if ( !empty($atts['sorting']) && ($atts['sorting'] == 'no') ) {
 					$sub_template_part = 'product_listing_sorting_criteria_hidden';
 					$sub_tpl_component = array();
 					$sub_tpl_component['CRITERIA_DEFAULT'] = !empty($sorting_criteria[0]['code']) ? $sorting_criteria[0]['code'] : 'title';
@@ -761,12 +766,10 @@ 
 
 			if ( !empty( $atts) && !empty($atts['container']) && $atts['container'] == 'no') {
 				$string = $sorting.'<div class="wps-catalog-container wps-bloc-loader">'.$string.'</div>';
-			}
-			else {
+			} else {
 				$string = '<div class="wpshop_products_block">'.$sorting.'<div class="wps-catalog-container wps-bloc-loader">'.$string.'</div></div>';
 			}
-		}
-		else if ( empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no') ) {
+		} else if ( empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no') ) {
 			$string = __('There is nothing to output here', 'wpshop');
 		}
 
@@ -831,24 +834,21 @@ 
 				default:
 					if(!empty($pid)) {
 						$post_meta = get_post_meta($pid, '_'.$criteria, true);
-					}
-					else{
+					} else{
 						$check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_'.$criteria);
 						$post_meta = $wpdb->get_var($check_meta);
 					}
 					if(!empty($post_meta)){
 						if ( in_array( $criteria, array( 'wpshop_displayed_price', 'product_price' ) ) ) {
 							$query['orderby'] = 'meta_value_num';
-						}
-						else {
+						} else {
 							$query['orderby'] = 'meta_value';
 						}
 						$query['meta_key'] = '_'.$criteria;
 					}
 					break;
 			}
-		}
-		else {
+		} else {
 			$query['orderby'] = 'menu_order ID';
 		}
 		$post_per_page = $query['posts_per_page'];
@@ -860,8 +860,7 @@ 
 				for( $i = 0; $i < $query['posts_per_page']; $i++ ) {
 					$tmp_array[] = $query['post__in'][$i];
 				}
-			}
-			else {
+			} else {
 				$begin_number = ( ($page_number - 1) * $query['posts_per_page'] ) ;
 				for( $i = $begin_number ; $i < $query['posts_per_page'] + $begin_number ; $i++ ) {
 					if ( !empty($query['post__in'][$i]) ) {
@@ -1091,8 +1090,7 @@ 
 						$product_meta['attribute_visible_listing'][$attribute->attribute_code] = $value;
 					}
 				}
-			}
-			else {
+			} else {
 
 			}
 
@@ -1194,8 +1192,7 @@ 
 					$query = "SELECT MAX(ID) AS PDCT_ID FROM {$wpdb->posts}";
 					$last_ref = $wpdb->get_var($query);
 					$data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
-				}
-				else {
+				} else {
 					/* Check if the product reference existing in the database */
 					$ref = $data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'];
 					$query = $wpdb->prepare(
@@ -1250,8 +1247,7 @@ 
 
 			if ( !empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']) && empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']['default_config']) ) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, $data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']);
-			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			} else if ( $data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF);
 			}
 
@@ -1325,23 +1321,20 @@ 
 			/*	Update the related products list*/
 			if ( !empty($data_to_save['related_products_list']) ) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS, $data_to_save['related_products_list']);
-			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			} else if ( $data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS);
 			}
 			/*	Update the provider list*/
 			if ( !empty($data_to_save['provider_list']) ) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER, $data_to_save['provider_list']);
-			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			} else if ( $data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER);
 			}
 
 			/*	Update product options	*/
 			if ( !empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']) ) {
 				update_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', $data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']);
-			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			} else if ( $data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
 			}
 
@@ -1372,8 +1365,7 @@ 
 				foreach( $variations as $variation_id => $variation_data ) {
 					if( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) == 1 ) {
 						return 'single';
-					}
-					elseif( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1 ) {
+					} elseif( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1 ) {
 						$variation_type = 'combined';
 					}
 				}
@@ -1529,8 +1521,7 @@ 
 		$display_price_state_when_price_is_empty = true;
 		if ( empty( $productPrice ) && ( !empty( $catalog_options ) || ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) ) ) {
 			$display_price_state_when_price_is_empty = false;
-		}
-		else if ( !empty( $productPrice ) ) {
+		} else if ( !empty( $productPrice ) ) {
 			$display_price_state_when_price_is_empty = true;
 		}
 		$add_to_cart_button = ( true === $add_to_cart_button_display_state)  && ( true === $display_price_state_when_price_is_empty ) ? self::display_add_to_cart_button( $product_id, $productStock, 'complete' ) : '';
@@ -1590,8 +1581,7 @@ 
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 			$content = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			$content = wpshop_display::display_template_element($template_part, $tpl_component);
 		}
 		unset($tpl_component);
@@ -1625,8 +1615,7 @@ 
 				$product_more_informations = $post_content[0];
 			}
 
-		}
-		else {
+		} else {
 			$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
 			$product_title = '<i>'.__('This product does not exist', 'wpshop').'</i>';
 			$product_link = '';
@@ -1655,8 +1644,7 @@ 
 	 			$tpl_component_price['MESSAGE_SAVE_MONEY'] = $product_price_infos['MESSAGE_SAVE_MONEY'];
 	 			$tpl_component_price['TAX_PILOTING'] = (!empty($price_ploting) && $price_ploting == 'HT' ) ? __('ET', 'wpshop') : ''; $product_price_infos['MESSAGE_SAVE_MONEY'];
 	 			$productPrice = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component_price );
-	 		}
-			else {
+	 		} else {
 				$productPrice = wpshop_prices::get_product_price($product, 'price_display', array('mini_output', $output_type) );
 	 		}
 		}
@@ -1671,8 +1659,7 @@ 
 		$display_price_state_when_price_is_empty = false;
 		if ( empty( $productPrice ) && ( !empty( $catalog_options ) || ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) ) ) {
 			$display_price_state_when_price_is_empty = false;
-		}
-		else if ( !empty( $productPrice ) ) {
+		} else if ( !empty( $productPrice ) ) {
 			$display_price_state_when_price_is_empty = true;
 		}
 		$add_to_cart_button = ( true === $add_to_cart_button_display_state)  && ( true === $display_price_state_when_price_is_empty ) ? self::display_add_to_cart_button( $product_id, $productStock, 'mini' ) : '';
@@ -1739,8 +1726,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$content = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$content = wpshop_display::display_template_element($template_part, $tpl_component);
 			}
 			unset($tpl_component);
@@ -1862,8 +1848,7 @@ 
 					$option_value = $wpdb->get_var($query);
 					$parent_post = $parent_product['parent_post'];
 					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $parent_post->post_title. ' <br/>('. $option_name . ' : ' . $option_value. ')');
-				}
-				else {
+				} else {
 					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
 				}
 
@@ -1958,8 +1943,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$product_special_state['output'] = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$product_special_state['output'] = wpshop_display::display_template_element($template_part, $tpl_component);
 			}
 			unset($tpl_component);
@@ -1995,8 +1979,7 @@ 
 		/** Si aucun prix trouvé on stop la méthode / If not found price, stop the method */
 		if( empty( $prices_attribute ) ) {
 			return false;
-		}
-		else {
+		} else {
 			/**
 			 * Récupère le prix de base selon le pilotage de prix de la boutique / Get
 			 * the base amount according on the shop price control
@@ -2024,8 +2007,7 @@ 
 			if ( WPSHOP_PRODUCT_PRICE_PILOT == 'HT' ) {
 				$price_with_vat = ($base_price * $divider_price_ttc );
 				$price_no_vat 	= $base_price;
-			}
-			else if ( WPSHOP_PRODUCT_PRICE_PILOT == 'TTC' ) {
+			} else if ( WPSHOP_PRODUCT_PRICE_PILOT == 'TTC' ) {
 				$price_with_vat = $base_price;
 				$price_no_vat	= ($price_with_vat / $divider_price_ttc );
 			}
@@ -2118,8 +2100,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$button = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$button = wpshop_display::display_template_element($template_part, $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $product_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . 'output_type' => $output_type));
 			}
 			unset($tpl_component);
@@ -2161,8 +2142,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$quotation_button = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$quotation_button = wpshop_display::display_template_element($template_part, $tpl_component);
 			}
 			unset($tpl_component);
@@ -2213,8 +2193,7 @@ 
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 			$galery_output = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			$galery_output = wpshop_display::display_template_element($template_part, $tpl_component);
 		}
 		unset($tpl_component);
@@ -2363,8 +2342,7 @@ 
 					if ( !empty($content->$attribute_value) ) {
 						if ( !empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes']) ) {
 							$variations_output[$post_def->ID]['variation_def'][$content->code] = $content->$attribute_value;
-						}
-						else {
+						} else {
 							$variations_output[$post_def->ID]['variation_dif'][$content->code] = $content->$attribute_value;
 						}
 					}
@@ -2404,8 +2382,7 @@ 
 				$tpl_component['VARIATION_DETAIL_PRICE'] = number_format( $p, 2, '.', '').' '.$productCurrency.' '.( ( !empty($price_piloting) && $price_piloting == 'HT' ) ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' ) );
 				if ( !empty($price_piloting) && $price_piloting == 'HT' ) {
 
-				}
-				else {
+				} else {
 
 				}
 				$post_obj = $variation['post'];
@@ -2417,17 +2394,14 @@ 
 					if ( !empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
 						if( !empty($price_piloting) && $price_piloting == 'HT' ) {
 							$product_price = ( ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0 ) + $parent_product_infos['parent_post_meta']['price_ht'];
-						}
-						else {
+						} else {
 							$product_price = ( ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0 ) + $parent_product_infos['parent_post_meta']['product_price'];
 						}
 						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Variation price combined with the parent product price', 'wpshop');
-					}
-					else {
+					} else {
 						if( !empty($price_piloting) && $price_piloting == 'HT' ) {
 							$product_price = ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0;
-						}
-						else {
+						} else {
 							$product_price = ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0;
 						}
 						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Only variation\'s price is used', 'wpshop');
@@ -2498,8 +2472,7 @@ 
 			$output .= wpshop_display::display_template_element('wpshop_admin_existing_variation_list', array('ADMIN_EXISTING_VARIATIONS_CONTAINER_CLASS' => '', 'ADMIN_EXISTING_VARIATIONS_CONTAINER' => $existing_variation_list), array(), 'admin');
 			/*	Reset de la liste des résultats pour éviter les comportements indésirables	*/
 			wp_reset_query();
-		}
-		else {
+		} else {
 			$output = __('No variation found for this product. Please use button above for create one', 'wpshop');
 		}
 
@@ -2525,8 +2498,9 @@ 
 			if (!empty($product_attribute_order_detail) ) {
 				foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
 					foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-						if ( !empty($attribute_def->code) )
-							$output_order[$attribute_def->code] = $position;
+						if ( !empty($attribute_def->code) ) {
+													$output_order[$attribute_def->code] = $position;
+						}
 					}
 				}
 			}
@@ -2564,8 +2538,7 @@ 
 							if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
 								$tpl_component['VARIATION_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', 'custom'));
 								$position = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'position', 'custom');
-							}
-							else if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
+							} else if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
 								$post_def = get_post($attribute_value);
 								$tpl_component['VARIATION_VALUE'] = stripslashes($post_def->post_title);
 								$position = $post_def->menu_order;
@@ -2899,8 +2872,7 @@ 
 				//Get Summary cart
 				$response['product_output'] = $wpshop_products->wps_get_summary_variations_product( $product_id, $the_product, ( !empty( $wpshop_variation_selected ) || !empty( $wpshop_free_variation ) ? true : false )  );
 				$response_status = true;
-			}
-			else {
+			} else {
 				//Product without variations
 				$product_data = wpshop_products::get_product_data($product_id);
 				$response['product_price_output'] = wpshop_prices::get_product_price($product_data, 'price_display', 'complete_sheet');
@@ -2971,8 +2943,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				// Get combined variations
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_key = '_wpshop_variations_attribute_def' AND P_META.meta_value = '" . serialize($query_variation) . "'", $product_id);
 				$combined_variation_id = $wpdb->get_var($query);
@@ -2995,12 +2966,10 @@ 
 						}
 					}
 					$product_to_add_to_cart['display_lower_price'] = true;
-				}
-				else {
+				} else {
 					$product_to_add_to_cart[$product_id]['variations'] = array();
 				}
-			}
-			else {
+			} else {
 				$product_to_add_to_cart['text_from'] = '';
 				$product_to_add_to_cart[$product_id]['variations'] = ( !empty($product_variation_type) && $product_variation_type == 'single' ) ? $single_variations : $combined_variations;
 			}
@@ -3051,11 +3020,9 @@ 
 
 						if( !empty($discount_config['type']) && $discount_config['type'] == 'discount_amount' ) {
 							$product_into_cart['discount_amount'] = $discount_amount + $product_into_cart['discount_amount'];
-						}
-						elseif( !empty($discount_config['type']) && $discount_config['type'] == 'discount_rate' ) {
+						} elseif( !empty($discount_config['type']) && $discount_config['type'] == 'discount_rate' ) {
 							$product_into_cart['discount_rate'] = $discount_rate + $discount_config['value'];
-						}
-						elseif( !empty($discount_config['type']) && $discount_config['type'] == 'special_price' ) {
+						} elseif( !empty($discount_config['type']) && $discount_config['type'] == 'special_price' ) {
 							$product_into_cart['special_price'] = $special_price + $discount_config['value'];
 						}
 					}
@@ -3076,14 +3043,12 @@ 
 					$product_into_cart['product_price'] = $variations_discount_total_price['price_ati'];
 					$product_into_cart['price_ht'] = $variations_discount_total_price['price_et'];
 					$product_into_cart['tva'] = $variations_discount_total_price['vat_amount'];
-				}
-				else {
+				} else {
 					$product_into_cart['product_price'] = $variations_total_price['price_ati'];
 					$product_into_cart['price_ht'] = $variations_total_price['price_et'];
 					$product_into_cart['tva'] = $variations_total_price['vat_amount'];
 				}
-			}
-			else {
+			} else {
 				// Add variations price to product price
 				if( !empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati']) ) {
 					$product_into_cart['price_ttc_before_discount'] = ( $product_into_cart['product_price'] + $variations_total_price['price_ati'] );
@@ -3092,8 +3057,7 @@ 
 					$product_into_cart['product_price'] += $variations_discount_total_price['price_ati'];
 					$product_into_cart['price_ht'] += $variations_discount_total_price['price_et'];
 					$product_into_cart['tva'] += $variations_discount_total_price['vat_amount'];
-				}
-				else {
+				} else {
 					$product_into_cart['product_price'] += $variations_total_price['price_ati'];
 					$product_into_cart['price_ht'] += $variations_total_price['price_et'];
 					$product_into_cart['tva'] += $variations_total_price['vat_amount'];
@@ -3107,17 +3071,14 @@ 
 
 					if( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_amount' ) {
 						$product_into_cart['discount_amount'] = $discount_amount +  $parent_discount_config['value'];
-					}
-					elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate' ) {
+					} elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate' ) {
 						$product_into_cart['discount_rate'] = $discount_rate + $parent_discount_config['value'];
-					}
-					elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price' ) {
+					} elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price' ) {
 						$product_into_cart['special_price'] = $special_price + $parent_discount_config['value'];
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// If product have just Free variations
 			$discount_config = wpshop_prices::check_discount_for_product( $head_product_id );
 			if( !empty($discount_config) ) {
@@ -3161,8 +3122,7 @@ 
 					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
 						$variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = $display_data;
 					}
-				}
-				else {
+				} else {
 					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
 					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
 						$variation_attribute_ordered['attribute_list'][] = $display_data;
@@ -3202,8 +3162,7 @@ 
 					$variation_definition = explode('-_variation_val_-', $build_variation);
 					$attribute_code = $variation_definition[0];
 					$attribute_selected_value = $variation_definition[1];
-				}
-				else {
+				} else {
 					$attribute_code = $build_variation_key;
 					$attribute_selected_value = $build_variation;
 				}
@@ -3291,8 +3250,7 @@ 
 				$output .= '<li>' .sprintf( __( 'Ordered by %s %s (%s) on %s (Order ref. : %s)', 'wpshop'), $sales_information['customer_name'], $sales_information['customer_firstname'], $sales_information['customer_email'], $sales_information['order_date'], $sales_information['order_key'] ). '</li>';
 			}
 			$output .= '</ul>';
-		}
-		else {
+		} else {
 			$output .= __( 'This product has never been ordered', 'wpshop');
 		}
 
@@ -3310,8 +3268,9 @@ 
 		if ( count($product_attribute_order_detail) > 0 ) {
 			foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
 				foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-					if ( !empty($attribute_def->code) )
-						$output_order[$attribute_def->code] = $position;
+					if ( !empty($attribute_def->code) ) {
+											$output_order[$attribute_def->code] = $position;
+					}
 				}
 			}
 		}
@@ -3331,8 +3290,7 @@ 
 				if ( !empty($wpshop_current_for_display) && in_array($product_definition_key, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ) {
 					$tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
 				}
-			}
-			else {
+			} else {
 				$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $product_definition_value, $output_order, 'selection_summary' );
 			}
 		}

Spacing +802 added lines, -802 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Products management method file
 *
@@ -10,8 +10,8 @@ 
 */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -37,25 +37,25 @@ 
 		die();
 	}
 
-	function products_list_js () {
+	function products_list_js() {
 		global $wpdb;
 		/** Create a JS Array of products **/
 // 		$query = $wpdb->prepare('SELECT ID, post_title FROM ' .$wpdb->posts. '  WHERE post_type = %s AND post_status = %s', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
 // 		$products_post = $wpdb->get_results( $query );
 
-		$products_post = get_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'post_status' => 'publish', 'posts_per_page' => -1 ) );
+		$products_post = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'post_status' => 'publish', 'posts_per_page' => -1));
 
-		if ( !empty( $products_post ) ) {
-			$products_js_array  = 'var products = [';
-			foreach ( $products_post as $product ) {
-				$barcode = get_post_meta( $product->ID, '_barcode', true);
-				$products_js_array .= '{label:"#' .$product->ID. ' ' .str_replace('"', '', $product->post_title). ' - ' .( (!empty($barcode) ) ? $barcode : '' ). '", ';
-				$products_js_array .= 'value:"' .$product->ID. '", ';
-				$products_js_array .= ( !empty($barcode) ) ? 'desc:"' .$barcode. '"},' : '},';
+		if (!empty($products_post)) {
+			$products_js_array = 'var products = [';
+			foreach ($products_post as $product) {
+				$barcode = get_post_meta($product->ID, '_barcode', true);
+				$products_js_array .= '{label:"#' . $product->ID . ' ' . str_replace('"', '', $product->post_title) . ' - ' . ((!empty($barcode)) ? $barcode : '') . '", ';
+				$products_js_array .= 'value:"' . $product->ID . '", ';
+				$products_js_array .= (!empty($barcode)) ? 'desc:"' . $barcode . '"},' : '},';
 			}
 			$products_js_array .= '];';
 		}
-		$output = wpshop_display::display_template_element('wps_orders_products_list_js', array('PRODUCTS_JS_ARRAY' => $products_js_array) , array(), 'admin');
+		$output = wpshop_display::display_template_element('wps_orders_products_list_js', array('PRODUCTS_JS_ARRAY' => $products_js_array), array(), 'admin');
 		return $output;
 	}
 
@@ -77,11 +77,11 @@ 
 				'with_front'		=> false,
 		);
 
-		if ( empty( $options['wpshop_catalog_product_slug'] ) || $options['wpshop_catalog_product_slug'] == '/' ) {
+		if (empty($options['wpshop_catalog_product_slug']) || $options['wpshop_catalog_product_slug'] == '/') {
 			$slug = false;
 		} else {
 			$slug['slug'] = $options['wpshop_catalog_product_slug'];
-			if( !empty( $options['wpshop_catalog_product_slug_with_category'] ) ) {
+			if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
 				$slug['slug'] .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%';
 			}
 		}
@@ -90,17 +90,17 @@ 
 		/*	Définition des produits 	*/
 		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, array(
 			'labels' => array(
-				'name'					=> __( 'Products', 'wpshop' ),
-				'singular_name' 		=> __( 'Catalog', 'wpshop' ),
-				'add_new_item' 			=> __( 'Add new product', 'wpshop' ),
-				'add_new' 				=> __( 'Add new product', 'wpshop' ),
-				'add_new_item' 			=> __( 'Add new product', 'wpshop' ),
-				'edit_item' 			=> __( 'Edit product', 'wpshop' ),
-				'new_item' 				=> __( 'New product', 'wpshop' ),
-				'view_item' 			=> __( 'View product', 'wpshop' ),
-				'search_items' 			=> __( 'Search products', 'wpshop' ),
-				'not_found' 			=> __( 'No products found', 'wpshop' ),
-				'not_found_in_trash' 	=> __( 'No products found in Trash', 'wpshop' ),
+				'name'					=> __('Products', 'wpshop'),
+				'singular_name' 		=> __('Catalog', 'wpshop'),
+				'add_new_item' 			=> __('Add new product', 'wpshop'),
+				'add_new' 				=> __('Add new product', 'wpshop'),
+				'add_new_item' 			=> __('Add new product', 'wpshop'),
+				'edit_item' 			=> __('Edit product', 'wpshop'),
+				'new_item' 				=> __('New product', 'wpshop'),
+				'view_item' 			=> __('View product', 'wpshop'),
+				'search_items' 			=> __('Search products', 'wpshop'),
+				'not_found' 			=> __('No products found', 'wpshop'),
+				'not_found_in_trash' 	=> __('No products found in Trash', 'wpshop'),
 				'parent_item_colon' 	=> ''
 			),
 			'supports' 				=> unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
@@ -108,26 +108,26 @@ 
 			'has_archive'			=> false,
 			'show_in_nav_menus' 	=> true,
 			//'rewrite' 				=> false,	//	For information see below
-			'taxonomies' 			=> array( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES ),
+			'taxonomies' 			=> array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES),
 			'menu_icon' 			=> 'dashicons-archive',
 			'rewrite' 				=> $slug,
 		));
 
 		/*	Définition des variations de produit (Déclinaisons)	*/
-		register_post_type( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, array(
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, array(
 			'labels'				=> array(
-				'name' 					=> __( 'Variations', 'wpshop' ),
-				'singular_name' 		=> __( 'Variation', 'wpshop' ),
-				'add_new' 				=> __( 'Add Variation', 'wpshop' ),
-				'add_new_item' 			=> __( 'Add New Variation', 'wpshop' ),
-				'edit' 					=> __( 'Edit', 'wpshop' ),
-				'edit_item' 			=> __( 'Edit Variation', 'wpshop' ),
-				'new_item' 				=> __( 'New Variation', 'wpshop' ),
-				'view' 					=> __( 'View Variation', 'wpshop' ),
-				'view_item' 			=> __( 'View Variation', 'wpshop' ),
-				'search_items' 			=> __( 'Search Variations', 'wpshop' ),
-				'not_found' 			=> __( 'No Variations found', 'wpshop' ),
-				'not_found_in_trash' 	=> __( 'No Variations found in trash', 'wpshop' ),
+				'name' 					=> __('Variations', 'wpshop'),
+				'singular_name' 		=> __('Variation', 'wpshop'),
+				'add_new' 				=> __('Add Variation', 'wpshop'),
+				'add_new_item' 			=> __('Add New Variation', 'wpshop'),
+				'edit' 					=> __('Edit', 'wpshop'),
+				'edit_item' 			=> __('Edit Variation', 'wpshop'),
+				'new_item' 				=> __('New Variation', 'wpshop'),
+				'view' 					=> __('View Variation', 'wpshop'),
+				'view_item' 			=> __('View Variation', 'wpshop'),
+				'search_items' 			=> __('Search Variations', 'wpshop'),
+				'not_found' 			=> __('No Variations found', 'wpshop'),
+				'not_found_in_trash' 	=> __('No Variations found in trash', 'wpshop'),
 				'parent_item_colon' 	=> ''
 			),
 			'supports' 				=> unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
@@ -163,12 +163,12 @@ 
 	
 	public static function hidden_meta_boxes($hidden, $screen, $use_defaults) {
 		global $wpdb;
-		if ( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT === $screen->post_type ) {
-			$user_meta_for_wpshop = array('metaboxhidden_'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-			foreach($user_meta_for_wpshop as $meta_to_check){
-				$metas_hidden = get_user_meta( get_current_user_id(), $meta_to_check, true );
-				if( empty( $metas_hidden ) && !is_array( $metas_hidden ) ) {
-					$hidden = unserialize( WPSHOP_PRODUCT_HIDDEN_METABOX );
+		if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT === $screen->post_type) {
+			$user_meta_for_wpshop = array('metaboxhidden_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			foreach ($user_meta_for_wpshop as $meta_to_check) {
+				$metas_hidden = get_user_meta(get_current_user_id(), $meta_to_check, true);
+				if (empty($metas_hidden) && !is_array($metas_hidden)) {
+					$hidden = unserialize(WPSHOP_PRODUCT_HIDDEN_METABOX);
 				}
 			}
 		}
@@ -181,7 +181,7 @@ 
 	public static function add_meta_boxes() {
 		global $post, $currentTabContent;
 
-		if(!empty($post->post_type) && ( ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) ) ) {
+		if (!empty($post->post_type) && (($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION))) {
 			/*	Get the attribute set list for the current entity	*/
 			$attributeEntitySetList = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode));
 			/*	Check if the meta information of the current product already exists 	*/
@@ -189,19 +189,19 @@ 
 			/*	Check if the product has been saved without meta information set	*/
 			$attribute_set_id = wpshop_attributes::get_attribute_value_content('product_attribute_set_id', $post->ID, self::currentPageCode);
 			/*	Unset 'free_product' from list of attributes set	*/
-			foreach( $attributeEntitySetList as $key_attribute_set => $attribute_set ) {
-				if( $attribute_set->slug == 'free_product' ) {
+			foreach ($attributeEntitySetList as $key_attribute_set => $attribute_set) {
+				if ($attribute_set->slug == 'free_product') {
 					unset($attributeEntitySetList[$key_attribute_set]);
 					break;
 				}
 			}
 
 			/*	Check if an attribute has already been choosen for the curernt entity or if the user has to choose a entity set before continuing	*/
-			if(((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))){
-				if((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))){
+			if (((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))) {
+				if ((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))) {
 					$post_attribute_set_id = $attributeEntitySetList[0]->id;
 				}
-				elseif(($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)){
+				elseif (($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)) {
 					$post_attribute_set_id = $attribute_set_id->value;
 				}
 
@@ -209,15 +209,15 @@ 
 
 				$fixed_box_exist = false;
 				/*	Get all the other attribute set for hte current entity	*/
-				if(isset($currentTabContent['box']) && count($currentTabContent['box']) > 0){
-					foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
-						if(!empty($currentTabContent['box'][$boxIdentifier.'_backend_display_type']) &&( $currentTabContent['box'][$boxIdentifier.'_backend_display_type'] == 'movable-tab')){
+				if (isset($currentTabContent['box']) && count($currentTabContent['box']) > 0) {
+					foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+						if (!empty($currentTabContent['box'][$boxIdentifier . '_backend_display_type']) && ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'movable-tab')) {
 							add_meta_box('wpshop_product_' . $boxIdentifier, __($boxTitle, 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default', array('boxIdentifier' => $boxIdentifier));
 						}
 						else $fixed_box_exist = true;
 					}
 				}
-				if ( $fixed_box_exist ) {
+				if ($fixed_box_exist) {
 					add_meta_box('wpshop_product_fixed_tab', __('Product data', 'wpshop'), array('wpshop_products', 'product_data_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'high', array('currentTabContent' => $currentTabContent));
 					add_meta_box('wpshop_product_fixed_tab', __('Product data', 'wpshop'), array('wpshop_products', 'product_data_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'normal', 'high', array('currentTabContent' => $currentTabContent));
 				}
@@ -229,7 +229,7 @@ 
 				/**	Product option	*/
 				add_meta_box('wpshop_product_options', __('Options', 'wpshop'), array('wpshop_products', 'product_options_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'side', 'default');
 			}
-			else if ( count($attributeEntitySetList) > 1 ) {
+			else if (count($attributeEntitySetList) > 1) {
 				$input_def['id'] = 'product_attribute_set_id';
 				$input_def['name'] = 'product_attribute_set_id';
 				$input_def['value'] = '';
@@ -238,7 +238,7 @@ 
 
 				$input_def['value'] = '';
 				foreach ($attributeEntitySetList as $set) {
-					if( $set->default_set == 'yes' ) {
+					if ($set->default_set == 'yes') {
 						$input_def['value'] = $set->id;
 					}
 				}
@@ -246,7 +246,7 @@ 
 				$currentTabContent['boxContent']['attribute_set_selector'] = '
 	<ul class="attribute_set_selector" >
 		<li class="attribute_set_selector_title_select" ><label for="title" >' . __('Choose a title for your product', 'wpshop') . '</label></li>
-		<li class="attribute_set_selector_group_selector" ><label for="' . $input_def['id'] . '" >' . __('Choose an attribute group for this product', 'wpshop') . '</label>&nbsp;'.wpshop_form::check_input_type($input_def, self::currentPageCode.'_attribute[integer]').'</li>
+		<li class="attribute_set_selector_group_selector" ><label for="' . $input_def['id'] . '" >' . __('Choose an attribute group for this product', 'wpshop') . '</label>&nbsp;' . wpshop_form::check_input_type($input_def, self::currentPageCode . '_attribute[integer]') . '</li>
 		<li class="attribute_set_selector_save_instruction" >' . __('Save the product with the "Save draft" button on the right side', 'wpshop') . '</li>
 		<li class="attribute_set_selector_after_save_instruction" >' . __('Once the group chosen, the different attribute will be displayed here', 'wpshop') . '</li>
 	</ul>';
@@ -262,10 +262,10 @@ 
 	 *
 	 * @param object $post
 	 */
-	public static function product_options_meta_box_content( $post ) {
+	public static function product_options_meta_box_content($post) {
 		$output = '';
 
-		$product_current_options = get_post_meta( $post->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
+		$product_current_options = get_post_meta($post->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
 
 		$tpl_component = array();
 		$tpl_component['ADMIN_PRODUCT_OPTION_FOR_CART_AUTOADD_CHECKBOX_STATE'] = (!empty($product_current_options['cart']) && !empty($product_current_options['cart']['auto_add'])) ? ' checked="checked"' : '';
@@ -284,25 +284,25 @@ 
 
 		echo '<div id="fixed-tabs" class="wpshop_tabs wpshop_detail_tabs wpshop_product_attribute_tabs" >
 				<ul>';
-		if(!empty($currentTabContent['box'])){
-			foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
-				if(!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-					if($currentTabContent['box'][$boxIdentifier.'_backend_display_type']=='fixed-tab') {
-						echo '<li><a href="#tabs-'.sanitize_title($boxIdentifier).'">'.__($boxTitle, 'wpshop').'</a></li>';
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<li><a href="#tabs-' . sanitize_title($boxIdentifier) . '">' . __($boxTitle, 'wpshop') . '</a></li>';
 					}
 				}
 			}
 		}
-		echo '<li><a href="#tabs-product-related">'.__('Related products', 'wpshop').'</a></li>';
-		echo '<li><a href="#tabs-product-provider">'.__('Providers', 'wpshop').'</a></li>';
-		echo '<li class="wpshop_product_data_display_tab" ><a href="#tabs-product-display">'.__('Product display', 'wpshop').'</a></li>';
+		echo '<li><a href="#tabs-product-related">' . __('Related products', 'wpshop') . '</a></li>';
+		echo '<li><a href="#tabs-product-provider">' . __('Providers', 'wpshop') . '</a></li>';
+		echo '<li class="wpshop_product_data_display_tab" ><a href="#tabs-product-display">' . __('Product display', 'wpshop') . '</a></li>';
 		echo '</ul>';
 
-		if(!empty($currentTabContent['box'])){
-			foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
-				if(!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-					if($currentTabContent['box'][$boxIdentifier.'_backend_display_type']=='fixed-tab') {
-						echo '<div id="tabs-'.sanitize_title($boxIdentifier).'">'.$currentTabContent['boxContent'][$boxIdentifier].'</div>';
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<div id="tabs-' . sanitize_title($boxIdentifier) . '">' . $currentTabContent['boxContent'][$boxIdentifier] . '</div>';
 					}
 				}
 			}
@@ -324,12 +324,12 @@ 
 	 * @param object $post The current edited post
 	 * @return string
 	 */
-	public static function related_products_meta_box_content( $post ) {
+	public static function related_products_meta_box_content($post) {
 		$content = $existing_selection = '';
 
-		if( !empty($post->ID) ) {
+		if (!empty($post->ID)) {
 			$related_products_id = get_post_meta($post->ID, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
-			if( !empty($related_products_id) && !empty($related_products_id[0]) ) {
+			if (!empty($related_products_id) && !empty($related_products_id[0])) {
 				foreach ($related_products_id as $related_product_id) {
 					$existing_selection .= '<option selected value="' . $related_product_id . '" >' . get_the_title($related_product_id) . '</option>';
 				}
@@ -349,14 +349,14 @@ 
 	 * @param object $post The current edited post
 	 * @return string
 	 */
-	public static function provider_products_meta_box_content( $post ) {
+	public static function provider_products_meta_box_content($post) {
 		$content = $existing_selection = '';
 
-		if( !empty($post->ID) ) {
+		if (!empty($post->ID)) {
 			$providers_id = get_post_meta($post->ID, WPSHOP_PRODUCT_PROVIDER, true);
-			if( !empty($providers_id) && !empty($providers_id[0]) ) {
+			if (!empty($providers_id) && !empty($providers_id[0])) {
 				foreach ($providers_id as $provider_id) {
-					$existing_selection .= '<option selected value="' . $provider_id . '" >' . get_the_title( $provider_id ) . '</option>';
+					$existing_selection .= '<option selected value="' . $provider_id . '" >' . get_the_title($provider_id) . '</option>';
 				}
 			}
 		}
@@ -373,7 +373,7 @@ 
 	 * Define the metabox content for the action box
 	 * @param obejct $post The current element being edited
 	 */
-	public static function product_actions_meta_box_content( $post ) {
+	public static function product_actions_meta_box_content($post) {
 		$output = '';
 		/*
 		 * Template parameters
@@ -381,7 +381,7 @@ 
 		$template_part = 'wpshop_duplicate_product';
 		$tpl_component = array();
 		$tpl_component['PRODUCT_ID'] = $post->ID;
-		$tpl_component['PRINT_PRODUCT_SHEET_LINK'] = WPSHOP_TEMPLATES_URL.'product_sheet.php?pid='.$post->ID;
+		$tpl_component['PRINT_PRODUCT_SHEET_LINK'] = WPSHOP_TEMPLATES_URL . 'product_sheet.php?pid=' . $post->ID;
 		/*
 		 * Build template
 		*/
@@ -394,7 +394,7 @@ 
 	/**
 	 *	Define the content of the product main information box
 	 */
-	public static function meta_box_content($post, $metaboxArgs){
+	public static function meta_box_content($post, $metaboxArgs) {
 		global $currentTabContent;
 
 		/*	Add the extra fields defined by the default attribute group in the general section	*/
@@ -407,19 +407,19 @@ 
 	 * @param object $post The current element being edited
 	 * @return string The metabox content
 	 */
-	public static function product_frontend_display_config_meta_box( $post ) {
+	public static function product_frontend_display_config_meta_box($post) {
 		$content = '';
 
 		$product_attribute_frontend_display_config = null;
-		if( !empty($post->ID) ) {
+		if (!empty($post->ID)) {
 			$product_attribute_frontend_display_config = get_post_meta($post->ID, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
 
 			$extra_options = get_option('wpshop_extra_options', array());
-			$column_count = (!empty($extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY'])?$extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY']:3);
-			$attribute_list = wpshop_attributes::getElementWithAttributeAndValue(wpshop_entities::get_entity_identifier_from_code( self::currentPageCode ), $post->ID, WPSHOP_CURRENT_LOCALE);
+			$column_count = (!empty($extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY']) ? $extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY'] : 3);
+			$attribute_list = wpshop_attributes::getElementWithAttributeAndValue(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post->ID, WPSHOP_CURRENT_LOCALE);
 			$column = 1;
 
-			if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {
+			if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
 				$sub_tpl_component = array();
 				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = __('Action on product', 'wpshop');
 
@@ -429,8 +429,8 @@ 
 				$tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_product_action_button_add_to_cart';
 				$button_is_set_to_be_displayed = (WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no';
 
-				$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display( $button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'complete_sheet') ? ' checked="checked"' : '';
-				$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display( $button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'mini_output') ? ' checked="checked"' : '';
+				$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'complete_sheet') ? ' checked="checked"' : '';
+				$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'mini_output') ? ' checked="checked"' : '';
 				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
 				unset($tpl_component);
 
@@ -440,21 +440,21 @@ 
 				$sub_content[1] = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $sub_tpl_component, array(), 'admin');
 			}
 
-			if ( !empty($attribute_list[$post->ID]) && is_array($attribute_list[$post->ID]) ) {
-				foreach ( $attribute_list[$post->ID] as $attribute_set_section_name => $attribute_set_section_content ) {
-					if ( !isset($sub_content[$column]) ) {
+			if (!empty($attribute_list[$post->ID]) && is_array($attribute_list[$post->ID])) {
+				foreach ($attribute_list[$post->ID] as $attribute_set_section_name => $attribute_set_section_content) {
+					if (!isset($sub_content[$column])) {
 						$sub_content[$column] = '';
 					}
 
 					$attribute_sub_output = '';
-					foreach ( $attribute_set_section_content['attributes'] as $attribute_id => $attribute_def ) {
-						if ( $attribute_def['attribute_code'] != 'product_attribute_set_id' ) {
+					foreach ($attribute_set_section_content['attributes'] as $attribute_id => $attribute_def) {
+						if ($attribute_def['attribute_code'] != 'product_attribute_set_id') {
 							$tpl_component = array();
 							$tpl_component['ADMIN_ATTRIBUTE_LABEL'] = $attribute_def['frontend_label'];
 							$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute][' . $attribute_def['attribute_code'] . ']';
 							$tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_' . $attribute_def['attribute_code'];
-							$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display( $attribute_def['is_visible_in_front'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'complete_sheet') ? ' checked="checked"' : '';
-							$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display( $attribute_def['is_visible_in_front_listing'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'mini_output') ? ' checked="checked"' : '';
+							$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'complete_sheet') ? ' checked="checked"' : '';
+							$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front_listing'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'mini_output') ? ' checked="checked"' : '';
 							$attribute_sub_output .= wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
 							unset($tpl_component);
 						}
@@ -465,18 +465,18 @@ 
 					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = $attribute_sub_output;
 					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . ']';
 					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = $attribute_set_section_content['code'];
-					$ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK = wpshop_attributes::check_attribute_display( $attribute_set_section_content['display_on_frontend'], $product_attribute_frontend_display_config, 'attribute_set_section', $attribute_set_section_content['code'], 'complete_sheet') ? ' checked="checked"' : '';
-					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '<input type="checkbox" name="' .  self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . '][complete_sheet]" id="' .  $attribute_set_section_content['code'] . '_complete_sheet" value="yes"' . $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK . ' /><label for="' .  $attribute_set_section_content['code'] . '_complete_sheet" >' . __('Display in product page', 'wpshop') . '</label>';
+					$ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK = wpshop_attributes::check_attribute_display($attribute_set_section_content['display_on_frontend'], $product_attribute_frontend_display_config, 'attribute_set_section', $attribute_set_section_content['code'], 'complete_sheet') ? ' checked="checked"' : '';
+					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '<input type="checkbox" name="' . self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . '][complete_sheet]" id="' . $attribute_set_section_content['code'] . '_complete_sheet" value="yes"' . $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK . ' /><label for="' . $attribute_set_section_content['code'] . '_complete_sheet" >' . __('Display in product page', 'wpshop') . '</label>';
 					$sub_content[$column] .= wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $tpl_component, array(), 'admin');
 					$column++;
-					if ( $column > $column_count ){
+					if ($column > $column_count) {
 						$column = 1;
 					}
 				}
 			}
 			$tpl_component = array();
 			$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] = '';
-			for ( $i=1; $i<=$column_count; $i++ ) {
+			for ($i = 1; $i <= $column_count; $i++) {
 				if (!empty($sub_content[$i]))
 					$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
 			}
@@ -484,7 +484,7 @@ 
 			$tpl_component['ADMIN_PRODUCT_ATTRIBUTE_FRONTEND_DISPLAY_MAIN_CHOICE_CHECK'] = empty($product_attribute_frontend_display_config) ? ' checked="checked"' : '';
 			$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display';
 
-			$content = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display_default_choice',$tpl_component, array(), 'admin') . '<div class="wpshop_cls"></div>';
+			$content = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display_default_choice', $tpl_component, array(), 'admin') . '<div class="wpshop_cls"></div>';
 		}
 
 		return $content;
@@ -499,9 +499,9 @@ 
 
 		$data = array(array('code' => 'title', 'frontend_label' => __('Product name', 'wpshop')), array('code' => 'date', 'frontend_label' => __('Date added', 'wpshop')), array('code' => 'modified', 'frontend_label' => __('Date modified', 'wpshop')));
 
-		$query = $wpdb->prepare("SELECT code, frontend_label FROM ".WPSHOP_DBT_ATTRIBUTE." WHERE is_used_for_sort_by = %s",  'yes');
+		$query = $wpdb->prepare("SELECT code, frontend_label FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE is_used_for_sort_by = %s", 'yes');
 		$results = $wpdb->get_results($query, ARRAY_A);
-		if(!empty($results))$data = array_merge($data, $results);
+		if (!empty($results))$data = array_merge($data, $results);
 
 		return $data;
 	}
@@ -513,62 +513,62 @@ 
 		$query = "SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code=%s";
 		$data = (array)$wpdb->get_row($wpdb->prepare($query, $attr_name));
 
-		if(!empty($data)) {
-			if ($data['data_type_to_use'] == 'custom' ) {
+		if (!empty($data)) {
+			if ($data['data_type_to_use'] == 'custom') {
 				// Find which table to take
-				if($data['data_type']=='datetime') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME; }
-				elseif($data['data_type']=='decimal') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL; }
-				elseif($data['data_type']=='integer') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER; }
-				elseif($data['data_type']=='options') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS; }
-				elseif($data['data_type']=='text') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT; }
-				elseif($data['data_type']=='varchar') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR; }
-
-				if(isset($table_name)) {
+				if ($data['data_type'] == 'datetime') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME; }
+				elseif ($data['data_type'] == 'decimal') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL; }
+				elseif ($data['data_type'] == 'integer') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER; }
+				elseif ($data['data_type'] == 'options') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS; }
+				elseif ($data['data_type'] == 'text') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT; }
+				elseif ($data['data_type'] == 'varchar') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR; }
+
+				if (isset($table_name)) {
 					// If the value is an id of a select, radio or checkbox
-					if(in_array($data['backend_input'], array('select','multiple-select', 'radio','checkbox'))) {
+					if (in_array($data['backend_input'], array('select', 'multiple-select', 'radio', 'checkbox'))) {
 
 						$query = $wpdb->prepare("
-							SELECT ".$table_name.".entity_id FROM ".$table_name."
-							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = ".$table_name.".entity_id ) AND ( P.post_status = 'publish' ) )
-							LEFT JOIN ".WPSHOP_DBT_ATTRIBUTE." AS ATT ON ATT.id = ".$table_name.".attribute_id
-							LEFT JOIN ".WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS." AS ATT_OPT ON ".$table_name.".value = ATT_OPT.id
-							WHERE ATT.code=%s AND ( ATT_OPT.value=%s OR ATT_OPT.value=%s )", $attr_name, strtolower( __( $attr_value, 'wpshop' ) ), $attr_value
+							SELECT ".$table_name . ".entity_id FROM " . $table_name . "
+							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
+							LEFT JOIN ".WPSHOP_DBT_ATTRIBUTE . " AS ATT ON ATT.id = " . $table_name . ".attribute_id
+							LEFT JOIN ".WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATT_OPT ON " . $table_name . ".value = ATT_OPT.id
+							WHERE ATT.code=%s AND ( ATT_OPT.value=%s OR ATT_OPT.value=%s )", $attr_name, strtolower(__($attr_value, 'wpshop')), $attr_value
 						);
 						$data = $wpdb->get_results($query);
 					}
 					else {
 
 						$query = $wpdb->prepare("
-							SELECT ".$table_name.".entity_id FROM ".$table_name."
-							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = ".$table_name.".entity_id ) AND ( P.post_status = 'publish' ) )
-							INNER JOIN ".WPSHOP_DBT_ATTRIBUTE." AS ATT ON ATT.id = ".$table_name.".attribute_id
-								INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = ".$table_name.".entity_id ) AND ( P.post_status = 'publish' ) )
-							WHERE ATT.code=%s AND ".$table_name.".value=%s", $attr_name, sprintf('%.5f', $attr_value) // force useless zero like 48.58000
+							SELECT ".$table_name . ".entity_id FROM " . $table_name . "
+							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
+							INNER JOIN ".WPSHOP_DBT_ATTRIBUTE . " AS ATT ON ATT.id = " . $table_name . ".attribute_id
+								INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
+							WHERE ATT.code=%s AND ".$table_name . ".value=%s", $attr_name, sprintf('%.5f', $attr_value) // force useless zero like 48.58000
 						);
 						$data = $wpdb->get_results($query);
 
 					}
 				}
-				else return __('Incorrect shortcode','wpshop');
+				else return __('Incorrect shortcode', 'wpshop');
 			}
-			elseif( $data['data_type_to_use'] == 'internal' )  {
+			elseif ($data['data_type_to_use'] == 'internal') {
 				/** Check the ID of manufacturer **/
-				$default_value = unserialize( $data['default_value'] );
-				if( !empty($default_value) && !empty($default_value['default_value']) ) {
-					$query = get_post( $attr_value );
-					$pid = ( !empty($query) && !empty($query->ID) ) ? $query->ID : '';
-					if ( !empty($pid) ) {
-						$query = $wpdb->prepare( 'SELECT post_id AS entity_id FROM '.$wpdb->postmeta.' WHERE post_id = ID AND post_status = %s AND meta_key = %s AND meta_value = %s', 'publish', '_'.$data['code'], $pid);
-						$data = $wpdb->get_results( $query );
+				$default_value = unserialize($data['default_value']);
+				if (!empty($default_value) && !empty($default_value['default_value'])) {
+					$query = get_post($attr_value);
+					$pid = (!empty($query) && !empty($query->ID)) ? $query->ID : '';
+					if (!empty($pid)) {
+						$query = $wpdb->prepare('SELECT post_id AS entity_id FROM ' . $wpdb->postmeta . ' WHERE post_id = ID AND post_status = %s AND meta_key = %s AND meta_value = %s', 'publish', '_' . $data['code'], $pid);
+						$data = $wpdb->get_results($query);
 					}
 				}
-			}else return __('Incorrect shortcode','wpshop');
+			} else return __('Incorrect shortcode', 'wpshop');
 
-		} else return __('Incorrect shortcode','wpshop');
+		} else return __('Incorrect shortcode', 'wpshop');
 
-		if(!empty($data)) {
-			foreach($data as $p) {
-				if ( !empty($p) && is_object($p) && !empty($p->entity_id) ) {
+		if (!empty($data)) {
+			foreach ($data as $p) {
+				if (!empty($p) && is_object($p) && !empty($p->entity_id)) {
 					$products[] = $p->entity_id;
 				}
 			}
@@ -591,14 +591,14 @@ 
 		global $wp_query;
 
 		$atts['product_type'] = 'related';
-		if(empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
+		if (empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
 
 		$related_product_output = self::wpshop_products_func($atts);
 
 		$output = '';
-		if ( !empty( $related_product_output ) ) {
+		if (!empty($related_product_output)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, 'frontend', 'related_product') );
+			require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, 'frontend', 'related_product'));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -629,7 +629,7 @@ 
 		$string = '';
 		$have_results = false;
 		$output_results = true;
-		$type = ( empty($atts['type']) OR !in_array($atts['type'], array('grid','list')) ) ? WPSHOP_DISPLAY_LIST_TYPE : $atts['type'];
+		$type = (empty($atts['type']) OR !in_array($atts['type'], array('grid', 'list'))) ? WPSHOP_DISPLAY_LIST_TYPE : $atts['type'];
 		$pagination = isset($atts['pagination']) ? intval($atts['pagination']) : WPSHOP_ELEMENT_NB_PER_PAGE;
 		$cid = !empty($atts['cid']) ? $atts['cid'] : 0;
 		$pid = !empty($atts['pid']) ? $atts['pid'] : 0;
@@ -644,14 +644,14 @@ 
 
 		/** Get products which have att_name equal to att_value	*/
 		if (!empty($atts['att_name']) && !empty($atts['att_value'])) {
-			$attr = $atts['att_name'].':'.$atts['att_value'];
+			$attr = $atts['att_name'] . ':' . $atts['att_value'];
 
 			$products = self::get_products_matching_attribute($atts['att_name'], $atts['att_value']);
 
 			// Foreach on the found products
-			if ( !empty($products) ) {
-				$pid = implode(',',$products);
-				if(empty($pid))$output_results = false;
+			if (!empty($products)) {
+				$pid = implode(',', $products);
+				if (empty($pid))$output_results = false;
 			}
 			else $output_results = false;
 		}
@@ -661,14 +661,14 @@ 
 			switch ($atts['product_type']) {
 				case 'related':
 					$product_id = !empty($atts['pid']) ? (int)$atts['pid'] : get_the_ID();
-					$type = !empty($atts['display_mode']) && in_array($atts['display_mode'],array('list','grid')) ? $atts['display_mode'] : WPSHOP_DISPLAY_LIST_TYPE;
+					$type = !empty($atts['display_mode']) && in_array($atts['display_mode'], array('list', 'grid')) ? $atts['display_mode'] : WPSHOP_DISPLAY_LIST_TYPE;
 					$grid_element_nb_per_line = !empty($atts['grid_element_nb_per_line']) ? $atts['grid_element_nb_per_line'] : WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE;
 
 					$pids = get_post_meta((int)$product_id, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
-					if ( !empty($pids) && !empty($pids[0]) ) {
+					if (!empty($pids) && !empty($pids[0])) {
 						$pid = implode(',', $pids);
 					}
-					if(empty($pid) || $pid == $product_id) {
+					if (empty($pid) || $pid == $product_id) {
 						$output_results = false;
 					}
 
@@ -677,21 +677,21 @@ 
 		}
 
 		/** Output all the products	*/
-		if ( $output_results ) {
+		if ($output_results) {
 			$data = self::wpshop_get_product_by_criteria((!empty($atts['order']) ? $atts['order'] : (!empty($atts['creator']) ? ($atts['creator'] == 'current') : '')), $cid, $pid, $type, $order_by_sorting, 1, $pagination, $limit, $grid_element_nb_per_line, $display_pagination);
 
-			if ( $data[0] ) {
+			if ($data[0]) {
 				$have_results = true;
 				$string = $data[1];
 			}
 		}
 
 		/** If there are result to display	*/
-		if ( $have_results ) {
+		if ($have_results) {
 			$sorting = '';
-			if ( !empty($pid) ) {
+			if (!empty($pid)) {
 				$product_list = explode(',', $pid);
-				if ( count($product_list) == 1 ) {
+				if (count($product_list) == 1) {
 					$atts['sorting'] = 'no';
 				}
 			}
@@ -706,7 +706,7 @@ 
 			 * Build template
 			*/
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/*	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -729,24 +729,24 @@ 
 				$tpl_component['SORTING_HIDDEN_FIELDS'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component, array(), 'admin');
 				unset($sub_tpl_component);
 
-				if ( (!empty($sorting_criteria) && is_array($sorting_criteria)) ) {
+				if ((!empty($sorting_criteria) && is_array($sorting_criteria))) {
 					$sub_template_part = 'product_listing_sorting_criteria';
 					$sub_tpl_component = array();
 					$criteria = '';
-					foreach($sorting_criteria as $c):
-						$criteria .= '<option value="' . $c['code'] . '">' . __($c['frontend_label'],'wpshop') . '</option>';
+					foreach ($sorting_criteria as $c):
+						$criteria .= '<option value="' . $c['code'] . '">' . __($c['frontend_label'], 'wpshop') . '</option>';
 					endforeach;
 					$sub_tpl_component['SORTING_CRITERIA_LIST'] = $criteria;
 					$tpl_component['SORTING_CRITERIA'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component);
 					unset($sub_tpl_component);
 				}
 
-				if ( empty($atts['sorting']) || ( !empty($atts['sorting']) && ($atts['sorting'] != 'no') ) ) {
-					$tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ?' active' : null;
-					$tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ?' active' : null;
+				if (empty($atts['sorting']) || (!empty($atts['sorting']) && ($atts['sorting'] != 'no'))) {
+					$tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ? ' active' : null;
+					$tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ? ' active' : null;
 					$sorting = wpshop_display::display_template_element($template_part, $tpl_component);
 				}
-				else if ( !empty($atts['sorting']) && ($atts['sorting'] == 'no') ) {
+				else if (!empty($atts['sorting']) && ($atts['sorting'] == 'no')) {
 					$sub_template_part = 'product_listing_sorting_criteria_hidden';
 					$sub_tpl_component = array();
 					$sub_tpl_component['CRITERIA_DEFAULT'] = !empty($sorting_criteria[0]['code']) ? $sorting_criteria[0]['code'] : 'title';
@@ -759,31 +759,31 @@ 
 			}
 			unset($tpl_component);
 
-			if ( !empty( $atts) && !empty($atts['container']) && $atts['container'] == 'no') {
-				$string = $sorting.'<div class="wps-catalog-container wps-bloc-loader">'.$string.'</div>';
+			if (!empty($atts) && !empty($atts['container']) && $atts['container'] == 'no') {
+				$string = $sorting . '<div class="wps-catalog-container wps-bloc-loader">' . $string . '</div>';
 			}
 			else {
-				$string = '<div class="wpshop_products_block">'.$sorting.'<div class="wps-catalog-container wps-bloc-loader">'.$string.'</div></div>';
+				$string = '<div class="wpshop_products_block">' . $sorting . '<div class="wps-catalog-container wps-bloc-loader">' . $string . '</div></div>';
 			}
 		}
-		else if ( empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no') ) {
+		else if (empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no')) {
 			$string = __('There is nothing to output here', 'wpshop');
 		}
 
 		return do_shortcode($string);
 	}
 
-	public static function wpshop_get_product_by_criteria( $criteria = null, $cid=0, $pid=0, $display_type, $order='ASC', $page_number, $products_per_page=0, $nb_of_product_limit=0, $grid_element_nb_per_line=WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true ) {
+	public static function wpshop_get_product_by_criteria($criteria = null, $cid = 0, $pid = 0, $display_type, $order = 'ASC', $page_number, $products_per_page = 0, $nb_of_product_limit = 0, $grid_element_nb_per_line = WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true) {
 		global $wpdb;
 
 		$string = '<span id="wpshop_loading">&nbsp;</span>';
 		$have_results = false;
-		$display_type = (!empty($display_type) && in_array($display_type,array('grid','list'))) ? $display_type : 'grid';
+		$display_type = (!empty($display_type) && in_array($display_type, array('grid', 'list'))) ? $display_type : 'grid';
 
 		/** Check if Discount are activated */
-		$discount_option = get_option( 'wpshop_catalog_product_option' );
+		$discount_option = get_option('wpshop_catalog_product_option');
 
-		if ( $criteria == 'product_price' && !empty($discount_option) && !empty($discount_option['discount']) && $discount_option['discount'] == 'on') {
+		if ($criteria == 'product_price' && !empty($discount_option) && !empty($discount_option['discount']) && $discount_option['discount'] == 'on') {
 			$criteria = 'wpshop_displayed_price';
 		}
 
@@ -796,18 +796,18 @@ 
 		);
 
 		// If the limit is greater than zero, hide pagination and change posts_per_page var
-		if ( $nb_of_product_limit > 0 ) {
+		if ($nb_of_product_limit > 0) {
 			$query['posts_per_page'] = $nb_of_product_limit;
 			unset($query['paged']);
 		}
-		if( !empty($pid) ) {
-			if(!is_array($pid)){
+		if (!empty($pid)) {
+			if (!is_array($pid)) {
 				$pid = explode(',', $pid);
 			}
 
 			$query['post__in'] = $pid;
 		}
-		if ( !empty($cid) ) {
+		if (!empty($cid)) {
 			$cid = explode(',', $cid);
 			$query['tax_query'] = array(array(
 				'taxonomy' => WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES,
@@ -816,8 +816,8 @@ 
 				'operator' => 'IN'
 			));
 		}
-		if($criteria != null) {
-			switch($criteria){
+		if ($criteria != null) {
+			switch ($criteria) {
 				case 'creator':
 				case 'author':
 					$query['author'] = get_current_user_id();
@@ -829,21 +829,21 @@ 
 					$query['orderby'] = $criteria;
 					break;
 				default:
-					if(!empty($pid)) {
-						$post_meta = get_post_meta($pid, '_'.$criteria, true);
+					if (!empty($pid)) {
+						$post_meta = get_post_meta($pid, '_' . $criteria, true);
 					}
-					else{
-						$check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_'.$criteria);
+					else {
+						$check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_' . $criteria);
 						$post_meta = $wpdb->get_var($check_meta);
 					}
-					if(!empty($post_meta)){
-						if ( in_array( $criteria, array( 'wpshop_displayed_price', 'product_price' ) ) ) {
+					if (!empty($post_meta)) {
+						if (in_array($criteria, array('wpshop_displayed_price', 'product_price'))) {
 							$query['orderby'] = 'meta_value_num';
 						}
 						else {
 							$query['orderby'] = 'meta_value';
 						}
-						$query['meta_key'] = '_'.$criteria;
+						$query['meta_key'] = '_' . $criteria;
 					}
 					break;
 			}
@@ -852,33 +852,33 @@ 
 			$query['orderby'] = 'menu_order ID';
 		}
 		$post_per_page = $query['posts_per_page'];
-		$total_products = ( !empty($query['post__in']) ) ? $query['post__in'] : 0;
-		if ( !empty($pid) && !empty($query['post__in']) && count($query['post__in']) > $query['posts_per_page'] ) {
+		$total_products = (!empty($query['post__in'])) ? $query['post__in'] : 0;
+		if (!empty($pid) && !empty($query['post__in']) && count($query['post__in']) > $query['posts_per_page']) {
 			$tmp_array = array();
 
-			if ( empty($page_number) || $page_number == 1 ) {
-				for( $i = 0; $i < $query['posts_per_page']; $i++ ) {
+			if (empty($page_number) || $page_number == 1) {
+				for ($i = 0; $i < $query['posts_per_page']; $i++) {
 					$tmp_array[] = $query['post__in'][$i];
 				}
 			}
 			else {
-				$begin_number = ( ($page_number - 1) * $query['posts_per_page'] ) ;
-				for( $i = $begin_number ; $i < $query['posts_per_page'] + $begin_number ; $i++ ) {
-					if ( !empty($query['post__in'][$i]) ) {
+				$begin_number = (($page_number - 1) * $query['posts_per_page']);
+				for ($i = $begin_number; $i < $query['posts_per_page'] + $begin_number; $i++) {
+					if (!empty($query['post__in'][$i])) {
 						$tmp_array[] = $query['post__in'][$i];
 					}
 				}
 			}
-			unset( $query['post__in'] );
+			unset($query['post__in']);
 			$query['post__in'] = $tmp_array;
 			$query['posts_per_page'] = -1;
 		}
 
 		$query['post_status'] = 'publish';
 
-		$custom_query = new WP_Query( $query );
+		$custom_query = new WP_Query($query);
 
-		if ( $custom_query->have_posts() ) {
+		if ($custom_query->have_posts()) {
 			$have_results = true;
 
 			// ---------------- //
@@ -894,7 +894,7 @@ 
 				$current_position++;
 			endwhile;
 			$tpl_component = array();
-			$tpl_component['PRODUCT_CONTAINER_TYPE_CLASS'] = ($display_type == 'grid' ? ' ' . $display_type . '_' . $grid_element_nb_per_line : '') . ' '. $display_type .'_mode';
+			$tpl_component['PRODUCT_CONTAINER_TYPE_CLASS'] = ($display_type == 'grid' ? ' ' . $display_type . '_' . $grid_element_nb_per_line : '') . ' ' . $display_type . '_mode';
 			$tpl_component['PRODUCT_LIST_DISPLAY_TYPE'] = $display_type;
 			$tpl_component['PRODUCT_LIST_PER_LINE'] = $grid_element_nb_per_line;
 			$tpl_component['PRODUCT_LIST'] = $product_list;
@@ -905,39 +905,39 @@ 
 			// --------------------- //
 			// Pagination management //
 			// --------------------- //
-			if($display_pagination) {
-				if($nb_of_product_limit==0) {
+			if ($display_pagination) {
+				if ($nb_of_product_limit == 0) {
 
 					$paginate = paginate_links(array(
 						'base' => '%_%',
 						'format' => '/?page_product=%#%',
-						'current' => $page_number ,
+						'current' => $page_number,
 						'total' => $custom_query->max_num_pages,
 						'type' => 'array',
 						'prev_next' => false
 					));
-					if(!empty($paginate)) {
+					if (!empty($paginate)) {
 						$string .= '<ul class="pagination wps-pagination">';
-						foreach($paginate as $p) {
-							$string .= '<li>'.$p.'</li>';
+						foreach ($paginate as $p) {
+							$string .= '<li>' . $p . '</li>';
 						}
 						$string .= '</ul>';
 					}
 				}
 
-				if ( !empty($pid) && !empty($query['post__in']) && count($total_products) > $post_per_page ) {
+				if (!empty($pid) && !empty($query['post__in']) && count($total_products) > $post_per_page) {
 					$paginate = paginate_links(array(
 							'base' => '%_%',
 							'format' => '/?page_product=%#%',
 							'current' => $page_number,
-							'total' => ceil( count($total_products) / $post_per_page ) ,
+							'total' => ceil(count($total_products) / $post_per_page),
 							'type' => 'array',
 							'prev_next' => false
 					));
-					if(!empty($paginate)) {
+					if (!empty($paginate)) {
 						$string .= '<ul class="pagination wps-pagination">';
-						foreach($paginate as $p) {
-							$string .= '<li>'.$p.'</li>';
+						foreach ($paginate as $p) {
+							$string .= '<li>' . $p . '</li>';
 						}
 						$string .= '</ul>';
 					}
@@ -955,21 +955,21 @@ 
 	 * @param integer $product_id The product we want to update quantity for
 	 * @param decimal $qty The new quantity
 	 */
-	public static function reduce_product_stock_qty($product_id, $qty, $variation_id = '' ) {
+	public static function reduce_product_stock_qty($product_id, $qty, $variation_id = '') {
 		global $wpdb;
 
 		$product = self::get_product_data($product_id);
 		/** Check if there is variation ***/
-		if ( !empty($variation_id) && $variation_id != $product_id ) {
-			$variation_post_type = get_post_type( $variation_id );
-			if ( $variation_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+		if (!empty($variation_id) && $variation_id != $product_id) {
+			$variation_post_type = get_post_type($variation_id);
+			if ($variation_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
 				/** Check if variation def is combined **/
-				$variations = get_post_meta( $product_id, '_wpshop_variation_defining', true );
-				if ( !empty($variations) && !empty($variations['options']) && !empty($variations['options']['priority']) && in_array( 'combined', $variations['options']['priority']) ) {
+				$variations = get_post_meta($product_id, '_wpshop_variation_defining', true);
+				if (!empty($variations) && !empty($variations['options']) && !empty($variations['options']['priority']) && in_array('combined', $variations['options']['priority'])) {
 					/** Get post meta of variation */
-					$variation_metadata = get_post_meta( $variation_id, '_wpshop_product_metadata', true );
-					if ( !empty($variation_metadata) && isset($variation_metadata['product_stock']) ) {
-						$product = self::get_product_data( $variation_id );
+					$variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
+					if (!empty($variation_metadata) && isset($variation_metadata['product_stock'])) {
+						$product = self::get_product_data($variation_id);
 						$product_id = $variation_id;
 					}
 				}
@@ -979,12 +979,12 @@ 
 		if (!empty($product)) {
 			$newQty = $product['product_stock'] - $qty;
 			$value_id = 0;
-			if ( $newQty >= 0 ) {
+			if ($newQty >= 0) {
 				$query = '
 					SELECT wp_wpshop__attribute_value_decimal.value_id
 					FROM wp_wpshop__attribute_value_decimal
 					LEFT JOIN wp_wpshop__attribute ON wp_wpshop__attribute_value_decimal.attribute_id = wp_wpshop__attribute.id
-					WHERE wp_wpshop__attribute_value_decimal.entity_id='.$product_id.' AND wp_wpshop__attribute.code="product_stock"
+					WHERE wp_wpshop__attribute_value_decimal.entity_id='.$product_id . ' AND wp_wpshop__attribute.code="product_stock"
 					LIMIT 1
 				';
 				$value_id = $wpdb->get_var($query);
@@ -994,10 +994,10 @@ 
 			$attribute_histo_content = array();
 			$attribute_histo_content['status'] = 'valid';
 			$attribute_histo_content['creation_date'] = current_time('mysql', 0);
-			$attribute_histo_content['creation_date_value'] = ( !empty( $attribute_histo[0]->creation_date_value ) ) ? $attribute_histo[0]->creation_date_value : current_time('mysql', 0);
+			$attribute_histo_content['creation_date_value'] = (!empty($attribute_histo[0]->creation_date_value)) ? $attribute_histo[0]->creation_date_value : current_time('mysql', 0);
 			$attribute_histo_content['original_value_id'] = $value_id;
-			$attribute_histo_content['entity_type_id'] = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-			$stock_atribute = wpshop_attributes::getElement( 'product_stock', "'valid'", 'code' );
+			$attribute_histo_content['entity_type_id'] = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$stock_atribute = wpshop_attributes::getElement('product_stock', "'valid'", 'code');
 			$attribute_histo_content['attribute_id'] = $stock_atribute->id;
 			$attribute_histo_content['entity_id'] = $product_id;
 			$attribute_histo_content['value'] = $product['product_stock'];
@@ -1017,15 +1017,15 @@ 
 	 * @param boolean $for_cart_storage
 	 * @return array Information about the product defined by first parameter
 	 */
-	public static function get_product_data( $product_id, $for_cart_storage = false, $post_status = '"publish"') {
+	public static function get_product_data($product_id, $for_cart_storage = false, $post_status = '"publish"') {
 		global $wpdb;
 			$query = $wpdb->prepare('
 			SELECT P.*, PM.meta_value AS attribute_set_id
-			FROM '.$wpdb->posts.' AS P
-				INNER JOIN '.$wpdb->postmeta.' AS PM ON (PM.post_id=P.ID)
+			FROM '.$wpdb->posts . ' AS P
+				INNER JOIN '.$wpdb->postmeta . ' AS PM ON (PM.post_id=P.ID)
 			WHERE
 				P.ID = %d
-				AND ( (P.post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'") OR (P.post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '") OR (P.post_type = "free_product") )
+				AND ( (P.post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '") OR (P.post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '") OR (P.post_type = "free_product") )
 				AND P.post_status IN (' . $post_status . ')
 				AND	PM.meta_key = "_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id"
 			LIMIT 1
@@ -1037,35 +1037,35 @@ 
 		$product_meta = array();
 
 		if (!empty($product)) {
-			$product_data['product_id'] = ( !empty($product->ID) ) ?  $product->ID : '';
-			$product_data['post_name'] = ( !empty($product->post_name) ) ? $product->post_name : '';
-			$product_data['product_name'] = ( !empty($product->post_title) ) ? $product->post_title : '';
-			$product_data['post_title'] = ( !empty($product->post_title) ) ? $product->post_title : '';
+			$product_data['product_id'] = (!empty($product->ID)) ? $product->ID : '';
+			$product_data['post_name'] = (!empty($product->post_name)) ? $product->post_name : '';
+			$product_data['product_name'] = (!empty($product->post_title)) ? $product->post_title : '';
+			$product_data['post_title'] = (!empty($product->post_title)) ? $product->post_title : '';
 
-			$product_data['product_author_id'] = ( !empty($product->post_author) ) ? $product->post_author : '';
-			$product_data['product_date'] = ( !empty($product->post_date) ) ? $product->post_date : '';
-			$product_data['product_content'] = ( !empty($product->post_content) ) ? $product->post_content : '';
-			$product_data['product_excerpt'] = ( !empty($product->post_excerpt) ) ? $product->post_excerpt : wp_trim_words( $product_data['product_content'], apply_filters( 'excerpt_length', 50 ), '...' );
+			$product_data['product_author_id'] = (!empty($product->post_author)) ? $product->post_author : '';
+			$product_data['product_date'] = (!empty($product->post_date)) ? $product->post_date : '';
+			$product_data['product_content'] = (!empty($product->post_content)) ? $product->post_content : '';
+			$product_data['product_excerpt'] = (!empty($product->post_excerpt)) ? $product->post_excerpt : wp_trim_words($product_data['product_content'], apply_filters('excerpt_length', 50), '...');
 
-			$product_data['product_meta_attribute_set_id'] = ( !empty($product->attribute_set_id) ) ? $product->attribute_set_id : '';
+			$product_data['product_meta_attribute_set_id'] = (!empty($product->attribute_set_id)) ? $product->attribute_set_id : '';
 
 			$data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), $product->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-			if ( !empty($data) ) {
+			if (!empty($data)) {
 				foreach ($data as $attribute) {
-					$data_type = 'attribute_value_'.$attribute->data_type;
+					$data_type = 'attribute_value_' . $attribute->data_type;
 					$value = $attribute->$data_type;
-					if (in_array($attribute->backend_input, array('select','multiple-select', 'radio','checkbox'))) {
+					if (in_array($attribute->backend_input, array('select', 'multiple-select', 'radio', 'checkbox'))) {
 						$value = wpshop_attributes::get_attribute_type_select_option_info($value, 'value');
 					}
 
 					/** Special traitment regarding attribute_code	*/
-					switch($attribute->attribute_code) {
+					switch ($attribute->attribute_code) {
 						case 'product_weight':
 							$default_weight_unity = get_option('wpshop_shop_default_weight_unity');
-							if ( !empty($default_weight_unity) ) {
-								$query = $wpdb->prepare('SELECT unit FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id = %d', $default_weight_unity);
+							if (!empty($default_weight_unity)) {
+								$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d', $default_weight_unity);
 								$unity = $wpdb->get_var($query);
-								if ( $unity == 'kg') {
+								if ($unity == 'kg') {
 									$value *= 1000;
 								}
 
@@ -1077,17 +1077,17 @@ 
 					}
 					$product_data[$attribute->attribute_code] = $value;
 
-					if(!$for_cart_storage OR $for_cart_storage && $attribute->is_recordable_in_cart_meta == 'yes') {
-						$meta = get_post_meta($product->ID, 'attribute_option_'.$attribute->attribute_code, true);
-						if(!empty($meta)) {
+					if (!$for_cart_storage OR $for_cart_storage && $attribute->is_recordable_in_cart_meta == 'yes') {
+						$meta = get_post_meta($product->ID, 'attribute_option_' . $attribute->attribute_code, true);
+						if (!empty($meta)) {
 							$product_meta[$attribute->attribute_code] = $meta;
 						}
 					}
 
-					if ( ($attribute->is_visible_in_front == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES))) ) {
+					if (($attribute->is_visible_in_front == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES)))) {
 						$product_meta['attribute_visible'][$attribute->attribute_code] = $value;
 					}
-					if ( ($attribute->is_visible_in_front_listing == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES))) ) {
+					if (($attribute->is_visible_in_front_listing == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES)))) {
 						$product_meta['attribute_visible_listing'][$attribute->attribute_code] = $value;
 					}
 				}
@@ -1097,16 +1097,16 @@ 
 			}
 
 			/**	Get datas about product options	*/
-			if ( $product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+			if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
 				$variation_details = get_post_meta($product->ID, '_wpshop_variations_attribute_def', true);
 
-				foreach ( $variation_details as $attribute_code => $attribute_value) {
+				foreach ($variation_details as $attribute_code => $attribute_value) {
 					$variation_id = $attribute_value;
 					$attribute_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 
 					$product_meta['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', $attribute_definition->data_type_to_use, true));
 					$product_meta['variation_definition'][$attribute_code]['NAME'] = $attribute_definition->frontend_label;
-					switch( $attribute_definition->backend_input ) {
+					switch ($attribute_definition->backend_input) {
 						case 'select':
 						case 'multiple-select':
 						case 'radio':
@@ -1135,7 +1135,7 @@ 
 	 * @param $attrs List of the attributes and values of the product
 	 * @return boolean
 	*/
-	function addProduct($name, $description, $attrs=array()) {
+	function addProduct($name, $description, $attrs = array()) {
 		$new_product = wpshop_entities::create_new_entity(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $name, $description, $attrs);
 		return $new_product[0];
 	}
@@ -1146,13 +1146,13 @@ 
 	 * @param string $product_search Optionnal Define a search term for request
 	 * @return object|string If $formated is set to true will display an html output with all product. Else return a wordpress database object with the product list
 	 */
-	function product_list($formated=false, $product_search=null) {
+	function product_list($formated = false, $product_search = null) {
 		global $wpdb;
 
 		$query_extra_params = $query_extra_params_value = '';
-		if( !empty($product_search) ) {
-			$query_extra_params = " AND post_title LIKE '%%".$product_search."%%'";
-			if ( is_array($product_search) ) {
+		if (!empty($product_search)) {
+			$query_extra_params = " AND post_title LIKE '%%" . $product_search . "%%'";
+			if (is_array($product_search)) {
 				$query_extra_params = " AND ID IN (%s)";
 				$query_extra_params_value = implode(",", $product_search);
 			}
@@ -1164,12 +1164,12 @@ 
 		/*
 		 * Make some arangement on output if parameter is given
 		 */
-		if ( $formated ) {
-			$product_string='';
+		if ($formated) {
+			$product_string = '';
 			foreach ($data as $d) {
 				$product_string .= '
 					<li class="wpshop_shortcode_element_container wpshop_shortcode_element_container_product" >
-						<input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_product" value="'.$d->ID.'" id="'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'-'.$d->ID.'" name="products[]" /><label for="'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'-'.$d->ID.'" > '.$d->post_title.'</label>
+						<input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_product" value="'.$d->ID . '" id="' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '-' . $d->ID . '" name="products[]" /><label for="' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '-' . $d->ID . '" > ' . $d->post_title . '</label>
 					</li>';
 			}
 		}
@@ -1180,17 +1180,17 @@ 
 	/**
 	 * Enregistrement des données pour le produit
 	 */
-	function save_product_custom_informations( $post_id , $data_to_save = array() ) {
+	function save_product_custom_informations($post_id, $data_to_save = array()) {
 		global $wpdb;
 
-		$data_to_save = ( !empty($data_to_save) ) ? $data_to_save : (array) $_REQUEST;
+		$data_to_save = (!empty($data_to_save)) ? $data_to_save : (array)$_REQUEST;
 		// Apply a filter to extra actions
-		$data_to_save = apply_filters( 'wps_save_product_extra_filter', $data_to_save );
+		$data_to_save = apply_filters('wps_save_product_extra_filter', $data_to_save);
 
-		if ( !empty($data_to_save['post_ID']) && ( (get_post_type($data_to_save['post_ID']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || (get_post_type($data_to_save['post_ID']) == "free_product") ) ) {
-			if ( !empty($data_to_save[wpshop_products::currentPageCode . '_attribute']) ) {
+		if (!empty($data_to_save['post_ID']) && ((get_post_type($data_to_save['post_ID']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || (get_post_type($data_to_save['post_ID']) == "free_product"))) {
+			if (!empty($data_to_save[wpshop_products::currentPageCode . '_attribute'])) {
 				/*	Fill the product reference automatically if nothing is sent	*/
-				if ( empty($data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference']) ) {
+				if (empty($data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'])) {
 					$query = "SELECT MAX(ID) AS PDCT_ID FROM {$wpdb->posts}";
 					$last_ref = $wpdb->get_var($query);
 					$data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
@@ -1200,16 +1200,16 @@ 
 					$ref = $data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'];
 					$query = $wpdb->prepare(
 						"SELECT value_id
-						FROM ".WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR."
+						FROM ".WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . "
 							INNER JOIN {$wpdb->posts} ON ( ID = entity_id )
 						WHERE value = %s
 							AND entity_id != %d
 							AND entity_type_id = %d"
 						, $ref, $data_to_save['post_ID'], wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
-					$existing_reference = $wpdb->get_var( $query );
+					$existing_reference = $wpdb->get_var($query);
 
 					/* If this product reference exist -> Create a new product reference */
-					if ( $wpdb->num_rows > 0 ) {
+					if ($wpdb->num_rows > 0) {
 						$query = "SELECT MAX(ID) AS PDCT_ID FROM " . $wpdb->posts;
 						$last_ref = $wpdb->get_var($query);
 						$data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
@@ -1219,27 +1219,27 @@ 
 				/*	Save the attributes values into wpshop eav database	*/
 				$update_from = !empty($data_to_save[wpshop_products::currentPageCode . '_provenance']) ? $data_to_save[wpshop_products::currentPageCode . '_provenance'] : '';
 				$lang = WPSHOP_CURRENT_LOCALE;
-				if ( !empty($data_to_save['icl_post_language']) ) {
+				if (!empty($data_to_save['icl_post_language'])) {
 					$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
 					$lang = $wpdb->get_var($query);
 				}
 				wpshop_attributes::saveAttributeForEntity($data_to_save[wpshop_products::currentPageCode . '_attribute'], wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $data_to_save['post_ID'], $lang, $update_from);
 
 				/*	Update product price looking for shop parameters	*/
-				wpshop_products::calculate_price( $data_to_save['post_ID'] );
+				wpshop_products::calculate_price($data_to_save['post_ID']);
 
 				/*	Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working	*/
 				$productMetaDatas = array();
-				foreach ( $data_to_save[wpshop_products::currentPageCode . '_attribute'] as $attributeType => $attributeValues ) {
-					foreach ( $attributeValues as $attributeCode => $attributeValue ) {
-						if ( $attributeCode == 'product_attribute_set_id' ) {
+				foreach ($data_to_save[wpshop_products::currentPageCode . '_attribute'] as $attributeType => $attributeValues) {
+					foreach ($attributeValues as $attributeCode => $attributeValue) {
+						if ($attributeCode == 'product_attribute_set_id') {
 							/*	Update the attribute set id for the current product	*/
 							update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $attributeValue);
 						}
-						if ( $attributeType == 'decimal' ) {
+						if ($attributeType == 'decimal') {
 							$attributeValue = str_replace(',', '.', $attributeValue);
 						}
-						if ( ($attributeType == 'integer') && !is_array($attributeValue) ) {
+						if (($attributeType == 'integer') && !is_array($attributeValue)) {
 							$attributeValue = (int)$attributeValue;
 						}
 						$productMetaDatas[$attributeCode] = $attributeValue;
@@ -1248,51 +1248,51 @@ 
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $productMetaDatas);
 			}
 
-			if ( !empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']) && empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']['default_config']) ) {
+			if (!empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']) && empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']['default_config'])) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, $data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']);
 			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			else if ($data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF);
 			}
 
 
-			$product = wpshop_products::get_product_data( $data_to_save['post_ID'], false, '"publish"' );
-			if( empty($product['product_id']) ) {
+			$product = wpshop_products::get_product_data($data_to_save['post_ID'], false, '"publish"');
+			if (empty($product['product_id'])) {
 				$product['product_id'] = $data_to_save['post_ID'];
 			}
-			$price = wpshop_prices::get_product_price( $product, 'just_price_infos', array('mini_output', 'grid') );
-			update_post_meta( $data_to_save['post_ID'], '_wps_price_infos', $price );
+			$price = wpshop_prices::get_product_price($product, 'just_price_infos', array('mini_output', 'grid'));
+			update_post_meta($data_to_save['post_ID'], '_wps_price_infos', $price);
 
 
 			/**	Save product variation	*/
-			if ( !empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION]) ) {
-				foreach ( $data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION] as $variation_id => $variation_definition ) {
+			if (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION])) {
+				foreach ($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION] as $variation_id => $variation_definition) {
 
-					foreach ( unserialize(WPSHOP_ATTRIBUTE_PRICES) as $price_attribute_code) {
+					foreach (unserialize(WPSHOP_ATTRIBUTE_PRICES) as $price_attribute_code) {
 						$price_attr_def = wpshop_attributes::getElement($price_attribute_code, "'valid'", 'code');
-						if ( !empty($variation_definition) && !empty($variation_definition['attribute']) && is_object($price_attr_def) && !empty($variation_definition['attribute'][$price_attr_def->data_type]) && is_array($variation_definition['attribute'][$price_attr_def->data_type]) && !array_key_exists($price_attribute_code, $variation_definition['attribute'][$price_attr_def->data_type]) ) {
+						if (!empty($variation_definition) && !empty($variation_definition['attribute']) && is_object($price_attr_def) && !empty($variation_definition['attribute'][$price_attr_def->data_type]) && is_array($variation_definition['attribute'][$price_attr_def->data_type]) && !array_key_exists($price_attribute_code, $variation_definition['attribute'][$price_attr_def->data_type])) {
 							$variation_definition['attribute'][$price_attr_def->data_type][$price_attribute_code] = !empty($data_to_save[wpshop_products::currentPageCode . '_attribute'][$price_attr_def->data_type][$price_attribute_code]) ? $data_to_save[wpshop_products::currentPageCode . '_attribute'][$price_attr_def->data_type][$price_attribute_code] : 0;
 						}
 					}
 					$lang = WPSHOP_CURRENT_LOCALE;
-					if ( !empty($data_to_save['icl_post_language']) ) {
+					if (!empty($data_to_save['icl_post_language'])) {
 						$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
 						$lang = $wpdb->get_var($query);
 					}
 					wpshop_attributes::saveAttributeForEntity($variation_definition['attribute'], wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, $lang);
 
 					/**	Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working	*/
-					$variation_metadata = get_post_meta( $variation_id, '_wpshop_product_metadata', true);
-					if ( !empty($variation_metadata) ) {
-						$attributes_list = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION),  $variation_id);
-						if ( !empty($attributes_list)) {
+					$variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
+					if (!empty($variation_metadata)) {
+						$attributes_list = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION), $variation_id);
+						if (!empty($attributes_list)) {
 							foreach ($attributes_list as $attribute) {
-								$value_key = 'attribute_value_'.$attribute->data_type;
+								$value_key = 'attribute_value_' . $attribute->data_type;
 								$attributeValue = $attribute->$value_key;
-								if ( $attribute->data_type == 'decimal' ) {
+								if ($attribute->data_type == 'decimal') {
 									$attributeValue = str_replace(',', '.', $attribute->$value_key);
 								}
-								if ( ($attribute->data_type == 'integer') && !is_array($attributeValue) ) {
+								if (($attribute->data_type == 'integer') && !is_array($attributeValue)) {
 									$attributeValue = (int)$attribute->$value_key;
 								}
 								$variation_metadata[$attribute->code] = $attribute->$value_key;
@@ -1300,12 +1300,12 @@ 
 						}
 					}
 
-					foreach ( $variation_definition['attribute'] as $attributeType => $attributeValues ) {
-						foreach ( $attributeValues as $attributeCode => $attributeValue ) {
-							if ( $attributeType == 'decimal' ) {
+					foreach ($variation_definition['attribute'] as $attributeType => $attributeValues) {
+						foreach ($attributeValues as $attributeCode => $attributeValue) {
+							if ($attributeType == 'decimal') {
 								$attributeValue = str_replace(',', '.', $attributeValue);
 							}
-							if ( ($attributeType == 'integer') && !is_array($attributeValue) ) {
+							if (($attributeType == 'integer') && !is_array($attributeValue)) {
 								$attributeValue = (int)$attributeValue;
 							}
 							$variation_metadata[$attributeCode] = $attributeValue;
@@ -1314,46 +1314,46 @@ 
 					update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $variation_metadata);
 
 					/** Save attached picture id **/
-					$attached_picture_id = ( !empty($data_to_save['wps_pdt_variations'][$variation_id]['wps_attached_picture_id']) ) ? intval( $data_to_save['wps_pdt_variations'][$variation_id]['wps_attached_picture_id'] ) : '';
-					$selected_picture = update_post_meta( $variation_id, '_wps_variation_attached_picture', $attached_picture_id );
+					$attached_picture_id = (!empty($data_to_save['wps_pdt_variations'][$variation_id]['wps_attached_picture_id'])) ? intval($data_to_save['wps_pdt_variations'][$variation_id]['wps_attached_picture_id']) : '';
+					$selected_picture = update_post_meta($variation_id, '_wps_variation_attached_picture', $attached_picture_id);
 
 					/*	Update product price looking for shop parameters	*/
-					wpshop_products::calculate_price( $variation_id );
+					wpshop_products::calculate_price($variation_id);
 				}
 			}
 
 			/*	Update the related products list*/
-			if ( !empty($data_to_save['related_products_list']) ) {
+			if (!empty($data_to_save['related_products_list'])) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS, $data_to_save['related_products_list']);
 			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			else if ($data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS);
 			}
 			/*	Update the provider list*/
-			if ( !empty($data_to_save['provider_list']) ) {
+			if (!empty($data_to_save['provider_list'])) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER, $data_to_save['provider_list']);
 			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			else if ($data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER);
 			}
 
 			/*	Update product options	*/
-			if ( !empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']) ) {
+			if (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options'])) {
 				update_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', $data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']);
 			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			else if ($data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
 			}
 
 			/** Add flag on variations to check which type of variation **/
-			$check_product_have_variations = self::get_variation( $post_id );
-			if( !empty($check_product_have_variations) ) {
-				$variation_flag = self::check_variation_type( $post_id );
-				$variation_defining = get_post_meta( $post_id, '_wpshop_variation_defining', true );
+			$check_product_have_variations = self::get_variation($post_id);
+			if (!empty($check_product_have_variations)) {
+				$variation_flag = self::check_variation_type($post_id);
+				$variation_defining = get_post_meta($post_id, '_wpshop_variation_defining', true);
 				$variation_defining['variation_type'] = $variation_flag;
-				update_post_meta( $post_id, '_wpshop_variation_defining', $variation_defining );
+				update_post_meta($post_id, '_wpshop_variation_defining', $variation_defining);
 			}
-			add_post_meta( $post_id, '_wpshop_variation_defining', array( 'follow_general_config' => true, 'options' => array( 'priority' => array( 'combined' ), 'price_behaviour' => array( 'replacement' ), 'price_display' => ( !empty($catalog_product_option) && !empty($catalog_product_option['price_display']) ) ? $catalog_product_option['price_display'] : array( 'text_from' => 'on', 'lower_price' => 'on' ) ) ), true );
+			add_post_meta($post_id, '_wpshop_variation_defining', array('follow_general_config' => true, 'options' => array('priority' => array('combined'), 'price_behaviour' => array('replacement'), 'price_display' => (!empty($catalog_product_option) && !empty($catalog_product_option['price_display'])) ? $catalog_product_option['price_display'] : array('text_from' => 'on', 'lower_price' => 'on'))), true);
 		}
 
 		flush_rewrite_rules();
@@ -1364,16 +1364,16 @@ 
 	 * @param integer $post_id
 	 * @return string
 	 */
-	public function check_variation_type( $post_id ) {
+	public function check_variation_type($post_id) {
 		$variation_type = 'single';
-		if( !empty($variation_type) ) {
-			$variations = self::get_variation( $post_id );
-			if( !empty($variations) ) {
-				foreach( $variations as $variation_id => $variation_data ) {
-					if( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) == 1 ) {
+		if (!empty($variation_type)) {
+			$variations = self::get_variation($post_id);
+			if (!empty($variations)) {
+				foreach ($variations as $variation_id => $variation_data) {
+					if (!empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) == 1) {
 						return 'single';
 					}
-					elseif( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1 ) {
+					elseif (!empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1) {
 						$variation_type = 'combined';
 					}
 				}
@@ -1391,21 +1391,21 @@ 
 	 *
 	 * @return mixed The new permalink for the current element
 	 */
-	public static function set_product_permalink($permalink, $post, $unknown){
+	public static function set_product_permalink($permalink, $post, $unknown) {
 		$options = get_option('wpshop_catalog_product_option', array());
 
-		if( $post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT /* && 'publish' == $post->post_status */ ) {
-			if( !isset( $options['wpshop_catalog_product_slug_with_category'] ) || $options['wpshop_catalog_product_slug_with_category'] != 'yes' ) {
+		if ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT /* && 'publish' == $post->post_status */) {
+			if (!isset($options['wpshop_catalog_product_slug_with_category']) || $options['wpshop_catalog_product_slug_with_category'] != 'yes') {
 				return $permalink;
 			} else {
-				$options_cats = get_option( 'wpshop_catalog_categories_option', array() );
-				$product_categories = wp_get_object_terms( $post->ID, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES );
-				if( empty( $product_categories ) ) {
+				$options_cats = get_option('wpshop_catalog_categories_option', array());
+				$product_categories = wp_get_object_terms($post->ID, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
+				if (empty($product_categories)) {
 					$product_category_slug = $options_cats['wpshop_catalog_no_category_slug'];
 				} else {
 					$product_category_slug = $product_categories[0]->slug;
 				}
-				$permalink = str_replace( '%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%', $product_category_slug, $permalink );
+				$permalink = str_replace('%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%', $product_category_slug, $permalink);
 			}
 		}
 
@@ -1439,10 +1439,10 @@ 
 		}*/
 	}
 
-	public static function set_product_request_by_name( $query ) {
+	public static function set_product_request_by_name($query) {
 		$options = get_option('wpshop_catalog_product_option', array());
 
-		if ( $query->is_main_query() && ( 2 == count( $query->query ) || isset( $query->query['page'] ) ) && ! empty( $query->query['name'] ) && empty( $options['wpshop_catalog_product_slug'] ) );
+		if ($query->is_main_query() && (2 == count($query->query) || isset($query->query['page'])) && !empty($query->query['name']) && empty($options['wpshop_catalog_product_slug']));
 		//	$query->set( 'post_type', array( 'post', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'page' ) );
 	}
 
@@ -1466,57 +1466,57 @@ 
 		/** Get product definition	*/
 
 		$product = self::get_product_data($product_id);
-		wp_cache_set( 'wpshop_product_data_'.$product_id, $product );
+		wp_cache_set('wpshop_product_data_' . $product_id, $product);
 
 		/** Get the product thumbnail	*/
 		$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-		if ( has_post_thumbnail($product_id) ) {
-			$thumbnail_url = wp_get_attachment_image_src( get_post_thumbnail_id(), 'full' );
+		if (has_post_thumbnail($product_id)) {
+			$thumbnail_url = wp_get_attachment_image_src(get_post_thumbnail_id(), 'full');
 			$tpl_component = array();
 			$tpl_component['PRODUCT_THUMBNAIL_URL'] = $thumbnail_url[0];
-			$tpl_component['PRODUCT_THUMBNAIL'] = get_the_post_thumbnail( $product_id, 'wpshop-product-galery' );
-			$tpl_component['PRODUCT_THUMBNAIL_FULL'] = get_the_post_thumbnail( $product_id, 'full' );
-			$image_attributes = wp_get_attachment_metadata( get_post_thumbnail_id() );
-			if ( !empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes']) ) {
-				foreach ( $image_attributes['sizes'] as $size_name => $size_def) {
+			$tpl_component['PRODUCT_THUMBNAIL'] = get_the_post_thumbnail($product_id, 'wpshop-product-galery');
+			$tpl_component['PRODUCT_THUMBNAIL_FULL'] = get_the_post_thumbnail($product_id, 'full');
+			$image_attributes = wp_get_attachment_metadata(get_post_thumbnail_id());
+			if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
+				foreach ($image_attributes['sizes'] as $size_name => $size_def) {
 					$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = wp_get_attachment_image(get_post_thumbnail_id(), $size_name);
-					$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = ( !empty( $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] ) ) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+					$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = (!empty($tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)])) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
 				}
 			}
-			$tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] = ( !empty( $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] ) ) ? $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
-			$productThumbnail = wpshop_display::display_template_element( 'product_thumbnail', $tpl_component );
+			$tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] = (!empty($tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'])) ? $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+			$productThumbnail = wpshop_display::display_template_element('product_thumbnail', $tpl_component);
 			unset($tpl_component);
 		}
 
-		$product_document_galery = wps_media_manager_frontend_ctr::get_product_complete_sheet_attachments( $product_id );
+		$product_document_galery = wps_media_manager_frontend_ctr::get_product_complete_sheet_attachments($product_id);
 
 		/**	Retrieve product attributes for output	*/
-		$attributeContentOutput = wpshop_attributes::attribute_of_entity_to_tab( wpshop_entities::get_entity_identifier_from_code( self::currentPageCode ), $product_id, $product);
+		$attributeContentOutput = wpshop_attributes::attribute_of_entity_to_tab(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $product_id, $product);
 
 		/** Retrieve product price */
-		$price_attribute = wpshop_attributes::getElement( 'product_price', "'valid'", 'code' );
-		$price_display = wpshop_attributes::check_attribute_display( $price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
-		$catalog_options = get_option( 'wpshop_catalog_main_option' , array() );
+		$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+		$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
+		$catalog_options = get_option('wpshop_catalog_main_option', array());
 		$productPrice = '';
 		$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
 		$check_product_price = wpshop_prices::check_product_price($product);
-		$result_price_piloting = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
-		if ( $price_display && !( !empty( $catalog_options ) && ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) && $result_price_piloting == 0 ) ) {
+		$result_price_piloting = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
+		if ($price_display && !(!empty($catalog_options) && (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes') && $result_price_piloting == 0)) {
 			$productPrice = wpshop_prices::get_product_price($product, 'price_display', 'complete_sheet');
 		}
 
 		/** Check if there is at less 1 product in stock	*/
 		$productStock = $wps_product_ctr->check_stock($product_id, 1);
-		$productStock = ( $productStock === true ) ? 1 : null;
+		$productStock = ($productStock === true) ? 1 : null;
 
 		/** if !product stock check product have variation with stock **/
 // 		if ( empty($productStock) ) {
-			$product_variation_meta = get_post_meta( $product_id, '_wpshop_variation_defining', true );
-			if ( !empty($product_variation_meta) && !empty($product_variation_meta['options']) && !empty($product_variation_meta['options']['priority']) && in_array('combined', $product_variation_meta['options']['priority']) ) {
-				$variations = wpshop_products::get_variation( $product_id );
-				if ( !empty($variations) ) {
-					foreach( $variations as $variation ) {
-						if ( !empty($variation) && !empty($variation['variation_dif']) && array_key_exists('product_stock', $variation['variation_dif']) && round( $variation['variation_dif']['product_stock'] ) > 0 ) {
+			$product_variation_meta = get_post_meta($product_id, '_wpshop_variation_defining', true);
+			if (!empty($product_variation_meta) && !empty($product_variation_meta['options']) && !empty($product_variation_meta['options']['priority']) && in_array('combined', $product_variation_meta['options']['priority'])) {
+				$variations = wpshop_products::get_variation($product_id);
+				if (!empty($variations)) {
+					foreach ($variations as $variation) {
+						if (!empty($variation) && !empty($variation['variation_dif']) && array_key_exists('product_stock', $variation['variation_dif']) && round($variation['variation_dif']['product_stock']) > 0) {
 							$productStock = 1;
 						}
 					}
@@ -1525,16 +1525,16 @@ 
 // 		}
 
 		/** Define "Add to cart" button	 */
-		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display( ((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'complete_sheet');
+		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display(((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'complete_sheet');
 		$display_price_state_when_price_is_empty = true;
-		if ( empty( $productPrice ) && ( !empty( $catalog_options ) || ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) ) ) {
+		if (empty($productPrice) && (!empty($catalog_options) || (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes'))) {
 			$display_price_state_when_price_is_empty = false;
 		}
-		else if ( !empty( $productPrice ) ) {
+		else if (!empty($productPrice)) {
 			$display_price_state_when_price_is_empty = true;
 		}
-		$add_to_cart_button = ( true === $add_to_cart_button_display_state)  && ( true === $display_price_state_when_price_is_empty ) ? self::display_add_to_cart_button( $product_id, $productStock, 'complete' ) : '';
-		$product_quantity_chooser_input = ( true === $add_to_cart_button_display_state ) ? wpshop_display::display_template_element( 'product_complete_sheet_quantity_chooser', array( 'PRODUCT_ID' => $product_id, ) ) : '';
+		$add_to_cart_button = (true === $add_to_cart_button_display_state) && (true === $display_price_state_when_price_is_empty) ? self::display_add_to_cart_button($product_id, $productStock, 'complete') : '';
+		$product_quantity_chooser_input = (true === $add_to_cart_button_display_state) ? wpshop_display::display_template_element('product_complete_sheet_quantity_chooser', array('PRODUCT_ID' => $product_id,)) : '';
 
 		/** Define "Ask a quotation" button	*/
 		$quotation_button = self::display_quotation_button($product_id, (!empty($product['quotation_allowed']) ? $product['quotation_allowed'] : null), 'complete');
@@ -1551,14 +1551,14 @@ 
 		$tpl_component['PRODUCT_PRICE'] = $productPrice;
 		$modules_option = get_option('wpshop_modules');
 		$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = '';
-		if ( !empty($modules_option) && !empty($modules_option['wpshop_low_stock_alert']) && $modules_option['wpshop_low_stock_alert']['activated'] == 'on' ) {
+		if (!empty($modules_option) && !empty($modules_option['wpshop_low_stock_alert']) && $modules_option['wpshop_low_stock_alert']['activated'] == 'on') {
 			$wps_marketing_tools = new wps_marketing_tools_ctr();
-			$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = $wps_marketing_tools->display_alert_stock_message( array( 'id' => $product_id ) );
+			$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = $wps_marketing_tools->display_alert_stock_message(array('id' => $product_id));
 		}
 
 
 		/** Gallery **/
-		$tpl_component['PRODUCT_COMPLETE_SHEET_GALLERY'] = wps_media_manager_frontend_ctr::get_product_complete_sheet_galery( $product_id );
+		$tpl_component['PRODUCT_COMPLETE_SHEET_GALLERY'] = wps_media_manager_frontend_ctr::get_product_complete_sheet_galery($product_id);
 
 		$product_new_def = self::display_product_special_state('declare_new', 'complete', (!empty($product['declare_new']) ? $product['declare_new'] : 'no'), (!empty($product['set_new_from']) ? $product['set_new_from'] : ''), (!empty($product['set_new_to']) ? $product['set_new_to'] : ''));
 
@@ -1577,14 +1577,14 @@ 
 		$tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] = $add_to_cart_button;
 		$tpl_component['PRODUCT_BUTTON_QUOTATION'] = $quotation_button;
 		$tpl_component['PRODUCT_QUANTITY_CHOOSER'] = $product_quantity_chooser_input;
-		$tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_QUOTATION'].$tpl_component['PRODUCT_BUTTON_ADD_TO_CART'];
+		$tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_QUOTATION'] . $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'];
 		$tpl_component['PRODUCT_GALERY_DOCS'] = $product_document_galery;
 		$tpl_component['PRODUCT_FEATURES'] = $attributeContentOutput;
-		$tpl_component = apply_filters( 'wps-filter-product-complete-sheet-output', $tpl_component, $product_id );
+		$tpl_component = apply_filters('wps-filter-product-complete-sheet-output', $tpl_component, $product_id);
 
 		/** Build template	*/
 		$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-		if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+		if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 			/*	Include the old way template part	*/
 			ob_start();
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -1605,14 +1605,14 @@ 
 
 		/** Get the product thumbnail	*/
 		$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-		if(has_post_thumbnail($product_id)){
+		if (has_post_thumbnail($product_id)) {
 			$productThumbnail = get_the_post_thumbnail($product_id, 'thumbnail');
 		}
 
 		$product = self::get_product_data($product_id);
 
 		/**	Get the product information for output	*/
-		if ( !empty($product) ) {
+		if (!empty($product)) {
 
 			$product_title = $product['post_title'];
 			$product_name = $product['post_name'];
@@ -1620,7 +1620,7 @@ 
 			$product_more_informations = $product['product_content'];
 			$product_excerpt = $product['product_excerpt'];
 
-			if ( strpos($product['product_content'], '<!--more-->') ) {
+			if (strpos($product['product_content'], '<!--more-->')) {
 				$post_content = explode('<!--more-->', $product['product_content']);
 				$product_more_informations = $post_content[0];
 			}
@@ -1628,55 +1628,55 @@ 
 		}
 		else {
 			$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-			$product_title = '<i>'.__('This product does not exist', 'wpshop').'</i>';
+			$product_title = '<i>' . __('This product does not exist', 'wpshop') . '</i>';
 			$product_link = '';
 			$product_more_informations = '';
 			$product_excerpt = '';
 		}
 
 		/** Retrieve product price	*/
-		$price_attribute = wpshop_attributes::getElement( 'product_price', "'valid'", 'code' );
-		$price_display = wpshop_attributes::check_attribute_display( $price_attribute->is_visible_in_front_listing, $product['custom_display'], 'attribute', 'product_price', 'mini_output');
-		$catalog_options = get_option( 'wpshop_catalog_main_option' , array() );
+		$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+		$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front_listing, $product['custom_display'], 'attribute', 'product_price', 'mini_output');
+		$catalog_options = get_option('wpshop_catalog_main_option', array());
 		$productPrice = '';
 		$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
 		$check_product_price = wpshop_prices::check_product_price($product);
-		$result_price_piloting = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
-		if ( $price_display && !( !empty( $catalog_options ) && ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) && $result_price_piloting == 0 ) ) {
-			$product_price_infos = wpshop_prices::get_product_price( $product, 'just_price_infos', 'mini_output' );
+		$result_price_piloting = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
+		if ($price_display && !(!empty($catalog_options) && (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes') && $result_price_piloting == 0)) {
+			$product_price_infos = wpshop_prices::get_product_price($product, 'just_price_infos', 'mini_output');
 			
-	 		if ( !empty($product_price_infos) ) {
+	 		if (!empty($product_price_infos)) {
 	 			$tpl_component_price = array();
 	 			/** Price piloting **/
-	 			$price_ploting = get_option( 'wpshop_shop_price_piloting' );
-	 			$tpl_component_price['CROSSED_OUT_PRICE'] = ( !empty($product_price_infos['CROSSED_OUT_PRICE']) ) ? ( ( !empty($product_price_infos['PRICE_FROM']) ) ? __('Price from', 'wpshop') . ' ' : '' ) . wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $product_price_infos['CROSSED_OUT_PRICE'])) : '';
-	 			$variations = wpshop_products::get_variation( $product_id );
-				$tpl_component_price['PRODUCT_PRICE'] = ( empty($product_price_infos['CROSSED_OUT_PRICE']) && ( !empty( $variations ) && !empty($product_price_infos['PRICE_FROM'] ) ) ) ? __('Price from', 'wpshop') . ' ' . $product_price_infos['PRODUCT_PRICE'] : $product_price_infos['PRODUCT_PRICE'];
+	 			$price_ploting = get_option('wpshop_shop_price_piloting');
+	 			$tpl_component_price['CROSSED_OUT_PRICE'] = (!empty($product_price_infos['CROSSED_OUT_PRICE'])) ? ((!empty($product_price_infos['PRICE_FROM'])) ? __('Price from', 'wpshop') . ' ' : '') . wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $product_price_infos['CROSSED_OUT_PRICE'])) : '';
+	 			$variations = wpshop_products::get_variation($product_id);
+				$tpl_component_price['PRODUCT_PRICE'] = (empty($product_price_infos['CROSSED_OUT_PRICE']) && (!empty($variations) && !empty($product_price_infos['PRICE_FROM']))) ? __('Price from', 'wpshop') . ' ' . $product_price_infos['PRODUCT_PRICE'] : $product_price_infos['PRODUCT_PRICE'];
 	 			$tpl_component_price['MESSAGE_SAVE_MONEY'] = $product_price_infos['MESSAGE_SAVE_MONEY'];
-	 			$tpl_component_price['TAX_PILOTING'] = (!empty($price_ploting) && $price_ploting == 'HT' ) ? __('ET', 'wpshop') : ''; $product_price_infos['MESSAGE_SAVE_MONEY'];
-	 			$productPrice = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component_price );
+	 			$tpl_component_price['TAX_PILOTING'] = (!empty($price_ploting) && $price_ploting == 'HT') ? __('ET', 'wpshop') : ''; $product_price_infos['MESSAGE_SAVE_MONEY'];
+	 			$productPrice = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component_price);
 	 		}
 			else {
-				$productPrice = wpshop_prices::get_product_price($product, 'price_display', array('mini_output', $output_type) );
+				$productPrice = wpshop_prices::get_product_price($product, 'price_display', array('mini_output', $output_type));
 	 		}
 		}
 
 		/** Check if there is at less 1 product in stock	*/
 		$wps_product_ctr = new wps_product_ctr();
 		$productStock = $wps_product_ctr->check_stock($product_id, 1);
-		$productStock = $productStock===true ? 1 : null;
+		$productStock = $productStock === true ? 1 : null;
 
 		/** Define "Add to cart" button	*/
-		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display( ((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'mini_output');
+		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display(((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'mini_output');
 		$display_price_state_when_price_is_empty = false;
-		if ( empty( $productPrice ) && ( !empty( $catalog_options ) || ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) ) ) {
+		if (empty($productPrice) && (!empty($catalog_options) || (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes'))) {
 			$display_price_state_when_price_is_empty = false;
 		}
-		else if ( !empty( $productPrice ) ) {
+		else if (!empty($productPrice)) {
 			$display_price_state_when_price_is_empty = true;
 		}
-		$add_to_cart_button = ( true === $add_to_cart_button_display_state)  && ( true === $display_price_state_when_price_is_empty ) ? self::display_add_to_cart_button( $product_id, $productStock, 'mini' ) : '';
-		$product_quantity_chooser_input = ( true === $add_to_cart_button_display_state ) ? wpshop_display::display_template_element( 'product_complete_sheet_quantity_chooser', array( 'PRODUCT_ID' => $product_id, ) ) : '';
+		$add_to_cart_button = (true === $add_to_cart_button_display_state) && (true === $display_price_state_when_price_is_empty) ? self::display_add_to_cart_button($product_id, $productStock, 'mini') : '';
+		$product_quantity_chooser_input = (true === $add_to_cart_button_display_state) ? wpshop_display::display_template_element('product_complete_sheet_quantity_chooser', array('PRODUCT_ID' => $product_id,)) : '';
 
 		/** Define "Ask a quotation" button	*/
 		$quotation_button = self::display_quotation_button($product_id, (!empty($product['quotation_allowed']) ? $product['quotation_allowed'] : null));
@@ -1690,11 +1690,11 @@ 
 		$product_featured = $product_featured_def['output'];
 		$product_class .= $product_featured_def['class'];
 
-		if ( !($current_item_position%$grid_element_nb_per_line) ) {
+		if (!($current_item_position % $grid_element_nb_per_line)) {
 			$product_class .= ' wpshop_last_product_of_line';
 		}
 
-		if ( !empty($product['product_id']) ) {
+		if (!empty($product['product_id'])) {
 			/** Template parameters	*/
 			$template_part = 'product_mini_' . $output_type;
 			$tpl_component = array();
@@ -1708,7 +1708,7 @@ 
 			$tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] . $tpl_component['PRODUCT_BUTTON_QUOTATION'];
 			$tpl_component['PRODUCT_PRICE'] = $productPrice;
 			$tpl_component['PRODUCT_PERMALINK'] = $product_link;
-			$tpl_component['PRODUCT_TITLE'] = ( !empty($product_title) ) ? $product_title  : '';
+			$tpl_component['PRODUCT_TITLE'] = (!empty($product_title)) ? $product_title : '';
 			$tpl_component['PRODUCT_NAME'] = $product_name;
 			$tpl_component['PRODUCT_DESCRIPTION'] = $product_more_informations;
 			$tpl_component['PRODUCT_IS_NEW'] = $product_new;
@@ -1716,24 +1716,24 @@ 
 			$tpl_component['PRODUCT_EXTRA_STATE'] = $tpl_component['PRODUCT_IS_NEW'] . $tpl_component['PRODUCT_IS_FEATURED'];
 			$tpl_component['PRODUCT_THUMBNAIL'] = $productThumbnail;
 
-			if ( has_post_thumbnail($product_id) ) {
-				$image_attributes = wp_get_attachment_metadata( get_post_thumbnail_id($product_id)  );
-				if ( !empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes']) ) {
+			if (has_post_thumbnail($product_id)) {
+				$image_attributes = wp_get_attachment_metadata(get_post_thumbnail_id($product_id));
+				if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
 					$existing_image_sizes = get_intermediate_image_sizes();
-					foreach ( $existing_image_sizes as $size_name) {
+					foreach ($existing_image_sizes as $size_name) {
 						$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = wp_get_attachment_image(get_post_thumbnail_id($product_id), $size_name);
-						$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = ( !empty( $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] ) ) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+						$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = (!empty($tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)])) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
 					}
 				}
 			}
 
 			$tpl_component['PRODUCT_EXCERPT'] = $product_excerpt;
 			$tpl_component['PRODUCT_OUTPUT_TYPE'] = $output_type;
-			$tpl_component = apply_filters( 'wps-filter-product-mini-output', $tpl_component, $product_id );
+			$tpl_component = apply_filters('wps-filter-product-mini-output', $tpl_component, $product_id);
 
 			/** Build template	*/
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/**	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -1760,18 +1760,18 @@ 
 	*
 	*	@return mixed $widget_content The output for the product list
 	*/
-	public static function get_product_of_category($category_slug, $category_id){
+	public static function get_product_of_category($category_slug, $category_id) {
 		global $top_categories;
 		$widget_content = '';
-		$products = wp_cache_get( 'wpshop_products_category_'.$category_id );
-		if( false == $products ) {
+		$products = wp_cache_get('wpshop_products_category_' . $category_id);
+		if (false == $products) {
 			$args = array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES => $category_slug);
 			$products = get_posts($args);
-			wp_cache_set( 'wpshop_products_category_'.$category_id, $products );
+			wp_cache_set('wpshop_products_category_' . $category_id, $products);
 		}
-		if(is_array($products) && (count($products) > 0)){
-			foreach($products as $product){
-				if ( $product->post_status == "publish" ) {
+		if (is_array($products) && (count($products) > 0)) {
+			foreach ($products as $product) {
+				if ($product->post_status == "publish") {
 					ob_start();
 					require(wpshop_display::get_template_file('categories_products-widget.tpl.php'));
 					$widget_content .= ob_get_contents();
@@ -1788,7 +1788,7 @@ 
 	 * @param unknown_type $selected_product
 	 * @return string
 	 */
-	function custom_product_list($selected_product = array()){
+	function custom_product_list($selected_product = array()) {
 		global $wpdb;
 
 		/*	Start the table definition	*/
@@ -1816,9 +1816,9 @@ 
 		$posts = query_posts(array(
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'posts_per_page' => -1
 		));
-		if(!empty($posts)){
+		if (!empty($posts)) {
 			$has_result = true;
-			foreach($posts as $post){
+			foreach ($posts as $post) {
 				$tableRowsId[$current_line_index] = 'product_' . $post->ID;
 
 				$post_info = get_post_meta($post->ID, '_wpshop_product_metadata', true);
@@ -1826,12 +1826,12 @@ 
 				unset($tableRowValue);
 				$tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '<input type="checkbox" name="wp_list_product[]" value="' . $post->ID . '" class="wpshop_product_cb_dialog" id="wpshop_product_cb_dialog_' . $post->ID . '" />');
 				$tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '<label for="wpshop_product_cb_dialog_' . $post->ID . '" >' . WPSHOP_IDENTIFIER_PRODUCT . $post->ID . '</label>');
-				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID  . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
-				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => ( !empty($post_info['product_reference']) ) ? $post_info['product_reference'] : '');
+				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => (!empty($post_info['product_reference'])) ? $post_info['product_reference'] : '');
 				$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
 				$tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '<a href="' . $post->guid . '" target="wpshop_product_view_product" target="wpshop_view_product" >' . __('View product', 'wpshop') . '</a><br/>
-				<a href="' . admin_url('post.php?post=' . $post->ID  . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
-				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ( ( !empty( $post_info[WPSHOP_PRODUCT_PRICE_HT]) ) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT],2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ( ( !empty($post_info[WPSHOP_PRODUCT_PRICE_TTC]) ) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC],2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
+				<a href="' . admin_url('post.php?post=' . $post->ID . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_HT])) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_TTC])) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
 				$tableRows[] = $tableRowValue;
 
 				$current_line_index++;
@@ -1841,9 +1841,9 @@ 
 		$posts = query_posts(array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'posts_per_page' => -1
 		));
-		if(!empty($posts)){
+		if (!empty($posts)) {
 			$has_result = true;
-			foreach($posts as $post){
+			foreach ($posts as $post) {
 				$tableRowsId[$current_line_index] = 'product_' . $post->ID;
 
 				$post_info = get_post_meta($post->ID, '_wpshop_product_metadata', true);
@@ -1851,25 +1851,25 @@ 
 				unset($tableRowValue);
 				$tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '<input type="checkbox" name="wp_list_product[]" value="' . $post->ID . '" class="wpshop_product_cb_dialog" id="wpshop_product_cb_dialog_' . $post->ID . '" />');
 				$tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '<label for="wpshop_product_cb_dialog_' . $post->ID . '" >' . WPSHOP_IDENTIFIER_PRODUCT . $post->ID . '</label>');
-				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID  . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
-				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => ( !empty($post_info['product_reference']) ) ? $post_info['product_reference'] : '');
+				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => (!empty($post_info['product_reference'])) ? $post_info['product_reference'] : '');
 				$parent_product = wpshop_products::get_parent_variation($post->ID);
-				if ( !empty($parent_product) && !empty($parent_product['parent_post']) ) {
-					$product_variations_postmeta = get_post_meta($post->ID,'_wpshop_variations_attribute_def', true);
-					$query = $wpdb->prepare('SELECT frontend_label FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s', key($product_variations_postmeta) );
+				if (!empty($parent_product) && !empty($parent_product['parent_post'])) {
+					$product_variations_postmeta = get_post_meta($post->ID, '_wpshop_variations_attribute_def', true);
+					$query = $wpdb->prepare('SELECT frontend_label FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', key($product_variations_postmeta));
 					$option_name = $wpdb->get_var($query);
-					$query = $wpdb->prepare('SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $product_variations_postmeta[key($product_variations_postmeta)]);
+					$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $product_variations_postmeta[key($product_variations_postmeta)]);
 					$option_value = $wpdb->get_var($query);
 					$parent_post = $parent_product['parent_post'];
-					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $parent_post->post_title. ' <br/>('. $option_name . ' : ' . $option_value. ')');
+					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $parent_post->post_title . ' <br/>(' . $option_name . ' : ' . $option_value . ')');
 				}
 				else {
 					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
 				}
 
 				$tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '<a href="' . $post->guid . '" target="wpshop_product_view_product" target="wpshop_view_product" >' . __('View product', 'wpshop') . '</a><br/>
-				<a href="' . admin_url('post.php?post=' . $post->ID  . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
-				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ( ( !empty( $post_info[WPSHOP_PRODUCT_PRICE_HT]) ) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT],2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ( ( !empty($post_info[WPSHOP_PRODUCT_PRICE_TTC]) ) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC],2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
+				<a href="' . admin_url('post.php?post=' . $post->ID . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_HT])) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_TTC])) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
 				$tableRows[] = $tableRowValue;
 
 				$current_line_index++;
@@ -1927,15 +1927,15 @@ 
 
 		/** PRODUCT MARK AS NEW */
 		$show_product_special_state = false;
-		if ( (strtolower(__($special_state_def, 'wpshop')) === strtolower(__('Yes', 'wpshop')) ) &&
+		if ((strtolower(__($special_state_def, 'wpshop')) === strtolower(__('Yes', 'wpshop'))) &&
 				(empty($special_state_start) || ($special_state_start == '0000-00-00') || ($special_state_start >= $current_time)) &&
-				(empty($special_state_end) || ($special_state_end == '0000-00-00') || ($special_state_end <= $current_time)) ) {
+				(empty($special_state_end) || ($special_state_end == '0000-00-00') || ($special_state_end <= $current_time))) {
 			$show_product_special_state = true;
 		}
 
-		if ( $show_product_special_state ) {
+		if ($show_product_special_state) {
 			/** Check the type of special output needed	*/
-			switch ( $special ) {
+			switch ($special) {
 				case 'declare_new':
 					$product_special_state['class'] = ' wpshop_product_is_new_' . $output_type;
 					$template_part = 'product_is_new_sticker';
@@ -1952,7 +1952,7 @@ 
 
 			/** Build template		*/
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/**	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -1975,7 +1975,7 @@ 
 	 *
 	 * @param integer $element_id Identifier of current product
 	 */
-	public static function calculate_price( $element_id ) {
+	public static function calculate_price($element_id) {
 		global $wpdb;
 
 		/**
@@ -1987,13 +1987,13 @@ 
 			"SELECT ATTR.code, ATTR_VAL.value_id AS id, ATTR_VAL.value, ATTR.id AS attribute_id
 			FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR
 				RIGHT JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " AS ATTR_VAL ON ((ATTR_VAL.attribute_id = ATTR.id) AND (ATTR_VAL.entity_id = %d))
-			WHERE ATTR.code IN ('" . implode( "', '",  unserialize( WPSHOP_ATTRIBUTE_PRICES ) ) . "')",
+			WHERE ATTR.code IN ('" . implode("', '", unserialize(WPSHOP_ATTRIBUTE_PRICES)) . "')",
 			$element_id
 		);
-		$prices_attribute = $wpdb->get_results( $query, OBJECT_K );
+		$prices_attribute = $wpdb->get_results($query, OBJECT_K);
 
 		/** Si aucun prix trouvé on stop la méthode / If not found price, stop the method */
-		if( empty( $prices_attribute ) ) {
+		if (empty($prices_attribute)) {
 			return false;
 		}
 		else {
@@ -2001,18 +2001,18 @@ 
 			 * Récupère le prix de base selon le pilotage de prix de la boutique / Get
 			 * the base amount according on the shop price control
 			 */
-			$base_price 		= $prices_attribute[constant( 'WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT )]->value;
-			$rate_vat			= wpshop_prices::get_rate_vat( $element_id );
-			$divider_price_ttc 	= 1 + ( $rate_vat->value / 100 );
+			$base_price = $prices_attribute[constant('WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT)]->value;
+			$rate_vat = wpshop_prices::get_rate_vat($element_id);
+			$divider_price_ttc = 1 + ($rate_vat->value / 100);
 
 			/**
 			 * Informations nécessaire pour crée un attribut / Information needed to
 			 * create an attribute
 			 */
-			$entity_type_id	= wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-			$language 		= WPSHOP_CURRENT_LOCALE;
+			$entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$language = WPSHOP_CURRENT_LOCALE;
 
-			if ( !empty($_REQUEST['icl_post_language']) ) {
+			if (!empty($_REQUEST['icl_post_language'])) {
 				$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", sanitize_text_field($_REQUEST['icl_post_language']));
 				$language = $wpdb->get_var($query);
 			}
@@ -2021,13 +2021,13 @@ 
 			 * Vérifie la configuration pour savoir comment calculer les prix pour le produit /
 			 * Check configuration to know how to make the calcul for the product
 			 */
-			if ( WPSHOP_PRODUCT_PRICE_PILOT == 'HT' ) {
-				$price_with_vat = ($base_price * $divider_price_ttc );
-				$price_no_vat 	= $base_price;
+			if (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') {
+				$price_with_vat = ($base_price * $divider_price_ttc);
+				$price_no_vat = $base_price;
 			}
-			else if ( WPSHOP_PRODUCT_PRICE_PILOT == 'TTC' ) {
+			else if (WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') {
 				$price_with_vat = $base_price;
-				$price_no_vat	= ($price_with_vat / $divider_price_ttc );
+				$price_no_vat = ($price_with_vat / $divider_price_ttc);
 			}
 
 			/**
@@ -2035,29 +2035,29 @@ 
 			 * type que celui-ci / The last parameter allows not to delete the
 			 * attributes of the same type as this one
 			 */
-			wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'product_price' => $price_with_vat )), $entity_type_id, $element_id, $language, 'wpshop_products' );
-			wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'price_ht' => $price_no_vat )), $entity_type_id, $element_id, $language, 'wpshop_product' );
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('product_price' => $price_with_vat)), $entity_type_id, $element_id, $language, 'wpshop_products');
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('price_ht' => $price_no_vat)), $entity_type_id, $element_id, $language, 'wpshop_product');
 
 			/** Ajout ou met à jour de l'attribut tva / Add or update the attribute vat */
 			$vat_amount = $price_with_vat - $price_no_vat;
-			wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'tva' => $vat_amount )), $entity_type_id, $element_id, $language, 'wpshop_product' );
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('tva' => $vat_amount)), $entity_type_id, $element_id, $language, 'wpshop_product');
 
 			/**	Update the product meta information with the calculated prices	*/
-			$product_postmeta 									= get_post_meta( $element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true );
-			$product_postmeta[WPSHOP_PRODUCT_PRICE_TTC] 		= number_format( round( $price_with_vat, 5 ), 5, '.', '' );
-			$product_postmeta[WPSHOP_PRODUCT_PRICE_HT] 			= number_format( round( $price_no_vat, 5 ), 5, '.', '' );
-			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX_AMOUNT] 	= number_format( round( $vat_amount, 5 ), 5, '.', '' );
+			$product_postmeta = get_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TTC] 		= number_format(round($price_with_vat, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_HT] 			= number_format(round($price_no_vat, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX_AMOUNT] = number_format(round($vat_amount, 5), 5, '.', '');
 			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX] 		= $rate_vat->id;
 
-			update_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $product_postmeta );
+			update_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $product_postmeta);
 
 			/** Met à jour la meta _wps_price_infos */
-			$p 		= wpshop_products::get_product_data( $element_id );
-			$price 	= wpshop_prices::get_product_price( $p, 'just_price_infos', array( 'mini_output', 'grid' ) );
-			update_post_meta( $element_id, '_wps_price_infos', $price );
+			$p = wpshop_products::get_product_data($element_id);
+			$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', 'grid'));
+			update_post_meta($element_id, '_wps_price_infos', $price);
 
 			/** Met à jour la meta _wpshop_displayed_price */
-			wps_filter_search::save_displayed_price_meta( $element_id );
+			wps_filter_search::save_displayed_price_meta($element_id);
 		}
 
 		return true;
@@ -2077,24 +2077,24 @@ 
 		$button = '';
 // 		$attributes_frontend_display = get_post_meta( $product_id, '_wpshop_product_attributes_frontend_display', true );
 
-		if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' /*&& ( empty($attributes_frontend_display) || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['mini_output']) && $output_type == 'mini') || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['complete_sheet']) && $output_type == 'complete') ) */) {
+		if (WPSHOP_DEFINED_SHOP_TYPE == 'sale' /*&& ( empty($attributes_frontend_display) || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['mini_output']) && $output_type == 'mini') || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['complete_sheet']) && $output_type == 'complete') ) */) {
 			/*
 			 * Check if current product has variation for button display
 			 */
-			$variations_exists = get_posts( array( 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $product_id) );
-			$variations_list = ( !empty($variations_exists) && is_array( wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => self::currentPageCode)) ) ) ? true : false;
+			$variations_exists = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $product_id));
+			$variations_list = (!empty($variations_exists) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? true : false;
 
 			/*
 			 * Template parameters
 			 */
 
 
-			if( get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
+			if (get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
 				/** Check variation stock **/
-				$variations = self::get_variation( $product_id );
-				if ( !empty($variations) ) {
-					foreach($variations as $variation ) {
-						if( !empty($variation) && !empty($variation['variation_dif']) && !empty($variation['variation_dif']['product_stock']) ) {
+				$variations = self::get_variation($product_id);
+				if (!empty($variations)) {
+					foreach ($variations as $variation) {
+						if (!empty($variation) && !empty($variation['variation_dif']) && !empty($variation['variation_dif']['product_stock'])) {
 							$productStock += $variation['variation_dif']['product_stock'];
 						}
 					}
@@ -2112,7 +2112,7 @@ 
 			 * Build template
 			 */
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/*	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2137,11 +2137,11 @@ 
 	 *
 	 * @return string $button The html output for the button
 	 */
-	public static function display_quotation_button($product_id, $product_quotation_state,  $output_type = 'mini') {
+	public static function display_quotation_button($product_id, $product_quotation_state, $output_type = 'mini') {
 		$quotation_button = '';
 
-		if ( WPSHOP_ADDONS_QUOTATION && (!empty($product_quotation_state) && strtolower(__($product_quotation_state, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) && (empty($_SESSION['cart']['cart_type']) || ($_SESSION['cart']['cart_type'] == 'quotation')) ) {
-			$variations_list = ( is_array( wpshop_products::get_variation( $product_id ) ) && is_array( wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => self::currentPageCode)) ) ) ? array_merge( wpshop_products::get_variation( $product_id ), wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => self::currentPageCode) ) ) : array();
+		if (WPSHOP_ADDONS_QUOTATION && (!empty($product_quotation_state) && strtolower(__($product_quotation_state, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) && (empty($_SESSION['cart']['cart_type']) || ($_SESSION['cart']['cart_type'] == 'quotation'))) {
+			$variations_list = (is_array(wpshop_products::get_variation($product_id)) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? array_merge(wpshop_products::get_variation($product_id), wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode))) : array();
 			/**
 			 * Template parameters
 			 */
@@ -2155,7 +2155,7 @@ 
 			 * Build template
 			 */
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/*	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2181,13 +2181,13 @@ 
 	 *
 	 * @return string The attachement gallery output
 	 */
-	public static function display_attachment_gallery( $attachement_type, $content ) {
+	public static function display_attachment_gallery($attachement_type, $content) {
 		$galery_output = '';
 
 		/*
 		 * Get the template part for given galery type
 		 */
-		switch ( $attachement_type ) {
+		switch ($attachement_type) {
 			case 'picture':
 					$template_part = 'product_attachment_picture_galery';
 				break;
@@ -2207,7 +2207,7 @@ 
 		 * Build template
 		 */
 		$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-		if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+		if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 			/*	Include the old way template part	*/
 			ob_start();
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2227,11 +2227,11 @@ 
 	 * Define the metabox to display in product edition page in backend
 	 * @param object $post The current element displayed for edition
 	 */
-	public static function meta_box_variations( $post ) {
+	public static function meta_box_variations($post) {
 		$output = '';
 		/*	Variations container	*/
 		$tpl_component = array();
-		$tpl_component['ADMIN_VARIATION_CONTAINER'] = self::display_variation_admin( $post->ID );
+		$tpl_component['ADMIN_VARIATION_CONTAINER'] = self::display_variation_admin($post->ID);
 		$output .= wpshop_display::display_template_element('wpshop_admin_variation_metabox', $tpl_component, array(), 'admin');
 		echo '<span class="wpshop_loading_ wpshopHide" ><img src="' . admin_url('images/loading.gif') . '" alt="loading picture" /></span>' . $output . '<div class="wpshop_cls" ></div>';
 	}
@@ -2246,12 +2246,12 @@ 
 	 *
 	 * @return mixed The last created variation identifier
 	 */
-	public static function creation_variation_callback( $possible_variations, $element_id ) {
+	public static function creation_variation_callback($possible_variations, $element_id) {
 		/** Get existing variation	*/
-		$existing_variations_in_db = wpshop_products::get_variation( $element_id );
+		$existing_variations_in_db = wpshop_products::get_variation($element_id);
 		$existing_variations = array();
-		if ( !empty($existing_variations_in_db) ) {
-			foreach ( $existing_variations_in_db as $variations_def) {
+		if (!empty($existing_variations_in_db)) {
+			foreach ($existing_variations_in_db as $variations_def) {
 				$existing_variations[] = $variations_def['variation_def'];
 			}
 		}
@@ -2259,22 +2259,22 @@ 
 		$attribute_defining_variation = get_post_meta($element_id, '_wpshop_variation_defining', true);
 
 		/**	Read possible values	*/
-		foreach ( $possible_variations as $variation_definition) {
-			if ( in_array($variation_definition, $existing_variations) ) {
+		foreach ($possible_variations as $variation_definition) {
+			if (in_array($variation_definition, $existing_variations)) {
 				continue;
 			}
 
 			$attribute_to_set = array();
-			foreach ( $variation_definition as $attribute_code => $attribute_selected_value ) {
+			foreach ($variation_definition as $attribute_code => $attribute_selected_value) {
 				$attribute = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 				$attribute_to_set[$attribute->data_type][$attribute_code] = $attribute_selected_value;
-				if ( empty($attribute_defining_variation['attributes']) || (!in_array($attribute_code, $attribute_defining_variation['attributes'])) ) {
+				if (empty($attribute_defining_variation['attributes']) || (!in_array($attribute_code, $attribute_defining_variation['attributes']))) {
 					$attribute_defining_variation['attributes'][] = $attribute_code;
 				}
 			}
 			$variation_id = wpshop_products::create_variation($element_id, $attribute_to_set);
 		}
-		update_post_meta($element_id, '_wpshop_variation_defining', $attribute_defining_variation );
+		update_post_meta($element_id, '_wpshop_variation_defining', $attribute_defining_variation);
 
 		return !empty($variation_id) ? $variation_id : 0;
 	}
@@ -2288,13 +2288,13 @@ 
 	 *
 	 * @return mixed <number, WP_Error> The variation identifier or an error in case the creation was not succesfull
 	 */
-	public static function create_variation( $head_product, $variation_attributes ) {
+	public static function create_variation($head_product, $variation_attributes) {
 		/** Create custom title */
 		$title_variation = "";
-		if(!empty($variation_attributes)) {
-			foreach($variation_attributes as $type => $array) {
-				if(!empty($array)) {
-					foreach($array as $code => $value) {
+		if (!empty($variation_attributes)) {
+			foreach ($variation_attributes as $type => $array) {
+				if (!empty($array)) {
+					foreach ($array as $code => $value) {
 						$title_variation .= " " . $code . " " . $value;
 					}
 				}
@@ -2302,25 +2302,25 @@ 
 		}
 
 		$variation = array(
-			'post_title' => sprintf(__('Product %s variation %s', 'wpshop'), $head_product, get_the_title( $head_product )) . $title_variation,
+			'post_title' => sprintf(__('Product %s variation %s', 'wpshop'), $head_product, get_the_title($head_product)) . $title_variation,
 			'post_content' => '',
 			'post_status' => 'publish',
 			'post_author' => get_current_user_id(),
 			'post_parent' => $head_product,
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION
 		);
-		$variation_id = wp_insert_post( $variation );
+		$variation_id = wp_insert_post($variation);
 
 		wpshop_attributes::saveAttributeForEntity($variation_attributes, wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, WPSHOP_CURRENT_LOCALE, '');
 
 		/*	Update product price looking for shop parameters	*/
-		wpshop_products::calculate_price( $variation_id );
+		wpshop_products::calculate_price($variation_id);
 
 		/*	Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working	*/
 		$productMetaDatas = array();
-		foreach ( $variation_attributes as $attributeType => $attributeValues ) {
-			foreach ( $attributeValues as $attributeCode => $attributeValue ) {
-				if ( !empty($attributeValue) ) {
+		foreach ($variation_attributes as $attributeType => $attributeValues) {
+			foreach ($attributeValues as $attributeCode => $attributeValue) {
+				if (!empty($attributeValue)) {
 					$productMetaDatas[$attributeCode] = $attributeValue;
 				}
 			}
@@ -2339,7 +2339,7 @@ 
 	 * @param integer $head_product The product identifier to get the variation for
 	 * @return object The variation list
 	 */
-	public static function get_variation( $head_product ) {
+	public static function get_variation($head_product) {
 		global $wpdb;
 		$variations_output = null;
 // 		$variations = query_posts(array(
@@ -2350,18 +2350,18 @@ 
 // 			'posts_per_page'=> -1
 // 		));
 
-		$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts.' WHERE post_type = %s AND post_parent = %d AND post_status = %s ORDER BY ID ASC', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, $head_product, 'publish' );
-		$variations = $wpdb->get_results( $query );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_parent = %d AND post_status = %s ORDER BY ID ASC', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, $head_product, 'publish');
+		$variations = $wpdb->get_results($query);
 
-		if ( !empty( $variations ) ) {
-			$head_wpshop_variation_definition = get_post_meta( $head_product, '_wpshop_variation_defining', true );
+		if (!empty($variations)) {
+			$head_wpshop_variation_definition = get_post_meta($head_product, '_wpshop_variation_defining', true);
 
-			foreach ( $variations as $post_def ) {
-				$data = wpshop_attributes::get_attribute_list_for_item( wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post_def->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-				foreach ( $data as $content ) {
+			foreach ($variations as $post_def) {
+				$data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post_def->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+				foreach ($data as $content) {
 					$attribute_value = 'attribute_value_' . $content->data_type;
-					if ( !empty($content->$attribute_value) ) {
-						if ( !empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes']) ) {
+					if (!empty($content->$attribute_value)) {
+						if (!empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes'])) {
 							$variations_output[$post_def->ID]['variation_def'][$content->code] = $content->$attribute_value;
 						}
 						else {
@@ -2383,26 +2383,26 @@ 
 	 * @param integer $head_product L'identifiant du produit dont on veut afficher les variations
 	 * @return string Le code html permettant l'affichage des variations dans l'interface d'édition du produit
 	 */
-	public static function display_variation_admin( $head_product ) {
+	public static function display_variation_admin($head_product) {
 		$output = '';
 		$productCurrency = wpshop_tools::wpshop_get_currency();
 		/*	Récupération de la liste des variations pour le produit en cours d'édition	*/
-		$variations = self::get_variation( $head_product );
-		$price_piloting = get_option( 'wpshop_shop_price_piloting' );
+		$variations = self::get_variation($head_product);
+		$price_piloting = get_option('wpshop_shop_price_piloting');
 
 		/*	Affichage de la liste des variations pour le produit en cours d'édition	*/
-		if ( !empty($variations) && is_array($variations) ) {
+		if (!empty($variations) && is_array($variations)) {
 			$existing_variation_list = wpshop_display::display_template_element('wpshop_admin_existing_variation_controller', array(), array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product), 'admin');
 
-			foreach ( $variations as $variation ) {
+			foreach ($variations as $variation) {
 				$tpl_component = array();
 
 				$tpl_component['ADMIN_EXISTING_VARIATIONS_CLASS'] = ' wpshop_variation_' . self::currentPageCode;
 				$tpl_component['VARIATION_IDENTIFIER'] = $variation['post']->ID;
 				$tpl_component['VARIATION_DETAIL'] = '  ';
-				$p = ( !empty($variation['variation_dif']['product_price']) || !empty($variation['variation_dif']['price_ht']) ) ? ( ( !empty($price_piloting) && $price_piloting == 'HT' && !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0 ) : 0;
-				$tpl_component['VARIATION_DETAIL_PRICE'] = number_format( $p, 2, '.', '').' '.$productCurrency.' '.( ( !empty($price_piloting) && $price_piloting == 'HT' ) ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' ) );
-				if ( !empty($price_piloting) && $price_piloting == 'HT' ) {
+				$p = (!empty($variation['variation_dif']['product_price']) || !empty($variation['variation_dif']['price_ht'])) ? ((!empty($price_piloting) && $price_piloting == 'HT' && !empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) : 0;
+				$tpl_component['VARIATION_DETAIL_PRICE'] = number_format($p, 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
+				if (!empty($price_piloting) && $price_piloting == 'HT') {
 
 				}
 				else {
@@ -2410,66 +2410,66 @@ 
 				}
 				$post_obj = $variation['post'];
 
-				$parent_product_infos = wpshop_products::get_parent_variation( $post_obj->ID );
-				if ( !empty($parent_product_infos) ) {
+				$parent_product_infos = wpshop_products::get_parent_variation($post_obj->ID);
+				if (!empty($parent_product_infos)) {
 					$parent_post = $parent_product_infos['parent_post'];
 					$product_option_postmeta = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
-					if ( !empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
-						if( !empty($price_piloting) && $price_piloting == 'HT' ) {
-							$product_price = ( ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0 ) + $parent_product_infos['parent_post_meta']['price_ht'];
+					if (!empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
+						if (!empty($price_piloting) && $price_piloting == 'HT') {
+							$product_price = ((!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0) + $parent_product_infos['parent_post_meta']['price_ht'];
 						}
 						else {
-							$product_price = ( ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0 ) + $parent_product_infos['parent_post_meta']['product_price'];
+							$product_price = ((!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) + $parent_product_infos['parent_post_meta']['product_price'];
 						}
 						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Variation price combined with the parent product price', 'wpshop');
 					}
 					else {
-						if( !empty($price_piloting) && $price_piloting == 'HT' ) {
-							$product_price = ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0;
+						if (!empty($price_piloting) && $price_piloting == 'HT') {
+							$product_price = (!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0;
 						}
 						else {
-							$product_price = ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0;
+							$product_price = (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0;
 						}
 						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Only variation\'s price is used', 'wpshop');
 					}
-					$product_price = number_format(str_replace(',', '.',$product_price), 2, '.', '').' '.$productCurrency.' '.( ( !empty($price_piloting) && $price_piloting == 'HT' ) ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' ) );
+					$product_price = number_format(str_replace(',', '.', $product_price), 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
 					$tpl_component['VARIATION_DETAIL_SALE_PRICE'] = $product_price;
 				}
 
-				if ( !empty($variation['variation_def']) ) {
-					foreach ( $variation['variation_def'] as $variation_key => $variation_value ) {
-						if ( !empty($variation_value) ) {
+				if (!empty($variation['variation_def'])) {
+					foreach ($variation['variation_def'] as $variation_key => $variation_value) {
+						if (!empty($variation_value)) {
 							$attribute_def_for_variation = wpshop_attributes::getElement($variation_key, "'valid'", 'code');
 							$tpl_component['VARIATION_DETAIL'] .= '<input type="hidden" name="' . self::current_page_variation_code . '[' . $variation['post']->ID . '][attribute][' . $attribute_def_for_variation->data_type . '][' . $variation_key . ']" value="' . $variation_value . '" />' . wpshop_display::display_template_element('wpshop_admin_variation_item_def_header', array('VARIATION_ATTRIBUTE_CODE' => $attribute_def_for_variation->frontend_label, 'VARIATION_ATTRIBUTE_CODE_VALUE' => stripslashes(wpshop_attributes::get_attribute_type_select_option_info($variation_value, 'label', $attribute_def_for_variation->data_type_to_use, true))), array(), 'admin');
 							$tpl_component['VARIATION_IMAGE_CHOICE'] = '';
 
 							/** Define Link image to variation interface **/
-							if( !empty($product_option_postmeta) && !empty($product_option_postmeta['attributes']) && !empty($product_option_postmeta['variation_type']) && ( ( count( $product_option_postmeta['attributes'] ) == 1 && $product_option_postmeta['variation_type'] == 'single' ) || ($product_option_postmeta['variation_type'] == 'combined' ) ) ) {
-								$pictures = get_posts( array('post_type' => 'attachment', 'posts_per_page' => -1, 'post_status' => null, 'post_parent' => $head_product) );
+							if (!empty($product_option_postmeta) && !empty($product_option_postmeta['attributes']) && !empty($product_option_postmeta['variation_type']) && ((count($product_option_postmeta['attributes']) == 1 && $product_option_postmeta['variation_type'] == 'single') || ($product_option_postmeta['variation_type'] == 'combined'))) {
+								$pictures = get_posts(array('post_type' => 'attachment', 'posts_per_page' => -1, 'post_status' => null, 'post_parent' => $head_product));
 
-								$media_id_data = get_post_meta( $head_product, '_wps_product_media', true );
-								if( !empty($media_id_data) ) {
-									$medias_ids = explode( ',', $media_id_data );
+								$media_id_data = get_post_meta($head_product, '_wps_product_media', true);
+								if (!empty($media_id_data)) {
+									$medias_ids = explode(',', $media_id_data);
 
-									if ( !empty( $medias_ids ) ) {
-										foreach ( $medias_ids as $media_id ) {
-											if ( !empty( $media_id ) ) {
-												$pictures[] = get_post( $media_id );
+									if (!empty($medias_ids)) {
+										foreach ($medias_ids as $media_id) {
+											if (!empty($media_id)) {
+												$pictures[] = get_post($media_id);
 											}
 										}
 									}
 								}
 
 								$pictures_data = '';
-								if( !empty($pictures) ) {
-									$selected_picture = get_post_meta($variation['post']->ID, '_wps_variation_attached_picture', true );
+								if (!empty($pictures)) {
+									$selected_picture = get_post_meta($variation['post']->ID, '_wps_variation_attached_picture', true);
 
 									$done_picture = array();
-									foreach( $pictures as $picture ) {
-										if ( !in_array( $picture->ID, $done_picture ) ) {
-											if( wp_attachment_is_image( $picture->ID ) ) {
-												$checked = ( ( !empty($selected_picture) && $selected_picture == $picture->ID ) ? 'checked="checked"' : '' );
-												$pictures_data .= wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_element', array( 'PICTURE_CHOICE_VARIATION_ID' => $picture->ID, 'PRODUCT_VARIATION_ID' =>$variation['post']->ID, 'PICTURE_CHOICE_SELECTED' => $checked, 'PICTURE_CHOICE_VARIATION_IMG' => wp_get_attachment_image( $picture->ID, 'thumbnail' ) ), array(), 'admin');
+									foreach ($pictures as $picture) {
+										if (!in_array($picture->ID, $done_picture)) {
+											if (wp_attachment_is_image($picture->ID)) {
+												$checked = ((!empty($selected_picture) && $selected_picture == $picture->ID) ? 'checked="checked"' : '');
+												$pictures_data .= wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_element', array('PICTURE_CHOICE_VARIATION_ID' => $picture->ID, 'PRODUCT_VARIATION_ID' =>$variation['post']->ID, 'PICTURE_CHOICE_SELECTED' => $checked, 'PICTURE_CHOICE_VARIATION_IMG' => wp_get_attachment_image($picture->ID, 'thumbnail')), array(), 'admin');
 
 												$done_picture[] = $picture->ID;
 											}
@@ -2477,7 +2477,7 @@ 
 									}
 								}
 
-								$tpl_component['VARIATION_IMAGE_CHOICE'] = wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_container',  array( 'PICTURE_CHOICE_CONTAINER_CONTENT' => $pictures_data ), array(), 'admin');
+								$tpl_component['VARIATION_IMAGE_CHOICE'] = wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_container', array('PICTURE_CHOICE_CONTAINER_CONTENT' => $pictures_data), array(), 'admin');
 							}
 
 						}
@@ -2488,7 +2488,7 @@ 
 				$tpl_component['VARIATION_DETAIL'] = substr($tpl_component['VARIATION_DETAIL'], 0, -2);
 
 				$tpl_component['ADMIN_VARIATION_SPECIFIC_DEFINITION_CONTAINER_CLASS'] = ' wpshopHide';
-				$tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute( array('input_class' => ' ', 'field_name' => wpshop_products::current_page_variation_code . '[' . $variation['post']->ID . ']','page_code' => self::current_page_variation_code, 'field_id' => self::current_page_variation_code . '_' . $variation['post']->ID, 'variation_dif_values' => (!empty($variation['variation_dif']) ? $variation['variation_dif'] : array())) );
+				$tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute(array('input_class' => ' ', 'field_name' => wpshop_products::current_page_variation_code . '[' . $variation['post']->ID . ']', 'page_code' => self::current_page_variation_code, 'field_id' => self::current_page_variation_code . '_' . $variation['post']->ID, 'variation_dif_values' => (!empty($variation['variation_dif']) ? $variation['variation_dif'] : array())));
 				$tpl_component['VARIATION_DEFINITION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_variation_item_specific_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
 
 				/*	Add the variation definition to output	*/
@@ -2510,22 +2510,22 @@ 
 	 * Retrieve and display the variation for a given product
 	 * @param integer $product_id The product identifier to get variation for
 	 */
-	public static function wpshop_variation( $post_id = '', $from_admin = false, $order_id = '', $qty = 1 ) {
+	public static function wpshop_variation($post_id = '', $from_admin = false, $order_id = '', $qty = 1) {
 		global $wp_query;
 		$output = '';
 
-		$product_id = empty($post_id) ? $wp_query->post->ID : $post_id ;
-		$wpshop_product_attributes_frontend_display = get_post_meta( $product_id, '_wpshop_product_attributes_frontend_display', true );
-		$head_wpshop_variation_definition = get_post_meta( $product_id, '_wpshop_variation_defining', true );
+		$product_id = empty($post_id) ? $wp_query->post->ID : $post_id;
+		$wpshop_product_attributes_frontend_display = get_post_meta($product_id, '_wpshop_product_attributes_frontend_display', true);
+		$head_wpshop_variation_definition = get_post_meta($product_id, '_wpshop_variation_defining', true);
 
 		/**	Get attribute order for current product	*/
-		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 		$output_order = array();
-		if ( count($product_attribute_order_detail) > 0 ) {
-			if (!empty($product_attribute_order_detail) ) {
-				foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-					foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-						if ( !empty($attribute_def->code) )
+		if (count($product_attribute_order_detail) > 0) {
+			if (!empty($product_attribute_order_detail)) {
+				foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+					foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+						if (!empty($attribute_def->code))
 							$output_order[$attribute_def->code] = $position;
 					}
 				}
@@ -2539,49 +2539,49 @@ 
 		$possible_values_for_selection_calculation = array();
 
 		/*	Vérification de l'existence de déclinaison pour le produit	*/
-		$wpshop_variation_list = self::get_variation( $product_id );
-		if ( !empty($wpshop_variation_list) ) {
+		$wpshop_variation_list = self::get_variation($product_id);
+		if (!empty($wpshop_variation_list)) {
 			foreach ($wpshop_variation_list as $variation) {
-				if (!empty($variation['variation_def']) ) {
-					$display_option = get_post_meta( $post_id, '_wpshop_product_attributes_frontend_display', true );
-					foreach ( $variation['variation_def'] as $attribute_code => $attribute_value ) {
-						if ( empty($display_option) || ( !empty($display_option['attribute']) && !empty($display_option['attribute'][$attribute_code]) && !empty($display_option['attribute'][$attribute_code]['complete_sheet']) ) ) {
+				if (!empty($variation['variation_def'])) {
+					$display_option = get_post_meta($post_id, '_wpshop_product_attributes_frontend_display', true);
+					foreach ($variation['variation_def'] as $attribute_code => $attribute_value) {
+						if (empty($display_option) || (!empty($display_option['attribute']) && !empty($display_option['attribute'][$attribute_code]) && !empty($display_option['attribute'][$attribute_code]['complete_sheet']))) {
 							$tpl_component = array();
 
 							$attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 							$default_value_is_serial = false;
 							$attribute_list_first_element = $attribute_db_definition->default_value;
-							if ( !empty($attribute_db_definition->default_value) && ($attribute_db_definition->default_value == serialize(false) || @unserialize($attribute_db_definition->default_value) !== false) ) {
+							if (!empty($attribute_db_definition->default_value) && ($attribute_db_definition->default_value == serialize(false) || @unserialize($attribute_db_definition->default_value) !== false)) {
 								$default_value_is_serial = true;
 								$tmp_default_value = unserialize($attribute_db_definition->default_value);
 								$attribute_list_first_element = !empty($tmp_default_value['field_options']['label_for_first_item']) ? $tmp_default_value['field_options']['label_for_first_item'] : null;
 							}
 
-							if ( $default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none') ) {
-								$possible_values[$attribute_code][0][0] = ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) ? stripslashes( sprintf( $attribute_list_first_element, strtolower($attribute_db_definition->frontend_label)) ) : __('Choose a value', 'wpshop');
+							if ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) {
+								$possible_values[$attribute_code][0][0] = ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) ? stripslashes(sprintf($attribute_list_first_element, strtolower($attribute_db_definition->frontend_label))) : __('Choose a value', 'wpshop');
 							}
 
-							if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
+							if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
 								$tpl_component['VARIATION_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', 'custom'));
 								$position = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'position', 'custom');
 							}
-							else if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
+							else if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
 								$post_def = get_post($attribute_value);
 								$tpl_component['VARIATION_VALUE'] = stripslashes($post_def->post_title);
 								$position = $post_def->menu_order;
 							}
 
-							if ( !empty($variation['variation_dif']) ) {
-								foreach ( $variation['variation_dif'] as $attribute_dif_code => $attribute_dif_value) {
+							if (!empty($variation['variation_dif'])) {
+								foreach ($variation['variation_dif'] as $attribute_dif_code => $attribute_dif_value) {
 									$wpshop_prices_attributes = unserialize(WPSHOP_ATTRIBUTE_PRICES);
 									$the_value = $attribute_dif_value;
-									if ( in_array($attribute_dif_code, $wpshop_prices_attributes) ) {
+									if (in_array($attribute_dif_code, $wpshop_prices_attributes)) {
 										$the_value = wpshop_display::format_field_output('wpshop_product_price', $attribute_dif_value);
 									}
 									$tpl_component['VARIATION_DIF_' . strtoupper($attribute_dif_code)] = stripslashes($the_value);
 								}
 							}
-							if ( !empty($attribute_value) ) {
+							if (!empty($attribute_value)) {
 								$possible_values[$attribute_code][$position][$attribute_value] = wpshop_display::display_template_element('product_variation_item_possible_values', $tpl_component, array('type' => 'attribute_for_variation', 'id' => $attribute_code));
 								$possible_values_for_selection_calculation[$attribute_code][$attribute_value] = $tpl_component['VARIATION_VALUE'];
 							}
@@ -2592,33 +2592,33 @@ 
 			}
 
 			$variation_tpl = array();
-			if ( !empty($head_wpshop_variation_definition['attributes']) ) {
-				foreach ( $head_wpshop_variation_definition['attributes'] as $attribute_code ) {
+			if (!empty($head_wpshop_variation_definition['attributes'])) {
+				foreach ($head_wpshop_variation_definition['attributes'] as $attribute_code) {
 					$attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-					if ( !empty( $attribute_db_definition ) ) {
-						$attribute_display_state = wpshop_attributes::check_attribute_display( $attribute_db_definition->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_code, 'complete_sheet');
+					if (!empty($attribute_db_definition)) {
+						$attribute_display_state = wpshop_attributes::check_attribute_display($attribute_db_definition->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_code, 'complete_sheet');
 
 
 
-						$is_required = ( (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && ( in_array( $attribute_code, $head_wpshop_variation_definition['options']['required_attributes']) )) ) ? true : false;
-						if ( !$is_required && $attribute_db_definition->is_required == 'yes' ) {
+						$is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_code, $head_wpshop_variation_definition['options']['required_attributes'])))) ? true : false;
+						if (!$is_required && $attribute_db_definition->is_required == 'yes') {
 							$is_required = true;
 						}
 
 						$input_def = array();
 						$input_def['type'] = $attribute_db_definition->frontend_input;
 						$value = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : (!empty($attribute_db_definition->default_value) ? $attribute_db_definition->default_value : null);
-						if ( in_array($attribute_db_definition->frontend_input, array('radio', 'checkbox')) ) {
+						if (in_array($attribute_db_definition->frontend_input, array('radio', 'checkbox'))) {
 							unset($possible_values[$attribute_code][0]);
 							$value = array($value);
 						}
 						$input_def['id'] = 'wpshop_variation_attr_' . $attribute_code;
 						$input_def['name'] = $attribute_code;
 						$real_possible_values = array();
-						if ( !empty($possible_values[$attribute_code]) ) {
+						if (!empty($possible_values[$attribute_code])) {
 							ksort($possible_values[$attribute_code]);
-							foreach ( $possible_values[$attribute_code] as $position => $def ) {
-								foreach ( $def as $attribute_value => $attribute_value_output ) {
+							foreach ($possible_values[$attribute_code] as $position => $def) {
+								foreach ($def as $attribute_value => $attribute_value_output) {
 									$real_possible_values[$attribute_value] = $attribute_value_output;
 								}
 							}
@@ -2628,19 +2628,19 @@ 
 						$input_def['value'] = $value;
 
 						$input_def['options']['more_input'] = '';
-						if ( !empty($possible_values_for_selection_calculation[$attribute_code]) ) {
-							foreach ( $possible_values_for_selection_calculation[$attribute_code] as $value_id => $value ) {
+						if (!empty($possible_values_for_selection_calculation[$attribute_code])) {
+							foreach ($possible_values_for_selection_calculation[$attribute_code] as $value_id => $value) {
 								$input_def['options']['more_input'] .= '<input type="hidden" disabled="disabled" value="' . str_replace("\\", "", $value) . '" name="' . $input_def['id'] . '_current_value" id="' . $input_def['id'] . '_current_value_' . $value_id . '" />';
 							}
 						}
 
 						$input_def['options_label']['original'] = true;
-						$input_def['option'] = ' class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_code . ' ' : '') . ( $attribute_db_definition->_display_informations_about_value == 'yes' ? ' wpshop_display_information_about_value' : '' ) . ' ' . (( is_admin() ) ? $attribute_db_definition->backend_css_class : $attribute_db_definition->frontend_css_class) . '" ';
-						if ( !empty(  $real_possible_values ) ) {
+						$input_def['option'] = ' class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_code . ' ' : '') . ($attribute_db_definition->_display_informations_about_value == 'yes' ? ' wpshop_display_information_about_value' : '') . ' ' . ((is_admin()) ? $attribute_db_definition->backend_css_class : $attribute_db_definition->frontend_css_class) . '" ';
+						if (!empty($real_possible_values)) {
 							$tpl_component = array();
 							$attribute_output_def['value'] = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : $input_def['value'];
 							$tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($input_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) . $input_def['options']['more_input'];
-							$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_code . '" >' . stripslashes($attribute_db_definition->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_db_definition->frontend_label) );
+							$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_code . '" >' . stripslashes($attribute_db_definition->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_db_definition->frontend_label));
 							$tpl_component['VARIATION_CODE'] = $attribute_code;
 							$tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_db_definition->frontend_help_message) ? ' title="' . $attribute_db_definition->frontend_help_message . '" ' : '';
 						 	$tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_db_definition->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
@@ -2648,7 +2648,7 @@ 
 							$tpl_component['VARIATION_PARENT_ID'] = $product_id;
 							$tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
 							$tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_code : '') . ' wpshop_variation_' . $attribute_code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
-							$tpl_component['VARIATION_REQUIRED_INDICATION'] = ( $is_required ) ? __('Required variation', 'wpshop') : '';
+							$tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
 							$variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)] = wpshop_display::display_template_element('product_variation_item', $tpl_component);
 							$variation_attribute_ordered[$output_order[$attribute_code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)];
 						}
@@ -2662,23 +2662,23 @@ 
 		$variation_tpl['VARIATION_FORM_ELEMENT_ID'] = $product_id;
 		wp_reset_query();
 
-		$attribute_defined_to_be_user_defined = wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => self::currentPageCode) );
-		if ( !empty($attribute_defined_to_be_user_defined) ) {
-			foreach ( $attribute_defined_to_be_user_defined as $attribute_not_in_variation_but_user_defined ) {
-				$is_required = ( (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && ( in_array( $attribute_not_in_variation_but_user_defined->code, $head_wpshop_variation_definition['options']['required_attributes']) )) || $attribute_not_in_variation_but_user_defined->is_required == 'yes' ) ? true : false;
+		$attribute_defined_to_be_user_defined = wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode));
+		if (!empty($attribute_defined_to_be_user_defined)) {
+			foreach ($attribute_defined_to_be_user_defined as $attribute_not_in_variation_but_user_defined) {
+				$is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_not_in_variation_but_user_defined->code, $head_wpshop_variation_definition['options']['required_attributes']))) || $attribute_not_in_variation_but_user_defined->is_required == 'yes') ? true : false;
 
-				$attribute_display_state = wpshop_attributes::check_attribute_display( $attribute_not_in_variation_but_user_defined->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_not_in_variation_but_user_defined->code, 'complete_sheet');
-				if ( $attribute_display_state &&  array_key_exists($attribute_not_in_variation_but_user_defined->code, $output_order) && !in_array($attribute_not_in_variation_but_user_defined->code, $variation_attribute) && ($attribute_not_in_variation_but_user_defined->is_used_for_variation == 'no') ) {
-					$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute_not_in_variation_but_user_defined, (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code] : 'Salut' ));
+				$attribute_display_state = wpshop_attributes::check_attribute_display($attribute_not_in_variation_but_user_defined->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_not_in_variation_but_user_defined->code, 'complete_sheet');
+				if ($attribute_display_state && array_key_exists($attribute_not_in_variation_but_user_defined->code, $output_order) && !in_array($attribute_not_in_variation_but_user_defined->code, $variation_attribute) && ($attribute_not_in_variation_but_user_defined->is_used_for_variation == 'no')) {
+					$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_not_in_variation_but_user_defined, (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code] : 'Salut'));
 
 					$tpl_component = array();
-					$attribute_output_def['option'] = ' class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_not_in_variation_but_user_defined->code : '') . ' ' . ( str_replace('"', '', str_replace('class="', '', $attribute_output_def['option'])) ) . ' ' . (( is_admin() ) ? $attribute_not_in_variation_but_user_defined->backend_css_class : $attribute_not_in_variation_but_user_defined->frontend_css_class) . '" ';
+					$attribute_output_def['option'] = ' class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_not_in_variation_but_user_defined->code : '') . ' ' . (str_replace('"', '', str_replace('class="', '', $attribute_output_def['option']))) . ' ' . ((is_admin()) ? $attribute_not_in_variation_but_user_defined->backend_css_class : $attribute_not_in_variation_but_user_defined->frontend_css_class) . '" ';
 					$tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
-					$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_not_in_variation_but_user_defined->code . '" >' . stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) );
+					$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_not_in_variation_but_user_defined->code . '" >' . stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_not_in_variation_but_user_defined->frontend_label));
 					$tpl_component['VARIATION_CODE'] = $attribute_not_in_variation_but_user_defined->code;
 					$tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' title="' . $attribute_not_in_variation_but_user_defined->frontend_help_message . '" ' : '';
 					$tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
-					$tpl_component['VARIATION_REQUIRED_INDICATION'] = ( $is_required ) ? __('Required variation', 'wpshop') : '';
+					$tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
 					$tpl_component['VARIATION_IDENTIFIER'] = $attribute_output_def['id'];
 					$tpl_component['VARIATION_PARENT_ID'] = $product_id;
 					$tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
@@ -2690,17 +2690,17 @@ 
 		}
 
 		$variation_tpl['VARIATION_FORM_VARIATION_LIST'] = '';
-		if ( !empty($variation_attribute_ordered) && is_array($variation_attribute_ordered) ) {
+		if (!empty($variation_attribute_ordered) && is_array($variation_attribute_ordered)) {
 			ksort($variation_attribute_ordered);
-			foreach ( $variation_attribute_ordered as $attribute_variation_to_output ) {
+			foreach ($variation_attribute_ordered as $attribute_variation_to_output) {
 				$variation_tpl['VARIATION_FORM_VARIATION_LIST'] .= $attribute_variation_to_output;
 			}
 		}
 		$variation_tpl['FROM_ADMIN_INDICATOR'] = $variation_tpl['ORDER_ID_INDICATOR'] = '';
-		$variation_tpl['PRODUCT_ADDED_TO_CART_QTY'] = ( !empty( $qty ) ) ? $qty : 1;
-		if ( $from_admin && !empty($order_id) ) {
+		$variation_tpl['PRODUCT_ADDED_TO_CART_QTY'] = (!empty($qty)) ? $qty : 1;
+		if ($from_admin && !empty($order_id)) {
 			$variation_tpl['FROM_ADMIN_INDICATOR'] = '<input type="hidden" name="wps_orders_from_admin" value="1" />';
-			$variation_tpl['ORDER_ID_INDICATOR'] = '<input type="hidden" name="wps_orders_order_id" value="' .$order_id. '" />';
+			$variation_tpl['ORDER_ID_INDICATOR'] = '<input type="hidden" name="wps_orders_order_id" value="' . $order_id . '" />';
 
 		}
 		$output = !empty($variation_tpl['VARIATION_FORM_VARIATION_LIST']) ? wpshop_display::display_template_element('product_variation_form', $variation_tpl) : '';
@@ -2708,11 +2708,11 @@ 
 		return $output;
 	}
 
-	public static function get_parent_variation ( $variation_id ) {
+	public static function get_parent_variation($variation_id) {
 		$result = array();
-		if ( !empty($variation_id) ) {
-			$variation_post = get_post( $variation_id);
-			if ( !empty($variation_post) && !empty($variation_post->post_parent) ) {
+		if (!empty($variation_id)) {
+			$variation_post = get_post($variation_id);
+			if (!empty($variation_post) && !empty($variation_post->post_parent)) {
 				$result['parent_post'] = get_post($variation_post->post_parent);
 				$result['parent_post_meta'] = get_post_meta($variation_post->post_parent, '_wpshop_product_metadata', true);
 			}
@@ -2724,7 +2724,7 @@ 
 	 * Display the current configuration for a given product
 	 * @param array $shortcode_attribute Some parameters given by the shortcode for display
 	 */
-	function wpshop_product_variations_summary( $shortcode_attribute ) {
+	function wpshop_product_variations_summary($shortcode_attribute) {
 		$output = '';
 
 		$product_variations_selection_args = array(
@@ -2734,36 +2734,36 @@ 
 
 		$current_user_id = get_current_user_id();
 
-		if ( !empty( $_SESSION ) && !empty( $_SESSION[ 'cart' ] ) && !empty( $_SESSION[ 'cart' ][ 'order_items' ] ) ) {
-			foreach ( $_SESSION[ 'cart' ][ 'order_items' ] as $item_id => $item ) {
-				if ( !empty( $item ) && !empty( $item[ 'item_id' ] ) ) {
+		if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+			foreach ($_SESSION['cart']['order_items'] as $item_id => $item) {
+				if (!empty($item) && !empty($item['item_id'])) {
 
 					$free_variations = array();
-					if ( !empty( $item['item_meta'] ) && !empty( $item['item_meta']['free_variation'] ) ) {
-						foreach ( $item['item_meta']['free_variation'] as $attribute_code => $attribute_value ) {
+					if (!empty($item['item_meta']) && !empty($item['item_meta']['free_variation'])) {
+						foreach ($item['item_meta']['free_variation'] as $attribute_code => $attribute_value) {
 							$free_variations[] = $attribute_code . '-_variation_val_-' . $attribute_value;
 						}
 					}
 
 					$variations = array();
-					if ( !empty( $item['item_meta'] ) && !empty( $item['item_meta']['variations'] ) ) {
-						foreach ( $item['item_meta']['variations'] as $variation_id => $variation_def ) {
+					if (!empty($item['item_meta']) && !empty($item['item_meta']['variations'])) {
+						foreach ($item['item_meta']['variations'] as $variation_id => $variation_def) {
 
-							if ( !empty( $variation_def[ 'item_meta' ] ) && !empty( $variation_def[ 'item_meta' ][ 'variation_definition' ] ) ) {
-								foreach ( $variation_def[ 'item_meta' ][ 'variation_definition' ] as $attribute_code => $attribute_selected_data ) {
-									$variations[] = $attribute_code . '-_variation_val_-' . $attribute_selected_data[ 'ID' ];
+							if (!empty($variation_def['item_meta']) && !empty($variation_def['item_meta']['variation_definition'])) {
+								foreach ($variation_def['item_meta']['variation_definition'] as $attribute_code => $attribute_selected_data) {
+									$variations[] = $attribute_code . '-_variation_val_-' . $attribute_selected_data['ID'];
 								}
 							}
 						}
 					}
-					$product_variation_summary = self::wpshop_ajax_wpshop_variation_selection( $item[ 'item_id' ], $variations, $free_variations, null, $item[ 'item_qty' ] );
+					$product_variation_summary = self::wpshop_ajax_wpshop_variation_selection($item['item_id'], $variations, $free_variations, null, $item['item_qty']);
 
-					$product_variations_selection_args['PRODUCT_VARIATION_SELECTION_DISPLAY'] .= $product_variation_summary[ 1 ][ 'product_output' ];
+					$product_variations_selection_args['PRODUCT_VARIATION_SELECTION_DISPLAY'] .= $product_variation_summary[1]['product_output'];
 				}
 			}
 		}
 
-		$output .= wpshop_display::display_template_element( 'wpshop_product_configuration_summary', $product_variations_selection_args );
+		$output .= wpshop_display::display_template_element('wpshop_product_configuration_summary', $product_variations_selection_args);
 
 		echo $output;
 	}
@@ -2779,53 +2779,53 @@ 
 	 *
 	 * @return array Le résultat du calcul pour l'affichage / Output result
 	 */
-	public static function wpshop_ajax_wpshop_variation_selection( $product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty = 1 ) {
+	public static function wpshop_ajax_wpshop_variation_selection($product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty = 1) {
 		global $wpdb;
 
 		$wpshop_cart = new wps_cart();
 		$wpshop_products = new wpshop_products();
 
 		$response = '';
-		$response_status = $has_variation = false ;
+		$response_status = $has_variation = false;
 		$tpl_component = array();
 
 		// Check if variations exists
-		if ( !empty( $wpshop_variation_selected ) || !empty( $wpshop_free_variation ) ) {
+		if (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation)) {
 
 			//Recover all selected variations
 			$variations_selected = array();
-			if ( !empty($wpshop_variation_selected) ) {
-				foreach ( $wpshop_variation_selected as $selected_variation ) {
+			if (!empty($wpshop_variation_selected)) {
+				foreach ($wpshop_variation_selected as $selected_variation) {
 					$variation_definition = explode('-_variation_val_-', $selected_variation);
 					$variations_selected[$variation_definition[0]] = $variation_definition[1];
 				}
 			}
 
 			// Check variations priority
-			$product_with_variation = wpshop_products::get_variation_by_priority( $variations_selected, $product_id );
+			$product_with_variation = wpshop_products::get_variation_by_priority($variations_selected, $product_id);
 
 			// Check if $product_with_variation have variations
-			if ( !empty($product_with_variation[$product_id]['variations']) || !empty( $wpshop_free_variation )  ) {
+			if (!empty($product_with_variation[$product_id]['variations']) || !empty($wpshop_free_variation)) {
 
-				$formatted_product = $wpshop_cart->prepare_product_to_add_to_cart( $product_id, $product_qty, $variations_selected );
+				$formatted_product = $wpshop_cart->prepare_product_to_add_to_cart($product_id, $product_qty, $variations_selected);
 				$product_to_add_to_cart = $formatted_product[0];
-				foreach ( $formatted_product[0] as $pid => $product_more_content) {
+				foreach ($formatted_product[0] as $pid => $product_more_content) {
 					$order_items[$pid]['product_id'] = $product_more_content['id'];
 
 					/** For product with variation	*/
-					$order_items[$pid]['product_variation_type'] = !empty( $product_more_content['variation_priority']) ? $product_more_content['variation_priority'] : '';
+					$order_items[$pid]['product_variation_type'] = !empty($product_more_content['variation_priority']) ? $product_more_content['variation_priority'] : '';
 					$order_items[$pid]['free_variation'] = !empty($product_more_content['free_variation']) ? $product_more_content['free_variation'] : '';
 					$order_items[$pid]['product_variation'] = '';
-					if ( !empty($product_more_content['variations']) ) {
-						foreach ( $product_more_content['variations'] as $variation_id) {
+					if (!empty($product_more_content['variations'])) {
+						foreach ($product_more_content['variations'] as $variation_id) {
 							$order_items[$pid]['product_variation'][] = $variation_id;
 						}
 					}
 				}
 
 				// If Product list is not empty, add products to order
-				if( !empty($order_items) ) {
-					foreach ( $order_items as $product_id => $d ) {
+				if (!empty($order_items)) {
+					foreach ($order_items as $product_id => $d) {
 						$product_key = $product_id;
 
 						// Formate datas
@@ -2833,71 +2833,71 @@ 
 						$product_variation = !empty($d['product_variation']) ? $d['product_variation'] : null;
 
 						// If product is a single variation product
-						if ( !empty($product_variation) && ( count($product_variation) == 1 ) ) {
+						if (!empty($product_variation) && (count($product_variation) == 1)) {
 							$product_id = $product_variation[0];
 						}
 
 						// Construct final product
 						$product = wpshop_products::get_product_data($d['product_id'], true);
-						$the_product = array_merge( array('product_id'	=> $d['product_id'], 'product_qty' 	=> 1 ), $product);
+						$the_product = array_merge(array('product_id'	=> $d['product_id'], 'product_qty' 	=> 1), $product);
 
 						//	Add variation to product into cart for storage
-						if ( !empty($product_variation) ) {
-							$the_product = wpshop_products::get_variation_price_behaviour( $the_product, $product_variation, $head_product_id, array('type' => $d['product_variation_type']) );
+						if (!empty($product_variation)) {
+							$the_product = wpshop_products::get_variation_price_behaviour($the_product, $product_variation, $head_product_id, array('type' => $d['product_variation_type']));
 						}
 
 						// Free Variations Checking
-						if ( !empty( $d['free_variation'] ) ) {
+						if (!empty($d['free_variation'])) {
 							$the_product['item_meta']['free_variation'] = $d['free_variation'];
 							$head_product_id = $the_product['product_id'];
 						}
 
 						// If product is a variation, we check parent product general
-						if( get_post_type( $the_product['product_id'] )  == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation ( $the_product['product_id'] );
-							if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
-								$variation_def = get_post_meta( $parent_def['parent_post']->ID, '_wpshop_variation_defining', true );
+						if (get_post_type($the_product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($the_product['product_id']);
+							if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
+								$variation_def = get_post_meta($parent_def['parent_post']->ID, '_wpshop_variation_defining', true);
 								$parent_meta = $parent_def['parent_post_meta'];
-								if( !empty($variation_def) && !empty($variation_def['options']) && !empty($variation_def['options']['priority']) && in_array('combined', $variation_def['options']['priority'] ) && !empty($variation_def['options']['price_behaviour']) && in_array( 'addition', $variation_def['options']['price_behaviour']) && !empty($variation_def['attributes']) && count($variation_def['attributes']) > 1 ) {
-									$the_product['product_price'] += number_format( str_replace( ',', '.', $parent_meta['product_price'] ), 2, '.', '' );
-									$the_product['price_ht'] += number_format( str_replace( ',', '.',$parent_meta['price_ht']) , 2, '.', '' );
-									$the_product['tva'] += number_format( str_replace( ',', '.', $parent_meta['tva']) , 2, '.', '' );
+								if (!empty($variation_def) && !empty($variation_def['options']) && !empty($variation_def['options']['priority']) && in_array('combined', $variation_def['options']['priority']) && !empty($variation_def['options']['price_behaviour']) && in_array('addition', $variation_def['options']['price_behaviour']) && !empty($variation_def['attributes']) && count($variation_def['attributes']) > 1) {
+									$the_product['product_price'] += number_format(str_replace(',', '.', $parent_meta['product_price']), 2, '.', '');
+									$the_product['price_ht'] += number_format(str_replace(',', '.', $parent_meta['price_ht']), 2, '.', '');
+									$the_product['tva'] += number_format(str_replace(',', '.', $parent_meta['tva']), 2, '.', '');
 								}
 							}
 						}
 					}
 				}
 
-				if( !empty($the_product) && empty($the_product['price_ttc_before_discount']) && empty($the_product['price_ht_before_discount']) ) {
-					$price_infos = wpshop_prices::check_product_price( $the_product, true );
-					if ( !empty($price_infos['discount']['discount_exist']) ) {
+				if (!empty($the_product) && empty($the_product['price_ttc_before_discount']) && empty($the_product['price_ht_before_discount'])) {
+					$price_infos = wpshop_prices::check_product_price($the_product, true);
+					if (!empty($price_infos['discount']['discount_exist'])) {
 						$the_product['price_ttc_before_discount'] = $the_product['product_price'];
 						$the_product['price_ht_before_discount'] = $the_product['price_ht'];
 					}
-					$the_product['price_ht'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ?  $price_infos['discount']['discount_et_price'] : $price_infos['et'];
-					$the_product['product_price'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
-					$the_product['tva'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
+					$the_product['price_ht'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_et_price'] : $price_infos['et'];
+					$the_product['product_price'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
+					$the_product['tva'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
 				}
 
-				$product = wpshop_products::get_product_data( $product_id, true );
+				$product = wpshop_products::get_product_data($product_id, true);
 				// Add free variations to product
-				if (  !empty( $wpshop_free_variation )  ) {
+				if (!empty($wpshop_free_variation)) {
 					$the_product['item_meta']['free_variation'] = $wpshop_free_variation;
 				}
 				// Change picture if have a selected variation
-				$the_selected_variation = !empty( $product_with_variation ) && !empty( $product_with_variation[$head_product_id] ) && !empty( $product_with_variation[$head_product_id]['variations'] ) ? $product_with_variation[$head_product_id]['variations'] : null;
-				$response['wps_product_image'] = $wpshop_products->wps_selected_variation_picture( $head_product_id, $the_selected_variation );
+				$the_selected_variation = !empty($product_with_variation) && !empty($product_with_variation[$head_product_id]) && !empty($product_with_variation[$head_product_id]['variations']) ? $product_with_variation[$head_product_id]['variations'] : null;
+				$response['wps_product_image'] = $wpshop_products->wps_selected_variation_picture($head_product_id, $the_selected_variation);
 
 				// Price Display
-				$price_attribute = wpshop_attributes::getElement( 'product_price', "'valid'", 'code' );
-				$price_display = wpshop_attributes::check_attribute_display( $price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
+				$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+				$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
 				$productPrice = '';
-				if ( $price_display ) {
+				if ($price_display) {
 					$response['product_price_output'] = wpshop_prices::get_product_price($the_product, 'price_display', 'complete_sheet', false, true);
 				}
 
 				//Get Summary cart
-				$response['product_output'] = $wpshop_products->wps_get_summary_variations_product( $product_id, $the_product, ( !empty( $wpshop_variation_selected ) || !empty( $wpshop_free_variation ) ? true : false )  );
+				$response['product_output'] = $wpshop_products->wps_get_summary_variations_product($product_id, $the_product, (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation) ? true : false));
 				$response_status = true;
 			}
 			else {
@@ -2907,7 +2907,7 @@ 
 			}
 		}
 
-		return array( $response_status, $response );
+		return array($response_status, $response);
 	}
 
 	/**
@@ -2915,7 +2915,7 @@ 
 	 *
 	 * @param array $shortcode_attribute Some parameters given by the shortcode for display
 	 */
-	function wpshop_product_variation_value_detail( $shortcode_attribute ) {
+	function wpshop_product_variation_value_detail($shortcode_attribute) {
 		echo wpshop_display::display_template_element('wpshop_product_variation_value_detail_container', array());
 	}
 
@@ -2927,47 +2927,47 @@ 
 	 *
 	 * @return array The product list for adding to the cart build by variation priority
 	 */
-	public static function get_variation_by_priority( $selected_variation, $product_id, $add_to_cart_action = false ) {
+	public static function get_variation_by_priority($selected_variation, $product_id, $add_to_cart_action = false) {
 		global $wpdb;
 		$all_required_variations_selected = $no_selected_variation = true;
 		$single_variations = $combined_variations = $product_to_add_to_cart = array();
 
 		// Check if all required variations are selected
-		$required_attributes_list = wpshop_prices::check_required_attributes( $product_id );
-		foreach( $selected_variation as $k => $value ) {
-			if( $value == 0 && in_array($k, $required_attributes_list) ) {
+		$required_attributes_list = wpshop_prices::check_required_attributes($product_id);
+		foreach ($selected_variation as $k => $value) {
+			if ($value == 0 && in_array($k, $required_attributes_list)) {
 				$all_required_variations_selected = false;
 			}
-			if( $value != 0 ) {
+			if ($value != 0) {
 				$no_selected_variation = false;
 			}
 		}
-		if( !empty($selected_variation) ) {
+		if (!empty($selected_variation)) {
 			//Check variations configuration
 			$product_variation_configuration = get_post_meta($product_id, '_wpshop_variation_defining', true);
 			// Check variations type
-			$product_variation_type = ( !empty($product_variation_configuration) && !empty($product_variation_configuration['variation_type']) ) ? $product_variation_configuration['variation_type'] : 'single';
+			$product_variation_type = (!empty($product_variation_configuration) && !empty($product_variation_configuration['variation_type'])) ? $product_variation_configuration['variation_type'] : 'single';
 			$product_to_add_to_cart[$product_id]['variation_priority'] = $product_variation_type;
 
 			//Check defined variation priority
-			$priority = (!empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['priority'][0]) ) ?  $product_variation_configuration['options']['priority'][0] : 'combined';
+			$priority = (!empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['priority'][0])) ? $product_variation_configuration['options']['priority'][0] : 'combined';
 			$product_to_add_to_cart[$product_id]['defined_variation_priority'] = $priority;
 
 			// Recover all product variations
 			$query_variation = $selected_variation;
 			// Delete free variations
-			unset( $query_variation['free'] );
+			unset($query_variation['free']);
 
-			if( $product_variation_type == 'single' ) {
+			if ($product_variation_type == 'single') {
 				// Get single variations
 				$single_variations = array();
-				foreach ( $selected_variation as $attribute_code => $attribute_value ) {
-					if ( isset($attribute_value) && $attribute_code != 'free' ) {
+				foreach ($selected_variation as $attribute_code => $attribute_value) {
+					if (isset($attribute_value) && $attribute_code != 'free') {
 						$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_value = '" . serialize(array($attribute_code => $attribute_value)) . "'", $product_id);
 						$single_variation_id = $wpdb->get_var($query);
-						if ( !empty($single_variation_id) ) {
+						if (!empty($single_variation_id)) {
 							$single_variations[] = $single_variation_id;
-							unset( $query_variation[$attribute_code] );
+							unset($query_variation[$attribute_code]);
 						}
 					}
 				}
@@ -2976,21 +2976,21 @@ 
 				// Get combined variations
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_key = '_wpshop_variations_attribute_def' AND P_META.meta_value = '" . serialize($query_variation) . "'", $product_id);
 				$combined_variation_id = $wpdb->get_var($query);
-				if ( !empty($combined_variation_id) ) {
+				if (!empty($combined_variation_id)) {
 					$combined_variations[] = $combined_variation_id;
 				}
 
 			}
 
 			//If all required variations are not selected
-			if ( !$all_required_variations_selected || $no_selected_variation ) {
+			if (!$all_required_variations_selected || $no_selected_variation) {
 				$product_to_add_to_cart['text_from'] = 'on';
 				// If we choose to display lower price variation combinaison
-				if( empty($product_variation_configuration) || ( !empty($product_variation_configuration) && empty($product_variation_configuration['options']) ) || ( !empty($product_variation_configuration) && !empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['price_display']) && !empty($product_variation_configuration['options']['price_display']['lower_price']) ) ) {
+				if (empty($product_variation_configuration) || (!empty($product_variation_configuration) && empty($product_variation_configuration['options'])) || (!empty($product_variation_configuration) && !empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['price_display']) && !empty($product_variation_configuration['options']['price_display']['lower_price']))) {
 					//Get lower price variation combinaison
-					$lower_price_variations = wpshop_prices::check_product_lower_price( $product_id );
-					if ( !empty($lower_price_variations['variations']) && is_array($lower_price_variations['variations']) ) {
-						foreach( $lower_price_variations['variations'] as $lower_price_variation ) {
+					$lower_price_variations = wpshop_prices::check_product_lower_price($product_id);
+					if (!empty($lower_price_variations['variations']) && is_array($lower_price_variations['variations'])) {
+						foreach ($lower_price_variations['variations'] as $lower_price_variation) {
 							$product_to_add_to_cart[$product_id]['variations'][] = $lower_price_variation;
 						}
 					}
@@ -3002,7 +3002,7 @@ 
 			}
 			else {
 				$product_to_add_to_cart['text_from'] = '';
-				$product_to_add_to_cart[$product_id]['variations'] = ( !empty($product_variation_type) && $product_variation_type == 'single' ) ? $single_variations : $combined_variations;
+				$product_to_add_to_cart[$product_id]['variations'] = (!empty($product_variation_type) && $product_variation_type == 'single') ? $single_variations : $combined_variations;
 			}
 		}
 
@@ -3010,30 +3010,30 @@ 
 	}
 
 
-	public static function get_variation_price_behaviour( $product_into_cart, $product_variations, $head_product_id, $variations_options ) {
+	public static function get_variation_price_behaviour($product_into_cart, $product_variations, $head_product_id, $variations_options) {
 		global $wpdb;
 
-		if( !empty($product_variations) ) {
+		if (!empty($product_variations)) {
 			// Initialize variations total price datas
-			$variations_total_price = array( 'price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
-			$variations_discount_total_price = array( 'price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0 );
+			$variations_total_price = array('price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
+			$variations_discount_total_price = array('price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
 			$vat_rate = 0;
 			$discount_amount = $discount_rate = $special_price = 0;
 			// Recover Head product metadata
-			$head_product_metadata = get_post_meta( $head_product_id, '_wpshop_product_metadata', true );
-			$tva_rate_id = ( !empty($head_product_metadata['tx_tva']) ) ? $head_product_metadata['tx_tva'] : 0;
-			if( !empty($tva_rate_id) ) {
+			$head_product_metadata = get_post_meta($head_product_id, '_wpshop_product_metadata', true);
+			$tva_rate_id = (!empty($head_product_metadata['tx_tva'])) ? $head_product_metadata['tx_tva'] : 0;
+			if (!empty($tva_rate_id)) {
 				// Recover VAT Rate of product
-				$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id = %d', $tva_rate_id );
-				$vat_rate = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $tva_rate_id);
+				$vat_rate = $wpdb->get_var($query);
 			}
-			$price_piloting = get_option( 'wpshop_shop_price_piloting');
-			foreach( $product_variations as $product_variation ) {
+			$price_piloting = get_option('wpshop_shop_price_piloting');
+			foreach ($product_variations as $product_variation) {
 				$variation_metadata['product_price'] = 0;
-				$variation_metadata = get_post_meta( $product_variation, '_wpshop_product_metadata', true );
-				if( !empty($variation_metadata) ) {
-					$p_et = ( ( empty($price_piloting) || $price_piloting == 'TTC' ) ? ( ( !empty( $variation_metadata['product_price'] ) ? $variation_metadata['product_price'] : 0 ) / ( 1 + ( $vat_rate / 100) ) )  : $variation_metadata['price_ht'] );
-					$p_ati = ( ( empty($price_piloting) || $price_piloting == 'TTC' ) ? ( !empty( $variation_metadata['product_price'] ) ? $variation_metadata['product_price'] : 0 ) : ( $variation_metadata['price_ht'] * ( 1 + ( $vat_rate / 100) ) ) );
+				$variation_metadata = get_post_meta($product_variation, '_wpshop_product_metadata', true);
+				if (!empty($variation_metadata)) {
+					$p_et = ((empty($price_piloting) || $price_piloting == 'TTC') ? ((!empty($variation_metadata['product_price']) ? $variation_metadata['product_price'] : 0) / (1 + ($vat_rate / 100))) : $variation_metadata['price_ht']);
+					$p_ati = ((empty($price_piloting) || $price_piloting == 'TTC') ? (!empty($variation_metadata['product_price']) ? $variation_metadata['product_price'] : 0) : ($variation_metadata['price_ht'] * (1 + ($vat_rate / 100))));
 
 					$variations_total_price['price_et'] += $p_et;
 					$variations_total_price['price_ati'] += $p_ati;
@@ -3042,20 +3042,20 @@ 
 					$variation_metadata['tx_tva'] = $product_into_cart['tx_tva'] = $vat_rate;
 
 					// Check discount
-					$discount_config = wpshop_prices::check_discount_for_product( $product_variation );
-					if ( !empty($discount_config) && !empty($discount_config['value']) ) {
-						$variation_discount_prices = wpshop_prices::calcul_discounted_price( $variation_metadata, $discount_config );
+					$discount_config = wpshop_prices::check_discount_for_product($product_variation);
+					if (!empty($discount_config) && !empty($discount_config['value'])) {
+						$variation_discount_prices = wpshop_prices::calcul_discounted_price($variation_metadata, $discount_config);
 						$variations_discount_total_price['price_et'] += $variation_discount_prices['price_ht'];
 						$variations_discount_total_price['price_ati'] += $variation_discount_prices['product_price'];
 						$variations_discount_total_price['vat_amount'] += $variation_discount_prices['tva'];
 
-						if( !empty($discount_config['type']) && $discount_config['type'] == 'discount_amount' ) {
+						if (!empty($discount_config['type']) && $discount_config['type'] == 'discount_amount') {
 							$product_into_cart['discount_amount'] = $discount_amount + $product_into_cart['discount_amount'];
 						}
-						elseif( !empty($discount_config['type']) && $discount_config['type'] == 'discount_rate' ) {
+						elseif (!empty($discount_config['type']) && $discount_config['type'] == 'discount_rate') {
 							$product_into_cart['discount_rate'] = $discount_rate + $discount_config['value'];
 						}
-						elseif( !empty($discount_config['type']) && $discount_config['type'] == 'special_price' ) {
+						elseif (!empty($discount_config['type']) && $discount_config['type'] == 'special_price') {
 							$product_into_cart['special_price'] = $special_price + $discount_config['value'];
 						}
 					}
@@ -3066,10 +3066,10 @@ 
 			}
 
 			// Check if add or replace variation price to head product
-			$product_variation_defining = get_post_meta( $head_product_id, '_wpshop_variation_defining', true );
-			if( empty($product_variation_defining) || ( !empty($product_variation_defining) && empty($product_variation_defining['options']) ) || ( ( !empty($product_variation_defining) ) && !empty($product_variation_defining['options']) && !empty($product_variation_defining['options']['price_behaviour']) && !empty($product_variation_defining['options']['price_behaviour'][0]) && $product_variation_defining['options']['price_behaviour'][0] == 'replacement' ) ){
+			$product_variation_defining = get_post_meta($head_product_id, '_wpshop_variation_defining', true);
+			if (empty($product_variation_defining) || (!empty($product_variation_defining) && empty($product_variation_defining['options'])) || ((!empty($product_variation_defining)) && !empty($product_variation_defining['options']) && !empty($product_variation_defining['options']['price_behaviour']) && !empty($product_variation_defining['options']['price_behaviour'][0]) && $product_variation_defining['options']['price_behaviour'][0] == 'replacement')) {
 				//Replace the product price
-				if( !empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati']) ) {
+				if (!empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati'])) {
 					$product_into_cart['price_ttc_before_discount'] = $variations_total_price['price_ati'];
 					$product_into_cart['price_ht_before_discount'] = $variations_total_price['price_et'];
 
@@ -3085,9 +3085,9 @@ 
 			}
 			else {
 				// Add variations price to product price
-				if( !empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati']) ) {
-					$product_into_cart['price_ttc_before_discount'] = ( $product_into_cart['product_price'] + $variations_total_price['price_ati'] );
-					$product_into_cart['price_ht_before_discount'] = ( $product_into_cart['price_ht'] + $variations_total_price['price_et'] );
+				if (!empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati'])) {
+					$product_into_cart['price_ttc_before_discount'] = ($product_into_cart['product_price'] + $variations_total_price['price_ati']);
+					$product_into_cart['price_ht_before_discount'] = ($product_into_cart['price_ht'] + $variations_total_price['price_et']);
 
 					$product_into_cart['product_price'] += $variations_discount_total_price['price_ati'];
 					$product_into_cart['price_ht'] += $variations_discount_total_price['price_et'];
@@ -3099,19 +3099,19 @@ 
 					$product_into_cart['tva'] += $variations_total_price['vat_amount'];
 				}
 				// Check parent discount
-				$parent_discount_config = wpshop_prices::check_discount_for_product( $head_product_id );
-				if( !empty($parent_discount_config) ) {
-					$product_into_cart['price_ttc_before_discount'] = ( !empty( $product_into_cart['price_ttc_before_discount'] ) ) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
-					$product_into_cart['price_ht_before_discount'] = ( !empty($product_into_cart['price_ht_before_discount']) ) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
-					$product_into_cart = wpshop_prices::calcul_discounted_price( $product_into_cart, $parent_discount_config );
-
-					if( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_amount' ) {
-						$product_into_cart['discount_amount'] = $discount_amount +  $parent_discount_config['value'];
+				$parent_discount_config = wpshop_prices::check_discount_for_product($head_product_id);
+				if (!empty($parent_discount_config)) {
+					$product_into_cart['price_ttc_before_discount'] = (!empty($product_into_cart['price_ttc_before_discount'])) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
+					$product_into_cart['price_ht_before_discount'] = (!empty($product_into_cart['price_ht_before_discount'])) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
+					$product_into_cart = wpshop_prices::calcul_discounted_price($product_into_cart, $parent_discount_config);
+
+					if (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_amount') {
+						$product_into_cart['discount_amount'] = $discount_amount + $parent_discount_config['value'];
 					}
-					elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate' ) {
+					elseif (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate') {
 						$product_into_cart['discount_rate'] = $discount_rate + $parent_discount_config['value'];
 					}
-					elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price' ) {
+					elseif (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price') {
 						$product_into_cart['special_price'] = $special_price + $parent_discount_config['value'];
 					}
 				}
@@ -3119,16 +3119,16 @@ 
 		}
 		else {
 			// If product have just Free variations
-			$discount_config = wpshop_prices::check_discount_for_product( $head_product_id );
-			if( !empty($discount_config) ) {
-				$product_into_cart['price_ttc_before_discount'] = ( !empty( $product_into_cart['price_ttc_before_discount'] ) ) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
-				$product_into_cart['price_ht_before_discount'] = ( !empty($product_into_cart['price_ht_before_discount']) ) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
-				$product_into_cart = wpshop_prices::calcul_discounted_price( $product_into_cart, $discount_config );
+			$discount_config = wpshop_prices::check_discount_for_product($head_product_id);
+			if (!empty($discount_config)) {
+				$product_into_cart['price_ttc_before_discount'] = (!empty($product_into_cart['price_ttc_before_discount'])) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
+				$product_into_cart['price_ht_before_discount'] = (!empty($product_into_cart['price_ht_before_discount'])) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
+				$product_into_cart = wpshop_prices::calcul_discounted_price($product_into_cart, $discount_config);
 			}
 		}
 
 		// Text From indicator
-		if( !empty($variations_options) && !empty($variations_options['text_from']) ) {
+		if (!empty($variations_options) && !empty($variations_options['text_from'])) {
 			$product_into_cart['text_from'] = $variations_options['text_from'];
 		}
 		return $product_into_cart;
@@ -3143,28 +3143,28 @@ 
 	 *
 	 * @return array The array containing all product options ordered as the admin configure it
 	 */
-	public static function get_selected_variation_display( $product_definition_value, $output_order, $from_page = null, $template_part = 'wpshop', $output_type = null ) {
+	public static function get_selected_variation_display($product_definition_value, $output_order, $from_page = null, $template_part = 'wpshop', $output_type = null) {
 		$variation_attribute_ordered = array();
 		$variation_attribute_ordered['prices'] = array();
 		$variation_attribute_ordered['attribute_list'] = array();
 
-		if ( !empty( $product_definition_value['variation_definition'] ) && is_array( $product_definition_value['variation_definition'] ) ) {
-			foreach ( $product_definition_value['variation_definition'] as $variation_attribute_code => $variation_attribute_detail ) {
+		if (!empty($product_definition_value['variation_definition']) && is_array($product_definition_value['variation_definition'])) {
+			foreach ($product_definition_value['variation_definition'] as $variation_attribute_code => $variation_attribute_detail) {
 				$variation_tpl_component = array();
-				foreach ( $variation_attribute_detail as $info_name => $info_value) {
-					$variation_tpl_component['VARIATION_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value)  : stripslashes($info_value);
+				foreach ($variation_attribute_detail as $info_name => $info_value) {
+					$variation_tpl_component['VARIATION_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value) : stripslashes($info_value);
 				}
 				$variation_tpl_component['VARIATION_ID'] = $variation_attribute_code;
 				$variation_tpl_component['VARIATION_ATT_CODE'] = $variation_attribute_code;
-				if( !empty($output_order[$variation_attribute_code]) ){
+				if (!empty($output_order[$variation_attribute_code])) {
 					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
-					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
 						$variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = $display_data;
 					}
 				}
 				else {
 					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
-					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
 						$variation_attribute_ordered['attribute_list'][] = $display_data;
 					}
 				}
@@ -3172,15 +3172,15 @@ 
 			}
 		}
 
-		if ( !empty( $product_definition_value['variations'] ) && is_array( $product_definition_value['variations'] ) ) {
-			foreach ( $product_definition_value['variations'] as $variation_id => $variation_details ) {
+		if (!empty($product_definition_value['variations']) && is_array($product_definition_value['variations'])) {
+			foreach ($product_definition_value['variations'] as $variation_id => $variation_details) {
 				$variation_tpl_component = array();
-				foreach ( $variation_details as $info_name => $info_value) {
-					if ( $info_name != 'item_meta' ) {
-						$variation_tpl_component['VARIATION_DETAIL_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value)  : stripslashes($info_value);
+				foreach ($variation_details as $info_name => $info_value) {
+					if ($info_name != 'item_meta') {
+						$variation_tpl_component['VARIATION_DETAIL_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value) : stripslashes($info_value);
 					}
 				}
-				foreach ( $variation_details['item_meta']['variation_definition'] as $variation_attribute_code => $variation_attribute_def ) {
+				foreach ($variation_details['item_meta']['variation_definition'] as $variation_attribute_code => $variation_attribute_def) {
 					$variation_tpl_component['VARIATION_NAME'] = stripslashes($variation_attribute_def['NAME']);
 					$variation_tpl_component['VARIATION_VALUE'] = stripslashes($variation_attribute_def['VALUE']);
 					$variation_tpl_component['VARIATION_ID'] = $variation_id;
@@ -3188,7 +3188,7 @@ 
 
 					$variation_attribute_ordered['prices'][$variation_attribute_code] = $variation_tpl_component['VARIATION_DETAIL_PRODUCT_PRICE'];
 				}
-				if( !empty($output_order[$variation_attribute_code]) ) {
+				if (!empty($output_order[$variation_attribute_code])) {
 					$variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
 				}
 				unset($variation_tpl_component);
@@ -3196,9 +3196,9 @@ 
 		}
 
 		/**	Free Variation part	*/
-		if ( !empty( $product_definition_value['free_variation'] ) && is_array( $product_definition_value['free_variation'] ) ) {
-			foreach ( $product_definition_value['free_variation'] as $build_variation_key => $build_variation ) {
-				if ( strpos($build_variation, '-_variation_val_-')) {
+		if (!empty($product_definition_value['free_variation']) && is_array($product_definition_value['free_variation'])) {
+			foreach ($product_definition_value['free_variation'] as $build_variation_key => $build_variation) {
+				if (strpos($build_variation, '-_variation_val_-')) {
 					$variation_definition = explode('-_variation_val_-', $build_variation);
 					$attribute_code = $variation_definition[0];
 					$attribute_selected_value = $variation_definition[1];
@@ -3211,17 +3211,17 @@ 
 				$free_variation_attribute_def = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 				$variation_tpl_component['VARIATION_NAME'] = stripslashes($free_variation_attribute_def->frontend_label);
 				$value_to_outut = $attribute_selected_value;
-				switch ( $free_variation_attribute_def->data_type ) {
+				switch ($free_variation_attribute_def->data_type) {
 					case 'datetime':
-						$value_to_outut = mysql2date( get_option( 'date_format' ), $attribute_selected_value, true );
+						$value_to_outut = mysql2date(get_option('date_format'), $attribute_selected_value, true);
 					break;
 				}
 				$variation_tpl_component['VARIATION_VALUE'] = stripslashes($value_to_outut);
 				$variation_tpl_component['VARIATION_ID'] = $attribute_code;
 				$variation_tpl_component['VARIATION_ATT_CODE'] = $attribute_code;
-				if ( !empty($value_to_outut) && !empty($output_order[$free_variation_attribute_def->code]) ) {
+				if (!empty($value_to_outut) && !empty($output_order[$free_variation_attribute_def->code])) {
 					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_code), $template_part);
-					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
 						$variation_attribute_ordered['attribute_list'][$output_order[$free_variation_attribute_def->code]] = $display_data;
 					}
 				}
@@ -3232,23 +3232,23 @@ 
 	}
 
 
-	function wps_selected_variation_picture( $head_product_id, $variations ) {
+	function wps_selected_variation_picture($head_product_id, $variations) {
 		$response = array();
 		/** Selected Product image **/
-		$post_thumbnail_id = get_post_thumbnail_id( $head_product_id );
-		if( !empty($post_thumbnail_id) ) {
+		$post_thumbnail_id = get_post_thumbnail_id($head_product_id);
+		if (!empty($post_thumbnail_id)) {
 			$response['img_id'] = $post_thumbnail_id;
-			$response['img'] = wp_get_attachment_image( $post_thumbnail_id,  'wpshop-product-galery' );
-			$response['img_url'] = wp_get_attachment_url( $post_thumbnail_id );
+			$response['img'] = wp_get_attachment_image($post_thumbnail_id, 'wpshop-product-galery');
+			$response['img_url'] = wp_get_attachment_url($post_thumbnail_id);
 		}
 
 		/** check if have one variation **/
-		if ( !empty($variations) && count($variations) == 1 ) {
-			$variation_attached_image_id = get_post_meta( $variations[0], '_wps_variation_attached_picture', true );
-			if( !empty($variation_attached_image_id) ) {
+		if (!empty($variations) && count($variations) == 1) {
+			$variation_attached_image_id = get_post_meta($variations[0], '_wps_variation_attached_picture', true);
+			if (!empty($variation_attached_image_id)) {
 				$response['img_id'] = $variation_attached_image_id;
-				$response['img'] = wp_get_attachment_image( $variation_attached_image_id,  'wpshop-product-galery' );
-				$response['img_url'] = wp_get_attachment_url( $variation_attached_image_id);
+				$response['img'] = wp_get_attachment_image($variation_attached_image_id, 'wpshop-product-galery');
+				$response['img_url'] = wp_get_attachment_url($variation_attached_image_id);
 			}
 		}
 		return $response;
@@ -3260,23 +3260,23 @@ 
 		global $post;
 		$product_id = $post->ID;
 
-		$variations = self::get_variation( $product_id );
+		$variations = self::get_variation($product_id);
 
 		$sales_informations = array();
 		/** Query **/
-		$data_to_compare = '"item_id";s:' .strlen($product_id). ':"' .$product_id. '";';
-		$query_args = array( 'posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'meta_query' => array( array('key' => '_order_postmeta', 'value' => $data_to_compare, 'compare' => 'LIKE') ) );
-		$orders = new WP_Query( $query_args );
-		if ( !empty($orders) && !empty($orders->posts) ) {
-			foreach( $orders->posts as $order ) {
-				$order_meta = get_post_meta( $order->ID, '_order_postmeta', true );
-				$order_info = get_post_meta( $order->ID, '_order_info', true );
+		$data_to_compare = '"item_id";s:' . strlen($product_id) . ':"' . $product_id . '";';
+		$query_args = array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'meta_query' => array(array('key' => '_order_postmeta', 'value' => $data_to_compare, 'compare' => 'LIKE')));
+		$orders = new WP_Query($query_args);
+		if (!empty($orders) && !empty($orders->posts)) {
+			foreach ($orders->posts as $order) {
+				$order_meta = get_post_meta($order->ID, '_order_postmeta', true);
+				$order_info = get_post_meta($order->ID, '_order_info', true);
 				$sales_informations[] = array(
-											'order_key' => ( !empty($order_meta) && !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : '',
-											'order_date' => ( !empty($order_meta) && !empty($order_meta['order_date']) ) ? $order_meta['order_date'] : '',
-											'customer_firstname' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_first_name']) ) ? $order_info['billing']['address']['address_first_name'] : '',
-											'customer_name' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name']) ) ? $order_info['billing']['address']['address_last_name'] : '',
-											'customer_email' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : ''
+											'order_key' => (!empty($order_meta) && !empty($order_meta['order_key'])) ? $order_meta['order_key'] : '',
+											'order_date' => (!empty($order_meta) && !empty($order_meta['order_date'])) ? $order_meta['order_date'] : '',
+											'customer_firstname' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_first_name'])) ? $order_info['billing']['address']['address_first_name'] : '',
+											'customer_name' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name'])) ? $order_info['billing']['address']['address_last_name'] : '',
+											'customer_email' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_user_email'])) ? $order_info['billing']['address']['address_user_email'] : ''
 										);
 			}
 		}
@@ -3284,33 +3284,33 @@ 
 
 		/** If product has been ordered **/
 		$output = '';
-		if( !empty($sales_informations) ) {
-			$output .= '<p>'.__( 'This product has been ordered', 'wpshop').' :</p>';
+		if (!empty($sales_informations)) {
+			$output .= '<p>' . __('This product has been ordered', 'wpshop') . ' :</p>';
 			$output .= '<ul>';
-			foreach( $sales_informations as $sales_information ) {
-				$output .= '<li>' .sprintf( __( 'Ordered by %s %s (%s) on %s (Order ref. : %s)', 'wpshop'), $sales_information['customer_name'], $sales_information['customer_firstname'], $sales_information['customer_email'], $sales_information['order_date'], $sales_information['order_key'] ). '</li>';
+			foreach ($sales_informations as $sales_information) {
+				$output .= '<li>' . sprintf(__('Ordered by %s %s (%s) on %s (Order ref. : %s)', 'wpshop'), $sales_information['customer_name'], $sales_information['customer_firstname'], $sales_information['customer_email'], $sales_information['order_date'], $sales_information['order_key']) . '</li>';
 			}
 			$output .= '</ul>';
 		}
 		else {
-			$output .= __( 'This product has never been ordered', 'wpshop');
+			$output .= __('This product has never been ordered', 'wpshop');
 		}
 
 		echo $output;
 	}
 
 
-	function wps_get_summary_variations_product( $product_id, $the_product, $has_variation ) {
+	function wps_get_summary_variations_product($product_id, $the_product, $has_variation) {
 		global $wpdb, $wpshop_payment;
 		$output = '';
 		$tpl_component = array();
 		/**	Get attribute order for current product	*/
-		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 		$output_order = array();
-		if ( count($product_attribute_order_detail) > 0 ) {
-			foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-				foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-					if ( !empty($attribute_def->code) )
+		if (count($product_attribute_order_detail) > 0) {
+			foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+				foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+					if (!empty($attribute_def->code))
 						$output_order[$attribute_def->code] = $position;
 				}
 			}
@@ -3318,22 +3318,22 @@ 
 		$variation_attribute_ordered = array();
 
 		/** Check if product is a variation and change his name **/
-		$product_post_type = get_post_type( $the_product['product_id'] );
-		if ( !empty($product_post_type) && $product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-			$parent_infos = wpshop_products::get_parent_variation( $the_product['product_id'] );
-			$parent_post = ( !empty($parent_infos) && !empty($parent_infos['parent_post']) ) ? $parent_infos['parent_post'] : array();
+		$product_post_type = get_post_type($the_product['product_id']);
+		if (!empty($product_post_type) && $product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+			$parent_infos = wpshop_products::get_parent_variation($the_product['product_id']);
+			$parent_post = (!empty($parent_infos) && !empty($parent_infos['parent_post'])) ? $parent_infos['parent_post'] : array();
 			$the_product['product_name'] = $the_product['post_title'] = $parent_post->post_title;
 		}
 
-		foreach ( $the_product as $product_definition_key => $product_definition_value ) {
-			if ( $product_definition_key != 'item_meta' ) {
+		foreach ($the_product as $product_definition_key => $product_definition_value) {
+			if ($product_definition_key != 'item_meta') {
 				$tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
-				if ( !empty($wpshop_current_for_display) && in_array($product_definition_key, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ) {
+				if (!empty($wpshop_current_for_display) && in_array($product_definition_key, unserialize(WPSHOP_ATTRIBUTE_PRICES))) {
 					$tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
 				}
 			}
 			else {
-				$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $product_definition_value, $output_order, 'selection_summary' );
+				$variation_attribute_ordered = wpshop_products::get_selected_variation_display($product_definition_value, $output_order, 'selection_summary');
 			}
 		}
 
@@ -3341,7 +3341,7 @@ 
 
 		ksort($variation_attribute_ordered['attribute_list']);
 		$tpl_component['PRODUCT_VARIATION_SUMMARY_DETAILS'] = '';
-		foreach ( $variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output ) {
+		foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
 			$tpl_component['PRODUCT_VARIATION_SUMMARY_DETAILS'] .= $attribute_variation_to_output;
 		}
 
@@ -3349,36 +3349,36 @@ 
 
 		/**	For security get all attributes defined as user defined or used in variation in order to set default value to empty	*/
 		$attribute_list = wpshop_attributes::getElement('yes', "'valid'", "is_used_for_variation", true);
-		if ( !empty($attribute_list) ) {
-			foreach ( $attribute_list as $attribute_def ) {
+		if (!empty($attribute_list)) {
+			foreach ($attribute_list as $attribute_def) {
 				$tpl_component['VARIATION_SUMMARY_ATTRIBUTE_PER_PRICE_' . strtoupper($attribute_def->code)] = '-';
 			}
 		}
 
 		/**	Fill the array with all prices for different variations	*/
-		foreach ( $variation_attribute_ordered['prices'] as $attribute => $prices ) {
+		foreach ($variation_attribute_ordered['prices'] as $attribute => $prices) {
 			$tpl_component['VARIATION_SUMMARY_ATTRIBUTE_PER_PRICE_' . strtoupper($attribute)] = $prices;
 		}
 
 		$tpl_component['PRODUCT_VARIATION_SUMMARY_MORE_CONTENT'] = '';
 		$query = $wpdb->prepare("SELECT post_id, meta_value FROM " . $wpdb->postmeta . " WHERE meta_key = %s ", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
 		$post_list_with_options = $wpdb->get_results($query);
-		if ( !empty($post_list_with_options) ) {
+		if (!empty($post_list_with_options)) {
 			$additionnal_price = 0;
-			foreach ( $post_list_with_options as $product_info) {
+			foreach ($post_list_with_options as $product_info) {
 				$product_meta = unserialize($product_info->meta_value);
-				if ( !empty($product_meta['cart']) && !empty($product_meta['cart']['auto_add']) && ($product_meta['cart']['auto_add'] == 'yes') ) {
+				if (!empty($product_meta['cart']) && !empty($product_meta['cart']['auto_add']) && ($product_meta['cart']['auto_add'] == 'yes')) {
 					$product = wpshop_products::get_product_data($product_info->post_id, true, '"publish", "draft"');
 
-					$the_product = array_merge( array(
+					$the_product = array_merge(array(
 							'product_id'	=> $product_info->post_id,
 							'product_qty' 	=> 1
 					), $product);
 
-					$additionnal_price += ( !$different_currency || ($change_rate == 1) ) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate);
+					$additionnal_price += (!$different_currency || ($change_rate == 1)) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate);
 					$tpl_component['AUTO_PRODUCT_NAME'] = $the_product['product_name'];
 
-					$tpl_component['AUTO_PRODUCT_PRODUCT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', ( !$different_currency || ($change_rate == 1) ) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate));
+					$tpl_component['AUTO_PRODUCT_PRODUCT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', (!$different_currency || ($change_rate == 1)) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate));
 					$tpl_component['PRODUCT_VARIATION_SUMMARY_MORE_CONTENT'] = wpshop_display::display_template_element('wpshop_product_configuration_summary_detail_auto_product', $tpl_component);
 				}
 			}
@@ -3386,14 +3386,14 @@ 
 
 		$tpl_component['PRODUCT_VARIATION_SUMMARY_GRAND_TOTAL'] = '';
 		$tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] = '';
-		if ( !empty($additionnal_price) ) {
+		if (!empty($additionnal_price)) {
 			$tpl_component['SUMMARY_FINAL_RESULT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', $tpl_component['PRODUCT_MAIN_INFO_PRODUCT_PRICE'] + $additionnal_price);
 			$tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] = ($tpl_component['PRODUCT_MAIN_INFO_PRODUCT_PRICE'] + $additionnal_price);
 			$tpl_component['PRODUCT_VARIATION_SUMMARY_GRAND_TOTAL'] = wpshop_display::display_template_element('wpshop_product_configuration_summary_detail_final_result', $tpl_component);
 		}
 
 		/**	Call informtion for partial payment	*/
-		$partial_payment = $wpshop_payment->partial_payment_calcul( $tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] );
+		$partial_payment = $wpshop_payment->partial_payment_calcul($tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT']);
 		$tpl_component['PARTIAL_PAYMENT_INFO'] = !empty($partial_payment['amount_to_pay']) ? $partial_payment['display'] : '';
 
 
@@ -3420,13 +3420,13 @@ 
 	 * @param array $old_value
 	 * @return array $new_value
 	 */
-	public static function update_wpshop_catalog_product_option( $new_value, $old_value ) {
+	public static function update_wpshop_catalog_product_option($new_value, $old_value) {
 		global $wpdb;
-		$query = $wpdb->prepare('SELECT post_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s AND meta_value LIKE %s', '_wpshop_variation_defining', '%' . serialize( 'follow_general_config' ) . '%' );
-		foreach( $wpdb->get_results( $query ) as $wpshop_variation_defining ) {
-			$wpshop_variation_defining_value = unserialize( $wpshop_variation_defining->meta_value );
+		$query = $wpdb->prepare('SELECT post_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s AND meta_value LIKE %s', '_wpshop_variation_defining', '%' . serialize('follow_general_config') . '%');
+		foreach ($wpdb->get_results($query) as $wpshop_variation_defining) {
+			$wpshop_variation_defining_value = unserialize($wpshop_variation_defining->meta_value);
 			$wpshop_variation_defining_value['options']['price_display'] = $new_value['price_display'];
-			update_post_meta( $wpshop_variation_defining->post_id, '_wpshop_variation_defining', $wpshop_variation_defining_value );
+			update_post_meta($wpshop_variation_defining->post_id, '_wpshop_variation_defining', $wpshop_variation_defining_value);
 		}
 		return $new_value;
 	}

includes/librairies/db/database.class.php

Doc Comments +2 added lines

@@ -120,6 +120,7 @@ 
 	*	Save a new attribute in database
 	*
 	*	@param array $informationsToSet An array with the different information we want to set
+	* @param string $dataBaseTable
 	*
 	*	@return string $requestResponse A message that allows to know if the creation has been done correctly or not
 	*/
@@ -141,6 +142,7 @@ 
 	*	Update an existing attribute in database
 	*
 	*	@param array $informationsToSet An array with the different information we want to set
+	* @param string $dataBaseTable
 	*
 	*	@return string $requestResponse A message that allows to know if the update has been done correctly or not
 	*/

Indentation +36 added lines, -36 removed lines

@@ -24,12 +24,12 @@ 
 {
 
 	/**
-	*	Get the field list into a database table
-	*
-	*	@param string $table_name The name of the table we want to retrieve field list for
-	*
-	*	@return object $field_list A wordpress database object containing the different field of the table
-	*/
+	 *	Get the field list into a database table
+	 *
+	 *	@param string $table_name The name of the table we want to retrieve field list for
+	 *
+	 *	@return object $field_list A wordpress database object containing the different field of the table
+	 */
 	public static function get_field_list($table_name){
 		global $wpdb;
 
@@ -39,12 +39,12 @@ 
 		return $field_list;
 	}
 	/**
-	*	Get a field defintion into a database table
-	*
-	*	@param string $table_name The name of the table we want to retrieve field list for
-	*
-	*	@return object $field A wordpress database object containing the field definition into the database table
-	*/
+	 *	Get a field defintion into a database table
+	 *
+	 *	@param string $table_name The name of the table we want to retrieve field list for
+	 *
+	 *	@return object $field A wordpress database object containing the field definition into the database table
+	 */
 	function get_field_definition($table_name, $field){
 		global $wpdb;
 
@@ -55,12 +55,12 @@ 
 	}
 
 	/**
-	*	Make a translation of the different database field type into a form input type
-	*
-	*	@param string $table_name The name of the table we want to retrieve field input type for
-	*
-	*	@return array $field_to_form An array with the list of field with its type, name and value
-	*/
+	 *	Make a translation of the different database field type into a form input type
+	 *
+	 *	@param string $table_name The name of the table we want to retrieve field input type for
+	 *
+	 *	@return array $field_to_form An array with the list of field with its type, name and value
+	 */
 	public static function fields_to_input($table_name){
 		$list_of_field_to_convert = wpshop_database::get_field_list($table_name);
 
@@ -70,12 +70,12 @@ 
 	}
 
 	/**
-	*	Transform the database table definition into an array for building a input for users
-	*
-	*	@param array $list_of_field_to_convert The list of field we want to have the types for
-	*
-	*	@return array $field_to_form The field stored into an array
-	*/
+	 *	Transform the database table definition into an array for building a input for users
+	 *
+	 *	@param array $list_of_field_to_convert The list of field we want to have the types for
+	 *
+	 *	@return array $field_to_form The field stored into an array
+	 */
 	public static function fields_type($list_of_field_to_convert){
 		$field_to_form = array();
 		$i = 0;
@@ -117,12 +117,12 @@ 
 
 
 	/**
-	*	Save a new attribute in database
-	*
-	*	@param array $informationsToSet An array with the different information we want to set
-	*
-	*	@return string $requestResponse A message that allows to know if the creation has been done correctly or not
-	*/
+	 *	Save a new attribute in database
+	 *
+	 *	@param array $informationsToSet An array with the different information we want to set
+	 *
+	 *	@return string $requestResponse A message that allows to know if the creation has been done correctly or not
+	 */
 	public static function save($informationsToSet, $dataBaseTable){
 		global $wpdb;
 		$requestResponse = '';
@@ -138,12 +138,12 @@ 
 		return $requestResponse;
 	}
 	/**
-	*	Update an existing attribute in database
-	*
-	*	@param array $informationsToSet An array with the different information we want to set
-	*
-	*	@return string $requestResponse A message that allows to know if the update has been done correctly or not
-	*/
+	 *	Update an existing attribute in database
+	 *
+	 *	@param array $informationsToSet An array with the different information we want to set
+	 *
+	 *	@return string $requestResponse A message that allows to know if the update has been done correctly or not
+	 */
 	public static function update($informationsToSet, $id, $dataBaseTable){
 		global $wpdb;
 		$requestResponse = '';

Spacing +27 added lines, -27 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'));
 }
 
 /**
@@ -30,7 +30,7 @@ 
 	*
 	*	@return object $field_list A wordpress database object containing the different field of the table
 	*/
-	public static function get_field_list($table_name){
+	public static function get_field_list($table_name) {
 		global $wpdb;
 
 		$query = "SHOW COLUMNS FROM " . $table_name;
@@ -45,7 +45,7 @@ 
 	*
 	*	@return object $field A wordpress database object containing the field definition into the database table
 	*/
-	function get_field_definition($table_name, $field){
+	function get_field_definition($table_name, $field) {
 		global $wpdb;
 
 		$query = $wpdb->prepare("SHOW COLUMNS FROM " . $table_name . " WHERE Field = %s", $field);
@@ -61,7 +61,7 @@ 
 	*
 	*	@return array $field_to_form An array with the list of field with its type, name and value
 	*/
-	public static function fields_to_input($table_name){
+	public static function fields_to_input($table_name) {
 		$list_of_field_to_convert = wpshop_database::get_field_list($table_name);
 
 		$field_to_form = self::fields_type($list_of_field_to_convert);
@@ -76,32 +76,32 @@ 
 	*
 	*	@return array $field_to_form The field stored into an array
 	*/
-	public static function fields_type($list_of_field_to_convert){
+	public static function fields_type($list_of_field_to_convert) {
 		$field_to_form = array();
 		$i = 0;
-		foreach ($list_of_field_to_convert as $Key => $field_definition){
+		foreach ($list_of_field_to_convert as $Key => $field_definition) {
 			$field_to_form[$i]['name'] = $field_definition->Field;
 			$field_to_form[$i]['value'] = $field_definition->Default;
 
 			$type = 'text';
-			if(($field_definition->Key == 'PRI') || ($field_definition->Field == 'creation_date') || ($field_definition->Field == 'last_update_date')){
-				$type =  'hidden';
+			if (($field_definition->Key == 'PRI') || ($field_definition->Field == 'creation_date') || ($field_definition->Field == 'last_update_date')) {
+				$type = 'hidden';
 			}
-			else{
-				$fieldtype = explode('(',$field_definition->Type);
-				if(!empty($fieldtype[1]))$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+			else {
+				$fieldtype = explode('(', $field_definition->Type);
+				if (!empty($fieldtype[1]))$fieldtype[1] = str_replace(')', '', $fieldtype[1]);
 
-				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int'))
+				if (($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int'))
 					$type = 'text';
-				elseif($fieldtype[0] == 'text')
+				elseif ($fieldtype[0] == 'text')
 					$type = 'textarea';
-				elseif($fieldtype[0] == 'enum')
+				elseif ($fieldtype[0] == 'enum')
 				{
-					$fieldtype[1] = str_replace("'","",$fieldtype[1]);
-					$possible_value = explode(",",$fieldtype[1]);
+					$fieldtype[1] = str_replace("'", "", $fieldtype[1]);
+					$possible_value = explode(",", $fieldtype[1]);
 
 					$type = 'radio';
-					if(count($possible_value) > 1)
+					if (count($possible_value) > 1)
 						$type = 'select';
 
 					$field_to_form[$i]['possible_value'] = $possible_value;
@@ -123,15 +123,15 @@ 
 	*
 	*	@return string $requestResponse A message that allows to know if the creation has been done correctly or not
 	*/
-	public static function save($informationsToSet, $dataBaseTable){
+	public static function save($informationsToSet, $dataBaseTable) {
 		global $wpdb;
 		$requestResponse = '';
 
 		$updateResult = $wpdb->insert($dataBaseTable, $informationsToSet, '%s');
-		if( $updateResult != false ){
+		if ($updateResult != false) {
 			$requestResponse = 'done';
 		}
-		else{
+		else {
 			$requestResponse = 'error';
 		}
 
@@ -144,19 +144,19 @@ 
 	*
 	*	@return string $requestResponse A message that allows to know if the update has been done correctly or not
 	*/
-	public static function update($informationsToSet, $id, $dataBaseTable){
+	public static function update($informationsToSet, $id, $dataBaseTable) {
 		global $wpdb;
 		$requestResponse = '';
 
-		$updateResult = $wpdb->update($dataBaseTable, $informationsToSet , array( 'id' => $id ), '%s', array('%d') );
+		$updateResult = $wpdb->update($dataBaseTable, $informationsToSet, array('id' => $id), '%s', array('%d'));
 
-		if( $updateResult == 1 ){
+		if ($updateResult == 1) {
 			$requestResponse = 'done';
 		}
-		elseif( $updateResult == 0 ){
+		elseif ($updateResult == 0) {
 			$requestResponse = 'nothingToUpdate';
 		}
-		elseif( $updateResult == false ){
+		elseif ($updateResult == false) {
 			$requestResponse = 'error';
 		}
 

Braces +18 added lines, -17 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' ) ) {
@@ -86,23 +88,25 @@ 
 			$type = 'text';
 			if(($field_definition->Key == 'PRI') || ($field_definition->Field == 'creation_date') || ($field_definition->Field == 'last_update_date')){
 				$type =  'hidden';
-			}
-			else{
+			} else{
 				$fieldtype = explode('(',$field_definition->Type);
-				if(!empty($fieldtype[1]))$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+				if(!empty($fieldtype[1])) {
+					$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+				}
 
-				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int'))
-					$type = 'text';
-				elseif($fieldtype[0] == 'text')
-					$type = 'textarea';
-				elseif($fieldtype[0] == 'enum')
+				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int')) {
+									$type = 'text';
+				} elseif($fieldtype[0] == 'text') {
+									$type = 'textarea';
+				} elseif($fieldtype[0] == 'enum')
 				{
 					$fieldtype[1] = str_replace("'","",$fieldtype[1]);
 					$possible_value = explode(",",$fieldtype[1]);
 
 					$type = 'radio';
-					if(count($possible_value) > 1)
-						$type = 'select';
+					if(count($possible_value) > 1) {
+											$type = 'select';
+					}
 
 					$field_to_form[$i]['possible_value'] = $possible_value;
 				}
@@ -130,8 +134,7 @@ 
 		$updateResult = $wpdb->insert($dataBaseTable, $informationsToSet, '%s');
 		if( $updateResult != false ){
 			$requestResponse = 'done';
-		}
-		else{
+		} else{
 			$requestResponse = 'error';
 		}
 
@@ -152,11 +155,9 @@ 
 
 		if( $updateResult == 1 ){
 			$requestResponse = 'done';
-		}
-		elseif( $updateResult == 0 ){
+		} elseif( $updateResult == 0 ){
 			$requestResponse = 'nothingToUpdate';
-		}
-		elseif( $updateResult == false ){
+		} elseif( $updateResult == false ){
 			$requestResponse = 'error';
 		}
 

includes/librairies/display/display.class.php

Doc Comments +7 added lines, -5 removed lines

@@ -191,10 +191,10 @@ 
 	 * Return a complete html table with header, body and content
 	 *
 	 *	@param string $tableId The unique identifier of the table in the document
-	 *	@param array $tableTitles An array with the different element to put into the table's header and footer
+	 *	@param string[] $tableTitles An array with the different element to put into the table's header and footer
 	 *	@param array $tableRows An array with the different value to put into the table's body
-	 *	@param array $tableClasses An array with the different class to affect to table rows and cols
-	 *	@param array $tableRowsId An array with the different identifier for table lines
+	 *	@param string[] $tableClasses An array with the different class to affect to table rows and cols
+	 *	@param string[] $tableRowsId An array with the different identifier for table lines
 	 *	@param string $tableSummary A summary for the table
 	 *	@param boolean $withFooter Allow to define if the table must be create with a footer or not
 	 *
@@ -274,6 +274,7 @@ 
 	 *
 	 * @param string $file_name The file name to check if exists in current theme
 	 * @param string $dir_name Optionnal The directory name of the file to check Default : wpshop
+	 * @param string $default_dir
 	 *
 	 * @return string $file_path The good filepath to include
 	 */
@@ -299,7 +300,7 @@ 
 	 * Check if the current shop use the first method for templates. One file per element to display
 	 *
 	 * @param string $template_part The part to take display for, will be usefull to check what file take in care if there were a file in old method
-	 * @param string $default_template_dirThe part of website to check template for. Possible values : wpshop / admin
+	 * @param string $default_template_dir part of website to check template for. Possible values : wpshop / admin
 	 *
 	 * @return array First index represent if there is a file for old version support, Second index represent the file to get for support old version
 	 */
@@ -546,6 +547,7 @@ 
 	 * @param string $part The part of shop where to display the given template element
 	 * @param string $template_part The template element we want to display
 	 * @param array $extras_args Allows to define some parameters to spot a specific template for example
+	 * @param string $default_template_dir
 	 *
 	 * @return string The good template to take in care, regarding on the given parameters
 	 */
@@ -742,7 +744,7 @@ 
 	 * Change output for product page
 	 *
 	 * @param string $content The content of a post
-	 * @return Ambigous <mixed, string>|unknown
+	 * @return string <mixed, string>|unknown
 	 */
 	public static function products_page( $content = '' ) {
 		global $wp_query;

Indentation +23 added lines, -23 removed lines

@@ -17,39 +17,39 @@
 class wpshop_display {
 
 	/**
-	*	Returns the header display of a classical HTML page.
-	*
-	*	@see afficherFinPage
-	*
-	*	@param string $pageTitle Title of the page.
-	*	@param string $pageIcon Path of the icon.
-	*	@param string $iconTitle Title attribute of the icon.
-	*	@param string $iconAlt Alt attribute of the icon.
-	*	@param boolean $hasAddButton Define if there must be a "add" button for this page
-	*	@param string $actionInformationMessage A message to display in case of action is send
-	*
-	*	@return string Html code composing the page header
-	*/
+	 *	Returns the header display of a classical HTML page.
+	 *
+	 *	@see afficherFinPage
+	 *
+	 *	@param string $pageTitle Title of the page.
+	 *	@param string $pageIcon Path of the icon.
+	 *	@param string $iconTitle Title attribute of the icon.
+	 *	@param string $iconAlt Alt attribute of the icon.
+	 *	@param boolean $hasAddButton Define if there must be a "add" button for this page
+	 *	@param string $actionInformationMessage A message to display in case of action is send
+	 *
+	 *	@return string Html code composing the page header
+	 */
 	public static function displayPageHeader($pageTitle, $pageIcon, $iconTitle, $iconAlt, $hasAddButton = true, $addButtonLink = '', $actionInformationMessage = '', $current_page_slug = ''){
 		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_header.tpl.php');
 	}
 
 	/**
-	*	Returns the end of a classical page
-	*
-	*	@see displayPageHeader
-	*
-	*	@return string Html code composing the page footer
-	*/
+	 *	Returns the end of a classical page
+	 *
+	 *	@see displayPageHeader
+	 *
+	 *	@return string Html code composing the page footer
+	 */
 	public static function displayPageFooter($formActionButton){
 		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_footer.tpl.php');
 	}
 
 	/**
-	*	Return The complete output page code
-	*
-	*	@return string The complete html page output
-	*/
+	 *	Return The complete output page code
+	 *
+	 *	@return string The complete html page output
+	 */
 	public static function display_page(){
 
 		$pageAddButton = false;

Braces +29 added lines, -24 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -111,8 +113,7 @@ 
 
 			if($outputType == 'listing'){
 				$pageContent = $objectType->elementList();
-			}
-			elseif($outputType == 'adding'){
+			} elseif($outputType == 'adding'){
 				$pageAddButton = false;
 
 				$pageFormButton = $objectType->getPageFormButton($objectToEdit);
@@ -124,8 +125,7 @@ 
 			$pageMessage = $objectType->pageMessage;
 			if ( in_array( $objectType->getEditionSlug(), array(WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING) ) ) {
 				$addButtonLink = admin_url('admin.php?page=' . $objectType->getEditionSlug() . '&amp;action=add');
-			}
-			else {
+			} else {
 				$addButtonLink = admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . $objectType->getEditionSlug() . '&amp;action=add');
 			}
 		}
@@ -287,8 +287,7 @@ 
 				$default_dir = get_stylesheet_directory();
 			}
 			$file_path = $default_dir . '/' . $the_file;
-		}
-		else if ( !$check_only_custom ) {
+		} else if ( !$check_only_custom ) {
 			$file_path = $default_dir . $the_file;
 		}
 
@@ -480,13 +479,17 @@ 
 		/*	Get custom admin template	*/
 		if ( is_file(get_stylesheet_directory() . '/admin/main_elements.tpl.php') ) {
 			require_once(get_stylesheet_directory() . '/admin/main_elements.tpl.php');
-			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+			if (!empty($tpl_element)) {
+							$wpshop_template['admin']['custom'] = ($tpl_element);
+			}
+			unset($tpl_element);
 		}
 		if ( is_file(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php') ) {
 			require_once(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php');
-			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+			if (!empty($tpl_element)) {
+							$wpshop_template['admin']['custom'] = ($tpl_element);
+			}
+			unset($tpl_element);
 		}
 		/*	Get default frontend template	*/
 		require_once(WPSHOP_TEMPLATES_DIR . 'wpshop/main_elements.tpl.php');
@@ -494,13 +497,17 @@ 
 		/*	Get custom frontend template	*/
 		if ( is_file(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php') ) {
 			require_once(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php');
-			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+			if (!empty($tpl_element)) {
+							$wpshop_template['wpshop']['custom'] = ($tpl_element);
+			}
+			unset($tpl_element);
 		}
 		if ( is_file(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php') ) {
 			require_once(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php');
-			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+			if (!empty($tpl_element)) {
+							$wpshop_template['wpshop']['custom'] = ($tpl_element);
+			}
+			unset($tpl_element);
 		}
 		foreach ( $wpshop_template as $site_side => $types ) {
 			foreach ( $types as $type => $tpl_component ) {
@@ -557,8 +564,7 @@ 
 
 		if ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part]) && !empty($extras_args['page']) && !empty( $template[$default_template_dir][$part][$extras_args['page']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part];
-		}
-		elseif ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
+		} elseif ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part];
 		}
 		/**	Check if the file have been duplicated into theme directory for customization	*/
@@ -591,7 +597,9 @@ 
 				$template_to_fill = str_replace('{WPSHOP_'.$element.'}', $value, $template_to_fill);
 			}
 		}
-		if (WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE) $template_to_fill = '<!-- Available keys : ' . implode(' / ', $available_key) . ' -->' . $template_to_fill;
+		if (WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE) {
+			$template_to_fill = '<!-- Available keys : ' . implode(' / ', $available_key) . ' -->' . $template_to_fill;
+		}
 
 		return $template_to_fill;
 	}
@@ -655,8 +663,7 @@ 
 		/*	Enable shortcodes in category, taxonomy, tag descriptions */
 		if(function_exists('term_description')) {
 			add_filter('term_description', 'do_shortcode');
-		}
-		else {
+		} else {
 			add_filter('category_description', 'do_shortcode');
 		}
 	}
@@ -686,8 +693,7 @@ 
 		if( in_array($pagenow, array('edit-tags.php')) ) {
 			$editor_id = 'tag_description';
 			$editor_selector = 'description';
-		}
-		else {
+		} else {
 			$editor_id = $editor_selector = 'category_description';
 		}
 
@@ -749,8 +755,7 @@ 
 
 		if (!empty($wp_query->queried_object) && !empty($wp_query->queried_object->post_type) && ($wp_query->queried_object->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)) {
 			return wpshop_products::product_complete_sheet_output($content, $wp_query->post->ID);
-		}
-		else {
+		} else {
 			return $content;
 		}
 	}

Spacing +125 added lines, -125 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'));
 }
 
 /**
@@ -30,8 +30,8 @@ 
 	*
 	*	@return string Html code composing the page header
 	*/
-	public static function displayPageHeader($pageTitle, $pageIcon, $iconTitle, $iconAlt, $hasAddButton = true, $addButtonLink = '', $actionInformationMessage = '', $current_page_slug = ''){
-		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_header.tpl.php');
+	public static function displayPageHeader($pageTitle, $pageIcon, $iconTitle, $iconAlt, $hasAddButton = true, $addButtonLink = '', $actionInformationMessage = '', $current_page_slug = '') {
+		include(WPSHOP_TEMPLATES_DIR . 'admin/admin_page_header.tpl.php');
 	}
 
 	/**
@@ -41,8 +41,8 @@ 
 	*
 	*	@return string Html code composing the page footer
 	*/
-	public static function displayPageFooter($formActionButton){
-		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_footer.tpl.php');
+	public static function displayPageFooter($formActionButton) {
+		include(WPSHOP_TEMPLATES_DIR . 'admin/admin_page_footer.tpl.php');
 	}
 
 	/**
@@ -50,7 +50,7 @@ 
 	*
 	*	@return string The complete html page output
 	*/
-	public static function display_page(){
+	public static function display_page() {
 
 		$pageAddButton = false;
 		$pageMessage = $addButtonLink = $pageFormButton = $pageIcon = $pageIconTitle = $pageIconAlt = $objectType = '';
@@ -60,13 +60,13 @@ 
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : '';
 
 		/*	Select the content to add to the page looking for the parameter	*/
-		switch($pageSlug){
+		switch ($pageSlug) {
 			case WPSHOP_URL_SLUG_ATTRIBUTE_LISTING:
 				$objectType = new wpshop_attributes();
 				$current_user_can_edit = current_user_can('wpshop_edit_attributes');
 				$current_user_can_add = current_user_can('wpshop_add_attributes');
 				$current_user_can_delete = current_user_can('wpshop_delete_attributes');
-				if(current_user_can('wpshop_add_attributes')){
+				if (current_user_can('wpshop_add_attributes')) {
 					$pageAddButton = true;
 				}
 			break;
@@ -75,7 +75,7 @@ 
 				$current_user_can_edit = current_user_can('wpshop_edit_attribute_set');
 				$current_user_can_add = current_user_can('wpshop_add_attribute_set');
 				$current_user_can_delete = current_user_can('wpshop_delete_attribute_set');
-				if(current_user_can('wpshop_add_attribute_set')){
+				if (current_user_can('wpshop_add_attribute_set')) {
 					$pageAddButton = true;
 				}
 			break;
@@ -88,19 +88,19 @@ 
 				$pageAddButton = false;
 				$objectType = new wpshop_messages();
 				$current_user_can_edit = true;
-				if(!empty($_GET['mid'])){
+				if (!empty($_GET['mid'])) {
 					$action = 'edit';
 				}
 			break;
 			default:{
-				$pageTitle = sprintf(__('You have to add this page into %s at line %s', 'wpshop'), __FILE__, (__LINE__ - 4));
+				$pageTitle = sprintf(__('You have to add this page into %s at line %s', 'wpshop'), __FILE__, (__LINE__ -4));
 				$pageAddButton = false;
 			}
 			break;
 		}
 
-		if($objectType != ''){
-			if(($action != '') && ((($action == 'edit') && $current_user_can_edit) || (($action == 'add') && $current_user_can_add) || (($action == 'delete') && $current_user_can_delete))){
+		if ($objectType != '') {
+			if (($action != '') && ((($action == 'edit') && $current_user_can_edit) || (($action == 'add') && $current_user_can_add) || (($action == 'delete') && $current_user_can_delete))) {
 				$outputType = 'adding';
 			}
 			$objectType->elementAction();
@@ -109,10 +109,10 @@ 
 			$pageIconTitle = self::getPageIconInformation('title', $objectType);
 			$pageIconAlt = self::getPageIconInformation('alt', $objectType);
 
-			if($outputType == 'listing'){
+			if ($outputType == 'listing') {
 				$pageContent = $objectType->elementList();
 			}
-			elseif($outputType == 'adding'){
+			elseif ($outputType == 'adding') {
 				$pageAddButton = false;
 
 				$pageFormButton = $objectType->getPageFormButton($objectToEdit);
@@ -122,11 +122,11 @@ 
 
 			$pageTitle = $objectType->pageTitle();
 			$pageMessage = $objectType->pageMessage;
-			if ( in_array( $objectType->getEditionSlug(), array(WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING) ) ) {
+			if (in_array($objectType->getEditionSlug(), array(WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING))) {
 				$addButtonLink = admin_url('admin.php?page=' . $objectType->getEditionSlug() . '&amp;action=add');
 			}
 			else {
-				$addButtonLink = admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . $objectType->getEditionSlug() . '&amp;action=add');
+				$addButtonLink = admin_url('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES . '&amp;page=' . $objectType->getEditionSlug() . '&amp;action=add');
 			}
 		}
 
@@ -148,37 +148,37 @@ 
 	 *
 	 * @return string The output builded from selected type
 	 */
-	public static function custom_page_output_builder($content, $output_type='tab') {
+	public static function custom_page_output_builder($content, $output_type = 'tab') {
 		$output_custom_layout = '';
 
-		switch ( $output_type ) {
+		switch ($output_type) {
 			case 'separated_bloc':
-				foreach ( $content as $element_type => $element_type_details ) {
-					$output_custom_layout.='
-	<div class="wpshop_separated_bloc wpshop_separated_bloc_'.$element_type.'" >';
-					foreach ( $element_type_details as $element_type_key => $element_type_content ) {
-						$output_custom_layout.='
-		<div class="wpshop_admin_box wpshop_admin_box_'.$element_type.' wpshop_admin_box_'.$element_type.'_'.$element_type_key.'" >
+				foreach ($content as $element_type => $element_type_details) {
+					$output_custom_layout .= '
+	<div class="wpshop_separated_bloc wpshop_separated_bloc_'.$element_type . '" >';
+					foreach ($element_type_details as $element_type_key => $element_type_content) {
+						$output_custom_layout .= '
+		<div class="wpshop_admin_box wpshop_admin_box_'.$element_type . ' wpshop_admin_box_' . $element_type . '_' . $element_type_key . '" >
 			<h3>' . $element_type_content['title'] . '</h3>' . $element_type_content['content'] . '
 		</div>';
 					}
-					$output_custom_layout.='
+					$output_custom_layout .= '
 	</div>';
 				}
 			break;
 			case 'tab':
-				$tab_list=$tab_content_list='';
-				foreach ( $content as $element_type => $element_type_details ) {
-					foreach ( $element_type_details as $element_type_key => $element_type_content ) {
-						$tab_list.='
-		<li><a href="#wpshop_'.$element_type.'_'.$element_type_key.'" >'.$element_type_content['title'].'</a></li>';
-						$tab_content_list.='
-		<div id="wpshop_'.$element_type.'_'.$element_type_key.'" class="wpshop_admin_box wpshop_admin_box_'.$element_type.' wpshop_admin_box_'.$element_type.'_'.$element_type_key.'" >'.$element_type_content['content'].'
+				$tab_list = $tab_content_list = '';
+				foreach ($content as $element_type => $element_type_details) {
+					foreach ($element_type_details as $element_type_key => $element_type_content) {
+						$tab_list .= '
+		<li><a href="#wpshop_'.$element_type . '_' . $element_type_key . '" >' . $element_type_content['title'] . '</a></li>';
+						$tab_content_list .= '
+		<div id="wpshop_'.$element_type . '_' . $element_type_key . '" class="wpshop_admin_box wpshop_admin_box_' . $element_type . ' wpshop_admin_box_' . $element_type . '_' . $element_type_key . '" >' . $element_type_content['content'] . '
 		</div>';
 					}
 				}
-				$output_custom_layout.='
-	<div id="wpshopFormManagementContainer" class="wpshop_tabs wpshop_full_page_tabs wpshop_'.$element_type.'_tabs" >
+				$output_custom_layout .= '
+	<div id="wpshopFormManagementContainer" class="wpshop_tabs wpshop_full_page_tabs wpshop_'.$element_type . '_tabs" >
 		<ul>' . $tab_list . '</ul>' . $tab_content_list . '
 	</div>';
 					break;
@@ -200,21 +200,21 @@ 
 	 *
 	 *	@return string $table The html code of the table to output
 	 */
-	public static function getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, $tableSummary = '', $withFooter = true){
+	public static function getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, $tableSummary = '', $withFooter = true) {
 		$tableTitleBar = $tableBody = '';
 
 		/*	Create the header and footer row	*/
-		for($i=0; $i<count($tableTitles); $i++){
+		for ($i = 0; $i < count($tableTitles); $i++) {
 			$tableTitleBar .= '
 				<th class="' . $tableClasses[$i] . '" scope="col" >' . $tableTitles[$i] . '</th>';
 		}
 
 		/*	Create each table row	*/
-		for($lineNumber=0; $lineNumber<count($tableRows); $lineNumber++){
+		for ($lineNumber = 0; $lineNumber < count($tableRows); $lineNumber++) {
 			$tableRow = $tableRows[$lineNumber];
 			$tableBody .= '
 		<tr id="' . $tableRowsId[$lineNumber] . '" class="tableRow" >';
-			for($i=0; $i<count($tableRow); $i++){
+			for ($i = 0; $i < count($tableRow); $i++) {
 				$tableBody .= '
 			<td class="' . $tableClasses[$i] . ' ' . $tableRow[$i]['class'] . '" >' . $tableRow[$i]['value'] . '</td>';
 			}
@@ -225,13 +225,13 @@ 
 		/*	Create the table output	*/
 		$table = '
 <table id="' . $tableId . '" cellspacing="0" cellpadding="0" class="widefat post fixed" >';
-		if($tableTitleBar != ''){
+		if ($tableTitleBar != '') {
 			$table .= '
 	<thead>
 			<tr class="tableTitleHeader" >' . $tableTitleBar . '
 			</tr>
 	</thead>';
-			if($withFooter){
+			if ($withFooter) {
 				$table .= '
 	<tfoot>
 			<tr class="tableTitleFooter" >' . $tableTitleBar . '
@@ -254,8 +254,8 @@ 
 	 *
 	 * @return string $pageIconInformation The information to output in the page
 	 */
-	public static function getPageIconInformation($infoType, $object){
-		switch($infoType){
+	public static function getPageIconInformation($infoType, $object) {
+		switch ($infoType) {
 			case 'path':
 				$pageIconInformation = $object->pageIcon;
 			break;
@@ -277,18 +277,18 @@ 
 	 *
 	 * @return string $file_path The good filepath to include
 	 */
-	public static function get_template_file($file_name, $default_dir = WPSHOP_TEMPLATES_DIR, $dir_name = 'wpshop', $usage_type = 'include', $check_only_custom = false){
+	public static function get_template_file($file_name, $default_dir = WPSHOP_TEMPLATES_DIR, $dir_name = 'wpshop', $usage_type = 'include', $check_only_custom = false) {
 		$file_path = '';
 		$the_file = $dir_name . '/' . $file_name;
 
 		if (is_file(get_stylesheet_directory() . '/' . $the_file)) {
 			$default_dir = str_replace(WP_CONTENT_DIR, WP_CONTENT_URL, get_stylesheet_directory());
-			if($usage_type == 'include'){
+			if ($usage_type == 'include') {
 				$default_dir = get_stylesheet_directory();
 			}
 			$file_path = $default_dir . '/' . $the_file;
 		}
-		else if ( !$check_only_custom ) {
+		else if (!$check_only_custom) {
 			$file_path = $default_dir . $the_file;
 		}
 
@@ -311,124 +311,124 @@ 
 		$custom_template_part = get_stylesheet_directory() . '/' . $default_template_dir . '/';
 
 		/** Let support the old way of template managing	*/
-		switch ( $template_part ) {
+		switch ($template_part) {
 			case 'category_mini_list':
 					$old_file_to_take_care_url = 'category-mini-list.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'category_mini_grid':
 					$old_file_to_take_care_url = 'category-mini-grid.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_complete_tpl':
 					$old_file_to_take_care_url = 'product.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_mini_list':
 					$old_file_to_take_care_url = 'product-mini-list.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_mini_grid':
 					$old_file_to_take_care_url = 'product-mini-grid.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_listing_sorting':
 					$old_file_to_take_care_url = 'product_listing_sorting.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'unavailable_product_button':
 					$old_file_to_take_care_url = 'not_available_product_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'add_to_cart_button':
 					$old_file_to_take_care_url = 'available_product_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'ask_quotation_button':
 					$old_file_to_take_care_url = 'quotation_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'mini_cart_content':
 					$old_file_to_take_care_url = 'wpshop_mini_cart.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_is_new_sticker':
 					$old_file_to_take_care_url = 'product-is-new.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_is_featured_sticker':
 					$old_file_to_take_care_url = 'product-is-featured.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_container':
 					$old_file_to_take_care_url = 'product-attribute-front-display-main-container.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_tabs':
 					$old_file_to_take_care_url = 'product-attribute-front-display-tabs.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_tabs_detail':
 					$old_file_to_take_care_url = 'product-attribute-front-display-tabs-content.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_picture_galery':
 					$old_file_to_take_care_url = 'product_picture_galery.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_galery':
 					$old_file_to_take_care_url = 'product_document_library.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_item_picture':
 					$old_file_to_take_care_url = 'product_attachment_picture_line.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_item_document':
 					$old_file_to_take_care_url = 'product_attachment_document_line.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_added_to_cart_message':
 					$old_file_to_take_care_url = 'product_added_to_cart_message.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
@@ -458,13 +458,13 @@ 
 	 */
 	public static function display_template_element($template_part, $template_part_component, $extras_args = array(), $default_template_dir = 'wpshop') {
 		/**	Set the template element to return by default before checking if custom exists in order to be sure to return something	*/
-		$default_template_element = wpshop_display::check_template_to_display( 'default', $template_part, $extras_args, $default_template_dir );
+		$default_template_element = wpshop_display::check_template_to_display('default', $template_part, $extras_args, $default_template_dir);
 
 		/**	Check in custom template if there is not a custom element to display for current 	*/
-		$custom_template_element = wpshop_display::check_template_to_display( 'custom', $template_part, $extras_args, $default_template_dir );
+		$custom_template_element = wpshop_display::check_template_to_display('custom', $template_part, $extras_args, $default_template_dir);
 		$tpl_element_to_return = !empty($custom_template_element) ? $custom_template_element : $default_template_element;
 
-		$template_part_component = apply_filters( 'wps_filter_display_' . $template_part, $template_part_component, $extras_args, $default_template_dir );
+		$template_part_component = apply_filters('wps_filter_display_' . $template_part, $template_part_component, $extras_args, $default_template_dir);
 
 		return self::feed_template($tpl_element_to_return, $template_part_component);
 	}
@@ -476,44 +476,44 @@ 
 		/*	Load template component	*/
 		/*	Get default admin template	*/
 		require_once(WPSHOP_TEMPLATES_DIR . 'admin/main_elements.tpl.php');
-		$wpshop_template['admin']['default'] = ($tpl_element);unset($tpl_element);
+		$wpshop_template['admin']['default'] = ($tpl_element); unset($tpl_element);
 		/*	Get custom admin template	*/
-		if ( is_file(get_stylesheet_directory() . '/admin/main_elements.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/admin/main_elements.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/admin/main_elements.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['admin']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		if ( is_file(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['admin']['custom'] = ($tpl_element); unset($tpl_element);
 		}
 		/*	Get default frontend template	*/
 		require_once(WPSHOP_TEMPLATES_DIR . 'wpshop/main_elements.tpl.php');
-		$wpshop_template['wpshop']['default'] = ($tpl_element);unset($tpl_element);
+		$wpshop_template['wpshop']['default'] = ($tpl_element); unset($tpl_element);
 		/*	Get custom frontend template	*/
-		if ( is_file(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['wpshop']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		if ( is_file(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['wpshop']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		foreach ( $wpshop_template as $site_side => $types ) {
-			foreach ( $types as $type => $tpl_component ) {
-				foreach ( $tpl_component as $tpl_key => $tpl_content ) {
+		foreach ($wpshop_template as $site_side => $types) {
+			foreach ($types as $type => $tpl_component) {
+				foreach ($tpl_component as $tpl_key => $tpl_content) {
 					$wpshop_template[$site_side][$type][$tpl_key] = str_replace("
 ", '', $tpl_content);
 				}
 			}
 		}
 
-		$wpshop_template = apply_filters( 'wpshop_custom_template', $wpshop_template);
+		$wpshop_template = apply_filters('wpshop_custom_template', $wpshop_template);
 
-		DEFINE( 'WPSHOP_TEMPLATE', serialize($wpshop_template) );
+		DEFINE('WPSHOP_TEMPLATE', serialize($wpshop_template));
 	}
 
 	/**
@@ -524,12 +524,12 @@ 
 	 *
 	 * @return array The new array with all elment, internal and module templates
 	 */
-	public static function add_modules_template_to_internal( $tpl_element, $templates ) {
-		if ( !empty($tpl_element) ) {
-			foreach ( $tpl_element as $template_part => $template_part_content) {
-				if ( !empty($template_part_content) && is_array($template_part_content) ) {
-					foreach ( $template_part_content as $template_type => $template_type_content) {
-						foreach ( $template_type_content as $template_key => $template) {
+	public static function add_modules_template_to_internal($tpl_element, $templates) {
+		if (!empty($tpl_element)) {
+			foreach ($tpl_element as $template_part => $template_part_content) {
+				if (!empty($template_part_content) && is_array($template_part_content)) {
+					foreach ($template_part_content as $template_type => $template_type_content) {
+						foreach ($template_type_content as $template_key => $template) {
 							$templates[$template_part][$template_type][$template_key] = $template;
 						}
 					}
@@ -549,20 +549,20 @@ 
 	 *
 	 * @return string The good template to take in care, regarding on the given parameters
 	 */
-	public static function check_template_to_display( $part, $template_part, $extras_args, $default_template_dir  ) {
+	public static function check_template_to_display($part, $template_part, $extras_args, $default_template_dir) {
 		$tpl_element_to_return = '';
 
 		/**	Get the defined template	*/
 		$template = defined("WPSHOP_TEMPLATE") ? unserialize(WPSHOP_TEMPLATE) : array();
 
-		if ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part]) && !empty($extras_args['page']) && !empty( $template[$default_template_dir][$part][$extras_args['page']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
+		if (!empty($extras_args['type']) && !empty($extras_args['id']) && !empty($template[$default_template_dir][$part]) && !empty($extras_args['page']) && !empty($template[$default_template_dir][$part][$extras_args['page']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part];
 		}
-		elseif ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
+		elseif (!empty($extras_args['type']) && !empty($extras_args['id']) && !empty($template[$default_template_dir][$part][$extras_args['type']]) && !empty($template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']]) && !empty($template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part];
 		}
 		/**	Check if the file have been duplicated into theme directory for customization	*/
-		elseif ( !empty( $template[$default_template_dir][$part] ) && !empty( $template[$default_template_dir][$part][$template_part] ) ) {
+		elseif (!empty($template[$default_template_dir][$part]) && !empty($template[$default_template_dir][$part][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$template_part];
 		}
 
@@ -582,13 +582,13 @@ 
 		$feed['CURRENCY'] = wpshop_tools::wpshop_get_currency();
 		$feed['CURRENCY_CHOOSEN'] = wpshop_tools::wpshop_get_currency();
 		$feed['CURRENCY_SELECTOR'] = wpshop_attributes_unit::wpshop_shop_currency_list_field();
-		$feed['CART_LINK'] = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_cart_page_id') ) );
+		$feed['CART_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_cart_page_id')));
 
 		$available_key = array();
 		foreach ($feed as $element => $value) {
-			$available_key[] = '{WPSHOP_'.$element.'}';
-			if ( !is_array($value) ) {
-				$template_to_fill = str_replace('{WPSHOP_'.$element.'}', $value, $template_to_fill);
+			$available_key[] = '{WPSHOP_' . $element . '}';
+			if (!is_array($value)) {
+				$template_to_fill = str_replace('{WPSHOP_' . $element . '}', $value, $template_to_fill);
 			}
 		}
 		if (WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE) $template_to_fill = '<!-- Available keys : ' . implode(' / ', $available_key) . ' -->' . $template_to_fill;
@@ -601,11 +601,11 @@ 
 	 *
 	 * @param boolean $force_replacement Define if we overwrite in all case or just if it not exist
 	 */
-	public static function check_template_file( $force_replacement = false ) {
+	public static function check_template_file($force_replacement = false) {
 		$wpshop_directory = get_stylesheet_directory() . '/wpshop';
 
 		/*	Add different file template	*/
-		if(!is_dir($wpshop_directory)){
+		if (!is_dir($wpshop_directory)) {
 			@mkdir($wpshop_directory, 0755, true);
 		}
 		/* On s'assure que le dossier principal est bien en 0755	*/
@@ -613,7 +613,7 @@ 
 		$upload_dir = wp_upload_dir();
 
 		/*	Add the category template	*/
-		if(!is_file(get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php') || ($force_replacement)){
+		if (!is_file(get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php') || ($force_replacement)) {
 			@copy(WPSHOP_TEMPLATES_DIR . 'taxonomy-wpshop_product_category.php', get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php');
 		}
 	}
@@ -631,29 +631,29 @@ 
 		/*	Check if user is on taxonomy edition page	*/
 		if ($pagenow == 'edit-tags.php') {
 
-			if(!user_can_richedit()) { return; }
+			if (!user_can_richedit()) { return; }
 
 			$taxonomies = get_taxonomies();
 
 			foreach ($taxonomies as $tax) {
-				if ( in_array($tax, array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES)) ) {
-					add_action($tax . '_edit_form_fields', array('wpshop_display','wpshop_add_form'));
-					add_action($tax . '_add_form_fields', array('wpshop_display','wpshop_add_form'));
+				if (in_array($tax, array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES))) {
+					add_action($tax . '_edit_form_fields', array('wpshop_display', 'wpshop_add_form'));
+					add_action($tax . '_add_form_fields', array('wpshop_display', 'wpshop_add_form'));
 				}
 			}
 
 			if ($pagenow == 'edit-tags.php' && isset($_REQUEST['action']) && sanitize_key($_REQUEST['action']) == 'edit' && empty($_REQUEST['taxonomy'])) {
-				add_action('edit_term',array('wpshop_display','wpshop_rt_taxonomy_save'));
+				add_action('edit_term', array('wpshop_display', 'wpshop_rt_taxonomy_save'));
 			}
 
-			foreach ( array( 'pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description' ) as $filter ) {
-				remove_filter( $filter, 'wp_filter_kses' );
+			foreach (array('pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description') as $filter) {
+				remove_filter($filter, 'wp_filter_kses');
 			}
 
 		}
 
 		/*	Enable shortcodes in category, taxonomy, tag descriptions */
-		if(function_exists('term_description')) {
+		if (function_exists('term_description')) {
 			add_filter('term_description', 'do_shortcode');
 		}
 		else {
@@ -669,8 +669,8 @@ 
 
 		$a = array('description');
 		foreach ($a as $v) {
-			$term = (array) $_POST[$v];
-			wp_update_term($tag_ID,$v,$term);
+			$term = (array)$_POST[$v];
+			wp_update_term($tag_ID, $v, $term);
 		}
 	}
 
@@ -682,9 +682,9 @@ 
 	public static function wpshop_add_form($object = '') {
 		global $pagenow;
 
-		$content = is_object($object) && isset($object->description) ? ( html_entity_decode( $object->description, ENT_COMPAT | ENT_HTML401, 'UTF-8' ) ) : '';
+		$content = is_object($object) && isset($object->description) ? (html_entity_decode($object->description, ENT_COMPAT | ENT_HTML401, 'UTF-8')) : '';
 
-		if( in_array($pagenow, array('edit-tags.php')) ) {
+		if (in_array($pagenow, array('edit-tags.php'))) {
 			$editor_id = 'tag_description';
 			$editor_selector = 'description';
 		}
@@ -730,8 +730,8 @@ 
 
 	public static function wps_hide_admin_bar_for_customers() {
 		$wpshop_hide_admin_bar_option = get_option('wpshop_display_option');
-		if ( !empty($wpshop_hide_admin_bar_option) && !empty($wpshop_hide_admin_bar_option['wpshop_hide_admin_bar']) && ! current_user_can( 'manage_options' ) ) {
-			show_admin_bar( false );
+		if (!empty($wpshop_hide_admin_bar_option) && !empty($wpshop_hide_admin_bar_option['wpshop_hide_admin_bar']) && !current_user_can('manage_options')) {
+			show_admin_bar(false);
 		}
 	}
 
@@ -745,7 +745,7 @@ 
 	 * @param string $content The content of a post
 	 * @return Ambigous <mixed, string>|unknown
 	 */
-	public static function products_page( $content = '' ) {
+	public static function products_page($content = '') {
 		global $wp_query;
 
 		if (!empty($wp_query->queried_object) && !empty($wp_query->queried_object->post_type) && ($wp_query->queried_object->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)) {
@@ -764,20 +764,20 @@ 
 	 *
 	 * @return string The formated value
 	 */
-	public static function format_field_output( $output_type, $value ) {
+	public static function format_field_output($output_type, $value) {
 		$formated_value = $value;
 
-		if ( !empty($value) ) {
-			switch ( $output_type ) {
+		if (!empty($value)) {
+			switch ($output_type) {
 				case 'wpshop_product_price':
-					$formated_value = (is_numeric($value) ) ? number_format($value, 2, ',', '') : $value;
+					$formated_value = (is_numeric($value)) ? number_format($value, 2, ',', '') : $value;
 					$formated_value_content = explode(',', $formated_value);
-					if ( !empty($formated_value_content) && !empty($formated_value_content[1]) && $formated_value_content[1] <= 0 ) {
+					if (!empty($formated_value_content) && !empty($formated_value_content[1]) && $formated_value_content[1] <= 0) {
 						$formated_value = $formated_value_content[0];
 					}
 				break;
 				case 'date':
-					$formated_value = mysql2date('d/F/Y', $value, true);;
+					$formated_value = mysql2date('d/F/Y', $value, true); ;
 				break;
 			}
 		}

includes/librairies/display/form.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 	*	@param string $method The default method for the form Default is set to post
 	*	@param string $action The default action for the form Default is set to empty
 	*
-	*	@return mixed $the_form The complete html output of the form
+	*	@return string $the_form The complete html output of the form
 	*/
 	function form($name, $input_list, $method = 'post', $action = ''){
 		$the_form_content_hidden = $the_form_content = '';
@@ -129,7 +129,7 @@ 
 	*	@param string $type The input type Could be: text or hidden or passowrd
 	*	@param string $option Allows to define options for the input Could be readonly or disabled or style
 	*
-	*	@return mixed The output code to add to the form
+	*	@return string The output code to add to the form
 	*/
 	public static function form_input($name, $id, $value = '', $type = 'text', $option = '', $input_label = ''){
 		$allowedType = array('text', 'hidden', 'password', 'file');
@@ -152,7 +152,7 @@ 
 	*	@param mixed $value The default value for the field Default is empty
 	*	@param string $option Allows to define options for the input Could be maxlength or style
 	*
-	*	@return mixed The output code to add to the form
+	*	@return string The output code to add to the form
 	*/
 	public static function form_input_textarea($name, $id, $value = '', $option = '')
 	{
@@ -167,7 +167,7 @@ 
 	*	@param mixed $value The selected value for the field Default is empty
 	*	@param string $option Allows to define options for the input Could be onchange
 	*
-	*	@return mixed $output The output code to add to the form
+	*	@return string $output The output code to add to the form
 	*/
 	public static function form_input_select($name, $id, $content, $value = '', $option = '', $optionValue = ''){
 		global $comboxOptionToHide;
@@ -215,7 +215,7 @@ 
 	*	@param mixed $value The selected value for the field Default is empty
 	*	@param string $option Allows to define options for the input Could be onchange
 	*
-	*	@return mixed $output The output code to add to the form
+	*	@return string $output The output code to add to the form
 	*/
 	public static function form_input_multiple_select($name, $id, $content, $value = array(), $option = '', $optionValue = '') {
 		global $comboxOptionToHide;
@@ -258,7 +258,7 @@ 
 	*	@param mixed $value The selected value for the field Default is empty
 	*	@param string $option Allows to define options for the input Could be onchange
 	*
-	*	@return mixed $output The output code to add to the form
+	*	@return string $output The output code to add to the form
 	*/
 	public static function form_input_check($name, $id, $content, $value = '', $type = 'checkbox', $option = '', $optionValue = '', $input_label=''){
 		$output = '';

Indentation +61 added lines, -61 removed lines

@@ -23,15 +23,15 @@ 
 class wpshop_form {
 
 	/**
-	*	Create The complete form by defining the form open and close and call the different function that allows to create the different type of input
-	*
-	*	@param string $name The name of the form
-	*	@param array $input_list The list build by the database class' function that get the type of a table
-	*	@param string $method The default method for the form Default is set to post
-	*	@param string $action The default action for the form Default is set to empty
-	*
-	*	@return mixed $the_form The complete html output of the form
-	*/
+	 *	Create The complete form by defining the form open and close and call the different function that allows to create the different type of input
+	 *
+	 *	@param string $name The name of the form
+	 *	@param array $input_list The list build by the database class' function that get the type of a table
+	 *	@param string $method The default method for the form Default is set to post
+	 *	@param string $action The default action for the form Default is set to empty
+	 *
+	 *	@return mixed $the_form The complete html output of the form
+	 */
 	function form($name, $input_list, $method = 'post', $action = ''){
 		$the_form_content_hidden = $the_form_content = '';
 		foreach ($input_list as $input_key => $input_def) {
@@ -68,12 +68,12 @@ 
 	}
 
 	/**
-	*	Check the input type
-	*
-	*	@param array $input_def The input definition
-	*
-	*	@return string $the_input
-	*/
+	 *	Check the input type
+	 *
+	 *	@param array $input_def The input definition
+	 *
+	 *	@return string $the_input
+	 */
 	public static function check_input_type($input_def, $input_domain = '') {
 
 		$input_option = '';
@@ -122,15 +122,15 @@ 
 	}
 
 	/**
-	*	Create an input type text or hidden or password
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param mixed $value The default value for the field Default is empty
-	*	@param string $type The input type Could be: text or hidden or passowrd
-	*	@param string $option Allows to define options for the input Could be readonly or disabled or style
-	*
-	*	@return mixed The output code to add to the form
-	*/
+	 *	Create an input type text or hidden or password
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param mixed $value The default value for the field Default is empty
+	 *	@param string $type The input type Could be: text or hidden or passowrd
+	 *	@param string $option Allows to define options for the input Could be readonly or disabled or style
+	 *
+	 *	@return mixed The output code to add to the form
+	 */
 	public static function form_input($name, $id, $value = '', $type = 'text', $option = '', $input_label = ''){
 		$allowedType = array('text', 'hidden', 'password', 'file');
 		if(in_array($type, $allowedType))
@@ -146,29 +146,29 @@ 
 	}
 
 	/**
-	*	Create an textarea
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param mixed $value The default value for the field Default is empty
-	*	@param string $option Allows to define options for the input Could be maxlength or style
-	*
-	*	@return mixed The output code to add to the form
-	*/
+	 *	Create an textarea
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param mixed $value The default value for the field Default is empty
+	 *	@param string $option Allows to define options for the input Could be maxlength or style
+	 *
+	 *	@return mixed The output code to add to the form
+	 */
 	public static function form_input_textarea($name, $id, $value = '', $option = '')
 	{
 		return '<textarea name="' . $name.'" id="' . $id . '" ' . $option . ' rows="4" cols="10" >' . $value . '</textarea>';
 	}
 
 	/**
-	*	Create a combo box input regarding to the type of content given in parameters could be an array or a wordpress database object
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
-	*	@param mixed $value The selected value for the field Default is empty
-	*	@param string $option Allows to define options for the input Could be onchange
-	*
-	*	@return mixed $output The output code to add to the form
-	*/
+	 *	Create a combo box input regarding to the type of content given in parameters could be an array or a wordpress database object
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
+	 *	@param mixed $value The selected value for the field Default is empty
+	 *	@param string $option Allows to define options for the input Could be onchange
+	 *
+	 *	@return mixed $output The output code to add to the form
+	 */
 	public static function form_input_select($name, $id, $content, $value = '', $option = '', $optionValue = ''){
 		global $comboxOptionToHide;
 
@@ -208,15 +208,15 @@ 
 	}
 
 	/**
-	*	Create a combo box input regarding to the type of content given in parameters could be an array or a wordpress database object
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
-	*	@param mixed $value The selected value for the field Default is empty
-	*	@param string $option Allows to define options for the input Could be onchange
-	*
-	*	@return mixed $output The output code to add to the form
-	*/
+	 *	Create a combo box input regarding to the type of content given in parameters could be an array or a wordpress database object
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
+	 *	@param mixed $value The selected value for the field Default is empty
+	 *	@param string $option Allows to define options for the input Could be onchange
+	 *
+	 *	@return mixed $output The output code to add to the form
+	 */
 	public static function form_input_multiple_select($name, $id, $content, $value = array(), $option = '', $optionValue = '') {
 		global $comboxOptionToHide;
 		$values = array();
@@ -249,17 +249,17 @@ 
 	}
 
 	/**
-	*	Create a checkbox input
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param string $id The identifier of the field
-	*	@param string $type The input type Could be checkbox or radio
-	*	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
-	*	@param mixed $value The selected value for the field Default is empty
-	*	@param string $option Allows to define options for the input Could be onchange
-	*
-	*	@return mixed $output The output code to add to the form
-	*/
+	 *	Create a checkbox input
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param string $id The identifier of the field
+	 *	@param string $type The input type Could be checkbox or radio
+	 *	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
+	 *	@param mixed $value The selected value for the field Default is empty
+	 *	@param string $option Allows to define options for the input Could be onchange
+	 *
+	 *	@return mixed $output The output code to add to the form
+	 */
 	public static function form_input_check($name, $id, $content, $value = '', $type = 'checkbox', $option = '', $optionValue = '', $input_label=''){
 		$output = '';
 		$allowedType = array('checkbox', 'radio');

Spacing +61 added lines, -61 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'));
 }
 
 /**
@@ -32,7 +32,7 @@ 
 	*
 	*	@return mixed $the_form The complete html output of the form
 	*/
-	function form($name, $input_list, $method = 'post', $action = ''){
+	function form($name, $input_list, $method = 'post', $action = '') {
 		$the_form_content_hidden = $the_form_content = '';
 		foreach ($input_list as $input_key => $input_def) {
 			$the_input = self::check_input_type($input_def);
@@ -40,10 +40,10 @@ 
 			$input_value = $input_def['value'];
 			$input_type = $input_def['type'];
 
-			if($input_type != 'hidden')
+			if ($input_type != 'hidden')
 			{
 				$label = 'for="' . $input_name . '"';
-				if(($input_type == 'radio') || ($input_type == 'checkbox'))
+				if (($input_type == 'radio') || ($input_type == 'checkbox'))
 				{
 					$label = '';
 				}
@@ -77,45 +77,45 @@ 
 	public static function check_input_type($input_def, $input_domain = '') {
 
 		$input_option = '';
-		if(!empty($input_def['option']) && $input_def['option'])
+		if (!empty($input_def['option']) && $input_def['option'])
 			$input_option = $input_def['option'];
 
 		$valueToPut = '';
-		if(!empty($input_def['valueToPut']) && $input_def['valueToPut'])
+		if (!empty($input_def['valueToPut']) && $input_def['valueToPut'])
 			$valueToPut = $input_def['valueToPut'];
 
 		$input_id = $input_def['name'];
-		if(!empty($input_def['id']))
+		if (!empty($input_def['id']))
 			$input_id = $input_def['id'];
 
 		$input_name = $input_def['name'];
-		if($input_domain != '')
+		if ($input_domain != '')
 			$input_name = $input_domain . '[' . $input_def['name'] . ']';
 		/**	Format data for saving without special chars	*/
-		if(!empty($input_def['value']) && !is_array($input_def['value']) && preg_match("/^-?(?:\d+|\d*\.\d+)$/", $input_def['value']))
-			$input_value = str_replace('.',',',$input_def['value']/* /1 */); // format francais avec virgule
+		if (!empty($input_def['value']) && !is_array($input_def['value']) && preg_match("/^-?(?:\d+|\d*\.\d+)$/", $input_def['value']))
+			$input_value = str_replace('.', ',', $input_def['value']/* /1 */); // format francais avec virgule
 		else $input_value = (!empty($input_def['value']) ? $input_def['value'] : '');
 
 		$input_type = $input_def['type'];
 		$the_input = '';
 
-		if( ( $input_type == 'text' ) || ( $input_type == 'email' ) || ( $input_type == 'tel' ) )
-			$the_input .= self::form_input( $input_name, $input_id, $input_value, 'text', $input_option, (!empty($input_def['options_label']) ? $input_def['options_label'] : '') );
-		elseif($input_type == 'password')
+		if (($input_type == 'text') || ($input_type == 'email') || ($input_type == 'tel'))
+			$the_input .= self::form_input($input_name, $input_id, $input_value, 'text', $input_option, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
+		elseif ($input_type == 'password')
 			$the_input .= self::form_input($input_name, $input_id, $input_value, 'password', $input_option);
-		elseif($input_type == 'textarea')
+		elseif ($input_type == 'textarea')
 			$the_input .= self::form_input_textarea($input_name, $input_id, $input_value, $input_option);
-		elseif($input_type == 'hidden')
+		elseif ($input_type == 'hidden')
 			$the_input .= self::form_input($input_name, $input_id, $input_value, 'hidden', $input_option);
-		elseif($input_type == 'select')
-			$the_input .= self::form_input_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
-		elseif($input_type == 'multiple-select')
-			$the_input .= self::form_input_multiple_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
-		elseif(($input_type == 'radio') || ($input_type == 'checkbox'))
-			$the_input .= self::form_input_check($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_type, $input_option, $valueToPut, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
-		elseif($input_type == 'file')
+		elseif ($input_type == 'select')
+			$the_input .= self::form_input_select($input_name, $input_id, (!empty($input_def['possible_value']) ? $input_def['possible_value'] : array()), $input_value, $input_option, $valueToPut);
+		elseif ($input_type == 'multiple-select')
+			$the_input .= self::form_input_multiple_select($input_name, $input_id, (!empty($input_def['possible_value']) ? $input_def['possible_value'] : array()), $input_value, $input_option, $valueToPut);
+		elseif (($input_type == 'radio') || ($input_type == 'checkbox'))
+			$the_input .= self::form_input_check($input_name, $input_id, (!empty($input_def['possible_value']) ? $input_def['possible_value'] : array()), $input_value, $input_type, $input_option, $valueToPut, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
+		elseif ($input_type == 'file')
 			$the_input .= self::form_input($input_name, $input_id, $input_value, 'file', $input_option);
-		elseif($input_type == 'gallery')
+		elseif ($input_type == 'gallery')
 			$the_input .= self::form_input($input_name, $input_id, $input_value, 'text', 'readonly = "readonly"') . 'Gallery field to check';
 
 		return $the_input;
@@ -131,17 +131,17 @@ 
 	*
 	*	@return mixed The output code to add to the form
 	*/
-	public static function form_input($name, $id, $value = '', $type = 'text', $option = '', $input_label = ''){
+	public static function form_input($name, $id, $value = '', $type = 'text', $option = '', $input_label = '') {
 		$allowedType = array('text', 'hidden', 'password', 'file');
-		if(in_array($type, $allowedType))
+		if (in_array($type, $allowedType))
 		{
-			$output = '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $value . '" ' . $option . ' />' ;
+			$output = '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $value . '" ' . $option . ' />';
 		}
 		else
 		{
 			return sprintf(__('Input type not allowed here in %s at line %s', 'wpshop'), __FILE__, __LINE__);
 		}
-		$output.=(is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">'.$input_label['custom'].'</label> ':'');
+		$output .= (is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">' . $input_label['custom'] . '</label> ' : '');
 		return $output;
 	}
 
@@ -156,7 +156,7 @@ 
 	*/
 	public static function form_input_textarea($name, $id, $value = '', $option = '')
 	{
-		return '<textarea name="' . $name.'" id="' . $id . '" ' . $option . ' rows="4" cols="10" >' . $value . '</textarea>';
+		return '<textarea name="' . $name . '" id="' . $id . '" ' . $option . ' rows="4" cols="10" >' . $value . '</textarea>';
 	}
 
 	/**
@@ -169,38 +169,38 @@ 
 	*
 	*	@return mixed $output The output code to add to the form
 	*/
-	public static function form_input_select($name, $id, $content, $value = '', $option = '', $optionValue = ''){
+	public static function form_input_select($name, $id, $content, $value = '', $option = '', $optionValue = '') {
 		global $comboxOptionToHide;
 
 		$output = '<select id="' . $id . '" name="' . $name . '" ' . $option . ' data-placeholder="' . __('Select an Option', 'wpshop') . '" >';
 
-		if(is_array($content) && (count($content) > 0)){
-			foreach($content as $index => $datas){
-				if(is_object($datas) && (!is_array($comboxOptionToHide) || !in_array($datas->id, $comboxOptionToHide))){
+		if (is_array($content) && (count($content) > 0)) {
+			foreach ($content as $index => $datas) {
+				if (is_object($datas) && (!is_array($comboxOptionToHide) || !in_array($datas->id, $comboxOptionToHide))) {
 
 					$selected = ($value == $datas->id) ? ' selected="selected" ' : '';
 
-					$dataText = __('Nothing to output' ,'wpshop');
-					if(isset($datas->name))
-						$dataText = __($datas->name ,'wpshop');
-					elseif(isset($datas->code))
-						$dataText = __($datas->code ,'wpshop');
+					$dataText = __('Nothing to output', 'wpshop');
+					if (isset($datas->name))
+						$dataText = __($datas->name, 'wpshop');
+					elseif (isset($datas->code))
+						$dataText = __($datas->code, 'wpshop');
 
-					$output .= '<option value="' . $datas->id . '" ' . $selected . ' >' . $dataText. '</option>';
+					$output .= '<option value="' . $datas->id . '" ' . $selected . ' >' . $dataText . '</option>';
 				}
-				elseif(!is_array($comboxOptionToHide) || !in_array($datas, $comboxOptionToHide)){
+				elseif (!is_array($comboxOptionToHide) || !in_array($datas, $comboxOptionToHide)) {
 					$valueToPut = $datas;
 					$selected = ($value == $datas) ? ' selected="selected" ' : '';
-					if($optionValue == 'index'){
+					if ($optionValue == 'index') {
 						$valueToPut = $index;
 						$selected = ($value == $index) ? ' selected="selected" ' : '';
 					}
-					$output .= '<option value="' . $valueToPut . '" ' . $selected . ' >' . __($datas ,'wpshop') . '</option>';
+					$output .= '<option value="' . $valueToPut . '" ' . $selected . ' >' . __($datas, 'wpshop') . '</option>';
 				}
 			}
 		}
 		else
-			$output .= '<option value="" >'.__('Nothing found here...', 'wpshop').'</option>';
+			$output .= '<option value="" >' . __('Nothing found here...', 'wpshop') . '</option>';
 
 			$output .= '</select>';
 
@@ -222,7 +222,7 @@ 
 		$values = array();
 
 		if (!empty($value) && (is_array($value))) {
-			foreach($value as $v) {
+			foreach ($value as $v) {
 				$values[] = $v->value;
 			}
 		}
@@ -234,8 +234,8 @@ 
 		if (is_array($content) && (count($content) > 0)) {
 			$output = '<select id="' . $id . '" name="' . $name . '[]" ' . $option . ' multiple size="4" data-placeholder="' . __('Select values from list', 'wpshop') . '" >';
 
-			foreach($content as $index => $datas) {
-				if ( !empty($datas) && !empty($index) ) {
+			foreach ($content as $index => $datas) {
+				if (!empty($datas) && !empty($index)) {
 					$selected = in_array($index, $values) ? ' selected="selected" ' : '';
 
 					$output .= '<option value="' . $index . '" ' . $selected . ' >' . $datas . '</option>';
@@ -260,41 +260,41 @@ 
 	*
 	*	@return mixed $output The output code to add to the form
 	*/
-	public static function form_input_check($name, $id, $content, $value = '', $type = 'checkbox', $option = '', $optionValue = '', $input_label=''){
+	public static function form_input_check($name, $id, $content, $value = '', $type = 'checkbox', $option = '', $optionValue = '', $input_label = '') {
 		$output = '';
 		$allowedType = array('checkbox', 'radio');
 		$container_start = (isset($input_label['container']) && $input_label['container'] ? '<div class="wpshop_input_' . $type . ' wpshop_input_' . $type . '_' . $id . '" >' : '');
 		$container_end = (isset($input_label['container']) && $input_label['container'] ? '</div>' : '');
 
-		if(in_array($type, $allowedType)){
-			if(is_array($content) && (count($content) > 0)){
-				foreach($content as $index => $datas){
-					if(is_object($datas)){
+		if (in_array($type, $allowedType)) {
+			if (is_array($content) && (count($content) > 0)) {
+				foreach ($content as $index => $datas) {
+					if (is_object($datas)) {
 						$id = $name . '_' . sanitize_title($datas->nom);
 						$checked = ($value == $datas->id) ? ' checked="checked" ' : '';
 					}
-					else{
+					else {
 
 						$valueToPut = $datas;
-						$checked = ( ($value == $datas) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
-						if($optionValue == 'index'){
+						$checked = (($value == $datas) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
+						if ($optionValue == 'index') {
 							$valueToPut = $index;
-							$checked = ( ($value == $index) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
+							$checked = (($value == $index) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
 						}
 
 						$id = $id . '_' . sanitize_title($datas);
 // 						$checked = ( ($value == $datas) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
-						$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $valueToPut . '" ' . $checked . ' ' . $option . ' />'.(!empty($input_label['original'])?'<label for="' . $id . '">'.__($datas,'wpshop').'</label>&nbsp;':'')  . $container_end ;
+						$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $valueToPut . '" ' . $checked . ' ' . $option . ' />' . (!empty($input_label['original']) ? '<label for="' . $id . '">' . __($datas, 'wpshop') . '</label>&nbsp;' : '') . $container_end;
 					}
 				}
 			}
-			else{
+			else {
 				$checked = (($value != '') && ($value == $content)) ? ' checked="checked" ' : '';
-				$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $content . '" ' . $checked . ' ' . $option . ' />' . $container_start ;
+				$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $content . '" ' . $checked . ' ' . $option . ' />' . $container_start;
 			}
-			$output.=(is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">'.$input_label['custom'].'</label> ':'');
+			$output .= (is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">' . $input_label['custom'] . '</label> ' : '');
 
-			if ( isset($input_label['container']) && $input_label['container'] ) $output .= '<div class="wpshop_cls" ></div>';
+			if (isset($input_label['container']) && $input_label['container']) $output .= '<div class="wpshop_cls" ></div>';
 			return $output;
 		}
 		else

Braces +59 added lines, -51 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' ) ) {
@@ -52,8 +54,7 @@ 
 	<label ' . $label . ' >' . __($input_name, 'wpshop') . '</label>&nbsp;:&nbsp;
 	' . $the_input . '
 </div>';
-			}
-			else
+			} else
 			{
 				$the_form_content_hidden .= '
 	' . $the_input;
@@ -77,46 +78,55 @@ 
 	public static function check_input_type($input_def, $input_domain = '') {
 
 		$input_option = '';
-		if(!empty($input_def['option']) && $input_def['option'])
-			$input_option = $input_def['option'];
+		if(!empty($input_def['option']) && $input_def['option']) {
+					$input_option = $input_def['option'];
+		}
 
 		$valueToPut = '';
-		if(!empty($input_def['valueToPut']) && $input_def['valueToPut'])
-			$valueToPut = $input_def['valueToPut'];
+		if(!empty($input_def['valueToPut']) && $input_def['valueToPut']) {
+					$valueToPut = $input_def['valueToPut'];
+		}
 
 		$input_id = $input_def['name'];
-		if(!empty($input_def['id']))
-			$input_id = $input_def['id'];
+		if(!empty($input_def['id'])) {
+					$input_id = $input_def['id'];
+		}
 
 		$input_name = $input_def['name'];
-		if($input_domain != '')
-			$input_name = $input_domain . '[' . $input_def['name'] . ']';
+		if($input_domain != '') {
+					$input_name = $input_domain . '[' . $input_def['name'] . ']';
+		}
 		/**	Format data for saving without special chars	*/
-		if(!empty($input_def['value']) && !is_array($input_def['value']) && preg_match("/^-?(?:\d+|\d*\.\d+)$/", $input_def['value']))
-			$input_value = str_replace('.',',',$input_def['value']/* /1 */); // format francais avec virgule
-		else $input_value = (!empty($input_def['value']) ? $input_def['value'] : '');
+		if(!empty($input_def['value']) && !is_array($input_def['value']) && preg_match("/^-?(?:\d+|\d*\.\d+)$/", $input_def['value'])) {
+					$input_value = str_replace('.',',',$input_def['value']/* /1 */);
+		}
+		// format francais avec virgule
+		else {
+			$input_value = (!empty($input_def['value']) ? $input_def['value'] : '');
+		}
 
 		$input_type = $input_def['type'];
 		$the_input = '';
 
-		if( ( $input_type == 'text' ) || ( $input_type == 'email' ) || ( $input_type == 'tel' ) )
-			$the_input .= self::form_input( $input_name, $input_id, $input_value, 'text', $input_option, (!empty($input_def['options_label']) ? $input_def['options_label'] : '') );
-		elseif($input_type == 'password')
-			$the_input .= self::form_input($input_name, $input_id, $input_value, 'password', $input_option);
-		elseif($input_type == 'textarea')
-			$the_input .= self::form_input_textarea($input_name, $input_id, $input_value, $input_option);
-		elseif($input_type == 'hidden')
-			$the_input .= self::form_input($input_name, $input_id, $input_value, 'hidden', $input_option);
-		elseif($input_type == 'select')
-			$the_input .= self::form_input_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
-		elseif($input_type == 'multiple-select')
-			$the_input .= self::form_input_multiple_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
-		elseif(($input_type == 'radio') || ($input_type == 'checkbox'))
-			$the_input .= self::form_input_check($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_type, $input_option, $valueToPut, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
-		elseif($input_type == 'file')
-			$the_input .= self::form_input($input_name, $input_id, $input_value, 'file', $input_option);
-		elseif($input_type == 'gallery')
-			$the_input .= self::form_input($input_name, $input_id, $input_value, 'text', 'readonly = "readonly"') . 'Gallery field to check';
+		if( ( $input_type == 'text' ) || ( $input_type == 'email' ) || ( $input_type == 'tel' ) ) {
+					$the_input .= self::form_input( $input_name, $input_id, $input_value, 'text', $input_option, (!empty($input_def['options_label']) ? $input_def['options_label'] : '') );
+		} elseif($input_type == 'password') {
+					$the_input .= self::form_input($input_name, $input_id, $input_value, 'password', $input_option);
+		} elseif($input_type == 'textarea') {
+					$the_input .= self::form_input_textarea($input_name, $input_id, $input_value, $input_option);
+		} elseif($input_type == 'hidden') {
+					$the_input .= self::form_input($input_name, $input_id, $input_value, 'hidden', $input_option);
+		} elseif($input_type == 'select') {
+					$the_input .= self::form_input_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
+		} elseif($input_type == 'multiple-select') {
+					$the_input .= self::form_input_multiple_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
+		} elseif(($input_type == 'radio') || ($input_type == 'checkbox')) {
+					$the_input .= self::form_input_check($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_type, $input_option, $valueToPut, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
+		} elseif($input_type == 'file') {
+					$the_input .= self::form_input($input_name, $input_id, $input_value, 'file', $input_option);
+		} elseif($input_type == 'gallery') {
+					$the_input .= self::form_input($input_name, $input_id, $input_value, 'text', 'readonly = "readonly"') . 'Gallery field to check';
+		}
 
 		return $the_input;
 	}
@@ -136,8 +146,7 @@ 
 		if(in_array($type, $allowedType))
 		{
 			$output = '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $value . '" ' . $option . ' />' ;
-		}
-		else
+		} else
 		{
 			return sprintf(__('Input type not allowed here in %s at line %s', 'wpshop'), __FILE__, __LINE__);
 		}
@@ -181,14 +190,14 @@ 
 					$selected = ($value == $datas->id) ? ' selected="selected" ' : '';
 
 					$dataText = __('Nothing to output' ,'wpshop');
-					if(isset($datas->name))
-						$dataText = __($datas->name ,'wpshop');
-					elseif(isset($datas->code))
-						$dataText = __($datas->code ,'wpshop');
+					if(isset($datas->name)) {
+											$dataText = __($datas->name ,'wpshop');
+					} elseif(isset($datas->code)) {
+											$dataText = __($datas->code ,'wpshop');
+					}
 
 					$output .= '<option value="' . $datas->id . '" ' . $selected . ' >' . $dataText. '</option>';
-				}
-				elseif(!is_array($comboxOptionToHide) || !in_array($datas, $comboxOptionToHide)){
+				} elseif(!is_array($comboxOptionToHide) || !in_array($datas, $comboxOptionToHide)){
 					$valueToPut = $datas;
 					$selected = ($value == $datas) ? ' selected="selected" ' : '';
 					if($optionValue == 'index'){
@@ -198,9 +207,9 @@ 
 					$output .= '<option value="' . $valueToPut . '" ' . $selected . ' >' . __($datas ,'wpshop') . '</option>';
 				}
 			}
+		} else {
+					$output .= '<option value="" >'.__('Nothing found here...', 'wpshop').'</option>';
 		}
-		else
-			$output .= '<option value="" >'.__('Nothing found here...', 'wpshop').'</option>';
 
 			$output .= '</select>';
 
@@ -225,8 +234,7 @@ 
 			foreach($value as $v) {
 				$values[] = $v->value;
 			}
-		}
-		else {
+		} else {
 			$values = (array)$value;
 		}
 
@@ -272,8 +280,7 @@ 
 					if(is_object($datas)){
 						$id = $name . '_' . sanitize_title($datas->nom);
 						$checked = ($value == $datas->id) ? ' checked="checked" ' : '';
-					}
-					else{
+					} else{
 
 						$valueToPut = $datas;
 						$checked = ( ($value == $datas) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
@@ -287,18 +294,19 @@ 
 						$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $valueToPut . '" ' . $checked . ' ' . $option . ' />'.(!empty($input_label['original'])?'<label for="' . $id . '">'.__($datas,'wpshop').'</label>&nbsp;':'')  . $container_end ;
 					}
 				}
-			}
-			else{
+			} else{
 				$checked = (($value != '') && ($value == $content)) ? ' checked="checked" ' : '';
 				$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $content . '" ' . $checked . ' ' . $option . ' />' . $container_start ;
 			}
 			$output.=(is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">'.$input_label['custom'].'</label> ':'');
 
-			if ( isset($input_label['container']) && $input_label['container'] ) $output .= '<div class="wpshop_cls" ></div>';
+			if ( isset($input_label['container']) && $input_label['container'] ) {
+				$output .= '<div class="wpshop_cls" ></div>';
+			}
 			return $output;
+		} else {
+					return sprintf(__('Input type not allowed here in %s at line %s', 'wpshop'), __FILE__, __LINE__);
 		}
-		else
-			return sprintf(__('Input type not allowed here in %s at line %s', 'wpshop'), __FILE__, __LINE__);
 	}
 
 }
\ No newline at end of file