Eoxia / wpshop

includes/librairies/catalog/categories.class.php

Doc Comments +2 added lines, -6 removed lines

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

Spacing +90 added lines, -90 removed lines

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

Indentation +54 added lines, -54 removed lines

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

Braces +19 added lines, -21 removed lines

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

includes/librairies/db/database.class.php

Doc Comments +2 added lines

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

Indentation +36 added lines, -36 removed lines

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

Spacing +27 added lines, -27 removed lines

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

Braces +18 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -86,23 +88,25 @@ 
 			$type = 'text';
 			if(($field_definition->Key == 'PRI') || ($field_definition->Field == 'creation_date') || ($field_definition->Field == 'last_update_date')){
 				$type =  'hidden';
-			}
-			else{
+			} else{
 				$fieldtype = explode('(',$field_definition->Type);
-				if(!empty($fieldtype[1]))$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+				if(!empty($fieldtype[1])) {
+					$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+				}
 
-				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int'))
-					$type = 'text';
-				elseif($fieldtype[0] == 'text')
-					$type = 'textarea';
-				elseif($fieldtype[0] == 'enum')
+				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int')) {
+									$type = 'text';
+				} elseif($fieldtype[0] == 'text') {
+									$type = 'textarea';
+				} elseif($fieldtype[0] == 'enum')
 				{
 					$fieldtype[1] = str_replace("'","",$fieldtype[1]);
 					$possible_value = explode(",",$fieldtype[1]);
 
 					$type = 'radio';
-					if(count($possible_value) > 1)
-						$type = 'select';
+					if(count($possible_value) > 1) {
+											$type = 'select';
+					}
 
 					$field_to_form[$i]['possible_value'] = $possible_value;
 				}
@@ -130,8 +134,7 @@ 
 		$updateResult = $wpdb->insert($dataBaseTable, $informationsToSet, '%s');
 		if( $updateResult != false ){
 			$requestResponse = 'done';
-		}
-		else{
+		} else{
 			$requestResponse = 'error';
 		}
 
@@ -152,11 +155,9 @@ 
 
 		if( $updateResult == 1 ){
 			$requestResponse = 'done';
-		}
-		elseif( $updateResult == 0 ){
+		} elseif( $updateResult == 0 ){
 			$requestResponse = 'nothingToUpdate';
-		}
-		elseif( $updateResult == false ){
+		} elseif( $updateResult == false ){
 			$requestResponse = 'error';
 		}
 

includes/librairies/display/display.class.php

Doc Comments +7 added lines, -5 removed lines

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

Indentation +23 added lines, -23 removed lines

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

Braces +29 added lines, -24 removed lines

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

Spacing +128 added lines, -128 removed lines

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

includes/librairies/display/form.class.php

Doc Comments +6 added lines, -6 removed lines

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

Indentation +61 added lines, -61 removed lines

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

Spacing +61 added lines, -61 removed lines

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

Braces +59 added lines, -51 removed lines

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

includes/librairies/display/widgets/categories.widget.php

Doc Comments -1 removed lines

@@ -98,7 +98,6 @@
 	/**
 	*	Get the sub categories of a given category
 	*
-	*	@param integer $parent_category The main category we want to have the sub categories for
 	*/
 	function category_tree_selector_output($category_id = 0, $wpshop_widget_categories, $instance){
 		$category_tree_output = '';

Indentation +13 added lines, -13 removed lines

@@ -33,10 +33,10 @@ 
 	}
 
 	/**
-	*	Define the content for the widget
-	*
-	*	@param mixed $instance The current widget instance
-	*/
+	 *	Define the content for the widget
+	 *
+	 *	@param mixed $instance The current widget instance
+	 */
 	function form($instance){
 		$instance = wp_parse_args((array) $instance, array(
 			'title' => '',
@@ -72,11 +72,11 @@ 
 	}
 
 	/**
-	* Widget Output
-	*
-	* @param array $args
-	* @param array $instance Widget values.
-	*/
+	 * Widget Output
+	 *
+	 * @param array $args
+	 * @param array $instance Widget values.
+	 */
 	function widget($args, $instance){
 		$widget_content = '';
 
@@ -96,10 +96,10 @@ 
 	}
 
 	/**
-	*	Get the sub categories of a given category
-	*
-	*	@param integer $parent_category The main category we want to have the sub categories for
-	*/
+	 *	Get the sub categories of a given category
+	 *
+	 *	@param integer $parent_category The main category we want to have the sub categories for
+	 */
 	function category_tree_selector_output($category_id = 0, $wpshop_widget_categories, $instance){
 		$category_tree_output = '';
 

Spacing +19 added lines, -19 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * WpShop categories menu widget management
 *
@@ -22,14 +22,14 @@ 
 	 * Widget Constructor
 	 */
 	public function __construct() {
-		add_action('widgets_init', create_function('', 'return register_widget("WP_Widget_Wpshop_Product_categories");' ) );
+		add_action('widgets_init', create_function('', 'return register_widget("WP_Widget_Wpshop_Product_categories");'));
 		
 		$params = array(
 			'classname' => 'widget_wpshop_pdt_categories',
 			'description' => __('Wpshop product categories widget', 'wpshop')
 		);
 		
-		parent::__construct( 'wpshop_pdt_categories', __('• Wpshop Categories', 'wpshop'), $params );
+		parent::__construct('wpshop_pdt_categories', __('• Wpshop Categories', 'wpshop'), $params);
 	}
 
 	/**
@@ -37,36 +37,36 @@ 
 	*
 	*	@param mixed $instance The current widget instance
 	*/
-	function form($instance){
-		$instance = wp_parse_args((array) $instance, array(
+	function form($instance) {
+		$instance = wp_parse_args((array)$instance, array(
 			'title' => '',
 			'show_product' => '',
 			'show_all_cat' => '',
 			'wpshop_widget_categories' => ''
 		));
 
-		$title    		= esc_attr($instance['title']);
+		$title = esc_attr($instance['title']);
 		$show_all_cat	= esc_attr($instance['show_all_cat']);
 		$show_product	= esc_attr($instance['show_product']);
-		if ( !isset( $instance['wpshop_widget_categories'] ) ){
+		if (!isset($instance['wpshop_widget_categories'])) {
 			$categories = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, array('hide_empty' => '0', 'parent' => 0));
-			if(!empty($categories)){
-				foreach($categories as $category){
+			if (!empty($categories)) {
+				foreach ($categories as $category) {
 					$instance['wpshop_widget_categories'][$category->term_id] = 'on';
 				}
 			}
 		}
-		$wpshop_widget_categories	= esc_attr($instance['wpshop_widget_categories']);
+		$wpshop_widget_categories = esc_attr($instance['wpshop_widget_categories']);
 		$checked = (($show_product != '') && ($show_product == 'yes')) ? 'checked="checked"' : '';
 ?>
 		<p>
-			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title', 'wpshop' ); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'wpshop'); ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" />
 		</p>
 		<p>
-			<input id="<?php echo $this->get_field_id( 'show_all_cat' ); ?>" class="wpshop-widget-all-cat" name="<?php echo $this->get_field_name( 'show_all_cat' ); ?>" type="hidden" value="yes" />
-			<input <?php echo $checked; ?> id="<?php echo $this->get_field_id( 'show_product' ); ?>" name="<?php echo $this->get_field_name( 'show_product' ); ?>" type="checkbox" value="yes" />
-			<label for="<?php echo $this->get_field_id( 'show_product' ); ?>" ><?php _e( 'Show product', 'wpshop' ); ?></label>
+			<input id="<?php echo $this->get_field_id('show_all_cat'); ?>" class="wpshop-widget-all-cat" name="<?php echo $this->get_field_name('show_all_cat'); ?>" type="hidden" value="yes" />
+			<input <?php echo $checked; ?> id="<?php echo $this->get_field_id('show_product'); ?>" name="<?php echo $this->get_field_name('show_product'); ?>" type="checkbox" value="yes" />
+			<label for="<?php echo $this->get_field_id('show_product'); ?>" ><?php _e('Show product', 'wpshop'); ?></label>
 		</p>
 <?php
 	}
@@ -77,7 +77,7 @@ 
 	* @param array $args
 	* @param array $instance Widget values.
 	*/
-	function widget($args, $instance){
+	function widget($args, $instance) {
 		$widget_content = '';
 
 		/*	Get the default args from wordpress	*/
@@ -100,12 +100,12 @@ 
 	*
 	*	@param integer $parent_category The main category we want to have the sub categories for
 	*/
-	function category_tree_selector_output($category_id = 0, $wpshop_widget_categories, $instance){
+	function category_tree_selector_output($category_id = 0, $wpshop_widget_categories, $instance) {
 		$category_tree_output = '';
 
 		$categories = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, array('hide_empty' => '0', 'parent' => $category_id));
-		if(count($categories) > 0){
-			foreach($categories as $category){
+		if (count($categories) > 0) {
+			foreach ($categories as $category) {
 				$checked = (is_array($instance['wpshop_widget_categories']) && in_array($category->term_id, $instance['wpshop_widget_categories'])) ? ' checked="checked" ' : '';
 				$category_main_class = ($category_id > 0) ? 'class="wpshop_categories_children"' : '';
 				$category_tree_output .= '

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * WpShop categories menu widget management
 *

includes/librairies/eav/attributes_set.class.php

Doc Comments +3 added lines, -2 removed lines

@@ -45,6 +45,7 @@ 
 	/**
 	*	Get the url listing slug of the current class
 	*
+	*	@param string $message
 	*	@return string The table of the class
 	*/
 	function setMessage($message){
@@ -665,7 +666,7 @@ 
 	/**
 	*	Display inteface allowing to manage the attribute set and group details
 	*
-	*	@param object $atributeSetId The element's identifier we have to manage the details for
+	*	@param object $attributeSetId The element's identifier we have to manage the details for
 	*
 	*	@return string $attributeSetDetailsManagement The html output of management interface
 	*/
@@ -949,7 +950,7 @@ 
 	*	@param integer $attributeSetId The attribute set identifier we want to get the details for
 	*	@param string $attributeSetStatus optionnal The attribute set status. Allows to define if we want all attribute sets or a deleted or valid and so on
 	*
-	*	@return array $attributeSetDetailsGroups The List of attribute and attribute groups for the given attribute set
+	*	@return string $attributeSetDetailsGroups The List of attribute and attribute groups for the given attribute set
 	*/
 	public static function getAttributeSetDetails($attributeSetId, $attributeSetStatus = "'valid', 'moderated'"){
 		global $wpdb, $validAttributeList;

Braces +57 added lines, -55 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' ) ) {
@@ -88,9 +90,9 @@ 
 			if($action == 'edit'){
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), __($editedItem->name, 'wpshop'), __($editedItem->entity, 'wpshop'));
+			} elseif($action == 'add') {
+							$title = __(self::pageAddingTitle, 'wpshop');
 			}
-			elseif($action == 'add')
-				$title = __(self::pageAddingTitle, 'wpshop');
 		}
 		return $title;
 	}
@@ -114,8 +116,7 @@ 
 		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->name . '</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->name . '</span>');
 		}
@@ -141,14 +142,14 @@ 
 			if(current_user_can('wpshop_edit_attribute_set')){
 				$attribute_set_parameter['last_update_date'] = date('Y-m-d H:i:s');
 				if($pageAction == 'delete'){
-					if(current_user_can('wpshop_delete_attribute_set'))
-						$attribute_set_parameter['status'] = 'deleted';
-					else
-						$actionResult = 'userNotAllowedForActionDelete';
+					if(current_user_can('wpshop_delete_attribute_set')) {
+											$attribute_set_parameter['status'] = 'deleted';
+					} else {
+											$actionResult = 'userNotAllowedForActionDelete';
+					}
 				}
 				$actionResult = wpshop_database::update($attribute_set_parameter, $id, self::getDbTable());
-			}
-			else{
+			} else{
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
 
@@ -199,17 +200,15 @@ 
 
 				}
 
-		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
+		} elseif(($pageAction != '') && (($pageAction == 'delete'))){
 			if(current_user_can('wpshop_delete_attribute_set')){
 				$attribute_set_parameter['last_update_date'] = date('Y-m-d H:i:s');
 				$attribute_set_parameter['status'] = 'deleted';
 				$actionResult = wpshop_database::update($attribute_set_parameter, $id, self::getDbTable());
+			} else {
+							$actionResult = 'userNotAllowedForActionDelete';
 			}
-			else
-				$actionResult = 'userNotAllowedForActionDelete';
-		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
+		} elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
 			if(current_user_can('wpshop_add_attribute_set')){
 				$attribute_set_parameter['creation_date'] = date('Y-m-d H:i:s');
 				$actionResult = wpshop_database::save($attribute_set_parameter, self::getDbTable());
@@ -244,9 +243,9 @@ 
 						}
 					}
 				}
+			} else {
+							$actionResult = 'userNotAllowedForActionAdd';
 			}
-			else
-				$actionResult = 'userNotAllowedForActionAdd';
 		}
 
 		/*	When an action is launched and there is a result message	*/
@@ -255,11 +254,12 @@ 
 		/****************************************************************************/
 		if($actionResult != ''){
 			$elementIdentifierForMessage = __('the attribute group', 'wpshop');
-			if(!empty($attribute_set_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_set_parameter['name'] . '</span>';
+			if(!empty($attribute_set_parameter['name'])) {
+				$elementIdentifierForMessage = '<span class="bold" >' . $attribute_set_parameter['name'] . '</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);
-			}
-			elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate')){
+			} elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate')){
 				/*****************************************************************************************************************/
 				/*************************			CHANGE FOR SPECIFIC ACTION FOR CURRENT ELEMENT				******************/
 				/*****************************************************************************************************************/
@@ -284,13 +284,11 @@ 
 									$validElement = $wpdb->get_var($query);
 									if(!empty($validElement)){
 										$query = $wpdb->prepare("UPDATE " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " SET position = %d, attribute_group_id = %d, last_update_date = NOW() WHERE attribute_id = %d AND status = %s AND attribute_set_id = %d", $i, $groupId, $element, 'valid', $id);
-									}
-									else{
+									} else{
 										$query = $wpdb->prepare("INSERT INTO " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " (id, status, creation_date, entity_type_id, attribute_set_id, attribute_group_id, attribute_id, position) VALUES ('', 'valid', NOW(), %d, %d, %d, %d, %d)", $attribute_set_parameter['entity_id'], $id, $groupId, $element, $i);
 									}
 									$wpdb->query($query);
-								}
-								else{
+								} else{
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0), 'position' => 0), array('attribute_id' => $element, 'status' => 'valid', 'attribute_set_id' => $id));
 								}
 								$i++;
@@ -344,13 +342,14 @@ 
 				$pageMessage .= '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), $elementIdentifierForMessage);
 				/* if(($pageAction == 'edit') || ($pageAction == 'save'))
 					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));
+				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')) {
+							$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('You are not allowed to do this action', 'wpshop');
 			}
-			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');
 		}
 
 		self::setMessage($pageMessage);
@@ -391,7 +390,9 @@ 
 							}
 						}
 						if(!empty($attribute_set_list[$i]['content'])){
-							if($has_att)$attribute_set_list[$i]['content'] = substr($attribute_set_list[$i]['content'],0,-2);
+							if($has_att) {
+								$attribute_set_list[$i]['content'] = substr($attribute_set_list[$i]['content'],0,-2);
+							}
 							$attribute_set_list[$i]['content'] .= '</div>';
 						}
 					}
@@ -433,8 +434,9 @@ 
 		$bloc_list=array();
 
 		$editedItem = '';
-		if($itemToEdit != '')
-			$editedItem = self::getElement($itemToEdit);
+		if($itemToEdit != '') {
+					$editedItem = self::getElement($itemToEdit);
+		}
 
 		foreach($dbFieldList as $input_key => $input_def){
 			$input_name = $input_def['name'];
@@ -446,14 +448,16 @@ 
 
 			/*	Get value by checking current object type	*/
 			$currentFieldValue = $input_value;
-			if(is_object($editedItem))
-				$currentFieldValue = $editedItem->$input_name;
-			elseif(($attributeAction != '') && ($attributeFormValue != ''))
-				$currentFieldValue = $attributeFormValue;
+			if(is_object($editedItem)) {
+							$currentFieldValue = $editedItem->$input_name;
+			} elseif(($attributeAction != '') && ($attributeFormValue != '')) {
+							$currentFieldValue = $attributeFormValue;
+			}
 
 			/*	Check if the field must be hidden	*/
-			if(in_array($input_name, $attribute_hidden_field))
-				$input_def['type'] = 'hidden';
+			if(in_array($input_name, $attribute_hidden_field)) {
+							$input_def['type'] = 'hidden';
+			}
 			if ($input_name == 'entity_id') {
 				$input_def['type'] = 'select';
 				$input_def['possible_value'] = wpshop_entities::get_entities_list();
@@ -475,8 +479,7 @@ 
 				}
 
 				$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
-			}
-			else {
+			} else {
 				if(in_array($input_name, array('status', 'default_set'))){
 					$input_def['type'] = 'checkbox';
 					switch($input_name){
@@ -503,8 +506,7 @@ 
 			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_'.$input_name.'" ><label for="'.$input_def_id.'" >' . __($input_name, '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_name.'" >' . $the_input . '</td>
 		</tr>';
-			}
-			else{
+			} else{
 				$the_form_content_hidden .= '
 		' . $the_input;
 			}
@@ -538,13 +540,15 @@ 
 ' . wpshop_form::form_input(self::getDbTable() . '_form_has_modification', self::getDbTable() . '_form_has_modification', 'no' , 'hidden') . $the_form_content_hidden . wpshop_display::custom_page_output_builder($bloc_list, WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT) . '
 	<div class="wpshop_edition_button wpshop_edition_button_'.self::currentPageCode.'" >';
 
-		if(($action == 'add') && (current_user_can('wpshop_add_attribute_set')))
-			$the_form .= '<input type="submit" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
-		elseif(current_user_can('wpshop_edit_attribute_set'))
-			$the_form .= '<input type="submit" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
+		if(($action == 'add') && (current_user_can('wpshop_add_attribute_set'))) {
+					$the_form .= '<input type="submit" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
+		} elseif(current_user_can('wpshop_edit_attribute_set')) {
+					$the_form .= '<input type="submit" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
+		}
 
-		if(current_user_can('wpshop_delete_attribute_set') && ($action != 'add'))
-			$the_form .= '<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_attribute_set') && ($action != 'add')) {
+					$the_form .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_'.self::currentPageCode.'" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
+		}
 
 		$the_form .= '
 	</div>
@@ -650,8 +654,7 @@ 
 		if(($elementId == '') || ($resultList == 'all'))
 		{
 			$elements = $wpdb->get_results($query);
-		}
-		else
+		} else
 		{
 			$elements = $wpdb->get_row($query);
 		}
@@ -1149,8 +1152,7 @@ 
 								$the_input .= '<option'.$selected.' value="'.$attr_set->id.'_'.$set_details['id'].'">'.__($set_details['name'],'wpshop').'</option>';
 							}
 							$the_input .= '</optgroup>';
-						}
-						else {
+						} else {
 							$the_input .= '<option value="'.$attr_set->id.'">'.__($attr_set->name, 'wpshop').'</option>';
 						}
 					}

Spacing +252 added lines, -252 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'));
 }
 
 /**
@@ -21,7 +21,7 @@ 
 * @package wpshop
 * @subpackage librairies
 */
-class wpshop_attributes_set{
+class wpshop_attributes_set {
 	/*	Define the database table used in the current class	*/
 	const dbTable = WPSHOP_DBT_ATTRIBUTE_SET;
 	/*	Define the url listing slug used in the current class	*/
@@ -47,7 +47,7 @@ 
 	*
 	*	@return string The table of the class
 	*/
-	function setMessage($message){
+	function setMessage($message) {
 		$this->pageMessage = $message;
 	}
 	/**
@@ -55,7 +55,7 @@ 
 	*
 	*	@return string The table of the class
 	*/
-	function getListingSlug(){
+	function getListingSlug() {
 		return self::urlSlugListing;
 	}
 	/**
@@ -63,7 +63,7 @@ 
 	*
 	*	@return string The table of the class
 	*/
-	public static function getEditionSlug(){
+	public static function getEditionSlug() {
 		return self::urlSlugEdition;
 	}
 	/**
@@ -71,7 +71,7 @@ 
 	*
 	*	@return string The table of the class
 	*/
-	public static function getDbTable(){
+	public static function getDbTable() {
 		return self::dbTable;
 	}
 	/**
@@ -79,17 +79,17 @@ 
 	*
 	*	@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']) : '';
 
-		$title = __(self::pageTitle, 'wpshop' );
-		if($action != ''){
-			if($action == 'edit'){
+		$title = __(self::pageTitle, 'wpshop');
+		if ($action != '') {
+			if ($action == 'edit') {
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), __($editedItem->name, 'wpshop'), __($editedItem->entity, 'wpshop'));
 			}
-			elseif($action == 'add')
+			elseif ($action == 'add')
 				$title = __(self::pageAddingTitle, 'wpshop');
 		}
 		return $title;
@@ -98,7 +98,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 = '';
 
@@ -107,16 +107,16 @@ 
 		/****************************************************************************/
 		$saveditem = isset($_REQUEST['saveditem']) ? sanitize_text_field($_REQUEST['saveditem']) : '';
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : 'add';
-		$id = !empty( $_REQUEST['id'] ) ? (int)$_REQUEST['id'] : 0;
-		if(!empty($action) && ($action=='activate') && (!empty($id))){
+		$id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+		if (!empty($action) && ($action == 'activate') && (!empty($id))) {
 			$query = $wpdb->update(self::getDbTable(), array('status'=>'moderated'), array('id'=>sanitize_key($id)));
 			wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . sanitize_key($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->name . '</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->name . '</span>');
 		}
@@ -124,63 +124,63 @@ 
 		/*	Define the database operation type from action launched by the user	 */
 		/*************************			GENERIC				****************************/
 		/*************************************************************************/
-		$attribute_set_parameter = !empty( $_REQUEST[self::getDbTable()] ) ? (array)$_REQUEST[self::getDbTable()] : array();
-		$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : ((!empty($_GET['action']) && ($_GET['action']=='delete')) ? sanitize_text_field($_GET['action']) : '');
+		$attribute_set_parameter = !empty($_REQUEST[self::getDbTable()]) ? (array)$_REQUEST[self::getDbTable()] : array();
+		$pageAction = 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_set_parameter['id']) ? sanitize_key($attribute_set_parameter['id']) : ((!empty($_GET['id'])) ? sanitize_key($_GET['id']) : '');
 		$set_section = !empty($attribute_set_parameter['set_section']) ? sanitize_text_field($attribute_set_parameter['set_section']) : '';
 		unset($attribute_set_parameter['set_section']);
 
 		/*	Specific case for the attribute groups	*/
-		if(!isset($attribute_set_parameter['status'])){
+		if (!isset($attribute_set_parameter['status'])) {
 			$attribute_set_parameter['status'] = 'moderated';
 		}
-		if(!isset($attribute_set_parameter['default_set'])){
+		if (!isset($attribute_set_parameter['default_set'])) {
 			$attribute_set_parameter['default_set'] = 'no';
 		}
 
-		if(($pageAction != '') && (($pageAction == 'edit') || ($pageAction == 'editandcontinue') || ($pageAction == 'delete'))){
-			if(current_user_can('wpshop_edit_attribute_set')){
+		if (($pageAction != '') && (($pageAction == 'edit') || ($pageAction == 'editandcontinue') || ($pageAction == 'delete'))) {
+			if (current_user_can('wpshop_edit_attribute_set')) {
 				$attribute_set_parameter['last_update_date'] = date('Y-m-d H:i:s');
-				if($pageAction == 'delete'){
-					if(current_user_can('wpshop_delete_attribute_set'))
+				if ($pageAction == 'delete') {
+					if (current_user_can('wpshop_delete_attribute_set'))
 						$attribute_set_parameter['status'] = 'deleted';
 					else
 						$actionResult = 'userNotAllowedForActionDelete';
 				}
 				$actionResult = wpshop_database::update($attribute_set_parameter, $id, self::getDbTable());
 			}
-			else{
+			else {
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
 
 			/** Address display managment **/
-				if ( !empty($id) ) {
+				if (!empty($id)) {
 					$is_billing = $is_shipping = false;
 					/** Get billing option **/
-					$billing_option = get_option( 'wpshop_billing_address' );
-					$shipping_option = get_option( 'wpshop_shipping_address_choice' );
+					$billing_option = get_option('wpshop_billing_address');
+					$shipping_option = get_option('wpshop_shipping_address_choice');
 
-					if( !empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $id ) {
+					if (!empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $id) {
 						$is_billing = true;
 					}
 
-					if( !empty($shipping_option) && !empty($shipping_option['choice']) && $shipping_option['choice'] == $id ) {
+					if (!empty($shipping_option) && !empty($shipping_option['choice']) && $shipping_option['choice'] == $id) {
 						$is_shipping = true;
 					}
 
-					$attribute_group_order = !empty( $_REQUEST['attribute_group_order'] ) ? (array) $_REQUEST['attribute_group_order'] : array();
+					$attribute_group_order = !empty($_REQUEST['attribute_group_order']) ? (array)$_REQUEST['attribute_group_order'] : array();
 
 					$attribute_display = array();
-					if ( !empty($attribute_group_order)) {
+					if (!empty($attribute_group_order)) {
 
-						foreach( $attribute_group_order as $group_id => $group_def ) {
+						foreach ($attribute_group_order as $group_id => $group_def) {
 							$end_line_element_id = 0;
-							if( $group_id != 'newOrderNotAffectedAttribute' ) {
-								$attribute_display[ str_replace('newOrder', '', $group_id) ] = explode( ',', $group_def );
+							if ($group_id != 'newOrderNotAffectedAttribute') {
+								$attribute_display[str_replace('newOrder', '', $group_id)] = explode(',', $group_def);
 
-								foreach( $attribute_display[ str_replace('newOrder', '', $group_id) ] as $att_id => $att ) {
-									if( $att == 'wps-attribute-end-line' ) {
-										$attribute_display[ str_replace('newOrder', '', $group_id) ][$att_id] = 'wps-attribute-end-line-'.$end_line_element_id;
+								foreach ($attribute_display[str_replace('newOrder', '', $group_id)] as $att_id => $att) {
+									if ($att == 'wps-attribute-end-line') {
+										$attribute_display[str_replace('newOrder', '', $group_id)][$att_id] = 'wps-attribute-end-line-' . $end_line_element_id;
 										$end_line_element_id++;
 									}
 								}
@@ -190,21 +190,21 @@ 
 					}
 
 
-					if ( $is_billing && !$is_shipping ) {
+					if ($is_billing && !$is_shipping) {
 						$billing_option['display_model'] = $attribute_display;
-						update_option( 'wpshop_billing_address', $billing_option );
+						update_option('wpshop_billing_address', $billing_option);
 					}
 
-					if ( !$is_billing && $is_shipping ) {
+					if (!$is_billing && $is_shipping) {
 						$shipping_option['display_model'] = $attribute_display;
-						update_option( 'wpshop_shipping_address_choice', $shipping_option );
+						update_option('wpshop_shipping_address_choice', $shipping_option);
 					}
 
 				}
 
 		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
-			if(current_user_can('wpshop_delete_attribute_set')){
+		elseif (($pageAction != '') && (($pageAction == 'delete'))) {
+			if (current_user_can('wpshop_delete_attribute_set')) {
 				$attribute_set_parameter['last_update_date'] = date('Y-m-d H:i:s');
 				$attribute_set_parameter['status'] = 'deleted';
 				$actionResult = wpshop_database::update($attribute_set_parameter, $id, self::getDbTable());
@@ -212,32 +212,32 @@ 
 			else
 				$actionResult = 'userNotAllowedForActionDelete';
 		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
-			if(current_user_can('wpshop_add_attribute_set')){
+		elseif (($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))) {
+			if (current_user_can('wpshop_add_attribute_set')) {
 				$attribute_set_parameter['creation_date'] = date('Y-m-d H:i:s');
 				$actionResult = wpshop_database::save($attribute_set_parameter, self::getDbTable());
 				$id = $wpdb->insert_id;
-				if ( empty( $set_section ) ) {
-					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, array('status' => 'valid', 'attribute_set_id' => $id, 'position' => 1, 'creation_date' => current_time('mysql',0), 'code' => 'general',  'default_group' => 'yes', 'name' => __('Main information', 'wpshop')));
+				if (empty($set_section)) {
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, array('status' => 'valid', 'attribute_set_id' => $id, 'position' => 1, 'creation_date' => current_time('mysql', 0), 'code' => 'general', 'default_group' => 'yes', 'name' => __('Main information', 'wpshop')));
 
 					$selected_entity_query = $wpdb->prepare("SELECT post_name FROM " . $wpdb->posts . " WHERE ID = %d", $attribute_set_parameter['entity_id']);
 					if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT == $wpdb->get_var($selected_entity_query)) {
-						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, array('status' => 'valid', 'attribute_set_id' => $id, 'position' => 1, 'creation_date' => current_time('mysql',0), 'code' => 'prices',  'default_group' => 'no', 'name' => __('Prices', 'wpshop')));
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, array('status' => 'valid', 'attribute_set_id' => $id, 'position' => 1, 'creation_date' => current_time('mysql', 0), 'code' => 'prices', 'default_group' => 'no', 'name' => __('Prices', 'wpshop')));
 						$price_attribute_set_id = $wpdb->insert_id;
 						$price_tab = unserialize(WPSHOP_ATTRIBUTE_PRICES);
 						unset($price_tab[array_search(WPSHOP_COST_OF_POSTAGE, $price_tab)]);
-						foreach($price_tab as $price_code){
+						foreach ($price_tab as $price_code) {
 							$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $price_code);
 							$attribute_id = $wpdb->get_var($query);
-							switch($price_code){
+							switch ($price_code) {
 								case WPSHOP_PRODUCT_PRICE_HT:
-										$position = ( WPSHOP_PRODUCT_PRICE_PILOT == 'HT' ) ? 1 : 3;
+										$position = (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') ? 1 : 3;
 									break;
 								case WPSHOP_PRODUCT_PRICE_TAX:
 										$position = 2;
 									break;
 								case WPSHOP_PRODUCT_PRICE_TTC:
-										$position = ( WPSHOP_PRODUCT_PRICE_PILOT == 'HT' ) ? 3 : 1;
+										$position = (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') ? 3 : 1;
 									break;
 								case WPSHOP_PRODUCT_PRICE_TAX_AMOUNT:
 										$position = 4;
@@ -256,47 +256,47 @@ 
 		/************		CHANGE THE FIELD NAME TO TAKE TO DISPLAY				*************/
 		/************		CHANGE ERROR MESSAGE FOR SPECIFIC CASE					*************/
 		/****************************************************************************/
-		if($actionResult != ''){
+		if ($actionResult != '') {
 			$elementIdentifierForMessage = __('the attribute group', 'wpshop');
-			if(!empty($attribute_set_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_set_parameter['name'] . '</span>';
-			if($actionResult == 'error'){/*	CHANGE HERE FOR SPECIFIC CASE	*/
+			if (!empty($attribute_set_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_set_parameter['name'] . '</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);
 			}
-			elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate')){
+			elseif (($actionResult == 'done') || ($actionResult == 'nothingToUpdate')) {
 				/*****************************************************************************************************************/
 				/*************************			CHANGE FOR SPECIFIC ACTION FOR CURRENT ELEMENT				******************/
 				/*****************************************************************************************************************/
-				$wpshop_attribute_set_section_order = !empty( $_POST['wpshop_attribute_set_section_order'] ) ? (array)$_POST['wpshop_attribute_set_section_order'] : array();
-				$wpshop_attribute_set_section = !empty( $_POST['wpshop_attribute_set_section'] ) ? (array)$_POST['wpshop_attribute_set_section'] : array();
-				if ( !empty($wpshop_attribute_set_section_order) ) {
+				$wpshop_attribute_set_section_order = !empty($_POST['wpshop_attribute_set_section_order']) ? (array)$_POST['wpshop_attribute_set_section_order'] : array();
+				$wpshop_attribute_set_section = !empty($_POST['wpshop_attribute_set_section']) ? (array)$_POST['wpshop_attribute_set_section'] : array();
+				if (!empty($wpshop_attribute_set_section_order)) {
 					$newOrder = str_replace('attribute_group_', '', $wpshop_attribute_set_section_order);
 					$order = explode(',', $newOrder);
-					foreach($order as $position => $set_section_id){
-						$wpshop_attribute_set_section[$set_section_id]['position']=$position;
+					foreach ($order as $position => $set_section_id) {
+						$wpshop_attribute_set_section[$set_section_id]['position'] = $position;
 					}
 				}
 
-				$attribute_group_order = !empty( $_REQUEST['attribute_group_order'] ) ? (array)$_REQUEST['attribute_group_order'] : array();
-				if(isset($attribute_group_order)){
-					foreach($attribute_group_order as $groupIdentifier => $newOrder){
+				$attribute_group_order = !empty($_REQUEST['attribute_group_order']) ? (array)$_REQUEST['attribute_group_order'] : array();
+				if (isset($attribute_group_order)) {
+					foreach ($attribute_group_order as $groupIdentifier => $newOrder) {
 						$newOrder = str_replace('attribute_', '', $newOrder);
 						$order = explode(',', $newOrder);
 						$groupId = str_replace('newOrder', '', $groupIdentifier);
 						$i = 1;
-						foreach($order as $element){
-							if($element != ''){
-								if((int)$groupId > 0){
+						foreach ($order as $element) {
+							if ($element != '') {
+								if ((int)$groupId > 0) {
 									$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_id = %d AND status = %s AND attribute_set_id = %d", $element, 'valid', $id);
 									$validElement = $wpdb->get_var($query);
-									if(!empty($validElement)){
+									if (!empty($validElement)) {
 										$query = $wpdb->prepare("UPDATE " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " SET position = %d, attribute_group_id = %d, last_update_date = NOW() WHERE attribute_id = %d AND status = %s AND attribute_set_id = %d", $i, $groupId, $element, 'valid', $id);
 									}
-									else{
+									else {
 										$query = $wpdb->prepare("INSERT INTO " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " (id, status, creation_date, entity_type_id, attribute_set_id, attribute_group_id, attribute_id, position) VALUES ('', 'valid', NOW(), %d, %d, %d, %d, %d)", $attribute_set_parameter['entity_id'], $id, $groupId, $element, $i);
 									}
 									$wpdb->query($query);
 								}
-								else{
+								else {
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0), 'position' => 0), array('attribute_id' => $element, 'status' => 'valid', 'attribute_set_id' => $id));
 								}
 								$i++;
@@ -305,10 +305,10 @@ 
 					}
 				}
 
-				$wpshop_attribute_set_section_is_default_of_set = !empty( $_REQUEST['wpshop_attribute_set_section_is_default_of_set'] ) ? sanitize_key( $_REQUEST['wpshop_attribute_set_section_is_default_of_set'] ) : '';
-				if(!empty($wpshop_attribute_set_section)){
-					foreach($wpshop_attribute_set_section as $set_section_id => $set_section_options){
-						if(!empty($set_section_options) && is_array($set_section_options)){
+				$wpshop_attribute_set_section_is_default_of_set = !empty($_REQUEST['wpshop_attribute_set_section_is_default_of_set']) ? sanitize_key($_REQUEST['wpshop_attribute_set_section_is_default_of_set']) : '';
+				if (!empty($wpshop_attribute_set_section)) {
+					foreach ($wpshop_attribute_set_section as $set_section_id => $set_section_options) {
+						if (!empty($set_section_options) && is_array($set_section_options)) {
 							$set_section_options['default_group'] = (!empty($wpshop_attribute_set_section_is_default_of_set) && $wpshop_attribute_set_section_is_default_of_set == $set_section_id) ? 'yes' : 'no';
 							$set_section_options['last_update_date'] = current_time('mysql', 0);
 							$set_section_options['display_on_frontend'] = (!empty($set_section_options['display_on_frontend']) && ($set_section_options['display_on_frontend'] == 'yes')) ? 'yes' : 'no';
@@ -317,9 +317,9 @@ 
 					}
 				}
 
-				if ( !empty( $set_section ) ) {
+				if (!empty($set_section)) {
 					$parent_attribute_set_detail = self::getAttributeSetDetails($set_section, "'valid'");
-					if ( !empty($parent_attribute_set_detail) ) {
+					if (!empty($parent_attribute_set_detail)) {
 
 						foreach ($parent_attribute_set_detail as $section => $section_detail) {
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, array('status'=>'valid', 'attribute_set_id' => $id, 'creation_date'=>current_time('mysql', 0), 'code'=>$section_detail['code'], 'name'=>$section_detail['name'], 'default_group'=>$section_detail['is_default_group'], 'backend_display_type'=>$section_detail['backend_display_type'], 'used_in_shop_type'=>$section_detail['used_in_shop_type'], 'display_on_frontend'=>$section_detail['display_on_frontend']));
@@ -332,17 +332,17 @@ 
 					}
 				}
 
-				$attribute_set_group_id = !empty( $_REQUEST['attribute_set_group_id'] ) ? (int) $_REQUEST['attribute_set_group_id'] : 0;
+				$attribute_set_group_id = !empty($_REQUEST['attribute_set_group_id']) ? (int)$_REQUEST['attribute_set_group_id'] : 0;
 				/*	If the current group is selected as default group set all others for current entity at no	*/
-				if($attribute_set_parameter['default_set'] == 'yes'){
+				if ($attribute_set_parameter['default_set'] == 'yes') {
 					$entity_to_take = 0;
-					if(isset($attribute_set_group_id) && ($attribute_set_group_id != '')){
+					if (isset($attribute_set_group_id) && ($attribute_set_group_id != '')) {
 						$entity_to_take = $attribute_set_group_id;
 					}
-					if(isset($attribute_set_parameter['entity_id']) && ($attribute_set_parameter['entity_id'] != '')){
+					if (isset($attribute_set_parameter['entity_id']) && ($attribute_set_parameter['entity_id'] != '')) {
 						$entity_to_take = $attribute_set_parameter['entity_id'];
 					}
-					if($entity_to_take > 0){
+					if ($entity_to_take > 0) {
 						$query = $wpdb->prepare("UPDATE " . self::getDbTable() . " SET default_set = 'no' WHERE id != %d AND entity_id = %d", $id, $entity_to_take);
 						$wpdb->query($query);
 					}
@@ -353,12 +353,12 @@ 
 				$pageMessage .= '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), $elementIdentifierForMessage);
 				/* if(($pageAction == 'edit') || ($pageAction == 'save'))
 					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));
+				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'))
+			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');
 		}
 
@@ -373,16 +373,16 @@ 
 	    //Create an instance of our package class...
 	    $wpshop_list_table = new wpshop_attributes_set_custom_List_table();
 	    //Fetch, prepare, sort, and filter our data...
-		$status="'valid', 'moderated'";
+		$status = "'valid', 'moderated'";
 		$attribute_set_list = array();
-		$attribute_group_status = !empty( $_REQUEST['attribute_groups_status'] ) ? sanitize_text_field( $_REQUEST['attribute_groups_status'] ) : '';
-		if(!empty($attribute_group_status)){
-			$status="'".$attribute_group_status."'";
+		$attribute_group_status = !empty($_REQUEST['attribute_groups_status']) ? sanitize_text_field($_REQUEST['attribute_groups_status']) : '';
+		if (!empty($attribute_group_status)) {
+			$status = "'" . $attribute_group_status . "'";
 		}
 		$attr_set_list = wpshop_attributes_set::getElement('', $status);
-		$i=0;
-		foreach($attr_set_list as $attr_set){
-			if(!empty($attr_set->id)){
+		$i = 0;
+		foreach ($attr_set_list as $attr_set) {
+			if (!empty($attr_set->id)) {
 				$attribute_set_list[$i]['id'] = $attr_set->id;
 				$attribute_set_list[$i]['name'] = $attr_set->name;
 				$attribute_set_list[$i]['status'] = $attr_set->status;
@@ -390,18 +390,18 @@ 
 				$attribute_set_details = self::getAttributeSetDetails($attr_set->id, "'valid'");
 
 				$attribute_set_list[$i]['content'] = '';
-				if(!empty($attribute_set_details)){
-					foreach($attribute_set_details as $set_details){
-						$attribute_set_list[$i]['content'] .= '<div><a href="'.admin_url('admin.php?page='.self::getListingSlug()."&action=edit&id=".$attr_set->id.'#attribute_group_'.$set_details['id']).'" >'.__($set_details['name'],'wpshop').'</a>  ';
-						$has_att=false;
-						foreach($set_details['attribut'] as $set_detail){
-							if(!empty($set_detail->frontend_label) && ( $set_detail->code != 'product_attribute_set_id' ) ){
-								$attribute_set_list[$i]['content'] .= __($set_detail->frontend_label,'wpshop').', ';
-								$has_att=true;
+				if (!empty($attribute_set_details)) {
+					foreach ($attribute_set_details as $set_details) {
+						$attribute_set_list[$i]['content'] .= '<div><a href="' . admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $attr_set->id . '#attribute_group_' . $set_details['id']) . '" >' . __($set_details['name'], 'wpshop') . '</a>  ';
+						$has_att = false;
+						foreach ($set_details['attribut'] as $set_detail) {
+							if (!empty($set_detail->frontend_label) && ($set_detail->code != 'product_attribute_set_id')) {
+								$attribute_set_list[$i]['content'] .= __($set_detail->frontend_label, 'wpshop') . ', ';
+								$has_att = true;
 							}
 						}
-						if(!empty($attribute_set_list[$i]['content'])){
-							if($has_att)$attribute_set_list[$i]['content'] = substr($attribute_set_list[$i]['content'],0,-2);
+						if (!empty($attribute_set_list[$i]['content'])) {
+							if ($has_att)$attribute_set_list[$i]['content'] = substr($attribute_set_list[$i]['content'], 0, -2);
 							$attribute_set_list[$i]['content'] .= '</div>';
 						}
 					}
@@ -440,45 +440,45 @@ 
 		$dbFieldList = wpshop_database::fields_to_input(self::getDbTable());
 		$form_more_content = $the_form_content_hidden = $the_form_general_content = '';
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : 'add';
-		$bloc_list=array();
+		$bloc_list = array();
 
 		$editedItem = '';
-		if($itemToEdit != '')
+		if ($itemToEdit != '')
 			$editedItem = self::getElement($itemToEdit);
 
-		foreach($dbFieldList as $input_key => $input_def){
+		foreach ($dbFieldList as $input_key => $input_def) {
 			$input_name = $input_def['name'];
 			$input_value = $input_def['value'];
-			$input_def_id=$input_def['id']='wpshop_' . self::currentPageCode . '_edition_table_field_id_'.$input_name;
+			$input_def_id = $input_def['id'] = 'wpshop_' . self::currentPageCode . '_edition_table_field_id_' . $input_name;
 
 			$attributeAction = isset($_REQUEST[self::getDbTable() . '_action']) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : '';
 			$attributeFormValue = isset($_REQUEST[self::getDbTable()][$input_name]) ? sanitize_text_field($_REQUEST[self::getDbTable()][$input_name]) : '';
 
 			/*	Get value by checking current object type	*/
 			$currentFieldValue = $input_value;
-			if(is_object($editedItem))
+			if (is_object($editedItem))
 				$currentFieldValue = $editedItem->$input_name;
-			elseif(($attributeAction != '') && ($attributeFormValue != ''))
+			elseif (($attributeAction != '') && ($attributeFormValue != ''))
 				$currentFieldValue = $attributeFormValue;
 
 			/*	Check if the field must be hidden	*/
-			if(in_array($input_name, $attribute_hidden_field))
+			if (in_array($input_name, $attribute_hidden_field))
 				$input_def['type'] = 'hidden';
 			if ($input_name == 'entity_id') {
 				$input_def['type'] = 'select';
 				$input_def['possible_value'] = wpshop_entities::get_entities_list();
 
 				$input_def['valueToPut'] = 'index';
-				if ( is_object($editedItem) || (count($input_def['possible_value'])==1) ) {
+				if (is_object($editedItem) || (count($input_def['possible_value']) == 1)) {
 					$input_def['type'] = 'hidden';
-					$currentFieldValue=(count($input_def['possible_value'])==1)?$input_def['possible_value'][0]->id:$currentFieldValue;
+					$currentFieldValue = (count($input_def['possible_value']) == 1) ? $input_def['possible_value'][0]->id : $currentFieldValue;
 				}
 				$input_def['name'] = $input_name;
 				$input_def['value'] = $currentFieldValue;
 
-				$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++;
@@ -487,19 +487,19 @@ 
 				$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
 			}
 			else {
-				if(in_array($input_name, array('status', 'default_set'))){
+				if (in_array($input_name, array('status', 'default_set'))) {
 					$input_def['type'] = 'checkbox';
-					switch($input_name){
+					switch ($input_name) {
 						case 'status':
 							$input_name = __('Use this attribute group', '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 group', '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 group', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 						break;
 						case 'default_set':
 							$input_def['possible_value'] = array('yes');
-							$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for using this attribute group as default group in selected element', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
-							$input_def_id.='_yes';
+							$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for using this attribute group as default group in selected element', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
+							$input_def_id .= '_yes';
 						break;
 					}
 				}
@@ -507,61 +507,61 @@ 
 				$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
 			}
 
-			if($input_def['type'] != 'hidden'){
+			if ($input_def['type'] != 'hidden') {
 				$the_form_general_content .= '
-		<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_'.$input_name.'" >
-			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_'.$input_name.'" ><label for="'.$input_def_id.'" >' . __($input_name, '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_name.'" >' . $the_input . '</td>
+		<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_' . $input_name . '" >
+			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_' . $input_name . '" ><label for="' . $input_def_id . '" >' . __($input_name, '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_name . '" >' . $the_input . '</td>
 		</tr>';
 			}
-			else{
+			else {
 				$the_form_content_hidden .= '
 		' . $the_input;
 			}
 		}
 
-		if( empty($itemToEdit) ) {
-			$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id,  self::getDbTable(), self::currentPageCode, false);
+		if (empty($itemToEdit)) {
+			$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id, self::getDbTable(), self::currentPageCode, false);
 			$the_form_general_content .= '
 			<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_existing_attribute_set_copy_from" >
-				<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_existing_attribute_set_copy_from" ><label for="'.$input_def_id.'" >' . __('Create the new group from an existing', '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_existing_attribute_set_copy_from" ><label for="' . $input_def_id . '" >' . __('Create the new group from an existing', '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_existing_attribute_set_copy_from" >' . $the_input . '</td>
 			</tr>';
 		}
 		$the_form_general_content = '
 <table class="wpshop_' . self::currentPageCode . '_edition_table wpshop_' . self::currentPageCode . '_edition_table_main_info" >
-'.$the_form_general_content.'
+'.$the_form_general_content . '
 </table>';
 
 		/*	Default content for the current page	*/
-		$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]['main_info']['title'] = __('Main informations', 'wpshop');
+		$bloc_list[self::currentPageCode]['main_info']['content'] = $the_form_general_content;
 
-		if(is_object($editedItem)){
-			$bloc_list[self::currentPageCode]['detail']['title']=__('Attribute group section details', 'wpshop');
-			$bloc_list[self::currentPageCode]['detail']['content']=self::attributeSetDetailsManagement($itemToEdit);
+		if (is_object($editedItem)) {
+			$bloc_list[self::currentPageCode]['detail']['title'] = __('Attribute group section details', 'wpshop');
+			$bloc_list[self::currentPageCode]['detail']['content'] = self::attributeSetDetailsManagement($itemToEdit);
 		}
 
 		$the_form = '
 <form name="' . self::getDbTable() . '_form" id="' . self::getDbTable() . '_form" method="post" action="#" >
-' . wpshop_form::form_input(self::getDbTable() . '_action', self::getDbTable() . '_action', (!empty($_REQUEST['action'])?sanitize_text_field($_REQUEST['action']):'save'), 'hidden') . '
-' . wpshop_form::form_input(self::getDbTable() . '_form_has_modification', self::getDbTable() . '_form_has_modification', 'no' , 'hidden') . $the_form_content_hidden . wpshop_display::custom_page_output_builder($bloc_list, WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT) . '
-	<div class="wpshop_edition_button wpshop_edition_button_'.self::currentPageCode.'" >';
+' . wpshop_form::form_input(self::getDbTable() . '_action', self::getDbTable() . '_action', (!empty($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : 'save'), 'hidden') . '
+' . wpshop_form::form_input(self::getDbTable() . '_form_has_modification', self::getDbTable() . '_form_has_modification', 'no', 'hidden') . $the_form_content_hidden . wpshop_display::custom_page_output_builder($bloc_list, WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT) . '
+	<div class="wpshop_edition_button wpshop_edition_button_'.self::currentPageCode . '" >';
 
-		if(($action == 'add') && (current_user_can('wpshop_add_attribute_set')))
+		if (($action == 'add') && (current_user_can('wpshop_add_attribute_set')))
 			$the_form .= '<input type="submit" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
-		elseif(current_user_can('wpshop_edit_attribute_set'))
+		elseif (current_user_can('wpshop_edit_attribute_set'))
 			$the_form .= '<input type="submit" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
 
-		if(current_user_can('wpshop_delete_attribute_set') && ($action != 'add'))
-			$the_form .= '<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_attribute_set') && ($action != 'add'))
+			$the_form .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_' . self::currentPageCode . '" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
 
 		$the_form .= '
 	</div>
 </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_attribute_set_edition_table_field_id_entity_id").change(function(){
 			jQuery(".wpshop_attribute_set_edition_table_field_input_existing_attribute_set_copy_from").html(jQuery("#wpshopLoadingPicture").html());
@@ -585,7 +585,7 @@ 
 	*
 	*	@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 = '';
 
@@ -600,15 +600,15 @@ 
 	*
 	*	@return object $elements A wordpress database object containing the element list
 	*/
-	public static function getElement($elementId = '', $elementStatus = "'valid', 'moderated'", $whatToSearch = 'id', $resultList = '', $entity_id = ''){
+	public static function getElement($elementId = '', $elementStatus = "'valid', 'moderated'", $whatToSearch = 'id', $resultList = '', $entity_id = '') {
 		global $wpdb;
 		$elements = array();
 		$moreQuery = "";
 		$moreQueryArgs = array();
 
-		if($elementId != '')
+		if ($elementId != '')
 		{
-			switch($whatToSearch)
+			switch ($whatToSearch)
 			{
 				case 'entity_code':
 					$moreQuery = "
@@ -638,13 +638,13 @@ 
 			$moreQueryArgs[] = $elementId;
 		}
 
-		if ( !empty($entity_id) ) {
+		if (!empty($entity_id)) {
 			$moreQuery .= "
 			AND ATTRIBUTE_SET.entity_id = %d ";
 			$moreQueryArgs[] = $entity_id;
 		}
 
-		if( empty($entity_id) ) {
+		if (empty($entity_id)) {
 			$moreQuery .= "AND 1=%d";
 			$moreQueryArgs[] = 1;
 		}
@@ -653,11 +653,11 @@ 
 			"SELECT ATTRIBUTE_SET.*, ENTITIES.post_name as entity
 			FROM " . self::getDbTable() . " AS ATTRIBUTE_SET
 				INNER JOIN " . $wpdb->posts . " AS ENTITIES ON (ENTITIES.ID = ATTRIBUTE_SET.entity_id)
-			WHERE ATTRIBUTE_SET.status IN (".$elementStatus.") " . $moreQuery, $moreQueryArgs
+			WHERE ATTRIBUTE_SET.status IN (".$elementStatus . ") " . $moreQuery, $moreQueryArgs
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if(($elementId == '') || ($resultList == 'all'))
+		if (($elementId == '') || ($resultList == 'all'))
 		{
 			$elements = $wpdb->get_results($query);
 		}
@@ -676,21 +676,21 @@ 
 	*
 	*	@return string $attributeSetDetailsManagement The html output of management interface
 	*/
-	public static function attributeSetDetailsManagement($attributeSetId = ''){
+	public static function attributeSetDetailsManagement($attributeSetId = '') {
 		global $validAttributeList; global $wpdb;
 		$user_more_script = $add_button = '';
 		$end_line_display = array();
 		/** Check if it's billing or Shipping **/
-		if ( !empty($attributeSetId) ) {
-			$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-			$billing_option = get_option( 'wpshop_billing_address' );
+		if (!empty($attributeSetId)) {
+			$shipping_option = get_option('wpshop_shipping_address_choice');
+			$billing_option = get_option('wpshop_billing_address');
 
-			if ( !empty($shipping_option) && !empty($shipping_option['choice']) && $shipping_option['choice'] == $attributeSetId ) {
-				$end_line_display = ( !empty( $shipping_option['display_model'] ) ) ? $shipping_option['display_model'] : array();
+			if (!empty($shipping_option) && !empty($shipping_option['choice']) && $shipping_option['choice'] == $attributeSetId) {
+				$end_line_display = (!empty($shipping_option['display_model'])) ? $shipping_option['display_model'] : array();
 			}
 
-			if ( !empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $attributeSetId ) {
-				$end_line_display = ( !empty( $billing_option['display_model'] ) ) ? $billing_option['display_model'] : array();
+			if (!empty($billing_option) && !empty($billing_option['choice']) && $billing_option['choice'] == $attributeSetId) {
+				$end_line_display = (!empty($billing_option['display_model'])) ? $billing_option['display_model'] : array();
 			}
 		}
 
@@ -698,12 +698,12 @@ 
 
 		$attributeSetDetailsManagement = '
 <div id="managementContainer" >';
-	if(current_user_can('wpshop_add_attribute_group')){
+	if (current_user_can('wpshop_add_attribute_group')) {
 		$dialog_title = __('New attribute set section name', 'wpshop');
 		$dialog_identifier = 'wpshop_new_set_section_add';
 		$dialog_input_identifier = 'wpshop_new_attribute_set_section_name';
 		ob_start();
-		include(WPSHOP_TEMPLATES_DIR.'admin/add_new_element_dialog.tpl.php');
+		include(WPSHOP_TEMPLATES_DIR . 'admin/add_new_element_dialog.tpl.php');
 		$attributeSetDetailsManagement .= ob_get_contents();
 		ob_end_clean();
 
@@ -711,37 +711,37 @@ 
 		$add_button_parent_class = 'attribute_set_section_add_new_button';
 		$add_button_name = 'wpshop_create_new_set_section_top';
 		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(){
 						jQuery("#managementContainer").load(ajaxurl,{
 							"action": "wps_attribute_set_section_new",
 							"_wpnonce": "' . wp_create_nonce("saveNewAttributeSetSection") . '",
 	            "elementIdentifier": "' . $attributeSetId . '",
-							"attributeSetSectionName": jQuery("#'.$dialog_input_identifier.'").val()
+							"attributeSetSectionName": jQuery("#'.$dialog_input_identifier . '").val()
 						});
 						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");
 			});';
 	}
 	$attributeSetDetailsManagement .= '
@@ -750,62 +750,62 @@ 
 
 		/*	Get information about the current attribute set we are editing	*/
 		$attributeSetDetails = self::getAttributeSetDetails($attributeSetId);
-		if(is_array($attributeSetDetails) && (count($attributeSetDetails) > 0)){
+		if (is_array($attributeSetDetails) && (count($attributeSetDetails) > 0)) {
 			/*	Build output with the current attribute set details	*/
-			foreach($attributeSetDetails as $attributeSetIDGroup => $attributeSetDetailsGroup){
+			foreach ($attributeSetDetails as $attributeSetIDGroup => $attributeSetDetailsGroup) {
 				/*	Check possible action for general code	*/
 				$elementActionClass = 'wpshop_attr_set_section_name';
 				$edition_area = $edit_button = '';
-				if ( current_user_can('wpshop_edit_attribute_group') ) {
+				if (current_user_can('wpshop_edit_attribute_group')) {
 					$elementActionClass = 'wpshop_attr_set_section_name_editable';
 					$edit_button = '
-			<a class="wpshop_attr_tool_box_button wpshop_attr_tool_box_edit wpshop_attr_tool_box_edit_attribute_set_section" id="wpshop_set_section_edit_'.$attributeSetDetailsGroup['id'].'" title="'.__('Edit this section', 'wpshop').'"></a>';
+			<a class="wpshop_attr_tool_box_button wpshop_attr_tool_box_edit wpshop_attr_tool_box_edit_attribute_set_section" id="wpshop_set_section_edit_'.$attributeSetDetailsGroup['id'] . '" title="' . __('Edit this section', 'wpshop') . '"></a>';
 
 					$tpl_component = array();
 					$tpl_component['ADMIN_GROUP_IDENTIFIER'] = str_replace('-', '_', sanitize_title($attributeSetDetailsGroup['id']));
 					$tpl_component['ADMIN_GROUP_ID'] = $attributeSetDetailsGroup['id'];
 					$tpl_component['ADMIN_GROUP_NAME'] = __($attributeSetDetailsGroup['name'], 'wpshop');
-					$tpl_component['ADMIN_GROUP_DISPLAY_TYPE_TAB'] = (!empty($attributeSetDetailsGroup['backend_display_type']) && ($attributeSetDetailsGroup['backend_display_type']=='fixed-tab')?' selected="selected"':'');
-					$tpl_component['ADMIN_GROUP_DISPLAY_TYPE_BOX'] = (!empty($attributeSetDetailsGroup['backend_display_type']) && ($attributeSetDetailsGroup['backend_display_type']=='movable-tab')?' selected="selected"':'');
-					$tpl_component['ADMIN_GROUP_DISPLAY_ON_FRONTEND'] = (!empty($attributeSetDetailsGroup['display_on_frontend']) && ($attributeSetDetailsGroup['display_on_frontend']=='yes')?' checked="checked"':'');
+					$tpl_component['ADMIN_GROUP_DISPLAY_TYPE_TAB'] = (!empty($attributeSetDetailsGroup['backend_display_type']) && ($attributeSetDetailsGroup['backend_display_type'] == 'fixed-tab') ? ' selected="selected"' : '');
+					$tpl_component['ADMIN_GROUP_DISPLAY_TYPE_BOX'] = (!empty($attributeSetDetailsGroup['backend_display_type']) && ($attributeSetDetailsGroup['backend_display_type'] == 'movable-tab') ? ' selected="selected"' : '');
+					$tpl_component['ADMIN_GROUP_DISPLAY_ON_FRONTEND'] = (!empty($attributeSetDetailsGroup['display_on_frontend']) && ($attributeSetDetailsGroup['display_on_frontend'] == 'yes') ? ' checked="checked"' : '');
 					$edition_area = wpshop_display::display_template_element('wpshop_admin_attr_set_section_params', $tpl_component, array(), 'admin');
 					unset($tpl_component);
 				}
 //<td rowspan="2" class="wpshop_attribute_set_section_detail_table_default_td" ><input title="'.__('Default section', 'wpshop').'" type="radio" name="wpshop_attribute_set_section_is_default_of_set" '.($is_default?'checked="checked" ':'').'id="wpshop_attribute_set_section_is_default_of_set_'.$attributeSetDetailsGroup['id'].'" value="'.$attributeSetDetailsGroup['id'].'" /></td>
-				$is_default = (!empty($attributeSetDetailsGroup['is_default_group']) && ($attributeSetDetailsGroup['is_default_group']=='yes')?true:false);
+				$is_default = (!empty($attributeSetDetailsGroup['is_default_group']) && ($attributeSetDetailsGroup['is_default_group'] == 'yes') ? true : false);
 				$attributeSetDetailsManagement .= '
-	<li id="attribute_group_' . $attributeSetIDGroup . '" class="attribute_set_section_container attribute_set_section_container_'.($is_default?'is_default':'normal').'" >
+	<li id="attribute_group_' . $attributeSetIDGroup . '" class="attribute_set_section_container attribute_set_section_container_' . ($is_default ? 'is_default' : 'normal') . '" >
 		<table class="wpshpop_attribute_set_section_detail_table" >
 			<tr>
 				<td id="wpshop_attr_set_section_name_' . $attributeSetDetailsGroup['id'] . '" class="' . $elementActionClass . '" >' . __($attributeSetDetailsGroup['name'], 'wpshop') . '</td>
 			</tr>
 			<tr>
 				<td>
-					<input class="newOrder" type="hidden" name="attribute_group_order[newOrder' . $attributeSetIDGroup . ']" id="newOrder' . $attributeSetIDGroup . '" value="' .( ( !empty($end_line_display) && !empty($end_line_display[$attributeSetIDGroup]) ) ? implode( ',', $end_line_display[$attributeSetIDGroup] ) : '' ). '" />';
+					<input class="newOrder" type="hidden" name="attribute_group_order[newOrder' . $attributeSetIDGroup . ']" id="newOrder' . $attributeSetIDGroup . '" value="' . ((!empty($end_line_display) && !empty($end_line_display[$attributeSetIDGroup])) ? implode(',', $end_line_display[$attributeSetIDGroup]) : '') . '" />';
 
 				/*	Add the set section details	*/
 				$price_tab = unserialize(WPSHOP_ATTRIBUTE_PRICES);
 				unset($price_tab[array_search(WPSHOP_COST_OF_POSTAGE, $price_tab)]);
 				$no_delete_button = false;
-				if ( is_array($attributeSetDetailsGroup['attribut']) && (count($attributeSetDetailsGroup['attribut']) >= 1) ) {
+				if (is_array($attributeSetDetailsGroup['attribut']) && (count($attributeSetDetailsGroup['attribut']) >= 1)) {
 					$attributeSetDetailsManagement .= '
 					<ul id="attribute_group_' . $attributeSetIDGroup . '_details" class="wpshop_attr_set_section_details" >';
 					ksort($attributeSetDetailsGroup['attribut']);
 					$end_line_id = 0;
-					foreach ( $attributeSetDetailsGroup['attribut'] as $attributInGroup ) {
-						if ( in_array($attributInGroup->code, $price_tab) ){
+					foreach ($attributeSetDetailsGroup['attribut'] as $attributInGroup) {
+						if (in_array($attributInGroup->code, $price_tab)) {
 							$no_delete_button = true;
 						}
-						if ( !empty($attributInGroup->id) && ( $attributInGroup->code != 'product_attribute_set_id' ) ) {
+						if (!empty($attributInGroup->id) && ($attributInGroup->code != 'product_attribute_set_id')) {
 
 						$attributeSetDetailsManagement .= '
-						<li class="ui-state-default attribute' . (in_array($attributInGroup->code, $price_tab) ? ' ui-state-disabled' : '') . '" id="attribute_' . $attributInGroup->id . '" >' . __($attributInGroup->frontend_label, 'wpshop')  . '</li>';
+						<li class="ui-state-default attribute' . (in_array($attributInGroup->code, $price_tab) ? ' ui-state-disabled' : '') . '" id="attribute_' . $attributInGroup->id . '" >' . __($attributInGroup->frontend_label, 'wpshop') . '</li>';
 
 
-						if ( !empty($end_line_display) && !empty($end_line_display[ $attributeSetIDGroup ]) && in_array('attribute_' .$attributInGroup->id, $end_line_display[ $attributeSetIDGroup ]) ) {
-							$key = array_search('attribute_' .$attributInGroup->id, $end_line_display[ $attributeSetIDGroup ] );
-							if ( !empty($end_line_display[ $attributeSetIDGroup ][$key + 1]) && $end_line_display[ $attributeSetIDGroup ][$key + 1] == 'wps-attribute-end-line-'.$end_line_id ) {
-								$attributeSetDetailsManagement .= '<li class="ui-state-green attribute_end_line" id="wps-attribute-end-line">' .__( 'End line', 'wpshop' ). '</li>';
+						if (!empty($end_line_display) && !empty($end_line_display[$attributeSetIDGroup]) && in_array('attribute_' . $attributInGroup->id, $end_line_display[$attributeSetIDGroup])) {
+							$key = array_search('attribute_' . $attributInGroup->id, $end_line_display[$attributeSetIDGroup]);
+							if (!empty($end_line_display[$attributeSetIDGroup][$key + 1]) && $end_line_display[$attributeSetIDGroup][$key + 1] == 'wps-attribute-end-line-' . $end_line_id) {
+								$attributeSetDetailsManagement .= '<li class="ui-state-green attribute_end_line" id="wps-attribute-end-line">' . __('End line', 'wpshop') . '</li>';
 								$end_line_id++;
 							}
 						}
@@ -817,15 +817,15 @@ 
 					</ul>';
 				}
 
-					$attributeSetDetailsManagement .= $edition_area.'
+					$attributeSetDetailsManagement .= $edition_area . '
 				</td>
 			</tr>
 		</table>
 
 		<div class="wpshop_admin_toolbox wpshop_attr_set_section_tool_box" >' . $edit_button;
-			if ( current_user_can('wpshop_delete_attribute_group') && !$no_delete_button ) {
+			if (current_user_can('wpshop_delete_attribute_group') && !$no_delete_button) {
 				$attributeSetDetailsManagement .= '
-			<a class="wpshop_attr_tool_box_button wpshop_attr_tool_box_delete wpshop_attr_tool_box_delete_attribute_set_section" id="wpshop_set_section_delete_'.$attributeSetDetailsGroup['id'].'" title="'.__('Delete this section', 'wpshop').'"></a>';
+			<a class="wpshop_attr_tool_box_button wpshop_attr_tool_box_delete wpshop_attr_tool_box_delete_attribute_set_section" id="wpshop_set_section_delete_'.$attributeSetDetailsGroup['id'] . '" title="' . __('Delete this section', 'wpshop') . '"></a>';
 			}
 			$attributeSetDetailsManagement .= '
 		</div>
@@ -845,9 +845,9 @@ 
 
 		/*	Get the not affected attribute list	*/
 		$notAffectedAttributeList = self::get_not_affected_attribute($attributeSetId, $attributeSetDetailsGroup['entity_id']);
-		if(count($notAffectedAttributeList) > 0){
-			foreach($notAffectedAttributeList as $notAffectedAttribute){
-				if( (is_null($validAttributeList) || !in_array($notAffectedAttribute->id, $validAttributeList)) && ( $notAffectedAttribute->code != 'product_attribute_set_id' ) && ($attributeSetDetailsGroup['entity_id'] == $notAffectedAttribute->entity_id) ){
+		if (count($notAffectedAttributeList) > 0) {
+			foreach ($notAffectedAttributeList as $notAffectedAttribute) {
+				if ((is_null($validAttributeList) || !in_array($notAffectedAttribute->id, $validAttributeList)) && ($notAffectedAttribute->code != 'product_attribute_set_id') && ($attributeSetDetailsGroup['entity_id'] == $notAffectedAttribute->entity_id)) {
 
 				$attributeSetDetailsManagement .= '
 			<li class="ui-state-default attribute" id="attribute_' . $notAffectedAttribute->id . '" >' . __($notAffectedAttribute->frontend_label, 'wpshop') . '</li>';
@@ -861,20 +861,20 @@ 
 		</fieldset>
 	</div>';
 
-		if ( !empty($attributeSetId) ) {
-			$query  = $wpdb->prepare( 'SELECT entity_id FROM '.WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE id = %d', $attributeSetId );
-			$entity_id = $wpdb->get_var( $query );
-			if ( !empty($entity_id) ) {
-				$entity_post = get_post( $entity_id );
-				if( !empty( $entity_post) && !empty($entity_post->post_type) && $entity_post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES && !empty($entity_post->post_name) && $entity_post->post_name == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS ) {
-					$attributeSetDetailsManagement .= '<ul class="wps_attribute_set_end_line"><li class="ui-state-green attribute_end_line" id="wps-attribute-end-line">' .__( 'End line', 'wpshop' ). '</li></ul>';
+		if (!empty($attributeSetId)) {
+			$query = $wpdb->prepare('SELECT entity_id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE id = %d', $attributeSetId);
+			$entity_id = $wpdb->get_var($query);
+			if (!empty($entity_id)) {
+				$entity_post = get_post($entity_id);
+				if (!empty($entity_post) && !empty($entity_post->post_type) && $entity_post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES && !empty($entity_post->post_name) && $entity_post->post_name == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) {
+					$attributeSetDetailsManagement .= '<ul class="wps_attribute_set_end_line"><li class="ui-state-green attribute_end_line" id="wps-attribute-end-line">' . __('End line', 'wpshop') . '</li></ul>';
 				}
 			}
 		}
-		if(current_user_can('wpshop_delete_attribute_group')){
+		if (current_user_can('wpshop_delete_attribute_group')) {
 			$user_more_script .= '
 			jQuery(".wpshop_attr_tool_box_delete").click(function(){
-				if(confirm(wpshopConvertAccentTojs("'.__('Are you sure you want to delete this atribute set section?', 'wpshop').'"))){
+				if(confirm(wpshopConvertAccentTojs("'.__('Are you sure you want to delete this atribute set section?', 'wpshop') . '"))){
 					jQuery("#ajax-response").load(ajaxurl,{
 						"action": "wps_attribute_set_section_delete",
 						"_wpnonce": "' . wp_create_nonce("deleteAttributeSetSection") . '",
@@ -886,7 +886,7 @@ 
 		$attributeSetDetailsManagement .= '
 	<script type="text/javascript" >
 		wpshop(document).ready(function(){
-			make_list_sortable("' . WPSHOP_DBT_ATTRIBUTE_SET . '");'.$user_more_script.'
+			make_list_sortable("' . WPSHOP_DBT_ATTRIBUTE_SET . '");' . $user_more_script . '
 		});
 	</script>
 	<div class="wpshop_cls"></div>
@@ -953,7 +953,7 @@ 
 	*
 	*	@return array $attributeSetDetailsGroups The List of attribute and attribute groups for the given attribute set
 	*/
-	public static function getAttributeSetDetails($attributeSetId, $attributeSetStatus = "'valid', 'moderated'"){
+	public static function getAttributeSetDetails($attributeSetId, $attributeSetStatus = "'valid', 'moderated'") {
 		global $wpdb, $validAttributeList;
 		$attributeSetDetailsGroups = '';
 
@@ -973,7 +973,7 @@ 
 			$attributeSetId);
 		$attributeSetDetails = $wpdb->get_results($query);
 
-		foreach ( $attributeSetDetails as $attributeGroup ) {
+		foreach ($attributeSetDetails as $attributeGroup) {
 			$attributeSetDetailsGroups[$attributeGroup->attr_group_id]['attribute_set_id'] = $attributeGroup->attribute_set_id;
 			$attributeSetDetailsGroups[$attributeGroup->attr_group_id]['id'] = $attributeGroup->attribute_detail_id;
 			$attributeSetDetailsGroups[$attributeGroup->attr_group_id]['code'] = $attributeGroup->attr_group_code;
@@ -984,17 +984,17 @@ 
 			$attributeSetDetailsGroups[$attributeGroup->attr_group_id]['display_on_frontend'] = $attributeGroup->display_on_frontend;
 			$attributeSetDetailsGroups[$attributeGroup->attr_group_id]['entity_id'] = $attributeGroup->entity_id;
 
-			if ( empty($done_position) || empty($done_position[$attributeGroup->attr_group_id]) ) {
+			if (empty($done_position) || empty($done_position[$attributeGroup->attr_group_id])) {
 				$done_position[$attributeGroup->attr_group_id] = array();
 			}
 			$position_to_take = $attributeGroup->attr_position_in_group;
-			if ( in_array($position_to_take, $done_position[$attributeGroup->attr_group_id]) ) {
+			if (in_array($position_to_take, $done_position[$attributeGroup->attr_group_id])) {
 				$position_to_take = max($done_position[$attributeGroup->attr_group_id]) + 1;
 			}
 			$done_position[$attributeGroup->attr_group_id][] = $position_to_take;
 			$attributeSetDetailsGroups[$attributeGroup->attr_group_id]['attribut'][$position_to_take] = $attributeGroup;
 			$attributeSetDetailsGroups[$attributeGroup->attr_group_id]['is_used_in_quick_add_form'] = $attributeGroup->is_used_in_quick_add_form;
-			if ( in_array($attributeGroup->code, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ) {
+			if (in_array($attributeGroup->code, unserialize(WPSHOP_ATTRIBUTE_PRICES))) {
 				$attributeSetDetailsGroups[$attributeGroup->attr_group_id]['prices'][$attributeGroup->code] = $attributeGroup;
 			}
 			$validAttributeList[] = $attributeGroup->id;
@@ -1010,7 +1010,7 @@ 
 	*
 	*	@return array $attributeSetDetails The List of attribute not affected
 	*/
-	public static function get_not_affected_attribute($attributeSetId, $entity_set_id){
+	public static function get_not_affected_attribute($attributeSetId, $entity_set_id) {
 		global $wpdb;
 
 		$query = $wpdb->prepare(
@@ -1050,7 +1050,7 @@ 
 	*
 	*	@return object $entitySets The entity sets list for the given entity
 	*/
-	public static function get_attribute_set_list_for_entity($entityId){
+	public static function get_attribute_set_list_for_entity($entityId) {
 		global $wpdb;
 		$entitySetList = '';
 
@@ -1074,39 +1074,39 @@ 
 		global $wpdb;
 
 		$query = '
-		SELECT '.WPSHOP_DBT_ATTRIBUTE.'.frontend_label, '.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL.'.value AS value_decimal, '.WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME.'.value AS value_datetime, '.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER.'.value AS value_integer,
-				'.WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT.'.value AS value_text, '.WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR.'.value AS value_varchar, '.WPSHOP_DBT_ATTRIBUTE_UNIT.'.unit AS unit, '.WPSHOP_DBT_ATTRIBUTE.'.frontend_verification
-		FROM '.WPSHOP_DBT_ATTRIBUTE_DETAILS.'
-			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE.' ON '.WPSHOP_DBT_ATTRIBUTE_DETAILS.'.attribute_id='.WPSHOP_DBT_ATTRIBUTE.'.id
-			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL.' ON '.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL.'.attribute_id='.WPSHOP_DBT_ATTRIBUTE.'.id
-			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME.' ON '.WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME.'.attribute_id='.WPSHOP_DBT_ATTRIBUTE.'.id
-			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER.' ON '.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER.'.attribute_id='.WPSHOP_DBT_ATTRIBUTE.'.id
-			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT.' ON '.WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT.'.attribute_id='.WPSHOP_DBT_ATTRIBUTE.'.id
-			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR.' ON '.WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR.'.attribute_id='.WPSHOP_DBT_ATTRIBUTE.'.id
-			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_UNIT.' ON (
-				'.WPSHOP_DBT_ATTRIBUTE_UNIT.'.id='.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL.'.unit_id
-				OR '.WPSHOP_DBT_ATTRIBUTE_UNIT.'.id='.WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME.'.unit_id
-				OR '.WPSHOP_DBT_ATTRIBUTE_UNIT.'.id='.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER.'.unit_id
-				OR '.WPSHOP_DBT_ATTRIBUTE_UNIT.'.id='.WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT.'.unit_id
-				OR '.WPSHOP_DBT_ATTRIBUTE_UNIT.'.id='.WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR.'.unit_id
+		SELECT '.WPSHOP_DBT_ATTRIBUTE . '.frontend_label, ' . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . '.value AS value_decimal, ' . WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME . '.value AS value_datetime, ' . WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . '.value AS value_integer,
+				'.WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT . '.value AS value_text, ' . WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . '.value AS value_varchar, ' . WPSHOP_DBT_ATTRIBUTE_UNIT . '.unit AS unit, ' . WPSHOP_DBT_ATTRIBUTE . '.frontend_verification
+		FROM '.WPSHOP_DBT_ATTRIBUTE_DETAILS . '
+			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE . ' ON ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . '.attribute_id=' . WPSHOP_DBT_ATTRIBUTE . '.id
+			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . ' ON ' . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . '.attribute_id=' . WPSHOP_DBT_ATTRIBUTE . '.id
+			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME . ' ON ' . WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME . '.attribute_id=' . WPSHOP_DBT_ATTRIBUTE . '.id
+			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . ' ON ' . WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . '.attribute_id=' . WPSHOP_DBT_ATTRIBUTE . '.id
+			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT . ' ON ' . WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT . '.attribute_id=' . WPSHOP_DBT_ATTRIBUTE . '.id
+			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . ' ON ' . WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . '.attribute_id=' . WPSHOP_DBT_ATTRIBUTE . '.id
+			LEFT JOIN '.WPSHOP_DBT_ATTRIBUTE_UNIT . ' ON (
+				'.WPSHOP_DBT_ATTRIBUTE_UNIT . '.id=' . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . '.unit_id
+				OR '.WPSHOP_DBT_ATTRIBUTE_UNIT . '.id=' . WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME . '.unit_id
+				OR '.WPSHOP_DBT_ATTRIBUTE_UNIT . '.id=' . WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . '.unit_id
+				OR '.WPSHOP_DBT_ATTRIBUTE_UNIT . '.id=' . WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT . '.unit_id
+				OR '.WPSHOP_DBT_ATTRIBUTE_UNIT . '.id=' . WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . '.unit_id
 			)
 		WHERE
-			'.WPSHOP_DBT_ATTRIBUTE_DETAILS.'.status="valid"
-			AND '.WPSHOP_DBT_ATTRIBUTE.'.status="valid"
-			AND '.WPSHOP_DBT_ATTRIBUTE_DETAILS.'.attribute_group_id IN ('.$atts['sid'].')
+			'.WPSHOP_DBT_ATTRIBUTE_DETAILS . '.status="valid"
+			AND '.WPSHOP_DBT_ATTRIBUTE . '.status="valid"
+			AND '.WPSHOP_DBT_ATTRIBUTE_DETAILS . '.attribute_group_id IN (' . $atts['sid'] . ')
 			AND (
-				'.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL.'.entity_id='.$atts['pid'].'
-				OR '.WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME.'.entity_id='.$atts['pid'].'
-				OR '.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER.'.entity_id='.$atts['pid'].'
-				OR '.WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT.'.entity_id='.$atts['pid'].'
-				OR '.WPSHOP_DBT_ATTRIBUTE.'_value_varchar.entity_id='.$atts['pid'].'
+				'.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . '.entity_id=' . $atts['pid'] . '
+				OR '.WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME . '.entity_id=' . $atts['pid'] . '
+				OR '.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . '.entity_id=' . $atts['pid'] . '
+				OR '.WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT . '.entity_id=' . $atts['pid'] . '
+				OR '.WPSHOP_DBT_ATTRIBUTE . '_value_varchar.entity_id=' . $atts['pid'] . '
 			)
 		';
 		$data = $wpdb->get_results($query);
-		foreach($data as $d) {
+		foreach ($data as $d) {
 			$value_style_start = $value_style_end = '';
-			if ( !empty($d->frontend_verification) ) {
-				switch ( $d->frontend_verification ) {
+			if (!empty($d->frontend_verification)) {
+				switch ($d->frontend_verification) {
 					case 'phone':
 						$value_style_start = '<a href="tel:' . $d->value_decimal . $d->value_datetime . $d->value_integer . $d->value_text . $d->value_varchar . '" >';
 						$value_style_end = '</a>';
@@ -1117,7 +1117,7 @@ 
 					break;
 				}
 			}
-			echo '<strong>'.__($d->frontend_label, 'wpshop').'</strong> : ' . $value_style_start . $d->value_decimal . $d->value_datetime . $d->value_integer . $d->value_text . $d->value_varchar . $value_style_end . ( !empty($d->unit) ? ' ('.$d->unit.')' : '' ) . '<br />';
+			echo '<strong>' . __($d->frontend_label, 'wpshop') . '</strong> : ' . $value_style_start . $d->value_decimal . $d->value_datetime . $d->value_integer . $d->value_text . $d->value_varchar . $value_style_end . (!empty($d->unit) ? ' (' . $d->unit . ')' : '') . '<br />';
 		}
 	}
 
@@ -1132,31 +1132,31 @@ 
 	 *
 	 * @return string Le code html permettant d'afficher la liste des groupes et/ou sous-groupes d'attributs
 	 */
-	public static function get_attribute_set_complete_list($entity_id, $table, $page_code, $complete_tree = true){
+	public static function get_attribute_set_complete_list($entity_id, $table, $page_code, $complete_tree = true) {
 		$the_input = __('There is no attribute set for this entity', 'wpshop');
 
 		$attr_set_list = wpshop_attributes_set::getElement($entity_id, "'valid'", 'entity_id', 'all');
-		if ( !empty($attr_set_list) ) {
+		if (!empty($attr_set_list)) {
 			$the_input = '<select name="' . $table . '[set_section]" class="wpshop_' . $page_code . '_set_section" >';
 			if (!$complete_tree) {
-				$the_input .= '<option value="0">'.__('None', 'wpshop').'</option>';
+				$the_input .= '<option value="0">' . __('None', 'wpshop') . '</option>';
 			}
 
-			foreach ( $attr_set_list as $attr_set_index => $attr_set ) {
-				if ( !empty($attr_set->id) ) {
+			foreach ($attr_set_list as $attr_set_index => $attr_set) {
+				if (!empty($attr_set->id)) {
 					$attribute_set_details = wpshop_attributes_set::getAttributeSetDetails($attr_set->id, "'valid'");
-					if ( !empty($attribute_set_details) ) {
+					if (!empty($attribute_set_details)) {
 
 						if ($complete_tree) {
-							$the_input .= '<optgroup label="'.__($attr_set->name, 'wpshop').'" >';
-							foreach ( $attribute_set_details as $set_details ) {
-								$selected = ( ( $attr_set->default_set == 'yes' ) && ( $set_details['is_default_group'] == 'yes' ) ? ' selected="selected"' : '' );
-								$the_input .= '<option'.$selected.' value="'.$attr_set->id.'_'.$set_details['id'].'">'.__($set_details['name'],'wpshop').'</option>';
+							$the_input .= '<optgroup label="' . __($attr_set->name, 'wpshop') . '" >';
+							foreach ($attribute_set_details as $set_details) {
+								$selected = (($attr_set->default_set == 'yes') && ($set_details['is_default_group'] == 'yes') ? ' selected="selected"' : '');
+								$the_input .= '<option' . $selected . ' value="' . $attr_set->id . '_' . $set_details['id'] . '">' . __($set_details['name'], 'wpshop') . '</option>';
 							}
 							$the_input .= '</optgroup>';
 						}
 						else {
-							$the_input .= '<option value="'.$attr_set->id.'">'.__($attr_set->name, 'wpshop').'</option>';
+							$the_input .= '<option value="' . $attr_set->id . '">' . __($attr_set->name, 'wpshop') . '</option>';
 						}
 					}
 				}

Indentation +73 added lines, -73 removed lines

@@ -43,42 +43,42 @@ 
 	public $pageMessage = '';
 
 	/**
-	*	Get the url listing slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url listing slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	function setMessage($message){
 		$this->pageMessage = $message;
 	}
 	/**
-	*	Get the url listing slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url listing slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	function getListingSlug(){
 		return self::urlSlugListing;
 	}
 	/**
-	*	Get the url edition slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url edition slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	public static function getEditionSlug(){
 		return self::urlSlugEdition;
 	}
 	/**
-	*	Get the database table of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the database table of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	public static function getDbTable(){
 		return self::dbTable;
 	}
 	/**
-	*	Define the title of the page
-	*
-	*	@return string $title The title of the page looking at the environnement
-	*/
+	 *	Define the title of the page
+	 *
+	 *	@return string $title The title of the page looking at the environnement
+	 */
 	function pageTitle(){
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
 		$objectInEdition = isset($_REQUEST['id']) ? sanitize_key($_REQUEST['id']) : '';
@@ -96,8 +96,8 @@ 
 	}
 
 	/**
-	*	Define the different message and action after an action is send through the element interface
-	*/
+	 *	Define the different message and action after an action is send through the element interface
+	 */
 	function elementAction(){
 		global $wpdb, $initialEavData;
 		$pageMessage = $actionResult = '';
@@ -365,14 +365,14 @@ 
 		self::setMessage($pageMessage);
 	}
 	/**
-	*	Return the list page content, containing the table that present the item list
-	*
-	*	@return string $listItemOutput The html code that output the item list
-	*/
+	 *	Return the list page content, containing the table that present the item list
+	 *
+	 *	@return string $listItemOutput The html code that output the item list
+	 */
 	function elementList() {
-	    //Create an instance of our package class...
-	    $wpshop_list_table = new wpshop_attributes_set_custom_List_table();
-	    //Fetch, prepare, sort, and filter our data...
+		//Create an instance of our package class...
+		$wpshop_list_table = new wpshop_attributes_set_custom_List_table();
+		//Fetch, prepare, sort, and filter our data...
 		$status="'valid', 'moderated'";
 		$attribute_set_list = array();
 		$attribute_group_status = !empty( $_REQUEST['attribute_groups_status'] ) ? sanitize_text_field( $_REQUEST['attribute_groups_status'] ) : '';
@@ -430,10 +430,10 @@ 
 	}
 
 	/**
-	*	Return the page content to add a new item
-	*
-	*	@return string The html code that output the interface for adding a nem item
-	*/
+	 *	Return the page content to add a new item
+	 *
+	 *	@return string The html code that output the interface for adding a nem item
+	 */
 	function elementEdition($itemToEdit = '') {
 		global $attribute_hidden_field;
 
@@ -581,10 +581,10 @@ 
 		return $the_form;
 	}
 	/**
-	*	Return the different button to save the item currently being added or edited
-	*
-	*	@return string $currentPageButton The html output code with the different button to add to the interface
-	*/
+	 *	Return the different button to save the item currently being added or edited
+	 *
+	 *	@return string $currentPageButton The html output code with the different button to add to the interface
+	 */
 	function getPageFormButton($element_id = 0){
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : 'add';
 		$currentPageButton = '';
@@ -593,13 +593,13 @@ 
 	}
 
 	/**
-	*	Get the existing element list into database
-	*
-	*	@param integer $elementId optionnal The element identifier we want to get. If not specify the entire list will be returned
-	*	@param string $elementStatus optionnal The status of element to get into database. Default is set to valid element
-	*
-	*	@return object $elements A wordpress database object containing the element list
-	*/
+	 *	Get the existing element list into database
+	 *
+	 *	@param integer $elementId optionnal The element identifier we want to get. If not specify the entire list will be returned
+	 *	@param string $elementStatus optionnal The status of element to get into database. Default is set to valid element
+	 *
+	 *	@return object $elements A wordpress database object containing the element list
+	 */
 	public static function getElement($elementId = '', $elementStatus = "'valid', 'moderated'", $whatToSearch = 'id', $resultList = '', $entity_id = ''){
 		global $wpdb;
 		$elements = array();
@@ -670,12 +670,12 @@ 
 	}
 
 	/**
-	*	Display inteface allowing to manage the attribute set and group details
-	*
-	*	@param object $atributeSetId The element's identifier we have to manage the details for
-	*
-	*	@return string $attributeSetDetailsManagement The html output of management interface
-	*/
+	 *	Display inteface allowing to manage the attribute set and group details
+	 *
+	 *	@param object $atributeSetId The element's identifier we have to manage the details for
+	 *
+	 *	@return string $attributeSetDetailsManagement The html output of management interface
+	 */
 	public static function attributeSetDetailsManagement($attributeSetId = ''){
 		global $validAttributeList; global $wpdb;
 		$user_more_script = $add_button = '';
@@ -946,13 +946,13 @@ 
 	}
 
 	/**
-	*	Get the complete details about attributes sets
-	*
-	*	@param integer $attributeSetId The attribute set identifier we want to get the details for
-	*	@param string $attributeSetStatus optionnal The attribute set status. Allows to define if we want all attribute sets or a deleted or valid and so on
-	*
-	*	@return array $attributeSetDetailsGroups The List of attribute and attribute groups for the given attribute set
-	*/
+	 *	Get the complete details about attributes sets
+	 *
+	 *	@param integer $attributeSetId The attribute set identifier we want to get the details for
+	 *	@param string $attributeSetStatus optionnal The attribute set status. Allows to define if we want all attribute sets or a deleted or valid and so on
+	 *
+	 *	@return array $attributeSetDetailsGroups The List of attribute and attribute groups for the given attribute set
+	 */
 	public static function getAttributeSetDetails($attributeSetId, $attributeSetStatus = "'valid', 'moderated'"){
 		global $wpdb, $validAttributeList;
 		$attributeSetDetailsGroups = '';
@@ -1004,12 +1004,12 @@ 
 	}
 
 	/**
-	*	Get the attribute list of attribute not associated to he set we are editing
-	*
-	*	@param integer $attributeSetId The attribute set identifier we want to get the details for
-	*
-	*	@return array $attributeSetDetails The List of attribute not affected
-	*/
+	 *	Get the attribute list of attribute not associated to he set we are editing
+	 *
+	 *	@param integer $attributeSetId The attribute set identifier we want to get the details for
+	 *
+	 *	@return array $attributeSetDetails The List of attribute not affected
+	 */
 	public static function get_not_affected_attribute($attributeSetId, $entity_set_id){
 		global $wpdb;
 
@@ -1044,12 +1044,12 @@ 
 	}
 
 	/**
-	*	Get the existing attribute set for an entity
-	*
-	*	@param integer $entityId The entity identifier we want to get the entity set list for
-	*
-	*	@return object $entitySets The entity sets list for the given entity
-	*/
+	 *	Get the existing attribute set for an entity
+	 *
+	 *	@param integer $entityId The entity identifier we want to get the entity set list for
+	 *
+	 *	@return object $entitySets The entity sets list for the given entity
+	 */
 	public static function get_attribute_set_list_for_entity($entityId){
 		global $wpdb;
 		$entitySetList = '';
@@ -1066,10 +1066,10 @@ 
 	}
 
 	/**
-	* Traduit le shortcode et affiche un groupe d'attributs
-	* @param array $atts : tableau de param�tre du shortcode
-	* @return mixed
-	**/
+	 * Traduit le shortcode et affiche un groupe d'attributs
+	 * @param array $atts : tableau de param�tre du shortcode
+	 * @return mixed
+	 **/
 	public static function wpshop_att_group_func($atts) {
 		global $wpdb;
 

includes/librairies/eav/attributes_unit.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -68,6 +68,7 @@ 
 	/**
 	*	Get the url listing slug of the current class
 	*
+	*	@param string $message
 	*	@return string The table of the class
 	*/
 	function setMessage($message)
@@ -519,7 +520,7 @@ 
 	*
 	*	@param integer $element_id optionnal The attribute identifier we want to get. If not specify the entire list will be returned
 	*	@param string $element_status optionnal The status of element to get into database. Default is set to valid element
-	*	@param mixed $field_to_search optionnal The field we want to check the row identifier into. Default is to set id
+	*	@param string $field_to_search optionnal The field we want to check the row identifier into. Default is to set id
 	*
 	*	@return object $element_list A wordpress database object containing the attribute list
 	*/

Indentation +78 added lines, -78 removed lines

@@ -24,45 +24,45 @@ 
 class wpshop_attributes_unit
 {
 	/**
-	*	Define the database table used in the current class
-	*/
+	 *	Define the database table used in the current class
+	 */
 	const dbTable = WPSHOP_DBT_ATTRIBUTE_UNIT;
 	/**
-	*	Define the url listing slug used in the current class
-	*/
+	 *	Define the url listing slug used in the current class
+	 */
 	const urlSlugListing = WPSHOP_URL_SLUG_ATTRIBUTE_LISTING;
 	/**
-	*	Define the url edition slug used in the current class
-	*/
+	 *	Define the url edition slug used in the current class
+	 */
 	const urlSlugEdition = WPSHOP_URL_SLUG_ATTRIBUTE_LISTING;
 	/**
-	*	Define the current entity code
-	*/
+	 *	Define the current entity code
+	 */
 	const currentPageCode = 'attributes_unit';
 	/**
-	*	Define the page title
-	*/
+	 *	Define the page title
+	 */
 	const pageContentTitle = 'Attributes unit';
 	/**
-	*	Define the page title when adding an attribute
-	*/
+	 *	Define the page title when adding an attribute
+	 */
 	const pageAddingTitle = 'Add an unit';
 	/**
-	*	Define the page title when editing an attribute
-	*/
+	 *	Define the page title when editing an attribute
+	 */
 	const pageEditingTitle = 'Unit "%s" edit';
 	/**
-	*	Define the page title when editing an attribute
-	*/
+	 *	Define the page title when editing an attribute
+	 */
 	const pageTitle = 'Attributes unit list';
 
 	/**
-	*	Define the path to page main icon
-	*/
+	 *	Define the path to page main icon
+	 */
 	public $pageIcon = '';
 	/**
-	*	Define the message to output after an action
-	*/
+	 *	Define the message to output after an action
+	 */
 	public $pageMessage = '';
 
 	/**
@@ -71,47 +71,47 @@ 
 	public static $currencies_cache;
 
 	/**
-	*	Get the url listing slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url listing slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	function setMessage($message)
 	{
 		$this->pageMessage = $message;
 	}
 	/**
-	*	Get the url listing slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url listing slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	public static function getListingSlug()
 	{
 		return self::urlSlugListing;
 	}
 	/**
-	*	Get the url edition slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url edition slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	public static function getEditionSlug()
 	{
 		return self::urlSlugEdition;
 	}
 	/**
-	*	Get the database table of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the database table of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	public static function getDbTable()
 	{
 		return self::dbTable;
 	}
 
 	/**
-	*	Define the title of the page
-	*
-	*	@return string $title The title of the page looking at the environnement
-	*/
+	 *	Define the title of the page
+	 *
+	 *	@return string $title The title of the page looking at the environnement
+	 */
 	function pageTitle()
 	{
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
@@ -139,8 +139,8 @@ 
 	}
 
 	/**
-	*	Define the different message and action after an action is send through the element interface
-	*/
+	 *	Define the different message and action after an action is send through the element interface
+	 */
 	function elementAction()
 	{
 		global $wpdb, $initialEavData;
@@ -270,10 +270,10 @@ 
 	}
 
 	/**
-	*	Return the list page content, containing the table that present the item list
-	*
-	*	@return string $listItemOutput The html code that output the item list
-	*/
+	 *	Return the list page content, containing the table that present the item list
+	 *
+	 *	@return string $listItemOutput The html code that output the item list
+	 */
 	public static function elementList()
 	{
 		$listItemOutput = '';
@@ -393,10 +393,10 @@ 
 		return $listItemOutput;
 	}
 	/**
-	*	Return the page content to add a new item
-	*
-	*	@return string The html code that output the interface for adding a nem item
-	*/
+	 *	Return the page content to add a new item
+	 *
+	 *	@return string The html code that output the interface for adding a nem item
+	 */
 	public static function elementEdition($itemToEdit = ''){
 		global $attribute_displayed_field; global $wpdb;
 		$dbFieldList = wpshop_database::fields_to_input(self::getDbTable());
@@ -493,10 +493,10 @@ 
 		return $the_form;
 	}
 	/**
-	*	Return the different button to save the item currently being added or edited
-	*
-	*	@return string $currentPageButton The html output code with the different button to add to the interface
-	*/
+	 *	Return the different button to save the item currently being added or edited
+	 *
+	 *	@return string $currentPageButton The html output code with the different button to add to the interface
+	 */
 	function getPageFormButton($element_id = 0)
 	{
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : 'add';
@@ -524,14 +524,14 @@ 
 	}
 
 	/**
-	*	Get the existing attribute list into database
-	*
-	*	@param integer $element_id optionnal The attribute identifier we want to get. If not specify the entire list will be returned
-	*	@param string $element_status optionnal The status of element to get into database. Default is set to valid element
-	*	@param mixed $field_to_search optionnal The field we want to check the row identifier into. Default is to set id
-	*
-	*	@return object $element_list A wordpress database object containing the attribute list
-	*/
+	 *	Get the existing attribute list into database
+	 *
+	 *	@param integer $element_id optionnal The attribute identifier we want to get. If not specify the entire list will be returned
+	 *	@param string $element_status optionnal The status of element to get into database. Default is set to valid element
+	 *	@param mixed $field_to_search optionnal The field we want to check the row identifier into. Default is to set id
+	 *
+	 *	@return object $element_list A wordpress database object containing the attribute list
+	 */
 	public static function getElement($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id'){
 		global $wpdb;
 		$element_list = array();
@@ -563,8 +563,8 @@ 
 	}
 
 	/**
-	*
-	*/
+	 *
+	 */
 	public static function get_unit_list_for_group($group_id){
 		global $wpdb;
 		$unit_list_for_group = '';
@@ -578,8 +578,8 @@ 
 		return $unit_list_for_group;
 	}
 	/**
-	*
-	*/
+	 *
+	 */
 	public static function get_default_unit_for_group($group_id){
 		global $wpdb;
 		$default_unit_for_group = '';
@@ -592,10 +592,10 @@ 
 	}
 
 	/**
-	*	Get the unit group existing list in database
-	*
-	*	@return object $attribute_unit_group_list The list of existing unit group
-	*/
+	 *	Get the unit group existing list in database
+	 *
+	 *	@return object $attribute_unit_group_list The list of existing unit group
+	 */
 	public static function get_unit_group($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id'){
 		global $wpdb;
 		$element_list = array();
@@ -628,10 +628,10 @@ 
 		// return $attribute_unit_group_list;
 	}
 	/**
-	*	Return the list page content, containing the table that present the item list
-	*
-	*	@return string $listItemOutput The html code that output the item list
-	*/
+	 *	Return the list page content, containing the table that present the item list
+	 *
+	 *	@return string $listItemOutput The html code that output the item list
+	 */
 	public static function unit_group_list(){
 		$listItemOutput = '';
 
@@ -740,10 +740,10 @@ 
 		return $listItemOutput;
 	}
 	/**
-	*	Return the page content to add a new item
-	*
-	*	@return string The html code that output the interface for adding a nem item
-	*/
+	 *	Return the page content to add a new item
+	 *
+	 *	@return string The html code that output the interface for adding a nem item
+	 */
 	public static function unit_group_edition($itemToEdit = ''){
 		global $attribute_displayed_field;
 		$dbFieldList = wpshop_database::fields_to_input(WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);

Spacing +131 added lines, -131 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'));
 }
 
 /**
@@ -116,22 +116,22 @@ 
 	{
 		$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 != '')
+		$title = __(self::pageTitle, 'wpshop');
+		if ($action != '')
 		{
-			if(($action == 'edit') || ($action == 'delete'))
+			if (($action == 'edit') || ($action == 'delete'))
 			{
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
 			}
-			elseif($action == 'add')
+			elseif ($action == 'add')
 			{
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && (sanitize_text_field($page) == self::getEditionSlug()))
+		elseif ((self::getEditionSlug() != self::getListingSlug()) && (sanitize_text_field($page) == self::getEditionSlug()))
 		{
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
@@ -152,31 +152,31 @@ 
 		/****************************************************************************/
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : 'add';
 		$saveditem = isset($_REQUEST['saveditem']) ? wpshop_tools::varSanitizer($_REQUEST['saveditem']) : '';
-		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>');
 		}
 
 		/*	Define the database operation type from action launched by the user	 */
-		$attribute_group_parameter = (!empty($_REQUEST[self::getDbTable()])) ? (array) $_REQUEST[self::getDbTable()] : array();
-		$attribute_group_parameter['default_value'] = str_replace('"', "'", sanitize_text_field( $attribute_group_parameter['default_value']));
+		$attribute_group_parameter = (!empty($_REQUEST[self::getDbTable()])) ? (array)$_REQUEST[self::getDbTable()] : array();
+		$attribute_group_parameter['default_value'] = str_replace('"', "'", sanitize_text_field($attribute_group_parameter['default_value']));
 		/*************************		GENERIC				**************************/
 		/*************************************************************************/
 		$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? wpshop_tools::varSanitizer($_REQUEST[self::getDbTable() . '_action']) : '';
 		$id = isset($attribute_group_parameter['id']) ? sanitize_key($attribute_group_parameter['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_group_parameter['last_update_date'] = date('Y-m-d H:i:s');
-				if($pageAction == 'delete')
+				if ($pageAction == 'delete')
 				{
-					if(current_user_can('wpshop_delete_attributes'))
+					if (current_user_can('wpshop_delete_attributes'))
 					{
 						$attribute_group_parameter['status'] = 'deleted';
 					}
@@ -192,8 +192,8 @@ 
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
 		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
-			if(current_user_can('wpshop_delete_attributes'))
+		elseif (($pageAction != '') && (($pageAction == 'delete'))) {
+			if (current_user_can('wpshop_delete_attributes'))
 			{
 				$attribute_group_parameter['last_update_date'] = date('Y-m-d H:i:s');
 				$attribute_group_parameter['status'] = 'deleted';
@@ -204,21 +204,21 @@ 
 				$actionResult = 'userNotAllowedForActionDelete';
 			}
 		}
-		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_group_parameter['creation_date'] = date('Y-m-d H:i:s');
-				if(trim($attribute_group_parameter['code']) == ''){
+				if (trim($attribute_group_parameter['code']) == '') {
 					$attribute_group_parameter['code'] = $attribute_group_parameter['frontend_label'];
 				}
 				$attribute_group_parameter['code'] = wpshop_tools::slugify(str_replace("\'", "_", str_replace('\"', "_", $attribute_group_parameter['code'])), array('noAccent', 'noSpaces', 'lowerCase', 'noPunctuation'));
 				$code_exists = self::getElement($attribute_group_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_group_parameter['code'] = $attribute_group_parameter['code'] . '_' . (count($code_exists) + 1);
 				}
 				$actionResult = wpshop_database::save($attribute_group_parameter, self::getDbTable());
 				$id = $wpdb->insert_id;
 			}
-			else{
+			else {
 				$actionResult = 'userNotAllowedForActionAdd';
 			}
 		}
@@ -228,16 +228,16 @@ 
 		/************		CHANGE THE FIELD NAME TO TAKE TO DISPLAY				*************/
 		/************		CHANGE ERROR MESSAGE FOR SPECIFIC CASE					*************/
 		/****************************************************************************/
-		if($actionResult != ''){
+		if ($actionResult != '') {
 			$elementIdentifierForMessage = '<span class="bold" >' . $attribute_group_parameter['frontend_label'] . '</span>';
 			if ($actionResult == 'error') {
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . sprintf(__('An error occured while saving %s', 'wpshop'), $elementIdentifierForMessage);
-				if(WPSHOP_DEBUG_MODE)
+				if (WPSHOP_DEBUG_MODE)
 				{
 					$pageMessage .= '<br/>' . $wpdb->last_error;
 				}
 			}
-			elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate'))
+			elseif (($actionResult == 'done') || ($actionResult == 'nothingToUpdate'))
 			{/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				/*****************************************************************************************************************/
 				/*************************			CHANGE FOR SPECIFIC ACTION FOR CURRENT ELEMENT				******************/
@@ -247,20 +247,20 @@ 
 				/*************************			GENERIC				****************************/
 				/***********************************************************************************/
 				$pageMessage .= '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), $elementIdentifierForMessage);
-				if(($pageAction == 'edit') || ($pageAction == 'save'))
+				if (($pageAction == 'edit') || ($pageAction == 'save'))
 				{
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=saveok&saveditem=" . $id));
 				}
-				elseif($pageAction == 'add')
+				elseif ($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');
 			}
@@ -292,36 +292,36 @@ 
 
 		$line = 0;
 		$elementList = self::getElement();
-		if(is_array($elementList) && (count($elementList) > 0)){
-			foreach($elementList as $element)
+		if (is_array($elementList) && (count($elementList) > 0)) {
+			foreach ($elementList as $element)
 			{
 				$tableRowsId[$line] = self::getDbTable() . '_' . $element->id;
 
 				$elementLabel = __($element->name, 'wpshop');
 				$subRowActions = '';
 				$attributeSlugUrl = self::getListingSlug();
-				if(current_user_can('wpshop_add_attributes_unit'))
+				if (current_user_can('wpshop_add_attributes_unit'))
 				{
 					$attributeSlugUrl = self::getEditionSlug();
 				}
-				if(current_user_can('wpshop_edit_attributes_unit'))
+				if (current_user_can('wpshop_edit_attributes_unit'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 					$subRowActions .= '
-		<a href="#" id="edit_attribute_unit_' . $element->id . '" class="edit_attribute_unit" data-nonce="' . wp_create_nonce( 'edit_attribute_unit_' . $element->id ) . '" >' . __('Edit', 'wpshop') . '</a>';
+		<a href="#" id="edit_attribute_unit_' . $element->id . '" class="edit_attribute_unit" data-nonce="' . wp_create_nonce('edit_attribute_unit_' . $element->id) . '" >' . __('Edit', 'wpshop') . '</a>';
 				}
-				elseif(current_user_can('wpshop_view_attributes_unit'))
+				elseif (current_user_can('wpshop_view_attributes_unit'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 				}
-				if(current_user_can('wpshop_delete_attributes_unit'))
+				if (current_user_can('wpshop_delete_attributes_unit'))
 				{
-					if($subRowActions != '')
+					if ($subRowActions != '')
 					{
 						$subRowActions .= '&nbsp;|&nbsp;';
 					}
 					$subRowActions .= '
-		<a href="#" id="delete_attribute_unit_' . $element->id . '" class="delete_attribute_unit" data-nonce="' . wp_create_nonce( 'delete_attribute_unit_' . $element->id ) . '" >' . __('Delete', 'wpshop') . '</a>';
+		<a href="#" id="delete_attribute_unit_' . $element->id . '" class="delete_attribute_unit" data-nonce="' . wp_create_nonce('delete_attribute_unit_' . $element->id) . '" >' . __('Delete', 'wpshop') . '</a>';
 				}
 
 				$rowActions = '
@@ -337,14 +337,14 @@ 
 				$line++;
 			}
 		}
-		else{
+		else {
 			unset($tableRowValue);
 			$tableRowValue[] = array('class' => self::currentPageCode . '_label_cell', 'value' => __('No element to ouput here', 'wpshop'));
 			$tableRowValue[] = array('class' => self::currentPageCode . '_name_cell', 'value' => '');
 			$tableRowValue[] = array('class' => self::currentPageCode . '_code_cell', 'value' => '');
 			$tableRows[] = $tableRowValue;
 		}
-		if(current_user_can('wpshop_add_attributes_unit')){
+		if (current_user_can('wpshop_add_attributes_unit')) {
 			$listItemOutput .= '
 <input type="button" value="' . __('Add an unit', 'wpshop') . '" class="button-secondary alignleft" name="add_attribute_unit" id="add_attribute_unit" />';
 		}
@@ -353,11 +353,11 @@ 
 	wpshop(document).ready(function(){
 		jQuery("#' . $tableId . '").dataTable();
 		jQuery("#wpshop_unit_group_list_tab").show();';
-		if(current_user_can('wpshop_delete_attributes_unit')){
+		if (current_user_can('wpshop_delete_attributes_unit')) {
 			$listItemOutput .= '
 		wpshop(document).on("click", ".delete_attribute_unit", function() {
 			var nonce = jQuery( this ).data( "nonce" );
-			if(confirm(wpshopConvertAccentTojs("' . __('Are you sure you want to delete this unit', 'wpshop')  .' ?"))){
+			if(confirm(wpshopConvertAccentTojs("' . __('Are you sure you want to delete this unit', 'wpshop') . ' ?"))){
 				wpshop("#wpshop_unit_list").load(ajaxurl,{
 					"action": "wps_attribute_unit_delete",
 					"elementIdentifier": wpshop(this).attr("id").replace("delete_attribute_unit_", ""),
@@ -366,7 +366,7 @@ 
 			}
 		});';
 		}
-		if(current_user_can('wpshop_edit_attributes_unit')){
+		if (current_user_can('wpshop_edit_attributes_unit')) {
 			$listItemOutput .= '
 		wpshop(document).on("click", ".edit_attribute_unit", function() {
 			var nonce = jQuery( this ).data( "nonce" );
@@ -377,7 +377,7 @@ 
 			});
 		});';
 		}
-		if(current_user_can('wpshop_add_attributes_unit')){
+		if (current_user_can('wpshop_add_attributes_unit')) {
 			$listItemOutput .= '
 		jQuery("#add_attribute_unit").click(function(){
 			jQuery("#wpshop_unit_list").load(ajaxurl,{
@@ -397,34 +397,34 @@ 
 	*
 	*	@return string The html code that output the interface for adding a nem item
 	*/
-	public static function elementEdition($itemToEdit = ''){
+	public static function elementEdition($itemToEdit = '') {
 		global $attribute_displayed_field; global $wpdb;
 		$dbFieldList = wpshop_database::fields_to_input(self::getDbTable());
 
 		$editedItem = '';
 		// @TODO : Request
 		// $_REQUEST['action'] = 'save_new_attribute_unit';
-		if($itemToEdit != ''){
+		if ($itemToEdit != '') {
 			$editedItem = self::getElement($itemToEdit);
 			// $_REQUEST['action'] = 'update_attribute_unit';
 		}
-		$query = $wpdb->prepare('SELECT unit FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id = ' .get_option('wpshop_shop_default_currency'). '', '');
+		$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = ' . get_option('wpshop_shop_default_currency') . '', '');
  		$default_unit = $wpdb->get_var($query);
 
 		$the_form_content_hidden = $the_form_general_content = $the_form_option_content = '';
-		foreach($dbFieldList as $input_key => $input_def){
+		foreach ($dbFieldList as $input_key => $input_def) {
 			$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : '';
 			$requestFormValue = isset($_REQUEST[self::currentPageCode][$input_def['name']]) ? sanitize_text_field($_REQUEST[self::currentPageCode][$input_def['name']]) : '';
 			$currentFieldValue = $input_def['value'];
-			if(is_object($editedItem)){
+			if (is_object($editedItem)) {
 				$currentFieldValue = $editedItem->{$input_def['name']};
 			}
-			elseif(($pageAction != '') && ($requestFormValue != '')){
+			elseif (($pageAction != '') && ($requestFormValue != '')) {
 				$currentFieldValue = $requestFormValue;
 			}
 
 			$input_def['value'] = $currentFieldValue;
-			if($input_def['name'] == 'group_id'){
+			if ($input_def['name'] == 'group_id') {
 				$attribute_unit_group_list = self::get_unit_group();
 				$input_def['possible_value'] = $attribute_unit_group_list;
 				$input_def['type'] = 'select';
@@ -434,9 +434,9 @@ 
 			$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
 
 
-			if($input_def['type'] != 'hidden'){
+			if ($input_def['type'] != 'hidden') {
 				$label = 'for="' . $input_def['name'] . '"';
-				if(($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')){
+				if (($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')) {
 					$label = '';
 				}
 
@@ -446,29 +446,29 @@ 
 						<label ' . $label . ' >' . __($input_def['name'], 'wpshop') . '</label>
 					</div>
 					<div class="wpshop_form_input wpshop_' . self::currentPageCode . '_' . $input_def['name'] . '_input alignleft" >
-						' . $the_input . ' ' .( ($input_def['name'] == 'change_rate') ? $default_unit : ''). '
+						' . $the_input . ' ' . (($input_def['name'] == 'change_rate') ? $default_unit : '') . '
 					</div>
 				</div>';
 
 
 			}
-			else{
+			else {
 				$the_form_content_hidden .= '
 	' . $the_input;
 			}
 		}
 
-		$the_form = '<form name="' . self::getDbTable() . '_form" id="' . self::getDbTable() . '_form" method="post" action="' . admin_url( 'admin-ajax.php' ) . '" >';
-		if( ctype_digit( (string) $itemToEdit ) ) {
+		$the_form = '<form name="' . self::getDbTable() . '_form" id="' . self::getDbTable() . '_form" method="post" action="' . admin_url('admin-ajax.php') . '" >';
+		if (ctype_digit((string)$itemToEdit)) {
 			$the_form .= wpshop_form::form_input('action', 'action', 'wps_attribute_unit_update', 'hidden');
-			$the_form .= wp_nonce_field( 'update_attribute_unit', '_wpnonce' );
+			$the_form .= wp_nonce_field('update_attribute_unit', '_wpnonce');
 		} else {
 			$the_form .= wpshop_form::form_input('action', 'action', 'wps_attribute_unit_new', 'hidden');
-			$the_form .= wp_nonce_field( 'save_new_attribute_unit', '_wpnonce' );
+			$the_form .= wp_nonce_field('save_new_attribute_unit', '_wpnonce');
 		}
-		$the_form .= wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no' , 'hidden');
+		$the_form .= wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no', 'hidden');
 		$the_form .= $the_form_content_hidden . $the_form_general_content;
-		$the_form .= '<input type="button" value="' . __('Back', 'wpshop') . '" class="button-primary alignright" name="cancel_unit_edition" id="cancel_unit_edition" data-nonce="' . wp_create_nonce( 'load_attribute_units' ) . '" />
+		$the_form .= '<input type="button" value="' . __('Back', 'wpshop') . '" class="button-primary alignright" name="cancel_unit_edition" id="cancel_unit_edition" data-nonce="' . wp_create_nonce('load_attribute_units') . '" />
 				<input type="submit" value="' . __('Save', 'wpshop') . '" class="button-primary alignright" name="save_new_unit" id="save_new_unit" />
 			</form>
 			<script type="text/javascript" >
@@ -502,18 +502,18 @@ 
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : 'add';
 		$currentPageButton = '';
 
-		if($action == 'add')
+		if ($action == 'add')
 		{
-			if(current_user_can('wpshop_add_attributes'))
+			if (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') . '" /><input type="button" class="button-primary" id="saveandcontinue" name="saveandcontinue" value="' . __('Save and continue edit', 'wpshop') . '" />';
 		}
-		if(current_user_can('wpshop_delete_attributes') && ($action != 'add'))
+		if (current_user_can('wpshop_delete_attributes') && ($action != 'add'))
 		{
 			$currentPageButton .= '<input type="button" class="button-primary" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
 		}
@@ -532,13 +532,13 @@ 
 	*
 	*	@return object $element_list A wordpress database object containing the attribute list
 	*/
-	public static function getElement($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id'){
+	public static function getElement($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id') {
 		global $wpdb;
 		$element_list = array();
 		$moreQuery = "";
-		$moreQueryArgs = array( 1, );
+		$moreQueryArgs = array(1,);
 
-		if($element_id != ''){
+		if ($element_id != '') {
 			$moreQuery = "
 			AND CURRENT_ELEMENT." . $field_to_search . " = %s ";
 			$moreQueryArgs[] = $element_id;
@@ -548,14 +548,14 @@ 
 		"SELECT CURRENT_ELEMENT.*, UNIT_GROUP.name as group_name
 		FROM " . self::getDbTable() . " AS CURRENT_ELEMENT
 			LEFT JOIN " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " AS UNIT_GROUP ON (UNIT_GROUP.id = CURRENT_ELEMENT.group_id)
-		WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status.") " . $moreQuery, $moreQueryArgs
+		WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status . ") " . $moreQuery, $moreQueryArgs
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if($element_id == ''){
+		if ($element_id == '') {
 			$element_list = $wpdb->get_results($query);
 		}
-		else{
+		else {
 			$element_list = $wpdb->get_row($query);
 		}
 
@@ -565,7 +565,7 @@ 
 	/**
 	*
 	*/
-	public static function get_unit_list_for_group($group_id){
+	public static function get_unit_list_for_group($group_id) {
 		global $wpdb;
 		$unit_list_for_group = '';
 
@@ -580,7 +580,7 @@ 
 	/**
 	*
 	*/
-	public static function get_default_unit_for_group($group_id){
+	public static function get_default_unit_for_group($group_id) {
 		global $wpdb;
 		$default_unit_for_group = '';
 
@@ -596,13 +596,13 @@ 
 	*
 	*	@return object $attribute_unit_group_list The list of existing unit group
 	*/
-	public static function get_unit_group($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id'){
+	public static function get_unit_group($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id') {
 		global $wpdb;
 		$element_list = array();
 		$moreQuery = "";
-		$moreQueryArgs = array( 1, );
+		$moreQueryArgs = array(1,);
 
-		if($element_id != ''){
+		if ($element_id != '') {
 			$moreQuery = "
 			AND CURRENT_ELEMENT." . $field_to_search . " = %d ";
 			$moreQueryArgs[] = $element_id;
@@ -611,11 +611,11 @@ 
 		$query = $wpdb->prepare(
 		"SELECT CURRENT_ELEMENT.*
 		FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " AS CURRENT_ELEMENT
-		WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status.") " . $moreQuery, $moreQueryArgs
+		WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status . ") " . $moreQuery, $moreQueryArgs
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if($element_id == '')
+		if ($element_id == '')
 			$element_list = $wpdb->get_results($query);
 		else
 			$element_list = $wpdb->get_row($query);
@@ -632,7 +632,7 @@ 
 	*
 	*	@return string $listItemOutput The html code that output the item list
 	*/
-	public static function unit_group_list(){
+	public static function unit_group_list() {
 		$listItemOutput = '';
 
 		/*	Start the table definition	*/
@@ -645,36 +645,36 @@ 
 
 		$line = 0;
 		$elementList = self::get_unit_group();
-		if(is_array($elementList) && (count($elementList) > 0)){
-			foreach($elementList as $element)
+		if (is_array($elementList) && (count($elementList) > 0)) {
+			foreach ($elementList as $element)
 			{
 				$tableRowsId[$line] = self::getDbTable() . '_' . $element->id;
 
 				$elementLabel = __($element->name, 'wpshop');
 				$subRowActions = '';
 				$attributeSlugUrl = self::getListingSlug();
-				if(current_user_can('wpshop_add_attributes_unit_group'))
+				if (current_user_can('wpshop_add_attributes_unit_group'))
 				{
 					$attributeSlugUrl = self::getEditionSlug();
 				}
-				if(current_user_can('wpshop_edit_attributes_unit_group'))
+				if (current_user_can('wpshop_edit_attributes_unit_group'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 					$subRowActions .= '
-		<a href="#" id="edit_attribute_unit_group_' . $element->id . '" class="edit_attribute_unit_group" data-nonce="' . wp_create_nonce( 'edit_attribute_unit_group_' . $element->id ) . '" >' . __('Edit', 'wpshop') . '</a>';
+		<a href="#" id="edit_attribute_unit_group_' . $element->id . '" class="edit_attribute_unit_group" data-nonce="' . wp_create_nonce('edit_attribute_unit_group_' . $element->id) . '" >' . __('Edit', 'wpshop') . '</a>';
 				}
-				elseif(current_user_can('wpshop_view_attributes_unit_group'))
+				elseif (current_user_can('wpshop_view_attributes_unit_group'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 				}
-				if(current_user_can('wpshop_delete_attributes_unit_group'))
+				if (current_user_can('wpshop_delete_attributes_unit_group'))
 				{
-					if($subRowActions != '')
+					if ($subRowActions != '')
 					{
 						$subRowActions .= '&nbsp;|&nbsp;';
 					}
 					$subRowActions .= '
-		<a href="#" id="delete_attribute_unit_group_' . $element->id . '" class="delete_attribute_unit_group" data-nonce="' . wp_create_nonce( 'delete_attribute_unit_group_' . $element->id ) . '" >' . __('Delete', 'wpshop') . '</a>';
+		<a href="#" id="delete_attribute_unit_group_' . $element->id . '" class="delete_attribute_unit_group" data-nonce="' . wp_create_nonce('delete_attribute_unit_group_' . $element->id) . '" >' . __('Delete', 'wpshop') . '</a>';
 				}
 
 				$rowActions = '
@@ -688,24 +688,24 @@ 
 				$line++;
 			}
 		}
-		else{
+		else {
 			unset($tableRowValue);
 			$tableRowValue[] = array('class' => self::currentPageCode . '_label_cell', 'value' => __('No element to ouput here', 'wpshop'));
 			$tableRows[] = $tableRowValue;
 		}
-		if(current_user_can('wpshop_add_attributes_unit_group')){
+		if (current_user_can('wpshop_add_attributes_unit_group')) {
 			$listItemOutput .= '
-<input type="button" value="' . __('Add an unit group', 'wpshop') . '" class="button-secondary alignleft" name="add_attribute_unit_group" id="add_attribute_unit_group" data-nonce="' . wp_create_nonce( 'add_attribute_unit_group' ) . '" />';
+<input type="button" value="' . __('Add an unit group', 'wpshop') . '" class="button-secondary alignleft" name="add_attribute_unit_group" id="add_attribute_unit_group" data-nonce="' . wp_create_nonce('add_attribute_unit_group') . '" />';
 		}
 		$listItemOutput .= wpshop_display::getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, $tableSummary, true) . '
 <script type="text/javascript" >
 	wpshop(document).ready(function(){
 		jQuery("#' . $tableId . '").dataTable();
 		jQuery("#wpshop_unit_list_tab").show();';
-		if(current_user_can('wpshop_delete_attributes_unit_group')){
+		if (current_user_can('wpshop_delete_attributes_unit_group')) {
 			$listItemOutput .= '
 		wpshop(document).on("click", ".delete_attribute_unit_group", function() {
-			if(confirm(wpshopConvertAccentTojs("' . __('Are you sure you want to delete this unit group', 'wpshop')  .' ?"))){
+			if(confirm(wpshopConvertAccentTojs("' . __('Are you sure you want to delete this unit group', 'wpshop') . ' ?"))){
 				wpshop("#wpshop_unit_group_list").load(ajaxurl, {
 					"action": "wps_attribute_group_unit_delete",
 					"elementIdentifier": wpshop(this).attr("id").replace("delete_attribute_unit_group_", ""),
@@ -714,7 +714,7 @@ 
 			}
 		});';
 		}
-		if(current_user_can('wpshop_edit_attributes_unit_group')){
+		if (current_user_can('wpshop_edit_attributes_unit_group')) {
 			$listItemOutput .= '
 		wpshop(document).on("click", ".edit_attribute_unit_group", function() {
 			wpshop("#wpshop_unit_group_list").load(ajaxurl, {
@@ -724,7 +724,7 @@ 
 			});
 		});';
 		}
-		if(current_user_can('wpshop_add_attributes_unit_group')){
+		if (current_user_can('wpshop_add_attributes_unit_group')) {
 			$listItemOutput .= '
 		wpshop("#add_attribute_unit_group").click(function(){
 			wpshop("#wpshop_unit_group_list").load(ajaxurl, {
@@ -744,25 +744,25 @@ 
 	*
 	*	@return string The html code that output the interface for adding a nem item
 	*/
-	public static function unit_group_edition($itemToEdit = ''){
+	public static function unit_group_edition($itemToEdit = '') {
 		global $attribute_displayed_field;
 		$dbFieldList = wpshop_database::fields_to_input(WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
 
-		if( ctype_digit( (string) $itemToEdit ) ) {
-			$editedItem = self::get_unit_group( (int) $itemToEdit );
+		if (ctype_digit((string)$itemToEdit)) {
+			$editedItem = self::get_unit_group((int)$itemToEdit);
 		} else {
 			$editedItem = '';
 		}
 
 		$the_form_content_hidden = $the_form_general_content = $the_form_option_content = '';
-		foreach($dbFieldList as $input_key => $input_def){
+		foreach ($dbFieldList as $input_key => $input_def) {
 			$pageAction = isset($_REQUEST[WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . '_action']) ? wpshop_tools::varSanitizer($_REQUEST[WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . '_action']) : '';
 			$requestFormValue = isset($_REQUEST[self::currentPageCode][$input_def['name']]) ? wpshop_tools::varSanitizer($_REQUEST[self::currentPageCode][$input_def['name']]) : '';
 			$currentFieldValue = $input_def['value'];
-			if(is_object($editedItem)){
+			if (is_object($editedItem)) {
 				$currentFieldValue = $editedItem->{$input_def['name']};
 			}
-			elseif(($pageAction != '') && ($requestFormValue != '')){
+			elseif (($pageAction != '') && ($requestFormValue != '')) {
 				$currentFieldValue = $requestFormValue;
 			}
 
@@ -771,9 +771,9 @@ 
 			$input_def['value'] = __(str_replace("\\", "", $input_def['value']), 'wpshop');
 			$the_input = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
 
-			if($input_def['type'] != 'hidden'){
+			if ($input_def['type'] != 'hidden') {
 				$label = 'for="' . $input_def['name'] . '"';
-				if(($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')){
+				if (($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')) {
 					$label = '';
 				}
 				$input = '
@@ -785,30 +785,30 @@ 
 			' . $the_input . '
 		</div>
 	</div>';
-				if(substr($input_def['name'], 0, 3) == 'is_'){
+				if (substr($input_def['name'], 0, 3) == 'is_') {
 					$the_form_option_content .= $input;
 				}
-				else{
+				else {
 					$the_form_general_content .= $input;
 				}
 			}
-			else{
+			else {
 				$the_form_content_hidden .= '
 	' . $the_input;
 			}
 		}
 
 		$the_form = '<form name="' . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . '_form" id="' . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . '_form" method="post" action="' . admin_url('admin-ajax.php') . '" >';
-		if( ctype_digit( (string) $itemToEdit ) ) {
+		if (ctype_digit((string)$itemToEdit)) {
 			$the_form .= wpshop_form::form_input('action', 'action', 'wps_attribute_group_unit_update', 'hidden');
-			$the_form .= wp_nonce_field( 'update_attribute_unit_group', '_wpnonce' );
+			$the_form .= wp_nonce_field('update_attribute_unit_group', '_wpnonce');
 		} else {
 			$the_form .= wpshop_form::form_input('action', 'action', 'wps_attribute_group_unit_new', 'hidden');
-			$the_form .= wp_nonce_field( 'save_new_attribute_unit_group', '_wpnonce' );
+			$the_form .= wp_nonce_field('save_new_attribute_unit_group', '_wpnonce');
 		}
-		$the_form .= wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no' , 'hidden');
+		$the_form .= wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no', 'hidden');
 		$the_form .= $the_form_content_hidden . $the_form_general_content;
-		$the_form .= '<input type="button" value="' . __('Retour', 'wpshop') . '" class="button-primary alignright" name="cancel_unit_group_edition" id="cancel_unit_group_edition" data-nonce="' . wp_create_nonce( 'load_attribute_unit_groups' ) . '"/>
+		$the_form .= '<input type="button" value="' . __('Retour', 'wpshop') . '" class="button-primary alignright" name="cancel_unit_group_edition" id="cancel_unit_group_edition" data-nonce="' . wp_create_nonce('load_attribute_unit_groups') . '"/>
 				<input type="submit" value="' . __('Save', 'wpshop') . '" class="button-primary alignright" name="save_new_unit_group" id="save_new_unit_group" />
 			</form>
 			<script type="text/javascript" >
@@ -836,11 +836,11 @@ 
 
 	/*	Default currecy for the entire shop	*/
 	public static function wpshop_shop_currency_list_field() {
-		if( is_null( self::$currencies_cache ) ) {
+		if (is_null(self::$currencies_cache)) {
 			$currency_group = get_option('wpshop_shop_currency_group');
-			if( !empty ( $currency_group ) ) {
+			if (!empty ($currency_group)) {
 				global $wpdb;
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE group_id = %d', $currency_group);
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id = %d', $currency_group);
 				self::$currencies_cache = $wpdb->get_results($query);
 			} else {
 				self::$currencies_cache = '';
@@ -850,17 +850,17 @@ 
 		$current_currency = get_option('wpshop_shop_default_currency');
 
 		$currencies_options = '';
-		if ( !empty (self::$currencies_cache) ) {
-			foreach ( self::$currencies_cache as $currency) {
-				$currencies_options .= '<option value="'.$currency->id.'"'.(($currency->id == $current_currency) ? ' selected="selected"' : null).'>'.$currency->name.' ('.$currency->unit.')</option>';
+		if (!empty (self::$currencies_cache)) {
+			foreach (self::$currencies_cache as $currency) {
+				$currencies_options .= '<option value="' . $currency->id . '"' . (($currency->id == $current_currency) ? ' selected="selected"' : null) . '>' . $currency->name . ' (' . $currency->unit . ')</option>';
 			}
 		}
 		else {
-			foreach($wpshop_shop_currencies as $k => $v) {
-				$currencies_options .= '<option value="'.$k.'"'.(($k==$current_currency) ? ' selected="selected"' : null).'>'.$k.' ('.$v.')</option>';
+			foreach ($wpshop_shop_currencies as $k => $v) {
+				$currencies_options .= '<option value="' . $k . '"' . (($k == $current_currency) ? ' selected="selected"' : null) . '>' . $k . ' (' . $v . ')</option>';
 			}
 		}
-		return '<select name="wpshop_shop_default_currency" class="wpshop_currency_field" >'.$currencies_options.'</select>';
+		return '<select name="wpshop_shop_default_currency" class="wpshop_currency_field" >' . $currencies_options . '</select>';
 	}
 
 	/**
@@ -873,7 +873,7 @@ 
 		global $wpdb;
 
 		/** Get the _unit_group_id and _default_unit */
-		return $wpdb->get_row( $wpdb->prepare( 'SELECT _unit_group_id, _default_unit FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code=%s', array( $attribute_code ) ) );
+		return $wpdb->get_row($wpdb->prepare('SELECT _unit_group_id, _default_unit FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code=%s', array($attribute_code)));
 	}
 
 	/**
@@ -885,15 +885,15 @@ 
 	 * @return stdClass Object [_unit_group_id], [_default_unit]
 	 */
 	public static function get_the_attribute_unit_by_code_for_product($product_id, $attribute_code) {
-		$unit = self::get_default_unit_attribute( $attribute_code );
+		$unit = self::get_default_unit_attribute($attribute_code);
 
-		if(empty($unit))
+		if (empty($unit))
 			return null;
 
 		$post_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
 
 		/** Si on trouve une unité */
-		if(!empty($post_meta) && !empty($post_meta['unit']) && !empty($post_meta['unit'][$attribute_code]))
+		if (!empty($post_meta) && !empty($post_meta['unit']) && !empty($post_meta['unit'][$attribute_code]))
 			$unit->_default_unit = $post_meta['unit'][$attribute_code];
 
 		return $unit;
@@ -908,7 +908,7 @@ 
 	public static function the_attribute_unit_by_code_for_product($product_id, $attribute_code) {
 		$unit = self::get_the_attribute_unit_by_code_for_product($product_id, $attribute_code);
 
-		if(empty($unit))
+		if (empty($unit))
 			return null;
 
 		echo self::get_the_subname_unit($unit->_unit_group_id, $unit->_default_unit);
@@ -925,10 +925,10 @@ 
 		global $wpdb;
 
 		/** Si pas d'unité ou de groupe, null */
-		if(0 === $unit_id || 0 === $group_id)
+		if (0 === $unit_id || 0 === $group_id)
 			return null;
 
-		return $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array( $group_id, $unit_id ) ) );
+		return $wpdb->get_var($wpdb->prepare('SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array($group_id, $unit_id)));
 	}
 
 	/**
@@ -942,9 +942,9 @@ 
 		global $wpdb;
 
 		/** Si pas d'unité ou de groupe, null */
-		if(0 === $unit_id || 0 === $group_id)
+		if (0 === $unit_id || 0 === $group_id)
 			return null;
 
-		return $wpdb->get_var( $wpdb->prepare( 'SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array( $group_id, $unit_id ) ) );
+		return $wpdb->get_var($wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array($group_id, $unit_id)));
 	}
 }

Braces +48 added lines, -65 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' ) ) {
@@ -125,13 +127,11 @@ 
 			{
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
-			}
-			elseif($action == 'add')
+			} elseif($action == 'add')
 			{
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
-		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && (sanitize_text_field($page) == self::getEditionSlug()))
+		} elseif((self::getEditionSlug() != self::getListingSlug()) && (sanitize_text_field($page) == self::getEditionSlug()))
 		{
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
@@ -156,8 +156,7 @@ 
 		{
 			$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>');
@@ -179,32 +178,27 @@ 
 					if(current_user_can('wpshop_delete_attributes'))
 					{
 						$attribute_group_parameter['status'] = 'deleted';
-					}
-					else
+					} else
 					{
 						$actionResult = 'userNotAllowedForActionDelete';
 					}
 				}
 				$actionResult = wpshop_database::update($attribute_group_parameter, $id, self::getDbTable());
-			}
-			else
+			} else
 			{
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
-		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
+		} elseif(($pageAction != '') && (($pageAction == 'delete'))){
 			if(current_user_can('wpshop_delete_attributes'))
 			{
 				$attribute_group_parameter['last_update_date'] = date('Y-m-d H:i:s');
 				$attribute_group_parameter['status'] = 'deleted';
 				$actionResult = wpshop_database::update($attribute_group_parameter, $id, self::getDbTable());
-			}
-			else
+			} else
 			{
 				$actionResult = 'userNotAllowedForActionDelete';
 			}
-		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
+		} elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
 			if(current_user_can('wpshop_add_attributes')){
 				$attribute_group_parameter['creation_date'] = date('Y-m-d H:i:s');
 				if(trim($attribute_group_parameter['code']) == ''){
@@ -217,8 +211,7 @@ 
 				}
 				$actionResult = wpshop_database::save($attribute_group_parameter, self::getDbTable());
 				$id = $wpdb->insert_id;
-			}
-			else{
+			} else{
 				$actionResult = 'userNotAllowedForActionAdd';
 			}
 		}
@@ -236,8 +229,7 @@ 
 				{
 					$pageMessage .= '<br/>' . $wpdb->last_error;
 				}
-			}
-			elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate'))
+			} elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate'))
 			{/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				/*****************************************************************************************************************/
 				/*************************			CHANGE FOR SPECIFIC ACTION FOR CURRENT ELEMENT				******************/
@@ -250,17 +242,14 @@ 
 				if(($pageAction == 'edit') || ($pageAction == 'save'))
 				{
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=saveok&saveditem=" . $id));
-				}
-				elseif($pageAction == 'add')
+				} elseif($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');
 			}
@@ -309,8 +298,7 @@ 
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 					$subRowActions .= '
 		<a href="#" id="edit_attribute_unit_' . $element->id . '" class="edit_attribute_unit" data-nonce="' . wp_create_nonce( 'edit_attribute_unit_' . $element->id ) . '" >' . __('Edit', 'wpshop') . '</a>';
-				}
-				elseif(current_user_can('wpshop_view_attributes_unit'))
+				} elseif(current_user_can('wpshop_view_attributes_unit'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 				}
@@ -336,8 +324,7 @@ 
 
 				$line++;
 			}
-		}
-		else{
+		} else{
 			unset($tableRowValue);
 			$tableRowValue[] = array('class' => self::currentPageCode . '_label_cell', 'value' => __('No element to ouput here', 'wpshop'));
 			$tableRowValue[] = array('class' => self::currentPageCode . '_name_cell', 'value' => '');
@@ -418,8 +405,7 @@ 
 			$currentFieldValue = $input_def['value'];
 			if(is_object($editedItem)){
 				$currentFieldValue = $editedItem->{$input_def['name']};
-			}
-			elseif(($pageAction != '') && ($requestFormValue != '')){
+			} elseif(($pageAction != '') && ($requestFormValue != '')){
 				$currentFieldValue = $requestFormValue;
 			}
 
@@ -451,8 +437,7 @@ 
 				</div>';
 
 
-			}
-			else{
+			} else{
 				$the_form_content_hidden .= '
 	' . $the_input;
 			}
@@ -508,8 +493,7 @@ 
 			{
 				$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') . '" /><input type="button" class="button-primary" id="saveandcontinue" name="saveandcontinue" value="' . __('Save and continue edit', 'wpshop') . '" />';
 		}
@@ -554,8 +538,7 @@ 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
 		if($element_id == ''){
 			$element_list = $wpdb->get_results($query);
-		}
-		else{
+		} else{
 			$element_list = $wpdb->get_row($query);
 		}
 
@@ -615,10 +598,11 @@ 
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if($element_id == '')
-			$element_list = $wpdb->get_results($query);
-		else
-			$element_list = $wpdb->get_row($query);
+		if($element_id == '') {
+					$element_list = $wpdb->get_results($query);
+		} else {
+					$element_list = $wpdb->get_row($query);
+		}
 
 		return $element_list;
 
@@ -662,8 +646,7 @@ 
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 					$subRowActions .= '
 		<a href="#" id="edit_attribute_unit_group_' . $element->id . '" class="edit_attribute_unit_group" data-nonce="' . wp_create_nonce( 'edit_attribute_unit_group_' . $element->id ) . '" >' . __('Edit', 'wpshop') . '</a>';
-				}
-				elseif(current_user_can('wpshop_view_attributes_unit_group'))
+				} elseif(current_user_can('wpshop_view_attributes_unit_group'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 				}
@@ -687,8 +670,7 @@ 
 
 				$line++;
 			}
-		}
-		else{
+		} else{
 			unset($tableRowValue);
 			$tableRowValue[] = array('class' => self::currentPageCode . '_label_cell', 'value' => __('No element to ouput here', 'wpshop'));
 			$tableRows[] = $tableRowValue;
@@ -761,8 +743,7 @@ 
 			$currentFieldValue = $input_def['value'];
 			if(is_object($editedItem)){
 				$currentFieldValue = $editedItem->{$input_def['name']};
-			}
-			elseif(($pageAction != '') && ($requestFormValue != '')){
+			} elseif(($pageAction != '') && ($requestFormValue != '')){
 				$currentFieldValue = $requestFormValue;
 			}
 
@@ -787,12 +768,10 @@ 
 	</div>';
 				if(substr($input_def['name'], 0, 3) == 'is_'){
 					$the_form_option_content .= $input;
-				}
-				else{
+				} else{
 					$the_form_general_content .= $input;
 				}
-			}
-			else{
+			} else{
 				$the_form_content_hidden .= '
 	' . $the_input;
 			}
@@ -854,8 +833,7 @@ 
 			foreach ( self::$currencies_cache as $currency) {
 				$currencies_options .= '<option value="'.$currency->id.'"'.(($currency->id == $current_currency) ? ' selected="selected"' : null).'>'.$currency->name.' ('.$currency->unit.')</option>';
 			}
-		}
-		else {
+		} else {
 			foreach($wpshop_shop_currencies as $k => $v) {
 				$currencies_options .= '<option value="'.$k.'"'.(($k==$current_currency) ? ' selected="selected"' : null).'>'.$k.' ('.$v.')</option>';
 			}
@@ -887,14 +865,16 @@ 
 	public static function get_the_attribute_unit_by_code_for_product($product_id, $attribute_code) {
 		$unit = self::get_default_unit_attribute( $attribute_code );
 
-		if(empty($unit))
-			return null;
+		if(empty($unit)) {
+					return null;
+		}
 
 		$post_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
 
 		/** Si on trouve une unité */
-		if(!empty($post_meta) && !empty($post_meta['unit']) && !empty($post_meta['unit'][$attribute_code]))
-			$unit->_default_unit = $post_meta['unit'][$attribute_code];
+		if(!empty($post_meta) && !empty($post_meta['unit']) && !empty($post_meta['unit'][$attribute_code])) {
+					$unit->_default_unit = $post_meta['unit'][$attribute_code];
+		}
 
 		return $unit;
 	}
@@ -908,8 +888,9 @@ 
 	public static function the_attribute_unit_by_code_for_product($product_id, $attribute_code) {
 		$unit = self::get_the_attribute_unit_by_code_for_product($product_id, $attribute_code);
 
-		if(empty($unit))
-			return null;
+		if(empty($unit)) {
+					return null;
+		}
 
 		echo self::get_the_subname_unit($unit->_unit_group_id, $unit->_default_unit);
 	}
@@ -925,8 +906,9 @@ 
 		global $wpdb;
 
 		/** Si pas d'unité ou de groupe, null */
-		if(0 === $unit_id || 0 === $group_id)
-			return null;
+		if(0 === $unit_id || 0 === $group_id) {
+					return null;
+		}
 
 		return $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array( $group_id, $unit_id ) ) );
 	}
@@ -942,8 +924,9 @@ 
 		global $wpdb;
 
 		/** Si pas d'unité ou de groupe, null */
-		if(0 === $unit_id || 0 === $group_id)
-			return null;
+		if(0 === $unit_id || 0 === $group_id) {
+					return null;
+		}
 
 		return $wpdb->get_var( $wpdb->prepare( 'SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array( $group_id, $unit_id ) ) );
 	}

includes/librairies/eav/entities.class.php

Doc Comments +1 added lines, -2 removed lines

@@ -88,7 +88,6 @@ 
 	/**
 	 * The metabox content for entity type support section in entity edition page
 	 *
-	 * @param object $post The entity type being edited
 	 */
 	public static function wpshop_entity_support_section( $entity ) {
 		$output = '';
@@ -657,7 +656,7 @@ 
 	/**
 	 * Define custom columns content display in post_type page for wpshop entities
 	 *
-	 * @param string $columns The default column for the post_type given in second parameter
+	 * @param string $column The default column for the post_type given in second parameter
 	 * @param integer $post_id The current post identifier to get information for display
 	 */
 	public static function custom_columns_content($column, $post_id) {

Indentation +6 added lines, -6 removed lines

@@ -53,11 +53,11 @@ 
 			'exclude_from_search'	=> true,
 			'capabilities'			=> array(
 				'edit_post' 			 => 'wpshop_view_dashboard',
-		        'edit_posts' 			 => 'wpshop_view_dashboard',
-		        'edit_others_posts' 	 => 'wpshop_view_dashboard',
-		        'publish_posts' 		 => 'wpshop_view_dashboard',
-		        'read_post' 			 => 'wpshop_view_dashboard',
-		        'read_private_posts' 	 => 'wpshop_view_dashboard',
+				'edit_posts' 			 => 'wpshop_view_dashboard',
+				'edit_others_posts' 	 => 'wpshop_view_dashboard',
+				'publish_posts' 		 => 'wpshop_view_dashboard',
+				'read_post' 			 => 'wpshop_view_dashboard',
+				'read_private_posts' 	 => 'wpshop_view_dashboard',
 				'delete_posts'			 => 'delete_product'
 			),
 		));
@@ -421,7 +421,7 @@ 
 	 * Save informations for current entity
 	 */
 	public static function save_entities_custom_informations( $post_id ) {
-    global $wpdb, $wpshop_account;
+	global $wpdb, $wpshop_account;
 
 		$edit_other_thing = !empty( $_POST['edit_other_thing'] ) ? (int) $_POST['edit_other_thing'] : 0;
 

Braces +31 added lines, -40 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Define utilities to manage entities
  *
@@ -215,8 +217,7 @@ 
 					$current_entity_params = get_post_meta($entity->ID, '_wpshop_entity_params', true);
 					if ( !empty($current_entity_params['display_admin_menu']) ) {
 						$show_in_menu = WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES;
-					}
-					else {
+					} else {
 						$show_in_menu = false;
 					}
 					$post_type_params = array(
@@ -330,15 +331,15 @@ 
 					foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
 						if (!empty($currentTabContent['box'][$boxIdentifier.'_backend_display_type']) &&( $currentTabContent['box'][$boxIdentifier.'_backend_display_type']=='movable-tab')) {
 							add_meta_box($post->post_type . '_' . $boxIdentifier, __($boxTitle, 'wpshop'), array('wpshop_entities', 'meta_box_content'), $post->post_type, 'normal', 'default', array('currentTabContent' => $currentTabContent['boxContent'][$boxIdentifier]));
+						} else {
+							$fixed_box_exist = true;
 						}
-						else $fixed_box_exist = true;
 					}
 				}
 				if ($fixed_box_exist && $post->post_type != WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) {
 					add_meta_box($post->post_type . '_fixed_tab', __('Informations', 'wpshop'), array('wpshop_entities', 'meta_box_content_datas'), $post->post_type, 'normal', 'high', array('currentTabContent' => $currentTabContent));
 				}
-			}
-			elseif (count($attribute_set_list) > 1) {
+			} elseif (count($attribute_set_list) > 1) {
 				$input_def['id'] = $post->post_type.'_attribute_set_id';
 				$input_def['name'] = $post->post_type.'_attribute_set_id';
 				$input_def['value'] = '';
@@ -490,8 +491,7 @@ 
 				if( !empty( $current_id ) ) {
 					update_post_meta ($post_id, '_wpshop_attached_address', $current_id);
 				}
-			}
-			else {
+			} else {
 				$current_id = array();
 
 				$address_type = !empty($_REQUEST['address_type']) ? (array) $_REQUEST['address_type'] : null;
@@ -608,8 +608,7 @@ 
 			$new_element_link = '<a class="wpshop_cls wpshop_duplicate_entity_element_link" href="' . admin_url('post.php?post=' . $last_post . '&action=edit') . '" >' . __('Go on the new element edit page', 'wpshop') . '</a>';
 			if ( $meta_creation ) {
 				return array('true', '<br/>' . $new_element_link, $last_post );
-			}
-			else {
+			} else {
 				return array('true', '<br/>' . __('Some errors occured while duplicating meta information, but element has been created.', 'wpshop') . ' ' . $new_element_link);
 			}
 		}
@@ -675,18 +674,21 @@ 
 						$column_content = get_the_post_thumbnail( $post_id, 'thumbnail');
 					break;
 					case "product_stock":
-						if( !empty($product['product_stock']) )
-							$column_content = (int)$product['product_stock'].' '.__('unit(s)','wpshop');
+						if( !empty($product['product_stock']) ) {
+													$column_content = (int)$product['product_stock'].' '.__('unit(s)','wpshop');
+						}
 					break;
 
 					case "product_price":
-						if( !empty($product['product_price']) )
-							$column_content = wpshop_prices::get_product_price( $product, 'price_display', 'complete_sheet');
+						if( !empty($product['product_price']) ) {
+													$column_content = wpshop_prices::get_product_price( $product, 'price_display', 'complete_sheet');
+						}
 					break;
 
 					case "tx_tva":
-						if( !empty($product['product_price']) )
-							$column_content = number_format($product[$column],2,'.', ' ').' %';
+						if( !empty($product['product_price']) ) {
+													$column_content = number_format($product[$column],2,'.', ' ').' %';
+						}
 					break;
 					default:
 						if ( !empty($product[$column]) ) {
@@ -694,9 +696,9 @@ 
 							if ( in_array($column, $attribute_prices) ) {
 								$column_content = number_format($product[$column],2,'.', ' ').' '.wpshop_tools::wpshop_get_currency();
 
+							} else {
+															$column_content = $product[$column];
 							}
-							else
-								$column_content = $product[$column];
 						}
 						break;
 				}
@@ -732,15 +734,13 @@ 
 
 			if ( empty($shortcode_args['attribute_set_id']) || empty($shortcode_args['post_type']) ) {
 				$output = __('This form page is invalid because no set or type or content is defined. Please contact administrator with this error message', 'wpshop');
-			}
-			else {
+			} else {
 				$entity_identifier = wpshop_entities::get_entity_identifier_from_code($shortcode_args['post_type']);
 				$attribute_set_def = wpshop_attributes_set::getElement($shortcode_args['attribute_set_id'], "'valid'");
 
 				if ( empty($entity_identifier) || empty($attribute_set_def) || ($entity_identifier != $attribute_set_def->entity_id) ) {
 					$output = __('This form page is invalid because type and set are not linked. Please contact administrator with this error message', 'wpshop');
-				}
-				else {
+				} else {
 					/** Display wordpress fields */
 					foreach ( explode(', ', $shortcode_args['fields']) as $field_name ) {
 						$label = '';
@@ -847,8 +847,7 @@ 
 			$tpl_component['DIALOG_BOX'] = '';
 			$output = wpshop_display::display_template_element($template_part, $tpl_component, array(), 'wpshop');
 			echo $output;
-		}
-		else {
+		} else {
 			echo $wpshop_account->display_login_form();
 		}
 	}
@@ -887,8 +886,7 @@ 
 		/** Update the attribute set id for the current product	*/
 		if ( !empty($extra_params['attribute_set_id']) ) {
 			$attribute_set_id = $extra_params['attribute_set_id'];
-		}
-		else {
+		} else {
 			$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE status = %s AND entity_id = %d AND default_set = %s", 'valid', wpshop_entities::get_entity_identifier_from_code($entity_type) , 'yes');
 			$attribute_set_id = $wpdb->get_var($query);
 		}
@@ -941,12 +939,10 @@ 
 					if ( $field_name == 'post_name' ) {
 						$db_datas_definition[] = $identifier;
 						$db_field_definition[] = str_replace( 'post_', '', $field_name );
-					}
-					else if ( $field_default_value == 'mandatory' ) {
+					} else if ( $field_default_value == 'mandatory' ) {
 						$has_error = true;
 						$errors[] = $field_name;
-					}
-					else {
+					} else {
 						$db_datas_definition[] = $field_default_value;
 						$db_field_definition[] = str_replace( 'post_', '', $field_name );
 					}
@@ -956,8 +952,7 @@ 
 			if ( $has_error ) {
 				$result = false;
 				$output = sprintf( __('You have to fill %s, they are mandatory for custom type creation', 'wpshop'), implode(',', $errors) );
-			}
-			else {
+			} else {
 				$custom_post_type_def = array();
 				foreach ( $db_field_definition as $field_position => $field_name ) {
 					$custom_post_type_def['post_' . $field_name] = $db_datas_definition[$field_position];
@@ -999,8 +994,7 @@ 
 			$attributes_for_cpt = wpshop_entities::check_default_cpt_attributes( $identifier, $tpl_component, $has_error );
 			$has_error = $attributes_for_cpt[0];
 			$tpl_component['CUSTOM_POST_TYPE_DEFAULT_ATTRIBUTES'] = $attributes_for_cpt[1];
-		}
-		else {
+		} else {
 			$tpl_component['CUSTOM_POST_TYPE_IDENTIFIER'] = '<img class="wpshop_tools_check_icon error" src="' . WPSHOP_MEDIAS_ICON_URL . 'informations/error_s.png" /> ' . $identifier;
 			$tpl_component['TOOLS_CUSTOM_POST_TYPE_CONTAINER_CLASS'] = ' error';
 			$template_part = 'wpshop_admin_tools_default_datas_check_main_element_content_error';
@@ -1038,8 +1032,7 @@ 
 					if ( $column_value == 'code' ) {
 						$code_column = $column_key;
 // 						$available_columns[$column_value] = $column_key;
-					}
-					else if ( in_array( $column_value, array('frontend_label')/* $attribute_displayed_field */ ) ) {
+					} else if ( in_array( $column_value, array('frontend_label')/* $attribute_displayed_field */ ) ) {
 						$available_columns[$column_value] = $column_key;
 					}
 				}
@@ -1055,8 +1048,7 @@ 
 							if ( in_array( $line_column, $available_columns ) ) {
 								if ( !empty($attribute) ) {
 									$attribute_ok .= $attribute->frontend_label . ', ';
-								}
-								else {
+								} else {
 									$attribute_not_ok .= $line_column_value . ', ';
 									$has_error = true;
 								}
@@ -1127,8 +1119,7 @@ 
 										break;
 								}
 								$attribute_def[$column_name] = ( !empty($attribute_definition[$column_index]) ) ? $column_value : '';
-							}
-							else {
+							} else {
 								switch ( $column_name ) {
 									case 'available_values':
 										$attribute_values = $attribute_definition[$column_index];

Spacing +239 added lines, -239 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Define utilities to manage entities
  *
@@ -11,8 +11,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'));
 }
 
 /**
@@ -33,20 +33,20 @@ 
 	public static function create_wpshop_entities_type() {
 		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, array(
 			'labels' => array(
-				'name'					=> __( 'Entities', 'wpshop' ),
-				'singular_name' 		=> __( 'Entity', 'wpshop' ),
-				'add_new_item' 			=> __( 'Add new entity', 'wpshop' ),
-				'add_new' 				=> __( 'Add new entity', 'wpshop' ),
-				'add_new_item' 			=> __( 'Add new entity', 'wpshop' ),
-				'edit_item' 			=> __( 'Edit entity', 'wpshop' ),
-				'new_item' 				=> __( 'New entity', 'wpshop' ),
-				'view_item' 			=> __( 'View entity', 'wpshop' ),
-				'search_items' 			=> __( 'Search entities', 'wpshop' ),
-				'not_found' 			=> __( 'No entities found', 'wpshop' ),
-				'not_found_in_trash' 	=> __( 'No entities found in Trash', 'wpshop' ),
+				'name'					=> __('Entities', 'wpshop'),
+				'singular_name' 		=> __('Entity', 'wpshop'),
+				'add_new_item' 			=> __('Add new entity', 'wpshop'),
+				'add_new' 				=> __('Add new entity', 'wpshop'),
+				'add_new_item' 			=> __('Add new entity', 'wpshop'),
+				'edit_item' 			=> __('Edit entity', 'wpshop'),
+				'new_item' 				=> __('New entity', 'wpshop'),
+				'view_item' 			=> __('View entity', 'wpshop'),
+				'search_items' 			=> __('Search entities', 'wpshop'),
+				'not_found' 			=> __('No entities found', 'wpshop'),
+				'not_found_in_trash' 	=> __('No entities found in Trash', 'wpshop'),
 				'parent_item_colon' 	=> '',
 			),
-			'supports' 				=> array( 'title', 'editor', 'page-attributes' ),
+			'supports' 				=> array('title', 'editor', 'page-attributes'),
 			'public' 				=> true,
 			'has_archive'			=> true,
 			'publicly_queryable' 	=> false,
@@ -76,13 +76,13 @@ 
 		/** Metabox allowgin to choose a custome rewrite for an entiy	*/
 		add_meta_box(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES . '_rewrite', __('Rewrite for entity', 'wpshop'), array('wpshop_entities', 'wpshop_entity_rewrite'), WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, 'normal', 'high');
 
-		if ( !in_array( $post->post_name, unserialize( WPSHOP_DEFAULT_CUSTOM_TYPES ) ) ) {
+		if (!in_array($post->post_name, unserialize(WPSHOP_DEFAULT_CUSTOM_TYPES))) {
 			/** Display or not address in admin menu	*/
 			add_meta_box(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES . '_admin_menu_display', __('Display in admin menu', 'wpshop'), array('wpshop_entities', 'wpshop_display_entity_in_admin_menu'), WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, 'side', 'low');
 		}
 
 		/** Join address to entity	*/
-		if ( !in_array( $post->post_name, array( WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS ) ) ) {
+		if (!in_array($post->post_name, array(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS))) {
 			add_meta_box(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES . '_join_address_to_entity', __('Join Address to this entity', 'wpshop'), array('wpshop_entities', 'wpshop_join_address_to_entity'), WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, 'side', 'low');
 		}
 	}
@@ -92,24 +92,24 @@ 
 	 *
 	 * @param object $post The entity type being edited
 	 */
-	public static function wpshop_entity_support_section( $entity ) {
+	public static function wpshop_entity_support_section($entity) {
 		$output = '';
 		$support_list = unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT);
 
 		$current_entity_params = get_post_meta($entity->ID, '_wpshop_entity_params', true);
 
-		unset($input_def);$input_def=array();
+		unset($input_def); $input_def = array();
 		$input_def['type'] = 'checkbox';
 
-		foreach ( $support_list as $support ) {
+		foreach ($support_list as $support) {
 			$input_def['id'] = 'wpshop_entity_support';
 			$input_def['name'] = $support;
 			$input_def['possible_value'] = array($support);
-			if ( !empty($current_entity_params['support']) && in_array($support, $current_entity_params['support']) ) {
+			if (!empty($current_entity_params['support']) && in_array($support, $current_entity_params['support'])) {
 				$input_def['value'] = $support;
 			}
 
-			$output .= '<p class="wpshop_entities_support_type wpshop_entities_support_type_' . $support . '" >' . wpshop_form::check_input_type($input_def, 'wpshop_entity_support') . ' <label for="'.$input_def['id'].'_'.$support.'">' . __($support, 'wpshop') . '</label></p>';
+			$output .= '<p class="wpshop_entities_support_type wpshop_entities_support_type_' . $support . '" >' . wpshop_form::check_input_type($input_def, 'wpshop_entity_support') . ' <label for="' . $input_def['id'] . '_' . $support . '">' . __($support, 'wpshop') . '</label></p>';
 		}
 		$output .= '<p class="wpshop_cls" ></p>';
 
@@ -121,33 +121,33 @@ 
 	 *
 	 * @param unknown_type $entity
 	 */
-	public static function wpshop_entity_rewrite( $entity ) {
+	public static function wpshop_entity_rewrite($entity) {
 		$output = '';
 
 		$current_entity_params = get_post_meta($entity->ID, '_wpshop_entity_params', true);
 
-		unset($input_def);$input_def=array();
+		unset($input_def); $input_def = array();
 		$input_def['type'] = 'text';
 		$input_def['id'] = 'wpshop_entity_rewrite';
 		$input_def['name'] = 'wpshop_entity_rewrite[slug]';
-		$input_def['value'] = (!empty($current_entity_params['rewrite']['slug']) ? $current_entity_params['rewrite']['slug'] :'');
+		$input_def['value'] = (!empty($current_entity_params['rewrite']['slug']) ? $current_entity_params['rewrite']['slug'] : '');
 
-		$output .= '<p><label for="'.$input_def['id'].'">' . __('Choose how this entity will be rewrite in front side. If you let it empty default will be taken', 'wpshop') . '</label><br/>' . wpshop_form::check_input_type($input_def) . '</p>';
+		$output .= '<p><label for="' . $input_def['id'] . '">' . __('Choose how this entity will be rewrite in front side. If you let it empty default will be taken', 'wpshop') . '</label><br/>' . wpshop_form::check_input_type($input_def) . '</p>';
 
 		echo $output;
 	}
 
 	public static function wpshop_display_entity_in_admin_menu() {
 		$checked = '';
-		$post = !empty( $_GET['post'] ) ? (int) $_GET['post'] : 0;
-		if ( !empty($post) ) {
-			$current_entity_params = get_post_meta( $post, '_wpshop_entity_params', true);
+		$post = !empty($_GET['post']) ? (int)$_GET['post'] : 0;
+		if (!empty($post)) {
+			$current_entity_params = get_post_meta($post, '_wpshop_entity_params', true);
 
-			if ( !empty($current_entity_params['display_admin_menu']) ) {
+			if (!empty($current_entity_params['display_admin_menu'])) {
 				$checked = 'checked ="checked"';
 				}
 		}
-		$output = '<input type="checkbox" id="wpshop_display_in_admin_menu" name="wpshop_display_in_admin_menu" ' .$checked. '/><label for="wpshop_display_in_admin_menu"> '.__('Display in admin menu', 'wpshop').'</label>';
+		$output = '<input type="checkbox" id="wpshop_display_in_admin_menu" name="wpshop_display_in_admin_menu" ' . $checked . '/><label for="wpshop_display_in_admin_menu"> ' . __('Display in admin menu', 'wpshop') . '</label>';
 		echo $output;
 	}
 
@@ -155,21 +155,21 @@ 
 	 * Save custom information for entity type
 	 */
 	public static function save_entity_type_custom_informations() {
-		$post_id = !empty($_POST['post_ID']) ? intval( sanitize_key($_POST['post_ID']) ) : null;
-		$post_support = !empty($_POST['wpshop_entity_support']) && is_array( (array)$_POST['wpshop_entity_support'] ) ? (array)$_POST['wpshop_entity_support'] : null;
-		$wpshop_entity_rewrite = !empty($_POST['wpshop_entity_rewrite']) ? (array) $_POST['wpshop_entity_rewrite'] : null;
+		$post_id = !empty($_POST['post_ID']) ? intval(sanitize_key($_POST['post_ID'])) : null;
+		$post_support = !empty($_POST['wpshop_entity_support']) && is_array((array)$_POST['wpshop_entity_support']) ? (array)$_POST['wpshop_entity_support'] : null;
+		$wpshop_entity_rewrite = !empty($_POST['wpshop_entity_rewrite']) ? (array)$_POST['wpshop_entity_rewrite'] : null;
 		$wpshop_entity_display_menu = !empty($_POST['wpshop_display_in_admin_menu']) ? sanitize_key($_POST['wpshop_display_in_admin_menu']) : null;
 
-		$address_type = !empty ($_POST['address_type']) ? (array) $_POST['address_type'] : null;
-		if ( isset($address_type) ) {
+		$address_type = !empty ($_POST['address_type']) ? (array)$_POST['address_type'] : null;
+		if (isset($address_type)) {
 			$save_array = array();
-			foreach ( $address_type as $key=>$value ) {
-				$save_array[] = intval( sanitize_text_field($value) );
+			foreach ($address_type as $key=>$value) {
+				$save_array[] = intval(sanitize_text_field($value));
 			}
-			update_post_meta( $post_id, '_wpshop_entity_attached_address', $save_array );
+			update_post_meta($post_id, '_wpshop_entity_attached_address', $save_array);
 		}
 
-		if ( get_post_type($post_id) == WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES ) {
+		if (get_post_type($post_id) == WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES) {
 			update_post_meta($post_id, '_wpshop_entity_params', array('support' => $post_support, 'rewrite' => $wpshop_entity_rewrite, 'display_admin_menu'=>$wpshop_entity_display_menu));
 			flush_rewrite_rules();
 		}
@@ -178,19 +178,19 @@ 
 	/**
 	 * Permite to join one or several address to an entity
 	 */
-	public static function wpshop_join_address_to_entity () {
+	public static function wpshop_join_address_to_entity() {
 		global $wpdb;
 		// Select the id of the entity address
-		$query = $wpdb->prepare('SELECT id FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_name = %s', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
-		$entity_id = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT id FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_name = %s', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
+		$entity_id = $wpdb->get_var($query);
 		//Get the Post_meta
-		$attached_address_values = get_post_meta( intval(wpshop_tools::varSanitizer( (!empty($_GET['post']) ? $_GET['post'] : '') )), '_wpshop_entity_attached_address', true );
+		$attached_address_values = get_post_meta(intval(wpshop_tools::varSanitizer((!empty($_GET['post']) ? $_GET['post'] : ''))), '_wpshop_entity_attached_address', true);
 		//Select and Display all addresses type
-		$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $entity_id);
-		$addresses = $wpdb->get_results( $query);
+		$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+		$addresses = $wpdb->get_results($query);
 		$output = '';
-		foreach ( $addresses as $address ) {
-			$output .= '<p><input type="checkbox" id="' .$address->name.'_'.$address->id.'" name="address_type[' .$address->name. ']" value="'.$address->id.'" ' .( ( !empty($attached_address_values) && in_array( $address->id, $attached_address_values) ) ? 'checked="checked"' : '' ). ' /> <label for="' .$address->name.'_'.$address->id.'">'.$address->name.'</label></p>';
+		foreach ($addresses as $address) {
+			$output .= '<p><input type="checkbox" id="' . $address->name . '_' . $address->id . '" name="address_type[' . $address->name . ']" value="' . $address->id . '" ' . ((!empty($attached_address_values) && in_array($address->id, $attached_address_values)) ? 'checked="checked"' : '') . ' /> <label for="' . $address->name . '_' . $address->id . '">' . $address->name . '</label></p>';
 		}
 		echo $output;
 	}
@@ -210,12 +210,12 @@ 
 		/*
 		 * Read the entity list for custom type declaration
 		 */
-		if ( !empty($entities) ) {
-			foreach ( $entities as $entity ) {
-				$wpshop_builtin_types = unserialize( WPSHOP_DEFAULT_CUSTOM_TYPES );
-				if ( !empty( $entity->post_name ) && !in_array( $entity->post_name, $wpshop_builtin_types ) ) {
+		if (!empty($entities)) {
+			foreach ($entities as $entity) {
+				$wpshop_builtin_types = unserialize(WPSHOP_DEFAULT_CUSTOM_TYPES);
+				if (!empty($entity->post_name) && !in_array($entity->post_name, $wpshop_builtin_types)) {
 					$current_entity_params = get_post_meta($entity->ID, '_wpshop_entity_params', true);
-					if ( !empty($current_entity_params['display_admin_menu']) ) {
+					if (!empty($current_entity_params['display_admin_menu'])) {
 						$show_in_menu = WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES;
 					}
 					else {
@@ -223,17 +223,17 @@ 
 					}
 					$post_type_params = array(
 						'labels' => array(
-							'name'					=> __( $entity->post_title , 'wpshop' ),
-							'singular_name' 		=> __( $entity->post_title, 'wpshop' ),
-							'add_new_item' 			=> sprintf( __( 'Add new %s', 'wpshop' ), $entity->post_title),
-							'add_new' 				=> sprintf( __( 'Add new %s', 'wpshop' ), $entity->post_title),
-							'add_new_item' 			=> sprintf( __( 'Add new %s', 'wpshop' ), $entity->post_title),
-							'edit_item' 			=> sprintf( __( 'Edit %s', 'wpshop' ), $entity->post_title),
-							'new_item' 				=> sprintf( __( 'New %s', 'wpshop' ), $entity->post_title),
-							'view_item' 			=> sprintf( __( 'View %s', 'wpshop' ), $entity->post_title),
-							'search_items' 			=> sprintf( __( 'Search %s', 'wpshop' ), $entity->post_title),
-							'not_found' 			=> sprintf( __( 'No %s found', 'wpshop' ), $entity->post_title),
-							'not_found_in_trash' 	=> sprintf( __( 'No %s found in Trash', 'wpshop' ), $entity->post_title),
+							'name'					=> __($entity->post_title, 'wpshop'),
+							'singular_name' 		=> __($entity->post_title, 'wpshop'),
+							'add_new_item' 			=> sprintf(__('Add new %s', 'wpshop'), $entity->post_title),
+							'add_new' 				=> sprintf(__('Add new %s', 'wpshop'), $entity->post_title),
+							'add_new_item' 			=> sprintf(__('Add new %s', 'wpshop'), $entity->post_title),
+							'edit_item' 			=> sprintf(__('Edit %s', 'wpshop'), $entity->post_title),
+							'new_item' 				=> sprintf(__('New %s', 'wpshop'), $entity->post_title),
+							'view_item' 			=> sprintf(__('View %s', 'wpshop'), $entity->post_title),
+							'search_items' 			=> sprintf(__('Search %s', 'wpshop'), $entity->post_title),
+							'not_found' 			=> sprintf(__('No %s found', 'wpshop'), $entity->post_title),
+							'not_found_in_trash' 	=> sprintf(__('No %s found in Trash', 'wpshop'), $entity->post_title),
 							'parent_item_colon' 	=> '',
 						),
 						'description' 			=> $entity->post_content,
@@ -247,7 +247,7 @@ 
 						'rewrite'				=> !empty($current_entity_params['rewrite']) ? $current_entity_params['rewrite'] : array(),
 						'hierarchical'			=> true,
 					);
-					register_post_type($entity->post_name, $post_type_params );
+					register_post_type($entity->post_name, $post_type_params);
 				}
 
 				/**	Add basic metabox */
@@ -258,7 +258,7 @@ 
 
 			}
 
-			add_filter( 'map_meta_cap', array('wpshop_entities', 'map_meta_cap'), 10, 4 );
+			add_filter('map_meta_cap', array('wpshop_entities', 'map_meta_cap'), 10, 4);
 			/*
 			 * Reset query for security reasons
 			 */
@@ -273,10 +273,10 @@ 
 	 * @param integer $user_id
 	 * @param array $args
 	 */
-	public static function map_meta_cap( $caps, $cap, $user_id, $args ) {
-		if ( !empty($args) ) {
+	public static function map_meta_cap($caps, $cap, $user_id, $args) {
+		if (!empty($args)) {
 			$post = get_post($args[0]);
-			if ( false && !empty($post) && is_object($post) && ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES) && (($post->post_name == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)  || ($post->post_name == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) || ($post->post_name == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS)) && ($cap == 'delete_product') ) {
+			if (false && !empty($post) && is_object($post) && ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES) && (($post->post_name == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_name == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) || ($post->post_name == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS)) && ($cap == 'delete_product')) {
 				$caps = 'wpshop_view_dashboard';
 			}
 		}
@@ -288,7 +288,7 @@ 
 	/**
 	 * Add metaboxes to the custom post types defined by entities
 	 */
-	public static function add_meta_boxes_to_custom_types( $post ) {
+	public static function add_meta_boxes_to_custom_types($post) {
 		global $post,
 			   $wpdb;
 
@@ -303,7 +303,7 @@ 
 		/*
 		 * Product are managed from another place
 		 */
-		if ( $post->post_type != WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
+		if ($post->post_type != WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
 			/*
 			 * Get the attribute set list for current entity
 			 */
@@ -314,8 +314,8 @@ 
 			 */
 			$attribute_set_id = get_post_meta($post->ID, sprintf(WPSHOP_ATTRIBUTE_SET_ID_META_KEY, $post->post_type), true);
 
-			if(((count($attribute_set_list) == 1) || ((count($attribute_set_list) > 1) && !empty($attribute_set_id)))){
-				if((count($attribute_set_list) == 1) || empty($attribute_set_id)){
+			if (((count($attribute_set_list) == 1) || ((count($attribute_set_list) > 1) && !empty($attribute_set_id)))) {
+				if ((count($attribute_set_list) == 1) || empty($attribute_set_id)) {
 					$attribute_set_id = $attribute_set_list[0]->id;
 				}
 
@@ -328,28 +328,28 @@ 
 				/*
 				 * Read the different element for building output for current entity
 				 */
-				if ( !empty($currentTabContent['box']) && is_array($currentTabContent['box']) ) {
+				if (!empty($currentTabContent['box']) && is_array($currentTabContent['box'])) {
 					foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
-						if (!empty($currentTabContent['box'][$boxIdentifier.'_backend_display_type']) &&( $currentTabContent['box'][$boxIdentifier.'_backend_display_type']=='movable-tab')) {
+						if (!empty($currentTabContent['box'][$boxIdentifier . '_backend_display_type']) && ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'movable-tab')) {
 							add_meta_box($post->post_type . '_' . $boxIdentifier, __($boxTitle, 'wpshop'), array('wpshop_entities', 'meta_box_content'), $post->post_type, 'normal', 'default', array('currentTabContent' => $currentTabContent['boxContent'][$boxIdentifier]));
 						}
 						else $fixed_box_exist = true;
 					}
 				}
-				if ($fixed_box_exist && $post->post_type != WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) {
+				if ($fixed_box_exist && $post->post_type != WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) {
 					add_meta_box($post->post_type . '_fixed_tab', __('Informations', 'wpshop'), array('wpshop_entities', 'meta_box_content_datas'), $post->post_type, 'normal', 'high', array('currentTabContent' => $currentTabContent));
 				}
 			}
 			elseif (count($attribute_set_list) > 1) {
-				$input_def['id'] = $post->post_type.'_attribute_set_id';
-				$input_def['name'] = $post->post_type.'_attribute_set_id';
+				$input_def['id'] = $post->post_type . '_attribute_set_id';
+				$input_def['name'] = $post->post_type . '_attribute_set_id';
 				$input_def['value'] = '';
 				$input_def['type'] = 'select';
 				$input_def['possible_value'] = $attribute_set_list;
 
 				$input_def['value'] = '';
 				foreach ($attribute_set_list as $set) {
-					if( $set->default_set == 'yes' ) {
+					if ($set->default_set == 'yes') {
 						$input_def['value'] = $set->id;
 					}
 				}
@@ -357,12 +357,12 @@ 
 				$currentTabContent = '
 		<ul class="attribute_set_selector" >
 			<li class="attribute_set_selector_title_select" ><label for="title" >' . sprintf(__('Choose a title for the %s', 'wpshop'), get_the_title(wpshop_entities::get_entity_identifier_from_code($post->post_type))) . '</label></li>
-			<li class="attribute_set_selector_group_selector" ><label for="' . $input_def['id'] . '" >' . sprintf(__('Choose an attribute group for this %s', 'wpshop'), get_the_title(wpshop_entities::get_entity_identifier_from_code($post->post_type))) . '</label>&nbsp;'.wpshop_form::check_input_type($input_def).'</li>
+			<li class="attribute_set_selector_group_selector" ><label for="' . $input_def['id'] . '" >' . sprintf(__('Choose an attribute group for this %s', 'wpshop'), get_the_title(wpshop_entities::get_entity_identifier_from_code($post->post_type))) . '</label>&nbsp;' . wpshop_form::check_input_type($input_def) . '</li>
 			<li class="attribute_set_selector_save_instruction" >' . sprintf(__('Save the %s with the "Save draft" button on the right side', 'wpshop'), get_the_title(wpshop_entities::get_entity_identifier_from_code($post->post_type))) . '</li>
 			<li class="attribute_set_selector_after_save_instruction" >' . __('Once the group chosen, the different attribute will be displayed here', 'wpshop') . '</li>
 		</ul>';
 
-				add_meta_box($post->post_type . '_attribute_set_selector',sprintf( __('%s attributes', 'wpshop'), get_the_title(wpshop_entities::get_entity_identifier_from_code($post->post_type))), array('wpshop_entities', 'meta_box_content'), $post->post_type, 'normal', 'high', array('currentTabContent' => $currentTabContent));
+				add_meta_box($post->post_type . '_attribute_set_selector', sprintf(__('%s attributes', 'wpshop'), get_the_title(wpshop_entities::get_entity_identifier_from_code($post->post_type))), array('wpshop_entities', 'meta_box_content'), $post->post_type, 'normal', 'high', array('currentTabContent' => $currentTabContent));
 			}
 
 		}
@@ -392,22 +392,22 @@ 
 
 		echo '<div id="fixed-tabs" class="wpshop_tabs wpshop_detail_tabs entities_attribute_tabs ' . $post->post_type . '_attribute_tabs" >
 				<ul>';
-		if(!empty($currentTabContent['box'])){
-			foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
-				if(!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-					if($currentTabContent['box'][$boxIdentifier.'_backend_display_type']=='fixed-tab') {
-						echo '<li><a href="#tabs-'.$boxIdentifier.'">'.__($boxTitle, 'wpshop').'</a></li>';
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<li><a href="#tabs-' . $boxIdentifier . '">' . __($boxTitle, 'wpshop') . '</a></li>';
 					}
 				}
 			}
 		}
 		echo '</ul>';
 
-		if(!empty($currentTabContent['box'])){
-			foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
-				if(!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-					if($currentTabContent['box'][$boxIdentifier.'_backend_display_type']=='fixed-tab') {
-						echo '<div id="tabs-'.$boxIdentifier.'">'.$currentTabContent['boxContent'][$boxIdentifier].'</div>';
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<div id="tabs-' . $boxIdentifier . '">' . $currentTabContent['boxContent'][$boxIdentifier] . '</div>';
 					}
 				}
 			}
@@ -422,32 +422,32 @@ 
 	/**
 	 * Save informations for current entity
 	 */
-	public static function save_entities_custom_informations( $post_id ) {
+	public static function save_entities_custom_informations($post_id) {
     global $wpdb, $wpshop_account;
 
-		$edit_other_thing = !empty( $_POST['edit_other_thing'] ) ? (int) $_POST['edit_other_thing'] : 0;
+		$edit_other_thing = !empty($_POST['edit_other_thing']) ? (int)$_POST['edit_other_thing'] : 0;
 
-		if ( ( ( !empty($post_id) && empty( $edit_other_thing ) ) || ( !empty($post_id) && !(bool)$edit_other_thing ) )
-				 && ( get_post_type( $post_id ) != WPSHOP_NEWTYPE_IDENTIFIER_ORDER )  ) {
-			$current_post_type = get_post_type( $post_id );
-			$current_post_type_text = !empty( $_REQUEST[$current_post_type . '_attribute_set_id'] ) ? sanitize_text_field( $_REQUEST[$current_post_type . '_attribute_set_id'] ) : '';
+		if (((!empty($post_id) && empty($edit_other_thing)) || (!empty($post_id) && !(bool)$edit_other_thing))
+				 && (get_post_type($post_id) != WPSHOP_NEWTYPE_IDENTIFIER_ORDER)) {
+			$current_post_type = get_post_type($post_id);
+			$current_post_type_text = !empty($_REQUEST[$current_post_type . '_attribute_set_id']) ? sanitize_text_field($_REQUEST[$current_post_type . '_attribute_set_id']) : '';
 			/*	Vérification de l'existence de l'envoi de l'identifiant du set d'attribut	*/
-			if	( !empty($current_post_type_text) ) {
-				$attribute_set_id = intval( $current_post_type_text );
+			if (!empty($current_post_type_text)) {
+				$attribute_set_id = intval($current_post_type_text);
 				$attribet_set_infos = wpshop_attributes_set::getElement($attribute_set_id, "'valid'", 'id');
 
-				if ( $attribet_set_infos->entity == sanitize_key( $current_post_type ) ) {
+				if ($attribet_set_infos->entity == sanitize_key($current_post_type)) {
 					/*	Enregistrement de l'identifiant du set d'attribut associé à l'entité	*/
 					update_post_meta($post_id, sprintf(WPSHOP_ATTRIBUTE_SET_ID_META_KEY, $current_post_type), $attribute_set_id);
 
 					/*	Enregistrement de tous les attributs	*/
 					$current_post_type_attributes = !empty($_REQUEST[$current_post_type . '_attribute']) ? (array)$_REQUEST[$current_post_type . '_attribute'] : null;
-					if ( isset($current_post_type_attributes) ) {
+					if (isset($current_post_type_attributes)) {
 						/*	Traduction des virgule en point pour la base de donnees	*/
-						if ( !empty($current_post_type_attributes['decimal']) ) {
-							foreach($current_post_type_attributes['decimal'] as $attributeName => $attributeValue){
-								if(!is_array($attributeValue)){
-									$current_post_type_attributes['decimal'][$attributeName] = str_replace(',','.',$current_post_type_attributes['decimal'][$attributeName]);
+						if (!empty($current_post_type_attributes['decimal'])) {
+							foreach ($current_post_type_attributes['decimal'] as $attributeName => $attributeValue) {
+								if (!is_array($attributeValue)) {
+									$current_post_type_attributes['decimal'][$attributeName] = str_replace(',', '.', $current_post_type_attributes['decimal'][$attributeName]);
 								}
 							}
 						}
@@ -456,8 +456,8 @@ 
 
 						/*	Enregistrement des valeurs des attributs dans les metas de l'entité => Permet de profiter de la recherche native de wordpress	*/
 						$productMetaDatas = array();
-						foreach ( $current_post_type_attributes as $attributeType => $attributeValues ) {
-							foreach ( $attributeValues as $attributeCode => $attributeValue ) {
+						foreach ($current_post_type_attributes as $attributeType => $attributeValues) {
+							foreach ($attributeValues as $attributeCode => $attributeValue) {
 								$productMetaDatas[$attributeCode] = $attributeValue;
 							}
 						}
@@ -467,42 +467,42 @@ 
 				}
 			}
 
-			$attribute = !empty($_REQUEST['attribute']) ? (array) $_REQUEST['attribute'] : null;
-			$post_id = !empty($_REQUEST['post_ID']) ? (int) $_REQUEST['post_ID'] : null;
-			if ( isset($attribute) ) {
+			$attribute = !empty($_REQUEST['attribute']) ? (array)$_REQUEST['attribute'] : null;
+			$post_id = !empty($_REQUEST['post_ID']) ? (int)$_REQUEST['post_ID'] : null;
+			if (isset($attribute)) {
 				$current_id = array();
-				foreach ( $attribute as $key=>$values ) {
+				foreach ($attribute as $key=>$values) {
 					$ad_id = '';
 					$addresses_id = get_post_meta($post_id, '_wpshop_attached_address', true);
-					if ( !empty($addresses_id) ) {
-						foreach ( $addresses_id as $address_id) {
+					if (!empty($addresses_id)) {
+						foreach ($addresses_id as $address_id) {
 							$address_type = get_post_meta($address_id, '_wpshop_address_attribute_set_id', true);
 							if ($address_type == $key) {
 								$ad_id = $address_id;
 							}
 						}
 					}
-					if( !empty( $ad_id ) ) {
+					if (!empty($ad_id)) {
 						// @TODO : REQUEST
 						// $_REQUEST['item_id'] = $ad_id;
-						$result = wps_address::save_address_infos( $key );
+						$result = wps_address::save_address_infos($key);
 						$current_id[] = $result['current_id'];
 					}
 				}
-				if( !empty( $current_id ) ) {
-					update_post_meta ($post_id, '_wpshop_attached_address', $current_id);
+				if (!empty($current_id)) {
+					update_post_meta($post_id, '_wpshop_attached_address', $current_id);
 				}
 			}
 			else {
 				$current_id = array();
 
-				$address_type = !empty($_REQUEST['address_type']) ? (array) $_REQUEST['address_type'] : null;
-				if ( isset($address_type) ) {
-					foreach ( $address_type as $key=>$value ) {
+				$address_type = !empty($_REQUEST['address_type']) ? (array)$_REQUEST['address_type'] : null;
+				if (isset($address_type)) {
+					foreach ($address_type as $key=>$value) {
 						$current_id[] = $value;
 					}
 				}
-				update_post_meta ($post_id, '_wpshop_entity_attached_address', $current_id);
+				update_post_meta($post_id, '_wpshop_entity_attached_address', $current_id);
 			}
 		}
 
@@ -525,7 +525,7 @@ 
 			'posts_per_page' 	=> '-1',
 		));
 
-		if ( !empty($entities) ) {
+		if (!empty($entities)) {
 			foreach ($entities as $entity_index => $entity) {
 				$entities_list[$entity->ID] = $entity->post_title;
 			}
@@ -544,7 +544,7 @@ 
 	 * @return integer The entity identifier that match to given parameters
 	 */
 	public static function get_entity_identifier_from_code($code, $post_status = 'publish', $entity_code = WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES) {
-		if ( ! isset( self::$entities_cache[$entity_code][$code][$post_status] ) ) {
+		if (!isset(self::$entities_cache[$entity_code][$code][$post_status])) {
 			global $wpdb;
 			self::$entities_cache[$entity_code][$code][$post_status] = null;
 			$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type=%s AND post_status=%s AND post_name=%s ORDER BY menu_order ASC", $entity_code, $post_status, $code);
@@ -563,7 +563,7 @@ 
 		global $wpdb;
 
 		/*	Get current post information	*/
-		$post_infos = get_post( $post_id, ARRAY_A );
+		$post_infos = get_post($post_id, ARRAY_A);
 		/*	Set new information for post that will be created	*/
 		unset($post_infos['ID']);
 		$post_infos['post_date'] = current_time('mysql', 1);
@@ -581,18 +581,18 @@ 
 		$last_post = wp_insert_post($post_infos);
 
 		/*	If there is no error then duplicate meta informations	*/
-		if ( is_int($last_post) && !empty($last_post) ) {
+		if (is_int($last_post) && !empty($last_post)) {
 			$meta_creation = true;
 
 			$current_post_meta = get_post_meta($post_id);
-			foreach ( $current_post_meta as $post_meta_key => $post_meta_value ) {
-				$meta_is_array = ( !empty( $post_meta_value[0] ) && wpshop_tools::is_serialized( $post_meta_value[0] ) ) ? unserialize( $post_meta_value[0] ) : '';
+			foreach ($current_post_meta as $post_meta_key => $post_meta_value) {
+				$meta_is_array = (!empty($post_meta_value[0]) && wpshop_tools::is_serialized($post_meta_value[0])) ? unserialize($post_meta_value[0]) : '';
 				$meta_real_value = (is_array($meta_is_array) ? $meta_is_array : $post_meta_value[0]);
 				$meta_creation = update_post_meta($last_post, $post_meta_key, $meta_real_value);
 			}
 			/*	Duplicate element taxonomy	*/
 			/*	Check the taxonomy to get	*/
-			switch ( get_post_type($post_id) ) {
+			switch (get_post_type($post_id)) {
 				case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 					$taxonomy = WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES;
 					break;
@@ -600,17 +600,17 @@ 
 					$taxonomy = '';
 					break;
 			}
-			$post_taxonomies = wp_get_post_terms( $post_id,  $taxonomy);
-			foreach ( $post_taxonomies as $post_taxonomy ) {
-				wp_set_post_terms( $last_post, $post_taxonomy->term_id, $taxonomy, true);
+			$post_taxonomies = wp_get_post_terms($post_id, $taxonomy);
+			foreach ($post_taxonomies as $post_taxonomy) {
+				wp_set_post_terms($last_post, $post_taxonomy->term_id, $taxonomy, true);
 			}
 
 			/*	Create a post meta allowing to know if the element has been duplicated from another	*/
 			update_post_meta($last_post, '_wpshop_duplicate_element', $post_id);
 
 			$new_element_link = '<a class="wpshop_cls wpshop_duplicate_entity_element_link" href="' . admin_url('post.php?post=' . $last_post . '&action=edit') . '" >' . __('Go on the new element edit page', 'wpshop') . '</a>';
-			if ( $meta_creation ) {
-				return array('true', '<br/>' . $new_element_link, $last_post );
+			if ($meta_creation) {
+				return array('true', '<br/>' . $new_element_link, $last_post);
 			}
 			else {
 				return array('true', '<br/>' . __('Some errors occured while duplicating meta information, but element has been created.', 'wpshop') . ' ' . $new_element_link);
@@ -636,12 +636,12 @@ 
 		$query = $wpdb->prepare("SELECT code, frontend_label FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATT WHERE status=%s AND is_used_in_admin_listing_column=%s AND entity_id=%d", 'valid', 'yes', self::get_entity_identifier_from_code($post_type));
 		$attributes_list = $wpdb->get_results($query);
 		$wpshop_custom_columns = array();
-		foreach ( $attributes_list as $attribute ) {
+		foreach ($attributes_list as $attribute) {
 			$wpshop_custom_columns[$attribute->code] = __($attribute->frontend_label, 'wpshop');
 		}
 
 		/*	Check the current entity to display custom column correctly. Add the custom column into default column list	*/
-		switch ( $post_type ) {
+		switch ($post_type) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 				$columns = array_merge(array(
 					'cb' => '<input type="checkbox" />',
@@ -668,34 +668,34 @@ 
 	public static function custom_columns_content($column, $post_id) {
 		$post_type = get_post_type($post_id);
 
-		switch ( $post_type ) {
+		switch ($post_type) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 				$column_content = '<strong>-</strong>';
 				$product = wpshop_products::get_product_data($post_id);
 
 				switch ($column) {
 					case 'picture' :
-						$column_content = get_the_post_thumbnail( $post_id, 'thumbnail');
+						$column_content = get_the_post_thumbnail($post_id, 'thumbnail');
 					break;
 					case "product_stock":
-						if( !empty($product['product_stock']) )
-							$column_content = (int)$product['product_stock'].' '.__('unit(s)','wpshop');
+						if (!empty($product['product_stock']))
+							$column_content = (int)$product['product_stock'] . ' ' . __('unit(s)', 'wpshop');
 					break;
 
 					case "product_price":
-						if( !empty($product['product_price']) )
-							$column_content = wpshop_prices::get_product_price( $product, 'price_display', 'complete_sheet');
+						if (!empty($product['product_price']))
+							$column_content = wpshop_prices::get_product_price($product, 'price_display', 'complete_sheet');
 					break;
 
 					case "tx_tva":
-						if( !empty($product['product_price']) )
-							$column_content = number_format($product[$column],2,'.', ' ').' %';
+						if (!empty($product['product_price']))
+							$column_content = number_format($product[$column], 2, '.', ' ') . ' %';
 					break;
 					default:
-						if ( !empty($product[$column]) ) {
+						if (!empty($product[$column])) {
 							$attribute_prices = unserialize(WPSHOP_ATTRIBUTE_PRICES);
-							if ( in_array($column, $attribute_prices) ) {
-								$column_content = number_format($product[$column],2,'.', ' ').' '.wpshop_tools::wpshop_get_currency();
+							if (in_array($column, $attribute_prices)) {
+								$column_content = number_format($product[$column], 2, '.', ' ') . ' ' . wpshop_tools::wpshop_get_currency();
 
 							}
 							else
@@ -716,16 +716,16 @@ 
 	 * Display a form allowing to create an entity from frontend with a shortcode
 	 * @param array $shortcode_args The different parameters for the shortocde: the field list for the form, different parameters for the entity to create
 	 */
-	public static function wpshop_entities_shortcode( $shortcode_args ) {
+	public static function wpshop_entities_shortcode($shortcode_args) {
 		global $wpshop_account, $wpdb;
 		$output = $form_content = '';
-		$quick_entity_add_button = !empty( $_POST['quick_entity_add_button'] ) ? (int) $_POST['quick_entity_add_button'] : 0;
-		if ( get_current_user_id() > 0 ) {
-			if ( !empty( $quick_entity_add_button ) ) {
+		$quick_entity_add_button = !empty($_POST['quick_entity_add_button']) ? (int)$_POST['quick_entity_add_button'] : 0;
+		if (get_current_user_id() > 0) {
+			if (!empty($quick_entity_add_button)) {
 				$attributes = array();
-				$attribute = !empty($_POST['attribute']) ? (array) $_POST['attribute'] : array();
-				foreach ( $attribute as $attribute_type => $attribute ) {
-					foreach ( $attribute as $attribute_code => $attribute_value ) {
+				$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
+				foreach ($attribute as $attribute_type => $attribute) {
+					foreach ($attribute as $attribute_code => $attribute_value) {
 						$attributes[$attribute_code] = $attribute_value;
 					}
 				}
@@ -733,23 +733,23 @@ 
 				$result = wpshop_products::addProduct($title, '', $attributes, 'complete');
 			}
 
-			if ( empty($shortcode_args['attribute_set_id']) || empty($shortcode_args['post_type']) ) {
+			if (empty($shortcode_args['attribute_set_id']) || empty($shortcode_args['post_type'])) {
 				$output = __('This form page is invalid because no set or type or content is defined. Please contact administrator with this error message', 'wpshop');
 			}
 			else {
 				$entity_identifier = wpshop_entities::get_entity_identifier_from_code($shortcode_args['post_type']);
 				$attribute_set_def = wpshop_attributes_set::getElement($shortcode_args['attribute_set_id'], "'valid'");
 
-				if ( empty($entity_identifier) || empty($attribute_set_def) || ($entity_identifier != $attribute_set_def->entity_id) ) {
+				if (empty($entity_identifier) || empty($attribute_set_def) || ($entity_identifier != $attribute_set_def->entity_id)) {
 					$output = __('This form page is invalid because type and set are not linked. Please contact administrator with this error message', 'wpshop');
 				}
 				else {
 					/** Display wordpress fields */
-					foreach ( explode(', ', $shortcode_args['fields']) as $field_name ) {
+					foreach (explode(', ', $shortcode_args['fields']) as $field_name) {
 						$label = '';
-						switch ( $field_name ) {
+						switch ($field_name) {
 							case 'post_title':
-								switch ( $shortcode_args['post_type'] ) {
+								switch ($shortcode_args['post_type']) {
 									case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 										$label = __('Product title', 'wpshop');
 										break;
@@ -761,7 +761,7 @@ 
 								$field_type = 'text';
 							break;
 							case 'post_thumbnail':
-								switch ( $shortcode_args['post_type'] ) {
+								switch ($shortcode_args['post_type']) {
 									case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 										$label = __('Product picture', 'wpshop');
 									break;
@@ -774,7 +774,7 @@ 
 							break;
 						}
 
-						if ( !empty( $label ) ) {
+						if (!empty($label)) {
 							$template_part = 'quick_entity_wp_internal_field_' . $field_type;
 							$tpl_component = array();
 							$tpl_component['WP_FIELD_NAME'] = $field_name;
@@ -807,20 +807,20 @@ 
 ORDER BY ATT_GROUP.position, ATTR_DET.position"
 						, 'yes', 'valid', wpshop_entities::get_entity_identifier_from_code($shortcode_args['post_type']), $shortcode_args['attribute_set_id']);
 					$attribute_for_creation = $wpdb->get_results($query);
-					foreach ( $attribute_for_creation as $attribute ) {
-						$attr_field = wpshop_attributes::display_attribute( $attribute->code, 'frontend'/* (is_admin() ? 'admin' : 'frontend') */ );
+					foreach ($attribute_for_creation as $attribute) {
+						$attr_field = wpshop_attributes::display_attribute($attribute->code, 'frontend'/* (is_admin() ? 'admin' : 'frontend') */);
 						$form_content .= $attr_field['field'];
 					}
 
 					/**	Check if there are extra parameters	*/
-					if ( !empty( $shortcode_args['extra_element'] ) ) {
+					if (!empty($shortcode_args['extra_element'])) {
 						$extra_element = explode(', ', $shortcode_args['extra_element']);
-						foreach ( $extra_element as $element) {
+						foreach ($extra_element as $element) {
 							$element_def = explode('!#wps#!', $element);
 							$element_type = $element_def[0];
 							$element_id = $element_def[1];
 
-							if ( $element_type == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS ) {
+							if ($element_type == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) {
 								$form_content .= '<div class="wpshop_entity_address_container">';
 // 								$form_content .= $wpshop_account->display_form_fields($element_id, null, 'not');
 								$form_content .= '</div><div class="wpshop_cls"></div>';
@@ -833,7 +833,7 @@ 
 			$template_part = 'quick_entity_add_form';
 			$tpl_component = array();
 			$tpl_component['ENTITY_TYPE'] = $shortcode_args['post_type'];
-			$tpl_component['ENTITY_ATTRIBUTE_SET_ID'] = !empty( $shortcode_args['attribute_set_id'] ) ? $shortcode_args['attribute_set_id'] : 0;
+			$tpl_component['ENTITY_ATTRIBUTE_SET_ID'] = !empty($shortcode_args['attribute_set_id']) ? $shortcode_args['attribute_set_id'] : 0;
 			$tpl_component['NEW_ENTITY_FORM_DETAILS'] = $form_content;
 			$tpl_component['ENTITY_QUICK_ADDING_FORM_NONCE'] = wp_create_nonce("wpshop_add_new_entity_ajax_nonce");
 			$tpl_component['ENTITY_QUICK_ADD_BUTTON_TEXT'] = __($shortcode_args['button_text'], 'wpshop');
@@ -843,7 +843,7 @@ 
 			$dialog_identifier = 'new_value_for_entity';
 			$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');
 			$tpl_component['DIALOG_BOX'] = ob_get_contents();
 			ob_end_clean();
 			$tpl_component['DIALOG_BOX'] .= '<input type="hidden" name="wpshop_attribute_type_select_code" value="" id="wpshop_attribute_type_select_code" />';
@@ -885,14 +885,14 @@ 
 		/** Add the new product	*/
 		$entity_id = wp_insert_post($entity_args);
 
-		do_action( 'wps_entity_more_action' , $entity_id, $attributes);
+		do_action('wps_entity_more_action', $entity_id, $attributes);
 
 		/** Update the attribute set id for the current product	*/
-		if ( !empty($extra_params['attribute_set_id']) ) {
+		if (!empty($extra_params['attribute_set_id'])) {
 			$attribute_set_id = $extra_params['attribute_set_id'];
 		}
 		else {
-			$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE status = %s AND entity_id = %d AND default_set = %s", 'valid', wpshop_entities::get_entity_identifier_from_code($entity_type) , 'yes');
+			$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE status = %s AND entity_id = %d AND default_set = %s", 'valid', wpshop_entities::get_entity_identifier_from_code($entity_type), 'yes');
 			$attribute_set_id = $wpdb->get_var($query);
 		}
 		update_post_meta($entity_id, '_' . $entity_type . '_attribute_set_id', $attribute_set_id);
@@ -910,7 +910,7 @@ 
 	 *
 	 * @return array The different response element for the request. $result: Boolean representing if creation is OK / $container: Where the result must be placed into output code / $output: The html content to output
 	 */
-	public static function create_cpt_from_csv_file( $identifier, $custom_file = '' ) {
+	public static function create_cpt_from_csv_file($identifier, $custom_file = '') {
 		global $wpdb;
 		$output = '';
 		$container = '';
@@ -930,47 +930,47 @@ 
 		$custom_post_type_identifier = $wpdb->get_var($query);
 		$container = 'wpshop_cpt_' . $identifier;
 
-		$file_uri = !empty( $custom_file ) ? $custom_file : WPSHOP_TEMPLATES_DIR . 'default_datas/' . $identifier . '.csv';
-		if ( is_file( $file_uri ) && empty($custom_post_type_identifier) ) {
+		$file_uri = !empty($custom_file) ? $custom_file : WPSHOP_TEMPLATES_DIR . 'default_datas/' . $identifier . '.csv';
+		if (is_file($file_uri) && empty($custom_post_type_identifier)) {
 			$csv_file_default_data = file($file_uri, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 
-			$db_field_definition = explode( ";", $csv_file_default_data[0] );
-			$db_datas_definition = explode( ";", $csv_file_default_data[1] );
+			$db_field_definition = explode(";", $csv_file_default_data[0]);
+			$db_datas_definition = explode(";", $csv_file_default_data[1]);
 
 			$has_error = false;
 			$errors = array();
-			foreach ( $custom_post_type_default_structure as $field_name => $field_default_value ) {
-				if ( !in_array( str_replace( 'post_', '', $field_name ) , $db_field_definition ) ) {
-					if ( $field_name == 'post_name' ) {
+			foreach ($custom_post_type_default_structure as $field_name => $field_default_value) {
+				if (!in_array(str_replace('post_', '', $field_name), $db_field_definition)) {
+					if ($field_name == 'post_name') {
 						$db_datas_definition[] = $identifier;
-						$db_field_definition[] = str_replace( 'post_', '', $field_name );
+						$db_field_definition[] = str_replace('post_', '', $field_name);
 					}
-					else if ( $field_default_value == 'mandatory' ) {
+					else if ($field_default_value == 'mandatory') {
 						$has_error = true;
 						$errors[] = $field_name;
 					}
 					else {
 						$db_datas_definition[] = $field_default_value;
-						$db_field_definition[] = str_replace( 'post_', '', $field_name );
+						$db_field_definition[] = str_replace('post_', '', $field_name);
 					}
 				}
 			}
 
-			if ( $has_error ) {
+			if ($has_error) {
 				$result = false;
-				$output = sprintf( __('You have to fill %s, they are mandatory for custom type creation', 'wpshop'), implode(',', $errors) );
+				$output = sprintf(__('You have to fill %s, they are mandatory for custom type creation', 'wpshop'), implode(',', $errors));
 			}
 			else {
 				$custom_post_type_def = array();
-				foreach ( $db_field_definition as $field_position => $field_name ) {
+				foreach ($db_field_definition as $field_position => $field_name) {
 					$custom_post_type_def['post_' . $field_name] = $db_datas_definition[$field_position];
 				}
-				$new_custom_post_type = wp_insert_post( $custom_post_type_def );
-				if ( is_int($new_custom_post_type) && !empty($new_custom_post_type) ) {
+				$new_custom_post_type = wp_insert_post($custom_post_type_def);
+				if (is_int($new_custom_post_type) && !empty($new_custom_post_type)) {
 					$result = true;
 				}
 
-				$check_cpt = wpshop_entities::check_default_custom_post_type( $identifier, array(), $result, $custom_file );
+				$check_cpt = wpshop_entities::check_default_custom_post_type($identifier, array(), $result, $custom_file);
 				$output = $check_cpt[1];
 			}
 		}
@@ -986,20 +986,20 @@ 
 	 *
 	 * @return array The different response element for the request. $has_error: A boolean result of request / $output: The complete html output for custom post type check / $tpl_componene: A mode complete list of element of templates
 	 */
-	public static function check_default_custom_post_type( $identifier, $tpl_component ) {
+	public static function check_default_custom_post_type($identifier, $tpl_component) {
 		global $wpdb;
 		$has_error = false;
 
 		/**	Check if custom post type exists	*/
 		$query = $wpdb->prepare("SELECT post_title FROM " . $wpdb->posts . " WHERE post_name = %s", $identifier);
 		$custom_post_type_title = $wpdb->get_var($query);
-		if ( !empty($custom_post_type_title) ) {
+		if (!empty($custom_post_type_title)) {
 			$tpl_component['CUSTOM_POST_TYPE_IDENTIFIER'] = '<img class="wpshop_tools_check_icon no_error" src="' . WPSHOP_MEDIAS_ICON_URL . 'informations/success_s.png" /> ' . $custom_post_type_title . ' (' . $identifier . ')';
 			$tpl_component['TOOLS_CUSTOM_POST_TYPE_CONTAINER_CLASS'] = ' no_error';
 			$tpl_component['CUSTOM_POST_TYPE_DEFAULT_ATTRIBUTES'] = '';
 			$template_part = 'wpshop_admin_tools_default_datas_check_main_element_content_no_error';
 
-			$attributes_for_cpt = wpshop_entities::check_default_cpt_attributes( $identifier, $tpl_component, $has_error );
+			$attributes_for_cpt = wpshop_entities::check_default_cpt_attributes($identifier, $tpl_component, $has_error);
 			$has_error = $attributes_for_cpt[0];
 			$tpl_component['CUSTOM_POST_TYPE_DEFAULT_ATTRIBUTES'] = $attributes_for_cpt[1];
 		}
@@ -1024,39 +1024,39 @@ 
 	 *
 	 * @return array The different response element for the request. $has_error: A boolean information for request result / $output: The complete html output for attribute check
 	 */
-	public static function check_default_cpt_attributes( $identifier, $tpl_component, $has_error, $custom_file = '' ) {
+	public static function check_default_cpt_attributes($identifier, $tpl_component, $has_error, $custom_file = '') {
 		global $wpdb, $attribute_displayed_field;
 		$output = '';
 
-		$cpt_attributes_file_uri = !empty( $custom_file ) ? $custom_file : WPSHOP_TEMPLATES_DIR . 'default_datas/' . $identifier . '-attributes.csv';
-		if ( is_file( $cpt_attributes_file_uri ) ) {
+		$cpt_attributes_file_uri = !empty($custom_file) ? $custom_file : WPSHOP_TEMPLATES_DIR . 'default_datas/' . $identifier . '-attributes.csv';
+		if (is_file($cpt_attributes_file_uri)) {
 			/**	Read lines into file defining default datas */
 			$csv_file_default_data = file($cpt_attributes_file_uri, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-			if ( !empty($csv_file_default_data) ) {
+			if (!empty($csv_file_default_data)) {
 				$header_line = explode(';', $csv_file_default_data[0]);
 				unset($csv_file_default_data[0]);
 				$code_column = null;
 				$available_columns = array();
-				foreach ( $header_line as $column_key => $column_value ) {
-					if ( $column_value == 'code' ) {
+				foreach ($header_line as $column_key => $column_value) {
+					if ($column_value == 'code') {
 						$code_column = $column_key;
 // 						$available_columns[$column_value] = $column_key;
 					}
-					else if ( in_array( $column_value, array('frontend_label')/* $attribute_displayed_field */ ) ) {
+					else if (in_array($column_value, array('frontend_label')/* $attribute_displayed_field */)) {
 						$available_columns[$column_value] = $column_key;
 					}
 				}
 
 				/**	Read the complete file content	*/
 				$attribute_ok = $attribute_not_ok = '  ';
-				foreach ( $csv_file_default_data as $line_index => $line_content ) {
+				foreach ($csv_file_default_data as $line_index => $line_content) {
 					$line_contents = explode(';', $line_content);
 					$query = $wpdb->prepare("SELECT id, frontend_label FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $line_contents[$code_column], wpshop_entities::get_entity_identifier_from_code($identifier));
-					$attribute = $wpdb->get_row( $query );
-					if ( !empty($line_contents) ) {
-						foreach ( $line_contents as $line_column => $line_column_value ) {
-							if ( in_array( $line_column, $available_columns ) ) {
-								if ( !empty($attribute) ) {
+					$attribute = $wpdb->get_row($query);
+					if (!empty($line_contents)) {
+						foreach ($line_contents as $line_column => $line_column_value) {
+							if (in_array($line_column, $available_columns)) {
+								if (!empty($attribute)) {
 									$attribute_ok .= $attribute->frontend_label . ', ';
 								}
 								else {
@@ -1067,18 +1067,18 @@ 
 						}
 					}
 				}
-				$attribute_not_ok = substr( $attribute_not_ok, 2, -2 );
-				if ( !empty($attribute_not_ok) ) {
-					$output .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element_content_attributes_error', array_merge( $tpl_component, array( 'CUSTOM_POST_TYPE_DEFAULT_ATTRIBUTES_LIST' => $attribute_not_ok )), array(), 'admin');
+				$attribute_not_ok = substr($attribute_not_ok, 2, -2);
+				if (!empty($attribute_not_ok)) {
+					$output .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element_content_attributes_error', array_merge($tpl_component, array('CUSTOM_POST_TYPE_DEFAULT_ATTRIBUTES_LIST' => $attribute_not_ok)), array(), 'admin');
 				}
-				$attribute_ok = substr( $attribute_ok, 2, -2 );
-				if ( !empty($attribute_ok) ) {
-					$output .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element_content_attributes_no_error', array_merge( $tpl_component, array( 'CUSTOM_POST_TYPE_DEFAULT_ATTRIBUTES_LIST' => $attribute_ok )), array(), 'admin');
+				$attribute_ok = substr($attribute_ok, 2, -2);
+				if (!empty($attribute_ok)) {
+					$output .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element_content_attributes_no_error', array_merge($tpl_component, array('CUSTOM_POST_TYPE_DEFAULT_ATTRIBUTES_LIST' => $attribute_ok)), array(), 'admin');
 				}
 			}
 		}
 
-		return array( $has_error, $output );
+		return array($has_error, $output);
 	}
 
 	/**
@@ -1088,60 +1088,60 @@ 
 	 *
 	 * @return array The different response element for the request. $result: Boolean representing if creation is OK / $container: Where the result must be placed into output code / $output: The html content to output
 	 */
-	public static function create_cpt_attributes_from_csv_file( $identifier, $custom_file = '' ) {
+	public static function create_cpt_attributes_from_csv_file($identifier, $custom_file = '') {
 		global $wpdb;
 
 		$output = $container = '';
 		$result = true;
 		$container = 'wpshop_cpt_' . $identifier . ' ul.wpshop_tools_default_datas_repair_attribute_container';
-		$excluded_column = array( 'available_values' );
+		$excluded_column = array('available_values');
 
-		$file_uri = !empty( $custom_file ) ? $custom_file : WPSHOP_TEMPLATES_DIR . 'default_datas/' . $identifier . '-attributes.csv';
-		if ( is_file( $file_uri ) ) {
+		$file_uri = !empty($custom_file) ? $custom_file : WPSHOP_TEMPLATES_DIR . 'default_datas/' . $identifier . '-attributes.csv';
+		if (is_file($file_uri)) {
 			$entity_id = wpshop_entities::get_entity_identifier_from_code($identifier);
 			$csv_file_default_data = file($file_uri, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 
-			$db_field_definition = explode( ";", $csv_file_default_data[0] );
+			$db_field_definition = explode(";", $csv_file_default_data[0]);
 			$code_column = null;
-			foreach ( $db_field_definition as $column_index => $column_name ) {
-				if ( $column_name == 'code' ) {
+			foreach ($db_field_definition as $column_index => $column_name) {
+				if ($column_name == 'code') {
 					$code_column = $column_index;
 					continue;
 				}
 			}
 			unset($csv_file_default_data[0]);
 
-			if ( !empty($code_column) || ($code_column == 0) ) {
-				foreach ( $csv_file_default_data as $line_index => $line_content ) {
-					$attribute_definition = explode( ";", $line_content );
-					$query = $wpdb->prepare( "SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_definition[$code_column], $entity_id);
+			if (!empty($code_column) || ($code_column == 0)) {
+				foreach ($csv_file_default_data as $line_index => $line_content) {
+					$attribute_definition = explode(";", $line_content);
+					$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_definition[$code_column], $entity_id);
 					$attribute_identifier = $wpdb->get_var($query);
 
-					if ( empty($attribute_identifier) ) {
+					if (empty($attribute_identifier)) {
 						$attribute_def = array();
 						$attribute_values = $default_value = null;
-						foreach ( $db_field_definition as $column_index => $column_name ) {
+						foreach ($db_field_definition as $column_index => $column_name) {
 							$column_name = trim($column_name);
-							if ( !empty($column_name) && !in_array($column_name, $excluded_column) ) {
+							if (!empty($column_name) && !in_array($column_name, $excluded_column)) {
 								$column_value = $attribute_definition[$column_index];
-								switch ( $column_name ) {
+								switch ($column_name) {
 									case 'frontend_label':
-										$column_value = __( $column_value, 'wpshop' );
+										$column_value = __($column_value, 'wpshop');
 										break;
 								}
-								$attribute_def[$column_name] = ( !empty($attribute_definition[$column_index]) ) ? $column_value : '';
+								$attribute_def[$column_name] = (!empty($attribute_definition[$column_index])) ? $column_value : '';
 							}
 							else {
-								switch ( $column_name ) {
+								switch ($column_name) {
 									case 'available_values':
 										$attribute_values = $attribute_definition[$column_index];
 									break;
 								}
 							}
 
-							switch ( $column_name ) {
+							switch ($column_name) {
 								case 'default_value':
-									$default_value = __( $attribute_definition[$column_index], 'wpshop' );
+									$default_value = __($attribute_definition[$column_index], 'wpshop');
 								break;
 							}
 						}
@@ -1150,14 +1150,14 @@ 
 						$last_attribute_id = $wpdb->insert_id;
 
 						/**	Create values for select element	*/
-						if ( !empty($attribute_values) ) {
-							$list_of_values_to_create = explode( ',', $attribute_values );
-							if ( !empty($list_of_values_to_create) ) {
-								foreach ( $list_of_values_to_create as $value ) {
-									$value_element = explode( '!:!:!', $value);
-									$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $last_attribute_id, 'label' => __( $value_element[0], 'wpshop' ), 'value' => __( (!empty($value_element[1]) ? $value_element[1] : strtolower($value_element[0]) ), 'wpshop' )));
-
-									if ( $default_value == (!empty($value_element[1]) ? $value_element[1] : strtolower($value_element[0])) ) {
+						if (!empty($attribute_values)) {
+							$list_of_values_to_create = explode(',', $attribute_values);
+							if (!empty($list_of_values_to_create)) {
+								foreach ($list_of_values_to_create as $value) {
+									$value_element = explode('!:!:!', $value);
+									$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $last_attribute_id, 'label' => __($value_element[0], 'wpshop'), 'value' => __((!empty($value_element[1]) ? $value_element[1] : strtolower($value_element[0])), 'wpshop')));
+
+									if ($default_value == (!empty($value_element[1]) ? $value_element[1] : strtolower($value_element[0]))) {
 										$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('last_update_date' => current_time('mysql', 0), 'default_value' => $wpdb->insert_id), array('id' => $last_attribute_id, 'default_value' => $default_value));
 									}
 								}
@@ -1169,7 +1169,7 @@ 
 			}
 		}
 
-		$check_cpt = wpshop_entities::check_default_cpt_attributes( $identifier, array(), false, $custom_file );
+		$check_cpt = wpshop_entities::check_default_cpt_attributes($identifier, array(), false, $custom_file);
 		$output = $check_cpt[1];
 
 		return array($result, $container, $output);

includes/librairies/HTML2PDF/_class/myPdf.class.php

Doc Comments +24 added lines, -7 removed lines

@@ -131,6 +131,7 @@ 
      * because it take a lot a time and a lot of memory => we use reference
      *
      * @param &HTML2PDF_myPdf object
+     * @param HTML2PDF_myPdf $pdf
      * @access public
      */
     public function cloneFontFrom(&$pdf)
@@ -523,8 +524,6 @@ 
     /**
      * add a Translate transformation
      *
-     * @param float $Tx
-     * @param float $Ty
      * @access public
      */
     public function setTranslate($xT, $yT)
@@ -545,8 +544,6 @@ 
      * add a Rotate transformation
      *
      * @param float $angle
-     * @param float $Cx
-     * @param float $Cy
      * @access public
      */
     public function setRotation($angle, $xC=null, $yC=null)
@@ -627,10 +624,18 @@ 
     {
         return $this->k;
     }
+
+    /**
+     * @return double
+     */
     public function getW()
     {
         return $this->w;
     }
+
+    /**
+     * @return double
+     */
     public function getH()
     {
         return $this->h;
@@ -639,10 +644,18 @@ 
     {
         return $this->lMargin;
     }
+
+    /**
+     * @return double
+     */
     public function getrMargin()
     {
         return $this->rMargin;
     }
+
+    /**
+     * @return double
+     */
     public function gettMargin()
     {
         return $this->tMargin;
@@ -969,7 +982,7 @@ 
      * @param float $rx
      * @param float $ry
      * @param float $angleBegin in radians
-     * @param float $angleEng in radians
+     * @param float $angleEnd in radians
      * @param boolean $direction
      * @param boolean $drawFirst, true => add the first point
      * @param boolean $trans apply transformation
@@ -1041,8 +1054,8 @@ 
      * @param float $rx
      * @param float $ry
      * @param float $angle deviation angle of the axis X
-     * @param boolean $l large-arc-flag
-     * @param boolean $s sweep-flag
+     * @param integer $l large-arc-flag
+     * @param integer $s sweep-flag
      * @param boolean $trans apply transformation
      * @access protected
      */
@@ -1142,6 +1155,8 @@ 
      * @param float &$x
      * @param float &$y
      * @param boolean $trans true => convert into PDF unit
+     * @param double $x
+     * @param double $y
      * @return boolean
      * @access public
      */
@@ -1385,6 +1400,7 @@ 
      *
      * @access public
      * @param integer $myLastPageGroup;
+     * @param integer $myLastPageGroup
      */
     public function setMyLastPageGroup($myLastPageGroup)
     {
@@ -1407,6 +1423,7 @@ 
      *
      * @access public
      * @param integer $myLastPageGroupNb;
+     * @param integer $myLastPageGroupNb
      */
     public function setMyLastPageGroupNb($myLastPageGroupNb)
     {

Indentation +1398 added lines, -1398 removed lines

@@ -14,1402 +14,1402 @@
 
 class HTML2PDF_myPdf extends TCPDF
 {
-    protected $_footerParam = array();
-    protected $_transf      = array();
-    protected $_myLastPageGroup = null;
-    protected $_myLastPageGroupNb = 0;
-
-    // used to make a radius with bezier : (4/3 * (sqrt(2) - 1))
-    const MY_ARC = 0.5522847498;
-
-    // nb of segment to build a arc with bezier curv
-    const ARC_NB_SEGMENT = 8;
-
-    /**
-     * class constructor
-     *
-     * @param string  $orientation page orientation, same as TCPDF
-     * @param string  $unit        User measure unit, same as TCPDF
-     * @param mixed   $format      The format used for pages, same as TCPDF
-     * @param boolean $unicode     TRUE means that the input text is unicode (default = true)
-     * @param String  $encoding    charset encoding; default is UTF-8
-     * @param boolean $diskcache   if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
-     * @access public
-     */
-    public function __construct(
-        $orientation='P',
-        $unit='mm',
-        $format='A4',
-        $unicode=true,
-        $encoding='UTF-8',
-        $diskcache=false)
-    {
-        // call the parent constructor
-        parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache);
-
-        // init the specific parameters used by HTML2PDF
-        $this->SetCreator(PDF_CREATOR);
-        $this->SetAutoPageBreak(false, 0);
-        $this->linestyleCap = '2 J';
-        $this->setPrintHeader(false);
-        $this->jpeg_quality = 90;
-
-        // prepare the automatic footer
-        $this->SetMyFooter();
-
-        $this->cMargin = 0;
-    }
-
-    /**
-     * Set the parameters for the automatic footer
-     *
-     * @param boolean $page display the page number
-     * @param boolean $date display the date
-     * @param boolean $hour display the hour
-     * @param boolean $form display a warning abour forms
-     * @access public
-     */
-    public function SetMyFooter($page = false, $date = false, $hour = false, $form = false)
-    {
-        $page    = ($page ? true : false);
-        $date    = ($date ? true : false);
-        $hour    = ($hour ? true : false);
-        $form    = ($form ? true : false);
-
-        $this->_footerParam = array('page' => $page, 'date' => $date, 'hour' => $hour, 'form' => $form);
-    }
-
-    /**
-     * This function is call automatically by TCPDF at the end of a page
-     * It takes no parameters
-     *
-     * @access public
-     */
-    public function Footer()
-    {
-        // prepare the text from the tranlated text
-        $txt = '';
-        if ($this->_footerParam['form']) {
-            $txt = (HTML2PDF_locale::get('pdf05'));
-        }
-        if ($this->_footerParam['date'] && $this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf03'));
-        }
-        if ($this->_footerParam['date'] && !$this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf01'));
-        }
-        if (!$this->_footerParam['date'] && $this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf02'));
-        }
-        if ($this->_footerParam['page']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf04'));
-        }
-
-        if (strlen($txt)>0) {
-            // replace some values
-            $toReplace = array(
-                '[[date_d]]'  => date('d'),
-                '[[date_m]]'  => date('m'),
-                '[[date_y]]'  => date('Y'),
-                '[[date_h]]'  => date('H'),
-                '[[date_i]]'  => date('i'),
-                '[[date_s]]'  => date('s'),
-                '[[page_cu]]' => $this->getMyNumPage(),
-                '[[page_nb]]' => $this->getMyAliasNbPages(),
-            );
-            $txt = str_replace(array_keys($toReplace), array_values($toReplace), $txt);
-
-            // draw the footer
-            parent::SetY(-11);
-            $this->SetFont('helvetica', 'I', 8);
-            $this->Cell(0, 10, $txt, 0, 0, 'R');
-        }
-    }
-
-     /**
-     * after cloning a object, we does not want to clone all the front informations
-     * because it take a lot a time and a lot of memory => we use reference
-     *
-     * @param &HTML2PDF_myPdf object
-     * @access public
-     */
-    public function cloneFontFrom(&$pdf)
-    {
-        $this->fonts            = &$pdf->getFonts();
-        $this->FontFiles        = &$pdf->getFontFiles();
-        $this->diffs            = &$pdf->getDiffs();
-        $this->fontlist         = &$pdf->getFontList();
-        $this->numfonts         = &$pdf->getNumFonts();
-        $this->fontkeys         = &$pdf->getFontKeys();
-        $this->font_obj_ids     = &$pdf->getFontObjIds();
-        $this->annotation_fonts = &$pdf->getAnnotFonts();
-    }
-
-    /**
-     * multiple public accessor for some private attributs
-     * used only by cloneFontFrom
-     *
-     * @return &array
-     * @access public
-     */
-    public function &getFonts()
-    {
-        return $this->fonts;
-    }
-    public function &getFontFiles()
-    {
-        return $this->FontFiles;
-    }
-    public function &getDiffs()
-    {
-        return $this->diffs;
-    }
-    public function &getFontList()
-    {
-        return $this->fontlist;
-    }
-    public function &getNumFonts()
-    {
-        return $this->numfonts;
-    }
-    public function &getFontKeys()
-    {
-        return $this->fontkeys;
-    }
-    public function &getFontObjIds()
-    {
-        return $this->font_obj_ids;
-    }
-    public function &getAnnotFonts()
-    {
-        return $this->annotation_fonts;
-    }
-
-    /**
-     * Verify that a Font is already loaded
-     *
-     * @param string Font Key
-     * @return boolean
-     * @access public
-     */
-    public function isLoadedFont($fontKey)
-    {
-        if (isset($this->fonts[$fontKey])) {
-            return true;
-        }
-
-        if (isset($this->CoreFonts[$fontKey])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the Word Spacing
-     *
-     * @access public
-     * @return float word spacing
-     */
-    public function getWordSpacing()
-    {
-        return $this->ws;
-    }
-
-    /**
-     * set the Word Spacing
-     *
-     * @param float word spacing
-     * @access public
-     */
-    public function setWordSpacing($ws=0.)
-    {
-        $this->ws = $ws;
-        $this->_out(sprintf('%.3F Tw', $ws*$this->k));
-    }
-
-    /**
-     * start to use a rectangular Cliping Path with radius corners
-     *
-     * @param float $x (top left corner)
-     * @param float $y (top left corner)
-     * @param float $w (x+w  = botom rigth corner)
-     * @param float $h (y+h = botom rigth corner)
-     * @param array $cornerTL radius of the Top Left corner
-     * @param array $cornerTR radius of the Top Right corner
-     * @param array $cornerBL radius of the Bottom Left corner
-     * @param array $cornerBR radius of the Bottom Right corner
-     * @access public
-     */
-    public function clippingPathStart(
-        $x = null,
-        $y = null,
-        $w = null,
-        $h = null,
-        $cornerTL=null,
-        $cornerTR=null,
-        $cornerBL=null,
-        $cornerBR=null)
-    {
-        // init the path
-        $path = '';
-
-        // if we have the position and the size of the rectangle, we can proceed
-        if ($x!==null && $y!==null && $w!==null && $h!==null) {
-            // the positions of the rectangle's corners
-            $x1 = $x*$this->k;
-            $y1 = ($this->h-$y)*$this->k;
-
-            $x2 = ($x+$w)*$this->k;
-            $y2 = ($this->h-$y)*$this->k;
-
-            $x3 = ($x+$w)*$this->k;
-            $y3 = ($this->h-$y-$h)*$this->k;
-
-            $x4 = $x*$this->k;
-            $y4 = ($this->h-$y-$h)*$this->k;
-
-            // if we have at least one radius corner, then we proceed to a specific path, else it is just a rectangle
-            if ($cornerTL || $cornerTR || $cornerBL || $cornerBR) {
-                // prepare the radius values
-                if ($cornerTL) {
-                    $cornerTL[0] = $cornerTL[0]*$this->k;
-                    $cornerTL[1] =-$cornerTL[1]*$this->k;
-                }
-                if ($cornerTR) {
-                    $cornerTR[0] = $cornerTR[0]*$this->k;
-                    $cornerTR[1] =-$cornerTR[1]*$this->k;
-                }
-                if ($cornerBL) {
-                    $cornerBL[0] = $cornerBL[0]*$this->k;
-                    $cornerBL[1] =-$cornerBL[1]*$this->k;
-                }
-                if ($cornerBR) {
-                    $cornerBR[0] = $cornerBR[0]*$this->k;
-                    $cornerBR[1] =-$cornerBR[1]*$this->k;
-                }
-
-                // if TL radius then specific start else (X1,Y1)
-                if ($cornerTL) {
-                    $path.= sprintf('%.2F %.2F m ', $x1+$cornerTL[0], $y1);
-                } else {
-                    $path.= sprintf('%.2F %.2F m ', $x1, $y1);
-                }
-
-                // if TR radius then line + arc, else line to (X2,Y2)
-                if ($cornerTR) {
-                    $xt1 = ($x2-$cornerTR[0])+$cornerTR[0]*self::MY_ARC;
-                    $yt1 = ($y2+$cornerTR[1])-$cornerTR[1];
-                    $xt2 = ($x2-$cornerTR[0])+$cornerTR[0];
-                    $yt2 = ($y2+$cornerTR[1])-$cornerTR[1]*self::MY_ARC;
-
-                    $path.= sprintf('%.2F %.2F l ', $x2-$cornerTR[0], $y2);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2+$cornerTR[1]);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x2, $y2);
-                }
-
-                // if BR radius then line + arc, else line to (X3, Y3)
-                if ($cornerBR) {
-                    $xt1 = ($x3-$cornerBR[0])+$cornerBR[0];
-                    $yt1 = ($y3-$cornerBR[1])+$cornerBR[1]*self::MY_ARC;
-                    $xt2 = ($x3-$cornerBR[0])+$cornerBR[0]*self::MY_ARC;
-                    $yt2 = ($y3-$cornerBR[1])+$cornerBR[1];
-
-                    $path.= sprintf('%.2F %.2F l ', $x3, $y3-$cornerBR[1]);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3-$cornerBR[0], $y3);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x3, $y3);
-                }
-
-                // if BL radius then line + arc, else line to (X4, Y4)
-                if ($cornerBL) {
-                    $xt1 = ($x4+$cornerBL[0])-$cornerBL[0]*self::MY_ARC;
-                    $yt1 = ($y4-$cornerBL[1])+$cornerBL[1];
-                    $xt2 = ($x4+$cornerBL[0])-$cornerBL[0];
-                    $yt2 = ($y4-$cornerBL[1])+$cornerBL[1]*self::MY_ARC;
-
-                    $path.= sprintf('%.2F %.2F l ', $x4+$cornerBL[0], $y4);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4-$cornerBL[1]);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x4, $y4);
-                }
-
-                // if RL radius then line + arc
-                if ($cornerTL) {
-                    $xt1 = ($x1+$cornerTL[0])-$cornerTL[0];
-                    $yt1 = ($y1+$cornerTL[1])-$cornerTL[1]*self::MY_ARC;
-                    $xt2 = ($x1+$cornerTL[0])-$cornerTL[0]*self::MY_ARC;
-                    $yt2 = ($y1+$cornerTL[1])-$cornerTL[1];
-
-                    $path.= sprintf('%.2F %.2F l ', $x1, $y1+$cornerTL[1]);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1+$cornerTL[0], $y1);
-                }
-            } else {
-                $path.= sprintf('%.2F %.2F m ', $x1, $y1);
-                $path.= sprintf('%.2F %.2F l ', $x2, $y2);
-                $path.= sprintf('%.2F %.2F l ', $x3, $y3);
-                $path.= sprintf('%.2F %.2F l ', $x4, $y4);
-            }
-
-            // close the path
-            $path.= ' h W n';
-        }
-
-        // using the path as a clipping path
-        $this->_out('q '.$path.' ');
-    }
-
-    /**
-     * stop to use the Cliping Path
-     *
-     * @access public
-     */
-    public function clippingPathStop()
-    {
-        $this->_out(' Q');
-    }
-
-    /**
-     * draw a filled corner of a border with a external and a internal radius
-     *         /--------+ ext2
-     *        /         |
-     *       /  /-------+ int2
-     *      /  /
-     *      | /
-     *      | |
-     *      | |
-     * ext1 +-+ int1        + cen
-     *
-     * @param float $ext1X
-     * @param float $ext1Y
-     * @param float $ext2X
-     * @param float $ext2Y
-     * @param float $int1X
-     * @param float $int1Y
-     * @param float $int2X
-     * @param float $int2Y
-     * @param float $cenX
-     * @param float $cenY
-     * @access public
-     */
-    public function drawCurve($ext1X, $ext1Y, $ext2X, $ext2Y, $int1X, $int1Y, $int2X, $int2Y, $cenX, $cenY)
-    {
-        // prepare the coordinates
-        $ext1X = $ext1X*$this->k;
-        $ext2X = $ext2X*$this->k;
-        $int1X = $int1X*$this->k;
-        $int2X = $int2X*$this->k;
-        $cenX  = $cenX*$this->k;
-
-        $ext1Y = ($this->h-$ext1Y)*$this->k;
-        $ext2Y = ($this->h-$ext2Y)*$this->k;
-        $int1Y = ($this->h-$int1Y)*$this->k;
-        $int2Y = ($this->h-$int2Y)*$this->k;
-        $cenY  = ($this->h-$cenY) *$this->k;
-
-        // init the curve
-        $path = '';
-
-        if ($ext1X-$cenX!=0) {
-            $xt1 = $cenX+($ext1X-$cenX);
-            $yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($ext2Y-$cenY);
-        } else {
-            $xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($ext1Y-$cenY);
-            $xt2 = $cenX+($ext2X-$cenX);
-            $yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
-        }
-        $path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-
-        if ($int1X-$cenX!=0) {
-            $xt1 = $cenX+($int1X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($int2Y-$cenY);
-            $xt2 = $cenX+($int1X-$cenX);
-            $yt2 = $cenY+($int2Y-$cenY)*self::MY_ARC;
-        } else {
-            $xt1 = $cenX+($int2X-$cenX);
-            $yt1 = $cenY+($int1Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($int2X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($int1Y-$cenY);
-        }
-        $path.= sprintf('%.2F %.2F l ', $int2X, $int2Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1X, $int1Y);
-
-        // draw the curve
-        $this->_out($path . 'f');
-    }
-
-    /**
-     * draw a filled corner of a border with only a external radius
-     *         /--+ ext2
-     *        /   |
-     *       /    |
-     *      /     |
-     *      |     |
-     *      |     |
-     *      |     |
-     * ext1 +-----+ int      + cen
-     *
-     * @param float $ext1X
-     * @param float $ext1Y
-     * @param float $ext2X
-     * @param float $ext2Y
-     * @param float $intX
-     * @param float $intY
-     * @param float $cenX
-     * @param float $cenY
-     * @access public
-     */
-    public function drawCorner($ext1X, $ext1Y, $ext2X, $ext2Y, $intX, $intY, $cenX, $cenY)
-    {
-        // prepare the coordinates
-        $ext1X = $ext1X*$this->k;
-        $ext2X = $ext2X*$this->k;
-        $intX  = $intX*$this->k;
-        $cenX  = $cenX*$this->k;
-
-        $ext1Y = ($this->h-$ext1Y)*$this->k;
-        $ext2Y = ($this->h-$ext2Y)*$this->k;
-        $intY  = ($this->h-$intY)*$this->k;
-        $cenY  = ($this->h-$cenY)*$this->k;
-
-        // init the curve
-        $path = '';
-
-        if ($ext1X-$cenX!=0) {
-            $xt1 = $cenX+($ext1X-$cenX);
-            $yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($ext2Y-$cenY);
-        } else {
-            $xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($ext1Y-$cenY);
-            $xt2 = $cenX+($ext2X-$cenX);
-            $yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
-        }
-        $path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-        $path.= sprintf('%.2F %.2F l ', $intX, $intY);
-        $path.= sprintf('%.2F %.2F l ', $ext1X, $ext1Y);
-
-        // draw the curve
-        $this->_out($path . 'f');
-    }
-
-    /**
-     * Start a transformation
-     *
-     * @access public
-     */
-    public function startTransform()
-    {
-        $this->_out('q');
-    }
-
-    /**
-     * Stop a transformation
-     *
-     * @access public
-     */
-    public function stopTransform()
-    {
-        $this->_out('Q');
-    }
-
-    /**
-     * add a Translate transformation
-     *
-     * @param float $Tx
-     * @param float $Ty
-     * @access public
-     */
-    public function setTranslate($xT, $yT)
-    {
-        // Matrix for Translate
-        $tm[0]=1;
-        $tm[1]=0;
-        $tm[2]=0;
-        $tm[3]=1;
-        $tm[4]=$xT*$this->k;
-        $tm[5]=-$yT*$this->k;
-
-        // apply the Transform Matric
-        $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-    }
-
-    /**
-     * add a Rotate transformation
-     *
-     * @param float $angle
-     * @param float $Cx
-     * @param float $Cy
-     * @access public
-     */
-    public function setRotation($angle, $xC=null, $yC=null)
-    {
-        // if no center, rotate around the current posiition
-        if($xC === null) $xC=$this->x;
-        if($yC === null) $yC=$this->y;
-
-        // prepare the coordinate
-        $yC=($this->h-$yC)*$this->k;
-        $xC*=$this->k;
-
-        // Matrix for Rotate
-        $tm[0]=cos(deg2rad($angle));
-        $tm[1]=sin(deg2rad($angle));
-        $tm[2]=-$tm[1];
-        $tm[3]=$tm[0];
-        $tm[4]=$xC+$tm[1]*$yC-$tm[0]*$xC;
-        $tm[5]=$yC-$tm[0]*$yC-$tm[1]*$xC;
-
-        // apply the Transform Matric
-        $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-    }
-
-    /**
-     * we redifine the original SetX method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param float   $x
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetX($x, $rtloff=false)
-    {
-        $this->x=$x;
-    }
-
-    /**
-     * we redifine the original SetY method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param float   $y
-     * @param boolean $resetx Reset the X position
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetY($y, $resetx=true, $rtloff=false)
-    {
-        if ($resetx)
-            $this->x=$this->lMargin;
-
-        $this->y=$y;
-    }
-
-    /**
-     * we redifine the original SetXY method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param integer $x
-     * @param integer $y
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetXY($x, $y, $rtloff=false)
-    {
-        $this->x=$x;
-        $this->y=$y;
-    }
-
-    /**
-     * multiple public accessor because HTML2PDF need to use TCPDF without being a extend of it
-     *
-     * @param  mixed
-     * @return mixed
-     * @access public
-     */
-    public function getK()
-    {
-        return $this->k;
-    }
-    public function getW()
-    {
-        return $this->w;
-    }
-    public function getH()
-    {
-        return $this->h;
-    }
-    public function getlMargin()
-    {
-        return $this->lMargin;
-    }
-    public function getrMargin()
-    {
-        return $this->rMargin;
-    }
-    public function gettMargin()
-    {
-        return $this->tMargin;
-    }
-    public function getbMargin()
-    {
-        return $this->bMargin;
-    }
-    public function setbMargin($v)
-    {
-        $this->bMargin=$v;
-    }
-
-    /**
-     * SVG - Convert a SVG Style in PDF Style
-     *
-     * @param  array  $styles SVG Style
-     * @return string PDF style
-     * @access public
-     */
-    public function svgSetStyle($styles)
-    {
-        // init the PDF style
-        $style = '';
-
-        // Style : fill
-        if ($styles['fill']) {
-            $this->setFillColorArray($styles['fill']);
-            $style.= 'F';
-        }
-
-        // Style : stroke
-        if ($styles['stroke'] && $styles['stroke-width']) {
-            $this->SetDrawColorArray($styles['stroke']);
-            $this->SetLineWidth($styles['stroke-width']);
-            $style.= 'D';
-        }
-
-        // Style : opacity
-        if ($styles['fill-opacity']) {
-            $this->SetAlpha($styles['fill-opacity']);
-        }
-
-        return $style;
-    }
-
-    /**
-     * SVG - make a Rectangle
-     *
-     * @param float $x
-     * @param float $y
-     * @param float $w
-     * @param float $h
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgRect($x, $y, $w, $h, $style)
-    {
-        // prepare the 4 corners
-        $x1=$x;
-        $x2=$x+$w;
-        $x3=$x+$w;
-        $x4=$x;
-
-        $y1=$y;
-        $y2=$y;
-        $y3=$y+$h;
-        $y4=$y+$h;
-
-        // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
-
-        // drawing
-        $this->_Point($x1, $y1, true);
-        $this->_Line($x2, $y2, true);
-        $this->_Line($x3, $y3, true);
-        $this->_Line($x4, $y4, true);
-        $this->_Line($x1, $y1, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Line
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @access public
-     */
-    public function svgLine($x1, $y1, $x2, $y2)
-    {
-        // get the Closing operator
-        $op='S';
-
-        // drawing
-        $this->_Point($x1, $y1, true);
-        $this->_Line($x2, $y2, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Ellipse
-     *
-     * @param float  $x0 x Center
-     * @param float  $y0 y Center
-     * @param float  $rx x radius
-     * @param float  $ry y radius
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgEllipse($x0, $y0, $rx, $ry, $style)
-    {
-        // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
-
-        // drawing
-        $this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Advanced Polygone
-     *
-     * @param array  $actions list of actions
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgPolygone($actions, $style)
-    {
-        // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
-
-        // To save the First action and the last point
-        $first = array('', 0, 0);
-        $last = array(0, 0, 0, 0);
-
-        foreach ($actions as $action) {
-            switch($action[0])
-            {
-                // Start the Path
-                case 'M':
-                case 'm':
-                    $first = $action;
-                    $x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
-                    $this->_Point($x, $y, true);
-                    break;
-
-                // Close the Path
-                case 'Z':
-                case 'z':
-                    $x = $first[1]; $y = $first[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Line (new point)
-                case 'L':
-                    $x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Line (vector from last point)
-                case 'l':
-                    $x = $last[0]+$action[1]; $y = $last[1]+$action[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Horizontal Line (new point)
-                case 'H':
-                    $x = $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Horisontal Line (vector from last point)
-                case 'h':
-                    $x = $last[0]+$action[1]; $y = $last[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Vertical Line (new point)
-                case 'V':
-                    $x = $last[0]; $y = $action[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Vertical Line (vector from last point)
-                case 'v':
-                    $x = $last[0]; $y = $last[1]+$action[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Arc (new point)
-                case 'A':
-                    $rx = $action[1];   // rx
-                    $ry = $action[2];   // ry
-                    $a = $action[3];    // deviation angle of the axis X
-                    $l = $action[4];    // large-arc-flag
-                    $s = $action[5];    // sweep-flag
-                    $x1 = $last[0];     // begin x
-                    $y1 = $last[1];     // begin y
-                    $x2 = $action[6];   // final x
-                    $y2 = $action[7];   // final y
-
-                    $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-                    $x = $x2; $y = $y2; $xc = $x; $yc = $y;
-                    break;
-
-                // Make a Arc (vector from last point)
-                case 'a':
-                    $rx = $action[1];   // rx
-                    $ry = $action[2];   // ry
-                    $a = $action[3];    // deviation angle of the axis X
-                    $l = $action[4];    // large-arc-flag
-                    $s = $action[5];    // sweep-flag
-                    $x1 = $last[0];     // begin x
-                    $y1 = $last[1];     // begin y
-                    $x2 = $last[0]+$action[6]; // final x
-                    $y2 = $last[1]+$action[7]; // final y
-
-                    $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-                    $x = $x2; $y = $y2; $xc = $x; $yc = $y;
-                    break;
-
-                // Make a Bezier Curve (new point)
-                case 'C':
-                    $x1 = $action[1];
-                    $y1 = $action[2];
-                    $x2 = $action[3];
-                    $y2 = $action[4];
-                    $xf = $action[5];
-                    $yf = $action[6];
-                    $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
-                    $x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
-                    break;
-
-                // Make a Bezier Curve (vector from last point)
-                case 'c':
-                    $x1 = $last[0]+$action[1];
-                    $y1 = $last[1]+$action[2];
-                    $x2 = $last[0]+$action[3];
-                    $y2 = $last[1]+$action[4];
-                    $xf = $last[0]+$action[5];
-                    $yf = $last[1]+$action[6];
-                    $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
-                    $x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
-                    break;
-
-                // Unknown Path
-                default:
-                    throw new HTML2PDF_exception(0, 'SVG Path Error : ['.$action[0].'] unkown');
-            }
-
-            // save the last point
-            $last = array($x, $y, $xc, $yc);
-        }
-
-        // finish the path
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - go to a point
-     *
-     * @param float   $x
-     * @param float   $y
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Point($x, $y, $trans = false)
-    {
-        if ($trans) $this->ptTransform($x, $y);
-
-        $this->_out(sprintf('%.2F %.2F m', $x, $y));
-    }
-
-    /**
-     * SVG - make a line from the last point to (x,y)
-     *
-     * @param float   $x
-     * @param float   $y
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Line($x, $y, $trans = false)
-    {
-        if ($trans) $this->ptTransform($x, $y);
-
-        $this->_out(sprintf('%.2F %.2F l', $x, $y));
-    }
-
-    /**
-     * SVG - make a bezier curve from the last point to (xf,yf), with the 2 direction points (x1,y1) and (x2,y2)
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $xf
-     * @param float $yf
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Curve($x1, $y1, $x2, $y2, $xf, $yf, $trans = false)
-    {
-        if ($trans) {
-            $this->ptTransform($x1, $y1);
-            $this->ptTransform($x2, $y2);
-            $this->ptTransform($xf, $yf);
-        }
-        $this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1, $y1, $x2, $y2, $xf, $yf));
-    }
-
-    /**
-     * SVG - make a arc with Center, Radius, from angleBegin to angleEnd
-     *
-     * @param float $xc
-     * @param float $yc
-     * @param float $rx
-     * @param float $ry
-     * @param float $angleBegin in radians
-     * @param float $angleEng in radians
-     * @param boolean $direction
-     * @param boolean $drawFirst, true => add the first point
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Arc(
-        $xc,
-        $yc,
-        $rx,
-        $ry,
-        $angleBegin,
-        $angleEnd,
-        $direction = true,
-        $drawFirst = true,
-        $trans=false)
-    {
-        // if we want the no trigo direction : add 2PI to the begin angle, to invert the direction
-        if (!$direction) $angleBegin+= M_PI*2.;
-
-        // cut in segment to convert in berize curv
-        $dt = ($angleEnd - $angleBegin)/self::ARC_NB_SEGMENT;
-        $dtm = $dt/3;
-
-        // center of the arc
-        $x0 = $xc; $y0 = $yc;
-
-        // calculing the first point
-        $t1 = $angleBegin;
-        $a0 = $x0 + ($rx * cos($t1));
-        $b0 = $y0 + ($ry * sin($t1));
-        $c0 = -$rx * sin($t1);
-        $d0 = $ry * cos($t1);
-
-        // if drawFirst => draw the first point
-        if ($drawFirst) $this->_Point($a0, $b0, $trans);
-
-        // foreach segment
-        for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
-            // calculing the next point
-            $t1 = ($i * $dt)+$angleBegin;
-            $a1 = $x0 + ($rx * cos($t1));
-            $b1 = $y0 + ($ry * sin($t1));
-            $c1 = -$rx * sin($t1);
-            $d1 = $ry * cos($t1);
-
-            // make the bezier curv
-            $this->_Curve(
-                $a0 + ($c0 * $dtm), $b0 + ($d0 * $dtm),
-                $a1 - ($c1 * $dtm), $b1 - ($d1 * $dtm),
-                $a1, $b1,
-                $trans
-            );
-
-            // save the point
-            $a0 = $a1;
-            $b0 = $b1;
-            $c0 = $c1;
-            $d0 = $d1;
-        }
-    }
-
-    /**
-     * SVG - make a arc from Pt1 to Pt2, with Radius
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $rx
-     * @param float $ry
-     * @param float $angle deviation angle of the axis X
-     * @param boolean $l large-arc-flag
-     * @param boolean $s sweep-flag
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $angle=0., $l=0, $s=0, $trans = false)
-    {
-        // array to stock the parameters
-        $v = array();
-
-        // the original values
-        $v['x1'] = $x1;
-        $v['y1'] = $y1;
-        $v['x2'] = $x2;
-        $v['y2'] = $y2;
-        $v['rx'] = $rx;
-        $v['ry'] = $ry;
-
-        // rotate with the deviation angle of the axis X
-        $v['xr1'] = $v['x1']*cos($angle) - $v['y1']*sin($angle);
-        $v['yr1'] = $v['x1']*sin($angle) + $v['y1']*cos($angle);
-        $v['xr2'] = $v['x2']*cos($angle) - $v['y2']*sin($angle);
-        $v['yr2'] = $v['x2']*sin($angle) + $v['y2']*cos($angle);
-
-        // the normalized vector
-        $v['Xr1'] = $v['xr1']/$v['rx'];
-        $v['Yr1'] = $v['yr1']/$v['ry'];
-        $v['Xr2'] = $v['xr2']/$v['rx'];
-        $v['Yr2'] = $v['yr2']/$v['ry'];
-        $v['dXr'] = $v['Xr2']-$v['Xr1'];
-        $v['dYr'] = $v['Yr2']-$v['Yr1'];
-        $v['D'] = $v['dXr']*$v['dXr'] + $v['dYr']*$v['dYr'];
-
-        // if |vector| is Null, or if |vector| > 2 : impossible to make a arc => Line
-        if ($v['D']==0 || $v['D']>4) {
-            $this->_Line($x2, $y2, $trans);
-            return false;
-        }
-
-        // convert paramters for make a arc with Center, Radius, from angleBegin to angleEnd
-        $v['s1'] = array();
-        $v['s1']['t'] = sqrt((4.-$v['D'])/$v['D']);
-        $v['s1']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s1']['t']*($v['Yr2']-$v['Yr1'])/2.;
-        $v['s1']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s1']['t']*($v['Xr1']-$v['Xr2'])/2.;
-        $v['s1']['xr'] = $v['s1']['Xr']*$v['rx'];
-        $v['s1']['yr'] = $v['s1']['Yr']*$v['ry'];
-        $v['s1']['x'] = $v['s1']['xr']*cos($angle)+$v['s1']['yr']*sin($angle);
-        $v['s1']['y'] =-$v['s1']['xr']*sin($angle)+$v['s1']['yr']*cos($angle);
-        $v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']);
-        $v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']);
-        if ($v['s1']['a1']>$v['s1']['a2']) $v['s1']['a1']-=2*M_PI;
-
-        $v['s2'] = array();
-        $v['s2']['t'] = -$v['s1']['t'];
-        $v['s2']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s2']['t']*($v['Yr2']-$v['Yr1'])/2.;
-        $v['s2']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s2']['t']*($v['Xr1']-$v['Xr2'])/2.;
-        $v['s2']['xr'] = $v['s2']['Xr']*$v['rx'];
-        $v['s2']['yr'] = $v['s2']['Yr']*$v['ry'];
-        $v['s2']['x'] = $v['s2']['xr']*cos($angle)+$v['s2']['yr']*sin($angle);
-        $v['s2']['y'] =-$v['s2']['xr']*sin($angle)+$v['s2']['yr']*cos($angle);
-        $v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']);
-        $v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']);
-        if ($v['s2']['a1']>$v['s2']['a2']) $v['s2']['a1']-=2*M_PI;
-
-        if (!$l) {
-            if ($s) {
-                $xc = $v['s2']['x'];
-                $yc = $v['s2']['y'];
-                $a1 = $v['s2']['a1'];
-                $a2 = $v['s2']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-            } else {
-                $xc = $v['s1']['x'];
-                $yc = $v['s1']['y'];
-                $a1 = $v['s1']['a1'];
-                $a2 = $v['s1']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-            }
-        } else {
-            if ($s) {
-                $xc = $v['s1']['x'];
-                $yc = $v['s1']['y'];
-                $a1 = $v['s1']['a1'];
-                $a2 = $v['s1']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-            } else {
-                $xc = $v['s2']['x'];
-                $yc = $v['s2']['y'];
-                $a1 = $v['s2']['a1'];
-                $a2 = $v['s2']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-            }
-        }
-    }
-
-    /**
-     * SVG - transform the point (reference)
-     *
-     * @param float &$x
-     * @param float &$y
-     * @param boolean $trans true => convert into PDF unit
-     * @return boolean
-     * @access public
-     */
-    public function ptTransform(&$x,  &$y, $trans=true)
-    {
-        // load the last Transfomation Matrix
-        $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
-
-        // apply the Transformation Matrix
-        list($x,$y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
-
-        // if true => convert into PDF unit
-        if ($trans) {
-            $x = $x*$this->k;
-            $y = ($this->h-$y)*$this->k;
-        }
-
-        return true;
-    }
-
-    /**
-     * SVG - add a transformation Matric
-     *
-     * @param array $n matrix
-     * @access public
-     */
-    public function doTransform($n = null)
-    {
-        // get the last Transformation Matrix
-        $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
-
-        // if no transform, get the Identity Matrix
-        if (!$n) $n = array(1,0,0,1,0,0);
-
-        // create the new Transformation Matrix
-        $this->_transf[] = array(
-            $m[0]*$n[0]+$m[2]*$n[1],
-            $m[1]*$n[0]+$m[3]*$n[1],
-            $m[0]*$n[2]+$m[2]*$n[3],
-            $m[1]*$n[2]+$m[3]*$n[3],
-            $m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-            $m[1]*$n[4]+$m[3]*$n[5]+$m[5]
-        );
-    }
-
-    /**
-     * SVG - remove a transformation Matric
-     *
-     * @access public
-     */
-    public function undoTransform()
-    {
-        array_pop($this->_transf);
-    }
-
-    /**
-     * Convert a HTML2PDF barcode in a TCPDF barcode
-     *
-     * @param string $code code to print
-     * @param string $type type of barcode (see tcpdf/barcodes.php for supported formats)
-     * @param int $x x position in user units
-     * @param int $y y position in user units
-     * @param int $w width in user units
-     * @param int $h height in user units
-     * @param int $labelFontsize of the Test Label. If false : no Label
-     * @param array $color color of the foreground
-     * @access public
-     */
-    public function myBarcode($code, $type, $x, $y, $w, $h, $labelFontsize, $color)
-    {
-        // the style of the barcode
-        $style = array(
-            'position' => 'S',
-            'text' => ($labelFontsize ? true : false),
-            'fgcolor' => $color,
-            'bgcolor' => false,
-        );
-
-        // build the barcode
-        $this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
-
-        // it Label => add the FontSize to the height
-        if ($labelFontsize) $h+= ($labelFontsize);
-
-        // return the size of the barcode
-        return array($w, $h);
-    }
-
-    /**
-     * create a automatic Index on a page
-     *
-     * @param html2pdf $obj           parent object
-     * @param string   $titre         Title of the Index Page
-     * @param integer  $sizeTitle     Font size for hthe Title
-     * @param integer  $sizeBookmark  Font size for the bookmarks
-     * @param boolean  $bookmarkTitle Bookmark the Title
-     * @param boolean  $displayPage   Display the page number for each bookmark
-     * @param integer  $page draw the automatic Index on a specific Page. if null => add a page at the end
-     * @param string   $fontName      FontName to use
-     * @access public
-     */
-    public function createIndex(
-        &$obj,
-        $titre = 'Index',
-        $sizeTitle = 20,
-        $sizeBookmark = 15,
-        $bookmarkTitle = true,
-        $displayPage = true,
-        $page = null,
-        $fontName = 'helvetica')
-    {
-        // bookmark the Title if wanted
-        if ($bookmarkTitle) $this->Bookmark($titre, 0, -1);
-
-        // display the Title with the good Font size
-        $this->SetFont($fontName, '', $sizeTitle);
-        $this->Cell(0, 5, $titre, 0, 1, 'C');
-
-        // set the good Font size for the bookmarks
-        $this->SetFont($fontName, '', $sizeBookmark);
-        $this->Ln(10);
-
-        // get the number of bookmarks
-        $size=sizeof($this->outlines);
-
-        // get the size of the "P. xx" cell
-        $pageCellSize=$this->GetStringWidth('p. '.$this->outlines[$size-1]['p'])+2;
-
-        // Foreach bookmark
-        for ($i=0;$i<$size;$i++) {
-            // if we need a new page => add a new page
-            if ($this->getY()+$this->FontSize>=($this->h - $this->bMargin)) {
-                $obj->_INDEX_NewPage($page);
-                $this->SetFont($fontName, '', $sizeBookmark);
-            }
-
-            // Offset of the current level
-            $level=$this->outlines[$i]['l'];
-            if($level>0) $this->Cell($level*8);
-
-            // Caption (cut to fit on the width page)
-            $str=$this->outlines[$i]['t'];
-            $strsize=$this->GetStringWidth($str);
-            $availableSize=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-4;
-            while ($strsize>=$availableSize) {
-                $str=substr($str, 0, -1);
-                $strsize=$this->GetStringWidth($str);
-            }
-
-            // if we want to display the page nmber
-            if ($displayPage) {
-                // display the Bookmark Caption
-                $this->Cell($strsize+2, $this->FontSize+2, $str);
-
-                //Filling dots
-                $w=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-($strsize+2);
-                $nb=$w/$this->GetStringWidth('.');
-                $dots=str_repeat('.', $nb);
-                $this->Cell($w, $this->FontSize+2, $dots, 0, 0, 'R');
-
-                //Page number
-                $this->Cell($pageCellSize, $this->FontSize+2, 'p. '.$this->outlines[$i]['p'], 0, 1, 'R');
-            } else {
-                // display the Bookmark Caption
-                $this->Cell($strsize+2, $this->FontSize+2, $str, 0, 1);
-            }
-        }
-    }
-
-    /**
-     * Returns the string alias used for the total number of pages.
-     *
-     * @access public
-     * @return string;
-     * @see TCPDF::getAliasNbPages(), TCPDF::getPageGroupAlias()
-     */
-    public function getMyAliasNbPages()
-    {
-        if ($this->_myLastPageGroupNb==0) {
-            return $this->getAliasNbPages();
-        } else {
-            $old = $this->currpagegroup;
-            $this->currpagegroup = '{nb'.$this->_myLastPageGroupNb.'}';
-            $new = $this->getPageGroupAlias();
-            $this->currpagegroup = $old;
-
-            return $new;
-        }
-    }
-
-    /**
-     * Returns the current page number.
-     *
-     * @access public
-     * @param  integer $page
-     * @return integer;
-     */
-    public function getMyNumPage($page=null)
-    {
-        if ($page===null) {
-            $page = $this->page;
-        }
-
-        if ($this->_myLastPageGroupNb==0) {
-            return $page;
-        } else {
-            return $page-$this->_myLastPageGroup;
-        }
-    }
-
-    /**
-     * Start a new group of pages
-     *
-     * @access public
-     * @return integer;
-     * @see tcpdf::startPageGroup
-     */
-    public function myStartPageGroup()
-    {
-        $this->_myLastPageGroup = $this->page-1;
-        $this->_myLastPageGroupNb++;
-    }
-
-    /**
-     * get $_myLastPageGroup;
-     *
-     * @access public
-     * @return integer $_myLastPageGroup;
-     */
-    public function getMyLastPageGroup()
-    {
-        return $this->_myLastPageGroup;
-    }
-
-    /**
-     * set $_myLastPageGroup;
-     *
-     * @access public
-     * @param integer $myLastPageGroup;
-     */
-    public function setMyLastPageGroup($myLastPageGroup)
-    {
-        $this->_myLastPageGroup = $myLastPageGroup;
-    }
-
-    /**
-     * get $_myLastPageGroupNb;
-     *
-     * @access public
-     * @return integer $_myLastPageGroupNb;
-     */
-    public function getMyLastPageGroupNb()
-    {
-        return $this->_myLastPageGroupNb;
-    }
-
-    /**
-     * set $_myLastPageGroupNb;
-     *
-     * @access public
-     * @param integer $myLastPageGroupNb;
-     */
-    public function setMyLastPageGroupNb($myLastPageGroupNb)
-    {
-        $this->_myLastPageGroupNb = $myLastPageGroupNb;
-    }
+	protected $_footerParam = array();
+	protected $_transf      = array();
+	protected $_myLastPageGroup = null;
+	protected $_myLastPageGroupNb = 0;
+
+	// used to make a radius with bezier : (4/3 * (sqrt(2) - 1))
+	const MY_ARC = 0.5522847498;
+
+	// nb of segment to build a arc with bezier curv
+	const ARC_NB_SEGMENT = 8;
+
+	/**
+	 * class constructor
+	 *
+	 * @param string  $orientation page orientation, same as TCPDF
+	 * @param string  $unit        User measure unit, same as TCPDF
+	 * @param mixed   $format      The format used for pages, same as TCPDF
+	 * @param boolean $unicode     TRUE means that the input text is unicode (default = true)
+	 * @param String  $encoding    charset encoding; default is UTF-8
+	 * @param boolean $diskcache   if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
+	 * @access public
+	 */
+	public function __construct(
+		$orientation='P',
+		$unit='mm',
+		$format='A4',
+		$unicode=true,
+		$encoding='UTF-8',
+		$diskcache=false)
+	{
+		// call the parent constructor
+		parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache);
+
+		// init the specific parameters used by HTML2PDF
+		$this->SetCreator(PDF_CREATOR);
+		$this->SetAutoPageBreak(false, 0);
+		$this->linestyleCap = '2 J';
+		$this->setPrintHeader(false);
+		$this->jpeg_quality = 90;
+
+		// prepare the automatic footer
+		$this->SetMyFooter();
+
+		$this->cMargin = 0;
+	}
+
+	/**
+	 * Set the parameters for the automatic footer
+	 *
+	 * @param boolean $page display the page number
+	 * @param boolean $date display the date
+	 * @param boolean $hour display the hour
+	 * @param boolean $form display a warning abour forms
+	 * @access public
+	 */
+	public function SetMyFooter($page = false, $date = false, $hour = false, $form = false)
+	{
+		$page    = ($page ? true : false);
+		$date    = ($date ? true : false);
+		$hour    = ($hour ? true : false);
+		$form    = ($form ? true : false);
+
+		$this->_footerParam = array('page' => $page, 'date' => $date, 'hour' => $hour, 'form' => $form);
+	}
+
+	/**
+	 * This function is call automatically by TCPDF at the end of a page
+	 * It takes no parameters
+	 *
+	 * @access public
+	 */
+	public function Footer()
+	{
+		// prepare the text from the tranlated text
+		$txt = '';
+		if ($this->_footerParam['form']) {
+			$txt = (HTML2PDF_locale::get('pdf05'));
+		}
+		if ($this->_footerParam['date'] && $this->_footerParam['hour']) {
+			$txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf03'));
+		}
+		if ($this->_footerParam['date'] && !$this->_footerParam['hour']) {
+			$txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf01'));
+		}
+		if (!$this->_footerParam['date'] && $this->_footerParam['hour']) {
+			$txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf02'));
+		}
+		if ($this->_footerParam['page']) {
+			$txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf04'));
+		}
+
+		if (strlen($txt)>0) {
+			// replace some values
+			$toReplace = array(
+				'[[date_d]]'  => date('d'),
+				'[[date_m]]'  => date('m'),
+				'[[date_y]]'  => date('Y'),
+				'[[date_h]]'  => date('H'),
+				'[[date_i]]'  => date('i'),
+				'[[date_s]]'  => date('s'),
+				'[[page_cu]]' => $this->getMyNumPage(),
+				'[[page_nb]]' => $this->getMyAliasNbPages(),
+			);
+			$txt = str_replace(array_keys($toReplace), array_values($toReplace), $txt);
+
+			// draw the footer
+			parent::SetY(-11);
+			$this->SetFont('helvetica', 'I', 8);
+			$this->Cell(0, 10, $txt, 0, 0, 'R');
+		}
+	}
+
+	 /**
+	  * after cloning a object, we does not want to clone all the front informations
+	  * because it take a lot a time and a lot of memory => we use reference
+	  *
+	  * @param &HTML2PDF_myPdf object
+	  * @access public
+	  */
+	public function cloneFontFrom(&$pdf)
+	{
+		$this->fonts            = &$pdf->getFonts();
+		$this->FontFiles        = &$pdf->getFontFiles();
+		$this->diffs            = &$pdf->getDiffs();
+		$this->fontlist         = &$pdf->getFontList();
+		$this->numfonts         = &$pdf->getNumFonts();
+		$this->fontkeys         = &$pdf->getFontKeys();
+		$this->font_obj_ids     = &$pdf->getFontObjIds();
+		$this->annotation_fonts = &$pdf->getAnnotFonts();
+	}
+
+	/**
+	 * multiple public accessor for some private attributs
+	 * used only by cloneFontFrom
+	 *
+	 * @return &array
+	 * @access public
+	 */
+	public function &getFonts()
+	{
+		return $this->fonts;
+	}
+	public function &getFontFiles()
+	{
+		return $this->FontFiles;
+	}
+	public function &getDiffs()
+	{
+		return $this->diffs;
+	}
+	public function &getFontList()
+	{
+		return $this->fontlist;
+	}
+	public function &getNumFonts()
+	{
+		return $this->numfonts;
+	}
+	public function &getFontKeys()
+	{
+		return $this->fontkeys;
+	}
+	public function &getFontObjIds()
+	{
+		return $this->font_obj_ids;
+	}
+	public function &getAnnotFonts()
+	{
+		return $this->annotation_fonts;
+	}
+
+	/**
+	 * Verify that a Font is already loaded
+	 *
+	 * @param string Font Key
+	 * @return boolean
+	 * @access public
+	 */
+	public function isLoadedFont($fontKey)
+	{
+		if (isset($this->fonts[$fontKey])) {
+			return true;
+		}
+
+		if (isset($this->CoreFonts[$fontKey])) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the Word Spacing
+	 *
+	 * @access public
+	 * @return float word spacing
+	 */
+	public function getWordSpacing()
+	{
+		return $this->ws;
+	}
+
+	/**
+	 * set the Word Spacing
+	 *
+	 * @param float word spacing
+	 * @access public
+	 */
+	public function setWordSpacing($ws=0.)
+	{
+		$this->ws = $ws;
+		$this->_out(sprintf('%.3F Tw', $ws*$this->k));
+	}
+
+	/**
+	 * start to use a rectangular Cliping Path with radius corners
+	 *
+	 * @param float $x (top left corner)
+	 * @param float $y (top left corner)
+	 * @param float $w (x+w  = botom rigth corner)
+	 * @param float $h (y+h = botom rigth corner)
+	 * @param array $cornerTL radius of the Top Left corner
+	 * @param array $cornerTR radius of the Top Right corner
+	 * @param array $cornerBL radius of the Bottom Left corner
+	 * @param array $cornerBR radius of the Bottom Right corner
+	 * @access public
+	 */
+	public function clippingPathStart(
+		$x = null,
+		$y = null,
+		$w = null,
+		$h = null,
+		$cornerTL=null,
+		$cornerTR=null,
+		$cornerBL=null,
+		$cornerBR=null)
+	{
+		// init the path
+		$path = '';
+
+		// if we have the position and the size of the rectangle, we can proceed
+		if ($x!==null && $y!==null && $w!==null && $h!==null) {
+			// the positions of the rectangle's corners
+			$x1 = $x*$this->k;
+			$y1 = ($this->h-$y)*$this->k;
+
+			$x2 = ($x+$w)*$this->k;
+			$y2 = ($this->h-$y)*$this->k;
+
+			$x3 = ($x+$w)*$this->k;
+			$y3 = ($this->h-$y-$h)*$this->k;
+
+			$x4 = $x*$this->k;
+			$y4 = ($this->h-$y-$h)*$this->k;
+
+			// if we have at least one radius corner, then we proceed to a specific path, else it is just a rectangle
+			if ($cornerTL || $cornerTR || $cornerBL || $cornerBR) {
+				// prepare the radius values
+				if ($cornerTL) {
+					$cornerTL[0] = $cornerTL[0]*$this->k;
+					$cornerTL[1] =-$cornerTL[1]*$this->k;
+				}
+				if ($cornerTR) {
+					$cornerTR[0] = $cornerTR[0]*$this->k;
+					$cornerTR[1] =-$cornerTR[1]*$this->k;
+				}
+				if ($cornerBL) {
+					$cornerBL[0] = $cornerBL[0]*$this->k;
+					$cornerBL[1] =-$cornerBL[1]*$this->k;
+				}
+				if ($cornerBR) {
+					$cornerBR[0] = $cornerBR[0]*$this->k;
+					$cornerBR[1] =-$cornerBR[1]*$this->k;
+				}
+
+				// if TL radius then specific start else (X1,Y1)
+				if ($cornerTL) {
+					$path.= sprintf('%.2F %.2F m ', $x1+$cornerTL[0], $y1);
+				} else {
+					$path.= sprintf('%.2F %.2F m ', $x1, $y1);
+				}
+
+				// if TR radius then line + arc, else line to (X2,Y2)
+				if ($cornerTR) {
+					$xt1 = ($x2-$cornerTR[0])+$cornerTR[0]*self::MY_ARC;
+					$yt1 = ($y2+$cornerTR[1])-$cornerTR[1];
+					$xt2 = ($x2-$cornerTR[0])+$cornerTR[0];
+					$yt2 = ($y2+$cornerTR[1])-$cornerTR[1]*self::MY_ARC;
+
+					$path.= sprintf('%.2F %.2F l ', $x2-$cornerTR[0], $y2);
+					$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2+$cornerTR[1]);
+				} else {
+					$path.= sprintf('%.2F %.2F l ', $x2, $y2);
+				}
+
+				// if BR radius then line + arc, else line to (X3, Y3)
+				if ($cornerBR) {
+					$xt1 = ($x3-$cornerBR[0])+$cornerBR[0];
+					$yt1 = ($y3-$cornerBR[1])+$cornerBR[1]*self::MY_ARC;
+					$xt2 = ($x3-$cornerBR[0])+$cornerBR[0]*self::MY_ARC;
+					$yt2 = ($y3-$cornerBR[1])+$cornerBR[1];
+
+					$path.= sprintf('%.2F %.2F l ', $x3, $y3-$cornerBR[1]);
+					$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3-$cornerBR[0], $y3);
+				} else {
+					$path.= sprintf('%.2F %.2F l ', $x3, $y3);
+				}
+
+				// if BL radius then line + arc, else line to (X4, Y4)
+				if ($cornerBL) {
+					$xt1 = ($x4+$cornerBL[0])-$cornerBL[0]*self::MY_ARC;
+					$yt1 = ($y4-$cornerBL[1])+$cornerBL[1];
+					$xt2 = ($x4+$cornerBL[0])-$cornerBL[0];
+					$yt2 = ($y4-$cornerBL[1])+$cornerBL[1]*self::MY_ARC;
+
+					$path.= sprintf('%.2F %.2F l ', $x4+$cornerBL[0], $y4);
+					$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4-$cornerBL[1]);
+				} else {
+					$path.= sprintf('%.2F %.2F l ', $x4, $y4);
+				}
+
+				// if RL radius then line + arc
+				if ($cornerTL) {
+					$xt1 = ($x1+$cornerTL[0])-$cornerTL[0];
+					$yt1 = ($y1+$cornerTL[1])-$cornerTL[1]*self::MY_ARC;
+					$xt2 = ($x1+$cornerTL[0])-$cornerTL[0]*self::MY_ARC;
+					$yt2 = ($y1+$cornerTL[1])-$cornerTL[1];
+
+					$path.= sprintf('%.2F %.2F l ', $x1, $y1+$cornerTL[1]);
+					$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1+$cornerTL[0], $y1);
+				}
+			} else {
+				$path.= sprintf('%.2F %.2F m ', $x1, $y1);
+				$path.= sprintf('%.2F %.2F l ', $x2, $y2);
+				$path.= sprintf('%.2F %.2F l ', $x3, $y3);
+				$path.= sprintf('%.2F %.2F l ', $x4, $y4);
+			}
+
+			// close the path
+			$path.= ' h W n';
+		}
+
+		// using the path as a clipping path
+		$this->_out('q '.$path.' ');
+	}
+
+	/**
+	 * stop to use the Cliping Path
+	 *
+	 * @access public
+	 */
+	public function clippingPathStop()
+	{
+		$this->_out(' Q');
+	}
+
+	/**
+	 * draw a filled corner of a border with a external and a internal radius
+	 *         /--------+ ext2
+	 *        /         |
+	 *       /  /-------+ int2
+	 *      /  /
+	 *      | /
+	 *      | |
+	 *      | |
+	 * ext1 +-+ int1        + cen
+	 *
+	 * @param float $ext1X
+	 * @param float $ext1Y
+	 * @param float $ext2X
+	 * @param float $ext2Y
+	 * @param float $int1X
+	 * @param float $int1Y
+	 * @param float $int2X
+	 * @param float $int2Y
+	 * @param float $cenX
+	 * @param float $cenY
+	 * @access public
+	 */
+	public function drawCurve($ext1X, $ext1Y, $ext2X, $ext2Y, $int1X, $int1Y, $int2X, $int2Y, $cenX, $cenY)
+	{
+		// prepare the coordinates
+		$ext1X = $ext1X*$this->k;
+		$ext2X = $ext2X*$this->k;
+		$int1X = $int1X*$this->k;
+		$int2X = $int2X*$this->k;
+		$cenX  = $cenX*$this->k;
+
+		$ext1Y = ($this->h-$ext1Y)*$this->k;
+		$ext2Y = ($this->h-$ext2Y)*$this->k;
+		$int1Y = ($this->h-$int1Y)*$this->k;
+		$int2Y = ($this->h-$int2Y)*$this->k;
+		$cenY  = ($this->h-$cenY) *$this->k;
+
+		// init the curve
+		$path = '';
+
+		if ($ext1X-$cenX!=0) {
+			$xt1 = $cenX+($ext1X-$cenX);
+			$yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
+			$xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
+			$yt2 = $cenY+($ext2Y-$cenY);
+		} else {
+			$xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
+			$yt1 = $cenY+($ext1Y-$cenY);
+			$xt2 = $cenX+($ext2X-$cenX);
+			$yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
+		}
+		$path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
+		$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
+
+		if ($int1X-$cenX!=0) {
+			$xt1 = $cenX+($int1X-$cenX)*self::MY_ARC;
+			$yt1 = $cenY+($int2Y-$cenY);
+			$xt2 = $cenX+($int1X-$cenX);
+			$yt2 = $cenY+($int2Y-$cenY)*self::MY_ARC;
+		} else {
+			$xt1 = $cenX+($int2X-$cenX);
+			$yt1 = $cenY+($int1Y-$cenY)*self::MY_ARC;
+			$xt2 = $cenX+($int2X-$cenX)*self::MY_ARC;
+			$yt2 = $cenY+($int1Y-$cenY);
+		}
+		$path.= sprintf('%.2F %.2F l ', $int2X, $int2Y);
+		$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1X, $int1Y);
+
+		// draw the curve
+		$this->_out($path . 'f');
+	}
+
+	/**
+	 * draw a filled corner of a border with only a external radius
+	 *         /--+ ext2
+	 *        /   |
+	 *       /    |
+	 *      /     |
+	 *      |     |
+	 *      |     |
+	 *      |     |
+	 * ext1 +-----+ int      + cen
+	 *
+	 * @param float $ext1X
+	 * @param float $ext1Y
+	 * @param float $ext2X
+	 * @param float $ext2Y
+	 * @param float $intX
+	 * @param float $intY
+	 * @param float $cenX
+	 * @param float $cenY
+	 * @access public
+	 */
+	public function drawCorner($ext1X, $ext1Y, $ext2X, $ext2Y, $intX, $intY, $cenX, $cenY)
+	{
+		// prepare the coordinates
+		$ext1X = $ext1X*$this->k;
+		$ext2X = $ext2X*$this->k;
+		$intX  = $intX*$this->k;
+		$cenX  = $cenX*$this->k;
+
+		$ext1Y = ($this->h-$ext1Y)*$this->k;
+		$ext2Y = ($this->h-$ext2Y)*$this->k;
+		$intY  = ($this->h-$intY)*$this->k;
+		$cenY  = ($this->h-$cenY)*$this->k;
+
+		// init the curve
+		$path = '';
+
+		if ($ext1X-$cenX!=0) {
+			$xt1 = $cenX+($ext1X-$cenX);
+			$yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
+			$xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
+			$yt2 = $cenY+($ext2Y-$cenY);
+		} else {
+			$xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
+			$yt1 = $cenY+($ext1Y-$cenY);
+			$xt2 = $cenX+($ext2X-$cenX);
+			$yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
+		}
+		$path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
+		$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
+		$path.= sprintf('%.2F %.2F l ', $intX, $intY);
+		$path.= sprintf('%.2F %.2F l ', $ext1X, $ext1Y);
+
+		// draw the curve
+		$this->_out($path . 'f');
+	}
+
+	/**
+	 * Start a transformation
+	 *
+	 * @access public
+	 */
+	public function startTransform()
+	{
+		$this->_out('q');
+	}
+
+	/**
+	 * Stop a transformation
+	 *
+	 * @access public
+	 */
+	public function stopTransform()
+	{
+		$this->_out('Q');
+	}
+
+	/**
+	 * add a Translate transformation
+	 *
+	 * @param float $Tx
+	 * @param float $Ty
+	 * @access public
+	 */
+	public function setTranslate($xT, $yT)
+	{
+		// Matrix for Translate
+		$tm[0]=1;
+		$tm[1]=0;
+		$tm[2]=0;
+		$tm[3]=1;
+		$tm[4]=$xT*$this->k;
+		$tm[5]=-$yT*$this->k;
+
+		// apply the Transform Matric
+		$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
+	}
+
+	/**
+	 * add a Rotate transformation
+	 *
+	 * @param float $angle
+	 * @param float $Cx
+	 * @param float $Cy
+	 * @access public
+	 */
+	public function setRotation($angle, $xC=null, $yC=null)
+	{
+		// if no center, rotate around the current posiition
+		if($xC === null) $xC=$this->x;
+		if($yC === null) $yC=$this->y;
+
+		// prepare the coordinate
+		$yC=($this->h-$yC)*$this->k;
+		$xC*=$this->k;
+
+		// Matrix for Rotate
+		$tm[0]=cos(deg2rad($angle));
+		$tm[1]=sin(deg2rad($angle));
+		$tm[2]=-$tm[1];
+		$tm[3]=$tm[0];
+		$tm[4]=$xC+$tm[1]*$yC-$tm[0]*$xC;
+		$tm[5]=$yC-$tm[0]*$yC-$tm[1]*$xC;
+
+		// apply the Transform Matric
+		$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
+	}
+
+	/**
+	 * we redifine the original SetX method, because we don't want the automatic treatment.
+	 * It is HTML2PDF that make the treatment
+	 *
+	 * @param float   $x
+	 * @param boolean $rtloff NOT USED
+	 * @access public
+	 */
+	public function SetX($x, $rtloff=false)
+	{
+		$this->x=$x;
+	}
+
+	/**
+	 * we redifine the original SetY method, because we don't want the automatic treatment.
+	 * It is HTML2PDF that make the treatment
+	 *
+	 * @param float   $y
+	 * @param boolean $resetx Reset the X position
+	 * @param boolean $rtloff NOT USED
+	 * @access public
+	 */
+	public function SetY($y, $resetx=true, $rtloff=false)
+	{
+		if ($resetx)
+			$this->x=$this->lMargin;
+
+		$this->y=$y;
+	}
+
+	/**
+	 * we redifine the original SetXY method, because we don't want the automatic treatment.
+	 * It is HTML2PDF that make the treatment
+	 *
+	 * @param integer $x
+	 * @param integer $y
+	 * @param boolean $rtloff NOT USED
+	 * @access public
+	 */
+	public function SetXY($x, $y, $rtloff=false)
+	{
+		$this->x=$x;
+		$this->y=$y;
+	}
+
+	/**
+	 * multiple public accessor because HTML2PDF need to use TCPDF without being a extend of it
+	 *
+	 * @param  mixed
+	 * @return mixed
+	 * @access public
+	 */
+	public function getK()
+	{
+		return $this->k;
+	}
+	public function getW()
+	{
+		return $this->w;
+	}
+	public function getH()
+	{
+		return $this->h;
+	}
+	public function getlMargin()
+	{
+		return $this->lMargin;
+	}
+	public function getrMargin()
+	{
+		return $this->rMargin;
+	}
+	public function gettMargin()
+	{
+		return $this->tMargin;
+	}
+	public function getbMargin()
+	{
+		return $this->bMargin;
+	}
+	public function setbMargin($v)
+	{
+		$this->bMargin=$v;
+	}
+
+	/**
+	 * SVG - Convert a SVG Style in PDF Style
+	 *
+	 * @param  array  $styles SVG Style
+	 * @return string PDF style
+	 * @access public
+	 */
+	public function svgSetStyle($styles)
+	{
+		// init the PDF style
+		$style = '';
+
+		// Style : fill
+		if ($styles['fill']) {
+			$this->setFillColorArray($styles['fill']);
+			$style.= 'F';
+		}
+
+		// Style : stroke
+		if ($styles['stroke'] && $styles['stroke-width']) {
+			$this->SetDrawColorArray($styles['stroke']);
+			$this->SetLineWidth($styles['stroke-width']);
+			$style.= 'D';
+		}
+
+		// Style : opacity
+		if ($styles['fill-opacity']) {
+			$this->SetAlpha($styles['fill-opacity']);
+		}
+
+		return $style;
+	}
+
+	/**
+	 * SVG - make a Rectangle
+	 *
+	 * @param float $x
+	 * @param float $y
+	 * @param float $w
+	 * @param float $h
+	 * @param string $style PDF Style
+	 * @access public
+	 */
+	public function svgRect($x, $y, $w, $h, $style)
+	{
+		// prepare the 4 corners
+		$x1=$x;
+		$x2=$x+$w;
+		$x3=$x+$w;
+		$x4=$x;
+
+		$y1=$y;
+		$y2=$y;
+		$y3=$y+$h;
+		$y4=$y+$h;
+
+		// get the Closing operator from the PDF Style
+		if($style=='F') $op='f';
+		elseif($style=='FD' || $style=='DF') $op='B';
+		else $op='S';
+
+		// drawing
+		$this->_Point($x1, $y1, true);
+		$this->_Line($x2, $y2, true);
+		$this->_Line($x3, $y3, true);
+		$this->_Line($x4, $y4, true);
+		$this->_Line($x1, $y1, true);
+		$this->_out($op);
+	}
+
+	/**
+	 * SVG - make a Line
+	 *
+	 * @param float $x1
+	 * @param float $y1
+	 * @param float $x2
+	 * @param float $y2
+	 * @access public
+	 */
+	public function svgLine($x1, $y1, $x2, $y2)
+	{
+		// get the Closing operator
+		$op='S';
+
+		// drawing
+		$this->_Point($x1, $y1, true);
+		$this->_Line($x2, $y2, true);
+		$this->_out($op);
+	}
+
+	/**
+	 * SVG - make a Ellipse
+	 *
+	 * @param float  $x0 x Center
+	 * @param float  $y0 y Center
+	 * @param float  $rx x radius
+	 * @param float  $ry y radius
+	 * @param string $style PDF Style
+	 * @access public
+	 */
+	public function svgEllipse($x0, $y0, $rx, $ry, $style)
+	{
+		// get the Closing operator from the PDF Style
+		if($style=='F') $op='f';
+		elseif($style=='FD' || $style=='DF') $op='B';
+		else $op='S';
+
+		// drawing
+		$this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
+		$this->_out($op);
+	}
+
+	/**
+	 * SVG - make a Advanced Polygone
+	 *
+	 * @param array  $actions list of actions
+	 * @param string $style PDF Style
+	 * @access public
+	 */
+	public function svgPolygone($actions, $style)
+	{
+		// get the Closing operator from the PDF Style
+		if($style=='F') $op='f';
+		elseif($style=='FD' || $style=='DF') $op='B';
+		else $op='S';
+
+		// To save the First action and the last point
+		$first = array('', 0, 0);
+		$last = array(0, 0, 0, 0);
+
+		foreach ($actions as $action) {
+			switch($action[0])
+			{
+				// Start the Path
+				case 'M':
+				case 'm':
+					$first = $action;
+					$x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
+					$this->_Point($x, $y, true);
+					break;
+
+				// Close the Path
+				case 'Z':
+				case 'z':
+					$x = $first[1]; $y = $first[2]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Line (new point)
+				case 'L':
+					$x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Line (vector from last point)
+				case 'l':
+					$x = $last[0]+$action[1]; $y = $last[1]+$action[2]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Horizontal Line (new point)
+				case 'H':
+					$x = $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Horisontal Line (vector from last point)
+				case 'h':
+					$x = $last[0]+$action[1]; $y = $last[1]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Vertical Line (new point)
+				case 'V':
+					$x = $last[0]; $y = $action[1]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Vertical Line (vector from last point)
+				case 'v':
+					$x = $last[0]; $y = $last[1]+$action[1]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Arc (new point)
+				case 'A':
+					$rx = $action[1];   // rx
+					$ry = $action[2];   // ry
+					$a = $action[3];    // deviation angle of the axis X
+					$l = $action[4];    // large-arc-flag
+					$s = $action[5];    // sweep-flag
+					$x1 = $last[0];     // begin x
+					$y1 = $last[1];     // begin y
+					$x2 = $action[6];   // final x
+					$y2 = $action[7];   // final y
+
+					$this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
+					$x = $x2; $y = $y2; $xc = $x; $yc = $y;
+					break;
+
+				// Make a Arc (vector from last point)
+				case 'a':
+					$rx = $action[1];   // rx
+					$ry = $action[2];   // ry
+					$a = $action[3];    // deviation angle of the axis X
+					$l = $action[4];    // large-arc-flag
+					$s = $action[5];    // sweep-flag
+					$x1 = $last[0];     // begin x
+					$y1 = $last[1];     // begin y
+					$x2 = $last[0]+$action[6]; // final x
+					$y2 = $last[1]+$action[7]; // final y
+
+					$this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
+					$x = $x2; $y = $y2; $xc = $x; $yc = $y;
+					break;
+
+				// Make a Bezier Curve (new point)
+				case 'C':
+					$x1 = $action[1];
+					$y1 = $action[2];
+					$x2 = $action[3];
+					$y2 = $action[4];
+					$xf = $action[5];
+					$yf = $action[6];
+					$this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
+					$x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
+					break;
+
+				// Make a Bezier Curve (vector from last point)
+				case 'c':
+					$x1 = $last[0]+$action[1];
+					$y1 = $last[1]+$action[2];
+					$x2 = $last[0]+$action[3];
+					$y2 = $last[1]+$action[4];
+					$xf = $last[0]+$action[5];
+					$yf = $last[1]+$action[6];
+					$this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
+					$x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
+					break;
+
+				// Unknown Path
+				default:
+					throw new HTML2PDF_exception(0, 'SVG Path Error : ['.$action[0].'] unkown');
+			}
+
+			// save the last point
+			$last = array($x, $y, $xc, $yc);
+		}
+
+		// finish the path
+		$this->_out($op);
+	}
+
+	/**
+	 * SVG - go to a point
+	 *
+	 * @param float   $x
+	 * @param float   $y
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Point($x, $y, $trans = false)
+	{
+		if ($trans) $this->ptTransform($x, $y);
+
+		$this->_out(sprintf('%.2F %.2F m', $x, $y));
+	}
+
+	/**
+	 * SVG - make a line from the last point to (x,y)
+	 *
+	 * @param float   $x
+	 * @param float   $y
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Line($x, $y, $trans = false)
+	{
+		if ($trans) $this->ptTransform($x, $y);
+
+		$this->_out(sprintf('%.2F %.2F l', $x, $y));
+	}
+
+	/**
+	 * SVG - make a bezier curve from the last point to (xf,yf), with the 2 direction points (x1,y1) and (x2,y2)
+	 *
+	 * @param float $x1
+	 * @param float $y1
+	 * @param float $x2
+	 * @param float $y2
+	 * @param float $xf
+	 * @param float $yf
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Curve($x1, $y1, $x2, $y2, $xf, $yf, $trans = false)
+	{
+		if ($trans) {
+			$this->ptTransform($x1, $y1);
+			$this->ptTransform($x2, $y2);
+			$this->ptTransform($xf, $yf);
+		}
+		$this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1, $y1, $x2, $y2, $xf, $yf));
+	}
+
+	/**
+	 * SVG - make a arc with Center, Radius, from angleBegin to angleEnd
+	 *
+	 * @param float $xc
+	 * @param float $yc
+	 * @param float $rx
+	 * @param float $ry
+	 * @param float $angleBegin in radians
+	 * @param float $angleEng in radians
+	 * @param boolean $direction
+	 * @param boolean $drawFirst, true => add the first point
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Arc(
+		$xc,
+		$yc,
+		$rx,
+		$ry,
+		$angleBegin,
+		$angleEnd,
+		$direction = true,
+		$drawFirst = true,
+		$trans=false)
+	{
+		// if we want the no trigo direction : add 2PI to the begin angle, to invert the direction
+		if (!$direction) $angleBegin+= M_PI*2.;
+
+		// cut in segment to convert in berize curv
+		$dt = ($angleEnd - $angleBegin)/self::ARC_NB_SEGMENT;
+		$dtm = $dt/3;
+
+		// center of the arc
+		$x0 = $xc; $y0 = $yc;
+
+		// calculing the first point
+		$t1 = $angleBegin;
+		$a0 = $x0 + ($rx * cos($t1));
+		$b0 = $y0 + ($ry * sin($t1));
+		$c0 = -$rx * sin($t1);
+		$d0 = $ry * cos($t1);
+
+		// if drawFirst => draw the first point
+		if ($drawFirst) $this->_Point($a0, $b0, $trans);
+
+		// foreach segment
+		for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
+			// calculing the next point
+			$t1 = ($i * $dt)+$angleBegin;
+			$a1 = $x0 + ($rx * cos($t1));
+			$b1 = $y0 + ($ry * sin($t1));
+			$c1 = -$rx * sin($t1);
+			$d1 = $ry * cos($t1);
+
+			// make the bezier curv
+			$this->_Curve(
+				$a0 + ($c0 * $dtm), $b0 + ($d0 * $dtm),
+				$a1 - ($c1 * $dtm), $b1 - ($d1 * $dtm),
+				$a1, $b1,
+				$trans
+			);
+
+			// save the point
+			$a0 = $a1;
+			$b0 = $b1;
+			$c0 = $c1;
+			$d0 = $d1;
+		}
+	}
+
+	/**
+	 * SVG - make a arc from Pt1 to Pt2, with Radius
+	 *
+	 * @param float $x1
+	 * @param float $y1
+	 * @param float $x2
+	 * @param float $y2
+	 * @param float $rx
+	 * @param float $ry
+	 * @param float $angle deviation angle of the axis X
+	 * @param boolean $l large-arc-flag
+	 * @param boolean $s sweep-flag
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $angle=0., $l=0, $s=0, $trans = false)
+	{
+		// array to stock the parameters
+		$v = array();
+
+		// the original values
+		$v['x1'] = $x1;
+		$v['y1'] = $y1;
+		$v['x2'] = $x2;
+		$v['y2'] = $y2;
+		$v['rx'] = $rx;
+		$v['ry'] = $ry;
+
+		// rotate with the deviation angle of the axis X
+		$v['xr1'] = $v['x1']*cos($angle) - $v['y1']*sin($angle);
+		$v['yr1'] = $v['x1']*sin($angle) + $v['y1']*cos($angle);
+		$v['xr2'] = $v['x2']*cos($angle) - $v['y2']*sin($angle);
+		$v['yr2'] = $v['x2']*sin($angle) + $v['y2']*cos($angle);
+
+		// the normalized vector
+		$v['Xr1'] = $v['xr1']/$v['rx'];
+		$v['Yr1'] = $v['yr1']/$v['ry'];
+		$v['Xr2'] = $v['xr2']/$v['rx'];
+		$v['Yr2'] = $v['yr2']/$v['ry'];
+		$v['dXr'] = $v['Xr2']-$v['Xr1'];
+		$v['dYr'] = $v['Yr2']-$v['Yr1'];
+		$v['D'] = $v['dXr']*$v['dXr'] + $v['dYr']*$v['dYr'];
+
+		// if |vector| is Null, or if |vector| > 2 : impossible to make a arc => Line
+		if ($v['D']==0 || $v['D']>4) {
+			$this->_Line($x2, $y2, $trans);
+			return false;
+		}
+
+		// convert paramters for make a arc with Center, Radius, from angleBegin to angleEnd
+		$v['s1'] = array();
+		$v['s1']['t'] = sqrt((4.-$v['D'])/$v['D']);
+		$v['s1']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s1']['t']*($v['Yr2']-$v['Yr1'])/2.;
+		$v['s1']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s1']['t']*($v['Xr1']-$v['Xr2'])/2.;
+		$v['s1']['xr'] = $v['s1']['Xr']*$v['rx'];
+		$v['s1']['yr'] = $v['s1']['Yr']*$v['ry'];
+		$v['s1']['x'] = $v['s1']['xr']*cos($angle)+$v['s1']['yr']*sin($angle);
+		$v['s1']['y'] =-$v['s1']['xr']*sin($angle)+$v['s1']['yr']*cos($angle);
+		$v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']);
+		$v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']);
+		if ($v['s1']['a1']>$v['s1']['a2']) $v['s1']['a1']-=2*M_PI;
+
+		$v['s2'] = array();
+		$v['s2']['t'] = -$v['s1']['t'];
+		$v['s2']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s2']['t']*($v['Yr2']-$v['Yr1'])/2.;
+		$v['s2']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s2']['t']*($v['Xr1']-$v['Xr2'])/2.;
+		$v['s2']['xr'] = $v['s2']['Xr']*$v['rx'];
+		$v['s2']['yr'] = $v['s2']['Yr']*$v['ry'];
+		$v['s2']['x'] = $v['s2']['xr']*cos($angle)+$v['s2']['yr']*sin($angle);
+		$v['s2']['y'] =-$v['s2']['xr']*sin($angle)+$v['s2']['yr']*cos($angle);
+		$v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']);
+		$v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']);
+		if ($v['s2']['a1']>$v['s2']['a2']) $v['s2']['a1']-=2*M_PI;
+
+		if (!$l) {
+			if ($s) {
+				$xc = $v['s2']['x'];
+				$yc = $v['s2']['y'];
+				$a1 = $v['s2']['a1'];
+				$a2 = $v['s2']['a2'];
+				$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
+			} else {
+				$xc = $v['s1']['x'];
+				$yc = $v['s1']['y'];
+				$a1 = $v['s1']['a1'];
+				$a2 = $v['s1']['a2'];
+				$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
+			}
+		} else {
+			if ($s) {
+				$xc = $v['s1']['x'];
+				$yc = $v['s1']['y'];
+				$a1 = $v['s1']['a1'];
+				$a2 = $v['s1']['a2'];
+				$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
+			} else {
+				$xc = $v['s2']['x'];
+				$yc = $v['s2']['y'];
+				$a1 = $v['s2']['a1'];
+				$a2 = $v['s2']['a2'];
+				$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
+			}
+		}
+	}
+
+	/**
+	 * SVG - transform the point (reference)
+	 *
+	 * @param float &$x
+	 * @param float &$y
+	 * @param boolean $trans true => convert into PDF unit
+	 * @return boolean
+	 * @access public
+	 */
+	public function ptTransform(&$x,  &$y, $trans=true)
+	{
+		// load the last Transfomation Matrix
+		$nb = count($this->_transf);
+		if ($nb)    $m = $this->_transf[$nb-1];
+		else        $m = array(1,0,0,1,0,0);
+
+		// apply the Transformation Matrix
+		list($x,$y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
+
+		// if true => convert into PDF unit
+		if ($trans) {
+			$x = $x*$this->k;
+			$y = ($this->h-$y)*$this->k;
+		}
+
+		return true;
+	}
+
+	/**
+	 * SVG - add a transformation Matric
+	 *
+	 * @param array $n matrix
+	 * @access public
+	 */
+	public function doTransform($n = null)
+	{
+		// get the last Transformation Matrix
+		$nb = count($this->_transf);
+		if ($nb)    $m = $this->_transf[$nb-1];
+		else        $m = array(1,0,0,1,0,0);
+
+		// if no transform, get the Identity Matrix
+		if (!$n) $n = array(1,0,0,1,0,0);
+
+		// create the new Transformation Matrix
+		$this->_transf[] = array(
+			$m[0]*$n[0]+$m[2]*$n[1],
+			$m[1]*$n[0]+$m[3]*$n[1],
+			$m[0]*$n[2]+$m[2]*$n[3],
+			$m[1]*$n[2]+$m[3]*$n[3],
+			$m[0]*$n[4]+$m[2]*$n[5]+$m[4],
+			$m[1]*$n[4]+$m[3]*$n[5]+$m[5]
+		);
+	}
+
+	/**
+	 * SVG - remove a transformation Matric
+	 *
+	 * @access public
+	 */
+	public function undoTransform()
+	{
+		array_pop($this->_transf);
+	}
+
+	/**
+	 * Convert a HTML2PDF barcode in a TCPDF barcode
+	 *
+	 * @param string $code code to print
+	 * @param string $type type of barcode (see tcpdf/barcodes.php for supported formats)
+	 * @param int $x x position in user units
+	 * @param int $y y position in user units
+	 * @param int $w width in user units
+	 * @param int $h height in user units
+	 * @param int $labelFontsize of the Test Label. If false : no Label
+	 * @param array $color color of the foreground
+	 * @access public
+	 */
+	public function myBarcode($code, $type, $x, $y, $w, $h, $labelFontsize, $color)
+	{
+		// the style of the barcode
+		$style = array(
+			'position' => 'S',
+			'text' => ($labelFontsize ? true : false),
+			'fgcolor' => $color,
+			'bgcolor' => false,
+		);
+
+		// build the barcode
+		$this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
+
+		// it Label => add the FontSize to the height
+		if ($labelFontsize) $h+= ($labelFontsize);
+
+		// return the size of the barcode
+		return array($w, $h);
+	}
+
+	/**
+	 * create a automatic Index on a page
+	 *
+	 * @param html2pdf $obj           parent object
+	 * @param string   $titre         Title of the Index Page
+	 * @param integer  $sizeTitle     Font size for hthe Title
+	 * @param integer  $sizeBookmark  Font size for the bookmarks
+	 * @param boolean  $bookmarkTitle Bookmark the Title
+	 * @param boolean  $displayPage   Display the page number for each bookmark
+	 * @param integer  $page draw the automatic Index on a specific Page. if null => add a page at the end
+	 * @param string   $fontName      FontName to use
+	 * @access public
+	 */
+	public function createIndex(
+		&$obj,
+		$titre = 'Index',
+		$sizeTitle = 20,
+		$sizeBookmark = 15,
+		$bookmarkTitle = true,
+		$displayPage = true,
+		$page = null,
+		$fontName = 'helvetica')
+	{
+		// bookmark the Title if wanted
+		if ($bookmarkTitle) $this->Bookmark($titre, 0, -1);
+
+		// display the Title with the good Font size
+		$this->SetFont($fontName, '', $sizeTitle);
+		$this->Cell(0, 5, $titre, 0, 1, 'C');
+
+		// set the good Font size for the bookmarks
+		$this->SetFont($fontName, '', $sizeBookmark);
+		$this->Ln(10);
+
+		// get the number of bookmarks
+		$size=sizeof($this->outlines);
+
+		// get the size of the "P. xx" cell
+		$pageCellSize=$this->GetStringWidth('p. '.$this->outlines[$size-1]['p'])+2;
+
+		// Foreach bookmark
+		for ($i=0;$i<$size;$i++) {
+			// if we need a new page => add a new page
+			if ($this->getY()+$this->FontSize>=($this->h - $this->bMargin)) {
+				$obj->_INDEX_NewPage($page);
+				$this->SetFont($fontName, '', $sizeBookmark);
+			}
+
+			// Offset of the current level
+			$level=$this->outlines[$i]['l'];
+			if($level>0) $this->Cell($level*8);
+
+			// Caption (cut to fit on the width page)
+			$str=$this->outlines[$i]['t'];
+			$strsize=$this->GetStringWidth($str);
+			$availableSize=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-4;
+			while ($strsize>=$availableSize) {
+				$str=substr($str, 0, -1);
+				$strsize=$this->GetStringWidth($str);
+			}
+
+			// if we want to display the page nmber
+			if ($displayPage) {
+				// display the Bookmark Caption
+				$this->Cell($strsize+2, $this->FontSize+2, $str);
+
+				//Filling dots
+				$w=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-($strsize+2);
+				$nb=$w/$this->GetStringWidth('.');
+				$dots=str_repeat('.', $nb);
+				$this->Cell($w, $this->FontSize+2, $dots, 0, 0, 'R');
+
+				//Page number
+				$this->Cell($pageCellSize, $this->FontSize+2, 'p. '.$this->outlines[$i]['p'], 0, 1, 'R');
+			} else {
+				// display the Bookmark Caption
+				$this->Cell($strsize+2, $this->FontSize+2, $str, 0, 1);
+			}
+		}
+	}
+
+	/**
+	 * Returns the string alias used for the total number of pages.
+	 *
+	 * @access public
+	 * @return string;
+	 * @see TCPDF::getAliasNbPages(), TCPDF::getPageGroupAlias()
+	 */
+	public function getMyAliasNbPages()
+	{
+		if ($this->_myLastPageGroupNb==0) {
+			return $this->getAliasNbPages();
+		} else {
+			$old = $this->currpagegroup;
+			$this->currpagegroup = '{nb'.$this->_myLastPageGroupNb.'}';
+			$new = $this->getPageGroupAlias();
+			$this->currpagegroup = $old;
+
+			return $new;
+		}
+	}
+
+	/**
+	 * Returns the current page number.
+	 *
+	 * @access public
+	 * @param  integer $page
+	 * @return integer;
+	 */
+	public function getMyNumPage($page=null)
+	{
+		if ($page===null) {
+			$page = $this->page;
+		}
+
+		if ($this->_myLastPageGroupNb==0) {
+			return $page;
+		} else {
+			return $page-$this->_myLastPageGroup;
+		}
+	}
+
+	/**
+	 * Start a new group of pages
+	 *
+	 * @access public
+	 * @return integer;
+	 * @see tcpdf::startPageGroup
+	 */
+	public function myStartPageGroup()
+	{
+		$this->_myLastPageGroup = $this->page-1;
+		$this->_myLastPageGroupNb++;
+	}
+
+	/**
+	 * get $_myLastPageGroup;
+	 *
+	 * @access public
+	 * @return integer $_myLastPageGroup;
+	 */
+	public function getMyLastPageGroup()
+	{
+		return $this->_myLastPageGroup;
+	}
+
+	/**
+	 * set $_myLastPageGroup;
+	 *
+	 * @access public
+	 * @param integer $myLastPageGroup;
+	 */
+	public function setMyLastPageGroup($myLastPageGroup)
+	{
+		$this->_myLastPageGroup = $myLastPageGroup;
+	}
+
+	/**
+	 * get $_myLastPageGroupNb;
+	 *
+	 * @access public
+	 * @return integer $_myLastPageGroupNb;
+	 */
+	public function getMyLastPageGroupNb()
+	{
+		return $this->_myLastPageGroupNb;
+	}
+
+	/**
+	 * set $_myLastPageGroupNb;
+	 *
+	 * @access public
+	 * @param integer $myLastPageGroupNb;
+	 */
+	public function setMyLastPageGroupNb($myLastPageGroupNb)
+	{
+		$this->_myLastPageGroupNb = $myLastPageGroupNb;
+	}
 }

Spacing +282 added lines, -282 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * HTML2PDF Librairy - myPdf class
  *
@@ -9,8 +9,8 @@ 
  * @version   4.03
  */
 
-require_once(dirname(__FILE__).'/tcpdfConfig.php');
-require_once(dirname(__FILE__).'/../_tcpdf_'.HTML2PDF_USED_TCPDF_VERSION.'/tcpdf.php');
+require_once(dirname(__FILE__) . '/tcpdfConfig.php');
+require_once(dirname(__FILE__) . '/../_tcpdf_' . HTML2PDF_USED_TCPDF_VERSION . '/tcpdf.php');
 
 class HTML2PDF_myPdf extends TCPDF
 {
@@ -37,12 +37,12 @@ 
      * @access public
      */
     public function __construct(
-        $orientation='P',
-        $unit='mm',
-        $format='A4',
-        $unicode=true,
-        $encoding='UTF-8',
-        $diskcache=false)
+        $orientation = 'P',
+        $unit = 'mm',
+        $format = 'A4',
+        $unicode = true,
+        $encoding = 'UTF-8',
+        $diskcache = false)
     {
         // call the parent constructor
         parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache);
@@ -93,19 +93,19 @@ 
             $txt = (HTML2PDF_locale::get('pdf05'));
         }
         if ($this->_footerParam['date'] && $this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf03'));
+            $txt .= ($txt ? ' - ' : '') . (HTML2PDF_locale::get('pdf03'));
         }
         if ($this->_footerParam['date'] && !$this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf01'));
+            $txt .= ($txt ? ' - ' : '') . (HTML2PDF_locale::get('pdf01'));
         }
         if (!$this->_footerParam['date'] && $this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf02'));
+            $txt .= ($txt ? ' - ' : '') . (HTML2PDF_locale::get('pdf02'));
         }
         if ($this->_footerParam['page']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf04'));
+            $txt .= ($txt ? ' - ' : '') . (HTML2PDF_locale::get('pdf04'));
         }
 
-        if (strlen($txt)>0) {
+        if (strlen($txt) > 0) {
             // replace some values
             $toReplace = array(
                 '[[date_d]]'  => date('d'),
@@ -222,10 +222,10 @@ 
      * @param float word spacing
      * @access public
      */
-    public function setWordSpacing($ws=0.)
+    public function setWordSpacing($ws = 0.)
     {
         $this->ws = $ws;
-        $this->_out(sprintf('%.3F Tw', $ws*$this->k));
+        $this->_out(sprintf('%.3F Tw', $ws * $this->k));
     }
 
     /**
@@ -246,118 +246,118 @@ 
         $y = null,
         $w = null,
         $h = null,
-        $cornerTL=null,
-        $cornerTR=null,
-        $cornerBL=null,
-        $cornerBR=null)
+        $cornerTL = null,
+        $cornerTR = null,
+        $cornerBL = null,
+        $cornerBR = null)
     {
         // init the path
         $path = '';
 
         // if we have the position and the size of the rectangle, we can proceed
-        if ($x!==null && $y!==null && $w!==null && $h!==null) {
+        if ($x !== null && $y !== null && $w !== null && $h !== null) {
             // the positions of the rectangle's corners
-            $x1 = $x*$this->k;
-            $y1 = ($this->h-$y)*$this->k;
+            $x1 = $x * $this->k;
+            $y1 = ($this->h - $y) * $this->k;
 
-            $x2 = ($x+$w)*$this->k;
-            $y2 = ($this->h-$y)*$this->k;
+            $x2 = ($x + $w) * $this->k;
+            $y2 = ($this->h - $y) * $this->k;
 
-            $x3 = ($x+$w)*$this->k;
-            $y3 = ($this->h-$y-$h)*$this->k;
+            $x3 = ($x + $w) * $this->k;
+            $y3 = ($this->h - $y - $h) * $this->k;
 
-            $x4 = $x*$this->k;
-            $y4 = ($this->h-$y-$h)*$this->k;
+            $x4 = $x * $this->k;
+            $y4 = ($this->h - $y - $h) * $this->k;
 
             // if we have at least one radius corner, then we proceed to a specific path, else it is just a rectangle
             if ($cornerTL || $cornerTR || $cornerBL || $cornerBR) {
                 // prepare the radius values
                 if ($cornerTL) {
-                    $cornerTL[0] = $cornerTL[0]*$this->k;
-                    $cornerTL[1] =-$cornerTL[1]*$this->k;
+                    $cornerTL[0] = $cornerTL[0] * $this->k;
+                    $cornerTL[1] = -$cornerTL[1] * $this->k;
                 }
                 if ($cornerTR) {
-                    $cornerTR[0] = $cornerTR[0]*$this->k;
-                    $cornerTR[1] =-$cornerTR[1]*$this->k;
+                    $cornerTR[0] = $cornerTR[0] * $this->k;
+                    $cornerTR[1] = -$cornerTR[1] * $this->k;
                 }
                 if ($cornerBL) {
-                    $cornerBL[0] = $cornerBL[0]*$this->k;
-                    $cornerBL[1] =-$cornerBL[1]*$this->k;
+                    $cornerBL[0] = $cornerBL[0] * $this->k;
+                    $cornerBL[1] = -$cornerBL[1] * $this->k;
                 }
                 if ($cornerBR) {
-                    $cornerBR[0] = $cornerBR[0]*$this->k;
-                    $cornerBR[1] =-$cornerBR[1]*$this->k;
+                    $cornerBR[0] = $cornerBR[0] * $this->k;
+                    $cornerBR[1] = -$cornerBR[1] * $this->k;
                 }
 
                 // if TL radius then specific start else (X1,Y1)
                 if ($cornerTL) {
-                    $path.= sprintf('%.2F %.2F m ', $x1+$cornerTL[0], $y1);
+                    $path .= sprintf('%.2F %.2F m ', $x1 + $cornerTL[0], $y1);
                 } else {
-                    $path.= sprintf('%.2F %.2F m ', $x1, $y1);
+                    $path .= sprintf('%.2F %.2F m ', $x1, $y1);
                 }
 
                 // if TR radius then line + arc, else line to (X2,Y2)
                 if ($cornerTR) {
-                    $xt1 = ($x2-$cornerTR[0])+$cornerTR[0]*self::MY_ARC;
-                    $yt1 = ($y2+$cornerTR[1])-$cornerTR[1];
-                    $xt2 = ($x2-$cornerTR[0])+$cornerTR[0];
-                    $yt2 = ($y2+$cornerTR[1])-$cornerTR[1]*self::MY_ARC;
+                    $xt1 = ($x2 - $cornerTR[0]) + $cornerTR[0] * self::MY_ARC;
+                    $yt1 = ($y2 + $cornerTR[1]) - $cornerTR[1];
+                    $xt2 = ($x2 - $cornerTR[0]) + $cornerTR[0];
+                    $yt2 = ($y2 + $cornerTR[1]) - $cornerTR[1] * self::MY_ARC;
 
-                    $path.= sprintf('%.2F %.2F l ', $x2-$cornerTR[0], $y2);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2+$cornerTR[1]);
+                    $path .= sprintf('%.2F %.2F l ', $x2 - $cornerTR[0], $y2);
+                    $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2 + $cornerTR[1]);
                 } else {
-                    $path.= sprintf('%.2F %.2F l ', $x2, $y2);
+                    $path .= sprintf('%.2F %.2F l ', $x2, $y2);
                 }
 
                 // if BR radius then line + arc, else line to (X3, Y3)
                 if ($cornerBR) {
-                    $xt1 = ($x3-$cornerBR[0])+$cornerBR[0];
-                    $yt1 = ($y3-$cornerBR[1])+$cornerBR[1]*self::MY_ARC;
-                    $xt2 = ($x3-$cornerBR[0])+$cornerBR[0]*self::MY_ARC;
-                    $yt2 = ($y3-$cornerBR[1])+$cornerBR[1];
+                    $xt1 = ($x3 - $cornerBR[0]) + $cornerBR[0];
+                    $yt1 = ($y3 - $cornerBR[1]) + $cornerBR[1] * self::MY_ARC;
+                    $xt2 = ($x3 - $cornerBR[0]) + $cornerBR[0] * self::MY_ARC;
+                    $yt2 = ($y3 - $cornerBR[1]) + $cornerBR[1];
 
-                    $path.= sprintf('%.2F %.2F l ', $x3, $y3-$cornerBR[1]);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3-$cornerBR[0], $y3);
+                    $path .= sprintf('%.2F %.2F l ', $x3, $y3 - $cornerBR[1]);
+                    $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3 - $cornerBR[0], $y3);
                 } else {
-                    $path.= sprintf('%.2F %.2F l ', $x3, $y3);
+                    $path .= sprintf('%.2F %.2F l ', $x3, $y3);
                 }
 
                 // if BL radius then line + arc, else line to (X4, Y4)
                 if ($cornerBL) {
-                    $xt1 = ($x4+$cornerBL[0])-$cornerBL[0]*self::MY_ARC;
-                    $yt1 = ($y4-$cornerBL[1])+$cornerBL[1];
-                    $xt2 = ($x4+$cornerBL[0])-$cornerBL[0];
-                    $yt2 = ($y4-$cornerBL[1])+$cornerBL[1]*self::MY_ARC;
+                    $xt1 = ($x4 + $cornerBL[0]) - $cornerBL[0] * self::MY_ARC;
+                    $yt1 = ($y4 - $cornerBL[1]) + $cornerBL[1];
+                    $xt2 = ($x4 + $cornerBL[0]) - $cornerBL[0];
+                    $yt2 = ($y4 - $cornerBL[1]) + $cornerBL[1] * self::MY_ARC;
 
-                    $path.= sprintf('%.2F %.2F l ', $x4+$cornerBL[0], $y4);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4-$cornerBL[1]);
+                    $path .= sprintf('%.2F %.2F l ', $x4 + $cornerBL[0], $y4);
+                    $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4 - $cornerBL[1]);
                 } else {
-                    $path.= sprintf('%.2F %.2F l ', $x4, $y4);
+                    $path .= sprintf('%.2F %.2F l ', $x4, $y4);
                 }
 
                 // if RL radius then line + arc
                 if ($cornerTL) {
-                    $xt1 = ($x1+$cornerTL[0])-$cornerTL[0];
-                    $yt1 = ($y1+$cornerTL[1])-$cornerTL[1]*self::MY_ARC;
-                    $xt2 = ($x1+$cornerTL[0])-$cornerTL[0]*self::MY_ARC;
-                    $yt2 = ($y1+$cornerTL[1])-$cornerTL[1];
+                    $xt1 = ($x1 + $cornerTL[0]) - $cornerTL[0];
+                    $yt1 = ($y1 + $cornerTL[1]) - $cornerTL[1] * self::MY_ARC;
+                    $xt2 = ($x1 + $cornerTL[0]) - $cornerTL[0] * self::MY_ARC;
+                    $yt2 = ($y1 + $cornerTL[1]) - $cornerTL[1];
 
-                    $path.= sprintf('%.2F %.2F l ', $x1, $y1+$cornerTL[1]);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1+$cornerTL[0], $y1);
+                    $path .= sprintf('%.2F %.2F l ', $x1, $y1 + $cornerTL[1]);
+                    $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1 + $cornerTL[0], $y1);
                 }
             } else {
-                $path.= sprintf('%.2F %.2F m ', $x1, $y1);
-                $path.= sprintf('%.2F %.2F l ', $x2, $y2);
-                $path.= sprintf('%.2F %.2F l ', $x3, $y3);
-                $path.= sprintf('%.2F %.2F l ', $x4, $y4);
+                $path .= sprintf('%.2F %.2F m ', $x1, $y1);
+                $path .= sprintf('%.2F %.2F l ', $x2, $y2);
+                $path .= sprintf('%.2F %.2F l ', $x3, $y3);
+                $path .= sprintf('%.2F %.2F l ', $x4, $y4);
             }
 
             // close the path
-            $path.= ' h W n';
+            $path .= ' h W n';
         }
 
         // using the path as a clipping path
-        $this->_out('q '.$path.' ');
+        $this->_out('q ' . $path . ' ');
     }
 
     /**
@@ -396,48 +396,48 @@ 
     public function drawCurve($ext1X, $ext1Y, $ext2X, $ext2Y, $int1X, $int1Y, $int2X, $int2Y, $cenX, $cenY)
     {
         // prepare the coordinates
-        $ext1X = $ext1X*$this->k;
-        $ext2X = $ext2X*$this->k;
-        $int1X = $int1X*$this->k;
-        $int2X = $int2X*$this->k;
-        $cenX  = $cenX*$this->k;
-
-        $ext1Y = ($this->h-$ext1Y)*$this->k;
-        $ext2Y = ($this->h-$ext2Y)*$this->k;
-        $int1Y = ($this->h-$int1Y)*$this->k;
-        $int2Y = ($this->h-$int2Y)*$this->k;
-        $cenY  = ($this->h-$cenY) *$this->k;
+        $ext1X = $ext1X * $this->k;
+        $ext2X = $ext2X * $this->k;
+        $int1X = $int1X * $this->k;
+        $int2X = $int2X * $this->k;
+        $cenX  = $cenX * $this->k;
+
+        $ext1Y = ($this->h - $ext1Y) * $this->k;
+        $ext2Y = ($this->h - $ext2Y) * $this->k;
+        $int1Y = ($this->h - $int1Y) * $this->k;
+        $int2Y = ($this->h - $int2Y) * $this->k;
+        $cenY  = ($this->h - $cenY) * $this->k;
 
         // init the curve
         $path = '';
 
-        if ($ext1X-$cenX!=0) {
-            $xt1 = $cenX+($ext1X-$cenX);
-            $yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($ext2Y-$cenY);
+        if ($ext1X - $cenX != 0) {
+            $xt1 = $cenX + ($ext1X - $cenX);
+            $yt1 = $cenY + ($ext2Y - $cenY) * self::MY_ARC;
+            $xt2 = $cenX + ($ext1X - $cenX) * self::MY_ARC;
+            $yt2 = $cenY + ($ext2Y - $cenY);
         } else {
-            $xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($ext1Y-$cenY);
-            $xt2 = $cenX+($ext2X-$cenX);
-            $yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
+            $xt1 = $cenX + ($ext2X - $cenX) * self::MY_ARC;
+            $yt1 = $cenY + ($ext1Y - $cenY);
+            $xt2 = $cenX + ($ext2X - $cenX);
+            $yt2 = $cenY + ($ext1Y - $cenY) * self::MY_ARC;
         }
-        $path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-
-        if ($int1X-$cenX!=0) {
-            $xt1 = $cenX+($int1X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($int2Y-$cenY);
-            $xt2 = $cenX+($int1X-$cenX);
-            $yt2 = $cenY+($int2Y-$cenY)*self::MY_ARC;
+        $path .= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
+        $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
+
+        if ($int1X - $cenX != 0) {
+            $xt1 = $cenX + ($int1X - $cenX) * self::MY_ARC;
+            $yt1 = $cenY + ($int2Y - $cenY);
+            $xt2 = $cenX + ($int1X - $cenX);
+            $yt2 = $cenY + ($int2Y - $cenY) * self::MY_ARC;
         } else {
-            $xt1 = $cenX+($int2X-$cenX);
-            $yt1 = $cenY+($int1Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($int2X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($int1Y-$cenY);
+            $xt1 = $cenX + ($int2X - $cenX);
+            $yt1 = $cenY + ($int1Y - $cenY) * self::MY_ARC;
+            $xt2 = $cenX + ($int2X - $cenX) * self::MY_ARC;
+            $yt2 = $cenY + ($int1Y - $cenY);
         }
-        $path.= sprintf('%.2F %.2F l ', $int2X, $int2Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1X, $int1Y);
+        $path .= sprintf('%.2F %.2F l ', $int2X, $int2Y);
+        $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1X, $int1Y);
 
         // draw the curve
         $this->_out($path . 'f');
@@ -467,34 +467,34 @@ 
     public function drawCorner($ext1X, $ext1Y, $ext2X, $ext2Y, $intX, $intY, $cenX, $cenY)
     {
         // prepare the coordinates
-        $ext1X = $ext1X*$this->k;
-        $ext2X = $ext2X*$this->k;
-        $intX  = $intX*$this->k;
-        $cenX  = $cenX*$this->k;
+        $ext1X = $ext1X * $this->k;
+        $ext2X = $ext2X * $this->k;
+        $intX  = $intX * $this->k;
+        $cenX  = $cenX * $this->k;
 
-        $ext1Y = ($this->h-$ext1Y)*$this->k;
-        $ext2Y = ($this->h-$ext2Y)*$this->k;
-        $intY  = ($this->h-$intY)*$this->k;
-        $cenY  = ($this->h-$cenY)*$this->k;
+        $ext1Y = ($this->h - $ext1Y) * $this->k;
+        $ext2Y = ($this->h - $ext2Y) * $this->k;
+        $intY  = ($this->h - $intY) * $this->k;
+        $cenY  = ($this->h - $cenY) * $this->k;
 
         // init the curve
         $path = '';
 
-        if ($ext1X-$cenX!=0) {
-            $xt1 = $cenX+($ext1X-$cenX);
-            $yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($ext2Y-$cenY);
+        if ($ext1X - $cenX != 0) {
+            $xt1 = $cenX + ($ext1X - $cenX);
+            $yt1 = $cenY + ($ext2Y - $cenY) * self::MY_ARC;
+            $xt2 = $cenX + ($ext1X - $cenX) * self::MY_ARC;
+            $yt2 = $cenY + ($ext2Y - $cenY);
         } else {
-            $xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($ext1Y-$cenY);
-            $xt2 = $cenX+($ext2X-$cenX);
-            $yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
+            $xt1 = $cenX + ($ext2X - $cenX) * self::MY_ARC;
+            $yt1 = $cenY + ($ext1Y - $cenY);
+            $xt2 = $cenX + ($ext2X - $cenX);
+            $yt2 = $cenY + ($ext1Y - $cenY) * self::MY_ARC;
         }
-        $path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-        $path.= sprintf('%.2F %.2F l ', $intX, $intY);
-        $path.= sprintf('%.2F %.2F l ', $ext1X, $ext1Y);
+        $path .= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
+        $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
+        $path .= sprintf('%.2F %.2F l ', $intX, $intY);
+        $path .= sprintf('%.2F %.2F l ', $ext1X, $ext1Y);
 
         // draw the curve
         $this->_out($path . 'f');
@@ -530,12 +530,12 @@ 
     public function setTranslate($xT, $yT)
     {
         // Matrix for Translate
-        $tm[0]=1;
-        $tm[1]=0;
-        $tm[2]=0;
-        $tm[3]=1;
-        $tm[4]=$xT*$this->k;
-        $tm[5]=-$yT*$this->k;
+        $tm[0] = 1;
+        $tm[1] = 0;
+        $tm[2] = 0;
+        $tm[3] = 1;
+        $tm[4] = $xT * $this->k;
+        $tm[5] = -$yT * $this->k;
 
         // apply the Transform Matric
         $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
@@ -549,23 +549,23 @@ 
      * @param float $Cy
      * @access public
      */
-    public function setRotation($angle, $xC=null, $yC=null)
+    public function setRotation($angle, $xC = null, $yC = null)
     {
         // if no center, rotate around the current posiition
-        if($xC === null) $xC=$this->x;
-        if($yC === null) $yC=$this->y;
+        if ($xC === null) $xC = $this->x;
+        if ($yC === null) $yC = $this->y;
 
         // prepare the coordinate
-        $yC=($this->h-$yC)*$this->k;
-        $xC*=$this->k;
+        $yC = ($this->h - $yC) * $this->k;
+        $xC *= $this->k;
 
         // Matrix for Rotate
-        $tm[0]=cos(deg2rad($angle));
-        $tm[1]=sin(deg2rad($angle));
-        $tm[2]=-$tm[1];
-        $tm[3]=$tm[0];
-        $tm[4]=$xC+$tm[1]*$yC-$tm[0]*$xC;
-        $tm[5]=$yC-$tm[0]*$yC-$tm[1]*$xC;
+        $tm[0] = cos(deg2rad($angle));
+        $tm[1] = sin(deg2rad($angle));
+        $tm[2] = -$tm[1];
+        $tm[3] = $tm[0];
+        $tm[4] = $xC + $tm[1] * $yC - $tm[0] * $xC;
+        $tm[5] = $yC - $tm[0] * $yC - $tm[1] * $xC;
 
         // apply the Transform Matric
         $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
@@ -579,9 +579,9 @@ 
      * @param boolean $rtloff NOT USED
      * @access public
      */
-    public function SetX($x, $rtloff=false)
+    public function SetX($x, $rtloff = false)
     {
-        $this->x=$x;
+        $this->x = $x;
     }
 
     /**
@@ -593,12 +593,12 @@ 
      * @param boolean $rtloff NOT USED
      * @access public
      */
-    public function SetY($y, $resetx=true, $rtloff=false)
+    public function SetY($y, $resetx = true, $rtloff = false)
     {
         if ($resetx)
-            $this->x=$this->lMargin;
+            $this->x = $this->lMargin;
 
-        $this->y=$y;
+        $this->y = $y;
     }
 
     /**
@@ -610,10 +610,10 @@ 
      * @param boolean $rtloff NOT USED
      * @access public
      */
-    public function SetXY($x, $y, $rtloff=false)
+    public function SetXY($x, $y, $rtloff = false)
     {
-        $this->x=$x;
-        $this->y=$y;
+        $this->x = $x;
+        $this->y = $y;
     }
 
     /**
@@ -653,7 +653,7 @@ 
     }
     public function setbMargin($v)
     {
-        $this->bMargin=$v;
+        $this->bMargin = $v;
     }
 
     /**
@@ -671,14 +671,14 @@ 
         // Style : fill
         if ($styles['fill']) {
             $this->setFillColorArray($styles['fill']);
-            $style.= 'F';
+            $style .= 'F';
         }
 
         // Style : stroke
         if ($styles['stroke'] && $styles['stroke-width']) {
             $this->SetDrawColorArray($styles['stroke']);
             $this->SetLineWidth($styles['stroke-width']);
-            $style.= 'D';
+            $style .= 'D';
         }
 
         // Style : opacity
@@ -702,20 +702,20 @@ 
     public function svgRect($x, $y, $w, $h, $style)
     {
         // prepare the 4 corners
-        $x1=$x;
-        $x2=$x+$w;
-        $x3=$x+$w;
-        $x4=$x;
+        $x1 = $x;
+        $x2 = $x + $w;
+        $x3 = $x + $w;
+        $x4 = $x;
 
-        $y1=$y;
-        $y2=$y;
-        $y3=$y+$h;
-        $y4=$y+$h;
+        $y1 = $y;
+        $y2 = $y;
+        $y3 = $y + $h;
+        $y4 = $y + $h;
 
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if ($style == 'F') $op = 'f';
+        elseif ($style == 'FD' || $style == 'DF') $op = 'B';
+        else $op = 'S';
 
         // drawing
         $this->_Point($x1, $y1, true);
@@ -738,7 +738,7 @@ 
     public function svgLine($x1, $y1, $x2, $y2)
     {
         // get the Closing operator
-        $op='S';
+        $op = 'S';
 
         // drawing
         $this->_Point($x1, $y1, true);
@@ -759,12 +759,12 @@ 
     public function svgEllipse($x0, $y0, $rx, $ry, $style)
     {
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if ($style == 'F') $op = 'f';
+        elseif ($style == 'FD' || $style == 'DF') $op = 'B';
+        else $op = 'S';
 
         // drawing
-        $this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
+        $this->_Arc($x0, $y0, $rx, $ry, 0, 2 * M_PI, true, true, true);
         $this->_out($op);
     }
 
@@ -778,16 +778,16 @@ 
     public function svgPolygone($actions, $style)
     {
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if ($style == 'F') $op = 'f';
+        elseif ($style == 'FD' || $style == 'DF') $op = 'B';
+        else $op = 'S';
 
         // To save the First action and the last point
         $first = array('', 0, 0);
         $last = array(0, 0, 0, 0);
 
         foreach ($actions as $action) {
-            switch($action[0])
+            switch ($action[0])
             {
                 // Start the Path
                 case 'M':
@@ -812,7 +812,7 @@ 
 
                 // Make a Line (vector from last point)
                 case 'l':
-                    $x = $last[0]+$action[1]; $y = $last[1]+$action[2]; $xc = $x; $yc = $y;
+                    $x = $last[0] + $action[1]; $y = $last[1] + $action[2]; $xc = $x; $yc = $y;
                     $this->_Line($x, $y, true);
                     break;
 
@@ -824,7 +824,7 @@ 
 
                 // Make a Horisontal Line (vector from last point)
                 case 'h':
-                    $x = $last[0]+$action[1]; $y = $last[1]; $xc = $x; $yc = $y;
+                    $x = $last[0] + $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
                     $this->_Line($x, $y, true);
                     break;
 
@@ -836,21 +836,21 @@ 
 
                 // Make a Vertical Line (vector from last point)
                 case 'v':
-                    $x = $last[0]; $y = $last[1]+$action[1]; $xc = $x; $yc = $y;
+                    $x = $last[0]; $y = $last[1] + $action[1]; $xc = $x; $yc = $y;
                     $this->_Line($x, $y, true);
                     break;
 
                 // Make a Arc (new point)
                 case 'A':
-                    $rx = $action[1];   // rx
-                    $ry = $action[2];   // ry
-                    $a = $action[3];    // deviation angle of the axis X
-                    $l = $action[4];    // large-arc-flag
-                    $s = $action[5];    // sweep-flag
-                    $x1 = $last[0];     // begin x
-                    $y1 = $last[1];     // begin y
-                    $x2 = $action[6];   // final x
-                    $y2 = $action[7];   // final y
+                    $rx = $action[1]; // rx
+                    $ry = $action[2]; // ry
+                    $a = $action[3]; // deviation angle of the axis X
+                    $l = $action[4]; // large-arc-flag
+                    $s = $action[5]; // sweep-flag
+                    $x1 = $last[0]; // begin x
+                    $y1 = $last[1]; // begin y
+                    $x2 = $action[6]; // final x
+                    $y2 = $action[7]; // final y
 
                     $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
                     $x = $x2; $y = $y2; $xc = $x; $yc = $y;
@@ -858,15 +858,15 @@ 
 
                 // Make a Arc (vector from last point)
                 case 'a':
-                    $rx = $action[1];   // rx
-                    $ry = $action[2];   // ry
-                    $a = $action[3];    // deviation angle of the axis X
-                    $l = $action[4];    // large-arc-flag
-                    $s = $action[5];    // sweep-flag
-                    $x1 = $last[0];     // begin x
-                    $y1 = $last[1];     // begin y
-                    $x2 = $last[0]+$action[6]; // final x
-                    $y2 = $last[1]+$action[7]; // final y
+                    $rx = $action[1]; // rx
+                    $ry = $action[2]; // ry
+                    $a = $action[3]; // deviation angle of the axis X
+                    $l = $action[4]; // large-arc-flag
+                    $s = $action[5]; // sweep-flag
+                    $x1 = $last[0]; // begin x
+                    $y1 = $last[1]; // begin y
+                    $x2 = $last[0] + $action[6]; // final x
+                    $y2 = $last[1] + $action[7]; // final y
 
                     $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
                     $x = $x2; $y = $y2; $xc = $x; $yc = $y;
@@ -886,19 +886,19 @@ 
 
                 // Make a Bezier Curve (vector from last point)
                 case 'c':
-                    $x1 = $last[0]+$action[1];
-                    $y1 = $last[1]+$action[2];
-                    $x2 = $last[0]+$action[3];
-                    $y2 = $last[1]+$action[4];
-                    $xf = $last[0]+$action[5];
-                    $yf = $last[1]+$action[6];
+                    $x1 = $last[0] + $action[1];
+                    $y1 = $last[1] + $action[2];
+                    $x2 = $last[0] + $action[3];
+                    $y2 = $last[1] + $action[4];
+                    $xf = $last[0] + $action[5];
+                    $yf = $last[1] + $action[6];
                     $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
                     $x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
                     break;
 
                 // Unknown Path
                 default:
-                    throw new HTML2PDF_exception(0, 'SVG Path Error : ['.$action[0].'] unkown');
+                    throw new HTML2PDF_exception(0, 'SVG Path Error : [' . $action[0] . '] unkown');
             }
 
             // save the last point
@@ -984,14 +984,14 @@ 
         $angleEnd,
         $direction = true,
         $drawFirst = true,
-        $trans=false)
+        $trans = false)
     {
         // if we want the no trigo direction : add 2PI to the begin angle, to invert the direction
-        if (!$direction) $angleBegin+= M_PI*2.;
+        if (!$direction) $angleBegin += M_PI * 2.;
 
         // cut in segment to convert in berize curv
-        $dt = ($angleEnd - $angleBegin)/self::ARC_NB_SEGMENT;
-        $dtm = $dt/3;
+        $dt = ($angleEnd - $angleBegin) / self::ARC_NB_SEGMENT;
+        $dtm = $dt / 3;
 
         // center of the arc
         $x0 = $xc; $y0 = $yc;
@@ -1009,7 +1009,7 @@ 
         // foreach segment
         for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
             // calculing the next point
-            $t1 = ($i * $dt)+$angleBegin;
+            $t1 = ($i * $dt) + $angleBegin;
             $a1 = $x0 + ($rx * cos($t1));
             $b1 = $y0 + ($ry * sin($t1));
             $c1 = -$rx * sin($t1);
@@ -1046,7 +1046,7 @@ 
      * @param boolean $trans apply transformation
      * @access protected
      */
-    protected function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $angle=0., $l=0, $s=0, $trans = false)
+    protected function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $angle = 0., $l = 0, $s = 0, $trans = false)
     {
         // array to stock the parameters
         $v = array();
@@ -1060,50 +1060,50 @@ 
         $v['ry'] = $ry;
 
         // rotate with the deviation angle of the axis X
-        $v['xr1'] = $v['x1']*cos($angle) - $v['y1']*sin($angle);
-        $v['yr1'] = $v['x1']*sin($angle) + $v['y1']*cos($angle);
-        $v['xr2'] = $v['x2']*cos($angle) - $v['y2']*sin($angle);
-        $v['yr2'] = $v['x2']*sin($angle) + $v['y2']*cos($angle);
+        $v['xr1'] = $v['x1'] * cos($angle) - $v['y1'] * sin($angle);
+        $v['yr1'] = $v['x1'] * sin($angle) + $v['y1'] * cos($angle);
+        $v['xr2'] = $v['x2'] * cos($angle) - $v['y2'] * sin($angle);
+        $v['yr2'] = $v['x2'] * sin($angle) + $v['y2'] * cos($angle);
 
         // the normalized vector
-        $v['Xr1'] = $v['xr1']/$v['rx'];
-        $v['Yr1'] = $v['yr1']/$v['ry'];
-        $v['Xr2'] = $v['xr2']/$v['rx'];
-        $v['Yr2'] = $v['yr2']/$v['ry'];
-        $v['dXr'] = $v['Xr2']-$v['Xr1'];
-        $v['dYr'] = $v['Yr2']-$v['Yr1'];
-        $v['D'] = $v['dXr']*$v['dXr'] + $v['dYr']*$v['dYr'];
+        $v['Xr1'] = $v['xr1'] / $v['rx'];
+        $v['Yr1'] = $v['yr1'] / $v['ry'];
+        $v['Xr2'] = $v['xr2'] / $v['rx'];
+        $v['Yr2'] = $v['yr2'] / $v['ry'];
+        $v['dXr'] = $v['Xr2'] - $v['Xr1'];
+        $v['dYr'] = $v['Yr2'] - $v['Yr1'];
+        $v['D'] = $v['dXr'] * $v['dXr'] + $v['dYr'] * $v['dYr'];
 
         // if |vector| is Null, or if |vector| > 2 : impossible to make a arc => Line
-        if ($v['D']==0 || $v['D']>4) {
+        if ($v['D'] == 0 || $v['D'] > 4) {
             $this->_Line($x2, $y2, $trans);
             return false;
         }
 
         // convert paramters for make a arc with Center, Radius, from angleBegin to angleEnd
         $v['s1'] = array();
-        $v['s1']['t'] = sqrt((4.-$v['D'])/$v['D']);
-        $v['s1']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s1']['t']*($v['Yr2']-$v['Yr1'])/2.;
-        $v['s1']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s1']['t']*($v['Xr1']-$v['Xr2'])/2.;
-        $v['s1']['xr'] = $v['s1']['Xr']*$v['rx'];
-        $v['s1']['yr'] = $v['s1']['Yr']*$v['ry'];
-        $v['s1']['x'] = $v['s1']['xr']*cos($angle)+$v['s1']['yr']*sin($angle);
-        $v['s1']['y'] =-$v['s1']['xr']*sin($angle)+$v['s1']['yr']*cos($angle);
-        $v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']);
-        $v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']);
-        if ($v['s1']['a1']>$v['s1']['a2']) $v['s1']['a1']-=2*M_PI;
+        $v['s1']['t'] = sqrt((4. - $v['D']) / $v['D']);
+        $v['s1']['Xr'] = ($v['Xr1'] + $v['Xr2']) / 2. + $v['s1']['t'] * ($v['Yr2'] - $v['Yr1']) / 2.;
+        $v['s1']['Yr'] = ($v['Yr1'] + $v['Yr2']) / 2. + $v['s1']['t'] * ($v['Xr1'] - $v['Xr2']) / 2.;
+        $v['s1']['xr'] = $v['s1']['Xr'] * $v['rx'];
+        $v['s1']['yr'] = $v['s1']['Yr'] * $v['ry'];
+        $v['s1']['x'] = $v['s1']['xr'] * cos($angle) + $v['s1']['yr'] * sin($angle);
+        $v['s1']['y'] = -$v['s1']['xr'] * sin($angle) + $v['s1']['yr'] * cos($angle);
+        $v['s1']['a1'] = atan2($v['y1'] - $v['s1']['y'], $v['x1'] - $v['s1']['x']);
+        $v['s1']['a2'] = atan2($v['y2'] - $v['s1']['y'], $v['x2'] - $v['s1']['x']);
+        if ($v['s1']['a1'] > $v['s1']['a2']) $v['s1']['a1'] -= 2 * M_PI;
 
         $v['s2'] = array();
         $v['s2']['t'] = -$v['s1']['t'];
-        $v['s2']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s2']['t']*($v['Yr2']-$v['Yr1'])/2.;
-        $v['s2']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s2']['t']*($v['Xr1']-$v['Xr2'])/2.;
-        $v['s2']['xr'] = $v['s2']['Xr']*$v['rx'];
-        $v['s2']['yr'] = $v['s2']['Yr']*$v['ry'];
-        $v['s2']['x'] = $v['s2']['xr']*cos($angle)+$v['s2']['yr']*sin($angle);
-        $v['s2']['y'] =-$v['s2']['xr']*sin($angle)+$v['s2']['yr']*cos($angle);
-        $v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']);
-        $v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']);
-        if ($v['s2']['a1']>$v['s2']['a2']) $v['s2']['a1']-=2*M_PI;
+        $v['s2']['Xr'] = ($v['Xr1'] + $v['Xr2']) / 2. + $v['s2']['t'] * ($v['Yr2'] - $v['Yr1']) / 2.;
+        $v['s2']['Yr'] = ($v['Yr1'] + $v['Yr2']) / 2. + $v['s2']['t'] * ($v['Xr1'] - $v['Xr2']) / 2.;
+        $v['s2']['xr'] = $v['s2']['Xr'] * $v['rx'];
+        $v['s2']['yr'] = $v['s2']['Yr'] * $v['ry'];
+        $v['s2']['x'] = $v['s2']['xr'] * cos($angle) + $v['s2']['yr'] * sin($angle);
+        $v['s2']['y'] = -$v['s2']['xr'] * sin($angle) + $v['s2']['yr'] * cos($angle);
+        $v['s2']['a1'] = atan2($v['y1'] - $v['s2']['y'], $v['x1'] - $v['s2']['x']);
+        $v['s2']['a2'] = atan2($v['y2'] - $v['s2']['y'], $v['x2'] - $v['s2']['x']);
+        if ($v['s2']['a1'] > $v['s2']['a2']) $v['s2']['a1'] -= 2 * M_PI;
 
         if (!$l) {
             if ($s) {
@@ -1145,20 +1145,20 @@ 
      * @return boolean
      * @access public
      */
-    public function ptTransform(&$x,  &$y, $trans=true)
+    public function ptTransform(&$x, &$y, $trans = true)
     {
         // load the last Transfomation Matrix
         $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
+        if ($nb)    $m = $this->_transf[$nb - 1];
+        else        $m = array(1, 0, 0, 1, 0, 0);
 
         // apply the Transformation Matrix
-        list($x,$y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
+        list($x, $y) = array(($x * $m[0] + $y * $m[2] + $m[4]), ($x * $m[1] + $y * $m[3] + $m[5]));
 
         // if true => convert into PDF unit
         if ($trans) {
-            $x = $x*$this->k;
-            $y = ($this->h-$y)*$this->k;
+            $x = $x * $this->k;
+            $y = ($this->h - $y) * $this->k;
         }
 
         return true;
@@ -1174,20 +1174,20 @@ 
     {
         // get the last Transformation Matrix
         $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
+        if ($nb)    $m = $this->_transf[$nb - 1];
+        else        $m = array(1, 0, 0, 1, 0, 0);
 
         // if no transform, get the Identity Matrix
-        if (!$n) $n = array(1,0,0,1,0,0);
+        if (!$n) $n = array(1, 0, 0, 1, 0, 0);
 
         // create the new Transformation Matrix
         $this->_transf[] = array(
-            $m[0]*$n[0]+$m[2]*$n[1],
-            $m[1]*$n[0]+$m[3]*$n[1],
-            $m[0]*$n[2]+$m[2]*$n[3],
-            $m[1]*$n[2]+$m[3]*$n[3],
-            $m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-            $m[1]*$n[4]+$m[3]*$n[5]+$m[5]
+            $m[0] * $n[0] + $m[2] * $n[1],
+            $m[1] * $n[0] + $m[3] * $n[1],
+            $m[0] * $n[2] + $m[2] * $n[3],
+            $m[1] * $n[2] + $m[3] * $n[3],
+            $m[0] * $n[4] + $m[2] * $n[5] + $m[4],
+            $m[1] * $n[4] + $m[3] * $n[5] + $m[5]
         );
     }
 
@@ -1228,7 +1228,7 @@ 
         $this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
 
         // it Label => add the FontSize to the height
-        if ($labelFontsize) $h+= ($labelFontsize);
+        if ($labelFontsize) $h += ($labelFontsize);
 
         // return the size of the barcode
         return array($w, $h);
@@ -1269,48 +1269,48 @@ 
         $this->Ln(10);
 
         // get the number of bookmarks
-        $size=sizeof($this->outlines);
+        $size = sizeof($this->outlines);
 
         // get the size of the "P. xx" cell
-        $pageCellSize=$this->GetStringWidth('p. '.$this->outlines[$size-1]['p'])+2;
+        $pageCellSize = $this->GetStringWidth('p. ' . $this->outlines[$size - 1]['p']) + 2;
 
         // Foreach bookmark
-        for ($i=0;$i<$size;$i++) {
+        for ($i = 0; $i < $size; $i++) {
             // if we need a new page => add a new page
-            if ($this->getY()+$this->FontSize>=($this->h - $this->bMargin)) {
+            if ($this->getY() + $this->FontSize >= ($this->h - $this->bMargin)) {
                 $obj->_INDEX_NewPage($page);
                 $this->SetFont($fontName, '', $sizeBookmark);
             }
 
             // Offset of the current level
-            $level=$this->outlines[$i]['l'];
-            if($level>0) $this->Cell($level*8);
+            $level = $this->outlines[$i]['l'];
+            if ($level > 0) $this->Cell($level * 8);
 
             // Caption (cut to fit on the width page)
-            $str=$this->outlines[$i]['t'];
-            $strsize=$this->GetStringWidth($str);
-            $availableSize=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-4;
-            while ($strsize>=$availableSize) {
-                $str=substr($str, 0, -1);
-                $strsize=$this->GetStringWidth($str);
+            $str = $this->outlines[$i]['t'];
+            $strsize = $this->GetStringWidth($str);
+            $availableSize = $this->w - $this->lMargin - $this->rMargin - $pageCellSize - ($level * 8) - 4;
+            while ($strsize >= $availableSize) {
+                $str = substr($str, 0, -1);
+                $strsize = $this->GetStringWidth($str);
             }
 
             // if we want to display the page nmber
             if ($displayPage) {
                 // display the Bookmark Caption
-                $this->Cell($strsize+2, $this->FontSize+2, $str);
+                $this->Cell($strsize + 2, $this->FontSize + 2, $str);
 
                 //Filling dots
-                $w=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-($strsize+2);
-                $nb=$w/$this->GetStringWidth('.');
-                $dots=str_repeat('.', $nb);
-                $this->Cell($w, $this->FontSize+2, $dots, 0, 0, 'R');
+                $w = $this->w - $this->lMargin - $this->rMargin - $pageCellSize - ($level * 8) - ($strsize + 2);
+                $nb = $w / $this->GetStringWidth('.');
+                $dots = str_repeat('.', $nb);
+                $this->Cell($w, $this->FontSize + 2, $dots, 0, 0, 'R');
 
                 //Page number
-                $this->Cell($pageCellSize, $this->FontSize+2, 'p. '.$this->outlines[$i]['p'], 0, 1, 'R');
+                $this->Cell($pageCellSize, $this->FontSize + 2, 'p. ' . $this->outlines[$i]['p'], 0, 1, 'R');
             } else {
                 // display the Bookmark Caption
-                $this->Cell($strsize+2, $this->FontSize+2, $str, 0, 1);
+                $this->Cell($strsize + 2, $this->FontSize + 2, $str, 0, 1);
             }
         }
     }
@@ -1324,11 +1324,11 @@ 
      */
     public function getMyAliasNbPages()
     {
-        if ($this->_myLastPageGroupNb==0) {
+        if ($this->_myLastPageGroupNb == 0) {
             return $this->getAliasNbPages();
         } else {
             $old = $this->currpagegroup;
-            $this->currpagegroup = '{nb'.$this->_myLastPageGroupNb.'}';
+            $this->currpagegroup = '{nb' . $this->_myLastPageGroupNb . '}';
             $new = $this->getPageGroupAlias();
             $this->currpagegroup = $old;
 
@@ -1343,16 +1343,16 @@ 
      * @param  integer $page
      * @return integer;
      */
-    public function getMyNumPage($page=null)
+    public function getMyNumPage($page = null)
     {
-        if ($page===null) {
+        if ($page === null) {
             $page = $this->page;
         }
 
-        if ($this->_myLastPageGroupNb==0) {
+        if ($this->_myLastPageGroupNb == 0) {
             return $page;
         } else {
-            return $page-$this->_myLastPageGroup;
+            return $page - $this->_myLastPageGroup;
         }
     }
 
@@ -1365,7 +1365,7 @@ 
      */
     public function myStartPageGroup()
     {
-        $this->_myLastPageGroup = $this->page-1;
+        $this->_myLastPageGroup = $this->page - 1;
         $this->_myLastPageGroupNb++;
     }
 

Braces +73 added lines, -28 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * HTML2PDF Librairy - myPdf class
  *
@@ -552,8 +554,12 @@ 
     public function setRotation($angle, $xC=null, $yC=null)
     {
         // if no center, rotate around the current posiition
-        if($xC === null) $xC=$this->x;
-        if($yC === null) $yC=$this->y;
+        if($xC === null) {
+        	$xC=$this->x;
+        }
+        if($yC === null) {
+        	$yC=$this->y;
+        }
 
         // prepare the coordinate
         $yC=($this->h-$yC)*$this->k;
@@ -595,8 +601,9 @@ 
      */
     public function SetY($y, $resetx=true, $rtloff=false)
     {
-        if ($resetx)
-            $this->x=$this->lMargin;
+        if ($resetx) {
+                    $this->x=$this->lMargin;
+        }
 
         $this->y=$y;
     }
@@ -713,9 +720,13 @@ 
         $y4=$y+$h;
 
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if($style=='F') {
+        	$op='f';
+        } elseif($style=='FD' || $style=='DF') {
+        	$op='B';
+        } else {
+        	$op='S';
+        }
 
         // drawing
         $this->_Point($x1, $y1, true);
@@ -759,9 +770,13 @@ 
     public function svgEllipse($x0, $y0, $rx, $ry, $style)
     {
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if($style=='F') {
+        	$op='f';
+        } elseif($style=='FD' || $style=='DF') {
+        	$op='B';
+        } else {
+        	$op='S';
+        }
 
         // drawing
         $this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
@@ -778,9 +793,13 @@ 
     public function svgPolygone($actions, $style)
     {
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if($style=='F') {
+        	$op='f';
+        } elseif($style=='FD' || $style=='DF') {
+        	$op='B';
+        } else {
+        	$op='S';
+        }
 
         // To save the First action and the last point
         $first = array('', 0, 0);
@@ -919,7 +938,9 @@ 
      */
     protected function _Point($x, $y, $trans = false)
     {
-        if ($trans) $this->ptTransform($x, $y);
+        if ($trans) {
+        	$this->ptTransform($x, $y);
+        }
 
         $this->_out(sprintf('%.2F %.2F m', $x, $y));
     }
@@ -934,7 +955,9 @@ 
      */
     protected function _Line($x, $y, $trans = false)
     {
-        if ($trans) $this->ptTransform($x, $y);
+        if ($trans) {
+        	$this->ptTransform($x, $y);
+        }
 
         $this->_out(sprintf('%.2F %.2F l', $x, $y));
     }
@@ -987,7 +1010,9 @@ 
         $trans=false)
     {
         // if we want the no trigo direction : add 2PI to the begin angle, to invert the direction
-        if (!$direction) $angleBegin+= M_PI*2.;
+        if (!$direction) {
+        	$angleBegin+= M_PI*2.;
+        }
 
         // cut in segment to convert in berize curv
         $dt = ($angleEnd - $angleBegin)/self::ARC_NB_SEGMENT;
@@ -1004,7 +1029,9 @@ 
         $d0 = $ry * cos($t1);
 
         // if drawFirst => draw the first point
-        if ($drawFirst) $this->_Point($a0, $b0, $trans);
+        if ($drawFirst) {
+        	$this->_Point($a0, $b0, $trans);
+        }
 
         // foreach segment
         for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
@@ -1091,7 +1118,9 @@ 
         $v['s1']['y'] =-$v['s1']['xr']*sin($angle)+$v['s1']['yr']*cos($angle);
         $v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']);
         $v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']);
-        if ($v['s1']['a1']>$v['s1']['a2']) $v['s1']['a1']-=2*M_PI;
+        if ($v['s1']['a1']>$v['s1']['a2']) {
+        	$v['s1']['a1']-=2*M_PI;
+        }
 
         $v['s2'] = array();
         $v['s2']['t'] = -$v['s1']['t'];
@@ -1103,7 +1132,9 @@ 
         $v['s2']['y'] =-$v['s2']['xr']*sin($angle)+$v['s2']['yr']*cos($angle);
         $v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']);
         $v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']);
-        if ($v['s2']['a1']>$v['s2']['a2']) $v['s2']['a1']-=2*M_PI;
+        if ($v['s2']['a1']>$v['s2']['a2']) {
+        	$v['s2']['a1']-=2*M_PI;
+        }
 
         if (!$l) {
             if ($s) {
@@ -1149,8 +1180,11 @@ 
     {
         // load the last Transfomation Matrix
         $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
+        if ($nb) {
+        	$m = $this->_transf[$nb-1];
+        } else {
+        	$m = array(1,0,0,1,0,0);
+        }
 
         // apply the Transformation Matrix
         list($x,$y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
@@ -1174,11 +1208,16 @@ 
     {
         // get the last Transformation Matrix
         $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
+        if ($nb) {
+        	$m = $this->_transf[$nb-1];
+        } else {
+        	$m = array(1,0,0,1,0,0);
+        }
 
         // if no transform, get the Identity Matrix
-        if (!$n) $n = array(1,0,0,1,0,0);
+        if (!$n) {
+        	$n = array(1,0,0,1,0,0);
+        }
 
         // create the new Transformation Matrix
         $this->_transf[] = array(
@@ -1228,7 +1267,9 @@ 
         $this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
 
         // it Label => add the FontSize to the height
-        if ($labelFontsize) $h+= ($labelFontsize);
+        if ($labelFontsize) {
+        	$h+= ($labelFontsize);
+        }
 
         // return the size of the barcode
         return array($w, $h);
@@ -1258,7 +1299,9 @@ 
         $fontName = 'helvetica')
     {
         // bookmark the Title if wanted
-        if ($bookmarkTitle) $this->Bookmark($titre, 0, -1);
+        if ($bookmarkTitle) {
+        	$this->Bookmark($titre, 0, -1);
+        }
 
         // display the Title with the good Font size
         $this->SetFont($fontName, '', $sizeTitle);
@@ -1284,7 +1327,9 @@ 
 
             // Offset of the current level
             $level=$this->outlines[$i]['l'];
-            if($level>0) $this->Cell($level*8);
+            if($level>0) {
+            	$this->Cell($level*8);
+            }
 
             // Caption (cut to fit on the width page)
             $str=$this->outlines[$i]['t'];