Eoxia / wpshop

script/wp-emulator.script.php

Spacing +35 added lines, -35 removed lines

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

script/unit.script.php

Spacing +2 added lines, -2 removed lines

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

includes/librairies/eav/entities.class.php

Spacing +226 added lines, -226 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'));
 }
 
 /**
@@ -31,20 +31,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,
@@ -74,13 +74,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');
 		}
 	}
@@ -90,24 +90,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>';
 
@@ -119,32 +119,32 @@ 
 	 *
 	 * @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 = '';
-		if ( !empty($_GET['post']) ) {
+		if (!empty($_GET['post'])) {
 			$current_entity_params = get_post_meta(wpshop_tools::varSanitizer($_GET['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;
 	}
 
@@ -152,20 +152,20 @@ 
 	 * Save custom information for entity type
 	 */
 	public static function save_entity_type_custom_informations() {
-		$post_id = !empty($_POST['post_ID']) ? intval( wpshop_tools::varSanitizer($_POST['post_ID']) ) : null;
+		$post_id = !empty($_POST['post_ID']) ? intval(wpshop_tools::varSanitizer($_POST['post_ID'])) : null;
 		$post_support = !empty($_POST['wpshop_entity_support']) ? $_POST['wpshop_entity_support'] : null;
 		$wpshop_entity_rewrite = !empty($_POST['wpshop_entity_rewrite']) ? $_POST['wpshop_entity_rewrite'] : null;
 		$wpshop_entity_display_menu = !empty($_POST['wpshop_display_in_admin_menu']) ? $_POST['wpshop_display_in_admin_menu'] : null;
 
-		if ( !empty ($_POST['address_type']) ) {
+		if (!empty ($_POST['address_type'])) {
 			$save_array = array();
-			foreach ( $_POST['address_type'] as $key=>$value ) {
-				$save_array[] = intval( wpshop_tools::varSanitizer($value) );
+			foreach ($_POST['address_type'] as $key=>$value) {
+				$save_array[] = intval(wpshop_tools::varSanitizer($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();
 		}
@@ -174,19 +174,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;
 	}
@@ -206,12 +206,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 {
@@ -219,17 +219,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,
@@ -243,7 +243,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 */
@@ -254,7 +254,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
 			 */
@@ -269,10 +269,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';
 			}
 		}
@@ -284,7 +284,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;
 
@@ -299,7 +299,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
 			 */
@@ -310,8 +310,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;
 				}
 
@@ -324,28 +324,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;
 					}
 				}
@@ -353,12 +353,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));
 			}
 
 		}
@@ -388,22 +388,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>';
 					}
 				}
 			}
@@ -418,33 +418,33 @@ 
 	/**
 	 * Save informations for current entity
 	 */
-	public static function save_entities_custom_informations( $post ) {
+	public static function save_entities_custom_informations($post) {
        global $wpdb;
        global $wpshop_account;
-		$post_id = !empty($_REQUEST['post_ID']) ? intval( wpshop_tools::varSanitizer($_REQUEST['post_ID']) ) : null;
+		$post_id = !empty($_REQUEST['post_ID']) ? intval(wpshop_tools::varSanitizer($_REQUEST['post_ID'])) : null;
 
-		if ( !empty($post_id) && empty($_POST['edit_other_thing']) || ( !empty($_REQUEST['post_ID']) && !(bool)$_POST['edit_other_thing'] && get_post_type($_REQUEST['post_ID']) != WPSHOP_NEWTYPE_IDENTIFIER_ORDER  ) ) {
+		if (!empty($post_id) && empty($_POST['edit_other_thing']) || (!empty($_REQUEST['post_ID']) && !(bool)$_POST['edit_other_thing'] && get_post_type($_REQUEST['post_ID']) != WPSHOP_NEWTYPE_IDENTIFIER_ORDER)) {
 			$current_post_type = get_post_type($post_id);
 
 
 
 
 			/*	Vérification de l'existence de l'envoi de l'identifiant du set d'attribut	*/
-			if	( !empty($_REQUEST[$current_post_type . '_attribute_set_id']) ) {
-				$attribute_set_id = intval( wpshop_tools::varSanitizer($_REQUEST[$current_post_type . '_attribute_set_id']) );
+			if (!empty($_REQUEST[$current_post_type . '_attribute_set_id'])) {
+				$attribute_set_id = intval(wpshop_tools::varSanitizer($_REQUEST[$current_post_type . '_attribute_set_id']));
 				$attribet_set_infos = wpshop_attributes_set::getElement($attribute_set_id, "'valid'", 'id');
 
-				if ( $attribet_set_infos->entity == $_REQUEST['post_type'] ) {
+				if ($attribet_set_infos->entity == $_REQUEST['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	*/
-					if ( !empty($_REQUEST[$current_post_type . '_attribute']) ) {
+					if (!empty($_REQUEST[$current_post_type . '_attribute'])) {
 						/*	Traduction des virgule en point pour la base de donnees	*/
-						if ( !empty($_REQUEST[$current_post_type . '_attribute']['decimal']) ) {
-							foreach($_REQUEST[$current_post_type . '_attribute']['decimal'] as $attributeName => $attributeValue){
-								if(!is_array($attributeValue)){
-									$_REQUEST[$current_post_type . '_attribute']['decimal'][$attributeName] = str_replace(',','.',$_REQUEST[$current_post_type . '_attribute']['decimal'][$attributeName]);
+						if (!empty($_REQUEST[$current_post_type . '_attribute']['decimal'])) {
+							foreach ($_REQUEST[$current_post_type . '_attribute']['decimal'] as $attributeName => $attributeValue) {
+								if (!is_array($attributeValue)) {
+									$_REQUEST[$current_post_type . '_attribute']['decimal'][$attributeName] = str_replace(',', '.', $_REQUEST[$current_post_type . '_attribute']['decimal'][$attributeName]);
 								}
 							}
 						}
@@ -453,8 +453,8 @@ 
 
 						/*	Enregistrement des valeurs des attributs dans les metas de l'entité => Permet de profiter de la recherche native de wordpress	*/
 						$productMetaDatas = array();
-						foreach ( $_REQUEST[$current_post_type . '_attribute'] as $attributeType => $attributeValues ) {
-							foreach ( $attributeValues as $attributeCode => $attributeValue ) {
+						foreach ($_REQUEST[$current_post_type . '_attribute'] as $attributeType => $attributeValues) {
+							foreach ($attributeValues as $attributeCode => $attributeValue) {
 								$productMetaDatas[$attributeCode] = $attributeValue;
 							}
 						}
@@ -463,42 +463,42 @@ 
 					}
 				}
 			}
-			if ( !empty($_REQUEST['attribute']) ) {
+			if (!empty($_REQUEST['attribute'])) {
 				$current_id = array();
-				foreach ( $_REQUEST['attribute'] as $key=>$values ) {
+				foreach ($_REQUEST['attribute'] as $key=>$values) {
 					$ad_id = '';
 					$addresses_id = get_post_meta($_REQUEST['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)) {
 						$_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 ($_REQUEST['post_ID'], '_wpshop_attached_address', $current_id);
+				if (!empty($current_id)) {
+					update_post_meta($_REQUEST['post_ID'], '_wpshop_attached_address', $current_id);
 				}
 			}
 			else {
 				$current_id = array();
-				if ( !empty ($_REQUEST['address_type']) ) {
-					foreach ( $_REQUEST['address_type'] as $key=>$value ) {
+				if (!empty ($_REQUEST['address_type'])) {
+					foreach ($_REQUEST['address_type'] as $key=>$value) {
 						$current_id[] = $value;
 					}
 				}
-				update_post_meta ($_REQUEST['post_ID'], '_wpshop_entity_attached_address', $current_id);
+				update_post_meta($_REQUEST['post_ID'], '_wpshop_entity_attached_address', $current_id);
 			}
 		}
 
 		/** Save price infos **/
-		if ( !empty($_REQUEST) && !empty($_REQUEST['post_ID']) && !empty( $_REQUEST['post_type']) && $_REQUEST['post_type'] == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
+		if (!empty($_REQUEST) && !empty($_REQUEST['post_ID']) && !empty($_REQUEST['post_type']) && $_REQUEST['post_type'] == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
 
 		}
 
@@ -521,7 +521,7 @@ 
 			'posts_per_page' 	=> '-1',
 		));
 
-		if ( !empty($entities) ) {
+		if (!empty($entities)) {
 			foreach ($entities as $entity_index => $entity) {
 				$entities_list[$entity->ID] = $entity->post_title;
 			}
@@ -558,7 +558,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);
@@ -576,18 +576,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] ) ? @unserialize($post_meta_value[0]) : '';
+			foreach ($current_post_meta as $post_meta_key => $post_meta_value) {
+				$meta_is_array = !empty($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;
@@ -595,17 +595,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);
@@ -631,12 +631,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" />',
@@ -663,34 +663,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
@@ -711,37 +711,37 @@ 
 	 * 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 = '';
-		if ( get_current_user_id() > 0 ) {
-			if ( !empty( $_POST['quick_entity_add_button'] ) ) {
+		if (get_current_user_id() > 0) {
+			if (!empty($_POST['quick_entity_add_button'])) {
 				$attributes = array();
-				foreach ( $_POST['attribute'] as $attribute_type => $attribute ) {
-					foreach ( $attribute as $attribute_code => $attribute_value ) {
+				foreach ($_POST['attribute'] as $attribute_type => $attribute) {
+					foreach ($attribute as $attribute_code => $attribute_value) {
 						$attributes[$attribute_code] = $attribute_value;
 					}
 				}
 				$result = wpshop_products::addProduct($_POST['wp_fields']['post_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;
@@ -753,7 +753,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;
@@ -766,7 +766,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;
@@ -799,20 +799,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>';
@@ -825,7 +825,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');
@@ -835,7 +835,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" />';
@@ -877,14 +877,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);
@@ -902,7 +902,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 = '';
@@ -922,47 +922,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];
 			}
 		}
@@ -978,20 +978,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];
 		}
@@ -1016,39 +1016,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 {
@@ -1059,18 +1059,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);
 	}
 
 	/**
@@ -1080,60 +1080,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;
 							}
 						}
@@ -1142,14 +1142,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));
 									}
 								}
@@ -1161,7 +1161,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/eav/wp_list_custom_attributes.class.php

Spacing +47 added lines, -47 removed lines

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

includes/librairies/eav/wp_list_custom_attributes_set.class.php

Spacing +40 added lines, -40 removed lines

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

includes/librairies/pdf/font/helveticabi.php

Spacing +14 added lines, -14 removed lines

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

includes/librairies/pdf/font/times.php

Spacing +14 added lines, -14 removed lines

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

includes/librairies/pdf/font/timesb.php

Spacing +14 added lines, -14 removed lines

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

includes/librairies/pdf/font/helvetica.php

Spacing +14 added lines, -14 removed lines

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