Eoxia / wpshop

script/wp-emulator.script.php

Indentation +3 added lines, -3 removed lines

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

Spacing +35 added lines, -35 removed lines

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

Braces +15 added lines, -6 removed lines

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

script/unit.script.php

Spacing +2 added lines, -2 removed lines

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

includes/librairies/eav/wp_list_custom_attributes.class.php

Indentation +8 added lines, -8 removed lines

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

Braces +3 added lines, -1 removed lines

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

Spacing +49 added lines, -49 removed lines

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

includes/librairies/eav/wp_list_custom_attributes_set.class.php

Indentation +203 added lines, -203 removed lines

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

Spacing +42 added lines, -42 removed lines

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

Braces +6 added lines, -3 removed lines

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

includes/librairies/eav/attributes.class.php

Indentation +1 added lines, -1 removed lines

@@ -1423,7 +1423,7 @@
 	 *	@param string $attributeType The extension of the database table to get the attribute value in
 	 *	@param integer $attributeId The attribute identifier we want to get the value for
 	 *	@param integer $entityTypeId The entity type identifier we want to get the attribute value for (example: product = 1)
-	 	*	@param integer $entityId The entity id we want the attribute value for
+	 *	@param integer $entityId The entity id we want the attribute value for
 	 *
 	 *	@return object $attributeValue A wordpress database object containing the value of the attribute for the selected entity
 	 */

Braces +156 added lines, -171 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' ) ) {
@@ -90,12 +92,12 @@ 
 			if(($action == 'edit') || ($action == 'delete')){
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label));
+			} elseif($action == 'add') {
+							$title = __(self::pageAddingTitle, 'wpshop');
 			}
-			elseif($action == 'add')
-				$title = __(self::pageAddingTitle, 'wpshop');
+		} elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())) {
+					$title = __(self::pageAddingTitle, 'wpshop');
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug()))
-			$title = __(self::pageAddingTitle, 'wpshop');
 
 		return $title;
 	}
@@ -126,14 +128,15 @@ 
 		if(($action != '') && ($action == 'saveok') && ($saveditem > 0)){
 			$editedElement = self::getElement($saveditem);
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
-		}
-		elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0)){
+		} elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0)){
 			$editedElement = self::getElement($saveditem, "'deleted'");
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully deleted', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
 		}
 
 		$attribute_parameter = !empty( $_REQUEST[self::getDbTable()] ) ? (array)$_REQUEST[self::getDbTable()] : array();
-		 if ( !empty($set_section) ) unset($attribute_parameter['set_section']);
+		 if ( !empty($set_section) ) {
+		 	unset($attribute_parameter['set_section']);
+		 }
 
 		$wpshop_attribute_combo_values_list_order_def = !empty($attribute_parameter['wpshop_attribute_combo_values_list_order_def']) ? $attribute_parameter['wpshop_attribute_combo_values_list_order_def'] : array();
 		// @TODO $_REQUEST
@@ -193,66 +196,82 @@ 
 			switch ($attribute_parameter['frontend_input']) {
 				case 'short_text':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 				case 'date_field':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'datetime';
 					break;
 				case 'float_field':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'decimal';
 					break;
 				case 'hidden_field':
 						$attribute_parameter['frontend_input'] = 'hidden';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 				case 'pass_field':
 						$attribute_parameter['frontend_input'] = 'password';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 
 				case 'select':
 						$attribute_parameter['frontend_input'] = 'select';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'multiple-select';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'multiple-select';
+						}
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'multiple-select':
 						$attribute_parameter['frontend_input'] = 'multiple-select';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'multiple-select';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'multiple-select';
+						}
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'radio':
 						$attribute_parameter['frontend_input'] = 'radio';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'multiple-select';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'multiple-select';
+						}
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'checkbox':
 						$attribute_parameter['frontend_input'] = 'checkbox';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'multiple-select';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'multiple-select';
+						}
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 
 				case 'textarea':
 						$attribute_parameter['frontend_input'] = 'textarea';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'textarea';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'textarea';
+						}
 						$attribute_parameter['data_type'] = 'text';
 					break;
 			}
-		}
-		else {
+		} else {
 			$attribute_parameter['frontend_input'] = 'text';
-			if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+			if ( empty($attribute_parameter['backend_input']) ) {
+				$attribute_parameter['backend_input'] = 'text';
+			}
 			$attribute_parameter['data_type'] = 'varchar';
 		}
 
@@ -287,22 +306,18 @@ 
 					if(!in_array($attribute_code, $attribute_undeletable)){
 						if(current_user_can('wpshop_delete_attributes')){
 							$attribute_parameter['status'] = 'deleted';
-						}
-						else{
+						} else{
 							$actionResult = 'userNotAllowedForActionDelete';
 						}
-					}
-					else{
+					} else{
 						$actionResult = 'unDeletableAtribute';
 					}
 				}
 				$actionResult = wpshop_database::update($attribute_parameter, $id, self::getDbTable());
-			}
-			else{
+			} else{
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
-		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
+		} elseif(($pageAction != '') && (($pageAction == 'delete'))){
 			$attribute_code = '';
 			if (empty(	$attribute_parameter['code'])) {
 				$attribute = self::getElement($id, "'valid', 'moderated', 'notused', 'deleted'", 'id');
@@ -313,14 +328,13 @@ 
 					$attribute_parameter['last_update_date'] = current_time('mysql', 0);
 					$attribute_parameter['status'] = 'deleted';
 					$actionResult = wpshop_database::update($attribute_parameter, $id, self::getDbTable());
+				} else {
+									$actionResult = 'userNotAllowedForActionDelete';
 				}
-				else
-					$actionResult = 'userNotAllowedForActionDelete';
+			} else {
+							$actionResult = 'unDeletableAtribute';
 			}
-			else
-				$actionResult = 'unDeletableAtribute';
-		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
+		} elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
 			if(current_user_can('wpshop_add_attributes')){
 				$attribute_parameter['creation_date'] = current_time('mysql', 0);
 				if(trim($attribute_parameter['code']) == ''){
@@ -333,8 +347,7 @@ 
 				}
 				$actionResult = wpshop_database::save($attribute_parameter, self::getDbTable());
 				$id = $wpdb->insert_id;
-			}
-			else{
+			} else{
 				$actionResult = 'userNotAllowedForActionAdd';
 			}
 		}
@@ -345,11 +358,12 @@ 
 		/****************************************************************************/
 		if($actionResult != ''){
 			$elementIdentifierForMessage = __('the attribute', 'wpshop');
-			if(!empty($attribute_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_parameter['frontend_label'] . '</span>';
+			if(!empty($attribute_parameter['name'])) {
+				$elementIdentifierForMessage = '<span class="bold" >' . $attribute_parameter['frontend_label'] . '</span>';
+			}
 			if ($actionResult == 'error') {/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . sprintf(__('An error occured while saving %s', 'wpshop'), $elementIdentifierForMessage, ' -> ' . $wpdb->last_error);
-			}
-			else if (($actionResult == 'done') || ($actionResult == 'nothingToUpdate')) {/*	CHANGE HERE FOR SPECIFIC CASE	*/
+			} else if (($actionResult == 'done') || ($actionResult == 'nothingToUpdate')) {/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				/*****************************************************************************************************************/
 				/*************************			CHANGE FOR SPECIFIC ACTION FOR CURRENT ELEMENT				****************************/
 				/*****************************************************************************************************************/
@@ -368,8 +382,7 @@ 
 					if (empty($attribute_parameter['code'])) {
 						$attribute = self::getElement($id, "'valid', 'moderated', 'notused'", 'id');
 						$attribute_code = $attribute->code;
-					}
-					else {
+					} else {
 						$attribute_code = $attribute_parameter['code'];
 					}
 					foreach ($optionsUpdate as $option_key => $option_label) {
@@ -460,8 +473,7 @@ 
 						$choosen_set_section = explode('_', $set_section);
 						$set_id = $choosen_set_section[0];
 						$group_id = $choosen_set_section[1];
-					}
-					else{
+					} else{
 						$attribute_current_attribute_set = 0;
 						$query = $wpdb->prepare("
 								SELECT id
@@ -509,7 +521,9 @@ 
 								$attribute_parameter['entity_id']
 						);
 						$wpshopAttributePosition = $wpdb->get_var($query);
-						if($wpshopAttributePosition == 0)$wpshopAttributePosition = 1;
+						if($wpshopAttributePosition == 0) {
+							$wpshopAttributePosition = 1;
+						}
 						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attribute_parameter['entity_id'], 'attribute_set_id' => $set_id, 'attribute_group_id' => $group_id, 'attribute_id' => $id, 'position' => $wpshopAttributePosition));
 					}
 				}
@@ -530,15 +544,14 @@ 
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=saveok&saveditem=" . $id));
 				}
 				else */
-				if ( $pageAction == 'add' )
-					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
-				elseif ( $pageAction == 'delete' )
-					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=deleteok&saveditem=" . $id));
-			}
-			elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete')){
+				if ( $pageAction == 'add' ) {
+									wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
+				} elseif ( $pageAction == 'delete' ) {
+									wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=deleteok&saveditem=" . $id));
+				}
+			} elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete')){
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('You are not allowed to do this action', 'wpshop');
-			}
-			elseif(($actionResult == 'unDeletableAtribute')){
+			} elseif(($actionResult == 'unDeletableAtribute')){
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('This attribute could not be deleted due to configuration', 'wpshop');
 			}
 
@@ -583,8 +596,7 @@ 
 		if ( !empty($s) ) {
 			$query = $wpdb->prepare("SELECT * FROM " . self::dbTable . ' WHERE frontend_label LIKE "%%%1$s%%" OR frontend_label LIKE "%%%2$s%%" AND backend_label LIKE "%%%1$s%%" OR backend_label LIKE "%%%2$s%%" AND code LIKE "%%%1$s%%" OR code LIKE "%%%2$s%%"', $s, __($s, 'wpshop') );
 			$attr_set_list = $wpdb->get_results( $query );
-		}
-		else {
+		} else {
 			$attr_set_list = self::getElement( '', $status );
 		}
 		$i=0;
@@ -638,8 +650,9 @@ 
 		global $attribute_displayed_field, $attribute_options_group;
 		$dbFieldList = wpshop_database::fields_to_input(self::getDbTable());
 		$editedItem = '';
-		if($itemToEdit != '')
-			$editedItem = self::getElement($itemToEdit);
+		if($itemToEdit != '') {
+					$editedItem = self::getElement($itemToEdit);
+		}
 
 		$the_form_content_hidden = $the_form_general_content = '';
 		$the_form_option_content_list = array();
@@ -652,10 +665,11 @@ 
 				$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : '';
 				$requestFormValue = isset($_REQUEST[self::currentPageCode][$input_def['label']]) ? sanitize_text_field($_REQUEST[self::currentPageCode][$input_def['label']]) : '';
 				$currentFieldValue = $input_def['value'];
-				if(is_object($editedItem))
-					$currentFieldValue = $editedItem->{$input_def['label']};
-				elseif(($pageAction != '') && ($requestFormValue != ''))
-					$currentFieldValue = $requestFormValue;
+				if(is_object($editedItem)) {
+									$currentFieldValue = $editedItem->{$input_def['label']};
+				} elseif(($pageAction != '') && ($requestFormValue != '')) {
+									$currentFieldValue = $requestFormValue;
+				}
 
 				if($input_def['label'] == 'status'){
 					if(in_array('notused', $input_def['possible_value'])){
@@ -727,9 +741,9 @@ 
 				}
 
 				$input_def['value'] = $currentFieldValue;
-				if($input_def['label'] == 'code')
-					$input_def['type'] = 'hidden';
-				elseif($input_def['label'] == 'entity_id'){
+				if($input_def['label'] == 'code') {
+									$input_def['type'] = 'hidden';
+				} elseif($input_def['label'] == 'entity_id'){
 					$input_def['possible_value'] = wpshop_entities::get_entities_list();
 					$input_def['valueToPut'] = 'index';
 					$input_def['type'] = 'select';
@@ -741,21 +755,17 @@ 
 						}
 						$i++;
 					}
-				}
-				elseif($input_def['label'] == '_unit_group_id'){
+				} elseif($input_def['label'] == '_unit_group_id'){
 					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_group();
 					$input_def['type'] = 'select';
-				}
-				elseif($input_def['label'] == '_default_unit'){
+				} elseif($input_def['label'] == '_default_unit'){
 					$unit_group_list = wpshop_attributes_unit::get_unit_group();
 					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group(!empty($editedItem->_unit_group_id)?$editedItem->_unit_group_id:(!empty($unit_group_list)?$unit_group_list[0]->id:''));
 					$input_def['type'] = 'select';
-				}
-				elseif ($input_def['label'] == 'backend_input') {
+				} elseif ($input_def['label'] == 'backend_input') {
 					if ( !is_object($editedItem) ) {
 						$input_def['type'] = 'hidden';
-					}
-					else {
+					} else {
 						$new_possible_value = array();
 						switch ( $editedItem->data_type) {
 							case 'integer':
@@ -789,8 +799,7 @@ 
 						}
 						$input_def['possible_value'] = $new_possible_value;
 					}
-				}
-				elseif ($input_def['label'] == 'frontend_input') {
+				} elseif ($input_def['label'] == 'frontend_input') {
 					$new_possible_value = array();
 
 					if ( is_object($editedItem) ) {
@@ -824,8 +833,7 @@ 
 									$new_possible_value[__('Date field', 'wpshop')] = 'date_field';
 								break;
 						}
-					}
-					else {
+					} else {
 						$new_possible_value[__('Text field', 'wpshop')] = 'short_text';
 						$new_possible_value[__('Number field', 'wpshop')] = 'float_field';
 						$new_possible_value[__('Date field', 'wpshop')] = 'date_field';
@@ -917,8 +925,7 @@ 
 								$the_input = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
 							break;
 						}
-					}
-					else {
+					} else {
 						$input_def['type']='text';
 						$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
 					}
@@ -945,9 +952,9 @@ 
 			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_'.$input_def['name'].'" ><label for="'.$input_def_id.'" >' . __($input_def['label'], 'wpshop') . '</label></td>
 			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_input wpshop_' . self::currentPageCode . '_edition_table_field_input_'.$input_def['name'].'" >' . $the_input . '</td>
 		</tr>';
-					if ( (substr($input_def['label'], 0, 3) == 'is_') || (substr($input_def['label'], 0, 1) == '_') || in_array($input_def['label'], unserialize( WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS )) )
-						$the_form_option_content_list[$input_def['label']] = $input;
-					else {
+					if ( (substr($input_def['label'], 0, 3) == 'is_') || (substr($input_def['label'], 0, 1) == '_') || in_array($input_def['label'], unserialize( WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS )) ) {
+											$the_form_option_content_list[$input_def['label']] = $input;
+					} else {
 						$the_form_general_content .= $input;
 						if ( ($input_def['label'] == 'frontend_input') && !is_object($editedItem) ) {
 
@@ -961,8 +968,7 @@ 
 							$the_form_general_content .= $input;
 						}
 					}
-				}
-				else{
+				} else{
 					$the_form_content_hidden .= '
 				' . $the_input;
 				}
@@ -1247,17 +1253,18 @@ 
 
 		 //$currentPageButton .= '<h2 class="cancelButton alignleft" ><a href="' . admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . self::getListingSlug()) . '" class="button add-new-h2" >' . __('Back', 'wpshop') . '</a></h2>';
 
-		if(($action == 'add') && (current_user_can('wpshop_add_attributes')))
-			$currentPageButton .= '<input type="button" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
-
-		elseif(current_user_can('wpshop_edit_attributes'))
-		$currentPageButton .= '<input type="button" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
+		if(($action == 'add') && (current_user_can('wpshop_add_attributes'))) {
+					$currentPageButton .= '<input type="button" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
+		} elseif(current_user_can('wpshop_edit_attributes')) {
+				$currentPageButton .= '<input type="button" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
+		}
 
 		$attribute_undeletable = unserialize(WPSHOP_ATTRIBUTE_UNDELETABLE);
 		$attribute = self::getElement($element_id, "'valid', 'moderated', 'notused'", 'id');
 		$attribute_code = !empty($attribute->code)?$attribute->code:'';
-		if(current_user_can('wpshop_delete_attributes') && ($action != 'add') && !in_array($attribute_code, $attribute_undeletable))
-			$currentPageButton .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_'.self::currentPageCode.'" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
+		if(current_user_can('wpshop_delete_attributes') && ($action != 'add') && !in_array($attribute_code, $attribute_undeletable)) {
+					$currentPageButton .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_'.self::currentPageCode.'" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
+		}
 
 		return $currentPageButton;
 	}
@@ -1302,8 +1309,7 @@ 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
 		if(($element_id == '') || $list){
 			$element_list = $wpdb->get_results($query);
-		}
-		else{
+		} else{
 			$element_list = $wpdb->get_row($query);
 		}
 
@@ -1397,8 +1403,7 @@ 
 										foreach($attributeValue as $a){
 											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($query_params, array('value' => $a)));
 										}
-									}
-									else{
+									} else{
 										$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($query_params, array('value' => $attributeValue)));
 										wpeologs_ctr::log_datas_in_files( 'wpshop_attributes', array(
 											'object_id' 	=> $entityId,
@@ -1417,8 +1422,10 @@ 
 										$value = self::get_attribute_type_select_option_info($attributeTypeDetails[$attribute_code], 'value');
 										if (strtolower($value) == 'yes') :
 											update_post_meta($entityId, 'attribute_option_'.$attribute_code, $attribute_option);
-										else :
+										else {
+											:
 											delete_post_meta($entityId, 'attribute_option_'.$attribute_code);
+										}
 										endif;
 									}
 								}
@@ -1478,8 +1485,7 @@ 
 
 		if ( ( (count($attributeValue) <= 1 ) && !empty($attributeValue[0]) ) && ( empty($atribute_params['frontend_input']) || ($atribute_params['frontend_input'] != 'multiple-select') )) {
 			$attributeValue = $attributeValue[0];
-		}
-		else{
+		} else{
 			$entity_meta = get_post_meta($entityId, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
 			if ( !empty($entity_meta) ) {
 				$query = $wpdb->prepare("SELECT code FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE id = %d AND entity_id = %d ", $attributeId, $entityTypeId);
@@ -1545,12 +1551,10 @@ 
 			if ( !empty($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value']) ) {
 				if (is_array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'])) {
 					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'][] = $elementDefinition->$attributeValueField;
-				}
-				else {
+				} else {
 					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'],$elementDefinition->$attributeValueField);
 				}
-			}
-			else {
+			} else {
 				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = $elementDefinition->$attributeValueField;
 			}
 
@@ -1631,17 +1635,14 @@ 
 			if ( ( is_array($attribute_custom_config) && in_array($attribute_or_set, array('attribute', 'attribute_set_section', 'product_action_button')) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes' )
 				 || empty($attribute_custom_config) ) {
 				$attribute_output = true;
-			}
-			else if ( empty($attribute_custom_config[$attribute_or_set][$attribute_code]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) || (!empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'no')) )  {
+			} else if ( empty($attribute_custom_config[$attribute_or_set][$attribute_code]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) || (!empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'no')) )  {
 				$attribute_output = false;
 			}
-		}
-		elseif ( $attribute_main_config === 'no' ) {
+		} elseif ( $attribute_main_config === 'no' ) {
 			$attribute_output = false;
 			if ( empty($attribute_custom_config[$attribute_or_set]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code]) ) {
 				$attribute_output = false;
-			}
-			else if ( !empty($attribute_custom_config) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes') )  {
+			} else if ( !empty($attribute_custom_config) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes') )  {
 				$attribute_output = true;
 			}
 		}
@@ -1659,7 +1660,9 @@ 
 		global $wp_query;
 
 		$attribute = self::getElement( $atts['attid'] );
-		if(empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
+		if(empty($atts['pid'])) {
+			$atts['pid'] = $wp_query->posts[0]->ID;
+		}
 		$attribute_main_config = ( empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet') ) ? $attribute->is_visible_in_front : $attribute->is_visible_in_front_listing;
 		$output_type = ( empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet') ) ? 'complete_sheet' : 'mini_output';
 		$product_attribute_custom_config = get_post_meta($atts['pid'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
@@ -1678,13 +1681,11 @@ 
 					}
 					$has_value = true;
 				}
-			}
-			else {
+			} else {
 				$data = $wpdb->get_var($query);
 				if ( !empty($data) ) {
 					$has_value = true;
-				}
-				elseif( !empty($attribute->default_value) ) {
+				} elseif( !empty($attribute->default_value) ) {
 					$has_value = true;
 					$data = $attribute->default_value;
 				}
@@ -1744,11 +1745,9 @@ 
 
 		if ( !empty($attribute_value) && !is_object($attribute_value) ) {
 			$input_def['value'] = $attribute_value;
-		}
-		else if ( !empty($attribute_value->value) ) {
+		} else if ( !empty($attribute_value->value) ) {
 			$input_def['value'] = stripslashes($attribute_value->value);
-		}
-		else if ( !empty($specific_argument['element_identifier']) && empty($attribute_value) && (get_post_status($specific_argument['element_identifier']) != 'auto-draft') ) {
+		} else if ( !empty($specific_argument['element_identifier']) && empty($attribute_value) && (get_post_status($specific_argument['element_identifier']) != 'auto-draft') ) {
 			$input_def['value'] = '';
 		}
 
@@ -1758,8 +1757,7 @@ 
 			$date_config = unserialize( $attribute->default_value );
 			if ((($date_config['default_value'] == '') || ($date_config['default_value'] == 'date_of_current_day')) && ($date_config['default_value'] == 'date_of_current_day')) {
 				$input_def['value'] = date('Y-m-d');
-			}
-			else {
+			} else {
 				/**	Modification due to a message on eoxia forum: http://www.eoxia.com/forums/topic/bug-attribut-de-type-date-dans-fiche-produit-admin/	*/
 				$input_def['value'] = !empty($attribute_value->value) && is_string($attribute_value->value) ? str_replace( " 00:00:00", "", $attribute_value->value ) : ( !empty($attribute_value) && is_string($attribute_value) ? str_replace( " 00:00:00", "", $attribute_value ) : '' );
 			}
@@ -1864,8 +1862,7 @@ 
 		if((WPSHOP_PRODUCT_PRICE_PILOT == 'HT') && ($attribute->code == WPSHOP_PRODUCT_PRICE_TTC) ){
 			$input_def['option'] .= ' readonly="readonly" ';
 			$input_more_class .= ' wpshop_prices_readonly';
-		}
-		elseif((WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') && ($attribute->code == WPSHOP_PRODUCT_PRICE_HT) ){
+		} elseif((WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') && ($attribute->code == WPSHOP_PRODUCT_PRICE_HT) ){
 			$input_def['option'] .= ' readonly="readonly" ';
 			$input_more_class .= ' wpshop_prices_readonly';
 		}
@@ -1889,14 +1886,12 @@ 
 		if ($attribute->is_requiring_unit == 'yes') {
 			if ( in_array($attribute->code, $wpshop_price_attributes) || ( WPSHOP_COST_OF_POSTAGE == $attribute->code) ) {
 				$input_def['options'] .= '&nbsp;<span class="attribute_currency" id="attribute_currency_' . $attribute->id . '" >' . wpshop_tools::wpshop_get_currency() . '</span>';
-			}
-			elseif ( in_array($attribute->code, $wpshop_weight_attributes) ) {
+			} elseif ( in_array($attribute->code, $wpshop_weight_attributes) ) {
 				$weight_defaut_unity_option = get_option('wpshop_shop_default_weight_unity');
 				$query = $wpdb->prepare('SELECT name FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
 				$unity = $wpdb->get_var( $query );
 				$input_def['options'] .= '&nbsp;<span class="attribute_weight" id="attribute_weight_' . $attribute->id . '" >' . __($unity, 'wpshop') . '</span>';
-			}
-			else {
+			} else {
 				unset($unit_input_def);
 				$unit_input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group($attribute->_unit_group_id);
 				$unit_input_def['type'] = 'select';
@@ -1907,8 +1902,7 @@ 
 				if($unit_input_def['value'] == ''){
 					if ( $attribute->_default_unit > 0 ) {
 						$unit_input_def['value'] = $attribute->_default_unit;
-					}
-					else {
+					} else {
 						$unit_input_def['value'] = wpshop_attributes_unit::get_default_unit_for_group($attribute->_unit_group_id);
 					}
 				}
@@ -1932,8 +1926,7 @@ 
 			$input_def['label_pointer'] = '';
 			$input_def['option'] = substr( $input_def['option'], 0 , -2 ) . ' wpshop_attributes_is_user_defined_admin_field "';
 			$input_def['field_container_class'] .= 'wpshop_attributes_is_user_defined_admin_container';
-		}
-		else {
+		} else {
 			$input_def['output'] = wpshop_form::check_input_type($input_def, $attributeInputDomain);
 		}
 		return $input_def;
@@ -2030,8 +2023,7 @@ 
 					/**	Check the value type to check if empty or not	*/
 					if ( $attributeDefinition['data_type'] == 'int' ) {
 						$attributeDefinition['value'] = (int)$attributeDefinition['value'];
-					}
-					else if ( $attributeDefinition['data_type'] == 'decimal' ) {
+					} else if ( $attributeDefinition['data_type'] == 'decimal' ) {
 						$attributeDefinition['value'] = (float)$attributeDefinition['value'];
 					}
 
@@ -2093,8 +2085,7 @@ 
 						require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 						$tab_list .= ob_get_contents();
 						ob_end_clean();
-					}
-					else {
+					} else {
 						$tab_list .= wpshop_display::display_template_element($template_part, $tpl_component);
 					}
 					unset($tpl_component);
@@ -2113,8 +2104,7 @@ 
 						require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 						$content_list .= ob_get_contents();
 						ob_end_clean();
-					}
-					else {
+					} else {
 						$content_list .= wpshop_display::display_template_element($template_part, $tpl_component);
 					}
 					unset($tpl_component);
@@ -2136,8 +2126,7 @@ 
 					require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 					$attributeContentOutput = ob_get_contents();
 					ob_end_clean();
-				}
-				else {
+				} else {
 					$attributeContentOutput = wpshop_display::display_template_element($template_part, $tpl_component);
 				}
 				unset($tpl_component);
@@ -2189,8 +2178,9 @@ 
 				foreach ($attributeDefinition['value'] as $v) {
 					$attribute_value .= ' / '.wpshop_attributes::get_attribute_type_select_option_info($v, 'label', $attributeDefinition['data_type_to_use']);
 				}
+			} else {
+				$attribute_value = ' / '.wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
 			}
-			else $attribute_value = ' / '.wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
 			$attribute_value = substr($attribute_value,3);
 		}
 
@@ -2272,8 +2262,7 @@ 
 								wps_shortcodes_ctr::output_shortcode('attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])), $shortcode_code_def, 'wpshop_product_shortcode_display wpshop_product_attribute_shortcode_display wpshop_product_attribute_shortcode_display_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])).' wpshop_cls');
 								$shortcodes .= '<li class="wpshop_cls" >'.sprintf(__('Insertion code for the attribute %s for this product', 'wpshop'), '<span>'.__($attribute_output_def['field_definition']['label'], 'wpshop').'</span>').ob_get_contents().'</li>';
 								ob_end_clean();
-							}
-							else {
+							} else {
 								if ( $attribute->code == 'product_attribute_set_id' ) {
 									$attribute_output_def['field_definition']['type'] = 'hidden';
 								}
@@ -2293,10 +2282,11 @@ 
 					$attribute_group_display = sprintf(__('Insertion code for attribute group %s for this product', 'wpshop'), '<span>'.$productAttributeSetDetail['name'].'</span>').ob_get_contents().'<ul class="" >'.$shortcodes.'</ul>';
 					ob_end_clean();
 
-					if( WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE == 'each-box' )
-						$currentTabContent .= '<div class="wpshop_cls" ><strong>'.__('Shortcodes','wpshop').'</strong> - <a href="#" class="show-hide-shortcodes">' . __('Display', 'wpshop') . '</a><div class="wpshop_product_shortcode_display wpshop_product_shortcode_display_container wpshopHide" >' . $attribute_group_display . '</div></div>';
-					else
-						$shortcodes_attr .= $attribute_group_display;
+					if( WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE == 'each-box' ) {
+											$currentTabContent .= '<div class="wpshop_cls" ><strong>'.__('Shortcodes','wpshop').'</strong> - <a href="#" class="show-hide-shortcodes">' . __('Display', 'wpshop') . '</a><div class="wpshop_product_shortcode_display wpshop_product_shortcode_display_container wpshopHide" >' . $attribute_group_display . '</div></div>';
+					} else {
+											$shortcodes_attr .= $attribute_group_display;
+					}
 
 					if ( $output_nb <= 0 ) {
 						$currentTabContent = __('Nothing avaiblable here. You can go in attribute management interface in order to add content here.', 'wpshop');
@@ -2311,8 +2301,7 @@ 
 						$box['boxContent'][$productAttributeSetDetail['code']] = '
 			<div id="wpshop_' . $currentPageCode . '_' . wpshop_tools::slugify($productAttributeSetDetail['code'], array('noAccent')) . '_form" >' . $currentTabContent . '
 							</div><div class="wpshop_cls" ></div>';
-					}
-					else if ( $outputType == 'column' ) {
+					} else if ( $outputType == 'column' ) {
 						$currentTabContent = str_replace('wpshop_form_input_element', 'wpshop_form_input_column', $currentTabContent);
 						$currentTabContent = str_replace('wpshop_form_label', 'wpshop_form_label_column', $currentTabContent);
 
@@ -2350,8 +2339,7 @@ 
 							$box['box']['shortcode'] = __('Product Shortcodes', 'wpshop');
 							$box['boxContent']['shortcode'] = $shortcodes_attr;
 							$box['box']['shortcode_backend_display_type'] = WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE;
-						}
-						else{
+						} else{
 							$box['columnTitle']['shortcode'] = __('Product Shortcodes', 'wpshop');
 							$box['columnContent']['shortcode'] = $shortcodes_attr;
 						}
@@ -2391,8 +2379,7 @@ 
 //					$ouput['more_input'] .= '<input type="hidden" value="' . (WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT ? str_replace("\\", "", $option->value) : str_replace("\\", "", $option->label)) . '" name="wpshop_product_attribute_' . $attribute->code . '_value_' . $option->id . '" id="wpshop_product_attribute_' . $attribute->code . '_value_' . $option->id . '" />';
 // 				}
 			endforeach;
-		}
-		elseif ( $attribute->data_type_to_use == 'internal')  {
+		} elseif ( $attribute->data_type_to_use == 'internal')  {
 			switch ($attribute_default_value) {
 				case 'users':
 					$users = get_users('orderby=nicename');
@@ -2421,9 +2408,11 @@ 
 		/*	There is no value existing for this value	*/
 		if (empty($attribute_select_options_list)) :
 			$ouput['more_input'].=__('Nothing found for this field', 'wpshop');
-		else:
+		else {
+			:
 			/*	Add a default value to the combobox list	*/
 			$default_value_is_serial = false;
+		}
 			$attribute_list_first_element = $attribute->default_value;
 			if ( !empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized( $attribute->default_value ) ) ) {
 				$default_value_is_serial = true;
@@ -2439,8 +2428,7 @@ 
 		/*	Add a extra element to create a new element into list	*/
 		if ( is_admin()  && ( empty($provenance['from']) || ($provenance['from'] != 'frontend')) ) {
 			/**	$ouput['more_input'] .= '<img src="'.WPSHOP_MEDIAS_ICON_URL.'add.png" id="new_value_pict_' . $attribute->code . '" alt="'.__('Add a new value for this attribute', 'wpshop').'" title="'.__('Add a new value for this attribute', 'wpshop').'" class="wpshop_icons wpshop_icons_add_new_value_to_option_list wpshop_icons_add_new_value_to_option_list_'.$attribute->code.'" />';	*/
-		}
-		else if ( 'yes' == $attribute->is_used_in_quick_add_form ) {
+		} else if ( 'yes' == $attribute->is_used_in_quick_add_form ) {
 			$tpl_component = array();
 			$tpl_component['NEW_ELEMENT_CREATION_FIELD'] = 'attribute[new_value_creation][' . $attribute->code . ']';
 			$ouput['more_input'] .= wpshop_display::display_template_element('quick_entity_specific_field_new_element', $tpl_component);
@@ -2462,8 +2450,7 @@ 
 WHERE ATT.code = %s
 	AND ATT_SELECT_OPTIONS_VALUE.status = 'valid'
 GROUP BY ATT.id, chosen_val", $element_id, $attribute_code);
-		}
-		else {
+		} else {
 			$query = $wpdb->prepare("
 SELECT P.ID AS chosen_val, P.post_title
 FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATT
@@ -2638,14 +2625,17 @@ 
 		$attribute_final = array();
 		$entity_type = get_post_type($entityId);
 		$data = self::get_attribute_list_for_item( wpshop_entities::get_entity_identifier_from_code($entity_type), $entityId, WPSHOP_CURRENT_LOCALE);
-		foreach($data as $d) $attribute_available[$d->attribute_code] = array('attribute_id' => $d->attribute_id, 'data_type' => $d->data_type);
+		foreach($data as $d) {
+			$attribute_available[$d->attribute_code] = array('attribute_id' => $d->attribute_id, 'data_type' => $d->data_type);
+		}
 
 		// Creation d'un array "propre" et valide pour la fonction self::saveAttributeForEntity
 		foreach ( $values as $key => $value ) {
 			if ( in_array( $key, array_keys( $attribute_available ) ) ) {
 				$attribute_final[$attribute_available[$key]['data_type']][$key] = $value;
+			} else {
+				$message .= sprintf(__('Impossible to set "%s" attribute', 'wpshop'), $key)."\n";
 			}
-			else $message .= sprintf(__('Impossible to set "%s" attribute', 'wpshop'), $key)."\n";
 		}
 
 		// Pour les autres attributs non donné on leur affecte leur valeur par défaut
@@ -2715,8 +2705,7 @@ 
 						/** Build template	*/
 						$info = wpshop_display::display_template_element($template_part, $tpl_component);
 						unset($tpl_component);
-					}
-					else {
+					} else {
 						$info = $entity_infos->post_title;
 					}
 				}
@@ -2904,8 +2893,7 @@ 
 
 		});
 	</script>';
-			}
-			elseif((($data_type == 'internal') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'internal'))){
+			} elseif((($data_type == 'internal') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'internal'))){
 				$sub_output='';
 				$wp_types = unserialize(WPSHOP_INTERNAL_TYPES);
 				unset($input_def);$input_def=array();
@@ -3006,8 +2994,7 @@ 
 									<option value="' . $value->value . '" >' . $value->label . '</option>';
 										}
 									}
-								}
-								else {
+								} else {
 									foreach ($attribute_values as $attribute_value) {
 										if ( !empty($attribute_value->value) ) {
 											$attribute_possible_values .= '
@@ -3090,8 +3077,7 @@ 
 					$final_list['unavailable'][$attribute->code]['label'] = $attribute->frontend_label;
 					$final_list['unavailable'][$attribute->code]['values'] = array();
 					$final_list['unavailable'][$attribute->code]['attribute_complete_def'] = $attribute;
-				}
-				else {
+				} else {
 					$final_list['available'][$attribute->code]['label'] = $attribute->frontend_label;
 					$final_list['available'][$attribute->code]['values'] = $attribute_values_for_variations;
 					$final_list['available'][$attribute->code]['attribute_complete_def'] = $attribute;
@@ -3119,8 +3105,7 @@ 
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_LABEL_STATE'] = '';
 						$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = '';
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL_EXPLAINATION'] = '';
-					}
-					else {
+					} else {
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_LABEL_STATE'] = ' class="wpshop_unavailable_label_variation_definition" ';
 						$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = ' disabled="disabled"';
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL_EXPLAINATION'] = '';

Spacing +559 added lines, -559 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'));
 }
 
 /**
@@ -20,7 +20,7 @@ 
  * @package wpshop
  * @subpackage librairies
  */
-class wpshop_attributes{
+class wpshop_attributes {
 	/*	Define the database table used in the current class	*/
 	const dbTable = WPSHOP_DBT_ATTRIBUTE;
 	/*	Define the url listing slug used in the current class	*/
@@ -50,7 +50,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function setMessage($message){
+	function setMessage($message) {
 		$this->pageMessage = $message;
 	}
 	/**
@@ -58,7 +58,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function getListingSlug(){
+	function getListingSlug() {
 		return self::urlSlugListing;
 	}
 	/**
@@ -66,7 +66,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function getEditionSlug(){
+	function getEditionSlug() {
 		return self::urlSlugEdition;
 	}
 	/**
@@ -74,7 +74,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	public static function getDbTable(){
+	public static function getDbTable() {
 		return self::dbTable;
 	}
 	/**
@@ -82,21 +82,21 @@ 
 	 *
 	 *	@return string $title The title of the page looking at the environnement
 	 */
-	function pageTitle(){
+	function pageTitle() {
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
 		$objectInEdition = isset($_REQUEST['id']) ? sanitize_key($_REQUEST['id']) : '';
-		$page = !empty( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$page = !empty($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 
-		$title = __(self::pageTitle, 'wpshop' );
-		if($action != ''){
-			if(($action == 'edit') || ($action == 'delete')){
+		$title = __(self::pageTitle, 'wpshop');
+		if ($action != '') {
+			if (($action == 'edit') || ($action == 'delete')) {
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label));
 			}
-			elseif($action == 'add')
+			elseif ($action == 'add')
 				$title = __(self::pageAddingTitle, 'wpshop');
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug()))
+		elseif ((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug()))
 			$title = __(self::pageAddingTitle, 'wpshop');
 
 		return $title;
@@ -105,7 +105,7 @@ 
 	/**
 	 *	Define the different message and action after an action is send through the element interface
 	 */
-	function elementAction(){
+	function elementAction() {
 		global $wpdb, $initialEavData;
 
 		$pageMessage = $actionResult = '';
@@ -118,75 +118,75 @@ 
 		$saveditem = isset($_REQUEST['saveditem']) ? sanitize_text_field($_REQUEST['saveditem']) : '';
 		$set_section = !empty($_REQUEST[self::getDbTable()]['set_section']) ? sanitize_text_field($_REQUEST[self::getDbTable()]['set_section']) : '';
 		//@TODO $_REQUEST
-		$id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : null;
-		if(!empty($action) && ($action=='activate') ){
-			if( isset($id) ) {
+		$id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : null;
+		if (!empty($action) && ($action == 'activate')) {
+			if (isset($id)) {
 				$query = $wpdb->update(self::getDbTable(), array('status'=>'moderated'), array('id'=>$id));
 				wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
 			}
 		}
-		if(($action != '') && ($action == 'saveok') && ($saveditem > 0)){
+		if (($action != '') && ($action == 'saveok') && ($saveditem > 0)) {
 			$editedElement = self::getElement($saveditem);
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
 		}
-		elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0)){
+		elseif (($action != '') && ($action == 'deleteok') && ($saveditem > 0)) {
 			$editedElement = self::getElement($saveditem, "'deleted'");
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully deleted', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
 		}
 
-		$attribute_parameter = !empty( $_REQUEST[self::getDbTable()] ) ? (array)$_REQUEST[self::getDbTable()] : array();
-		 if ( !empty($set_section) ) unset($attribute_parameter['set_section']);
+		$attribute_parameter = !empty($_REQUEST[self::getDbTable()]) ? (array)$_REQUEST[self::getDbTable()] : array();
+		 if (!empty($set_section)) unset($attribute_parameter['set_section']);
 
 		$wpshop_attribute_combo_values_list_order_def = !empty($attribute_parameter['wpshop_attribute_combo_values_list_order_def']) ? $attribute_parameter['wpshop_attribute_combo_values_list_order_def'] : array();
 		// @TODO $_REQUEST
 		// unset($_REQUEST[self::getDbTable()]['wpshop_attribute_combo_values_list_order_def']);
 
-		if(!isset($attribute_parameter['status'])){
+		if (!isset($attribute_parameter['status'])) {
 			$attribute_parameter['status'] = 'moderated';
 		}
-		if(!isset($attribute_parameter['is_historisable'])){
+		if (!isset($attribute_parameter['is_historisable'])) {
 			$attribute_parameter['is_historisable'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_required'])){
+		if (!isset($attribute_parameter['is_required'])) {
 			$attribute_parameter['is_required'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_in_admin_listing_column'])){
+		if (!isset($attribute_parameter['is_used_in_admin_listing_column'])) {
 			$attribute_parameter['is_used_in_admin_listing_column'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_in_quick_add_form'])){
+		if (!isset($attribute_parameter['is_used_in_quick_add_form'])) {
 			$attribute_parameter['is_used_in_quick_add_form'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_intrinsic'])){
+		if (!isset($attribute_parameter['is_intrinsic'])) {
 			$attribute_parameter['is_intrinsic'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_requiring_unit'])){
+		if (!isset($attribute_parameter['is_requiring_unit'])) {
 			$attribute_parameter['is_requiring_unit'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_visible_in_front'])){
+		if (!isset($attribute_parameter['is_visible_in_front'])) {
 			$attribute_parameter['is_visible_in_front'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_visible_in_front_listing'])){
+		if (!isset($attribute_parameter['is_visible_in_front_listing'])) {
 			$attribute_parameter['is_visible_in_front_listing'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_for_sort_by'])){
+		if (!isset($attribute_parameter['is_used_for_sort_by'])) {
 			$attribute_parameter['is_used_for_sort_by'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_visible_in_advanced_search'])){
+		if (!isset($attribute_parameter['is_visible_in_advanced_search'])) {
 			$attribute_parameter['is_visible_in_advanced_search'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_searchable'])){
+		if (!isset($attribute_parameter['is_searchable'])) {
 			$attribute_parameter['is_searchable'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_for_variation'])){
+		if (!isset($attribute_parameter['is_used_for_variation'])) {
 			$attribute_parameter['is_used_for_variation'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_in_variation'])){
+		if (!isset($attribute_parameter['is_used_in_variation'])) {
 			$attribute_parameter['is_used_in_variation'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_user_defined'])){
+		if (!isset($attribute_parameter['is_user_defined'])) {
 			$attribute_parameter['is_user_defined'] = 'no';
 		}
-		if(!isset($attribute_parameter['_display_informations_about_value'])){
+		if (!isset($attribute_parameter['_display_informations_about_value'])) {
 			$attribute_parameter['_display_informations_about_value'] = 'no';
 		}
 
@@ -195,58 +195,58 @@ 
 			switch ($attribute_parameter['frontend_input']) {
 				case 'short_text':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 				case 'date_field':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'datetime';
 					break;
 				case 'float_field':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'decimal';
 					break;
 				case 'hidden_field':
 						$attribute_parameter['frontend_input'] = 'hidden';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 				case 'pass_field':
 						$attribute_parameter['frontend_input'] = 'password';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 
 				case 'select':
 						$attribute_parameter['frontend_input'] = 'select';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'multiple-select';
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'multiple-select':
 						$attribute_parameter['frontend_input'] = 'multiple-select';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'multiple-select';
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'radio':
 						$attribute_parameter['frontend_input'] = 'radio';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'multiple-select';
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'checkbox':
 						$attribute_parameter['frontend_input'] = 'checkbox';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'multiple-select';
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 
 				case 'textarea':
 						$attribute_parameter['frontend_input'] = 'textarea';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'textarea';
 						$attribute_parameter['data_type'] = 'text';
 					break;
@@ -254,7 +254,7 @@ 
 		}
 		else {
 			$attribute_parameter['frontend_input'] = 'text';
-			if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+			if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 			$attribute_parameter['data_type'] = 'varchar';
 		}
 
@@ -263,55 +263,55 @@ 
 			// $attribute_parameter['use_ajax_for_filling_field']='no';
 		// }
 		$attribute_parameter['use_ajax_for_filling_field'] = 'yes';
-		if( $attribute_parameter['backend_input'] == 'multiple-select' ) {
+		if ($attribute_parameter['backend_input'] == 'multiple-select') {
 			$attribute_parameter['is_used_for_variation'] = 'yes';
 		}
 
 		/*	Define the database operation type from action launched by the user	 */
 		$attribute_parameter['default_value'] = (!empty($attribute_parameter['default_value']) && is_array($attribute_parameter['default_value'])) ? serialize($attribute_parameter['default_value']) : (isset($attribute_parameter['default_value']) ? str_replace('"', "'", $attribute_parameter['default_value']) : '');
-		if ( $attribute_parameter['data_type'] == 'datetime' ) {
+		if ($attribute_parameter['data_type'] == 'datetime') {
 			$date_default_value_trasform_into_config = array('default_value' => $attribute_parameter['default_value'], 'field_options' => (!empty($_POST[self::getDbTable() . '_options']) ? sanitize_text_field($_POST[self::getDbTable() . '_options']) : null));
-			$attribute_parameter['default_value'] = serialize( $date_default_value_trasform_into_config );
+			$attribute_parameter['default_value'] = serialize($date_default_value_trasform_into_config);
 		}
 		/*****************************		GENERIC				**************************/
 		/*************************************************************************/
-		$pageAction = (!empty($attribute_parameter['frontend_label']) && isset($_REQUEST[self::getDbTable() . '_action'])) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : ((!empty($_GET['action']) && ($_GET['action']=='delete')) ? sanitize_text_field($_GET['action']) : '');
+		$pageAction = (!empty($attribute_parameter['frontend_label']) && isset($_REQUEST[self::getDbTable() . '_action'])) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : ((!empty($_GET['action']) && ($_GET['action'] == 'delete')) ? sanitize_text_field($_GET['action']) : '');
 		$id = isset($attribute_parameter['id']) ? sanitize_key($attribute_parameter['id']) : ((!empty($_GET['id'])) ? $_GET['id'] : '');
-		if(($pageAction != '') && (($pageAction == 'edit') || ($pageAction == 'editandcontinue'))){
-			if(current_user_can('wpshop_edit_attributes')){
+		if (($pageAction != '') && (($pageAction == 'edit') || ($pageAction == 'editandcontinue'))) {
+			if (current_user_can('wpshop_edit_attributes')) {
 				$attribute_parameter['last_update_date'] = date('Y-m-d H:i:s');
-				if($pageAction == 'delete'){
+				if ($pageAction == 'delete') {
 					$attribute_code = $attribute_parameter['code'];
-					if(!isset($attribute_parameter['code']) || ($attribute_parameter['code'] == '')){
+					if (!isset($attribute_parameter['code']) || ($attribute_parameter['code'] == '')) {
 						$attribute = self::getElement($id, "'valid', 'moderated', 'notused'", 'id');
 						$attribute_code = $attribute->code;
 					}
-					if(!in_array($attribute_code, $attribute_undeletable)){
-						if(current_user_can('wpshop_delete_attributes')){
+					if (!in_array($attribute_code, $attribute_undeletable)) {
+						if (current_user_can('wpshop_delete_attributes')) {
 							$attribute_parameter['status'] = 'deleted';
 						}
-						else{
+						else {
 							$actionResult = 'userNotAllowedForActionDelete';
 						}
 					}
-					else{
+					else {
 						$actionResult = 'unDeletableAtribute';
 					}
 				}
 				$actionResult = wpshop_database::update($attribute_parameter, $id, self::getDbTable());
 			}
-			else{
+			else {
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
 		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
+		elseif (($pageAction != '') && (($pageAction == 'delete'))) {
 			$attribute_code = '';
-			if (empty(	$attribute_parameter['code'])) {
+			if (empty($attribute_parameter['code'])) {
 				$attribute = self::getElement($id, "'valid', 'moderated', 'notused', 'deleted'", 'id');
 				$attribute_code = $attribute->code;
 			}
 			if (!in_array($attribute_code, $attribute_undeletable)) {
-				if(current_user_can('wpshop_delete_attributes')){
+				if (current_user_can('wpshop_delete_attributes')) {
 					$attribute_parameter['last_update_date'] = current_time('mysql', 0);
 					$attribute_parameter['status'] = 'deleted';
 					$actionResult = wpshop_database::update($attribute_parameter, $id, self::getDbTable());
@@ -322,21 +322,21 @@ 
 			else
 				$actionResult = 'unDeletableAtribute';
 		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
-			if(current_user_can('wpshop_add_attributes')){
+		elseif (($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))) {
+			if (current_user_can('wpshop_add_attributes')) {
 				$attribute_parameter['creation_date'] = current_time('mysql', 0);
-				if(trim($attribute_parameter['code']) == ''){
+				if (trim($attribute_parameter['code']) == '') {
 					$attribute_parameter['code'] = $attribute_parameter['frontend_label'];
 				}
 				$attribute_parameter['code'] = wpshop_tools::slugify(str_replace("\'", "_", str_replace('\"', "_", $attribute_parameter['code'])), array('noAccent', 'noSpaces', 'lowerCase', 'noPunctuation'));
 				$code_exists = self::getElement($attribute_parameter['code'], "'valid', 'moderated', 'deleted'", 'code');
-				if((is_object($code_exists) || is_array($code_exists)) && (count($code_exists) > 0)){
+				if ((is_object($code_exists) || is_array($code_exists)) && (count($code_exists) > 0)) {
 					$attribute_parameter['code'] = $attribute_parameter['code'] . '_' . (count($code_exists) + rand());
 				}
 				$actionResult = wpshop_database::save($attribute_parameter, self::getDbTable());
 				$id = $wpdb->insert_id;
 			}
-			else{
+			else {
 				$actionResult = 'userNotAllowedForActionAdd';
 			}
 		}
@@ -345,9 +345,9 @@ 
 		/************		CHANGE THE FIELD NAME TO TAKE TO DISPLAY				*************/
 		/************		CHANGE ERROR MESSAGE FOR SPECIFIC CASE					*************/
 		/****************************************************************************/
-		if($actionResult != ''){
+		if ($actionResult != '') {
 			$elementIdentifierForMessage = __('the attribute', 'wpshop');
-			if(!empty($attribute_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_parameter['frontend_label'] . '</span>';
+			if (!empty($attribute_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_parameter['frontend_label'] . '</span>';
 			if ($actionResult == 'error') {/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . sprintf(__('An error occured while saving %s', 'wpshop'), $elementIdentifierForMessage, ' -> ' . $wpdb->last_error);
 			}
@@ -359,11 +359,11 @@ 
 				$done_options_value = array();
 				$default_value = $attribute_parameter['default_value'];
 				$i = 1;
-				$options = !empty($_REQUEST['options']) ? (array) $_REQUEST['options'] : array();
-				$optionsValue = !empty($_REQUEST['optionsValue']) ? (array) $_REQUEST['optionsValue'] : array();
-				$optionsUpdate = !empty($_REQUEST['optionsUpdate']) ? (array) $_REQUEST['optionsUpdate'] : array();
-				$optionsUpdateValue = !empty($_REQUEST['optionsUpdateValue']) ? (array) $_REQUEST['optionsUpdateValue'] : array();
-				if ( !empty($optionsUpdate) ) {
+				$options = !empty($_REQUEST['options']) ? (array)$_REQUEST['options'] : array();
+				$optionsValue = !empty($_REQUEST['optionsValue']) ? (array)$_REQUEST['optionsValue'] : array();
+				$optionsUpdate = !empty($_REQUEST['optionsUpdate']) ? (array)$_REQUEST['optionsUpdate'] : array();
+				$optionsUpdateValue = !empty($_REQUEST['optionsUpdateValue']) ? (array)$_REQUEST['optionsUpdateValue'] : array();
+				if (!empty($optionsUpdate)) {
 					/**
 					 *	Check if there is an attribute code into sended request or if we have to get the code from database (Bug fix)
 					 */
@@ -377,25 +377,25 @@ 
 					foreach ($optionsUpdate as $option_key => $option_label) {
 						$option_value = !empty($optionsUpdateValue[$option_key]) ? str_replace(",", ".", $optionsUpdateValue[$option_key]) : '';
 
-						if ( empty($option_value) || !in_array($option_value, $done_options_value) ) {
+						if (empty($option_value) || !in_array($option_value, $done_options_value)) {
 							/*	Update an existing value only if the value does not exist into existing list	*/
 							$label = (($option_label != '') ? $option_label : str_replace(",", ".", $option_value));
 							$value = str_replace(",", ".", $option_value);
-							if( !WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT ) {
+							if (!WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT) {
 								$label = $option_label;
-								$value =  str_replace(",", ".", $label);
+								$value = str_replace(",", ".", $label);
 							}
 
 							$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('last_update_date' => current_time('mysql', 0), 'position' => $i, 'label' => stripslashes($label), 'value' => stripslashes($value)), array('id' => $option_key));
 							$done_options_value[] = str_replace(",", ".", $option_value);
 
 							/*	Check if this value is used for price calculation and make update on the different product using this value	*/
-							if($attribute_code == WPSHOP_PRODUCT_PRICE_TAX){
+							if ($attribute_code == WPSHOP_PRODUCT_PRICE_TAX) {
 								$action = wpshop_prices::mass_update_prices();
 							}
 						}
 
-						if($default_value == $option_key) {
+						if ($default_value == $option_key) {
 							/*	Update an existing a only if the value does not exist into existing list	*/
 							$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('last_update_date' => current_time('mysql', 0), 'default_value' => $option_key), array('id' => $id));
 							$done_options_value[] = str_replace(",", ".", $option_value);
@@ -403,13 +403,13 @@ 
 						$i++;
 					}
 				}
-				if ( !empty($options) ) {
-					foreach ( $options as $option_key => $option_label ) {
+				if (!empty($options)) {
+					foreach ($options as $option_key => $option_label) {
 						$option_value = !empty($optionsValue[$option_key]) ? str_replace(",", ".", $optionsValue[$option_key]) : sanitize_title($option_label);
 
 						/*	Check what value to use for the new values	*/
 						$label = (!empty($option_label) ? $option_label : str_replace(",", ".", $option_value));
-						if( !WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT && empty($option_value) ) {
+						if (!WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT && empty($option_value)) {
 							$label = $option_label;
 							$option_value = sanitize_title($label);
 						}
@@ -417,7 +417,7 @@ 
 						// If the optionsUpdateValue is empty, set it a empty array to avoid error calling the in_array() function
 						// $_REQUEST['optionsUpdateValue'] = !empty($_REQUEST['optionsUpdateValue']) ? $_REQUEST['optionsUpdateValue'] : array();
 
-						if (!in_array($option_value, $done_options_value) && !in_array($option_value, $optionsUpdateValue) ) {
+						if (!in_array($option_value, $done_options_value) && !in_array($option_value, $optionsUpdateValue)) {
 
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('creation_date' => current_time('mysql', 0), 'status' => 'valid', 'attribute_id' => $id, 'position' => $i, 'label' => stripslashes($label), 'value' => stripslashes($option_value)));
 							$done_options_value[] = str_replace(",", ".", $option_value);
@@ -435,19 +435,19 @@ 
 				}
 
 				// If the is_used_for_sort_by is mark as yes, we have to get out some attributes and save it separately
-				if( (!empty($attribute_parameter['is_used_for_sort_by']) && ($attribute_parameter['is_used_for_sort_by'] == 'yes')) || (!empty($attribute_parameter['is_filterable']) && ($attribute_parameter['is_filterable'] == 'yes')) || (!empty($attribute_parameter['is_searchable']) && ($attribute_parameter['is_searchable'] == 'yes')) ){
+				if ((!empty($attribute_parameter['is_used_for_sort_by']) && ($attribute_parameter['is_used_for_sort_by'] == 'yes')) || (!empty($attribute_parameter['is_filterable']) && ($attribute_parameter['is_filterable'] == 'yes')) || (!empty($attribute_parameter['is_searchable']) && ($attribute_parameter['is_searchable'] == 'yes'))) {
 					$attribute_code = $attribute_parameter['code'];
-					if(!isset($attribute_parameter['code']) || ($attribute_parameter['code'] == '')){
+					if (!isset($attribute_parameter['code']) || ($attribute_parameter['code'] == '')) {
 						$attribute = self::getElement($id, "'valid', 'moderated', 'notused'", 'id');
 						$attribute_code = $attribute->code;
 					}
 
 					$count_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-					for( $i = 0; $i <= $count_products->publish; $i+= 20 ) {
-						$query = $wpdb->prepare( 'SELECT * FROM '. $wpdb->posts .' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT '.$i.', 20', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish' );
-						$products = $wpdb->get_results( $query );
-						if ( !empty($products) ) {
-							foreach( $products as $product ) {
+					for ($i = 0; $i <= $count_products->publish; $i += 20) {
+						$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT ' . $i . ', 20', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
+						$products = $wpdb->get_results($query);
+						if (!empty($products)) {
+							foreach ($products as $product) {
 								$query = $wpdb->prepare("SELECT value FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attribute_parameter['data_type'] . " WHERE attribute_id = %d AND entity_type_id = %d AND entity_id = %d AND value != '' ORDER BY creation_date_value DESC", $id, $attribute_parameter['entity_id'], $product->ID);
 								$value = $wpdb->get_var($query);
 								update_post_meta($product->ID, '_' . $attribute_code, $value);
@@ -457,13 +457,13 @@ 
 					wp_reset_query();
 				}
 
-				if ( $pageAction != 'delete' ) {/*	Add the new attribute in the additionnal informations attribute group	*/
-					if ( !empty($set_section) ) {
+				if ($pageAction != 'delete') {/*	Add the new attribute in the additionnal informations attribute group	*/
+					if (!empty($set_section)) {
 						$choosen_set_section = explode('_', $set_section);
 						$set_id = $choosen_set_section[0];
 						$group_id = $choosen_set_section[1];
 					}
-					else{
+					else {
 						$attribute_current_attribute_set = 0;
 						$query = $wpdb->prepare("
 								SELECT id
@@ -473,7 +473,7 @@ 
 									AND ATTRIBUTE_SET_DETAILS.entity_type_id = %d", $id, $attribute_parameter['entity_id']);
 						$attribute_current_attribute_set = $wpdb->get_results($query);
 
-						if ( empty($attribute_current_attribute_set) ) {
+						if (empty($attribute_current_attribute_set)) {
 							$query = $wpdb->prepare("
 								SELECT
 									(
@@ -494,12 +494,12 @@ 
 							$wpshop_default_group = $wpdb->get_row($query);
 
 							$set_id = $wpshop_default_group->attribute_set_id;
-							$default_group_id = ( !empty( $wpshop_default_group->default_attribute_group_id) ) ? $wpshop_default_group->default_attribute_group_id : '';
+							$default_group_id = (!empty($wpshop_default_group->default_attribute_group_id)) ? $wpshop_default_group->default_attribute_group_id : '';
 							$group_id = !empty($default_group_id) ? $default_group_id : $wpshop_default_group->attribute_group_id;
 						}
 					}
 
-					if ( !empty($set_id) && !empty($group_id) ) {
+					if (!empty($set_id) && !empty($group_id)) {
 						$query = $wpdb->prepare(
 								"SELECT (MAX(position) + 1) AS position
 								FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . "
@@ -511,12 +511,12 @@ 
 								$attribute_parameter['entity_id']
 						);
 						$wpshopAttributePosition = $wpdb->get_var($query);
-						if($wpshopAttributePosition == 0)$wpshopAttributePosition = 1;
+						if ($wpshopAttributePosition == 0)$wpshopAttributePosition = 1;
 						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attribute_parameter['entity_id'], 'attribute_set_id' => $set_id, 'attribute_group_id' => $group_id, 'attribute_id' => $id, 'position' => $wpshopAttributePosition));
 					}
 				}
 
-				if ( !empty($wpshop_attribute_combo_values_list_order_def) ) {
+				if (!empty($wpshop_attribute_combo_values_list_order_def)) {
 					$post_order = explode(',', $wpshop_attribute_combo_values_list_order_def);
 					$position = 1;
 					foreach ($post_order as $post_id) {
@@ -532,19 +532,19 @@ 
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=saveok&saveditem=" . $id));
 				}
 				else */
-				if ( $pageAction == 'add' )
+				if ($pageAction == 'add')
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
-				elseif ( $pageAction == 'delete' )
+				elseif ($pageAction == 'delete')
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=deleteok&saveditem=" . $id));
 			}
-			elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete')){
+			elseif (($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete')) {
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('You are not allowed to do this action', 'wpshop');
 			}
-			elseif(($actionResult == 'unDeletableAtribute')){
+			elseif (($actionResult == 'unDeletableAtribute')) {
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('This attribute could not be deleted due to configuration', 'wpshop');
 			}
 
-			if(empty($attribute_parameter['frontend_label']) && ($pageAction!='delete')){
+			if (empty($attribute_parameter['frontend_label']) && ($pageAction != 'delete')) {
 				$pageMessage .= __('Please enter an label for the attribut', 'wpshop');
 			}
 		}
@@ -562,37 +562,37 @@ 
 		//Create an instance of our package class...
 		$wpshop_list_table = new wpshop_attributes_custom_List_table();
 		//Fetch, prepare, sort, and filter our data...
-		$status="'valid'";
-		$attribute_status = !empty($_REQUEST['attribute_status']) ? sanitize_text_field( $_REQUEST['attribute_status'] ) : null;
-		$s = !empty($_REQUEST['s']) ? sanitize_text_field( $_REQUEST['s'] ) : null;
+		$status = "'valid'";
+		$attribute_status = !empty($_REQUEST['attribute_status']) ? sanitize_text_field($_REQUEST['attribute_status']) : null;
+		$s = !empty($_REQUEST['s']) ? sanitize_text_field($_REQUEST['s']) : null;
 		$order = !empty($_REQUEST['order']) ? sanitize_text_field($_REQUEST['order']) : null;
 		$orderby = !empty($_REQUEST['orderby']) ? sanitize_text_field($_REQUEST['orderby']) : null;
-		if(!empty($attribute_status)){
-			switch($attribute_status){
+		if (!empty($attribute_status)) {
+			switch ($attribute_status) {
 				case 'unactive':
-					$status="'moderated', 'notused'";
-					if(empty($order_by) && empty($order)){
+					$status = "'moderated', 'notused'";
+					if (empty($order_by) && empty($order)) {
 						// @TODO : REQUEST
 						// $_REQUEST['orderby']='status';
 						// $_REQUEST['order']='asc';
 					}
 					break;
 				default:
-					$status="'".sanitize_text_field($_REQUEST['attribute_status'])."'";
+					$status = "'" . sanitize_text_field($_REQUEST['attribute_status']) . "'";
 					break;
 			}
 		}
-		if ( !empty($s) ) {
-			$query = $wpdb->prepare("SELECT * FROM " . self::dbTable . ' WHERE frontend_label LIKE "%%%1$s%%" OR frontend_label LIKE "%%%2$s%%" AND backend_label LIKE "%%%1$s%%" OR backend_label LIKE "%%%2$s%%" AND code LIKE "%%%1$s%%" OR code LIKE "%%%2$s%%"', $s, __($s, 'wpshop') );
-			$attr_set_list = $wpdb->get_results( $query );
+		if (!empty($s)) {
+			$query = $wpdb->prepare("SELECT * FROM " . self::dbTable . ' WHERE frontend_label LIKE "%%%1$s%%" OR frontend_label LIKE "%%%2$s%%" AND backend_label LIKE "%%%1$s%%" OR backend_label LIKE "%%%2$s%%" AND code LIKE "%%%1$s%%" OR code LIKE "%%%2$s%%"', $s, __($s, 'wpshop'));
+			$attr_set_list = $wpdb->get_results($query);
 		}
 		else {
-			$attr_set_list = self::getElement( '', $status );
+			$attr_set_list = self::getElement('', $status);
 		}
-		$i=0;
-		$attribute_set_list=array();
-		foreach($attr_set_list as $attr_set){
-			if(!empty($attr_set->id) && ($attr_set->code != 'product_attribute_set_id') ){
+		$i = 0;
+		$attribute_set_list = array();
+		foreach ($attr_set_list as $attr_set) {
+			if (!empty($attr_set->id) && ($attr_set->code != 'product_attribute_set_id')) {
 				$attribute_set_list[$i]['id'] = $attr_set->id;
 				$attribute_set_list[$i]['name'] = $attr_set->frontend_label;
 				$attribute_set_list[$i]['status'] = $attr_set->status;
@@ -640,31 +640,31 @@ 
 		global $attribute_displayed_field, $attribute_options_group;
 		$dbFieldList = wpshop_database::fields_to_input(self::getDbTable());
 		$editedItem = '';
-		if($itemToEdit != '')
+		if ($itemToEdit != '')
 			$editedItem = self::getElement($itemToEdit);
 
 		$the_form_content_hidden = $the_form_general_content = '';
 		$the_form_option_content_list = array();
-		foreach($dbFieldList as $input_key => $input_def){
+		foreach ($dbFieldList as $input_key => $input_def) {
 
-			if(!isset($attribute_displayed_field) || !is_array($attribute_displayed_field) || in_array($input_def['name'], $attribute_displayed_field)){
+			if (!isset($attribute_displayed_field) || !is_array($attribute_displayed_field) || in_array($input_def['name'], $attribute_displayed_field)) {
 				$input_def['label'] = $input_def['name'];
-				$input_def_id=$input_def['id']='wpshop_' . self::currentPageCode . '_edition_table_field_id_'.$input_def['label'];
+				$input_def_id = $input_def['id'] = 'wpshop_' . self::currentPageCode . '_edition_table_field_id_' . $input_def['label'];
 
 				$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : '';
 				$requestFormValue = isset($_REQUEST[self::currentPageCode][$input_def['label']]) ? sanitize_text_field($_REQUEST[self::currentPageCode][$input_def['label']]) : '';
 				$currentFieldValue = $input_def['value'];
-				if(is_object($editedItem))
+				if (is_object($editedItem))
 					$currentFieldValue = $editedItem->{$input_def['label']};
-				elseif(($pageAction != '') && ($requestFormValue != ''))
+				elseif (($pageAction != '') && ($requestFormValue != ''))
 					$currentFieldValue = $requestFormValue;
 
-				if($input_def['label'] == 'status'){
-					if(in_array('notused', $input_def['possible_value'])){
+				if ($input_def['label'] == 'status') {
+					if (in_array('notused', $input_def['possible_value'])) {
 						$key = array_keys($input_def['possible_value'], 'notused');
 						unset($input_def['possible_value'][$key[0]]);
 					}
-					if(in_array('dbl', $input_def['possible_value'])){
+					if (in_array('dbl', $input_def['possible_value'])) {
 						$key = array_keys($input_def['possible_value'], 'dbl');
 						unset($input_def['possible_value'][$key[0]]);
 					}
@@ -672,94 +672,94 @@ 
 					$input_def['type'] = 'checkbox';
 					$input_def['label'] = __('Use this attribute', 'wpshop');
 					$input_def['possible_value'] = array('valid');
-					$input_def_id.='_valid';
-					$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for using this attribute', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+					$input_def_id .= '_valid';
+					$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for using this attribute', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 				}
 
-				if ( (substr($input_def['label'], 0, 3) == 'is_') || ( $input_def['label'] == '_display_informations_about_value') ) {
+				if ((substr($input_def['label'], 0, 3) == 'is_') || ($input_def['label'] == '_display_informations_about_value')) {
 					$input_def['type'] = 'checkbox';
 					$input_def['possible_value'] = 'yes';
 				}
-				switch($input_def['label']){
+				switch ($input_def['label']) {
 					case 'is_requiring_unit':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for using unit with this attribute', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for using unit with this attribute', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_visible_in_front':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for displaying this attribute in shop', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for displaying this attribute in shop', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_visible_in_front_listing':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for displaying this attribute in product listing in shop', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for displaying this attribute in product listing in shop', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_used_for_sort_by':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for displaying this attribute into sortbar', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for displaying this attribute into sortbar', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_searchable':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for including values of this attribute as search parameter', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for including values of this attribute as search parameter', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_visible_in_advanced_search':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for using in advanced search form', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for using in advanced search form', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'frontend_css_class':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Separate with a space each CSS Class', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Separate with a space each CSS Class', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'backend_css_class':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Separate with a space each CSS Class', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Separate with a space each CSS Class', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_historisable':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if you want to save the different value this attribute, each time it is modified', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if you want to save the different value this attribute, each time it is modified', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_filterable':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if you want to use this attribute in the filter search', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if you want to use this attribute in the filter search', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_intrinsic':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if this attribute is intrinsic for a product', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if this attribute is intrinsic for a product', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_used_for_variation':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if this attribute is used for variation. It means that the user would be able to choose a value in frontend', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if this attribute is used for variation. It means that the user would be able to choose a value in frontend', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_used_in_variation':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if you want to use this attribute for variation definition', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
-						if ( !empty($editedItem) && ($editedItem->is_used_for_variation == 'yes') ) {
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if you want to use this attribute for variation definition', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
+						if (!empty($editedItem) && ($editedItem->is_used_for_variation == 'yes')) {
 							$input_def['option'] = 'disabled="disabled"';
 						}
 					break;
 					case 'is_user_defined':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if you want your customer to choose a value for this attribute into frontend product', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if you want your customer to choose a value for this attribute into frontend product', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 				}
 
 				$input_def['value'] = $currentFieldValue;
-				if($input_def['label'] == 'code')
+				if ($input_def['label'] == 'code')
 					$input_def['type'] = 'hidden';
-				elseif($input_def['label'] == 'entity_id'){
+				elseif ($input_def['label'] == 'entity_id') {
 					$input_def['possible_value'] = wpshop_entities::get_entities_list();
 					$input_def['valueToPut'] = 'index';
 					$input_def['type'] = 'select';
 
-					$i=0;
-					foreach($input_def['possible_value'] as $entity_id => $entity_name) {
-						if($i <= 0){
+					$i = 0;
+					foreach ($input_def['possible_value'] as $entity_id => $entity_name) {
+						if ($i <= 0) {
 							$current_entity_id = $entity_id;
 						}
 						$i++;
 					}
 				}
-				elseif($input_def['label'] == '_unit_group_id'){
+				elseif ($input_def['label'] == '_unit_group_id') {
 					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_group();
 					$input_def['type'] = 'select';
 				}
-				elseif($input_def['label'] == '_default_unit'){
+				elseif ($input_def['label'] == '_default_unit') {
 					$unit_group_list = wpshop_attributes_unit::get_unit_group();
-					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group(!empty($editedItem->_unit_group_id)?$editedItem->_unit_group_id:(!empty($unit_group_list)?$unit_group_list[0]->id:''));
+					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group(!empty($editedItem->_unit_group_id) ? $editedItem->_unit_group_id : (!empty($unit_group_list) ? $unit_group_list[0]->id : ''));
 					$input_def['type'] = 'select';
 				}
 				elseif ($input_def['label'] == 'backend_input') {
-					if ( !is_object($editedItem) ) {
+					if (!is_object($editedItem)) {
 						$input_def['type'] = 'hidden';
 					}
 					else {
 						$new_possible_value = array();
-						switch ( $editedItem->data_type) {
+						switch ($editedItem->data_type) {
 							case 'integer':
 								$new_possible_value[__('Checkbox', 'wpshop')] = 'checkbox';
 								$new_possible_value[__('Radio button', 'wpshop')] = 'radio';
@@ -767,7 +767,7 @@ 
 								$new_possible_value[__('multiple-select', 'wpshop')] = 'multiple-select';
 								break;
 							case 'varchar':
-								switch ( $input_def['value'] ) {
+								switch ($input_def['value']) {
 									case 'hidden':
 										$new_possible_value[__('Hidden field', 'wpshop')] = 'hidden_field';
 										break;
@@ -795,8 +795,8 @@ 
 				elseif ($input_def['label'] == 'frontend_input') {
 					$new_possible_value = array();
 
-					if ( is_object($editedItem) ) {
-						switch ( $editedItem->data_type) {
+					if (is_object($editedItem)) {
+						switch ($editedItem->data_type) {
 							case 'integer':
 								$new_possible_value[__('Checkbox', 'wpshop')] = 'checkbox';
 								$new_possible_value[__('Radio button', 'wpshop')] = 'radio';
@@ -804,7 +804,7 @@ 
 								$new_possible_value[__('multiple-select', 'wpshop')] = 'multiple-select';
 								break;
 							case 'varchar':
-									switch ( $input_def['value'] ) {
+									switch ($input_def['value']) {
 										case 'hidden':
 											$new_possible_value[__('Hidden field', 'wpshop')] = 'hidden_field';
 										break;
@@ -842,10 +842,10 @@ 
 
 					$input_def['possible_value'] = $new_possible_value;
 
-					if ( !empty($editedItem->frontend_input) ) {
-						switch ( $editedItem->frontend_input ) {
+					if (!empty($editedItem->frontend_input)) {
+						switch ($editedItem->frontend_input) {
 							case 'text':
-								switch ( $editedItem->data_type ) {
+								switch ($editedItem->data_type) {
 									case 'varchar':
 										$input_def['value'] = 'short_text';
 									break;
@@ -870,7 +870,7 @@ 
 					}
 				}
 
-				if(is_object($editedItem) && (($input_def['label'] == 'code') || ($input_def['label'] == 'data_type') || ($input_def['label'] == 'entity_id'))){
+				if (is_object($editedItem) && (($input_def['label'] == 'code') || ($input_def['label'] == 'data_type') || ($input_def['label'] == 'entity_id'))) {
 					// $input_def['type'] = 'hidden';
 					$input_def['option'] = ' disabled="disabled" ';
 					$the_form_content_hidden .= '<input type="hidden" name="' . self::getDbTable() . '[' . $input_def['name'] . ']" value="' . $input_def['value'] . '" />';
@@ -881,16 +881,16 @@ 
 				$input_def['value'] = str_replace("\\", "", $input_def['value']);
 
 				$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
-				if ( $input_def['label'] == 'default_value' ) {
-					if ( !empty($editedItem->frontend_input) ) {
-						switch ( $editedItem->frontend_input ) {
+				if ($input_def['label'] == 'default_value') {
+					if (!empty($editedItem->frontend_input)) {
+						switch ($editedItem->frontend_input) {
 							case 'text':
 								$input_def['type'] = 'text';
-								switch ( $editedItem->data_type ) {
+								switch ($editedItem->data_type) {
 									case 'datetime':
-										$the_input = wpshop_attributes::attribute_type_date_config( unserialize($input_def['value']) );
+										$the_input = wpshop_attributes::attribute_type_date_config(unserialize($input_def['value']));
 
-										$input_def['label'] = __('Date field configuration','wpshop');
+										$input_def['label'] = __('Date field configuration', 'wpshop');
 									break;
 									default:
 										$the_input = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
@@ -907,7 +907,7 @@ 
 							case 'multiple-select':
 							case 'radio':
 							case 'checkbox':
-								$input_def['label'] = __('Options list for attribute','wpshop') . '
+								$input_def['label'] = __('Options list for attribute', 'wpshop') . '
 <div class="alignright wpshop_change_select_data_type" >
 	+' . __('Change data type for this attribute', 'wpshop') . '
 </div>';
@@ -921,50 +921,50 @@ 
 						}
 					}
 					else {
-						$input_def['type']='text';
+						$input_def['type'] = 'text';
 						$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
 					}
 				}
-				if( $input_def['label'] == '_unit_group_id') {
+				if ($input_def['label'] == '_unit_group_id') {
 					$the_input .= '<div id="wpshop_loader_input_group_unit"></div>';
-					$the_input .= '<a class="button-primary" href="#wpshop_unit_group_list" id="wpshop_attribute_group_unit_manager_opener" data-nonce="' . wp_create_nonce( 'load_unit_interface' ) . '">'.__('Manage group unit', 'wpshop').'</a>';
+					$the_input .= '<a class="button-primary" href="#wpshop_unit_group_list" id="wpshop_attribute_group_unit_manager_opener" data-nonce="' . wp_create_nonce('load_unit_interface') . '">' . __('Manage group unit', 'wpshop') . '</a>';
 				}
 
-				if( $input_def['label'] == '_default_unit') {
+				if ($input_def['label'] == '_default_unit') {
 					$the_input .= '<div id="wpshop_loader_input_unit"></div>';
-					$the_input .= '<a class="button-primary" href="#wpshop_unit_list" id="wpshop_attribute_unit_manager_opener" data-nonce="' . wp_create_nonce( 'load_unit_interface' ) . '">'.__('Manage units', 'wpshop').'</a>';
+					$the_input .= '<a class="button-primary" href="#wpshop_unit_list" id="wpshop_attribute_unit_manager_opener" data-nonce="' . wp_create_nonce('load_unit_interface') . '">' . __('Manage units', 'wpshop') . '</a>';
 					$the_input .= '<input type="hidden" name="input_wpshop_load_attribute_unit_list" id="input_wpshop_load_attribute_unit_list" value="' . wp_create_nonce("wpshop_load_attribute_unit_list") . '" />';
 					$the_input .= '<div id="wpshop_attribute_unit_manager" title="' . __('Unit management', 'wpshop') . '" class="wpshopHide" ><div class="loading_picture_container" id="product_chooser_picture" ><img src="' . WPSHOP_LOADING_ICON . '" alt="loading..." /></div></div>';
 				}
 
 
-				if($input_def['type'] != 'hidden'){
-					if ( ($input_def['label'] == 'entity_id') && is_object($editedItem) ) {
+				if ($input_def['type'] != 'hidden') {
+					if (($input_def['label'] == 'entity_id') && is_object($editedItem)) {
 						$the_input .= '<br/><span class="wpshop_duplicate_attribute" >' . __('Duplicate this attribute to . another entity', 'wpshop') . '</span>';
 					}
 					$input = '
-		<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_'.$input_def['name'].'" >
-			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_'.$input_def['name'].'" ><label for="'.$input_def_id.'" >' . __($input_def['label'], 'wpshop') . '</label></td>
-			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_input wpshop_' . self::currentPageCode . '_edition_table_field_input_'.$input_def['name'].'" >' . $the_input . '</td>
+		<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_' . $input_def['name'] . '" >
+			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_' . $input_def['name'] . '" ><label for="' . $input_def_id . '" >' . __($input_def['label'], 'wpshop') . '</label></td>
+			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_input wpshop_' . self::currentPageCode . '_edition_table_field_input_' . $input_def['name'] . '" >' . $the_input . '</td>
 		</tr>';
-					if ( (substr($input_def['label'], 0, 3) == 'is_') || (substr($input_def['label'], 0, 1) == '_') || in_array($input_def['label'], unserialize( WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS )) )
+					if ((substr($input_def['label'], 0, 3) == 'is_') || (substr($input_def['label'], 0, 1) == '_') || in_array($input_def['label'], unserialize(WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS)))
 						$the_form_option_content_list[$input_def['label']] = $input;
 					else {
 						$the_form_general_content .= $input;
-						if ( ($input_def['label'] == 'frontend_input') && !is_object($editedItem) ) {
+						if (($input_def['label'] == 'frontend_input') && !is_object($editedItem)) {
 
-							$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id,  self::getDbTable(), self::currentPageCode);
+							$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id, self::getDbTable(), self::currentPageCode);
 
 							$input = '
 		<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_set_section" >
-			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_set_section" ><label for="'.self::currentPageCode.'_set_section" >' . __('Affect this new attribute to the set section', 'wpshop') . '</label></td>
+			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_set_section" ><label for="' . self::currentPageCode . '_set_section" >' . __('Affect this new attribute to the set section', 'wpshop') . '</label></td>
 			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_input wpshop_' . self::currentPageCode . '_edition_table_field_input_set_section" >' . $the_input . '</td>
 		</tr>';
 							$the_form_general_content .= $input;
 						}
 					}
 				}
-				else{
+				else {
 					$the_form_content_hidden .= '
 				' . $the_input;
 				}
@@ -980,17 +980,17 @@ 
 		$section_content = $the_form_general_content;
 
 		ob_start();
-		include(WPSHOP_TEMPLATES_DIR.'admin/admin_box_section.tpl.php');
+		include(WPSHOP_TEMPLATES_DIR . 'admin/admin_box_section.tpl.php');
 		$the_form_general_content = ob_get_contents();
 		ob_end_clean();
 
 		/** It is attribute TVA, add a button to calcilate price in mass **/
-		if ( !empty($editedItem) && !empty($editedItem->code) && $editedItem->code == 'tx_tva' ) {
-			$the_form_general_content .= '<input type="button" data-nonce="' . wp_create_nonce( 'wps_update_products_prices' ) . '" id="wps_update_price_infos" value="' .__('Update all products price', 'wpshop').'" /> <img src="' .WPSHOP_LOADING_ICON. '" alt="" id="update_products_loader" /> <br/>';
-			$the_form_general_content .= __('If you have updated your VAT rates, save it and update your products price after', 'wpshop' );
+		if (!empty($editedItem) && !empty($editedItem->code) && $editedItem->code == 'tx_tva') {
+			$the_form_general_content .= '<input type="button" data-nonce="' . wp_create_nonce('wps_update_products_prices') . '" id="wps_update_price_infos" value="' . __('Update all products price', 'wpshop') . '" /> <img src="' . WPSHOP_LOADING_ICON . '" alt="" id="update_products_loader" /> <br/>';
+			$the_form_general_content .= __('If you have updated your VAT rates, save it and update your products price after', 'wpshop');
 		}
 		if (!empty($the_form_option_content_list)) {
-			$the_form_option_content_section='';
+			$the_form_option_content_section = '';
 			foreach ($attribute_options_group as $group_name => $group_content) {
 				$section_content = '';
 				foreach ($group_content as $group_code) {
@@ -999,23 +999,23 @@ 
 						unset($the_form_option_content_list[$group_code]);
 					}
 				}
-				$section_legend = __($group_name,'wpshop');
+				$section_legend = __($group_name, 'wpshop');
 				$section_page_code = self::currentPageCode;
 
 				ob_start();
-				include(WPSHOP_TEMPLATES_DIR.'admin/admin_box_section.tpl.php');
+				include(WPSHOP_TEMPLATES_DIR . 'admin/admin_box_section.tpl.php');
 				$the_form_option_content_section .= ob_get_contents();
 				ob_end_clean();
 			}
 
 			/*	Check there are other attributes to display not in defined group	*/
 			if (!empty($the_form_option_content_list)) {
-				$section_legend = __('General options','wpshop');
+				$section_legend = __('General options', 'wpshop');
 				$section_content = implode('', $the_form_option_content_list);
 				$section_page_code = self::currentPageCode;
 
 				ob_start();
-				include(WPSHOP_TEMPLATES_DIR.'admin/admin_box_section.tpl.php');
+				include(WPSHOP_TEMPLATES_DIR . 'admin/admin_box_section.tpl.php');
 				$the_form_option_content = ob_get_contents();
 				ob_end_clean();
 
@@ -1025,17 +1025,17 @@ 
 		}
 
 		/*	Default content for the current page	*/
-		$bloc_list[self::currentPageCode]['main_info']['title']=__('Main informations', 'wpshop');
+		$bloc_list[self::currentPageCode]['main_info']['title'] = __('Main informations', 'wpshop');
 		$bloc_list[self::currentPageCode]['main_info']['content'] = $the_form_general_content;
 
-		$bloc_list[self::currentPageCode]['options']['title']=__('Options', 'wpshop');
-		$bloc_list[self::currentPageCode]['options']['content']=$the_form_option_content;
+		$bloc_list[self::currentPageCode]['options']['title'] = __('Options', 'wpshop');
+		$bloc_list[self::currentPageCode]['options']['content'] = $the_form_option_content;
 
-		$action = !empty( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action' ] ) : '';
+		$action = !empty($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
 		$the_form = '
 <form name="' . self::getDbTable() . '_form" id="' . self::getDbTable() . '_form" method="post" action="#" >
-	' . wpshop_form::form_input(self::getDbTable() . '_action', self::getDbTable() . '_action', (isset($action) && ($action != '') ? sanitize_text_field($action) : 'save') , 'hidden') . '
-	' . wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no' , 'hidden') . $the_form_content_hidden . wpshop_display::custom_page_output_builder($bloc_list, WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT) . '
+	' . wpshop_form::form_input(self::getDbTable() . '_action', self::getDbTable() . '_action', (isset($action) && ($action != '') ? sanitize_text_field($action) : 'save'), 'hidden') . '
+	' . wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no', 'hidden') . $the_form_content_hidden . wpshop_display::custom_page_output_builder($bloc_list, WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT) . '
 </form>
 <div title="' . __('Change data type for selected attribute', 'wpshop') . '" id="wpshop_dialog_change_select_data_type" ><div id="wpshop_dialog_change_select_data_type_container" ></div></div>';
 		$input_def['possible_value'] = wpshop_entities::get_entities_list();
@@ -1053,7 +1053,7 @@ 
 		$the_form .= '
 <script type="text/javascript" >
 	wpshop(document).ready(function(){
-		wpshopMainInterface("'.self::getDbTable().'", "' . __('Are you sure you want to quit this page? You will loose all current modification', 'wpshop') . '", "' . __('Are you sure you want to delete this attributes group?', 'wpshop') . '");
+		wpshopMainInterface("'.self::getDbTable() . '", "' . __('Are you sure you want to quit this page? You will loose all current modification', 'wpshop') . '", "' . __('Are you sure you want to delete this attributes group?', 'wpshop') . '");
 
 		jQuery("#wpshop_dialog_duplicate_attribute").dialog({
 			autoOpen: false,
@@ -1063,7 +1063,7 @@ 
 			dialogClass: "wpshop_uidialog_box",
 			resizable: false,
 			buttons:{
-				"'.__('Duplicate', 'wpshop').'": function(){
+				"'.__('Duplicate', 'wpshop') . '": function(){
 					var data = {
 						action: "wpshop_duplicate_attribute",
 						wpshop_ajax_nonce: "' . wp_create_nonce("wpshop_duplicate_attribute") . '",
@@ -1079,7 +1079,7 @@ 
 						}
 					}, "json");
 				},
-				"'.__('Cancel', 'wpshop').'": function(){
+				"'.__('Cancel', 'wpshop') . '": function(){
 					jQuery(this).dialog("close");
 					jQuery(".wpshop_duplicate_attribute_result").remove();
 				}
@@ -1097,7 +1097,7 @@ 
 			dialogClass: "wpshop_uidialog_box",
 			resizable: false,
 			buttons:{
-				"'.__('Change type', 'wpshop').'": function(){
+				"'.__('Change type', 'wpshop') . '": function(){
 					var delete_entity = false;
 					if(jQuery("#delete_entity").is(":checked")){
 						var delete_entity = true;
@@ -1120,7 +1120,7 @@ 
 						jQuery("#wpshop_dialog_change_select_data_type").dialog("close");
 					}, "json");
 				},
-				"'.__('Cancel', 'wpshop').'": function(){
+				"'.__('Cancel', 'wpshop') . '": function(){
 					jQuery(this).dialog("close");
 				}
 			}
@@ -1160,7 +1160,7 @@ 
 			change_unit_list();
 		});';
 
-		if ( !is_object($editedItem) )  {
+		if (!is_object($editedItem)) {
 			$the_form .= '
 		jQuery("#wpshop_attributes_edition_table_field_id_frontend_input").change(function(){
 			jQuery(".wpshop_attributes_edition_table_field_input_default_value").html(jQuery("#wpshopLoadingPicture").html());
@@ -1243,23 +1243,23 @@ 
 	 *
 	 *	@return string $currentPageButton The html output code with the different button to add to the interface
 	 */
-	function getPageFormButton($element_id = 0){
+	function getPageFormButton($element_id = 0) {
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : 'add';
 		$currentPageButton = '';
 
 		 //$currentPageButton .= '<h2 class="cancelButton alignleft" ><a href="' . admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . self::getListingSlug()) . '" class="button add-new-h2" >' . __('Back', 'wpshop') . '</a></h2>';
 
-		if(($action == 'add') && (current_user_can('wpshop_add_attributes')))
+		if (($action == 'add') && (current_user_can('wpshop_add_attributes')))
 			$currentPageButton .= '<input type="button" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
 
-		elseif(current_user_can('wpshop_edit_attributes'))
+		elseif (current_user_can('wpshop_edit_attributes'))
 		$currentPageButton .= '<input type="button" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
 
 		$attribute_undeletable = unserialize(WPSHOP_ATTRIBUTE_UNDELETABLE);
 		$attribute = self::getElement($element_id, "'valid', 'moderated', 'notused'", 'id');
-		$attribute_code = !empty($attribute->code)?$attribute->code:'';
-		if(current_user_can('wpshop_delete_attributes') && ($action != 'add') && !in_array($attribute_code, $attribute_undeletable))
-			$currentPageButton .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_'.self::currentPageCode.'" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
+		$attribute_code = !empty($attribute->code) ? $attribute->code : '';
+		if (current_user_can('wpshop_delete_attributes') && ($action != 'add') && !in_array($attribute_code, $attribute_undeletable))
+			$currentPageButton .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_' . self::currentPageCode . '" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
 
 		return $currentPageButton;
 	}
@@ -1273,22 +1273,22 @@ 
 	 *
 	 *	@return object $element_list A wordpress database object containing the attribute list
 	 */
-	public static function getElement($element_id = '', $element_status = "'valid', 'moderated', 'notused'", $field_to_search = 'id', $list = false){
+	public static function getElement($element_id = '', $element_status = "'valid', 'moderated', 'notused'", $field_to_search = 'id', $list = false) {
 
 		global $wpdb;
 		$element_list = array();
 		$moreQuery = "";
-		$moreArgs = array( 1, );
+		$moreArgs = array(1,);
 
-		$orderby = !empty( $_REQUEST['orderby'] ) ? sanitize_text_field( $_REQUEST['orderby'] ) : '';
-		$order = !empty( $_REQUEST['order'] ) ? sanitize_text_field( $_REQUEST['order'] ) : '';
+		$orderby = !empty($_REQUEST['orderby']) ? sanitize_text_field($_REQUEST['orderby']) : '';
+		$order = !empty($_REQUEST['order']) ? sanitize_text_field($_REQUEST['order']) : '';
 
-		if($element_id != ''){
+		if ($element_id != '') {
 			$moreQuery .= "
 					AND CURRENT_ELEMENT." . $field_to_search . " = %s ";
 			$moreArgs[] = $element_id;
 		}
-		if(!empty($orderby) && !empty($order)){
+		if (!empty($orderby) && !empty($order)) {
 			$moreQuery .= "
 					ORDER BY " . $orderby . "  " . $order;
 		}
@@ -1297,15 +1297,15 @@ 
 			"SELECT CURRENT_ELEMENT.*, ENTITIES.post_name as entity
 			FROM " . self::getDbTable() . " AS CURRENT_ELEMENT
 			INNER JOIN {$wpdb->posts} AS ENTITIES ON (ENTITIES.ID = CURRENT_ELEMENT.entity_id)
-			WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status.") " . $moreQuery,
+			WHERE %d AND CURRENT_ELEMENT.status IN (" . $element_status . ") " . $moreQuery,
 			$moreArgs
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if(($element_id == '') || $list){
+		if (($element_id == '') || $list) {
 			$element_list = $wpdb->get_results($query);
 		}
-		else{
+		else {
 			$element_list = $wpdb->get_row($query);
 		}
 
@@ -1327,8 +1327,8 @@ 
 		$user_id = function_exists('is_user_logged_in') && is_user_logged_in() ? get_current_user_id() : '0';
 		$sent_attribute_list = array();
 
-		if ( !empty($attributeToSet) ) {
-			$attributeToSet = apply_filters( 'save_attribute_for_entity', $attributeToSet, $entityTypeId, $entityId );
+		if (!empty($attributeToSet)) {
+			$attributeToSet = apply_filters('save_attribute_for_entity', $attributeToSet, $entityTypeId, $entityId);
 			$old_attribute_to_set = $attributeToSet;
 			$attribute_setted = array();
 			foreach ($attributeToSet as $attributeType => $attributeTypeDetails) {
@@ -1337,39 +1337,39 @@ 
 					'entity_id' => $entityId,
 					'entity_type_id' => $entityTypeId
 				);
-				if ( WPSHOP_ATTRIBUTE_VALUE_PER_USER ) {
+				if (WPSHOP_ATTRIBUTE_VALUE_PER_USER) {
 					$delete_current_attribute_values_params['user_id'] = $user_id;
 				}
 
-				if(!empty($attributeTypeDetails) && is_array($attributeTypeDetails)) {
-					$attributeTypeDetails = apply_filters( "save_attribute_for_entity_{$attributeType}", $attributeTypeDetails, $entityTypeId, $entityId );
-					foreach($attributeTypeDetails as $attribute_code => $attributeValue) {
-						$attributeValue = apply_filters( "save_attribute_for_entity_{$attributeType}_{$attribute_code}", apply_filters( "save_attribute_for_entity__{$attribute_code}", $attributeValue, $entityTypeId, $entityId ), $entityTypeId, $entityId );
+				if (!empty($attributeTypeDetails) && is_array($attributeTypeDetails)) {
+					$attributeTypeDetails = apply_filters("save_attribute_for_entity_{$attributeType}", $attributeTypeDetails, $entityTypeId, $entityId);
+					foreach ($attributeTypeDetails as $attribute_code => $attributeValue) {
+						$attributeValue = apply_filters("save_attribute_for_entity_{$attributeType}_{$attribute_code}", apply_filters("save_attribute_for_entity__{$attribute_code}", $attributeValue, $entityTypeId, $entityId), $entityTypeId, $entityId);
 						$old_attribute_value = $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;
 						}
 						$more_query_params_values = array();
-						if($attribute_code != 'unit') {
+						if ($attribute_code != 'unit') {
 
 							$unit_id = 0;
-							if(isset($attributeTypeDetails['unit'][$attribute_code])){
+							if (isset($attributeTypeDetails['unit'][$attribute_code])) {
 								$unit_id = $attributeTypeDetails['unit'][$attribute_code];
 							}
 
 							$currentAttribute = self::getElement($attribute_code, "'valid'", 'code');
-							if( !empty($currentAttribute) ){
+							if (!empty($currentAttribute)) {
 								$sent_attribute_list[] = $currentAttribute->id;
 
 								/*	Enregistrement de la valeur actuelle de l'attribut dans la table d'historique si l'option historique est activee sur l'attribut courant	*/
-								if (  $currentAttribute->is_historisable == 'yes') {
+								if ($currentAttribute->is_historisable == 'yes') {
 									$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType . " WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d", $entityTypeId, $currentAttribute->id, $entityId);
 									$attribute_histo = $wpdb->get_results($query);
-									if(!empty($attribute_histo)){
+									if (!empty($attribute_histo)) {
 										$attribute_histo_content['status'] = 'valid';
 										$attribute_histo_content['creation_date'] = current_time('mysql', 0);
 										$attribute_histo_content['creation_date_value'] = $attribute_histo[0]->creation_date_value;
@@ -1387,8 +1387,8 @@ 
 								}
 								$attributeValue = str_replace("\\", "", $attributeValue);
 
-								if ( empty($from) || (!empty($attributeValue)) ) {
-									$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($delete_current_attribute_values_params, array('attribute_id' => $currentAttribute->id)));
+								if (empty($from) || (!empty($attributeValue))) {
+									$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array_merge($delete_current_attribute_values_params, array('attribute_id' => $currentAttribute->id)));
 
 									/**	Insertion de la nouvelle valeur de l'attribut dans la base	*/
 									$query_params = array(
@@ -1402,66 +1402,66 @@ 
 										'creation_date_value' => current_time('mysql', 0)
 									);
 									/**	Si l'attribut courant est contenu dans un tableau (exemple: select multiple) on lit tout le tableau et on enregistre chaque valeur separement	*/
-									if(is_array($attributeValue)){
-										foreach($attributeValue as $a){
-											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($query_params, array('value' => $a)));
+									if (is_array($attributeValue)) {
+										foreach ($attributeValue as $a) {
+											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array_merge($query_params, array('value' => $a)));
 										}
 									}
-									else{
-										$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($query_params, array('value' => $attributeValue)));
-										wpeologs_ctr::log_datas_in_files( 'wpshop_attributes', array(
+									else {
+										$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array_merge($query_params, array('value' => $attributeValue)));
+										wpeologs_ctr::log_datas_in_files('wpshop_attributes', array(
 											'object_id' 	=> $entityId,
-											'message' 		=> __( 'Add the attribute : ' . $currentAttribute->code . ' with value : ' . $attributeValue , 'wpshop' ) ), 0
+											'message' 		=> __('Add the attribute : ' . $currentAttribute->code . ' with value : ' . $attributeValue, 'wpshop') ), 0
 										);
 									}
 
 									/**	Dans le cas ou l'attribut courant est utilise dans l'interface permettant de trier les produits (option de l'attribut) on defini une meta specifique	*/
-									if ( ( ($currentAttribute->is_used_for_sort_by == 'yes') || ($currentAttribute->is_searchable == 'yes'))  || ( $currentAttribute->is_filterable == 'yes') && !empty($attributeValue) ) :
-										update_post_meta($entityId, '_'.$attribute_code, $attributeValue);
+									if ((($currentAttribute->is_used_for_sort_by == 'yes') || ($currentAttribute->is_searchable == 'yes')) || ($currentAttribute->is_filterable == 'yes') && !empty($attributeValue)) :
+										update_post_meta($entityId, '_' . $attribute_code, $attributeValue);
 									endif;
 
 									/**	Enregistrement de toutes les valeurs des attributs dans une meta du produit	*/
-									$attribute_option = (!empty($_POST['attribute_option'][$attribute_code])) ? (array) $_POST['attribute_option'][$attribute_code] : null;
+									$attribute_option = (!empty($_POST['attribute_option'][$attribute_code])) ? (array)$_POST['attribute_option'][$attribute_code] : null;
 									if (isset($attribute_option)) {
 										$value = self::get_attribute_type_select_option_info($attributeTypeDetails[$attribute_code], 'value');
 										if (strtolower($value) == 'yes') :
-											update_post_meta($entityId, 'attribute_option_'.$attribute_code, $attribute_option);
+											update_post_meta($entityId, 'attribute_option_' . $attribute_code, $attribute_option);
 										else :
-											delete_post_meta($entityId, 'attribute_option_'.$attribute_code);
+											delete_post_meta($entityId, 'attribute_option_' . $attribute_code);
 										endif;
 									}
 								}
 							}
 						}
-						do_action( "saved_attribute_for_entity_{$attributeType}_{$attribute_code}", $attributeValue, $old_attribute_value, $entityTypeId, $entityId );
-						do_action( "saved_attribute_for_entity__{$attribute_code}", $attributeValue, $old_attribute_value, $entityTypeId, $entityId );
-						if ( isset( $attribute_setted[$attributeType][$attribute_code] ) ) {
-							if( is_array( $attribute_setted[$attributeType][$attribute_code] )) {
+						do_action("saved_attribute_for_entity_{$attributeType}_{$attribute_code}", $attributeValue, $old_attribute_value, $entityTypeId, $entityId);
+						do_action("saved_attribute_for_entity__{$attribute_code}", $attributeValue, $old_attribute_value, $entityTypeId, $entityId);
+						if (isset($attribute_setted[$attributeType][$attribute_code])) {
+							if (is_array($attribute_setted[$attributeType][$attribute_code])) {
 								$attribute_setted[$attributeType][$attribute_code][] = $attributeValue;
 							} else {
-								$attribute_setted[$attributeType][$attribute_code] = array( $attribute_setted[$attributeType][$attribute_code], $attributeValue );
+								$attribute_setted[$attributeType][$attribute_code] = array($attribute_setted[$attributeType][$attribute_code], $attributeValue);
 							}
 						} else {
 							$attribute_setted[$attributeType][$attribute_code] = $attributeValue;
 						}
 					}
 
-					if ( empty($from) ) {
-						$query = $wpdb->prepare("SELECT value_id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType . " WHERE attribute_id NOT IN ('" . implode("', '", $sent_attribute_list) . "') AND entity_id = %d AND entity_type_id = %d", $entityId, $entityTypeId);
+					if (empty($from)) {
+						$query = $wpdb->prepare("SELECT value_id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType . " WHERE attribute_id NOT IN ('" . implode("', '", $sent_attribute_list) . "') AND entity_id = %d AND entity_type_id = %d", $entityId, $entityTypeId);
 						$attr_to_delete = $wpdb->get_results($query);
-						if(!empty($attr_to_delete)){
+						if (!empty($attr_to_delete)) {
 							foreach ($attr_to_delete as $value) {
-								$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($delete_current_attribute_values_params, array('value_id' => $value->value_id)));
-								wpeologs_ctr::log_datas_in_files( 'wpshop_attributes', array(
+								$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array_merge($delete_current_attribute_values_params, array('value_id' => $value->value_id)));
+								wpeologs_ctr::log_datas_in_files('wpshop_attributes', array(
 									'object_id' 	=> $entityId,
-									'message' 		=> __( 'Remove the attribute : ' . $value->value_id, 'wpshop' ) ), 0
+									'message' 		=> __('Remove the attribute : ' . $value->value_id, 'wpshop') ), 0
 								);
 							}
 						}
 					}
 				}
 			}
-			do_action( "saved_attribute_for_entity", $attribute_setted, $old_attribute_to_set, $entityTypeId, $entityId );
+			do_action("saved_attribute_for_entity", $attribute_setted, $old_attribute_to_set, $entityTypeId, $entityId);
 		}
 	}
 
@@ -1481,7 +1481,7 @@ 
 
 		$query_params = "";
 		$query_params_values = array($attributeId, $entityTypeId, $entityId);
-		if(WPSHOP_ATTRIBUTE_VALUE_PER_USER && (isset($atribute_params['intrinsic']) && ($atribute_params['intrinsic'] != 'yes'))){
+		if (WPSHOP_ATTRIBUTE_VALUE_PER_USER && (isset($atribute_params['intrinsic']) && ($atribute_params['intrinsic'] != 'yes'))) {
 			$query_params = "
 				AND ATTR_VAL.user_id = %d";
 			$query_params_values[] = get_current_user_id();
@@ -1497,20 +1497,20 @@ 
 		);
 		$attributeValue = $wpdb->get_results($query);
 
-		if ( ( (count($attributeValue) <= 1 ) && !empty($attributeValue[0]) ) && ( empty($atribute_params['frontend_input']) || ($atribute_params['frontend_input'] != 'multiple-select') )) {
+		if (((count($attributeValue) <= 1) && !empty($attributeValue[0])) && (empty($atribute_params['frontend_input']) || ($atribute_params['frontend_input'] != 'multiple-select'))) {
 			$attributeValue = $attributeValue[0];
 		}
-		else{
+		else {
 			$entity_meta = get_post_meta($entityId, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
-			if ( !empty($entity_meta) ) {
+			if (!empty($entity_meta)) {
 				$query = $wpdb->prepare("SELECT code FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE id = %d AND entity_id = %d ", $attributeId, $entityTypeId);
 				$attribute_code = $wpdb->get_var($query);
 				$attributeValue = !empty($entity_meta[$attribute_code]) ? $entity_meta[$attribute_code] : null;
 			}
-			if ( is_array($attributeValue) ) {
+			if (is_array($attributeValue)) {
 				$tmp_array = array();
-				if ( !empty($attributeValue) ) {
-					foreach ( $attributeValue as $att ) {
+				if (!empty($attributeValue)) {
+					foreach ($attributeValue as $att) {
 						$obj = new stdClass();
 						$obj->value = $att;
 						$obj->unit_id = 0;
@@ -1541,9 +1541,9 @@ 
 		$elements = array();
 		$elementsWithAttributeAndValues = self::get_attribute_list_for_item($entityId, $elementId, $language);
 
-		foreach ( $elementsWithAttributeAndValues as $elementDefinition ) {
+		foreach ($elementsWithAttributeAndValues as $elementDefinition) {
 			$arrayKey = $elementDefinition->attribute_id;
-			if ( $keyForArray == 'code' ) {
+			if ($keyForArray == 'code') {
 				$arrayKey = $elementDefinition->attribute_code;
 			}
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['code'] = $elementDefinition->attribute_set_section_code;
@@ -1553,7 +1553,7 @@ 
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['backend_table'] = $elementDefinition->backend_table;
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['backend_input'] = $elementDefinition->backend_input;
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['frontend_input'] = $elementDefinition->frontend_input;
-			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['frontend_label'] = __( $elementDefinition->frontend_label, 'wpshop' );
+			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['frontend_label'] = __($elementDefinition->frontend_label, 'wpshop');
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['attribute_code'] = $elementDefinition->attribute_code;
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['data_type_to_use'] = $elementDefinition->data_type_to_use;
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['is_visible_in_front'] = $elementDefinition->is_visible_in_front;
@@ -1563,29 +1563,29 @@ 
 			$attributeValueField = 'attribute_value_' . $elementDefinition->data_type;
 
 			// Manage the value differently if it is an array or not
-			if ( !empty($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value']) ) {
+			if (!empty($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'])) {
 				if (is_array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'])) {
 					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'][] = $elementDefinition->$attributeValueField;
 				}
 				else {
-					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'],$elementDefinition->$attributeValueField);
+					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'], $elementDefinition->$attributeValueField);
 				}
 			}
 			else {
 				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = $elementDefinition->$attributeValueField;
 			}
 
-			if ( $elementDefinition->backend_input == 'multiple-select' ) {
+			if ($elementDefinition->backend_input == 'multiple-select') {
 				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['select_value'] = self::get_attribute_type_select_option_info($attributeValueField, 'value');
 			}
 
 			$attributeUnitField = 'attribute_unit_' . $elementDefinition->data_type;
-			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] = __( $elementDefinition->$attributeUnitField, 'wpshop' );
-			if( !empty($elementDefinition->is_requiring_unit ) && ( $elementDefinition->is_requiring_unit == 'yes' ) && empty( $elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] ) ) {
+			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] = __($elementDefinition->$attributeUnitField, 'wpshop');
+			if (!empty($elementDefinition->is_requiring_unit) && ($elementDefinition->is_requiring_unit == 'yes') && empty($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'])) {
 				$unit = '';
-				$query = $wpdb->prepare( 'SELECT unit FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d AND status = %s', $elementDefinition->_default_unit, 'valid');
-				$unit = $wpdb->get_var( $query );
-				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] = __( $unit, 'wpshop' );
+				$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d AND status = %s', $elementDefinition->_default_unit, 'valid');
+				$unit = $wpdb->get_var($query);
+				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] = __($unit, 'wpshop');
 			}
 
 		}
@@ -1597,7 +1597,7 @@ 
 		$elementsWithAttributeAndValues = array();
 		$moreQuery = "";
 
-		$entity_type = empty($defined_entity_type) ? get_post_type( $elementId ) : $defined_entity_type;
+		$entity_type = empty($defined_entity_type) ? get_post_type($elementId) : $defined_entity_type;
 
 		$query = $wpdb->prepare(
 				"SELECT POST_META.*,
@@ -1646,23 +1646,23 @@ 
 	 *
 	 * @return boolean The result to know if the element has to be displayed on frontend
 	 */
-	public static function check_attribute_display( $attribute_main_config, $attribute_custom_config, $attribute_or_set, $attribute_code, $output_type) {
-		if ( $attribute_main_config === 'yes' ) {
+	public static function check_attribute_display($attribute_main_config, $attribute_custom_config, $attribute_or_set, $attribute_code, $output_type) {
+		if ($attribute_main_config === 'yes') {
 			$attribute_output = true;
-			if ( ( is_array($attribute_custom_config) && in_array($attribute_or_set, array('attribute', 'attribute_set_section', 'product_action_button')) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes' )
-				 || empty($attribute_custom_config) ) {
+			if ((is_array($attribute_custom_config) && in_array($attribute_or_set, array('attribute', 'attribute_set_section', 'product_action_button')) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes')
+				 || empty($attribute_custom_config)) {
 				$attribute_output = true;
 			}
-			else if ( empty($attribute_custom_config[$attribute_or_set][$attribute_code]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) || (!empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'no')) )  {
+			else if (empty($attribute_custom_config[$attribute_or_set][$attribute_code]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) || (!empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'no'))) {
 				$attribute_output = false;
 			}
 		}
-		elseif ( $attribute_main_config === 'no' ) {
+		elseif ($attribute_main_config === 'no') {
 			$attribute_output = false;
-			if ( empty($attribute_custom_config[$attribute_or_set]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code]) ) {
+			if (empty($attribute_custom_config[$attribute_or_set]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code])) {
 				$attribute_output = false;
 			}
-			else if ( !empty($attribute_custom_config) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes') )  {
+			else if (!empty($attribute_custom_config) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes')) {
 				$attribute_output = true;
 			}
 		}
@@ -1679,22 +1679,22 @@ 
 		global $wpdb;
 		global $wp_query;
 
-		$attribute = self::getElement( $atts['attid'] );
-		if(empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
-		$attribute_main_config = ( empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet') ) ? $attribute->is_visible_in_front : $attribute->is_visible_in_front_listing;
-		$output_type = ( empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet') ) ? 'complete_sheet' : 'mini_output';
+		$attribute = self::getElement($atts['attid']);
+		if (empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
+		$attribute_main_config = (empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet')) ? $attribute->is_visible_in_front : $attribute->is_visible_in_front_listing;
+		$output_type = (empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet')) ? 'complete_sheet' : 'mini_output';
 		$product_attribute_custom_config = get_post_meta($atts['pid'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
-		$display_attribute_value = wpshop_attributes::check_attribute_display( $attribute_main_config, $product_attribute_custom_config, 'attribute', $attribute->code, $output_type);
+		$display_attribute_value = wpshop_attributes::check_attribute_display($attribute_main_config, $product_attribute_custom_config, 'attribute', $attribute->code, $output_type);
 
-		if ( !empty( $attribute->data_type ) ) {
+		if (!empty($attribute->data_type)) {
 			$attributeDefinition['unit'] = '';
 
 			$has_value = false;
-			$query = $wpdb->prepare("SELECT value FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attribute->data_type . " WHERE entity_id=%s AND attribute_id=%d", $atts['pid'], $atts['attid'] );
-			if ( in_array($attribute->backend_input, array('multiple-select', 'checkbox')) ) {
+			$query = $wpdb->prepare("SELECT value FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attribute->data_type . " WHERE entity_id=%s AND attribute_id=%d", $atts['pid'], $atts['attid']);
+			if (in_array($attribute->backend_input, array('multiple-select', 'checkbox'))) {
 				$list_of_value = $wpdb->get_results($query);
-				if ( !empty($list_of_value) ) {
-					foreach ( $list_of_value as $value ) {
+				if (!empty($list_of_value)) {
+					foreach ($list_of_value as $value) {
 						$data[] = $value->value;
 					}
 					$has_value = true;
@@ -1702,10 +1702,10 @@ 
 			}
 			else {
 				$data = $wpdb->get_var($query);
-				if ( !empty($data) ) {
+				if (!empty($data)) {
 					$has_value = true;
 				}
-				elseif( !empty($attribute->default_value) ) {
+				elseif (!empty($attribute->default_value)) {
 					$has_value = true;
 					$data = $attribute->default_value;
 				}
@@ -1717,7 +1717,7 @@ 
 			$attributeDefinition['is_requiring_unit'] = $attribute->is_requiring_unit;
 			$attributeDefinition['backend_input'] = $attribute->backend_input;
 			$attributeDefinition['data_type_to_use'] = $attribute->data_type_to_use;
-			$attribute_display = wpshop_attributes::wps_attribute_values_display( $attributeDefinition );
+			$attribute_display = wpshop_attributes::wps_attribute_values_display($attributeDefinition);
 			$attribute_value = $attribute_display[0];
 			$attributeDefinition['value'] = $attribute_display[1];
 			$attribute_unit_list = $attribute_display[2];
@@ -1737,13 +1737,13 @@ 
 	 * @param array $specific_argument Optionnal The different parameters used for filter output
 	 * @return array The definition for the field used to display an attribute
 	 */
-	public static function get_attribute_field_definition( $attribute, $attribute_value = '', $specific_argument = array() ) {
+	public static function get_attribute_field_definition($attribute, $attribute_value = '', $specific_argument = array()) {
 		global $wpdb;
 		$wpshop_price_attributes = unserialize(WPSHOP_ATTRIBUTE_PRICES);
 		$wpshop_weight_attributes = unserialize(WPSHOP_ATTRIBUTE_WEIGHT);
 		$input_def = array();
 		$input_def['option'] = $input_def['field_container_class'] = '';
-		$attributeInputDomain = (!empty($specific_argument['field_custom_name_prefix']) || (!empty($specific_argument['field_custom_name_prefix']) && ($specific_argument['field_custom_name_prefix'] == 'empty')) ) ? $specific_argument['field_custom_name_prefix'] : ((!empty($specific_argument['page_code']) ? $specific_argument['page_code'] . '_' : '' ) . 'attribute[' . $attribute->data_type . ']');
+		$attributeInputDomain = (!empty($specific_argument['field_custom_name_prefix']) || (!empty($specific_argument['field_custom_name_prefix']) && ($specific_argument['field_custom_name_prefix'] == 'empty'))) ? $specific_argument['field_custom_name_prefix'] : ((!empty($specific_argument['page_code']) ? $specific_argument['page_code'] . '_' : '') . 'attribute[' . $attribute->data_type . ']');
 		$input_def['input_domain'] = $attributeInputDomain;
 		$input_def['id'] = (!empty($specific_argument) && !empty($specific_argument['field_id']) ? $specific_argument['field_id'] . '_' : '') . 'attribute_' . $attribute->id;
 		$input_def['intrinsec'] = $attribute->is_intrinsic;
@@ -1763,26 +1763,26 @@ 
 		$input_def['frontend_type'] = $attribute->frontend_input;
 		$input_def['is_used_in_quick_add_form'] = $attribute->is_used_in_quick_add_form;
 
-		if ( !empty($attribute_value) && !is_object($attribute_value) ) {
+		if (!empty($attribute_value) && !is_object($attribute_value)) {
 			$input_def['value'] = $attribute_value;
 		}
-		else if ( !empty($attribute_value->value) ) {
+		else if (!empty($attribute_value->value)) {
 			$input_def['value'] = stripslashes($attribute_value->value);
 		}
-		else if ( !empty($specific_argument['element_identifier']) && empty($attribute_value) && (get_post_status($specific_argument['element_identifier']) != 'auto-draft') ) {
+		else if (!empty($specific_argument['element_identifier']) && empty($attribute_value) && (get_post_status($specific_argument['element_identifier']) != 'auto-draft')) {
 			$input_def['value'] = '';
 		}
 
 		$input_def['options'] = '';
 		$input_more_class = !empty($specific_argument['input_class']) ? $specific_argument['input_class'] : '';
 		if ($attribute->data_type == 'datetime') {
-			$date_config = unserialize( $attribute->default_value );
+			$date_config = unserialize($attribute->default_value);
 			if ((($date_config['default_value'] == '') || ($date_config['default_value'] == 'date_of_current_day')) && ($date_config['default_value'] == 'date_of_current_day')) {
 				$input_def['value'] = date('Y-m-d');
 			}
 			else {
 				/**	Modification due to a message on eoxia forum: http://www.eoxia.com/forums/topic/bug-attribut-de-type-date-dans-fiche-produit-admin/	*/
-				$input_def['value'] = !empty($attribute_value->value) && is_string($attribute_value->value) ? str_replace( " 00:00:00", "", $attribute_value->value ) : ( !empty($attribute_value) && is_string($attribute_value) ? str_replace( " 00:00:00", "", $attribute_value ) : '' );
+				$input_def['value'] = !empty($attribute_value->value) && is_string($attribute_value->value) ? str_replace(" 00:00:00", "", $attribute_value->value) : (!empty($attribute_value) && is_string($attribute_value) ? str_replace(" 00:00:00", "", $attribute_value) : '');
 			}
 			$input_more_class .= ' wpshop_input_datetime ';
 			$field_script = '<script type="text/javascript" >
@@ -1795,31 +1795,31 @@ 
 		wpshop("#' . $input_def['id'] . '").datepicker("option", "navigationAsDateFormat", true);
 		wpshop("#' . $input_def['id'] . '").val("' . str_replace(" 00:00:00", "", $input_def['value']) . '");';
 
-			if ( !empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']) ) {
-				if ( !empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0]) ) {
+			if (!empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur'])) {
+				if (!empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0])) {
 					$field_script .= '
 		wpshop("#' . $input_def['id'] . '").datepicker("option", "minDate", "' . $date_config['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0] . '");';
 				}
-				if ( !empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0]) ) {
+				if (!empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0])) {
 					$field_script .= '
 		wpshop("#' . $input_def['id'] . '").datepicker("option", "maxDate", "' . $date_config['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0] . '");';
 				}
 			}
 
 			$script_options = $script_options_params = array();
-			if ( !empty($date_config['field_options']['attribute_type_date_options_day_to_show']) ) {
+			if (!empty($date_config['field_options']['attribute_type_date_options_day_to_show'])) {
 				$day_to_show_list = '    ';
-				foreach ( $date_config['field_options']['attribute_type_date_options_day_to_show'] as $day_to_show ) {
+				foreach ($date_config['field_options']['attribute_type_date_options_day_to_show'] as $day_to_show) {
 					$day_to_show_list .= '(date.getDay() == ' . $day_to_show . ') || ';
 				}
 				$script_options[] = '( ' . substr($day_to_show_list, 0, -4) . ' )';
 			}
 
-			if ( !empty($date_config['field_options']['attribute_type_date_options_available_date_type'][0]) ) {
-				if ( !empty($date_config['field_options']['attribute_type_date_options_available_date']) ) {
+			if (!empty($date_config['field_options']['attribute_type_date_options_available_date_type'][0])) {
+				if (!empty($date_config['field_options']['attribute_type_date_options_available_date'])) {
 					$available_date = ' ';
-					foreach ( $date_config['field_options']['attribute_type_date_options_available_date'] as $avalaible_date_list ) {
-						if ( !empty($avalaible_date_list) ) {
+					foreach ($date_config['field_options']['attribute_type_date_options_available_date'] as $avalaible_date_list) {
+						if (!empty($avalaible_date_list)) {
 							$available_date .= '"' . $avalaible_date_list . '",';
 						}
 					}
@@ -1828,7 +1828,7 @@ 
 				}
 			}
 
-			if ( !empty( $script_options ) ) {
+			if (!empty($script_options)) {
 				$field_script .= '
 		wpshop("#' . $input_def['id'] . '").datepicker("option", "beforeShowDay", function(date){
 			' . implode(' ', $script_options_params) . ';
@@ -1856,37 +1856,37 @@ 
 </script>';
 			$input_def['options'] .= $field_script;
 		}
-		if ( in_array($attribute->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'))) {
-			$input_more_class .= (!empty($specific_argument['no_chosen']) ? '' : ' chosen_select ' );
+		if (in_array($attribute->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'))) {
+			$input_more_class .= (!empty($specific_argument['no_chosen']) ? '' : ' chosen_select ');
 			$input_def['type'] = ((!empty($specific_argument['from']) && ($specific_argument['from'] == 'frontend')) || (!is_admin() && empty($specific_argument['from'])) ? $attribute->frontend_input : $attribute->backend_input);
 			$input_def['valueToPut'] = 'index';
 
 			$select_display = self::get_select_output($attribute, $specific_argument);
-			if ( empty( $input_def[ 'options_label' ] ) && !empty( $specific_argument ) && (!empty($specific_argument['from']) && ($specific_argument['from'] == 'frontend') ) ) {
-				$input_def[ 'options_label' ][ 'original' ] = true;
+			if (empty($input_def['options_label']) && !empty($specific_argument) && (!empty($specific_argument['from']) && ($specific_argument['from'] == 'frontend'))) {
+				$input_def['options_label']['original'] = true;
 			}
 			$input_def['options'] .= $select_display['more_input'];
 			$input_def['possible_value'] = (!empty($select_display) && !empty($select_display['possible_value'])) ? $select_display['possible_value'] : '';
-			if ( !is_admin() ) {
+			if (!is_admin()) {
 				$input_def['options'] .= '<input type="hidden" value="' . str_replace("\\", "", $input_def['value']) . '" name="wpshop_product_attribute_' . $attribute->code . '_current_value" id="wpshop_product_attribute_' . $attribute->code . '_current_value" />';
 			}
-			if ( in_array($attribute->backend_input, array('multiple-select', 'checkbox')) && is_admin() && (empty($specific_argument['from']) || ($specific_argument['from'] != 'frontend')) ) {
-				$input_def['options'] .= wpshop_display::display_template_element('select_list_multiple_bulk_action', array( 'CURRENT_ATTRIBUTE_ID' => $input_def['id'], 'CURRENT_ATTRIBUTE_CODE' => $attribute->code), array(), 'admin');
+			if (in_array($attribute->backend_input, array('multiple-select', 'checkbox')) && is_admin() && (empty($specific_argument['from']) || ($specific_argument['from'] != 'frontend'))) {
+				$input_def['options'] .= wpshop_display::display_template_element('select_list_multiple_bulk_action', array('CURRENT_ATTRIBUTE_ID' => $input_def['id'], 'CURRENT_ATTRIBUTE_CODE' => $attribute->code), array(), 'admin');
 			}
 		}
 		$input_def['label_pointer'] = 'for="' . $input_def['id'] . '"';
-		if(($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')){
+		if (($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')) {
 			$input_def['label_pointer'] = '';
 		}
 
 		/*
 		 * Specifc treatment for price attributes
 		 */
-		if((WPSHOP_PRODUCT_PRICE_PILOT == 'HT') && ($attribute->code == WPSHOP_PRODUCT_PRICE_TTC) ){
+		if ((WPSHOP_PRODUCT_PRICE_PILOT == 'HT') && ($attribute->code == WPSHOP_PRODUCT_PRICE_TTC)) {
 			$input_def['option'] .= ' readonly="readonly" ';
 			$input_more_class .= ' wpshop_prices_readonly';
 		}
-		elseif((WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') && ($attribute->code == WPSHOP_PRODUCT_PRICE_HT) ){
+		elseif ((WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') && ($attribute->code == WPSHOP_PRODUCT_PRICE_HT)) {
 			$input_def['option'] .= ' readonly="readonly" ';
 			$input_more_class .= ' wpshop_prices_readonly';
 		}
@@ -1897,7 +1897,7 @@ 
 
 		$input_def['label'] = str_replace("\\", "", $input_def['label']);
 // 		$input_def['value'] = str_replace("\\", "", $input_def['value']);
-		$input_def['option'] .= ' class="wpshop_product_attribute_' . $attribute->code . $input_more_class . ' ' . (( is_admin() ) ? $attribute->backend_css_class : $attribute->frontend_css_class) . ( !empty($attribute->frontend_verification) ? ' wps_attr_verification_' . $attribute->frontend_verification : '' ) . '" ';
+		$input_def['option'] .= ' class="wpshop_product_attribute_' . $attribute->code . $input_more_class . ' ' . ((is_admin()) ? $attribute->backend_css_class : $attribute->frontend_css_class) . (!empty($attribute->frontend_verification) ? ' wps_attr_verification_' . $attribute->frontend_verification : '') . '" ';
 		$input_def['title'] = !empty($attribute->frontend_help_message) ? ' title="' . $attribute->frontend_help_message . '" ' : '';
 
 		if (($attribute->is_intrinsic == 'yes') && ((!empty($input_def['value'])) || ($input_def['value'] > 0))) {
@@ -1908,13 +1908,13 @@ 
 		 * Add the unit to the attribute if attribute configuration is set to yes
 		 */
 		if ($attribute->is_requiring_unit == 'yes') {
-			if ( in_array($attribute->code, $wpshop_price_attributes) || ( WPSHOP_COST_OF_POSTAGE == $attribute->code) ) {
+			if (in_array($attribute->code, $wpshop_price_attributes) || (WPSHOP_COST_OF_POSTAGE == $attribute->code)) {
 				$input_def['options'] .= '&nbsp;<span class="attribute_currency" id="attribute_currency_' . $attribute->id . '" >' . wpshop_tools::wpshop_get_currency() . '</span>';
 			}
-			elseif ( in_array($attribute->code, $wpshop_weight_attributes) ) {
+			elseif (in_array($attribute->code, $wpshop_weight_attributes)) {
 				$weight_defaut_unity_option = get_option('wpshop_shop_default_weight_unity');
-				$query = $wpdb->prepare('SELECT name FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
-				$unity = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
+				$unity = $wpdb->get_var($query);
 				$input_def['options'] .= '&nbsp;<span class="attribute_weight" id="attribute_weight_' . $attribute->id . '" >' . __($unity, 'wpshop') . '</span>';
 			}
 			else {
@@ -1922,11 +1922,11 @@ 
 				$unit_input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group($attribute->_unit_group_id);
 				$unit_input_def['type'] = 'select';
 				$unit_input_def['option'] = ' class="wpshop_attribute_unit_input chosen_select" ';
-				$unit_input_def['id'] = ( !empty($specific_argument['page_code']) ? $specific_argument['page_code'] : null ) . '_' . ( !empty($specific_argument['element_identifier']) ? $specific_argument['element_identifier'] : null ) . '_unit_attribute_' . $attribute->id;
+				$unit_input_def['id'] = (!empty($specific_argument['page_code']) ? $specific_argument['page_code'] : null) . '_' . (!empty($specific_argument['element_identifier']) ? $specific_argument['element_identifier'] : null) . '_unit_attribute_' . $attribute->id;
 				$unit_input_def['name'] = $attribute->code;
 				$unit_input_def['value'] = (!empty($attribute_value->unit_id) ? $attribute_value->unit_id : '');
-				if($unit_input_def['value'] == ''){
-					if ( $attribute->_default_unit > 0 ) {
+				if ($unit_input_def['value'] == '') {
+					if ($attribute->_default_unit > 0) {
 						$unit_input_def['value'] = $attribute->_default_unit;
 					}
 					else {
@@ -1940,18 +1940,18 @@ 
 		/*
 		 * Add indication on postage cost tax
 		 */
-		if ( $attribute->code == WPSHOP_COST_OF_POSTAGE ) {
+		if ($attribute->code == WPSHOP_COST_OF_POSTAGE) {
 			$input_def['options'] .= ' <span class="attribute_currency" >' . __('ATI', 'wpshop') . '</span>';
 		}
 
 		/*
 		 * Create the field output
 		 */
-		if ( is_admin() && ($attribute->data_type == 'datetime') && ($attribute->is_user_defined == 'yes') && (empty($specific_argument['from']) || ($specific_argument['from'] != 'frontend')) ) {
-			$input_def['output'] = sprintf(__('You select this field to be defined by final customer into frontend part. To change this behaviour you have to change attribute option "%s"', 'wpshop'),__('is_user_defined', 'wpshop'));
+		if (is_admin() && ($attribute->data_type == 'datetime') && ($attribute->is_user_defined == 'yes') && (empty($specific_argument['from']) || ($specific_argument['from'] != 'frontend'))) {
+			$input_def['output'] = sprintf(__('You select this field to be defined by final customer into frontend part. To change this behaviour you have to change attribute option "%s"', 'wpshop'), __('is_user_defined', 'wpshop'));
 			$input_def['options'] = '';
 			$input_def['label_pointer'] = '';
-			$input_def['option'] = substr( $input_def['option'], 0 , -2 ) . ' wpshop_attributes_is_user_defined_admin_field "';
+			$input_def['option'] = substr($input_def['option'], 0, -2) . ' wpshop_attributes_is_user_defined_admin_field "';
 			$input_def['field_container_class'] .= 'wpshop_attributes_is_user_defined_admin_container';
 		}
 		else {
@@ -1966,7 +1966,7 @@ 
 	 * @param string $output_from
 	 * @return string The output for
 	 */
-	public static function display_attribute( $attribute_code, $output_from = 'admin', $output_specs = array() ) {
+	public static function display_attribute($attribute_code, $output_from = 'admin', $output_specs = array()) {
 		$output = '';
 		/*	Get the page code	*/
 		$currentPageCode = !empty($output_specs['page_code']) ? $output_specs['page_code'] : '';
@@ -1977,17 +1977,17 @@ 
 
 		/*	Get attribute input definition	*/
 		$current_value = (!empty($output_specs['current_value']) ? $output_specs['current_value'] : '');
-		$input = wpshop_attributes::get_attribute_field_definition( $attribute_def, $current_value, array_merge($output_specs, array('input_class' => ' wpshop_attributes_display', 'from' => $output_from)) );
+		$input = wpshop_attributes::get_attribute_field_definition($attribute_def, $current_value, array_merge($output_specs, array('input_class' => ' wpshop_attributes_display', 'from' => $output_from)));
 
 		/*	Create default output	*/
 		$input_to_display = $input['output'] . $input['options'];
 
 		/*	Check if current field is linked to an addon, and if the addon is activated	*/
 		$addons_list = unserialize(WPSHOP_ADDONS_LIST);
-		foreach ( $addons_list as $addon_code => $addon_def ) {
-			if ( in_array($attribute_code, $addon_def) ) {
-				if ( constant($addon_code) === false ) {
-					$input_to_display = '<a href="' . admin_url('options-general.php?page=wpshop_option#wpshop_addons_option') . '" >' . __("This addon isn't activated, click to activate",'wpshop') . '</a>';
+		foreach ($addons_list as $addon_code => $addon_def) {
+			if (in_array($attribute_code, $addon_def)) {
+				if (constant($addon_code) === false) {
+					$input_to_display = '<a href="' . admin_url('options-general.php?page=wpshop_option#wpshop_addons_option') . '" >' . __("This addon isn't activated, click to activate", 'wpshop') . '</a>';
 				}
 			}
 		}
@@ -2012,11 +2012,11 @@ 
 		/*
 		 * Display attribute option if applicable
 		 */
-		if ( $output_from == 'admin') {
-			$attribute_option_display = $attribute_def->backend_input=='select' && (strtolower( __(self::get_attribute_type_select_option_info($input['value'], 'value'), 'wpshop') ) == strtolower(__('yes', 'wpshop'))) ? '' : ' wpshopHide';
+		if ($output_from == 'admin') {
+			$attribute_option_display = $attribute_def->backend_input == 'select' && (strtolower(__(self::get_attribute_type_select_option_info($input['value'], 'value'), 'wpshop')) == strtolower(__('yes', 'wpshop'))) ? '' : ' wpshopHide';
 
 			$output['field'] .= '
-	<div class="attribute_option_'.$attribute_def->code.''.$attribute_option_display.'">'.self::get_attribute_option_fields($element_identifier, $attribute_def->code).'</div>';
+	<div class="attribute_option_'.$attribute_def->code . '' . $attribute_option_display . '">' . self::get_attribute_option_fields($element_identifier, $attribute_def->code) . '</div>';
 		}
 
 		$output['field'] .= '</div>';
@@ -2034,36 +2034,36 @@ 
 	 *
 	 * @return string The html code to output directly tabs
 	 */
-	public static function attribute_of_entity_to_tab( $element_code, $element_id, $element_definition ) {
+	public static function attribute_of_entity_to_tab($element_code, $element_id, $element_definition) {
 		$attributeContentOutput = '';
 
 		/**	Get the different attribute affected to the entity	*/
 		$element_atribute_list = wpshop_attributes::getElementWithAttributeAndValue($element_code, $element_id, WPSHOP_CURRENT_LOCALE, '', 'frontend');
 
 
-		if ( is_array($element_atribute_list) && (count($element_atribute_list) > 0) ) {
-			foreach ( $element_atribute_list[$element_id] as $attributeSetSectionName => $attributeSetContent ) {
+		if (is_array($element_atribute_list) && (count($element_atribute_list) > 0)) {
+			foreach ($element_atribute_list[$element_id] as $attributeSetSectionName => $attributeSetContent) {
 				$attributeToShowNumber = 0;
 				$attributeOutput = '';
 
-				foreach ( $attributeSetContent['attributes'] as $attributeId => $attributeDefinition ) {
+				foreach ($attributeSetContent['attributes'] as $attributeId => $attributeDefinition) {
 
 					/**	Check the value type to check if empty or not	*/
-					if ( $attributeDefinition['data_type'] == 'int' ) {
+					if ($attributeDefinition['data_type'] == 'int') {
 						$attributeDefinition['value'] = (int)$attributeDefinition['value'];
 					}
-					else if ( $attributeDefinition['data_type'] == 'decimal' ) {
+					else if ($attributeDefinition['data_type'] == 'decimal') {
 						$attributeDefinition['value'] = (float)$attributeDefinition['value'];
 					}
 
 					/** Check if the attribute is set to be displayed in frontend	*/
-					$attribute_display_state = wpshop_attributes::check_attribute_display( $attributeDefinition['is_visible_in_front'], $element_definition['custom_display'], 'attribute', $attributeDefinition['code'], 'complete_sheet');
+					$attribute_display_state = wpshop_attributes::check_attribute_display($attributeDefinition['is_visible_in_front'], $element_definition['custom_display'], 'attribute', $attributeDefinition['code'], 'complete_sheet');
 
 					/**	Output the field if the value is not null	*/
 
-					if ( (is_array($attributeDefinition['value']) || ( !empty($attributeDefinition['value']) ) ) && $attribute_display_state) {
+					if ((is_array($attributeDefinition['value']) || (!empty($attributeDefinition['value']))) && $attribute_display_state) {
 
-						$attribute_display = wpshop_attributes::wps_attribute_values_display( $attributeDefinition );
+						$attribute_display = wpshop_attributes::wps_attribute_values_display($attributeDefinition);
 						$attribute_value = $attribute_display[0];
 						$attributeDefinition['value'] = $attribute_display[1];
 						$attribute_unit_list = $attribute_display[2];
@@ -2074,8 +2074,8 @@ 
 						$tpl_component['PDT_ENTITY_CODE'] = self::currentPageCode;
 						$tpl_component['ATTRIBUTE_CODE'] = $attributeDefinition['attribute_code'];
 						$tpl_component['ATTRIBUTE_LABEL'] = __($attributeDefinition['frontend_label'], 'wpshop');
-						$tpl_component['ATTRIBUTE_VALUE'] = (  !is_array($attribute_value) ) ? stripslashes($attribute_value) : $attribute_value;
-						$tpl_component['ATTRIBUTE_VALUE_UNIT'] =  $attribute_unit_list;
+						$tpl_component['ATTRIBUTE_VALUE'] = (!is_array($attribute_value)) ? stripslashes($attribute_value) : $attribute_value;
+						$tpl_component['ATTRIBUTE_VALUE_UNIT'] = $attribute_unit_list;
 
 						/** Build template	*/
 						$attributeOutput .= wpshop_display::display_template_element($template_part, $tpl_component);
@@ -2086,9 +2086,9 @@ 
 				}
 
 				/** Check if the attribute set section is set to be displayed in frontend	*/
-				$attribute_set_display_state = wpshop_attributes::check_attribute_display( $attributeSetContent['display_on_frontend'], $element_definition['custom_display'], 'attribute_set_section', $attributeSetContent['code'], 'complete_sheet');
+				$attribute_set_display_state = wpshop_attributes::check_attribute_display($attributeSetContent['display_on_frontend'], $element_definition['custom_display'], 'attribute_set_section', $attributeSetContent['code'], 'complete_sheet');
 
-				if ( !$attribute_set_display_state ) {
+				if (!$attribute_set_display_state) {
 					$attributeToShowNumber = 0;
 					$attributeOutput = '';
 				}
@@ -2098,8 +2098,8 @@ 
 
 			/** Gestion de l'affichage	*/
 			$tab_list = $content_list = '';
-			foreach ( $element_atribute_list[$element_id] as $attributeSetSectionName => $attributeSetContent ) {
-				if ( !empty($attributeSetContent['count']) > 0 ) {
+			foreach ($element_atribute_list[$element_id] as $attributeSetSectionName => $attributeSetContent) {
+				if (!empty($attributeSetContent['count']) > 0) {
 					/** Template parameters	*/
 					$template_part = 'product_attribute_tabs';
 					$tpl_component = array();
@@ -2108,7 +2108,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]));
@@ -2128,7 +2128,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]));
@@ -2142,16 +2142,16 @@ 
 				}
 			}
 
-			if ( $tab_list != '' ) {
+			if ($tab_list != '') {
 				/** Template parameters	*/
 				$template_part = 'product_attribute_container';
 				$tpl_component = array();
-				$tpl_component['PDT_TABS'] = apply_filters( 'wpshop_extra_tabs_menu_before', '' ).$tab_list.apply_filters( 'wpshop_extra_tabs_menu_after', '' );
-				$tpl_component['PDT_TAB_DETAIL'] = apply_filters( 'wpshop_extra_tabs_content_before', '' ).$content_list.apply_filters( 'wpshop_extra_tabs_content_after', '' );
+				$tpl_component['PDT_TABS'] = apply_filters('wpshop_extra_tabs_menu_before', '') . $tab_list . apply_filters('wpshop_extra_tabs_menu_after', '');
+				$tpl_component['PDT_TAB_DETAIL'] = apply_filters('wpshop_extra_tabs_content_before', '') . $content_list . apply_filters('wpshop_extra_tabs_content_after', '');
 
 				/** 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]));
@@ -2174,9 +2174,9 @@ 
 	 * @param unknown_type $attributeDefinition
 	 * @return multitype:Ambigous <unknown, string> Ambigous <string, string> Ambigous <>
 	 */
-	public static function wps_attribute_values_display( $attributeDefinition ) {
+	public static function wps_attribute_values_display($attributeDefinition) {
 		$attribute_unit_list = '';
-		if ( !empty($attributeDefinition['unit']) ) {
+		if (!empty($attributeDefinition['unit'])) {
 			/** Template parameters	*/
 			$template_part = 'product_attribute_unit';
 			$tpl_component = array();
@@ -2188,31 +2188,31 @@ 
 		}
 
 		$attribute_value = $attributeDefinition['value'];
-		if ( $attributeDefinition['data_type'] == 'decimal' ) {
-			$attribute_value =(is_numeric($attribute_value) ) ? number_format($attribute_value, 2, ',', '') : $attribute_value;
-			if ( in_array($attributeDefinition['code'], unserialize(WPSHOP_ATTRIBUTE_PRICES)) ) {
-				if ( $attributeDefinition['is_requiring_unit'] == 'yes' ) {
+		if ($attributeDefinition['data_type'] == 'decimal') {
+			$attribute_value = (is_numeric($attribute_value)) ? number_format($attribute_value, 2, ',', '') : $attribute_value;
+			if (in_array($attributeDefinition['code'], unserialize(WPSHOP_ATTRIBUTE_PRICES))) {
+				if ($attributeDefinition['is_requiring_unit'] == 'yes') {
 					$attribute_unit_list = ' ' . wpshop_tools::wpshop_get_currency();
 				}
 				$attributeDefinition['value'] = wpshop_display::format_field_output('wpshop_product_price', $attributeDefinition['value']);
 			}
 		}
-		if ( $attributeDefinition['data_type'] == 'datetime' ) {
+		if ($attributeDefinition['data_type'] == 'datetime') {
 			$attribute_value = mysql2date('d/m/Y', $attributeDefinition['value'], true);
 		}
-		if ( $attributeDefinition['backend_input'] == 'select' ) {
+		if ($attributeDefinition['backend_input'] == 'select') {
 			$attribute_value = wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
 		}
 		/** Manage differently if its an array of values or not	*/
-		if ( $attributeDefinition['backend_input'] == 'multiple-select') {
+		if ($attributeDefinition['backend_input'] == 'multiple-select') {
 			$attribute_value = '';
-			if ( is_array($attributeDefinition['value']) ) {
+			if (is_array($attributeDefinition['value'])) {
 				foreach ($attributeDefinition['value'] as $v) {
-					$attribute_value .= ' / '.wpshop_attributes::get_attribute_type_select_option_info($v, 'label', $attributeDefinition['data_type_to_use']);
+					$attribute_value .= ' / ' . wpshop_attributes::get_attribute_type_select_option_info($v, 'label', $attributeDefinition['data_type_to_use']);
 				}
 			}
-			else $attribute_value = ' / '.wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
-			$attribute_value = substr($attribute_value,3);
+			else $attribute_value = ' / ' . wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
+			$attribute_value = substr($attribute_value, 3);
 		}
 
 		return array($attribute_value, $attributeDefinition['value'], $attribute_unit_list);
@@ -2222,13 +2222,13 @@ 
 	 * Manage display for the output when user uses a shortcode for attributes display
 	 * @param array $shorcode_args The list of argument passed through the shortcode
 	 */
-	function wpshop_attributes_shortcode( $shorcode_args ) {
+	function wpshop_attributes_shortcode($shorcode_args) {
 		$output = '';
 		/*
 		 * Read the attribute list
 		*/
-		foreach ( explode(', ', $shorcode_args['attributes']) as $attribute_code ) {
-			$attribute_output_def = wpshop_attributes::display_attribute( $attribute_code, $shorcode_args['from'] );
+		foreach (explode(', ', $shorcode_args['attributes']) as $attribute_code) {
+			$attribute_output_def = wpshop_attributes::display_attribute($attribute_code, $shorcode_args['from']);
 			$output .= $attribute_output_def['field'];
 		}
 
@@ -2250,7 +2250,7 @@ 
 		$productAttributeSetDetails = wpshop_attributes_set::getAttributeSetDetails($attributeSetId, "'valid','deleted'");
 		$attribute_specification = array('page_code' => $currentPageCode, 'element_identifier' => $itemToEdit, 'field_id' => $currentPageCode . '_' . $itemToEdit . '_');
 
-		if ( count($productAttributeSetDetails) > 0 ) {
+		if (count($productAttributeSetDetails) > 0) {
 			/*	Read the attribute list in order to output	*/
 			$shortcodes_attr = '';
 			$shortcodes_to_display = false;
@@ -2260,80 +2260,80 @@ 
 
 				$shortcodes = $currentTabContent = '';
 				$output_nb = 0;
-				if(count($productAttributeSetDetail['attribut']) >= 1){
-					foreach($productAttributeSetDetail['attribut'] as $attribute){
+				if (count($productAttributeSetDetail['attribut']) >= 1) {
+					foreach ($productAttributeSetDetail['attribut'] as $attribute) {
 
-						if ( !empty($attribute->id) ) {
-							if ( $attribute->code == 'product_attribute_set_id' ) {
+						if (!empty($attribute->id)) {
+							if ($attribute->code == 'product_attribute_set_id') {
 								$attribute_set_id_is_present = true;
 							}
 
 							/** Generic part for attribute field output	*/
 							$value = wpshop_attributes::getAttributeValueForEntityInSet($attribute->data_type, $attribute->id, wpshop_entities::get_entity_identifier_from_code($currentPageCode), $itemToEdit, array('intrinsic' => $attribute->is_intrinsic, 'backend_input' => $attribute->backend_input));
-							$product_meta = get_post_meta( $itemToEdit, '_wpshop_product_metadata', true);
+							$product_meta = get_post_meta($itemToEdit, '_wpshop_product_metadata', true);
 
 							/**	Check if value is empty and get value in meta if not empty	*/
 							$value = (empty($value) && !empty($product_meta[$attribute->code])) ? $product_meta[$attribute->code] : (!empty($value) ? $value : null);
 
 							/*	Manage specific field as the attribute_set_id in product form	*/
-							if ( $attribute->code == 'product_attribute_set_id' ) {
+							if ($attribute->code == 'product_attribute_set_id') {
 
 								$value = empty($value) ? $attributeSetId : $value;
 							}
 							$attribute_specification['current_value'] = $value;
-							$attribute_output_def = apply_filters( 'wpshop_attribute_output_def', wpshop_attributes::display_attribute( $attribute->code, 'admin', $attribute_specification), $itemToEdit );
-							if ( ($attribute_output_def['field_definition']['type'] != 'hidden') && ($attribute->code != 'product_attribute_set_id') ) {
+							$attribute_output_def = apply_filters('wpshop_attribute_output_def', wpshop_attributes::display_attribute($attribute->code, 'admin', $attribute_specification), $itemToEdit);
+							if (($attribute_output_def['field_definition']['type'] != 'hidden') && ($attribute->code != 'product_attribute_set_id')) {
 								$currentTabContent .= $attribute_output_def['field'];
-								$shortcode_code_def=array();
-								$shortcode_code_def['attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['main_code'] = 'wpshop_att_val';
-								$shortcode_code_def['attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['type'] = $attribute->data_type;
-								$shortcode_code_def['attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['attid'] = $attribute->id;
-								$shortcode_code_def['attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['pid'] = $itemToEdit;
+								$shortcode_code_def = array();
+								$shortcode_code_def['attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['main_code'] = 'wpshop_att_val';
+								$shortcode_code_def['attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['type'] = $attribute->data_type;
+								$shortcode_code_def['attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['attid'] = $attribute->id;
+								$shortcode_code_def['attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['pid'] = $itemToEdit;
 								ob_start();
-								wps_shortcodes_ctr::output_shortcode('attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])), $shortcode_code_def, 'wpshop_product_shortcode_display wpshop_product_attribute_shortcode_display wpshop_product_attribute_shortcode_display_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])).' wpshop_cls');
-								$shortcodes .= '<li class="wpshop_cls" >'.sprintf(__('Insertion code for the attribute %s for this product', 'wpshop'), '<span>'.__($attribute_output_def['field_definition']['label'], 'wpshop').'</span>').ob_get_contents().'</li>';
+								wps_shortcodes_ctr::output_shortcode('attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])), $shortcode_code_def, 'wpshop_product_shortcode_display wpshop_product_attribute_shortcode_display wpshop_product_attribute_shortcode_display_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])) . ' wpshop_cls');
+								$shortcodes .= '<li class="wpshop_cls" >' . sprintf(__('Insertion code for the attribute %s for this product', 'wpshop'), '<span>' . __($attribute_output_def['field_definition']['label'], 'wpshop') . '</span>') . ob_get_contents() . '</li>';
 								ob_end_clean();
 							}
 							else {
-								if ( $attribute->code == 'product_attribute_set_id' ) {
+								if ($attribute->code == 'product_attribute_set_id') {
 									$attribute_output_def['field_definition']['type'] = 'hidden';
 								}
-								$currentTabContent .=  wpshop_form::check_input_type($attribute_output_def['field_definition'], $attribute_output_def['field_definition']['input_domain']);
+								$currentTabContent .= wpshop_form::check_input_type($attribute_output_def['field_definition'], $attribute_output_def['field_definition']['input_domain']);
 							}
 							$output_nb++;
 						}
 					}
 
-					$currentTabContent = apply_filters( 'wps_entity_attribute_edition', $currentTabContent, $itemToEdit, $productAttributeSetDetail );
+					$currentTabContent = apply_filters('wps_entity_attribute_edition', $currentTabContent, $itemToEdit, $productAttributeSetDetail);
 
 					$shortcode_code['attributes_set']['main_code'] = 'wpshop_att_group';
 					$shortcode_code['attributes_set']['attrs_exemple']['pid'] = $itemToEdit;
 					$shortcode_code['attributes_set']['attrs_exemple']['sid'] = $productAttributeSetDetail['id'];
 					ob_start();
-					wps_shortcodes_ctr::output_shortcode('attributes_set', $shortcode_code, 'wpshop_product_shortcode_display wpshop_product_attribute_group_shortcode_display wpshop_product_attribute_group_shortcode_display_'.str_replace('-', '_', sanitize_title($productAttributeSetDetail['name'])).' cls');
-					$attribute_group_display = sprintf(__('Insertion code for attribute group %s for this product', 'wpshop'), '<span>'.$productAttributeSetDetail['name'].'</span>').ob_get_contents().'<ul class="" >'.$shortcodes.'</ul>';
+					wps_shortcodes_ctr::output_shortcode('attributes_set', $shortcode_code, 'wpshop_product_shortcode_display wpshop_product_attribute_group_shortcode_display wpshop_product_attribute_group_shortcode_display_' . str_replace('-', '_', sanitize_title($productAttributeSetDetail['name'])) . ' cls');
+					$attribute_group_display = sprintf(__('Insertion code for attribute group %s for this product', 'wpshop'), '<span>' . $productAttributeSetDetail['name'] . '</span>') . ob_get_contents() . '<ul class="" >' . $shortcodes . '</ul>';
 					ob_end_clean();
 
-					if( WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE == 'each-box' )
-						$currentTabContent .= '<div class="wpshop_cls" ><strong>'.__('Shortcodes','wpshop').'</strong> - <a href="#" class="show-hide-shortcodes">' . __('Display', 'wpshop') . '</a><div class="wpshop_product_shortcode_display wpshop_product_shortcode_display_container wpshopHide" >' . $attribute_group_display . '</div></div>';
+					if (WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE == 'each-box')
+						$currentTabContent .= '<div class="wpshop_cls" ><strong>' . __('Shortcodes', 'wpshop') . '</strong> - <a href="#" class="show-hide-shortcodes">' . __('Display', 'wpshop') . '</a><div class="wpshop_product_shortcode_display wpshop_product_shortcode_display_container wpshopHide" >' . $attribute_group_display . '</div></div>';
 					else
 						$shortcodes_attr .= $attribute_group_display;
 
-					if ( $output_nb <= 0 ) {
+					if ($output_nb <= 0) {
 						$currentTabContent = __('Nothing avaiblable here. You can go in attribute management interface in order to add content here.', 'wpshop');
 					}
 				}
 
 				if ($output_nb > 0) {
 					$shortcodes_to_display = true;
-					if ( $outputType == 'box' ) {
+					if ($outputType == 'box') {
 						$box['box'][$productAttributeSetDetail['code']] = $productAttributeSetDetail['name'];
-						$box['box'][$productAttributeSetDetail['code'].'_backend_display_type'] = $productAttributeSetDetail['backend_display_type'];
+						$box['box'][$productAttributeSetDetail['code'] . '_backend_display_type'] = $productAttributeSetDetail['backend_display_type'];
 						$box['boxContent'][$productAttributeSetDetail['code']] = '
 			<div id="wpshop_' . $currentPageCode . '_' . wpshop_tools::slugify($productAttributeSetDetail['code'], array('noAccent')) . '_form" >' . $currentTabContent . '
 							</div><div class="wpshop_cls" ></div>';
 					}
-					else if ( $outputType == 'column' ) {
+					else if ($outputType == 'column') {
 						$currentTabContent = str_replace('wpshop_form_input_element', 'wpshop_form_input_column', $currentTabContent);
 						$currentTabContent = str_replace('wpshop_form_label', 'wpshop_form_label_column', $currentTabContent);
 
@@ -2343,11 +2343,11 @@ 
 				}
 			}
 
-			if( !$attribute_set_id_is_present ) {
+			if (!$attribute_set_id_is_present) {
 				/*	Get attribute definition	*/
 				$attribute_def = wpshop_attributes::getElement('product_attribute_set_id', "'valid'", 'code');
 				/*	Get attribute input definition	*/
-				$input = wpshop_attributes::get_attribute_field_definition( $attribute_def, $attributeSetId, array_merge($attribute_specification, array('input_class' => ' wpshop_attributes_display', 'from' => 'admin')) );
+				$input = wpshop_attributes::get_attribute_field_definition($attribute_def, $attributeSetId, array_merge($attribute_specification, array('input_class' => ' wpshop_attributes_display', 'from' => 'admin')));
 				$input['type'] = 'hidden';
 
 				$box['boxMore'] = wpshop_form::check_input_type($input, $input['input_domain']);
@@ -2358,13 +2358,13 @@ 
 			$dialog_identifier = 'wpshop_new_attribute_option_value_add';
 			$dialog_input_identifier = 'wpshop_new_attribute_option_value';
 			ob_start();
-			include(WPSHOP_TEMPLATES_DIR.'admin/add_new_element_dialog.tpl.php');
+			include(WPSHOP_TEMPLATES_DIR . 'admin/add_new_element_dialog.tpl.php');
 			$box['boxMore'] .= ob_get_contents();
 			ob_end_clean();
 			$box['boxMore'] .= '<input type="hidden" name="wpshop_attribute_type_select_code" value="" id="wpshop_attribute_type_select_code" />';
 
-			if ( $shortcodes_to_display ) {
-				switch ( WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE ) {
+			if ($shortcodes_to_display) {
+				switch (WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE) {
 					case 'fixed-tab':
 					case 'movable-tab':
 						if ($outputType == 'box') {
@@ -2372,7 +2372,7 @@ 
 							$box['boxContent']['shortcode'] = $shortcodes_attr;
 							$box['box']['shortcode_backend_display_type'] = WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE;
 						}
-						else{
+						else {
 							$box['columnTitle']['shortcode'] = __('Product Shortcodes', 'wpshop');
 							$box['columnContent']['shortcode'] = $shortcodes_attr;
 						}
@@ -2396,12 +2396,12 @@ 
 		$ouput['more_input'] = '';
 
 		$attribute_default_value = $attribute->default_value;
-		if ( !empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized( $attribute->default_value ) ) ) {
+		if (!empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized($attribute->default_value))) {
 			$tmp_default_value = unserialize($attribute->default_value);
 			$attribute_default_value = !empty($tmp_default_value["default_value"]) ? $tmp_default_value["default_value"] : null;
 		}
 
-		if ( $attribute->data_type_to_use == 'custom') {
+		if ($attribute->data_type_to_use == 'custom') {
 			$query = $wpdb->prepare("SELECT id, label, value, '' as name FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' ORDER BY position", $attribute->id);
 			$attribute_select_options = $wpdb->get_results($query);
 
@@ -2413,11 +2413,11 @@ 
 // 				}
 			endforeach;
 		}
-		elseif ( $attribute->data_type_to_use == 'internal')  {
+		elseif ($attribute->data_type_to_use == 'internal') {
 			switch ($attribute_default_value) {
 				case 'users':
 					$users = get_users('orderby=nicename');
-					foreach($users as $user){
+					foreach ($users as $user) {
 						$attribute_select_options_list[$user->ID] = $user->display_name;
 					}
 				break;
@@ -2426,11 +2426,11 @@ 
 					$wpshop_attr_custom_post_query = new WP_Query(array(
 						'post_type' => $attribute_default_value,
 						'posts_per_page' => -1,
-						'post_status' => array( 'publish', 'draft', 'future' ) ,
+						'post_status' => array('publish', 'draft', 'future'),
 					));
 
-					if($wpshop_attr_custom_post_query->have_posts()):
-						foreach($wpshop_attr_custom_post_query->posts as $post){
+					if ($wpshop_attr_custom_post_query->have_posts()):
+						foreach ($wpshop_attr_custom_post_query->posts as $post) {
 							$attribute_select_options_list[$post->ID] = $post->post_title;
 						}
 					endif;
@@ -2441,27 +2441,27 @@ 
 
 		/*	There is no value existing for this value	*/
 		if (empty($attribute_select_options_list)) :
-			$ouput['more_input'].=__('Nothing found for this field', 'wpshop');
+			$ouput['more_input'] .= __('Nothing found for this field', 'wpshop');
 		else:
 			/*	Add a default value to the combobox list	*/
 			$default_value_is_serial = false;
 			$attribute_list_first_element = $attribute->default_value;
-			if ( !empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized( $attribute->default_value ) ) ) {
+			if (!empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized($attribute->default_value))) {
 				$default_value_is_serial = true;
 				$tmp_default_value = unserialize($attribute->default_value);
 				$attribute_list_first_element = $tmp_default_value["field_options"]["label_for_first_item"];
 			}
 			//if ( !in_array($attribute->frontend_input, array('radio', 'checkbox')) || ($attribute_list_first_element != 'none') ) $ouput['possible_value'][] = ($default_value_is_serial && !empty($attribute_list_first_element)) ? $attribute_list_first_element : __('Choose a value', 'wpshop');
-			foreach ( $attribute_select_options_list as $option_key => $option_value ) {
+			foreach ($attribute_select_options_list as $option_key => $option_value) {
 				$ouput['possible_value'][$option_key] = stripslashes($option_value);
 			}
 		endif;
 
 		/*	Add a extra element to create a new element into list	*/
-		if ( is_admin()  && ( empty($provenance['from']) || ($provenance['from'] != 'frontend')) ) {
+		if (is_admin() && (empty($provenance['from']) || ($provenance['from'] != 'frontend'))) {
 			/**	$ouput['more_input'] .= '<img src="'.WPSHOP_MEDIAS_ICON_URL.'add.png" id="new_value_pict_' . $attribute->code . '" alt="'.__('Add a new value for this attribute', 'wpshop').'" title="'.__('Add a new value for this attribute', 'wpshop').'" class="wpshop_icons wpshop_icons_add_new_value_to_option_list wpshop_icons_add_new_value_to_option_list_'.$attribute->code.'" />';	*/
 		}
-		else if ( 'yes' == $attribute->is_used_in_quick_add_form ) {
+		else if ('yes' == $attribute->is_used_in_quick_add_form) {
 			$tpl_component = array();
 			$tpl_component['NEW_ELEMENT_CREATION_FIELD'] = 'attribute[new_value_creation][' . $attribute->code . ']';
 			$ouput['more_input'] .= wpshop_display::display_template_element('quick_entity_specific_field_new_element', $tpl_component);
@@ -2470,11 +2470,11 @@ 
 		return $ouput;
 	}
 
-	public static function get_affected_value_for_list( $attribute_code, $element_id, $attribute_data_type ) {
+	public static function get_affected_value_for_list($attribute_code, $element_id, $attribute_data_type) {
 		global $wpdb;
 		$affected_value = array();
 
-		if ( $attribute_data_type == 'custom' ) {
+		if ($attribute_data_type == 'custom') {
 			$query = $wpdb->prepare("
 SELECT ATT_SELECT_OPTIONS_VALUE.id AS chosen_val, ATT_SELECT_OPTIONS_VALUE.value
 FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATT
@@ -2496,20 +2496,20 @@ 
 		}
 
 		$attribute_values_for_variations = $wpdb->get_results($query);
-		foreach ( $attribute_values_for_variations as $attribute_def ) {
-			$affected_value[] = (int) $attribute_def->chosen_val;
+		foreach ($attribute_values_for_variations as $attribute_def) {
+			$affected_value[] = (int)$attribute_def->chosen_val;
 		}
 
 		return $affected_value;
 	}
 
 	public static function get_attribute_option_output($item, $attr_code, $attr_option, $additionnal_params = '') {
-		switch($attr_code){
+		switch ($attr_code) {
 			case 'is_downloadable_':
-				$option = get_post_meta($item['item_id'], 'attribute_option_'.$attr_code, true);
-				switch($attr_option){
+				$option = get_post_meta($item['item_id'], 'attribute_option_' . $attr_code, true);
+				switch ($attr_option) {
 					case 'file_url':
-						if(in_array($additionnal_params['order_status'], array('completed', 'shipped')) && (!empty($item['item_'.$attr_code]) && (strtolower(__($item['item_'.$attr_code], 'wpshop')) == __('yes','wpshop'))) ){
+						if (in_array($additionnal_params['order_status'], array('completed', 'shipped')) && (!empty($item['item_' . $attr_code]) && (strtolower(__($item['item_' . $attr_code], 'wpshop')) == __('yes', 'wpshop')))) {
 							$file_url = isset($option[$attr_option]) ? $option[$attr_option] : false;
 							return $file_url;
 						}
@@ -2522,17 +2522,17 @@ 
 
 	public static function get_attribute_option_fields($postid, $code) {
 
-		switch($code){
+		switch ($code) {
 			case 'is_downloadable_':
-				$data = get_post_meta($postid, 'attribute_option_'.$code, true);
-				$data['file_url'] = !empty($data['file_url'])?$data['file_url']:__('No file selected', 'wpshop');
-				$fields =  wp_nonce_field( 'ajax_wpshop_show_downloadable_interface_in_admin'.$postid, '_show_downloadable_interface_in_admin_wpnonce', true, false );
+				$data = get_post_meta($postid, 'attribute_option_' . $code, true);
+				$data['file_url'] = !empty($data['file_url']) ? $data['file_url'] : __('No file selected', 'wpshop');
+				$fields = wp_nonce_field('ajax_wpshop_show_downloadable_interface_in_admin' . $postid, '_show_downloadable_interface_in_admin_wpnonce', true, false);
 				$fields .= '<div class="wpshop_form_label alignleft">&nbsp;</div>
 						<div class="wpshop_form_input_element alignleft">
-						<div class="send_downloadable_file_dialog wpshop_add_box" data-post="'.$postid.'" title="' .__('Send the downloadable file', 'wpshop'). '"></div>
-						<a data-nonce="' . wp_create_nonce( "ajax_wpshop_fill_the_downloadable_dialog".$postid ) . '"  class="send_downlodable_file wps-bton-first-mini-rounded">' .__('Send a file', 'wpshop').'</a>
-						<input type="hidden" class="product_identifer_field" value="' .( !empty($postid) ? esc_attr( $postid ) : '') . '" /><br/><u>'.__('File url','wpshop').' :</u>
-						<div class="is_downloadable_statut_'.$postid.'"><a href="' .$data['file_url']. '" target="_blank" download>'.basename($data['file_url']).'</a></div>
+						<div class="send_downloadable_file_dialog wpshop_add_box" data-post="'.$postid . '" title="' . __('Send the downloadable file', 'wpshop') . '"></div>
+						<a data-nonce="' . wp_create_nonce("ajax_wpshop_fill_the_downloadable_dialog" . $postid) . '"  class="send_downlodable_file wps-bton-first-mini-rounded">' . __('Send a file', 'wpshop') . '</a>
+						<input type="hidden" class="product_identifer_field" value="' .(!empty($postid) ? esc_attr($postid) : '') . '" /><br/><u>' . __('File url', 'wpshop') . ' :</u>
+						<div class="is_downloadable_statut_'.$postid . '"><a href="' . $data['file_url'] . '" target="_blank" download>' . basename($data['file_url']) . '</a></div>
 						</div>';
 				return $fields;
 				break;
@@ -2557,8 +2557,8 @@ 
 		$attribute_value_content = '';
 
 		$atributes = self::getElement($attribute_code, "'valid'", 'code');
-		if ( !empty($atributes) ) {
-			$attribute_value_content = self::getAttributeValueForEntityInSet($atributes->data_type, $atributes->id,  wpshop_entities::get_entity_identifier_from_code($entity_type), $entity_id);
+		if (!empty($atributes)) {
+			$attribute_value_content = self::getAttributeValueForEntityInSet($atributes->data_type, $atributes->id, wpshop_entities::get_entity_identifier_from_code($entity_type), $entity_id);
 		}
 
 		return $attribute_value_content;
@@ -2570,14 +2570,14 @@ 
 	 * @param mixed $value
 	 * @return string The complete interface allowing to manage datetime attribute field
 	 */
-	function attribute_type_date_config( $value ) {
+	function attribute_type_date_config($value) {
 		$date_config_output = '';
 
 		$input_def['name'] = 'default_value';
 		$input_def['type'] = 'checkbox';
 		$input_def['possible_value'] = 'date_of_current_day';
 		$input_def['value'] = !empty($value['default_value']) ? $value['default_value'] : '';
-		$input_def['options_label']['custom'] = ' ' . __('Use the date of the day as default value', 'wpshop') . ' <a href="#" title="'.__('Check this box for using date of the day as value when editing a product', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		$input_def['options_label']['custom'] = ' ' . __('Use the date of the day as default value', 'wpshop') . ' <a href="#" title="' . __('Check this box for using date of the day as value when editing a product', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 		$date_config_output .= wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
 
 		$input_def = array();
@@ -2586,35 +2586,35 @@ 
 		$input_def['type'] = 'checkbox';
 		$input_def['valueToPut'] = 'index';
 		$input_def['value'] = !empty($value['field_options']['attribute_type_date_options_day_to_show']) ? $value['field_options']['attribute_type_date_options_day_to_show'] : '';
-		$input_def['possible_value'] = array('1' => ' ' . __('Monday', 'wpshop'), '2' => ' ' .__('Tuesday', 'wpshop'), '3' => ' ' .__('Wednesday', 'wpshop'), '4' => ' ' .__('Thursday', 'wpshop'), '5' => ' ' .__('Friday', 'wpshop'), '6' => ' ' .__('Saturday', 'wpshop'), '0' => ' ' .__('Sunday', 'wpshop'));
+		$input_def['possible_value'] = array('1' => ' ' . __('Monday', 'wpshop'), '2' => ' ' . __('Tuesday', 'wpshop'), '3' => ' ' . __('Wednesday', 'wpshop'), '4' => ' ' . __('Thursday', 'wpshop'), '5' => ' ' . __('Friday', 'wpshop'), '6' => ' ' . __('Saturday', 'wpshop'), '0' => ' ' . __('Sunday', 'wpshop'));
 		$input_def['options_label']['original'] = true;
-		$date_config_output .= '<div>' . __('Choose available days in date picker', 'wpshop') . '<a href="#" title="'.__('This option allows you to define the available day in final datepicker', 'wpshop').'" class="wpshop_infobulle_marker">?</a>' . '<br/>' . wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_day_to_show]') . '</div>';
+		$date_config_output .= '<div>' . __('Choose available days in date picker', 'wpshop') . '<a href="#" title="' . __('This option allows you to define the available day in final datepicker', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>' . '<br/>' . wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_day_to_show]') . '</div>';
 
 		/**	Past and futur date restriction	*/
 		$input_def = array();
 		$input_def['name'] = '';
 		$input_def['type'] = 'text';
-		$date_config_output .= '<div id="wpshop_avalaible_date_for_past_and_futur" >' . __('Calendar past and futur date available', 'wpshop') . '<a href="#" title="'.__('Define if the end user is allowed to choose past and/or futur date', 'wpshop').'" class="wpshop_infobulle_marker">?</a><br/>';
+		$date_config_output .= '<div id="wpshop_avalaible_date_for_past_and_futur" >' . __('Calendar past and futur date available', 'wpshop') . '<a href="#" title="' . __('Define if the end user is allowed to choose past and/or futur date', 'wpshop') . '" class="wpshop_infobulle_marker">?</a><br/>';
 		$available_type_input_def = array();
 		$available_type_input_def['name'] = '';
 		$available_type_input_def['id'] = 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_past_futur_minimum';
 		$available_type_input_def['type'] = 'text';
 		$available_type_input_def['value'] = !empty($value['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0]) ? $value['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0] : '';
-		$date_config_output .= __('Minimum date to show', 'wpshop') . '<a href="#" title="'.__('If you want the calendar to start today put only 0, if you want to show anterior date, put the number of Day or Month or Year (ex: -1D)', 'wpshop').'" class="wpshop_infobulle_marker">?</a>' . wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_past_futur][minDate]') . '<br/>';
+		$date_config_output .= __('Minimum date to show', 'wpshop') . '<a href="#" title="' . __('If you want the calendar to start today put only 0, if you want to show anterior date, put the number of Day or Month or Year (ex: -1D)', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>' . wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_past_futur][minDate]') . '<br/>';
 		$available_type_input_def = array();
 		$available_type_input_def['name'] = '';
 		$available_type_input_def['id'] = 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_past_futur_maximum';
 		$available_type_input_def['type'] = 'text';
 		$available_type_input_def['value'] = !empty($value['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0]) ? $value['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0] : '';
-		$date_config_output .= __('Maximum date to show', 'wpshop') . '<a href="#" title="'.__('If you want the calendar to end today put only 0, if you want to show date in futur, put the number of Day or Month or Year (ex: +1M)', 'wpshop').'" class="wpshop_infobulle_marker">?</a>' . wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_past_futur][maxDate]') . '<br/>';
+		$date_config_output .= __('Maximum date to show', 'wpshop') . '<a href="#" title="' . __('If you want the calendar to end today put only 0, if you want to show date in futur, put the number of Day or Month or Year (ex: +1M)', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>' . wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_past_futur][maxDate]') . '<br/>';
 		$date_config_output .= '</div>';
 
 		$input_def = array();
 		$input_def['name'] = '';
 		$input_def['type'] = 'text';
 		$date_config_output .= '
-<div id="wpshop_attribute_date_empy_field" class="wpshopHide" ><br/>' . wpshop_form::check_input_type(array_merge($input_def, array('value' => '', 'id' => 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_new_input')), WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date]') .'</div>
-<div id="wpshop_avalaible_date_list_container" >' . __('Choose available date in date picker', 'wpshop') . '<a href="#" title="'.__('This option allows you to define the available date in final datepicker', 'wpshop').'" class="wpshop_infobulle_marker">?</a><br/>';
+<div id="wpshop_attribute_date_empy_field" class="wpshopHide" ><br/>' . wpshop_form::check_input_type(array_merge($input_def, array('value' => '', 'id' => 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_new_input')), WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date]') . '</div>
+<div id="wpshop_avalaible_date_list_container" >' . __('Choose available date in date picker', 'wpshop') . '<a href="#" title="' . __('This option allows you to define the available date in final datepicker', 'wpshop') . '" class="wpshop_infobulle_marker">?</a><br/>';
 
 		$available_type_input_def = array();
 		$available_type_input_def['name'] = '';
@@ -2627,9 +2627,9 @@ 
 		$date_config_output .= wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_type]') . '<br/>';
 
 		$existing = 0;
-		if ( !empty($value['field_options']['attribute_type_date_options_available_date']) ) {
-			foreach ( $value['field_options']['attribute_type_date_options_available_date'] as $index => $value ) {
-				if ( !empty($value) ) {
+		if (!empty($value['field_options']['attribute_type_date_options_available_date'])) {
+			foreach ($value['field_options']['attribute_type_date_options_available_date'] as $index => $value) {
+				if (!empty($value)) {
 					$input_def['value'] = $value;
 					$input_def['id'] = 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_' . $index;
 					$date_config_output .= wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date]') . '<br/>';
@@ -2653,20 +2653,20 @@ 
 	 * @param array $values Valeurs d'attributs
 	 * @return array
 	 */
-	public static function setAttributesValuesForItem($entityId, $values=array(), $defaultValueForOthers=false, $from = 'webservice') {
-		$message='';
+	public static function setAttributesValuesForItem($entityId, $values = array(), $defaultValueForOthers = false, $from = 'webservice') {
+		$message = '';
 		$attribute_available = array();
 		$attribute_final = array();
 		$entity_type = get_post_type($entityId);
-		$data = self::get_attribute_list_for_item( wpshop_entities::get_entity_identifier_from_code($entity_type), $entityId, WPSHOP_CURRENT_LOCALE);
-		foreach($data as $d) $attribute_available[$d->attribute_code] = array('attribute_id' => $d->attribute_id, 'data_type' => $d->data_type);
+		$data = self::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code($entity_type), $entityId, WPSHOP_CURRENT_LOCALE);
+		foreach ($data as $d) $attribute_available[$d->attribute_code] = array('attribute_id' => $d->attribute_id, 'data_type' => $d->data_type);
 
 		// Creation d'un array "propre" et valide pour la fonction self::saveAttributeForEntity
-		foreach ( $values as $key => $value ) {
-			if ( in_array( $key, array_keys( $attribute_available ) ) ) {
+		foreach ($values as $key => $value) {
+			if (in_array($key, array_keys($attribute_available))) {
 				$attribute_final[$attribute_available[$key]['data_type']][$key] = $value;
 			}
-			else $message .= sprintf(__('Impossible to set "%s" attribute', 'wpshop'), $key)."\n";
+			else $message .= sprintf(__('Impossible to set "%s" attribute', 'wpshop'), $key) . "\n";
 		}
 
 		// Pour les autres attributs non donné on leur affecte leur valeur par défaut
@@ -2687,7 +2687,7 @@ 
 			}
 		}
 
-		switch ( $entity_type ) {
+		switch ($entity_type) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 					$meta_key = WPSHOP_PRODUCT_ATTRIBUTE_META_KEY;
 				break;
@@ -2717,22 +2717,22 @@ 
 	 */
 	public static function get_attribute_type_select_option_info($option_id, $field = 'label', $attribute_data_type = 'custom', $only_value = false) {
 		global $wpdb;
-		if( ! is_numeric( $option_id ) ) {
+		if (!is_numeric($option_id)) {
 			return '';
 		}
-		$option_id = (int) $option_id;
-		switch ( $attribute_data_type ) {
+		$option_id = (int)$option_id;
+		switch ($attribute_data_type) {
 			case 'internal':
 				$entity_infos = get_post($option_id);
-				if ( !empty($entity_infos) ) {
-					if ( !$only_value ) {
+				if (!empty($entity_infos)) {
+					if (!$only_value) {
 						/** Template parameters */
 						$template_part = 'product_attribute_value_internal';
 						$tpl_component = array();
 						$tpl_component['ATTRIBUTE_VALUE_POST_LINK'] = get_permalink($option_id);
 						$tpl_component['ATTRIBUTE_VALUE_POST_TITLE'] = $entity_infos->post_title;
 
-						foreach ( $entity_infos as $post_definition_key => $post_definition_value ) {
+						foreach ($entity_infos as $post_definition_key => $post_definition_value) {
 							$tpl_component['ATTRIBUTE_VALUE_' . strtoupper($post_definition_key)] = $entity_infos->$post_definition_key;
 						}
 
@@ -2747,8 +2747,8 @@ 
 				break;
 
 			default:
-				if ( ! array_key_exists( $option_id, self::$select_option_info_cache ) ) {
-					$query = $wpdb->prepare("SELECT " . $field . " FROM ".WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS." WHERE id=%d LIMIT 1", $option_id);
+				if (!array_key_exists($option_id, self::$select_option_info_cache)) {
+					$query = $wpdb->prepare("SELECT " . $field . " FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE id=%d LIMIT 1", $option_id);
 					self::$select_option_info_cache[$option_id] = $wpdb->get_var($query);
 				}
 				$info = self::$select_option_info_cache[$option_id];
@@ -2788,39 +2788,39 @@ 
 	 * @param string $data_type optionnal Le type de donnees choisi pour cet attribut (custom | internal)
 	 * @return string Le resultat sous forme de code html pour la liste des options
 	 */
-	function get_select_options_list($attribute_id, $data_type='custom') {
+	function get_select_options_list($attribute_id, $data_type = 'custom') {
 		global $wpdb;
 		$output = '';
 
 		$attribute_select_options = self::get_select_option_list_($attribute_id);
 
 		/*	Add possibily to choose datat type to use with list	*/
-		if(empty($attribute_id) || (!empty($attribute_select_options) && empty($attribute_select_options[0]->data_type_to_use))){
-			unset($input_def);$input_def=array();
+		if (empty($attribute_id) || (!empty($attribute_select_options) && empty($attribute_select_options[0]->data_type_to_use))) {
+			unset($input_def); $input_def = array();
 			$input_def['label'] = __('Type of data for list', 'wpshop');
 			$input_def['type'] = 'radio';
 			$input_def['name'] = 'data_type_to_use';
 			$input_def['valueToPut'] = 'index';
 			$input_def['possible_value'] = unserialize(WPSHOP_ATTR_SELECT_TYPE);
 			$input_def['option'] = 'class="wpshop_cls wpshop_attr_combo_data_type"';
-			$input_def['value'] = $data_type.'_data';
+			$input_def['value'] = $data_type . '_data';
 			$input_def['options_label']['original'] = true;
 			$output = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
 		}
 
-		if(!empty($attribute_id) || !empty($data_type)){
-			$defaut_value = ( !empty($attribute_select_options[0]) && !empty($attribute_select_options[0]->default_value) ) ? $attribute_select_options[0]->default_value : null;
+		if (!empty($attribute_id) || !empty($data_type)) {
+			$defaut_value = (!empty($attribute_select_options[0]) && !empty($attribute_select_options[0]->default_value)) ? $attribute_select_options[0]->default_value : null;
 			$default_is_serial = false;
-			if ( !empty($attribute_select_options[0]->default_value) && ($attribute_select_options[0]->default_value == serialize(false) || wpshop_tools::is_serialized( $attribute_select_options[0]->default_value ) ) ) {
+			if (!empty($attribute_select_options[0]->default_value) && ($attribute_select_options[0]->default_value == serialize(false) || wpshop_tools::is_serialized($attribute_select_options[0]->default_value))) {
 				$defaut_value = unserialize($attribute_select_options[0]->default_value);
 				$default_is_serial = true;
 			}
 			/**	Add a custom text first item of list	*/
-			$output .= '<div class="wpshop_cls" ><label for="text_for_empty_value" >' . __('Text displayed when no value selected', 'wpshop') . '</label> <input type="text" name="' . WPSHOP_DBT_ATTRIBUTE . '[default_value][field_options][label_for_first_item]" value="' . (($default_is_serial && is_array($defaut_value) && !empty($defaut_value["field_options"]["label_for_first_item"])) ? stripslashes( $defaut_value["field_options"]["label_for_first_item"] ) : __('Choose a value', 'wpshop')) . '" id="text_for_empty_value" /></div>';
+			$output .= '<div class="wpshop_cls" ><label for="text_for_empty_value" >' . __('Text displayed when no value selected', 'wpshop') . '</label> <input type="text" name="' . WPSHOP_DBT_ATTRIBUTE . '[default_value][field_options][label_for_first_item]" value="' . (($default_is_serial && is_array($defaut_value) && !empty($defaut_value["field_options"]["label_for_first_item"])) ? stripslashes($defaut_value["field_options"]["label_for_first_item"]) : __('Choose a value', 'wpshop')) . '" id="text_for_empty_value" /></div>';
 
-			if((($data_type == 'custom') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'custom'))){
+			if ((($data_type == 'custom') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'custom'))) {
 				$sub_output = '';
-				if ( !empty($attribute_select_options) && !empty($attribute_select_options[0]) && !empty($attribute_select_options[0]->id) ) {
+				if (!empty($attribute_select_options) && !empty($attribute_select_options[0]) && !empty($attribute_select_options[0]->id)) {
 					$sub_output .= '
 					<li class="wpshop_attribute_combo_options_container ui-state-disabled" >
 						<input type="radio" name="' . WPSHOP_DBT_ATTRIBUTE . '[default_value][default_value]" value="" id="default_value_empty" ' . (($default_is_serial && is_array($defaut_value) && empty($defaut_value["default_value"])) || empty($defaut_value) ? 'checked ' : '') . '/> <label for="default_value_empty">' . __('No default value', 'wpshop') . '</label>
@@ -2833,7 +2833,7 @@ 
 						$tpl_component['ADMIN_ATTRIBUTE_VALUES_OPTION_VALUE'] = str_replace(".", ",", $options->value);
 						$tpl_component['ADMIN_ATTRIBUTE_VALUES_OPTION_STATE'] = (!empty($options->id) && (($default_is_serial && is_array($defaut_value) && !empty($defaut_value["default_value"]) && ($defaut_value["default_value"] == $options->id))) ? ' checked="checked"' : '');
 						$tpl_component['ADMIN_ATTRIBUTE_VALUE_OPTIN_ACTIONS'] = '';
-						if( current_user_can('wpshop_delete_attributes_select_values') && ($options->value_id >= 0) ):
+						if (current_user_can('wpshop_delete_attributes_select_values') && ($options->value_id >= 0)):
 							$tpl_component['ADMIN_ATTRIBUTE_VALUE_OPTIN_ACTIONS'] .= wpshop_display::display_template_element('wpshop_admin_attr_option_value_item_deletion', $tpl_component, array('type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_id), 'admin');
 						endif;
 						$sub_output .= wpshop_display::display_template_element('wpshop_admin_attr_option_value_item', $tpl_component, array('type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_id), 'admin');
@@ -2841,13 +2841,13 @@ 
 					}
 				}
 				$add_button = $add_dialog_box = $user_more_script = '';
-				if( current_user_can('wpshop_add_attributes_select_values') ) {
+				if (current_user_can('wpshop_add_attributes_select_values')) {
 
 					$dialog_title = __('New value for attribute', 'wpshop');
 					$dialog_identifier = 'wpshop_new_attribute_option_value_add';
 					$dialog_input_identifier = 'wpshop_new_attribute_option_value';
 					ob_start();
-					include(WPSHOP_TEMPLATES_DIR.'admin/add_new_element_dialog.tpl.php');
+					include(WPSHOP_TEMPLATES_DIR . 'admin/add_new_element_dialog.tpl.php');
 					$add_dialog_box = ob_get_contents();
 					ob_end_clean();
 
@@ -2855,23 +2855,23 @@ 
 					$add_button_parent_class = 'wpshop_attribute_option_value_add';
 					$add_button_name = 'wpshop_add_option_to_select';
 					ob_start();
-					include(WPSHOP_TEMPLATES_DIR.'admin/add_new_element_with_dialog.tpl.php');
+					include(WPSHOP_TEMPLATES_DIR . 'admin/add_new_element_with_dialog.tpl.php');
 					$add_button = ob_get_contents();
 					ob_end_clean();
 
 					$user_more_script = '
-			jQuery("#'.$dialog_identifier.'").dialog({
+			jQuery("#'.$dialog_identifier . '").dialog({
 				modal: true,
 				dialogClass: "wpshop_uidialog_box",
 				autoOpen:false,
 				show: "blind",
 				resizable: false,
 				buttons:{
-					"'.__('Add', 'wpshop').'": function(){
+					"'.__('Add', 'wpshop') . '": function(){
 						var data = {
 							action: "new_option_for_select",
 							wpshop_ajax_nonce: "' . wp_create_nonce("wpshop_new_option_for_attribute_creation") . '",
-							attribute_new_label: jQuery("#'.$dialog_input_identifier.'").val(),
+							attribute_new_label: jQuery("#'.$dialog_input_identifier . '").val(),
 							attribute_identifier: "' . $attribute_id . '"
 						};
 						jQuery.post(ajaxurl, data, function(response) {
@@ -2887,21 +2887,21 @@ 
 
 						jQuery(this).children("img").show();
 					},
-					"'.__('Cancel', 'wpshop').'": function(){
+					"'.__('Cancel', 'wpshop') . '": function(){
 						jQuery(this).dialog("close");
 					}
 				},
 				close:function(){
-					jQuery("#'.$dialog_input_identifier.'").val("");
+					jQuery("#'.$dialog_input_identifier . '").val("");
 				}
 			});
-			jQuery(".'.$add_button_parent_class.' input").click(function(){
-				jQuery("#'.$dialog_identifier.'").dialog("open");
+			jQuery(".'.$add_button_parent_class . ' input").click(function(){
+				jQuery("#'.$dialog_identifier . '").dialog("open");
 			});';
 
 				}
 				$output .= $add_dialog_box . '
-	<ul id="sortable_attribute" class="wpshop_cls" >'.(count($attribute_select_options)>5 ? $add_button : '').$sub_output.$add_button.'
+	<ul id="sortable_attribute" class="wpshop_cls" >'.(count($attribute_select_options) > 5 ? $add_button : '') . $sub_output . $add_button . '
 	</ul>
 	<input type="hidden" value="' . wp_create_nonce("wpshop_new_option_for_attribute_deletion") . '" name="wpshop_new_option_for_attribute_deletion_nonce" id="wpshop_new_option_for_attribute_deletion_nonce" />
 	<script type="text/javascript" >
@@ -2917,7 +2917,7 @@ 
 					var data = {
 						action: "attribute_output_type",
 						current_type: jQuery("#wpshop_attributes_edition_table_field_id_frontend_input").val(),
-						elementIdentifier: "'.$attribute_id.'",
+						elementIdentifier: "'.$attribute_id . '",
 						data_type_to_use: jQuery(this).val(),
 						wpshop_ajax_nonce: "' . wp_create_nonce("wpshop_attribute_output_type_selection") . '"
 					};
@@ -2932,10 +2932,10 @@ 
 		});
 	</script>';
 			}
-			elseif((($data_type == 'internal') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'internal'))){
-				$sub_output='';
+			elseif ((($data_type == 'internal') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'internal'))) {
+				$sub_output = '';
 				$wp_types = unserialize(WPSHOP_INTERNAL_TYPES);
-				unset($input_def);$input_def=array();
+				unset($input_def); $input_def = array();
 				$input_def['label'] = __('Type of data for list', 'wpshop');
 				$input_def['type'] = 'select';
 				$input_def['name'] = 'default_value][default_value';
@@ -2944,20 +2944,20 @@ 
 				$input_def['possible_value'] = $wp_types;
 				$input_def['value'] = (($default_is_serial && is_array($defaut_value) && !empty($defaut_value["default_value"])) ? $defaut_value["default_value"] : (!empty($defaut_value) ? $defaut_value : null));
 				$combo_wp_type = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
-				$output .= '<div class="wpshop_cls">'.$combo_wp_type.'</div>';
-				if ( !empty($attribute_id) ) {
+				$output .= '<div class="wpshop_cls">' . $combo_wp_type . '</div>';
+				if (!empty($attribute_id)) {
 					$option_list = '<div>' . __('You can reorder element for display them in the order you want into frontend part', 'wpshop') . '</div>';
-					$options_for_current_attribute = query_posts( array('post_type' => $input_def['value'], 'posts_per_page' => -1, 'orderby' => 'menu_order', 'order' => 'ASC' ) );
-					if ( !empty($options_for_current_attribute) ) {
+					$options_for_current_attribute = query_posts(array('post_type' => $input_def['value'], 'posts_per_page' => -1, 'orderby' => 'menu_order', 'order' => 'ASC'));
+					if (!empty($options_for_current_attribute)) {
 						$option_list .= '<ul class="wpshop_attribute_combo_values_list_container" >';
 						$current_order = ' ';
-						foreach ( $options_for_current_attribute as $options_def ) {
+						foreach ($options_for_current_attribute as $options_def) {
 							$current_order .= 'post_' . $options_def->ID . ',';
 							$option_list .= '<li id="post_' . $options_def->ID . '" class="wpshop_attribute_combo_values_list_item wpshop_attribute_combo_values_list_item_' . $options_def->ID . '" ><span class="wpshop_internal_value_for_option_list_identifier" >#' . $options_def->ID . '</span> ' . $options_def->post_title . '</li>';
 						}
 						$option_list .= '</ul><input type="hidden" value="' . substr($current_order, 0, -1) . '" name="' . WPSHOP_DBT_ATTRIBUTE . '[wpshop_attribute_combo_values_list_order_def]" id="wpshop_attribute_combo_values_list_order_def" />';
 					}
-					$output .= '<div class="wpshop_cls">'.$option_list.'</div>';
+					$output .= '<div class="wpshop_cls">' . $option_list . '</div>';
 				}
 			}
 		}
@@ -2985,8 +2985,8 @@ 
 		$attribute_list_for_entity = self::getElement($entity_id, "'valid'", 'entity_id', true);
 
 		/*	Read the list	*/
-		if ( !empty ($attribute_list_for_entity ) ) {
-			foreach ( $attribute_list_for_entity as $attribute) {
+		if (!empty ($attribute_list_for_entity)) {
+			foreach ($attribute_list_for_entity as $attribute) {
 				switch ($list_for) {
 					case 'attribute_value':
 							$checkbox_state = ' ';
@@ -2995,8 +2995,8 @@ 
 								<select id="wpshop_shortcode_element_attribute_value_product_list_' . $attribute->id . '" class="wpshop_shortcode_element_attribute_value_product_list" >';
 
 							global $post;
-							$posts = get_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'numberposts' => -1) );
-							foreach( $posts as $post ) :
+							$posts = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'numberposts' => -1));
+							foreach ($posts as $post) :
 								setup_postdata($post);
 								$attribute_possible_values .= '<option value="' . get_the_ID() . '" >' . get_the_ID() . ' - ' . get_the_title() . '</option>';
 							endforeach;
@@ -3012,23 +3012,23 @@ 
 
 						$checkbox_state = 'disabled ';
 						$attribute_possible_values = '';
-						if ( !empty($attribute_values) ) {
+						if (!empty($attribute_values)) {
 							$checkbox_state = '';
 							$attribute_possible_values = '
 							<div class="wpshop_shortcode_element_product_listing_per_attribute_value wpshop_shortcode_element_prodcut_listing_per_attribute_value_' . $attribute->code . '_container" >
 								<select id="wpshop_attribute_value_for_shortcode_generation_' . $attribute->id . '" class="wpshop_shortcode_element_prodcut_listing_per_attribute_value hidden" >';
 
-								if ( ($attribute->data_type == 'integer') && ( ($attribute->backend_input == 'select') || ($attribute->backend_input == 'multiple-select') ) ) {
+								if (($attribute->data_type == 'integer') && (($attribute->backend_input == 'select') || ($attribute->backend_input == 'multiple-select'))) {
 									$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id=%d ORDER BY position", $attribute->id);
 									$possible_values = $wpdb->get_results($query);
 									$already_selected_values = array();
 									foreach ($attribute_values as $attribute_value) {
-										if ( !empty($attribute_value->value) ) {
+										if (!empty($attribute_value->value)) {
 											$already_selected_values[] = $attribute_value->value;
 										}
 									}
 									foreach ($possible_values as $value) {
-										if ( in_array( $value->id, $already_selected_values ) ) {
+										if (in_array($value->id, $already_selected_values)) {
 											$attribute_possible_values .= '
 									<option value="' . $value->value . '" >' . $value->label . '</option>';
 										}
@@ -3036,7 +3036,7 @@ 
 								}
 								else {
 									foreach ($attribute_values as $attribute_value) {
-										if ( !empty($attribute_value->value) ) {
+										if (!empty($attribute_value->value)) {
 											$attribute_possible_values .= '
 									<option value="' . $attribute_value->value . '" >' . $attribute_value->value . '</option>';
 										}
@@ -3065,23 +3065,23 @@ 
 	 *
 	 * @return object The attribute list as a wordpress database object
 	 */
-	function get_attribute_list_in_same_set_section( $attribute_code ) {
+	function get_attribute_list_in_same_set_section($attribute_code) {
 		global $wpdb;
 
 		$attribute_def = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 
 		/** Get the entire list of attribute in price set section for display	*/
-		$query = $wpdb->prepare( "SELECT entity_type_id, attribute_set_id, attribute_group_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_id = %d AND status = 'valid'", $attribute_def->id);
+		$query = $wpdb->prepare("SELECT entity_type_id, attribute_set_id, attribute_group_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_id = %d AND status = 'valid'", $attribute_def->id);
 		$attribute_attribution_def = $wpdb->get_row($query);
 
-		$query = $wpdb->prepare( "
+		$query = $wpdb->prepare("
 							SELECT ATTR.code, is_visible_in_front_listing, is_visible_in_front
 							FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS SET_SECTION_DETAIL
 								INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR ON (ATTR.id = SET_SECTION_DETAIL.attribute_id)
 							WHERE entity_type_id = %d
 								AND attribute_set_id = %d
 								AND attribute_group_id = %d",
-				$attribute_attribution_def->entity_type_id, $attribute_attribution_def->attribute_set_id, $attribute_attribution_def->attribute_group_id );
+				$attribute_attribution_def->entity_type_id, $attribute_attribution_def->attribute_set_id, $attribute_attribution_def->attribute_group_id);
 		$atribute_list = $wpdb->get_results($query);
 
 		return $atribute_list;
@@ -3092,7 +3092,7 @@ 
 	 * @param unknown_type $current_entity_id
 	 * @return Ambigous <multitype:, multitype:NULL >
 	 */
-	public static function get_variation_available_attribute( $current_entity_id ) {
+	public static function get_variation_available_attribute($current_entity_id) {
 		global $wpdb;
 		$final_list = array();
 
@@ -3100,7 +3100,7 @@ 
 		$query = $wpdb->prepare(
 				"SELECT ATT.*, ENTITY_META.meta_value
 				FROM " . self::getDbTable() . " AS ATT
-					INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_DETAILS. " AS ATT_DETAILS ON ((ATT_DETAILS.attribute_id = ATT.id) AND (ATT_DETAILS.entity_type_id = %d) AND (ATT_DETAILS.status = 'valid'))
+					INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS ATT_DETAILS ON ((ATT_DETAILS.attribute_id = ATT.id) AND (ATT_DETAILS.entity_type_id = %d) AND (ATT_DETAILS.status = 'valid'))
 					INNER JOIN " . $wpdb->postmeta . " AS ENTITY_META ON ((ENTITY_META.meta_key = %s) AND (ENTITY_META.meta_value = ATT_DETAILS.attribute_set_id))
 				WHERE ATT.status IN ('valid')
 					AND ATT.is_used_for_variation = %s
@@ -3110,10 +3110,10 @@ 
 		);
 		$attribute_list = $wpdb->get_results($query);
 		foreach ($attribute_list as $attribute) {
-			if ( !in_array($attribute->code, unserialize(WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE)) && in_array($attribute->backend_input, array('select', 'multiple-select')) ) {
-				$attribute_values_for_variations = wpshop_attributes::get_affected_value_for_list( $attribute->code, $current_entity_id, $attribute->data_type_to_use );
+			if (!in_array($attribute->code, unserialize(WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE)) && in_array($attribute->backend_input, array('select', 'multiple-select'))) {
+				$attribute_values_for_variations = wpshop_attributes::get_affected_value_for_list($attribute->code, $current_entity_id, $attribute->data_type_to_use);
 
-				if ( empty($attribute_values_for_variations) ) {
+				if (empty($attribute_values_for_variations)) {
 					$final_list['unavailable'][$attribute->code]['label'] = $attribute->frontend_label;
 					$final_list['unavailable'][$attribute->code]['values'] = array();
 					$final_list['unavailable'][$attribute->code]['attribute_complete_def'] = $attribute;
@@ -3133,16 +3133,16 @@ 
 	 * @param integer $current_entity_id The current element edited
 	 * @return Ambigous <string, string, mixed>
 	 */
-	public static function get_variation_available_attribute_display( $current_entity_id, $variation_type = 'multiple' ) {
+	public static function get_variation_available_attribute_display($current_entity_id, $variation_type = 'multiple') {
 		$attribute_list = wpshop_attributes::get_variation_available_attribute($current_entity_id);
 
 		$attribute_defined_as_available_for_variation = '';
-		if ( !empty($attribute_list) ) {
+		if (!empty($attribute_list)) {
 			foreach ($attribute_list as $list_type => $attribute_list_by_type) {
 				$sub_attribute_list = '';
 				foreach ($attribute_list_by_type as $attribute_code => $attribute_def) {
 					$tpl_component = array();
-					if ( $list_type == 'available' ) {
+					if ($list_type == 'available') {
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_LABEL_STATE'] = '';
 						$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = '';
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL_EXPLAINATION'] = '';
@@ -3156,13 +3156,13 @@ 
 					$tpl_component['ADMIN_ATTRIBUTE_CODE_FOR_VARIATION'] = $attribute_code;
 					$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_NAME'] = $attribute_code;
 					$tpl_component['ADMIN_VARIATION_ATTRIBUTE_CONTAINER_CLASS'] = ' wpshop_attribute_for_variation_' . $attribute_code;
-					$tpl_component['ADMIN_VARIATION_NEW_SINGLE_LABEL'] = __( $attribute_def['label'], 'wpshop' );
+					$tpl_component['ADMIN_VARIATION_NEW_SINGLE_LABEL'] = __($attribute_def['label'], 'wpshop');
 					$tpl_component['ADMIN_VARIATION_NEW_SINGLE_INPUT'] = '';
-					if ( $variation_type == 'single' ) {
-						$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute_def['attribute_complete_def'], $attribute_def['values'], array('from' => 'frontend', 'field_custom_name_prefix' => 'variation_attr', 'input_class' => ' variation_attribute_usable_input') );
-						if ( !empty($attribute_output_def['possible_value']) ) {
-							foreach( $attribute_output_def['possible_value'] as $value_id => $value ){
-								if ( !in_array($value_id, $attribute_def['values']) ) {
+					if ($variation_type == 'single') {
+						$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_def['attribute_complete_def'], $attribute_def['values'], array('from' => 'frontend', 'field_custom_name_prefix' => 'variation_attr', 'input_class' => ' variation_attribute_usable_input'));
+						if (!empty($attribute_output_def['possible_value'])) {
+							foreach ($attribute_output_def['possible_value'] as $value_id => $value) {
+								if (!in_array($value_id, $attribute_def['values'])) {
 									unset($attribute_output_def['possible_value'][$value_id]);
 								}
 							}
@@ -3177,7 +3177,7 @@ 
 			}
 		}
 
-		return array($attribute_defined_as_available_for_variation, ( (!empty($attribute_list['available']) ) ? $attribute_list['available'] : ''), ( ( !empty($attribute_list['unavailable']) ) ? $attribute_list['unavailable'] : ''));
+		return array($attribute_defined_as_available_for_variation, ((!empty($attribute_list['available'])) ? $attribute_list['available'] : ''), ((!empty($attribute_list['unavailable'])) ? $attribute_list['unavailable'] : ''));
 	}
 
 	/**
@@ -3186,18 +3186,18 @@ 
 	 * @param array $variations_attribute_parameters Allows to give some parameters for customize list
 	 * @return string The output for all specific attribute in each product with option
 	 */
-	public static function get_variation_attribute( $variations_attribute_parameters ) {
+	public static function get_variation_attribute($variations_attribute_parameters) {
 		$output = '';
 
 		$attribute_list = wpshop_attributes::getElement('yes', "'valid'", "is_used_in_variation", true);
-		if ( !empty( $attribute_list ) ) {
+		if (!empty($attribute_list)) {
 			$tpl_component = array();
 			$tpl_component['ADMIN_VARIATION_DETAIL'] = '';
 			$price_piloting_option = get_option('wpshop_shop_price_piloting');
-			foreach ( $attribute_list as $attribute_def ) {
+			foreach ($attribute_list as $attribute_def) {
 
 				$variations_attribute_parameters['field_custom_name_prefix'] = $variations_attribute_parameters['field_name'] . '[attribute][' . $attribute_def->data_type . ']';
-				$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute_def, (!empty($variations_attribute_parameters['variation_dif_values'][$attribute_def->code]) ? $variations_attribute_parameters['variation_dif_values'][$attribute_def->code] : ''), $variations_attribute_parameters );
+				$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_def, (!empty($variations_attribute_parameters['variation_dif_values'][$attribute_def->code]) ? $variations_attribute_parameters['variation_dif_values'][$attribute_def->code] : ''), $variations_attribute_parameters);
 
 				$field_output = $attribute_output_def['output'];
 
@@ -3209,9 +3209,9 @@ 
 				$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_ID'] = $attribute_output_def['id'];
 				$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_LABEL'] = $attribute_output_def['label'];
 				$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_INPUT'] = $field_output;
-				if( isset( $variations_attribute_parameters['post_id'] ) ) {
-					$attribute_option_display = $attribute_def->backend_input=='select' && (strtolower( __(self::get_attribute_type_select_option_info($attribute_output_def['value'], 'value'), 'wpshop') ) == strtolower( __('yes', 'wpshop') )) ? '' : ' wpshopHide';
-					$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_INPUT'] .= '<div class="attribute_option_'.$attribute_def->code.''.$attribute_option_display.'">'.self::get_attribute_option_fields($variations_attribute_parameters['post_id'], $attribute_def->code).'</div>';
+				if (isset($variations_attribute_parameters['post_id'])) {
+					$attribute_option_display = $attribute_def->backend_input == 'select' && (strtolower(__(self::get_attribute_type_select_option_info($attribute_output_def['value'], 'value'), 'wpshop')) == strtolower(__('yes', 'wpshop'))) ? '' : ' wpshopHide';
+					$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_INPUT'] .= '<div class="attribute_option_' . $attribute_def->code . '' . $attribute_option_display . '">' . self::get_attribute_option_fields($variations_attribute_parameters['post_id'], $attribute_def->code) . '</div>';
 				}
 				$tpl_component['ADMIN_VARIATION_DETAIL'] .= wpshop_display::display_template_element('wpshop_admin_variation_item_details_line', $sub_tpl_component, array(), 'admin');
 				unset($sub_tpl_component);
@@ -3222,7 +3222,7 @@ 
 		return $output;
 	}
 
-	public static function get_attribute_user_defined( $use_defined_parameters, $status = "'publish'" ) {
+	public static function get_attribute_user_defined($use_defined_parameters, $status = "'publish'") {
 		global $wpdb;
 		$attribute_user_defined_list = array();
 
@@ -3249,12 +3249,12 @@ 
 	 * @param string $post_type The current
 	 *
 	 */
-	function quick_edit( $column_name, $entity ) {
-		switch ( $entity ) {
+	function quick_edit($column_name, $entity) {
+		switch ($entity) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 				$attribute_def = wpshop_attributes::getElement($column_name, "'valid'", 'code');
-				if ( !empty($attribute_def) ) {
-					$input_def = self::get_attribute_field_definition( $attribute_def, '', array('input_class' => ' wpshop_bulk_and_quick_edit_input') );
+				if (!empty($attribute_def)) {
+					$input_def = self::get_attribute_field_definition($attribute_def, '', array('input_class' => ' wpshop_bulk_and_quick_edit_input'));
 					$input = wpshop_form::check_input_type($input_def, $input_def['input_domain']);
 ?>
 	<div class="wpshop_bulk_and_quick_edit_column_container wpshop_bulk_and_quick_edit_column_<?php echo $column_name; ?>_container">
@@ -3274,12 +3274,12 @@ 
 	 * @param string $post_type The current
 	 *
 	 */
-	public static function bulk_edit( $column_name, $entity ) {
-		switch ( $entity ) {
+	public static function bulk_edit($column_name, $entity) {
+		switch ($entity) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 				$attribute_def = wpshop_attributes::getElement($column_name, "'valid'", 'code');
-				if ( !empty($attribute_def) ) {
-					$input_def = self::get_attribute_field_definition( $attribute_def, '', array('input_class' => ' wpshop_bulk_and_quick_edit_input') );
+				if (!empty($attribute_def)) {
+					$input_def = self::get_attribute_field_definition($attribute_def, '', array('input_class' => ' wpshop_bulk_and_quick_edit_input'));
 					$input = wpshop_form::check_input_type($input_def, $input_def['input_domain']);
 ?>
 	<div class="wpshop_bulk_and_quick_edit_column_container wpshop_bulk_and_quick_edit_column_<?php echo $column_name; ?>_container">

includes/librairies/purchase/orders.class.php

Indentation +7 added lines, -7 removed lines

@@ -243,7 +243,7 @@ 
 
 	/** Generate the billing reference regarding the order $order_id
 	 * @return void
-	*/
+	 */
 	function order_generate_billing_number($order_id, $force_invoicing = false){
 		global $wpdb, $wpshop_modules_billing;
 
@@ -264,8 +264,8 @@ 
 
 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
-	* @return int
-	*/
+	 * @return int
+	 */
 	public static function get_new_order_reference(){
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
@@ -285,8 +285,8 @@ 
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
-	* @return int
-	*/
+	 * @return int
+	 */
 	public static function get_new_pre_order_reference($save = true){
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
@@ -348,7 +348,7 @@ 
 
 	/** Set the custom colums
 	 * @return array
-	*/
+	 */
 	static function orders_edit_columns($columns){
 	  $columns = array(
 		'cb' => '<input type="checkbox" />',
@@ -367,7 +367,7 @@ 
 
 	/** Give the content by column
 	 * @return array
-	*/
+	 */
 	public static function orders_custom_columns($column, $post_id) {
 		if ( get_post_type( $post_id ) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) {
 			global $civility, $order_status;

Spacing +138 added lines, -138 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'));
 }
 
 /**
@@ -70,12 +70,12 @@ 
 		/**	Add action button	*/
 		add_meta_box(
 			'wpshop_order_actions',
-			'<span class="dashicons dashicons-info"></span> '.__('Actions on order', 'wpshop'),
+			'<span class="dashicons dashicons-info"></span> ' . __('Actions on order', 'wpshop'),
 			array('wpshop_orders', 'order_actions'),
 				WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'high'
 		);
 
-		if ( !in_array( $post->post_status, array( 'auto-draft' ) ) ) {
+		if (!in_array($post->post_status, array('auto-draft'))) {
 			add_meta_box('wpshop_credit_actions', __('Credit on order', 'wpshop'), array('wps_credit', 'wps_credit_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
 		}
 
@@ -100,7 +100,7 @@ 
 	 *
 	 * @param object $order The current order being edited
 	 */
-	public static function order_actions( $order ) {
+	public static function order_actions($order) {
 		$output = '';
 
 		$order_status = unserialize(WPSHOP_ORDER_STATUS);
@@ -108,34 +108,34 @@ 
 
 		$tpl_component = array();
 
-		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url( get_delete_post_link($order->ID) ) , 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') :  __('Move to Trash', 'wpshop'))), array(), 'admin');
-		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can( "delete_post", $order->ID ) ? $delete_button : '';
+		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url(get_delete_post_link($order->ID)), 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') : __('Move to Trash', 'wpshop'))), array(), 'admin');
+		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can("delete_post", $order->ID) ? $delete_button : '';
 
 		/**	Add an action list	*/
 		$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] = '';
 
 		/**	Display main information about the order	*/
 		$order_main_info = '';
-		if(!empty($order_postmeta['order_date'])){
-			$order_main_info .=  '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>'.__('Order date','wpshop').' : </strong><br/>'.mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true).'</div>';
+		if (!empty($order_postmeta['order_date'])) {
+			$order_main_info .= '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>' . __('Order date', 'wpshop') . ' : </strong><br/>' . mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true) . '</div>';
 		}
 		$order_main_info .= '<div class="wps-product-section">';
-		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
-			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
+		if (empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))) {
+			$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Temporary quotation reference', 'wpshop') . ': </strong>' . self::get_new_pre_order_reference(false) . '<br/>';
 		}
-		else{
-			if(!empty($order_postmeta['order_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
+		else {
+			if (!empty($order_postmeta['order_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Order reference', 'wpshop') . ' : </strong>' . $order_postmeta['order_key'] . '<br/>';
 			}
-			if(!empty($order_postmeta['order_temporary_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Pre-order reference','wpshop').': </strong>'.$order_postmeta['order_temporary_key'].'<br/>';
-				$post_ID = !empty( $_GET['post'] ) ? (int) $_GET['post'] : 0;
-				$order_main_info .= '<a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' . $post_ID . '&mode=pdf' ) . '">' .__('Download the quotation', 'wpshop'). '</a><br />';
+			if (!empty($order_postmeta['order_temporary_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Pre-order reference', 'wpshop') . ': </strong>' . $order_postmeta['order_temporary_key'] . '<br/>';
+				$post_ID = !empty($_GET['post']) ? (int)$_GET['post'] : 0;
+				$order_main_info .= '<a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $post_ID . '&mode=pdf') . '">' . __('Download the quotation', 'wpshop') . '</a><br />';
 			}
-			if(!empty($order_postmeta['order_invoice_ref'])){
+			if (!empty($order_postmeta['order_invoice_ref'])) {
 				$sub_tpl_component = array();
-				$order_invoice_download = '<a href="' . admin_url( 'admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&invoice_ref=' . $order_postmeta['order_invoice_ref'] . '&mode=pdf' ) . '">' . __('Download invoice', 'wpshop') . '</a><br />';
-				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
+				$order_invoice_download = '<a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&invoice_ref=' . $order_postmeta['order_invoice_ref'] . '&mode=pdf') . '">' . __('Download invoice', 'wpshop') . '</a><br />';
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Invoice number', 'wpshop') . ': </strong>' . $order_postmeta['order_invoice_ref'] . '<br/>' . $order_invoice_download . '';
 			}
 			else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
@@ -145,7 +145,7 @@ 
 
 
 		/*Add the current order status in display**/
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= ( !empty($order_postmeta['order_status']) ) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) ) : '';
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= (!empty($order_postmeta['order_status'])) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop'))) : '';
 
 			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= $order_main_info;
 
@@ -163,8 +163,8 @@ 
 			</div>';
 		}*/
 
-		if( ( ( !empty($order_postmeta['cart_type']) && $order_postmeta['cart_type'] == 'quotation' ) || !empty( $order_postmeta['order_temporary_key'] ) ) && in_array( $order_postmeta['order_status'], array( 'awaiting_payment', 'partially_paid' ) ) && (float) $order_postmeta['order_amount_to_pay_now'] != (float) 0 ) {
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section">' . self::display_customer_pay_quotation( isset( $order_postmeta['pay_quotation'] ), $order->ID ) . '</div>';
+		if (((!empty($order_postmeta['cart_type']) && $order_postmeta['cart_type'] == 'quotation') || !empty($order_postmeta['order_temporary_key'])) && in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid')) && (float)$order_postmeta['order_amount_to_pay_now'] != (float)0) {
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section">' . self::display_customer_pay_quotation(isset($order_postmeta['pay_quotation']), $order->ID) . '</div>';
 		}
 
 		/**
@@ -175,30 +175,30 @@ 
 		}*/
 
 		/*Add the button regarding the order status**/
-		if ( !empty($order_postmeta['order_status']) ) {
-			if( $order_postmeta['order_status'] == 'awaiting_payment' ) {
-				$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_'.$order->ID.'" >'.__('Cancel this order', 'wpshop').'</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
+		if (!empty($order_postmeta['order_status'])) {
+			if ($order_postmeta['order_status'] == 'awaiting_payment') {
+				$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_' . $order->ID . '" >' . __('Cancel this order', 'wpshop') . '</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
 			}
-			$credit_meta = get_post_meta( $order->ID, '_wps_order_credit', true );
+			$credit_meta = get_post_meta($order->ID, '_wps_order_credit', true);
 
-			$total_received = (float) 0;
-			if ( ! empty( $order_postmeta['order_payment'] ) && ! empty( $order_postmeta['order_payment']['received'] ) ) {
-				foreach( $order_postmeta['order_payment']['received'] as $received ) {
-					$total_received += (float) isset( $received['received_amount'] ) ? $received['received_amount'] : 0;
+			$total_received = (float)0;
+			if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received'])) {
+				foreach ($order_postmeta['order_payment']['received'] as $received) {
+					$total_received += (float)isset($received['received_amount']) ? $received['received_amount'] : 0;
 				}
 			}
 
-			if ( empty($credit_meta) && (float) 0 !== $total_received ) {
-				if( $order_postmeta['order_status'] == 'refunded') {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok' ). '" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
+			if (empty($credit_meta) && (float)0 !== $total_received) {
+				if ($order_postmeta['order_status'] == 'refunded') {
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' . __('Credit Slip number', 'wpshop') . ' : <strong>' . ((!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref'])) ? '<a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&amp;invoice_ref=' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '&credit_slip=ok') . '" target="_blank">' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '</a>' : '') . '</strong></div>';
 				}
 				else {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' . $order->ID . '">' . __('Refund this order', 'wpshop') . '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
 		}
-		$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] = strrev( preg_replace( strrev( '/wps-product-section/' ), '', strrev( $tpl_component['ADMIN_ORDER_ACTIONS_LIST'] ), 1 ) );
-		echo wpshop_display::display_template_element( 'wpshop_admin_order_action_box', $tpl_component, array( 'type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'id' => $order->ID ), 'admin' );
+		$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] = strrev(preg_replace(strrev('/wps-product-section/'), '', strrev($tpl_component['ADMIN_ORDER_ACTIONS_LIST']), 1));
+		echo wpshop_display::display_template_element('wpshop_admin_order_action_box', $tpl_component, array('type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'id' => $order->ID), 'admin');
 	}
 
 
@@ -206,7 +206,7 @@ 
 	function order_container_in_admin() {
 		global $post;
 		$output  = '<div id="wps_order_content_container">';
-		$output .= self::order_content( $post );
+		$output .= self::order_content($post);
 		$output .= '</div>';
 		echo $output;
 	}
@@ -217,13 +217,13 @@ 
 	 *
 	 * @param order $post The complete order content
 	 */
-	function order_content( $post ) {
+	function order_content($post) {
 		$order_content = '';
 
 		$order = get_post_meta($post->ID, '_order_postmeta', true);
 
 		$order_content .= '<div id="order_product_container" class="order_product_container wpshop_cls" >';
-		if($order){/*	Read the order content if the order has product	*/
+		if ($order) {/*	Read the order content if the order has product	*/
 			$order_content .= '<input type="hidden" value="" name="order_products_to_delete" id="order_products_to_delete" />' . wpshop_cart::display_cart(true, $order, 'admin');
 			if (empty($order['order_invoice_ref'])) {
 				$order_content .= '<div id="order_refresh_button_container" class="wpshop_clear_block" ><input type="button" class="button-primary alignright wpshopHide" id="wpshop_admin_order_recalculate" value="' . __('Refresh order informations', 'wpshop') . '" /></div>';
@@ -241,18 +241,18 @@ 
 	/** Generate the billing reference regarding the order $order_id
 	 * @return void
 	*/
-	function order_generate_billing_number($order_id, $force_invoicing = false){
+	function order_generate_billing_number($order_id, $force_invoicing = false) {
 		global $wpdb, $wpshop_modules_billing;
 
 		// Get the order from the db
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 
 		// If the payment is completed
-		if(($order['order_status']=='completed') || $force_invoicing) {
+		if (($order['order_status'] == 'completed') || $force_invoicing) {
 
 			// If the reference hasn't been generated yet
-			if(empty($order['order_invoice_ref'])) {
-				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number( $order_id );
+			if (empty($order['order_invoice_ref'])) {
+				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number($order_id);
 
 				update_post_meta($order_id, '_order_postmeta', $order);
 			}
@@ -263,45 +263,45 @@ 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
 	* @return int
 	*/
-	public static function get_new_order_reference(){
+	public static function get_new_order_reference() {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_ORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_ORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
 	* @return int
 	*/
-	public static function get_new_pre_order_reference($save = true){
+	public static function get_new_pre_order_reference($save = true) {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
-		if($save){
+		if ($save) {
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_PREORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_PREORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 
@@ -316,24 +316,24 @@ 
 	 *
 	 *	@return void
 	 */
-	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id='', $billing_address_id=''){
+	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id = '', $billing_address_id = '') {
 		/**	Get order informations	*/
 		$billing_info['id'] = get_post_meta($billing_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-		$billing_info['address'] = get_post_meta($billing_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-		$billing_info['address_id'] = ( !empty($_SESSION['billing_address']) ) ? intval( $_SESSION['billing_address'] ) : '';
-		if ( !empty($_SESSION['shipping_partner_id']) ) {
-			$partner_address_id = get_post_meta( $_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
+		$billing_info['address'] = get_post_meta($billing_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+		$billing_info['address_id'] = (!empty($_SESSION['billing_address'])) ? intval($_SESSION['billing_address']) : '';
+		if (!empty($_SESSION['shipping_partner_id'])) {
+			$partner_address_id = get_post_meta($_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
 			if (!empty($partner_address_id)) {
-				foreach( $partner_address_id as $address_id ) {
+				foreach ($partner_address_id as $address_id) {
 					$shipping_info['id'] = get_post_meta($address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
+					$shipping_info['address'] = get_post_meta($address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
 				}
 			}
 		}
 		else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
+			$shipping_info['address'] = get_post_meta($shipping_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+			$shipping_info['address_id'] = (!empty($_SESSION['shipping_address'])) ? intval($_SESSION['shipping_address']) : '';
 		}
 
 		$order_info = array('billing' => $billing_info, 'shipping' => $shipping_info);
@@ -346,7 +346,7 @@ 
 	/** Set the custom colums
 	 * @return array
 	*/
-	static function orders_edit_columns($columns){
+	static function orders_edit_columns($columns) {
 	  $columns = array(
 		'cb' => '<input type="checkbox" />',
 		'order_identifier' => __('Identifiers', 'wpshop'),
@@ -366,40 +366,40 @@ 
 	 * @return array
 	*/
 	public static function orders_custom_columns($column, $post_id) {
-		if ( get_post_type( $post_id ) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) {
+		if (get_post_type($post_id) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
 			global $civility, $order_status;
 
 			$metadata = get_post_custom();
 
-			$order_postmeta = isset($metadata['_order_postmeta'][0])?unserialize($metadata['_order_postmeta'][0]):'';
-			$addresses = get_post_meta($post_id,'_order_info', true);
+			$order_postmeta = isset($metadata['_order_postmeta'][0]) ? unserialize($metadata['_order_postmeta'][0]) : '';
+			$addresses = get_post_meta($post_id, '_order_info', true);
 
-			switch($column){
+			switch ($column) {
 				case "order_identifier":
-					if( !empty( $order_postmeta['order_key'] ) ) {
+					if (!empty($order_postmeta['order_key'])) {
 						echo '<b>' . $order_postmeta['order_key'] . '</b><br>';
 					}
-					if( !empty( $order_postmeta['order_invoice_ref'] ) ) {
+					if (!empty($order_postmeta['order_invoice_ref'])) {
 						echo '<i>' . $order_postmeta['order_invoice_ref'] . '</i>';
-					} elseif( !empty($order_postmeta['order_temporary_key'] ) ) {
+					} elseif (!empty($order_postmeta['order_temporary_key'])) {
 						echo '<b>' . $order_postmeta['order_temporary_key'] . '</b>';
 					}
 				break;
 
 				case "order_status":
-					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_'.$post_id.'">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
+					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_' . $post_id . '">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
 				break;
 
 				case "order_billing":
-					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
+					if (!empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address'])) {
 						$billing = $addresses['billing']['address'];
 					}
-					else if ( !empty($addresses['billing']) ) {
+					else if (!empty($addresses['billing'])) {
 						$billing = $addresses['billing'];
 					}
-					if ( !empty($billing) ) {
-						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null).' <strong>'.(!empty($billing['address_first_name']) ? $billing['address_first_name'] : null).' '.(!empty($billing['address_last_name']) ? $billing['address_last_name'] : null).'</strong>';
-						echo empty($billing['company']) ?'<br />' : ', <i>'.$billing['company'].'</i><br />';
+					if (!empty($billing)) {
+						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null) . ' <strong>' . (!empty($billing['address_first_name']) ? $billing['address_first_name'] : null) . ' ' . (!empty($billing['address_last_name']) ? $billing['address_last_name'] : null) . '</strong>';
+						echo empty($billing['company']) ? '<br />' : ', <i>' . $billing['company'] . '</i><br />';
 						echo !empty($billing['address']) ? $billing['address'] : null;
 						echo !empty($billing['postcode']) ? '<br />' . $billing['postcode'] . ' ' : null;
 						echo !empty($billing['city']) ? $billing['city'] . ', ' : null;
@@ -412,35 +412,35 @@ 
 				break;
 
 				case "order_shipping":
-					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
+					if (!empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address'])) {
 						$shipping = $addresses['shipping']['address'];
 					}
-					else if ( !empty($addresses['shipping']) ) {
+					else if (!empty($addresses['shipping'])) {
 						$shipping = $addresses['shipping'];
 					}
-					if ( !empty($shipping) ) {
-						echo '<strong>'.(!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null).' '.(!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null).'</strong>';
-						echo empty($shipping['company'])?'<br />':', <i>'.$shipping['company'].'</i><br />';
+					if (!empty($shipping)) {
+						echo '<strong>' . (!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null) . ' ' . (!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null) . '</strong>';
+						echo empty($shipping['company']) ? '<br />' : ', <i>' . $shipping['company'] . '</i><br />';
 						echo (!empty($shipping['address']) ? $shipping['address'] : null);
 						echo !empty($billing['postcode']) ? '<br />' . $billing['postcode'] . ' ' : null;
 						echo !empty($billing['city']) ? $billing['city'] . ', ' : null;
 						echo !empty($billing['country']) ? $billing['country'] : null;
 					}
-					else{
+					else {
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
 
 				case "order_type":
-						echo '<a href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.(!empty($order_postmeta['order_temporary_key']) ? __('Quotation','wpshop') :  __('Basic order','wpshop')).'</a>';
+						echo '<a href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . (!empty($order_postmeta['order_temporary_key']) ? __('Quotation', 'wpshop') : __('Basic order', 'wpshop')) . '</a>';
 						$buttons = '<p class="row-actions">';
 						// Voir la commande
-						$buttons .= '<a class="button button-small" href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.__('View', 'wpshop').'</a>';
+						$buttons .= '<a class="button button-small" href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . __('View', 'wpshop') . '</a>';
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
-							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader" data-nonce="' . wp_create_nonce("wpshop_dialog_inform_shipping_number") . '">'.__('Mark as shipped', 'wpshop').'</a> ';
+							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_' . $post_id . ' wps-bton-loader" data-nonce="' . wp_create_nonce("wpshop_dialog_inform_shipping_number") . '">' . __('Mark as shipped', 'wpshop') . '</a> ';
 						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment')) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';
@@ -453,7 +453,7 @@ 
 
 				case "order_total":
 					$currency = !empty($order_postmeta['order_currency']) ? $order_postmeta['order_currency'] : get_option('wpshop_shop_default_currency');
-					echo isset( $order_postmeta['order_grand_total'] ) ? number_format( $order_postmeta['order_grand_total'], 2, '.', '' ).' '.  wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
+					echo isset($order_postmeta['order_grand_total']) ? number_format($order_postmeta['order_grand_total'], 2, '.', '') . ' ' . wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
 				break;
 
 				/*case "order_actions":
@@ -481,10 +481,10 @@ 
 	}
 
 	public static function list_table_filters() {
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
 		if (isset($post_type)) {
 			if (post_type_exists($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER)) {
@@ -496,23 +496,23 @@ 
 				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, $entity_filter, '', 'index');
 				$min = $entity_filter_btpf;
 				$max = $entity_filter_btps;
-				echo ' <label for="entity_filter_btpf">'.__('Between two prices', 'wpshop').'</label> ';
-				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="'.__('Minimum price', 'wpshop').'"', null);
-				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="'.__('Maximum price', 'wpshop').'"', null);
+				echo ' <label for="entity_filter_btpf">' . __('Between two prices', 'wpshop') . '</label> ';
+				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="' . __('Minimum price', 'wpshop') . '"', null);
+				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="' . __('Maximum price', 'wpshop') . '"', null);
 			}
 		}
 	}
 
 	public static function list_table_filter_parse_query($query) {
 		global $pagenow, $wpdb;
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
-		if ( is_admin() && ($pagenow == 'edit.php') && !empty( $post_type ) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) && !empty( $entity_filter ) ) {
+		if (is_admin() && ($pagenow == 'edit.php') && !empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) && !empty($entity_filter)) {
 			$check = null;
-			switch ( $entity_filter ) {
+			switch ($entity_filter) {
 				case 'all':
 					$sql_query = $wpdb->prepare(
 						"SELECT ID
@@ -576,27 +576,27 @@ 
 						break;
 			}
 
-			if ( !empty( $check ) ) {
-				if( !empty($no_btp) && $no_btp == 'yes' ) {
+			if (!empty($check)) {
+				if (!empty($no_btp) && $no_btp == 'yes') {
 					$min = 'minimum';
 					$max = 'maximum';
 				} else {
-					$min = ( !empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf']) ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : 'minimum';
-					$max = ( !empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps']) ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : 'maximum';
+					$min = (!empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf'])) ? sanitize_text_field($_GET['entity_filter_btpf']) : 'minimum';
+					$max = (!empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps'])) ? sanitize_text_field($_GET['entity_filter_btps']) : 'maximum';
 				}
 				$results = $wpdb->get_results($sql_query);
 				$post_id_list = array();
 				$i = 0;
-				foreach($results as $item){
+				foreach ($results as $item) {
 					$meta_value = get_post_meta($item->ID, '_order_postmeta');
-					$price = ( !empty( $meta_value[0]['order_grand_total'] ) ) ? $meta_value[0]['order_grand_total'] : '';
-					if( $price >= $min || $min == 'minimum' ) {
-						if( $price <= $max || $max == 'maximum' ) {
+					$price = (!empty($meta_value[0]['order_grand_total'])) ? $meta_value[0]['order_grand_total'] : '';
+					if ($price >= $min || $min == 'minimum') {
+						if ($price <= $max || $max == 'maximum') {
 							$post_id_list[] = $item->ID;
 						}
 					}
 				}
-				if( empty($post_id_list) ) {
+				if (empty($post_id_list)) {
 					$post_id_list[] = 'no_result';
 				}
 				$query->query_vars[$check] = $post_id_list;
@@ -607,67 +607,67 @@ 
 
 
 
-	function latest_products_ordered ( $orders ) {
+	function latest_products_ordered($orders) {
 		global $wpdb;
 		$product_id = $output = '';
 		$products = array();
 		$display_option = get_option('wpshop_display_option');
-		if ( !empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered']) ) {
-			foreach( $orders as $order ) {
-				$order_content = get_post_meta( $order->ID, '_order_postmeta', true );
-				if ( !empty($order_content) && !empty( $order_content['order_items']) ) {
+		if (!empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered'])) {
+			foreach ($orders as $order) {
+				$order_content = get_post_meta($order->ID, '_order_postmeta', true);
+				if (!empty($order_content) && !empty($order_content['order_items'])) {
 
-					foreach( $order_content['order_items'] as $item ) {
-						if ( count( $products) >= $display_option['latest_products_ordered'] ) {
+					foreach ($order_content['order_items'] as $item) {
+						if (count($products) >= $display_option['latest_products_ordered']) {
 							continue;
 						}
 						$product_id = $item['item_id'];
-						if ( !empty( $item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition']) ) {
-							$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-							if ( !empty( $parent_def ) ) {
+						if (!empty($item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition'])) {
+							$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+							if (!empty($parent_def)) {
 								$parent_post = $parent_def['parent_post'];
 								$product_id = $parent_post->ID;
 							}
 						}
 
-						if ( !in_array($product_id, $products) ) {
+						if (!in_array($product_id, $products)) {
 							$products[] = $product_id;
 						}
 					}
 				}
 			}
-			if ( !empty($products) ) {
+			if (!empty($products)) {
 				$products_id = implode(",", $products);
-				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' .$products_id. '"]')) );
+				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' . $products_id . '"]')));
 			}
 		}
 		return $output;
 	}
 
-	function get_order_list_for_customer( $customer_id ) {
+	function get_order_list_for_customer($customer_id) {
 		global $wpdb;
 		$output = '';
 
-		if( !empty($customer_id) ) {
-			 $query = $wpdb->prepare( 'SELECT *
-							 		   FROM ' .$wpdb->posts. '
+		if (!empty($customer_id)) {
+			 $query = $wpdb->prepare('SELECT *
+							 		   FROM ' .$wpdb->posts . '
 							 		   WHERE post_author = %d
-							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			 $orders = $wpdb->get_results( $query );
+							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			 $orders = $wpdb->get_results($query);
 
-			 foreach( $orders as $order ) {
+			 foreach ($orders as $order) {
 
 			 }
 		}
 
 		return $output;
 	}
-	static function display_customer_pay_quotation( $state, $oid ) {
-		$label = ( ( $state ) ? __('Invalid quotation', 'wpshop') : __('Valid quotation', 'wpshop') );
-		$btn = '<p><a role="button" data-nonce="' . wp_create_nonce( 'wps_quotation_is_payable_by_customer' ) . '" class="wps-bton-' . ( ( $state ) ? 'third' : 'second' ) . '-mini-rounded quotation_is_payable_by_customer" href="#" >'.$label.'</a></p>';
-		if( $state ) {
+	static function display_customer_pay_quotation($state, $oid) {
+		$label = (($state) ? __('Invalid quotation', 'wpshop') : __('Valid quotation', 'wpshop'));
+		$btn = '<p><a role="button" data-nonce="' . wp_create_nonce('wps_quotation_is_payable_by_customer') . '" class="wps-bton-' . (($state) ? 'third' : 'second') . '-mini-rounded quotation_is_payable_by_customer" href="#" >' . $label . '</a></p>';
+		if ($state) {
 			//$btn .= '<a target="_blank" href="' . admin_url( 'admin-ajax.php?action=wps_checkout_quotation&order_id=' . $oid . '&is_link=link' ) . '">' . __( 'Pay link', 'wpshop' ) . '</a>';
-			$btn .= '<span><input id="wps_direct_link_url" type="text" value="' . wpshop_checkout::wps_direct_payment_link_url( $oid ) . '"/><a class="button" data-copy-target="#wps_direct_link_url" title="' . __( 'Copy', 'wpshop' ) . '"><span class="dashicons dashicons-clipboard"></span></a><a data-nonce="' . wp_create_nonce( 'wps_send_direct_payment_link' ) . '" role="button" class="button" href="#" title="' . __( 'Send by mail', 'wpshop' ) . '"><span class="dashicons dashicons-email"></span></a></span><span>' . sprintf( __( 'Link is valid until %s', 'wpshop' ), mysql2date( get_option( 'date_format' ), date_format( date_create( date('Y-m') . ' + 2month - 1day' ), 'Y-m-d H:i:s' ), true ) ) . '</span>';
+			$btn .= '<span><input id="wps_direct_link_url" type="text" value="' . wpshop_checkout::wps_direct_payment_link_url($oid) . '"/><a class="button" data-copy-target="#wps_direct_link_url" title="' . __('Copy', 'wpshop') . '"><span class="dashicons dashicons-clipboard"></span></a><a data-nonce="' . wp_create_nonce('wps_send_direct_payment_link') . '" role="button" class="button" href="#" title="' . __('Send by mail', 'wpshop') . '"><span class="dashicons dashicons-email"></span></a></span><span>' . sprintf(__('Link is valid until %s', 'wpshop'), mysql2date(get_option('date_format'), date_format(date_create(date('Y-m') . ' + 2month - 1day'), 'Y-m-d H:i:s'), true)) . '</span>';
 		}
 		return $btn;
 	}

Braces +14 added lines, -23 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Products management method file
  *
@@ -122,8 +124,7 @@ 
 		$order_main_info .= '<div class="wps-product-section">';
 		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
 			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
-		}
-		else{
+		} else{
 			if(!empty($order_postmeta['order_key'])){
 				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
 			}
@@ -136,8 +137,7 @@ 
 				$sub_tpl_component = array();
 				$order_invoice_download = '<a href="' . admin_url( 'admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&invoice_ref=' . $order_postmeta['order_invoice_ref'] . '&mode=pdf' ) . '">' . __('Download invoice', 'wpshop') . '</a><br />';
 				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
-			}
-			else {
+			} else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
 			}
 		}
@@ -191,8 +191,7 @@ 
 			if ( empty($credit_meta) && (float) 0 !== $total_received ) {
 				if( $order_postmeta['order_status'] == 'refunded') {
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok' ). '" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
-				}
-				else {
+				} else {
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
@@ -273,8 +272,7 @@ 
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
-		else { $order_current_number++; }
+		if(!$order_current_number) { $order_current_number = 1; } else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
 		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
@@ -294,8 +292,7 @@ 
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
-		else { $order_current_number++; }
+		if(!$order_current_number) { $order_current_number = 1; } else { $order_current_number++; }
 		if($save){
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
@@ -329,8 +326,7 @@ 
 					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
 				}
 			}
-		}
-		else {
+		} else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
 			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
 			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
@@ -393,8 +389,7 @@ 
 				case "order_billing":
 					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
 						$billing = $addresses['billing']['address'];
-					}
-					else if ( !empty($addresses['billing']) ) {
+					} else if ( !empty($addresses['billing']) ) {
 						$billing = $addresses['billing'];
 					}
 					if ( !empty($billing) ) {
@@ -405,8 +400,7 @@ 
 						echo !empty($billing['city']) ? $billing['city'] . ', ' : null;
 						echo !empty($billing['country']) ? $billing['country'] : null;
 						echo (!empty($billing['phone']) ? '<br /><b>' . $billing['phone'] . '</b>' : '');
-					}
-					else {
+					} else {
 						echo __('No information available for user billing', 'wpshop');
 					}
 				break;
@@ -414,8 +408,7 @@ 
 				case "order_shipping":
 					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
 						$shipping = $addresses['shipping']['address'];
-					}
-					else if ( !empty($addresses['shipping']) ) {
+					} else if ( !empty($addresses['shipping']) ) {
 						$shipping = $addresses['shipping'];
 					}
 					if ( !empty($shipping) ) {
@@ -425,8 +418,7 @@ 
 						echo !empty($billing['postcode']) ? '<br />' . $billing['postcode'] . ' ' : null;
 						echo !empty($billing['city']) ? $billing['city'] . ', ' : null;
 						echo !empty($billing['country']) ? $billing['country'] : null;
-					}
-					else{
+					} else{
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
@@ -439,8 +431,7 @@ 
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
 							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader" data-nonce="' . wp_create_nonce("wpshop_dialog_inform_shipping_number") . '">'.__('Mark as shipped', 'wpshop').'</a> ';
-						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						} else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';

includes/librairies/purchase/checkout.class.php

Indentation +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 	var $creating_account = true;
 
 	/** Constructor of the class
-	* @return void
-	*/
+	 * @return void
+	 */
 	function __construct () {
 	}
 

Braces +14 added lines, -12 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' ) ) {
@@ -58,12 +60,13 @@ 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
 						update_post_meta($order_id, '_wpshop_order_customer_id', $user_id);
+					} else {
+						$wpshop->add_error(__('You don\'t own the order', 'wpshop'));
 					}
-					else $wpshop->add_error(__('You don\'t own the order', 'wpshop'));
+				} else {
+					$wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 				}
-				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
-			}
-			else{
+			} else{
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
 					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
@@ -118,7 +121,9 @@ 
 						}
 					}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if(!empty($download_codes)) {
+					update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				}
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -140,8 +145,7 @@ 
 				// Si c'est un devis
 				if ( $paymentMethod == 'quotation' ) {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
-				}
-				else {
+				} else {
 					$order['order_key'] = wpshop_orders::get_new_order_reference();
 				}
 
@@ -202,8 +206,7 @@ 
 
 				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
-				}
-				else {
+				} else {
 					$email_option = get_option( 'wpshop_emails' );
 					if ( empty($email_option['send_confirmation_order_message']) ) {
 						$payment_method_option = get_option( 'wps_payment_mode' );
@@ -257,8 +260,7 @@ 
 
 			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
-			}
-			else {
+			} else {
 				$message_type = 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE';
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}

Spacing +87 added lines, -87 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'));
 }
 
 /**
@@ -25,11 +25,11 @@ 
 	/** Constructor of the class
 	* @return void
 	*/
-	function __construct () {
+	function __construct() {
 	}
 
 
-	public static function process_checkout($paymentMethod='paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
+	public static function process_checkout($paymentMethod = 'paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
 
 		global $wpdb, $wpshop, $wpshop_cart;
 		$wps_message = new wps_message_ctr();
@@ -38,22 +38,22 @@ 
 		if (is_user_logged_in()) :
 			$user_id = get_current_user_id();
 
-		if ( $customer_id != 0 ) {
+		if ($customer_id != 0) {
 			$user_id = $customer_id;
 		}
 
 			// If the order is already created in the db
-			if(!empty($order_id) && is_numeric($order_id)) {
+			if (!empty($order_id) && is_numeric($order_id)) {
 				$order = get_post_meta($order_id, '_order_postmeta', true);
 
-				if(!empty($order)) {
-					if($order['customer_id'] == $user_id) {
+				if (!empty($order)) {
+					if ($order['customer_id'] == $user_id) {
 						$order['payment_method'] = $paymentMethod;
-						$_SESSION['order_id'] = (int) $order_id;
+						$_SESSION['order_id'] = (int)$order_id;
 						// Store cart in session
 						//wpshop_cart::store_cart_in_session($order);
 						// Add a payment
-						$order['order_payment']['received'][] = array( 'method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id() );
+						$order['order_payment']['received'][] = array('method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id());
 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
@@ -63,12 +63,12 @@ 
 				}
 				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 			}
-			else{
+			else {
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
+					'post_title' => sprintf(__('Order - %s', 'wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
 					'post_status' => 'publish',
-					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field( $_POST['wps-customer-comment'] ) : '',
+					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field($_POST['wps-customer-comment']) : '',
 					'post_author' => $user_id,
 					'comment_status' => 'closed'
 				);
@@ -78,7 +78,7 @@ 
 				$order_tva = array();
 
 				//$cart = (array)$wpshop_cart->cart;
-				if ( !empty($_SESSION['cart']) && !empty( $_SESSION['cart']['shipping_method']) ) {
+				if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['shipping_method'])) {
 					$_SESSION['cart']['shipping_method'] = __('Standard shipping method', 'wpshop');
 				}
 				$cart = (array)$_SESSION['cart'];
@@ -90,35 +90,35 @@ 
 				$_SESSION['order_id'] = $order_id;
 
 				// Cr�ation des codes de t�l�chargement si il y a des produits t�l�chargeable dans le panier
-				if ( !empty( $cart['order_items'] ) ) {
-					foreach($cart['order_items'] as $c) {
+				if (!empty($cart['order_items'])) {
+					foreach ($cart['order_items'] as $c) {
 						$product_id = $c['item_id'];
 						$product = null;
-						if( isset( $c['item_meta']['variations'] ) ) {
-							foreach ( $c['item_meta']['variations'] as $variation_id => $variation ) {
-								if( isset( $variation['item_meta']['is_downloadable_'] ) ) {
+						if (isset($c['item_meta']['variations'])) {
+							foreach ($c['item_meta']['variations'] as $variation_id => $variation) {
+								if (isset($variation['item_meta']['is_downloadable_'])) {
 									$product_id = $c['item_id'] . '__' . $variation_id;
-									$product = wpshop_products::get_product_data( $product_id );
+									$product = wpshop_products::get_product_data($product_id);
 								}
 							}
 						}
-						if( !isset( $product ) ) {
-							$product = wpshop_products::get_product_data( $c['item_id'] );
+						if (!isset($product)) {
+							$product = wpshop_products::get_product_data($c['item_id']);
 							$product_id = $c['item_id'];
 							/** Check if it's a variation and check the parent product **/
-							if ( get_post_type( $c['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation( $c['item_id'] );
-								if ( !empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_']) ) {
+							if (get_post_type($c['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($c['item_id']);
+								if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_'])) {
 									$product['is_downloadable_'] = $parent_def['parent_post_meta']['is_downloadable_'];
 								}
 							}
 						}
-						if(!empty($product['is_downloadable_'])) {
+						if (!empty($product['is_downloadable_'])) {
 							$download_codes[$product_id] = array('item_id' => $product_id, 'download_code' => uniqid('', true));
 						}
 					}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if (!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_' . $order_id, $download_codes);
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -133,12 +133,12 @@ 
 					'order_payment' 		=> array(
 					'customer_choice' 		=> array('method' => $paymentMethod),
 					'received'				=> array('0' => array('method' => $paymentMethod, 'waited_amount' => $cart['order_amount_to_pay_now'], 'status' =>  'waiting_payment', 'author' => $user_id)),
-					'shipping_method'       => ( ( !empty( $_SESSION['shipping_method']) ) ? wpshop_tools::varSanitizer( $_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop') )
+					'shipping_method'       => ((!empty($_SESSION['shipping_method'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop'))
 					),
 				), $cart);
 
 				// Si c'est un devis
-				if ( $paymentMethod == 'quotation' ) {
+				if ($paymentMethod == 'quotation') {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
 				}
 				else {
@@ -146,9 +146,9 @@ 
 				}
 
 				//Round final amount
-				$order['order_grand_total'] = number_format( round($order['order_grand_total'], 2), 2, '.', '');
-				$order['order_total_ttc'] = number_format( round($order['order_total_ttc'], 2), 2, '.', '');
-				$order['order_amount_to_pay_now'] = number_format( round($order['order_amount_to_pay_now'], 2), 2, '.', '');
+				$order['order_grand_total'] = number_format(round($order['order_grand_total'], 2), 2, '.', '');
+				$order['order_total_ttc'] = number_format(round($order['order_total_ttc'], 2), 2, '.', '');
+				$order['order_amount_to_pay_now'] = number_format(round($order['order_amount_to_pay_now'], 2), 2, '.', '');
 
 				/** On enregistre la commande	*/
 				update_post_meta($order_id, '_order_postmeta', $order);
@@ -157,75 +157,75 @@ 
 				update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 
-				do_action( 'wps_order_extra_save', $order_id );
+				do_action('wps_order_extra_save', $order_id);
 
 				//Add an action to extra actions on order save
 				// @TODO : REQUEST
-				$args = array( 'order_id' => $order_id, 'posted_data' => $_REQUEST );
-				wpshop_tools::create_custom_hook( 'wps_order_extra_save_action', $args );
+				$args = array('order_id' => $order_id, 'posted_data' => $_REQUEST);
+				wpshop_tools::create_custom_hook('wps_order_extra_save_action', $args);
 
 				/**	Set custmer information for the order	*/
-				$shipping_address =  ( !empty($shipping_address_option) && !empty($shipping_address_option['activate']) ) ? ( ( !empty($_SESSION['shipping_address']) ) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id ) : '';
-				$billing_address =  ( !empty($_SESSION['billing_address']) ) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
+				$shipping_address = (!empty($shipping_address_option) && !empty($shipping_address_option['activate'])) ? ((!empty($_SESSION['shipping_address'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id) : '';
+				$billing_address = (!empty($_SESSION['billing_address'])) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
 
 
-				if ( !empty( $billing_address) ) {
+				if (!empty($billing_address)) {
 					wpshop_orders::set_order_customer_addresses($user_id, $order_id, $shipping_address, $billing_address);
 				}
 
-				if ( !empty($_SESSION['shipping_address_to_save']) ) {
+				if (!empty($_SESSION['shipping_address_to_save'])) {
 					$order_infos_postmeta = get_post_meta($order_id, '_order_info', true);
 					$order_infos_postmeta['shipping']['address'] = $_SESSION['shipping_address_to_save'];
 					$order_infos_postmeta['shipping']['address_id'] = '';
 					update_post_meta($order_id, '_order_info', $order_infos_postmeta);
-					unset( $_SESSION['shipping_address_to_save'] );
+					unset($_SESSION['shipping_address_to_save']);
 				}
 
 
 				/** Save Coupon use **/
-				if ( !empty($_SESSION['cart']['coupon_id']) ) {
+				if (!empty($_SESSION['cart']['coupon_id'])) {
 					$wps_coupon_mdl = new wps_coupon_model();
-					$wps_coupon_mdl->save_coupon_use( $_SESSION['cart']['coupon_id'] );
+					$wps_coupon_mdl->save_coupon_use($_SESSION['cart']['coupon_id']);
 				}
 
 				/**	Notify the customer as the case	*/
 				$user_info = get_userdata($user_id);
 				$email = $user_info->user_email;
-				$first_name = $user_info->user_firstname ;
+				$first_name = $user_info->user_firstname;
 				$last_name = $user_info->user_lastname;
 
 				// Envoie du message de confirmation de commande au client
-				$order_meta = get_post_meta( $order_id, '_order_postmeta', true);
+				$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
+				if (!empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 				}
 				else {
-					$email_option = get_option( 'wpshop_emails' );
-					if ( empty($email_option['send_confirmation_order_message']) ) {
-						$payment_method_option = get_option( 'wps_payment_mode' );
-						$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+					$email_option = get_option('wpshop_emails');
+					if (empty($email_option['send_confirmation_order_message'])) {
+						$payment_method_option = get_option('wps_payment_mode');
+						$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
-						$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' ) );
+						$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 					}
 				}
 
-				if ( empty($_SESSION['wps-pos-addon']) ) {
+				if (empty($_SESSION['wps-pos-addon'])) {
 					$email_option = get_option('wpshop_emails');
-					if( empty($email_option) || ( !empty($email_option) && empty($email_option['send_confirmation_order_message']) ) ){
-						self::send_order_email_to_administrator( $order_id, $user_info );
+					if (empty($email_option) || (!empty($email_option) && empty($email_option['send_confirmation_order_message']))) {
+						self::send_order_email_to_administrator($order_id, $user_info);
 					}
 				}
 
 
 				/** IF Order amount is 0, Finish the Order **/
-				if ( $cart['order_amount_to_pay_now'] == 0 ) {
+				if ($cart['order_amount_to_pay_now'] == 0) {
 					$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 					$payment_status = 'completed';
-					$params_array = array (
+					$params_array = array(
 						'method' =>'free',
 						'waited_amount' => $order_meta['order_amount_to_pay_now'],
 						'status' =>  'payment_received',
@@ -236,14 +236,14 @@ 
 					);
 					wpshop_payment::check_order_payment_total_amount($order_id, $params_array, $payment_status);
 				}
-				apply_filters( 'wpshop_finish_order_extra_actions', $order_id);
+				apply_filters('wpshop_finish_order_extra_actions', $order_id);
 			}
 		endif;
 		return $order_id;
 	}
 
-	public static function send_order_email_to_administrator ( $order_id, $customer_infos = ''  ) {
-		if ( !empty($order_id) ) {
+	public static function send_order_email_to_administrator($order_id, $customer_infos = '') {
+		if (!empty($order_id)) {
 			$wps_message = new wps_message_ctr();
 			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
 			//Send email to administrator(s)
@@ -251,11 +251,11 @@ 
 			$shop_admin_email = $shop_admin_email_option['contact_email'];
 			$order_tmp_key = '';
 
-			$shipping_mode_option = get_option( 'wps_shipping_mode' );
-			$shipping_method = ( !empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ( (!empty($order_infos['order_payment']['shipping_method']) ) ? $order_infos['order_payment']['shipping_method'] : '' );
+			$shipping_mode_option = get_option('wps_shipping_mode');
+			$shipping_method = (!empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ((!empty($order_infos['order_payment']['shipping_method'])) ? $order_infos['order_payment']['shipping_method'] : '');
 
 
-			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
+			if (!empty($order_infos) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key'])) {
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
 			}
 			else {
@@ -263,12 +263,12 @@ 
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}
 
-			$payment_method_option = get_option( 'wps_payment_mode' );
-			$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
+			$payment_method_option = get_option('wps_payment_mode');
+			$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
 
-			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => ( !empty($customer_infos) && !empty($customer_infos->user_email) ) ? $customer_infos->user_email : '' , 'customer_last_name' => ( !empty($customer_infos) && !empty($customer_infos->user_lastname) ) ? $customer_infos->user_lastname : '', 'customer_first_name' => ( !empty($customer_infos) && !empty($customer_infos->user_firstname) ) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '','order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' );
+			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => (!empty($customer_infos) && !empty($customer_infos->user_email)) ? $customer_infos->user_email : '', 'customer_last_name' => (!empty($customer_infos) && !empty($customer_infos->user_lastname)) ? $customer_infos->user_lastname : '', 'customer_first_name' => (!empty($customer_infos) && !empty($customer_infos->user_firstname)) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '');
 
-			$wps_message->wpshop_prepared_email( $shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
+			$wps_message->wpshop_prepared_email($shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
 		}
 	}
 
@@ -279,13 +279,13 @@ 
 	 * @param mixed $data Array or false.
 	 * @return void
 	 */
-	public static function wps_direct_payment_link( $data = false ) {
-		$data = empty( $data ) ? self::wps_direct_payment_link_verify_token() : $data;
-		if ( (bool) $data ) {
-			wps_orders_ctr::pay_quotation( $data['oid'] );
-			wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) ) ) . '?order_step=5' );
+	public static function wps_direct_payment_link($data = false) {
+		$data = empty($data) ? self::wps_direct_payment_link_verify_token() : $data;
+		if ((bool)$data) {
+			wps_orders_ctr::pay_quotation($data['oid']);
+			wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . '?order_step=5');
 		} else {
-			wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ) ) ) );
+			wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))));
 		}
 	}
 	/**
@@ -295,12 +295,12 @@ 
 	 * @param mixed $data Array or false.
 	 * @return void
 	 */
-	public static function wps_direct_payment_link_nopriv( $data = false ) {
-		$data = empty( $data ) ? self::wps_direct_payment_link_verify_token() : $data;
-		if ( (bool) $data ) {
-			wp_set_auth_cookie( $data['cid'], true, is_ssl() );
+	public static function wps_direct_payment_link_nopriv($data = false) {
+		$data = empty($data) ? self::wps_direct_payment_link_verify_token() : $data;
+		if ((bool)$data) {
+			wp_set_auth_cookie($data['cid'], true, is_ssl());
 		}
-		self::wps_direct_payment_link( $data );
+		self::wps_direct_payment_link($data);
 	}
 	/**
 	 * Verify token in request.
@@ -309,11 +309,11 @@ 
 	 * @return mixed Customer id or false.
 	 */
 	public static function wps_direct_payment_link_verify_token() {
-		$token = ! empty( $_GET['token'] ) ? sanitize_text_field( $_GET['token'] ) : '';
-		$order_id = ! empty( $_GET['order_id'] ) ? (int) $_GET['order_id'] : '';
-		$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
-		$customer_id = ! empty( $order_metadata['customer_id'] ) ? (int) $order_metadata['customer_id'] : false;
-		return ( (bool) $customer_id && wps_orders_ctr::wps_verify_token_order( $token, (int) $order_id ) ) ? array( 'oid' => $order_id, 'cid' => $customer_id ) : false;
+		$token = !empty($_GET['token']) ? sanitize_text_field($_GET['token']) : '';
+		$order_id = !empty($_GET['order_id']) ? (int)$_GET['order_id'] : '';
+		$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
+		$customer_id = !empty($order_metadata['customer_id']) ? (int)$order_metadata['customer_id'] : false;
+		return ((bool)$customer_id && wps_orders_ctr::wps_verify_token_order($token, (int)$order_id)) ? array('oid' => $order_id, 'cid' => $customer_id) : false;
 	}
 	/**
 	 * Get URL for wps_direct_link.
@@ -322,7 +322,7 @@ 
 	 * @param  int $order_id OrderID.
 	 * @return string Url or empty string.
 	 */
-	public static function wps_direct_payment_link_url( $order_id ) {
-		return ( (bool) ( $token = wps_orders_ctr::wps_token_order_customer( (int) $order_id ) ) ) ? admin_url( 'admin-post.php?action=wps_direct_payment_link&token=' . $token . '&amp;order_id=' . (int) $order_id ) : '';
+	public static function wps_direct_payment_link_url($order_id) {
+		return ((bool)($token = wps_orders_ctr::wps_token_order_customer((int)$order_id))) ? admin_url('admin-post.php?action=wps_direct_payment_link&token=' . $token . '&amp;order_id=' . (int)$order_id) : '';
 	}
 }

includes/librairies/purchase/list_countries.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 $wpshop_tab_countries = array(
 	'AF' => __('Afghanistan', 'wpshop'),
 	'AX' => __('&#197;land Islands', 'wpshop'),

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 $wpshop_tab_countries = array(
 	'AF' => __('Afghanistan', 'wpshop'),
 	'AX' => __('&#197;land Islands', 'wpshop'),

includes/librairies/pdf/font/helveticabi.php

Spacing +14 added lines, -14 removed lines

@@ -1,15 +1,15 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-$fpdf_charwidths['helveticaBI']=array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
-	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
-	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
-	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+<?php if (!defined('ABSPATH')) exit;
+$fpdf_charwidths['helveticaBI'] = array(
+	chr(0)=>278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
+	chr(22)=>278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>333, '"'=>474, '#'=>556, '$'=>556, '%'=>889, '&'=>722, '\''=>238, '('=>333, ')'=>333, '*'=>389, '+'=>584,
+	','=>278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>333, ';'=>333, '<'=>584, '='=>584, '>'=>584, '?'=>611, '@'=>975, 'A'=>722,
+	'B'=>722, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>722, 'I'=>278, 'J'=>556, 'K'=>722, 'L'=>611, 'M'=>833, 'N'=>722, 'O'=>778, 'P'=>667, 'Q'=>778, 'R'=>722, 'S'=>667, 'T'=>611, 'U'=>722, 'V'=>667, 'W'=>944,
+	'X'=>667, 'Y'=>667, 'Z'=>611, '['=>333, '\\'=>278, ']'=>333, '^'=>584, '_'=>556, '`'=>333, 'a'=>556, 'b'=>611, 'c'=>556, 'd'=>611, 'e'=>556, 'f'=>333, 'g'=>611, 'h'=>611, 'i'=>278, 'j'=>278, 'k'=>556, 'l'=>278, 'm'=>889,
+	'n'=>611, 'o'=>611, 'p'=>611, 'q'=>611, 'r'=>389, 's'=>556, 't'=>333, 'u'=>611, 'v'=>556, 'w'=>778, 'x'=>556, 'y'=>556, 'z'=>500, '{'=>389, '|'=>280, '}'=>389, '~'=>584, chr(127)=>350, chr(128)=>556, chr(129)=>350, chr(130)=>278, chr(131)=>556,
+	chr(132)=>500, chr(133)=>1000, chr(134)=>556, chr(135)=>556, chr(136)=>333, chr(137)=>1000, chr(138)=>667, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>278, chr(146)=>278, chr(147)=>500, chr(148)=>500, chr(149)=>350, chr(150)=>556, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+	chr(154)=>556, chr(155)=>333, chr(156)=>944, chr(157)=>350, chr(158)=>500, chr(159)=>667, chr(160)=>278, chr(161)=>333, chr(162)=>556, chr(163)=>556, chr(164)=>556, chr(165)=>556, chr(166)=>280, chr(167)=>556, chr(168)=>333, chr(169)=>737, chr(170)=>370, chr(171)=>556, chr(172)=>584, chr(173)=>333, chr(174)=>737, chr(175)=>333,
+	chr(176)=>400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>611, chr(182)=>556, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
+	chr(198)=>1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+	chr(220)=>722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>556, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>611, chr(241)=>611,
+	chr(242)=>611, chr(243)=>611, chr(244)=>611, chr(245)=>611, chr(246)=>611, chr(247)=>584, chr(248)=>611, chr(249)=>611, chr(250)=>611, chr(251)=>611, chr(252)=>611, chr(253)=>556, chr(254)=>611, chr(255)=>556);
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 $fpdf_charwidths['helveticaBI']=array(
 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,