Eoxia / wpshop

includes/librairies/eav/attributes_set.class.php

Doc Comments +3 added lines, -2 removed lines

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

Indentation +73 added lines, -73 removed lines

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

Spacing +244 added lines, -244 removed lines

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

Braces +57 added lines, -55 removed lines

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

includes/librairies/eav/attributes_unit.class.php

Doc Comments +2 added lines, -1 removed lines

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

Indentation +78 added lines, -78 removed lines

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

Braces +48 added lines, -65 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -119,13 +121,11 @@ 
 			{
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
-			}
-			elseif($action == 'add')
+			} elseif($action == 'add')
 			{
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
-		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($_GET['page'] == self::getEditionSlug()))
+		} elseif((self::getEditionSlug() != self::getListingSlug()) && ($_GET['page'] == self::getEditionSlug()))
 		{
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
@@ -150,8 +150,7 @@ 
 		{
 			$editedElement = self::getElement($saveditem);
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
-		}
-		elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0))
+		} elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0))
 		{
 			$editedElement = self::getElement($saveditem, "'deleted'");
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully deleted', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
@@ -172,32 +171,27 @@ 
 					if(current_user_can('wpshop_delete_attributes'))
 					{
 						$_REQUEST[self::getDbTable()]['status'] = 'deleted';
-					}
-					else
+					} else
 					{
 						$actionResult = 'userNotAllowedForActionDelete';
 					}
 				}
 				$actionResult = wpshop_database::update($_REQUEST[self::getDbTable()], $id, self::getDbTable());
-			}
-			else
+			} else
 			{
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
-		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
+		} elseif(($pageAction != '') && (($pageAction == 'delete'))){
 			if(current_user_can('wpshop_delete_attributes'))
 			{
 				$_REQUEST[self::getDbTable()]['last_update_date'] = date('Y-m-d H:i:s');
 				$_REQUEST[self::getDbTable()]['status'] = 'deleted';
 				$actionResult = wpshop_database::update($_REQUEST[self::getDbTable()], $id, self::getDbTable());
-			}
-			else
+			} else
 			{
 				$actionResult = 'userNotAllowedForActionDelete';
 			}
-		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
+		} elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
 			if(current_user_can('wpshop_add_attributes')){
 				$_REQUEST[self::getDbTable()]['creation_date'] = date('Y-m-d H:i:s');
 				if(trim($_REQUEST[self::getDbTable()]['code']) == ''){
@@ -210,8 +204,7 @@ 
 				}
 				$actionResult = wpshop_database::save($_REQUEST[self::getDbTable()], self::getDbTable());
 				$id = $wpdb->insert_id;
-			}
-			else{
+			} else{
 				$actionResult = 'userNotAllowedForActionAdd';
 			}
 		}
@@ -229,8 +222,7 @@ 
 				{
 					$pageMessage .= '<br/>' . $wpdb->last_error;
 				}
-			}
-			elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate'))
+			} elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate'))
 			{/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				/*****************************************************************************************************************/
 				/*************************			CHANGE FOR SPECIFIC ACTION FOR CURRENT ELEMENT				******************/
@@ -243,17 +235,14 @@ 
 				if(($pageAction == 'edit') || ($pageAction == 'save'))
 				{
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=saveok&saveditem=" . $id));
-				}
-				elseif($pageAction == 'add')
+				} elseif($pageAction == 'add')
 				{
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
-				}
-				elseif($pageAction == 'delete')
+				} elseif($pageAction == 'delete')
 				{
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=deleteok&saveditem=" . $id));
 				}
-			}
-			elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete'))
+			} elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete'))
 			{
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('You are not allowed to do this action', 'wpshop');
 			}
@@ -302,8 +291,7 @@ 
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 					$subRowActions .= '
 		<a href="#" id="edit_attribute_unit_' . $element->id . '" class="edit_attribute_unit" >' . __('Edit', 'wpshop') . '</a>';
-				}
-				elseif(current_user_can('wpshop_view_attributes_unit'))
+				} elseif(current_user_can('wpshop_view_attributes_unit'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 				}
@@ -329,8 +317,7 @@ 
 
 				$line++;
 			}
-		}
-		else{
+		} else{
 			unset($tableRowValue);
 			$tableRowValue[] = array('class' => self::currentPageCode . '_label_cell', 'value' => __('No element to ouput here', 'wpshop'));
 			$tableRowValue[] = array('class' => self::currentPageCode . '_name_cell', 'value' => '');
@@ -411,8 +398,7 @@ 
 			$currentFieldValue = $input_def['value'];
 			if(is_object($editedItem)){
 				$currentFieldValue = $editedItem->{$input_def['name']};
-			}
-			elseif(($pageAction != '') && ($requestFormValue != '')){
+			} elseif(($pageAction != '') && ($requestFormValue != '')){
 				$currentFieldValue = $requestFormValue;
 			}
 
@@ -444,8 +430,7 @@ 
 				</div>';
 
 
-			}
-			else{
+			} else{
 				$the_form_content_hidden .= '
 	' . $the_input;
 			}
@@ -499,8 +484,7 @@ 
 			{
 				$currentPageButton .= '<input type="button" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
 			}
-		}
-		elseif(current_user_can('wpshop_edit_attributes'))
+		} elseif(current_user_can('wpshop_edit_attributes'))
 		{
 			$currentPageButton .= '<input type="button" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" /><input type="button" class="button-primary" id="saveandcontinue" name="saveandcontinue" value="' . __('Save and continue edit', 'wpshop') . '" />';
 		}
@@ -545,8 +529,7 @@ 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
 		if($element_id == ''){
 			$element_list = $wpdb->get_results($query);
-		}
-		else{
+		} else{
 			$element_list = $wpdb->get_row($query);
 		}
 
@@ -606,10 +589,11 @@ 
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if($element_id == '')
-			$element_list = $wpdb->get_results($query);
-		else
-			$element_list = $wpdb->get_row($query);
+		if($element_id == '') {
+					$element_list = $wpdb->get_results($query);
+		} else {
+					$element_list = $wpdb->get_row($query);
+		}
 
 		return $element_list;
 
@@ -653,8 +637,7 @@ 
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 					$subRowActions .= '
 		<a href="#" id="edit_attribute_unit_group_' . $element->id . '" class="edit_attribute_unit_group" >' . __('Edit', 'wpshop') . '</a>';
-				}
-				elseif(current_user_can('wpshop_view_attributes_unit_group'))
+				} elseif(current_user_can('wpshop_view_attributes_unit_group'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 				}
@@ -678,8 +661,7 @@ 
 
 				$line++;
 			}
-		}
-		else{
+		} else{
 			unset($tableRowValue);
 			$tableRowValue[] = array('class' => self::currentPageCode . '_label_cell', 'value' => __('No element to ouput here', 'wpshop'));
 			$tableRows[] = $tableRowValue;
@@ -756,8 +738,7 @@ 
 			$currentFieldValue = $input_def['value'];
 			if(is_object($editedItem)){
 				$currentFieldValue = $editedItem->{$input_def['name']};
-			}
-			elseif(($pageAction != '') && ($requestFormValue != '')){
+			} elseif(($pageAction != '') && ($requestFormValue != '')){
 				$currentFieldValue = $requestFormValue;
 			}
 
@@ -782,12 +763,10 @@ 
 	</div>';
 				if(substr($input_def['name'], 0, 3) == 'is_'){
 					$the_form_option_content .= $input;
-				}
-				else{
+				} else{
 					$the_form_general_content .= $input;
 				}
-			}
-			else{
+			} else{
 				$the_form_content_hidden .= '
 	' . $the_input;
 			}
@@ -841,8 +820,7 @@ 
 			foreach ( $currencies as $currency) {
 				$currencies_options .= '<option value="'.$currency->id.'"'.(($currency->id == $current_currency) ? ' selected="selected"' : null).'>'.$currency->name.' ('.$currency->unit.')</option>';
 			}
-		}
-		else {
+		} else {
 			foreach($wpshop_shop_currencies as $k => $v) {
 				$currencies_options .= '<option value="'.$k.'"'.(($k==$current_currency) ? ' selected="selected"' : null).'>'.$k.' ('.$v.')</option>';
 			}
@@ -874,14 +852,16 @@ 
 	public static function get_the_attribute_unit_by_code_for_product($product_id, $attribute_code) {
 		$unit = self::get_default_unit_attribute( $attribute_code );
 		
-		if(empty($unit))
-			return null;
+		if(empty($unit)) {
+					return null;
+		}
 		
 		$post_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
 
 		/** Si on trouve une unité */
-		if(!empty($post_meta) && !empty($post_meta['unit']) && !empty($post_meta['unit'][$attribute_code]))
-			$unit->_default_unit = $post_meta['unit'][$attribute_code];
+		if(!empty($post_meta) && !empty($post_meta['unit']) && !empty($post_meta['unit'][$attribute_code])) {
+					$unit->_default_unit = $post_meta['unit'][$attribute_code];
+		}
 
 		return $unit;
 	}
@@ -895,8 +875,9 @@ 
 	public static function the_attribute_unit_by_code_for_product($product_id, $attribute_code) {
 		$unit = self::get_the_attribute_unit_by_code_for_product($product_id, $attribute_code);
 		
-		if(empty($unit))
-			return null;
+		if(empty($unit)) {
+					return null;
+		}
 		
 		echo self::get_the_subname_unit($unit->_unit_group_id, $unit->_default_unit);
 	}
@@ -912,8 +893,9 @@ 
 		global $wpdb;
 		
 		/** Si pas d'unité ou de groupe, null */
-		if(0 === $unit_id || 0 === $group_id)
-			return null;
+		if(0 === $unit_id || 0 === $group_id) {
+					return null;
+		}
 		
 		return $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array( $group_id, $unit_id ) ) );
 	}
@@ -929,8 +911,9 @@ 
 		global $wpdb;
 		
 		/** Si pas d'unité ou de groupe, null */
-		if(0 === $unit_id || 0 === $group_id)
-			return null;
+		if(0 === $unit_id || 0 === $group_id) {
+					return null;
+		}
 		
 		return $wpdb->get_var( $wpdb->prepare( 'SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array( $group_id, $unit_id ) ) );
 	}

Spacing +114 added lines, -114 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'));
 }
 
 /**
@@ -112,20 +112,20 @@ 
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : '';
 		$objectInEdition = isset($_REQUEST['id']) ? wpshop_tools::varSanitizer($_REQUEST['id']) : '';
 
-		$title = __(self::pageTitle, 'wpshop' );
-		if($action != '')
+		$title = __(self::pageTitle, 'wpshop');
+		if ($action != '')
 		{
-			if(($action == 'edit') || ($action == 'delete'))
+			if (($action == 'edit') || ($action == 'delete'))
 			{
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
 			}
-			elseif($action == 'add')
+			elseif ($action == 'add')
 			{
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($_GET['page'] == self::getEditionSlug()))
+		elseif ((self::getEditionSlug() != self::getListingSlug()) && ($_GET['page'] == self::getEditionSlug()))
 		{
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
@@ -146,12 +146,12 @@ 
 		/****************************************************************************/
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : 'add';
 		$saveditem = isset($_REQUEST['saveditem']) ? wpshop_tools::varSanitizer($_REQUEST['saveditem']) : '';
-		if(($action != '') && ($action == 'saveok') && ($saveditem > 0))
+		if (($action != '') && ($action == 'saveok') && ($saveditem > 0))
 		{
 			$editedElement = self::getElement($saveditem);
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
 		}
-		elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0))
+		elseif (($action != '') && ($action == 'deleteok') && ($saveditem > 0))
 		{
 			$editedElement = self::getElement($saveditem, "'deleted'");
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully deleted', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
@@ -163,13 +163,13 @@ 
 		/*************************************************************************/
 		$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? wpshop_tools::varSanitizer($_REQUEST[self::getDbTable() . '_action']) : '';
 		$id = isset($_REQUEST[self::getDbTable()]['id']) ? wpshop_tools::varSanitizer($_REQUEST[self::getDbTable()]['id']) : '';
-		if(($pageAction != '') && (($pageAction == 'edit') || ($pageAction == 'editandcontinue'))){
-			if(current_user_can('wpshop_edit_attributes'))
+		if (($pageAction != '') && (($pageAction == 'edit') || ($pageAction == 'editandcontinue'))) {
+			if (current_user_can('wpshop_edit_attributes'))
 			{
 				$_REQUEST[self::getDbTable()]['last_update_date'] = date('Y-m-d H:i:s');
-				if($pageAction == 'delete')
+				if ($pageAction == 'delete')
 				{
-					if(current_user_can('wpshop_delete_attributes'))
+					if (current_user_can('wpshop_delete_attributes'))
 					{
 						$_REQUEST[self::getDbTable()]['status'] = 'deleted';
 					}
@@ -185,8 +185,8 @@ 
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
 		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
-			if(current_user_can('wpshop_delete_attributes'))
+		elseif (($pageAction != '') && (($pageAction == 'delete'))) {
+			if (current_user_can('wpshop_delete_attributes'))
 			{
 				$_REQUEST[self::getDbTable()]['last_update_date'] = date('Y-m-d H:i:s');
 				$_REQUEST[self::getDbTable()]['status'] = 'deleted';
@@ -197,21 +197,21 @@ 
 				$actionResult = 'userNotAllowedForActionDelete';
 			}
 		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
-			if(current_user_can('wpshop_add_attributes')){
+		elseif (($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))) {
+			if (current_user_can('wpshop_add_attributes')) {
 				$_REQUEST[self::getDbTable()]['creation_date'] = date('Y-m-d H:i:s');
-				if(trim($_REQUEST[self::getDbTable()]['code']) == ''){
+				if (trim($_REQUEST[self::getDbTable()]['code']) == '') {
 					$_REQUEST[self::getDbTable()]['code'] = $_REQUEST[self::getDbTable()]['frontend_label'];
 				}
 				$_REQUEST[self::getDbTable()]['code'] = wpshop_tools::slugify(str_replace("\'", "_", str_replace('\"', "_", $_REQUEST[self::getDbTable()]['code'])), array('noAccent', 'noSpaces', 'lowerCase', 'noPunctuation'));
 				$code_exists = self::getElement($_REQUEST[self::getDbTable()]['code'], "'valid', 'moderated', 'deleted'", 'code');
-				if((is_object($code_exists) || is_array($code_exists)) && (count($code_exists) > 0)){
+				if ((is_object($code_exists) || is_array($code_exists)) && (count($code_exists) > 0)) {
 					$_REQUEST[self::getDbTable()]['code'] = $_REQUEST[self::getDbTable()]['code'] . '_' . (count($code_exists) + 1);
 				}
 				$actionResult = wpshop_database::save($_REQUEST[self::getDbTable()], self::getDbTable());
 				$id = $wpdb->insert_id;
 			}
-			else{
+			else {
 				$actionResult = 'userNotAllowedForActionAdd';
 			}
 		}
@@ -221,16 +221,16 @@ 
 		/************		CHANGE THE FIELD NAME TO TAKE TO DISPLAY				*************/
 		/************		CHANGE ERROR MESSAGE FOR SPECIFIC CASE					*************/
 		/****************************************************************************/
-		if($actionResult != ''){
+		if ($actionResult != '') {
 			$elementIdentifierForMessage = '<span class="bold" >' . $_REQUEST[self::getDbTable()]['frontend_label'] . '</span>';
 			if ($actionResult == 'error') {
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . sprintf(__('An error occured while saving %s', 'wpshop'), $elementIdentifierForMessage);
-				if(WPSHOP_DEBUG_MODE)
+				if (WPSHOP_DEBUG_MODE)
 				{
 					$pageMessage .= '<br/>' . $wpdb->last_error;
 				}
 			}
-			elseif(($actionResult == 'done') || ($actionResult == 'nothingToUpdate'))
+			elseif (($actionResult == 'done') || ($actionResult == 'nothingToUpdate'))
 			{/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				/*****************************************************************************************************************/
 				/*************************			CHANGE FOR SPECIFIC ACTION FOR CURRENT ELEMENT				******************/
@@ -240,20 +240,20 @@ 
 				/*************************			GENERIC				****************************/
 				/***********************************************************************************/
 				$pageMessage .= '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), $elementIdentifierForMessage);
-				if(($pageAction == 'edit') || ($pageAction == 'save'))
+				if (($pageAction == 'edit') || ($pageAction == 'save'))
 				{
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=saveok&saveditem=" . $id));
 				}
-				elseif($pageAction == 'add')
+				elseif ($pageAction == 'add')
 				{
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
 				}
-				elseif($pageAction == 'delete')
+				elseif ($pageAction == 'delete')
 				{
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=deleteok&saveditem=" . $id));
 				}
 			}
-			elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete'))
+			elseif (($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete'))
 			{
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('You are not allowed to do this action', 'wpshop');
 			}
@@ -285,31 +285,31 @@ 
 
 		$line = 0;
 		$elementList = self::getElement();
-		if(is_array($elementList) && (count($elementList) > 0)){
-			foreach($elementList as $element)
+		if (is_array($elementList) && (count($elementList) > 0)) {
+			foreach ($elementList as $element)
 			{
 				$tableRowsId[$line] = self::getDbTable() . '_' . $element->id;
 
 				$elementLabel = __($element->name, 'wpshop');
 				$subRowActions = '';
 				$attributeSlugUrl = self::getListingSlug();
-				if(current_user_can('wpshop_add_attributes_unit'))
+				if (current_user_can('wpshop_add_attributes_unit'))
 				{
 					$attributeSlugUrl = self::getEditionSlug();
 				}
-				if(current_user_can('wpshop_edit_attributes_unit'))
+				if (current_user_can('wpshop_edit_attributes_unit'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 					$subRowActions .= '
 		<a href="#" id="edit_attribute_unit_' . $element->id . '" class="edit_attribute_unit" >' . __('Edit', 'wpshop') . '</a>';
 				}
-				elseif(current_user_can('wpshop_view_attributes_unit'))
+				elseif (current_user_can('wpshop_view_attributes_unit'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 				}
-				if(current_user_can('wpshop_delete_attributes_unit'))
+				if (current_user_can('wpshop_delete_attributes_unit'))
 				{
-					if($subRowActions != '')
+					if ($subRowActions != '')
 					{
 						$subRowActions .= '&nbsp;|&nbsp;';
 					}
@@ -330,14 +330,14 @@ 
 				$line++;
 			}
 		}
-		else{
+		else {
 			unset($tableRowValue);
 			$tableRowValue[] = array('class' => self::currentPageCode . '_label_cell', 'value' => __('No element to ouput here', 'wpshop'));
 			$tableRowValue[] = array('class' => self::currentPageCode . '_name_cell', 'value' => '');
 			$tableRowValue[] = array('class' => self::currentPageCode . '_code_cell', 'value' => '');
 			$tableRows[] = $tableRowValue;
 		}
-		if(current_user_can('wpshop_add_attributes_unit')){
+		if (current_user_can('wpshop_add_attributes_unit')) {
 			$listItemOutput .= '
 <input type="button" value="' . __('Add an unit', 'wpshop') . '" class="button-secondary alignleft" name="add_attribute_unit" id="add_attribute_unit" />';
 		}
@@ -346,10 +346,10 @@ 
 	wpshop(document).ready(function(){
 		jQuery("#' . $tableId . '").dataTable();
 		jQuery("#wpshop_unit_group_list_tab").show();';
-		if(current_user_can('wpshop_delete_attributes_unit')){
+		if (current_user_can('wpshop_delete_attributes_unit')) {
 			$listItemOutput .= '
 		wpshop(".delete_attribute_unit").click(function(){
-			if(confirm(wpshopConvertAccentTojs("' . __('Are you sure you want to delete this unit', 'wpshop')  .' ?"))){
+			if(confirm(wpshopConvertAccentTojs("' . __('Are you sure you want to delete this unit', 'wpshop') . ' ?"))){
 				wpshop("#wpshop_unit_list").load(ajaxurl,{
 					"action": "wps_attribute_unit_delete",
 					"elementIdentifier": wpshop(this).attr("id").replace("delete_attribute_unit_", "")
@@ -357,7 +357,7 @@ 
 			}
 		});';
 		}
-		if(current_user_can('wpshop_edit_attributes_unit')){
+		if (current_user_can('wpshop_edit_attributes_unit')) {
 			$listItemOutput .= '
 		jQuery(".edit_attribute_unit").click(function(){
 			jQuery("#wpshop_unit_list").load(ajaxurl,{
@@ -366,7 +366,7 @@ 
 			});
 		});';
 		}
-		if(current_user_can('wpshop_add_attributes_unit')){
+		if (current_user_can('wpshop_add_attributes_unit')) {
 			$listItemOutput .= '
 		jQuery("#add_attribute_unit").click(function(){
 			jQuery("#wpshop_unit_list").load(ajaxurl,{
@@ -385,33 +385,33 @@ 
 	*
 	*	@return string The html code that output the interface for adding a nem item
 	*/
-	public static function elementEdition($itemToEdit = ''){
+	public static function elementEdition($itemToEdit = '') {
 		global $attribute_displayed_field; global $wpdb;
 		$dbFieldList = wpshop_database::fields_to_input(self::getDbTable());
 
 		$editedItem = '';
 		$_REQUEST['action'] = 'save_new_attribute_unit';
-		if($itemToEdit != ''){
+		if ($itemToEdit != '') {
 			$editedItem = self::getElement($itemToEdit);
 			$_REQUEST['action'] = 'update_attribute_unit';
 		}
-		$query = $wpdb->prepare('SELECT unit FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id = ' .get_option('wpshop_shop_default_currency'). '', '');
+		$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = ' . get_option('wpshop_shop_default_currency') . '', '');
  		$default_unit = $wpdb->get_var($query);
 
 		$the_form_content_hidden = $the_form_general_content = $the_form_option_content = '';
-		foreach($dbFieldList as $input_key => $input_def){
+		foreach ($dbFieldList as $input_key => $input_def) {
 			$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? wpshop_tools::varSanitizer($_REQUEST[self::getDbTable() . '_action']) : '';
 			$requestFormValue = isset($_REQUEST[self::currentPageCode][$input_def['name']]) ? wpshop_tools::varSanitizer($_REQUEST[self::currentPageCode][$input_def['name']]) : '';
 			$currentFieldValue = $input_def['value'];
-			if(is_object($editedItem)){
+			if (is_object($editedItem)) {
 				$currentFieldValue = $editedItem->{$input_def['name']};
 			}
-			elseif(($pageAction != '') && ($requestFormValue != '')){
+			elseif (($pageAction != '') && ($requestFormValue != '')) {
 				$currentFieldValue = $requestFormValue;
 			}
 
 			$input_def['value'] = $currentFieldValue;
-			if($input_def['name'] == 'group_id'){
+			if ($input_def['name'] == 'group_id') {
 				$attribute_unit_group_list = self::get_unit_group();
 				$input_def['possible_value'] = $attribute_unit_group_list;
 				$input_def['type'] = 'select';
@@ -421,9 +421,9 @@ 
 			$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
 
 
-			if($input_def['type'] != 'hidden'){
+			if ($input_def['type'] != 'hidden') {
 				$label = 'for="' . $input_def['name'] . '"';
-				if(($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')){
+				if (($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')) {
 					$label = '';
 				}
 
@@ -433,13 +433,13 @@ 
 						<label ' . $label . ' >' . __($input_def['name'], 'wpshop') . '</label>
 					</div>
 					<div class="wpshop_form_input wpshop_' . self::currentPageCode . '_' . $input_def['name'] . '_input alignleft" >
-						' . $the_input . ' ' .( ($input_def['name'] == 'change_rate') ? $default_unit : ''). '
+						' . $the_input . ' ' . (($input_def['name'] == 'change_rate') ? $default_unit : '') . '
 					</div>
 				</div>';
 
 
 			}
-			else{
+			else {
 				$the_form_content_hidden .= '
 	' . $the_input;
 			}
@@ -448,10 +448,10 @@ 
 		$the_form = '
 <form name="' . self::getDbTable() . '_form" id="' . self::getDbTable() . '_form" method="post" action="' . admin_ajax() . '" >
 ' . wpshop_form::form_input('action', 'action', $_REQUEST['action'], 'hidden') . '
-' . wpshop_form::form_input('post', 'post', 'true' , 'hidden') . '
-' . wpshop_form::form_input('elementCode', 'elementCode', 'attribute_unit_management' , 'hidden') . '
-' . wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no' , 'hidden') . '
-	' . $the_form_content_hidden .'' . $the_form_general_content . '
+' . wpshop_form::form_input('post', 'post', 'true', 'hidden') . '
+' . wpshop_form::form_input('elementCode', 'elementCode', 'attribute_unit_management', 'hidden') . '
+' . wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no', 'hidden') . '
+	' . $the_form_content_hidden . '' . $the_form_general_content . '
 	<input type="button" value="' . __('Back', 'wpshop') . '" class="button-primary alignright" name="cancel_unit_edition" id="cancel_unit_edition" />
 	<input type="submit" value="' . __('Save', 'wpshop') . '" class="button-primary alignright" name="save_new_unit" id="save_new_unit" />
 </form>
@@ -485,18 +485,18 @@ 
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : 'add';
 		$currentPageButton = '';
 
-		if($action == 'add')
+		if ($action == 'add')
 		{
-			if(current_user_can('wpshop_add_attributes'))
+			if (current_user_can('wpshop_add_attributes'))
 			{
 				$currentPageButton .= '<input type="button" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
 			}
 		}
-		elseif(current_user_can('wpshop_edit_attributes'))
+		elseif (current_user_can('wpshop_edit_attributes'))
 		{
 			$currentPageButton .= '<input type="button" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" /><input type="button" class="button-primary" id="saveandcontinue" name="saveandcontinue" value="' . __('Save and continue edit', 'wpshop') . '" />';
 		}
-		if(current_user_can('wpshop_delete_attributes') && ($action != 'add'))
+		if (current_user_can('wpshop_delete_attributes') && ($action != 'add'))
 		{
 			$currentPageButton .= '<input type="button" class="button-primary" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
 		}
@@ -515,13 +515,13 @@ 
 	*
 	*	@return object $element_list A wordpress database object containing the attribute list
 	*/
-	public static function getElement($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id'){
+	public static function getElement($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id') {
 		global $wpdb;
 		$element_list = array();
 		$moreQuery = "";
-		$moreQueryArgs = array( 1, );
+		$moreQueryArgs = array(1,);
 
-		if($element_id != ''){
+		if ($element_id != '') {
 			$moreQuery = "
 			AND CURRENT_ELEMENT." . $field_to_search . " = %s ";
 			$moreQueryArgs[] = $element_id;
@@ -531,14 +531,14 @@ 
 		"SELECT CURRENT_ELEMENT.*, UNIT_GROUP.name as group_name
 		FROM " . self::getDbTable() . " AS CURRENT_ELEMENT
 			LEFT JOIN " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " AS UNIT_GROUP ON (UNIT_GROUP.id = CURRENT_ELEMENT.group_id)
-		WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status.") " . $moreQuery, $moreQueryArgs
+		WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status . ") " . $moreQuery, $moreQueryArgs
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if($element_id == ''){
+		if ($element_id == '') {
 			$element_list = $wpdb->get_results($query);
 		}
-		else{
+		else {
 			$element_list = $wpdb->get_row($query);
 		}
 
@@ -548,7 +548,7 @@ 
 	/**
 	*
 	*/
-	public static function get_unit_list_for_group($group_id){
+	public static function get_unit_list_for_group($group_id) {
 		global $wpdb;
 		$unit_list_for_group = '';
 
@@ -563,7 +563,7 @@ 
 	/**
 	*
 	*/
-	public static function get_default_unit_for_group($group_id){
+	public static function get_default_unit_for_group($group_id) {
 		global $wpdb;
 		$default_unit_for_group = '';
 
@@ -579,13 +579,13 @@ 
 	*
 	*	@return object $attribute_unit_group_list The list of existing unit group
 	*/
-	public static function get_unit_group($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id'){
+	public static function get_unit_group($element_id = '', $element_status = "'valid', 'moderated'", $field_to_search = 'id') {
 		global $wpdb;
 		$element_list = array();
 		$moreQuery = "";
-		$moreQueryArgs = array( 1, );
+		$moreQueryArgs = array(1,);
 
-		if($element_id != ''){
+		if ($element_id != '') {
 			$moreQuery = "
 			AND CURRENT_ELEMENT." . $field_to_search . " = %d ";
 			$moreQueryArgs[] = $element_id;
@@ -594,11 +594,11 @@ 
 		$query = $wpdb->prepare(
 		"SELECT CURRENT_ELEMENT.*
 		FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " AS CURRENT_ELEMENT
-		WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status.") " . $moreQuery, $moreQueryArgs
+		WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status . ") " . $moreQuery, $moreQueryArgs
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if($element_id == '')
+		if ($element_id == '')
 			$element_list = $wpdb->get_results($query);
 		else
 			$element_list = $wpdb->get_row($query);
@@ -615,7 +615,7 @@ 
 	*
 	*	@return string $listItemOutput The html code that output the item list
 	*/
-	public static function unit_group_list(){
+	public static function unit_group_list() {
 		$listItemOutput = '';
 
 		/*	Start the table definition	*/
@@ -628,31 +628,31 @@ 
 
 		$line = 0;
 		$elementList = self::get_unit_group();
-		if(is_array($elementList) && (count($elementList) > 0)){
-			foreach($elementList as $element)
+		if (is_array($elementList) && (count($elementList) > 0)) {
+			foreach ($elementList as $element)
 			{
 				$tableRowsId[$line] = self::getDbTable() . '_' . $element->id;
 
 				$elementLabel = __($element->name, 'wpshop');
 				$subRowActions = '';
 				$attributeSlugUrl = self::getListingSlug();
-				if(current_user_can('wpshop_add_attributes_unit_group'))
+				if (current_user_can('wpshop_add_attributes_unit_group'))
 				{
 					$attributeSlugUrl = self::getEditionSlug();
 				}
-				if(current_user_can('wpshop_edit_attributes_unit_group'))
+				if (current_user_can('wpshop_edit_attributes_unit_group'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 					$subRowActions .= '
 		<a href="#" id="edit_attribute_unit_group_' . $element->id . '" class="edit_attribute_unit_group" >' . __('Edit', 'wpshop') . '</a>';
 				}
-				elseif(current_user_can('wpshop_view_attributes_unit_group'))
+				elseif (current_user_can('wpshop_view_attributes_unit_group'))
 				{
 					$editAction = admin_url('admin.php?page=' . $attributeSlugUrl . '&amp;action=edit&amp;id=' . $element->id);
 				}
-				if(current_user_can('wpshop_delete_attributes_unit_group'))
+				if (current_user_can('wpshop_delete_attributes_unit_group'))
 				{
-					if($subRowActions != '')
+					if ($subRowActions != '')
 					{
 						$subRowActions .= '&nbsp;|&nbsp;';
 					}
@@ -671,12 +671,12 @@ 
 				$line++;
 			}
 		}
-		else{
+		else {
 			unset($tableRowValue);
 			$tableRowValue[] = array('class' => self::currentPageCode . '_label_cell', 'value' => __('No element to ouput here', 'wpshop'));
 			$tableRows[] = $tableRowValue;
 		}
-		if(current_user_can('wpshop_add_attributes_unit_group')){
+		if (current_user_can('wpshop_add_attributes_unit_group')) {
 			$listItemOutput .= '
 <input type="button" value="' . __('Add an unit group', 'wpshop') . '" class="button-secondary alignleft" name="add_attribute_unit_group" id="add_attribute_unit_group" />';
 		}
@@ -685,10 +685,10 @@ 
 	wpshop(document).ready(function(){
 		jQuery("#' . $tableId . '").dataTable();
 		jQuery("#wpshop_unit_list_tab").show();';
-		if(current_user_can('wpshop_delete_attributes_unit_group')){
+		if (current_user_can('wpshop_delete_attributes_unit_group')) {
 			$listItemOutput .= '
 		wpshop(".delete_attribute_unit_group").click(function(){
-			if(confirm(wpshopConvertAccentTojs("' . __('Are you sure you want to delete this unit group', 'wpshop')  .' ?"))){
+			if(confirm(wpshopConvertAccentTojs("' . __('Are you sure you want to delete this unit group', 'wpshop') . ' ?"))){
 				wpshop("#wpshop_unit_group_list").load(ajaxurl, {
 					"action": "wps_attribute_group_unit_delete",
 					"elementIdentifier": wpshop(this).attr("id").replace("delete_attribute_unit_group_", "")
@@ -696,7 +696,7 @@ 
 			}
 		});';
 		}
-		if(current_user_can('wpshop_edit_attributes_unit_group')){
+		if (current_user_can('wpshop_edit_attributes_unit_group')) {
 			$listItemOutput .= '
 		wpshop(".edit_attribute_unit_group").click(function(){
 			wpshop("#wpshop_unit_group_list").load(ajaxurl, {
@@ -705,7 +705,7 @@ 
 			});
 		});';
 		}
-		if(current_user_can('wpshop_add_attributes_unit_group')){
+		if (current_user_can('wpshop_add_attributes_unit_group')) {
 			$listItemOutput .= '
 		wpshop("#add_attribute_unit_group").click(function(){
 			wpshop("#wpshop_unit_group_list").load(ajaxurl, {
@@ -724,7 +724,7 @@ 
 	*
 	*	@return string The html code that output the interface for adding a nem item
 	*/
-	public static function unit_group_edition($itemToEdit = ''){
+	public static function unit_group_edition($itemToEdit = '') {
 		global $attribute_displayed_field;
 		$dbFieldList = wpshop_database::fields_to_input(WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
 
@@ -736,14 +736,14 @@ 
 		}*/
 
 		$the_form_content_hidden = $the_form_general_content = $the_form_option_content = '';
-		foreach($dbFieldList as $input_key => $input_def){
+		foreach ($dbFieldList as $input_key => $input_def) {
 			$pageAction = isset($_REQUEST[WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . '_action']) ? wpshop_tools::varSanitizer($_REQUEST[WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . '_action']) : '';
 			$requestFormValue = isset($_REQUEST[self::currentPageCode][$input_def['name']]) ? wpshop_tools::varSanitizer($_REQUEST[self::currentPageCode][$input_def['name']]) : '';
 			$currentFieldValue = $input_def['value'];
-			if(is_object($editedItem)){
+			if (is_object($editedItem)) {
 				$currentFieldValue = $editedItem->{$input_def['name']};
 			}
-			elseif(($pageAction != '') && ($requestFormValue != '')){
+			elseif (($pageAction != '') && ($requestFormValue != '')) {
 				$currentFieldValue = $requestFormValue;
 			}
 
@@ -752,9 +752,9 @@ 
 			$input_def['value'] = __(str_replace("\\", "", $input_def['value']), 'wpshop');
 			$the_input = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
 
-			if($input_def['type'] != 'hidden'){
+			if ($input_def['type'] != 'hidden') {
 				$label = 'for="' . $input_def['name'] . '"';
-				if(($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')){
+				if (($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')) {
 					$label = '';
 				}
 				$input = '
@@ -766,14 +766,14 @@ 
 			' . $the_input . '
 		</div>
 	</div>';
-				if(substr($input_def['name'], 0, 3) == 'is_'){
+				if (substr($input_def['name'], 0, 3) == 'is_') {
 					$the_form_option_content .= $input;
 				}
-				else{
+				else {
 					$the_form_general_content .= $input;
 				}
 			}
-			else{
+			else {
 				$the_form_content_hidden .= '
 	' . $the_input;
 			}
@@ -782,8 +782,8 @@ 
 		$the_form = '
 <form name="' . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . '_form" id="' . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . '_form" method="post" action="' . admin_url('admin-ajax.php') . '" >
 ' . wpshop_form::form_input('action', 'action', 'wps_attribute_group_unit_edit', 'hidden') . '
-' . wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no' , 'hidden') . '
-	' . $the_form_content_hidden .'' . $the_form_general_content . '
+' . wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no', 'hidden') . '
+	' . $the_form_content_hidden . '' . $the_form_general_content . '
 	<input type="button" value="' . __('Retour', 'wpshop') . '" class="button-primary alignright" name="cancel_unit_group_edition" id="cancel_unit_group_edition" />
 	<input type="submit" value="' . __('Save', 'wpshop') . '" class="button-primary alignright" name="save_new_unit_group" id="save_new_unit_group" />
 </form>
@@ -817,19 +817,19 @@ 
 		$current_currency = get_option('wpshop_shop_default_currency');
 
 		$currencies_options = '';
-		if ( !empty ($currency_group) ) {
-			$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE group_id = %d', $currency_group);
+		if (!empty ($currency_group)) {
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id = %d', $currency_group);
 			$currencies = $wpdb->get_results($query);
-			foreach ( $currencies as $currency) {
-				$currencies_options .= '<option value="'.$currency->id.'"'.(($currency->id == $current_currency) ? ' selected="selected"' : null).'>'.$currency->name.' ('.$currency->unit.')</option>';
+			foreach ($currencies as $currency) {
+				$currencies_options .= '<option value="' . $currency->id . '"' . (($currency->id == $current_currency) ? ' selected="selected"' : null) . '>' . $currency->name . ' (' . $currency->unit . ')</option>';
 			}
 		}
 		else {
-			foreach($wpshop_shop_currencies as $k => $v) {
-				$currencies_options .= '<option value="'.$k.'"'.(($k==$current_currency) ? ' selected="selected"' : null).'>'.$k.' ('.$v.')</option>';
+			foreach ($wpshop_shop_currencies as $k => $v) {
+				$currencies_options .= '<option value="' . $k . '"' . (($k == $current_currency) ? ' selected="selected"' : null) . '>' . $k . ' (' . $v . ')</option>';
 			}
 		}
-		return '<select name="wpshop_shop_default_currency" class="wpshop_currency_field" >'.$currencies_options.'</select>';
+		return '<select name="wpshop_shop_default_currency" class="wpshop_currency_field" >' . $currencies_options . '</select>';
 	}
 
 	/**
@@ -842,7 +842,7 @@ 
 		global $wpdb;
 
 		/** Get the _unit_group_id and _default_unit */
-		return $wpdb->get_row( $wpdb->prepare( 'SELECT _unit_group_id, _default_unit FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code=%s', array( $attribute_code ) ) );
+		return $wpdb->get_row($wpdb->prepare('SELECT _unit_group_id, _default_unit FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code=%s', array($attribute_code)));
 	}
 	
 	/**
@@ -854,15 +854,15 @@ 
 	 * @return stdClass Object [_unit_group_id], [_default_unit]
 	 */
 	public static function get_the_attribute_unit_by_code_for_product($product_id, $attribute_code) {
-		$unit = self::get_default_unit_attribute( $attribute_code );
+		$unit = self::get_default_unit_attribute($attribute_code);
 		
-		if(empty($unit))
+		if (empty($unit))
 			return null;
 		
 		$post_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
 
 		/** Si on trouve une unité */
-		if(!empty($post_meta) && !empty($post_meta['unit']) && !empty($post_meta['unit'][$attribute_code]))
+		if (!empty($post_meta) && !empty($post_meta['unit']) && !empty($post_meta['unit'][$attribute_code]))
 			$unit->_default_unit = $post_meta['unit'][$attribute_code];
 
 		return $unit;
@@ -877,7 +877,7 @@ 
 	public static function the_attribute_unit_by_code_for_product($product_id, $attribute_code) {
 		$unit = self::get_the_attribute_unit_by_code_for_product($product_id, $attribute_code);
 		
-		if(empty($unit))
+		if (empty($unit))
 			return null;
 		
 		echo self::get_the_subname_unit($unit->_unit_group_id, $unit->_default_unit);
@@ -894,10 +894,10 @@ 
 		global $wpdb;
 		
 		/** Si pas d'unité ou de groupe, null */
-		if(0 === $unit_id || 0 === $group_id)
+		if (0 === $unit_id || 0 === $group_id)
 			return null;
 		
-		return $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array( $group_id, $unit_id ) ) );
+		return $wpdb->get_var($wpdb->prepare('SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array($group_id, $unit_id)));
 	}
 	
 	/**
@@ -911,9 +911,9 @@ 
 		global $wpdb;
 		
 		/** Si pas d'unité ou de groupe, null */
-		if(0 === $unit_id || 0 === $group_id)
+		if (0 === $unit_id || 0 === $group_id)
 			return null;
 		
-		return $wpdb->get_var( $wpdb->prepare( 'SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array( $group_id, $unit_id ) ) );
+		return $wpdb->get_var($wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE group_id=%d AND id=%d', array($group_id, $unit_id)));
 	}
 }
\ No newline at end of file

includes/librairies/eav/entities.class.php

Doc Comments +1 added lines, -2 removed lines

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

Indentation +8 added lines, -8 removed lines

@@ -53,11 +53,11 @@ 
 			'exclude_from_search'	=> true,
 			'capabilities'			=> array(
 				'edit_post' 			 => 'wpshop_view_dashboard',
-		        'edit_posts' 			 => 'wpshop_view_dashboard',
-		        'edit_others_posts' 	 => 'wpshop_view_dashboard',
-		        'publish_posts' 		 => 'wpshop_view_dashboard',
-		        'read_post' 			 => 'wpshop_view_dashboard',
-		        'read_private_posts' 	 => 'wpshop_view_dashboard',
+				'edit_posts' 			 => 'wpshop_view_dashboard',
+				'edit_others_posts' 	 => 'wpshop_view_dashboard',
+				'publish_posts' 		 => 'wpshop_view_dashboard',
+				'read_post' 			 => 'wpshop_view_dashboard',
+				'read_private_posts' 	 => 'wpshop_view_dashboard',
 				'delete_posts'			 => 'delete_product'
 			),
 		));
@@ -419,8 +419,8 @@ 
 	 * Save informations for current entity
 	 */
 	public static function save_entities_custom_informations( $post ) {
-       global $wpdb;
-       global $wpshop_account;
+	   global $wpdb;
+	   global $wpshop_account;
 		$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  ) ) {
@@ -503,7 +503,7 @@ 
 		}
 
 		flush_rewrite_rules();
-    }
+	}
 
 
 	/**

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);

Braces +31 added lines, -40 removed lines

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

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

Doc Comments +24 added lines, -7 removed lines

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

Indentation +1398 added lines, -1398 removed lines

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

Spacing +282 added lines, -282 removed lines

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

Braces +73 added lines, -28 removed lines

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

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

Doc Comments +5 added lines, -1 removed lines

@@ -30,6 +30,7 @@ 
      * Constructor
      *
      * @param  &HTML2PDF_myPdf reference to the PDF $object
+     * @param HTML2PDF_myPdf $pdf
      * @access public
      */
     public function __construct(&$pdf)
@@ -75,6 +76,7 @@ 
     * define the Default Font to use, if the font does not exist, or if no font asked
     *
     * @param  string  default font-family. If null : Arial for no font asked, and error fot ont does not exist
+    * @param string $default
     * @return string  old default font-family
     * @access public
     */
@@ -473,6 +475,7 @@ 
      * @access public
      * @param  string   tag name
      * @param  array    styles
+     * @param string $tagName
      */
     public function getSvgStyle($tagName, &$param)
     {
@@ -1661,7 +1664,7 @@ 
      * read a css content
      *
      * @access protected
-     * @param  &string $code
+     * @param  string $code
      */
     protected function _analyseStyle(&$code)
     {
@@ -1725,6 +1728,7 @@ 
      *
      * @access public
      * @param  string   &$html
+     * @param string $html
      */
     public function readStyle(&$html)
     {

Indentation +1797 added lines, -1797 removed lines

@@ -11,1802 +11,1802 @@
 
 class HTML2PDF_parsingCss
 {
-    /**
-     * reference to the pdf object
-     * @var TCPDF
-     */
-    protected $_pdf         = null;
-
-    protected $_htmlColor   = array(); // list of the HTML colors
-    protected $_onlyLeft    = false;   // flag if we are in a sub html => only "text-align:left" is used
-    protected $_defaultFont = null;    // default font to use if the asked font does not exist
-
-    public    $value        = array(); // current values
-    public    $css          = array(); // css values
-    public    $cssKeys      = array(); // css key, for the execution order
-    public    $table        = array(); // level history
-
-    /**
-     * Constructor
-     *
-     * @param  &HTML2PDF_myPdf reference to the PDF $object
-     * @access public
-     */
-    public function __construct(&$pdf)
-    {
-        $this->_init();
-        $this->setPdfParent($pdf);
-    }
-
-    /**
-     * Set the HTML2PDF parent object
-     *
-     * @param  &HTML2PDF reference to the HTML2PDF parent $object
-     * @access public
-     */
-    public function setPdfParent(&$pdf)
-    {
-        $this->_pdf = &$pdf;
-    }
-
-    /**
-     * Inform that we want only "test-align:left" because we are in a sub HTML
-     *
-     * @access public
-     */
-    public function setOnlyLeft()
-    {
-        $this->value['text-align'] = 'left';
-        $this->_onlyLeft = true;
-    }
-
-    /**
-     * Get the vales of the parent, if exist
-     *
-     * @return array CSS values
-     * @access public
-     */
-    public function getOldValues()
-    {
-        return isset($this->table[count($this->table)-1]) ? $this->table[count($this->table)-1] : $this->value;
-    }
-
-    /**
-    * define the Default Font to use, if the font does not exist, or if no font asked
-    *
-    * @param  string  default font-family. If null : Arial for no font asked, and error fot ont does not exist
-    * @return string  old default font-family
-    * @access public
-    */
-    public function setDefaultFont($default = null)
-    {
-        $old = $this->_defaultFont;
-        $this->_defaultFont = $default;
-        if ($default) $this->value['font-family'] = $default;
-        return $old;
-    }
-
-     /**
-     * Init the object
-     *
-     * @access protected
-     */
-    protected function _init()
-    {
-        // get the Web Colors from TCPDF
-        require(K_PATH_MAIN.'htmlcolors.php');
-        $this->_htmlColor = $webcolor;
-
-        // init the Style
-        $this->table = array();
-        $this->value = array();
-        $this->initStyle();
-
-        // Init the styles without legacy
-        $this->resetStyle();
-    }
-
-    /**
-     * Init the CSS Style
-     *
-     * @access public
-     */
-    public function initStyle()
-    {
-        $this->value['id_tag']       = 'body';        // tag name
-        $this->value['id_name']          = null;         // tag - attribute name
-        $this->value['id_id']            = null;         // tag - attribute id
-        $this->value['id_class']         = null;         // tag - attribute class
-        $this->value['id_lst']           = array('*');   // tag - list of legacy
-        $this->value['mini-size']        = 1.;           // specific size report for sup, sub
-        $this->value['mini-decal']       = 0;            // specific position report for sup, sub
-        $this->value['font-family']      = 'Arial';
-        $this->value['font-bold']        = false;
-        $this->value['font-italic']      = false;
-        $this->value['font-underline']   = false;
-        $this->value['font-overline']    = false;
-        $this->value['font-linethrough'] = false;
-        $this->value['text-transform']   = 'none';
-        $this->value['font-size']        = $this->convertToMM('10pt');
-        $this->value['text-indent']      = 0;
-        $this->value['text-align']       = 'left';
-        $this->value['vertical-align']   = 'middle';
-        $this->value['line-height']      = 'normal';
-
-        $this->value['position']         = null;
-        $this->value['x']                = null;
-        $this->value['y']                = null;
-        $this->value['width']            = 0;
-        $this->value['height']           = 0;
-        $this->value['top']              = null;
-        $this->value['right']            = null;
-        $this->value['bottom']           = null;
-        $this->value['left']             = null;
-        $this->value['float']            = null;
-        $this->value['display']          = null;
-        $this->value['rotate']           = null;
-        $this->value['overflow']         = 'visible';
-
-        $this->value['color']            = array(0, 0, 0);
-        $this->value['background']       = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-        $this->value['border']           = array();
-        $this->value['padding']          = array();
-        $this->value['margin']           = array();
-        $this->value['margin-auto']      = false;
-
-        $this->value['list-style-type']  = '';
-        $this->value['list-style-image'] = '';
-
-        $this->value['xc'] = null;
-        $this->value['yc'] = null;
-    }
-
-    /**
-     * Init the CSS Style without legacy
-     *
-     * @param  string  tag name
-     * @access public
-     */
-    public function resetStyle($tagName = '')
-    {
-        // prepare somme values
-        $border = $this->readBorder('solid 1px #000000');
-        $units = array(
-            '1px' => $this->convertToMM('1px'),
-            '5px' => $this->convertToMM('5px'),
-        );
-
-
-        // prepare the Collapse attribute
-        $collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
-        if (!in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) $collapse = false;
-
-        // set the global css values
-        $this->value['position']   = null;
-        $this->value['x']          = null;
-        $this->value['y']          = null;
-        $this->value['width']      = 0;
-        $this->value['height']     = 0;
-        $this->value['top']        = null;
-        $this->value['right']      = null;
-        $this->value['bottom']     = null;
-        $this->value['left']       = null;
-        $this->value['float']      = null;
-        $this->value['display']    = null;
-        $this->value['rotate']     = null;
-        $this->value['overflow']   = 'visible';
-        $this->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-        $this->value['border']     = array(
-            't' => $this->readBorder('none'),
-            'r' => $this->readBorder('none'),
-            'b' => $this->readBorder('none'),
-            'l' => $this->readBorder('none'),
-            'radius' => array(
-                'tl' => array(0, 0),
-                'tr' => array(0, 0),
-                'br' => array(0, 0),
-                'bl' => array(0, 0)
-            ),
-            'collapse' => $collapse,
-        );
-
-        // specific values for some tags
-        if (!in_array($tagName, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
-            $this->value['margin'] = array('t'=>0,'r'=>0,'b'=>0,'l'=>0);
-        }
-
-        if (in_array($tagName, array('input', 'select', 'textarea'))) {
-            $this->value['border']['t'] = null;
-            $this->value['border']['r'] = null;
-            $this->value['border']['b'] = null;
-            $this->value['border']['l'] = null;
-        }
-
-        if ($tagName=='p') {
-            $this->value['margin']['t'] = null;
-            $this->value['margin']['b'] = null;
-        }
-        if ($tagName=='blockquote') {
-            $this->value['margin']['t'] = 3;
-            $this->value['margin']['r'] = 3;
-            $this->value['margin']['b'] = 3;
-            $this->value['margin']['l'] = 6;
-        }
-        $this->value['margin-auto'] = false;
-
-        if (in_array($tagName, array('blockquote', 'div', 'fieldset'))) {
-            $this->value['vertical-align'] = 'top';
-        }
-
-        if (in_array($tagName, array('fieldset', 'legend'))) {
-            $this->value['border'] = array(
-                't' => $border,
-                'r' => $border,
-                'b' => $border,
-                'l' => $border,
-                'radius' => array(
-                    'tl' => array($units['5px'], $units['5px']),
-                    'tr' => array($units['5px'], $units['5px']),
-                    'br' => array($units['5px'], $units['5px']),
-                    'bl' => array($units['5px'], $units['5px'])
-                ),
-                'collapse' => false,
-            );
-        }
-
-        if (in_array($tagName, array('ul', 'li'))) {
-            $this->value['list-style-type']  = '';
-            $this->value['list-style-image'] = '';
-        }
-
-        if (!in_array($tagName, array('tr', 'td'))) {
-            $this->value['padding'] = array(
-                't' => 0,
-                'r' => 0,
-                'b' => 0,
-                'l' => 0
-            );
-        } else {
-            $this->value['padding'] = array(
-                't' => $units['1px'],
-                'r' => $units['1px'],
-                'b' => $units['1px'],
-                'l' => $units['1px']
-            );
-        }
-
-        if ($tagName=='hr') {
-            $this->value['border'] = array(
-                't' => $border,
-                'r' => $border,
-                'b' => $border,
-                'l' => $border,
-                'radius' => array(
-                    'tl' => array(0, 0),
-                    'tr' => array(0, 0),
-                    'br' => array(0, 0),
-                    'bl' => array(0, 0)
-                ),
-                'collapse' => false,
-            );
-            $this->convertBackground('#FFFFFF', $this->value['background']);
-        }
-
-        $this->value['xc'] = null;
-        $this->value['yc'] = null;
-    }
-
-    /**
-     * Init the PDF Font
-     *
-     * @access public
-     */
-    public function fontSet()
-    {
-        $family = strtolower($this->value['font-family']);
-
-        $b = ($this->value['font-bold']        ? 'B' : '');
-        $i = ($this->value['font-italic']      ? 'I' : '');
-        $u = ($this->value['font-underline']   ? 'U' : '');
-        $d = ($this->value['font-linethrough'] ? 'D' : '');
-        $o = ($this->value['font-overline']    ? 'O' : '');
-
-        // font style
-        $style = $b.$i;
-
-        if ($this->_defaultFont) {
-            if($family=='arial')
-                $family='helvetica';
-            elseif($family=='symbol' || $family=='zapfdingbats')
-                $style='';
-
-            $fontkey = $family.$style;
-            if (!$this->_pdf->isLoadedFont($fontkey))
-                $family = $this->_defaultFont;
-        }
-
-        if($family=='arial')
-            $family='helvetica';
-        elseif($family=='symbol' || $family=='zapfdingbats')
-            $style='';
-
-        // complete style
-        $style.= $u.$d.$o;
-
-        // size : mm => pt
-        $size = $this->value['font-size'];
-        $size = 72 * $size / 25.4;
-
-        // apply the font
-        $this->_pdf->SetFont($family, $style, $this->value['mini-size']*$size);
-        $this->_pdf->setTextColorArray($this->value['color']);
-        if ($this->value['background']['color'])
-            $this->_pdf->setFillColorArray($this->value['background']['color']);
-        else
-            $this->_pdf->setFillColor(255);
-    }
-
-     /**
-     * add a level in the CSS history
-     *
-     * @access public
-     */
-    public function save()
-    {
-        array_push($this->table, $this->value);
-    }
-
-     /**
-     * remove a level in the CSS history
-     *
-     * @access public
-     */
-    public function load()
-    {
-        if (count($this->table)) {
-            $this->value = array_pop($this->table);
-        }
-    }
-
-     /**
-     * restore the Y positiony (used after a span)
-     *
-     * @access public
-     */
-    public function restorePosition()
-    {
-        if ($this->value['y']==$this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
-    }
-
-     /**
-     * set the New position for the current Tag
-     *
-     * @access public
-     */
-    public function setPosition()
-    {
-        // get the current position
-        $currentX = $this->_pdf->getX();
-        $currentY = $this->_pdf->getY();
-
-        // save it
-        $this->value['xc'] = $currentX;
-        $this->value['yc'] = $currentY;
-
-        if ($this->value['position']=='relative' || $this->value['position']=='absolute') {
-            if ($this->value['right']!==null) {
-                $x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
-                if ($this->value['margin']['r']) $x-= $this->value['margin']['r'];
-            } else {
-                $x = $this->value['left'];
-                if ($this->value['margin']['l']) $x+= $this->value['margin']['l'];
-            }
-
-            if ($this->value['bottom']!==null) {
-                $y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
-                if ($this->value['margin']['b']) $y-= $this->value['margin']['b'];
-            } else {
-                $y = $this->value['top'];
-                if ($this->value['margin']['t']) $y+= $this->value['margin']['t'];
-            }
-
-            if ($this->value['position']=='relative') {
-                $this->value['x'] = $currentX + $x;
-                $this->value['y'] = $currentY + $y;
-            } else {
-                $this->value['x'] = $this->_getLastAbsoluteX()+$x;
-                $this->value['y'] = $this->_getLastAbsoluteY()+$y;
-            }
-        } else {
-            $this->value['x'] = $currentX;
-            $this->value['y'] = $currentY;
-            if ($this->value['margin']['l']) $this->value['x']+= $this->value['margin']['l'];
-            if ($this->value['margin']['t']) $this->value['y']+= $this->value['margin']['t'];
-        }
-
-        // save the new position
-        $this->_pdf->setXY($this->value['x'], $this->value['y']);
-    }
-
-     /**
-     * Analise the CSS style to convert it into Form style
-     *
-     * @access public
-     * @param  array    styles
-     */
-    public function getFormStyle()
-    {
-        $prop = array();
-
-        $prop['alignment'] = $this->value['text-align'];
-
-        if (isset($this->value['background']['color']) && is_array($this->value['background']['color'])) {
-            $prop['fillColor'] = $this->value['background']['color'];
-        }
-
-        if (isset($this->value['border']['t']['color'])) {
-            $prop['strokeColor'] = $this->value['border']['t']['color'];
-        }
-
-        if (isset($this->value['border']['t']['width'])) {
-            $prop['lineWidth'] = $this->value['border']['t']['width'];
-        }
-
-        if (isset($this->value['border']['t']['type'])) {
-            $prop['borderStyle'] = $this->value['border']['t']['type'];
-        }
-
-        if (!empty($this->value['color'])) {
-            $prop['textColor'] = $this->value['color'];
-        }
-
-        if (!empty($this->value['font-size'])) {
-            $prop['textSize'] = $this->value['font-size'];
-        }
-
-        return $prop;
-    }
-
-     /**
-     * Analise the CSS style to convert it into SVG style
-     *
-     * @access public
-     * @param  string   tag name
-     * @param  array    styles
-     */
-    public function getSvgStyle($tagName, &$param)
-    {
-        // prepare
-        $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) $name = null;
-
-        // read the class attribute
-        $class = array();
-        $tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
-        $tmp = explode(' ', $tmp);
-        foreach ($tmp as $k => $v) {
-            $v = trim($v);
-            if ($v) $class[] = $v;
-        }
-
-        // identify the tag, and the direct styles
-        $this->value['id_tag'] = $tagName;
-        $this->value['id_name']   = $name;
-        $this->value['id_id']     = $id;
-        $this->value['id_class']  = $class;
-        $this->value['id_lst']    = array();
-        $this->value['id_lst'][] = '*';
-        $this->value['id_lst'][] = $tagName;
-        if (!isset($this->value['svg'])) {
-            $this->value['svg'] = array(
-                'stroke'         => null,
-                'stroke-width'   => $this->convertToMM('1pt'),
-                'fill'           => null,
-                'fill-opacity'   => null,
-            );
-        }
-
-        if (count($class)) {
-            foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
-            }
-        }
-        if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
-        }
-
-        // CSS style
-        $styles = $this->_getFromCSS();
-
-        // adding the style from the tag
-        $styles = array_merge($styles, $param['style']);
-
-        if (isset($styles['stroke']))        $this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
-        if (isset($styles['stroke-width']))  $this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
-        if (isset($styles['fill']))          $this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
-        if (isset($styles['fill-opacity']))  $this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
-
-        return $this->value['svg'];
-    }
-
-    /**
-     * analyse the css properties from the HTML parsing
-     *
-     * @access public
-     * @param  string  $tagName
-     * @param  array   $param
-     * @param  array   $legacy
-     */
-    public function analyse($tagName, &$param, $legacy = null)
-    {
-        // prepare the informations
-        $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name']))  : null; if (!$name) $name = null;
-
-        // get the class names to use
-        $class = array();
-        $tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
-        $tmp = explode(' ', $tmp);
-        foreach ($tmp as $k => $v) {
-            $v = trim($v);
-            if ($v) $class[] = $v;
-        }
-
-        // prepare the values, and the list of css tags to identify
-        $this->value['id_tag']   = $tagName;
-        $this->value['id_name']  = $name;
-        $this->value['id_id']    = $id;
-        $this->value['id_class'] = $class;
-        $this->value['id_lst']   = array();
-        $this->value['id_lst'][] = '*';
-        $this->value['id_lst'][] = $tagName;
-        if (count($class)) {
-            foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
-            }
-        }
-        if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
-        }
-
-        // get the css styles from class
-        $styles = $this->_getFromCSS();
-
-        // merge with the css styles from tag
-        $styles = array_merge($styles, $param['style']);
-        if (isset($param['allwidth']) && !isset($styles['width'])) $styles['width'] = '100%';
-
-        // reset some styles, depending on the tag name
-        $this->resetStyle($tagName);
-
-        // add the legacy values
-        if ($legacy) {
-            foreach ($legacy as $legacyName => $legacyValue) {
-                if (is_array($legacyValue)) {
-                    foreach($legacyValue as $legacy2Name => $legacy2Value)
-                        $this->value[$legacyName][$legacy2Name] = $legacy2Value;
-                } else {
-                    $this->value[$legacyName] = $legacyValue;
-                }
-            }
-        }
-
-        // some flags
-        $correctWidth = false;
-        $noWidth = true;
-
-        // read all the css styles
-        foreach ($styles as $nom => $val) {
-            switch($nom)
-            {
-                case 'font-family':
-                    $val = explode(',', $val);
-                    $val = trim($val[0]);
-                    if ($val) $this->value['font-family'] = $val;
-                    break;
-
-                case 'font-weight':
-                    $this->value['font-bold'] = ($val=='bold');
-                    break;
-
-                case 'font-style':
-                    $this->value['font-italic'] = ($val=='italic');
-                    break;
-
-                case 'text-decoration':
-                    $val = explode(' ', $val);
-                    $this->value['font-underline']   = (in_array('underline', $val));
-                    $this->value['font-overline']    = (in_array('overline', $val));
-                    $this->value['font-linethrough'] = (in_array('line-through', $val));
-                    break;
-
-                case 'text-indent':
-                    $this->value['text-indent'] = $this->convertToMM($val);
-                    break;
-
-                case 'text-transform':
-                    if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
-                    $this->value['text-transform']  = $val;
-                    break;
-
-                case 'font-size':
-                    $val = $this->convertToMM($val, $this->value['font-size']);
-                    if ($val) $this->value['font-size'] = $val;
-                    break;
-
-                case 'color':
-                    $res = null;
-                    $this->value['color'] = $this->convertToColor($val, $res);
-                    if ($tagName=='hr') {
-                        $this->value['border']['l']['color'] = $this->value['color'];
-                        $this->value['border']['t']['color'] = $this->value['color'];
-                        $this->value['border']['r']['color'] = $this->value['color'];
-                        $this->value['border']['b']['color'] = $this->value['color'];
-                    }
-                    break;
-
-                case 'text-align':
-                    $val = strtolower($val);
-                    if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
-                    $this->value['text-align'] = $val;
-                    break;
-
-                case 'vertical-align':
-                    $this->value['vertical-align'] = $val;
-                    break;
-
-                case 'width':
-                    $this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
-                    if ($this->value['width'] && substr($val, -1)=='%') $correctWidth=true;
-                    $noWidth = false;
-                    break;
-
-                case 'height':
-                    $this->value['height'] = $this->convertToMM($val, $this->getLastHeight());
-                    break;
-
-                case 'line-height':
-                    if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val*100).'%';
-                    $this->value['line-height'] = $val;
-                    break;
-
-                case 'rotate':
-                    if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
-                    if ($val<0) $val+= 360;
-                    $this->value['rotate'] = $val;
-                    break;
-
-                case 'overflow':
-                    if (!in_array($val, array('visible', 'hidden'))) $val = 'visible';
-                    $this->value['overflow'] = $val;
-                    break;
-
-                case 'padding':
-                    $val = explode(' ', $val);
-                    foreach ($val as $k => $v) {
-                        $v = trim($v);
-                        if ($v!='') {
-                            $val[$k] = $v;
-                        } else {
-                            unset($val[$k]);
-                        }
-                    }
-                    $val = array_values($val);
-                    $this->_duplicateBorder($val);
-                    $this->value['padding']['t'] = $this->convertToMM($val[0], 0);
-                    $this->value['padding']['r'] = $this->convertToMM($val[1], 0);
-                    $this->value['padding']['b'] = $this->convertToMM($val[2], 0);
-                    $this->value['padding']['l'] = $this->convertToMM($val[3], 0);
-                    break;
-
-                case 'padding-top':
-                    $this->value['padding']['t'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-right':
-                    $this->value['padding']['r'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-bottom':
-                    $this->value['padding']['b'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-left':
-                    $this->value['padding']['l'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin':
-                    if ($val=='auto') {
-                        $this->value['margin-auto'] = true;
-                        break;
-                    }
-                    $val = explode(' ', $val);
-                    foreach ($val as $k => $v) {
-                        $v = trim($v);
-                        if ($v!='') {
-                            $val[$k] = $v;
-                        } else {
-                            unset($val[$k]);
-                        }
-                    }
-                    $val = array_values($val);
-                    $this->_duplicateBorder($val);
-                    $this->value['margin']['t'] = $this->convertToMM($val[0], 0);
-                    $this->value['margin']['r'] = $this->convertToMM($val[1], 0);
-                    $this->value['margin']['b'] = $this->convertToMM($val[2], 0);
-                    $this->value['margin']['l'] = $this->convertToMM($val[3], 0);
-                    break;
-
-                case 'margin-top':
-                    $this->value['margin']['t'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-right':
-                    $this->value['margin']['r'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-bottom':
-                    $this->value['margin']['b'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-left':
-                    $this->value['margin']['l'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'border':
-                    $val = $this->readBorder($val);
-                    $this->value['border']['t'] = $val;
-                    $this->value['border']['r'] = $val;
-                    $this->value['border']['b'] = $val;
-                    $this->value['border']['l'] = $val;
-                    break;
-
-                case 'border-style':
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                        if (!in_array($valV, array('solid', 'dotted', 'dashed'))) {
-                            $val[$valK] = null;
-                        }
-                    }
-                    $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['type'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['type'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['type'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['type'] = $val[3];
-                    break;
-
-                case 'border-top-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['t']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-right-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['r']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-bottom-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['b']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-left-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed')))
-                        $this->value['border']['l']['type'] = $val;
-                    break;
-
-                case 'border-color':
-                    $res = false;
-                    $val = preg_replace('/,[\s]+/', ',', $val);
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                            $val[$valK] = $this->convertToColor($valV, $res);
-                            if (!$res) {
-                                $val[$valK] = null;
-                            }
-                    }
-                    $this->_duplicateBorder($val);
-                    if (is_array($val[0])) $this->value['border']['t']['color'] = $val[0];
-                    if (is_array($val[1])) $this->value['border']['r']['color'] = $val[1];
-                    if (is_array($val[2])) $this->value['border']['b']['color'] = $val[2];
-                    if (is_array($val[3])) $this->value['border']['l']['color'] = $val[3];
-
-                    break;
-
-                case 'border-top-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['t']['color'] = $val;
-                    break;
-
-                case 'border-right-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['r']['color'] = $val;
-                    break;
-
-                case 'border-bottom-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['b']['color'] = $val;
-                    break;
-
-                case 'border-left-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['l']['color'] = $val;
-                    break;
-
-                case 'border-width':
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                            $val[$valK] = $this->convertToMM($valV, 0);
-                    }
-                    $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['width'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['width'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['width'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['width'] = $val[3];
-                    break;
-
-                case 'border-top-width':
-                    $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['t']['width'] = $val;
-                    break;
-
-                case 'border-right-width':
-                    $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['r']['width'] = $val;
-                    break;
-
-                case 'border-bottom-width':
-                    $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['b']['width'] = $val;
-                    break;
-
-                case 'border-left-width':
-                    $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['l']['width'] = $val;
-                    break;
-
-                case 'border-collapse':
-                    if ($tagName=='table') $this->value['border']['collapse'] = ($val=='collapse');
-                    break;
-
-                case 'border-radius':
-                    $val = explode('/', $val);
-                    if (count($val)>2) {
-                        break;
-                    }
-                    $valH = $this->convertToRadius(trim($val[0]));
-                    if (count($valH)<1 || count($valH)>4) {
-                        break;
-                    }
-                    if (!isset($valH[1])) $valH[1] = $valH[0];
-                    if (!isset($valH[2])) $valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
-                    if (!isset($valH[3])) $valH[3] = $valH[1];
-                    if (isset($val[1])) {
-                        $valV = $this->convertToRadius(trim($val[1]));
-                        if (count($valV)<1 || count($valV)>4) {
-                            break;
-                        }
-                        if (!isset($valV[1])) $valV[1] = $valV[0];
-                        if (!isset($valV[2])) $valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
-                        if (!isset($valV[3])) $valV[3] = $valV[1];
-                    } else {
-                        $valV = $valH;
-                    }
-                    $this->value['border']['radius'] = array(
-                                'tl' => array($valH[0], $valV[0]),
-                                'tr' => array($valH[1], $valV[1]),
-                                'br' => array($valH[2], $valV[2]),
-                                'bl' => array($valH[3], $valV[3])
-                            );
-                    break;
-
-                case 'border-top-left-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-top-right-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-bottom-right-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-bottom-left-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-top':
-                    $this->value['border']['t'] = $this->readBorder($val);
-                    break;
-
-                case 'border-right':
-                    $this->value['border']['r'] = $this->readBorder($val);
-                    break;
-
-                case 'border-bottom':
-                    $this->value['border']['b'] = $this->readBorder($val);
-                    break;
-
-                case 'border-left':
-                    $this->value['border']['l'] = $this->readBorder($val);
-                    break;
-
-                case 'background-color':
-                    $this->value['background']['color'] = $this->convertBackgroundColor($val);
-                    break;
-
-                case 'background-image':
-                    $this->value['background']['image'] = $this->convertBackgroundImage($val);
-                    break;
-
-                case 'background-position':
-                    $res = null;
-                    $this->value['background']['position'] = $this->convertBackgroundPosition($val, $res);
-                    break;
-
-                case 'background-repeat':
-                    $this->value['background']['repeat'] = $this->convertBackgroundRepeat($val);
-                    break;
-
-                case 'background':
-                    $this->convertBackground($val, $this->value['background']);
-                    break;
-
-                case 'position':
-                    if ($val=='absolute')       $this->value['position'] = 'absolute';
-                    else if ($val=='relative')  $this->value['position'] = 'relative';
-                    else                        $this->value['position'] = null;
-                    break;
-
-                case 'float':
-                    if ($val=='left')           $this->value['float'] = 'left';
-                    else if ($val=='right')     $this->value['float'] = 'right';
-                    else                        $this->value['float'] = null;
-                    break;
-
-                case 'display':
-                    if ($val=='inline')         $this->value['display'] = 'inline';
-                    else if ($val=='block')     $this->value['display'] = 'block';
-                    else if ($val=='none')      $this->value['display'] = 'none';
-                    else                        $this->value['display'] = null;
-                    break;
-
-                case 'top':
-                case 'bottom':
-                case 'left':
-                case 'right':
-                    $this->value[$nom] = $val;
-                    break;
-
-                case 'list-style':
-                case 'list-style-type':
-                case 'list-style-image':
-                    if ($nom=='list-style') $nom = 'list-style-type';
-                    $this->value[$nom] = $val;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        $return = true;
-
-        // only for P tag
-        if ($this->value['margin']['t']===null) $this->value['margin']['t'] = $this->value['font-size'];
-        if ($this->value['margin']['b']===null) $this->value['margin']['b'] = $this->value['font-size'];
-
-        // force the text align to left, if asked by html2pdf
-        if ($this->_onlyLeft) $this->value['text-align'] = 'left';
-
-        // correction on the width (quick box)
-        if ($noWidth && in_array($tagName, array('div', 'blockquote', 'fieldset')) && $this->value['position']!='absolute') {
-            $this->value['width'] = $this->getLastWidth();
-            $this->value['width']-= $this->value['margin']['l'] + $this->value['margin']['r'];
-        } else {
-            if ($correctWidth) {
-                if (!in_array($tagName, array('table', 'div', 'blockquote', 'fieldset', 'hr'))) {
-                    $this->value['width']-= $this->value['padding']['l'] + $this->value['padding']['r'];
-                    $this->value['width']-= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
-                }
-                if (in_array($tagName, array('th', 'td'))) {
-                    $this->value['width']-= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-                    $return = false;
-                }
-                if ($this->value['width']<0) $this->value['width']=0;
-            } else {
-                if ($this->value['width']) {
-                    if ($this->value['border']['l']['width']) $this->value['width'] += $this->value['border']['l']['width'];
-                    if ($this->value['border']['r']['width']) $this->value['width'] += $this->value['border']['r']['width'];
-                    if ($this->value['padding']['l'])         $this->value['width'] += $this->value['padding']['l'];
-                    if ($this->value['padding']['r'])         $this->value['width'] += $this->value['padding']['r'];
-                }
-            }
-        }
-        if ($this->value['height']) {
-            if ($this->value['border']['b']['width']) $this->value['height'] += $this->value['border']['b']['width'];
-            if ($this->value['border']['t']['width']) $this->value['height'] += $this->value['border']['t']['width'];
-            if ($this->value['padding']['b'])         $this->value['height'] += $this->value['padding']['b'];
-            if ($this->value['padding']['t'])         $this->value['height'] += $this->value['padding']['t'];
-        }
-
-        if ($this->value['top']!=null)      $this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
-        if ($this->value['bottom']!=null)   $this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
-        if ($this->value['left']!=null)     $this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
-        if ($this->value['right']!=null)    $this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
-
-        if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])    $this->value['bottom']  = null;
-        if ($this->value['left'] && $this->value['right'] && $this->value['width'])     $this->value['right']   = null;
-
-        return $return;
-    }
-
-     /**
-     * get the height of the current line
-     *
-     * @access public
-     * @return float $height in mm
-     */
-    public function getLineHeight()
-    {
-        $val = $this->value['line-height'];
-        if ($val=='normal') $val = '108%';
-        return $this->convertToMM($val, $this->value['font-size']);
-    }
-
-     /**
-     * get the width of the parent
-     *
-     * @access public
-     * @param  boolean $mode true => adding padding and border
-     * @return float $width in mm
-     */
-    public function getLastWidth($mode = false)
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['width']) {
-                $w = $this->table[$k]['width'];
-                if ($mode) {
-                    $w+= $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
-                    $w+= $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
-                }
-                return $w;
-            }
-        }
-        return $this->_pdf->getW() - $this->_pdf->getlMargin() - $this->_pdf->getrMargin();
-    }
-
-     /**
-     * get the height of the parent
-     *
-     * @access public
-     * @param  boolean $mode true => adding padding and border
-     * @return float $height in mm
-     */
-    public function getLastHeight($mode = false)
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['height']) {
-                $h = $this->table[$k]['height'];
-                if ($mode) {
-                    $h+= $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
-                    $h+= $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
-                }
-                return $h;
-            }
-        }
-        return $this->_pdf->getH() - $this->_pdf->gettMargin() - $this->_pdf->getbMargin();
-    }
-
-    /**
-     * get the value of the float property
-     *
-     * @access public
-     * @return $float left/right
-     */
-    public function getFloat()
-    {
-        if ($this->value['float']=='left')    return 'left';
-        if ($this->value['float']=='right')   return 'right';
-        return null;
-    }
-
-    /**
-     * get the last value for a specific key
-     *
-     * @access public
-     * @param  string $key
-     * @return mixed
-     */
-    public function getLastValue($key)
-    {
-        $nb = count($this->table);
-        if ($nb>0) {
-            return $this->table[$nb-1][$key];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * get the last absolute X
-     *
-     * @access protected
-     * @return float $x
-     */
-    protected function _getLastAbsoluteX()
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
-        }
-        return $this->_pdf->getlMargin();
-    }
-
-    /**
-     * get the last absolute Y
-     *
-     * @access protected
-     * @return float $y
-     */
-    protected function _getLastAbsoluteY()
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
-        }
-        return $this->_pdf->gettMargin();
-    }
-
-    /**
-     * get the CSS properties of the current tag
-     *
-     * @access protected
-     * @return array $styles
-     */
-    protected function _getFromCSS()
-    {
-        // styles to apply
-        $styles = array();
-
-        // list of the selectors to get in the CSS files
-        $getit  = array();
-
-        // get the list of the selectors of each tags
-        $lst = array();
-        $lst[] = $this->value['id_lst'];
-        for ($i=count($this->table)-1; $i>=0; $i--) {
-            $lst[] = $this->table[$i]['id_lst'];
-        }
-
-        // foreach selectors in the CSS files, verify if it match with the list of selectors
-        foreach ($this->cssKeys as $key => $num) {
-            if ($this->_getReccursiveStyle($key, $lst)) {
-                $getit[$key] = $num;
-            }
-        }
-
-        // if we have selectors
-        if (count($getit)) {
-            // get them, but in the definition order, because of priority
-            asort($getit);
-            foreach ($getit as $key => $val) $styles = array_merge($styles, $this->css[$key]);
-        }
-
-        return $styles;
-    }
-
-    /**
-     * identify if the selector $key match with the list of tag selectors
-     *
-     * @access protected
-     * @param  string   $key CSS selector to analyse
-     * @param  array    $lst list of the selectors of each tags
-     * @param  string   $next next step of parsing the selector
-     * @return boolean
-     */
-    protected function _getReccursiveStyle($key, $lst, $next = null)
-    {
-        // if next step
-        if ($next!==null) {
-            // we remove this step
-            if ($next) $key = trim(substr($key, 0, -strlen($next)));
-            array_shift($lst);
-
-            // if no more step to identify => return false
-            if (!count($lst)) {
-                return false;
-            }
-        }
-
-        // for each selector of the current step
-        foreach ($lst[0] as $name) {
-            // if selector = key => ok
-            if ($key==$name) {
-                return true;
-            }
-
-            // if the end of the key = the selector and the next step is ok => ok
-            if (substr($key, -strlen(' '.$name))==' '.$name && $this->_getReccursiveStyle($key, $lst, $name)) {
-                return true;
-            }
-        }
-
-        // if we are not in the first step, we analyse the sub steps (the pareng tag of the current tag)
-        if ($next!==null && $this->_getReccursiveStyle($key, $lst, '')) {
-            return true;
-        }
-
-        // no corresponding found
-        return false;
-    }
-
-    /**
-     * Analyse a border
-     *
-     * @access  public
-     * @param   string $css css border properties
-     * @return  array  border properties
-     */
-    public function readBorder($css)
-    {
-        // border none
-        $none = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
-
-        // default value
-        $type  = 'solid';
-        $width = $this->convertToMM('1pt');
-        $color = array(0, 0, 0);
-
-        // clean up the values
-        $css = explode(' ', $css);
-        foreach ($css as $k => $v) {
-            $v = trim($v);
-            if ($v) $css[$k] = $v;
-            else    unset($css[$k]);
-        }
-        $css = array_values($css);
-
-        // read the values
-        $res = null;
-        foreach ($css as $value) {
-
-            // if no border => return none
-            if ($value=='none' || $value=='hidden') {
-                return $none;
-            }
-
-            // try to convert the value as a distance
-            $tmp = $this->convertToMM($value);
-
-            // if the convert is ok => it is a width
-            if ($tmp!==null) {
-                $width = $tmp;
-            // else, it could be the type
-            } else if (in_array($value, array('solid', 'dotted', 'dashed', 'double'))) {
-                $type = $value;
-            // else, it could be the color
-            } else {
-                $tmp = $this->convertToColor($value, $res);
-                if ($res) $color = $tmp;
-            }
-        }
-
-        // if no witdh => return none
-        if (!$width) return $none;
-
-        // return the border properties
-        return array('type' => $type, 'width' => $width, 'color' => $color);
-    }
-
-    /**
-     * duplicate the borders if needed
-     *
-     * @access protected
-     * @param  &array $val
-     */
-    protected function _duplicateBorder(&$val)
-    {
-        // 1 value => L => RTB
-        if (count($val)==1) {
-            $val[1] = $val[0];
-            $val[2] = $val[0];
-            $val[3] = $val[0];
-        // 2 values => L => R & T => B
-        } else if (count($val)==2) {
-            $val[2] = $val[0];
-            $val[3] = $val[1];
-        // 3 values => T => B
-        } else if (count($val)==3) {
-            $val[3] = $val[1];
-        }
-    }
-
-    /**
-     * Analyse a background
-     *
-     * @access public
-     * @param  string $css css background properties
-     * @param  &array $value parsed values (by reference, because, ther is a legacy of the parent CSS properties)
-     */
-    public function convertBackground($css, &$value)
-    {
-        // is there a image ?
-        $text = '/url\(([^)]*)\)/isU';
-        if (preg_match($text, $css, $match)) {
-            // get the image
-            $value['image'] = $this->convertBackgroundImage($match[0]);
-
-            // remove if from the css properties
-            $css = preg_replace($text, '', $css);
-            $css = preg_replace('/[\s]+/', ' ', $css);
-        }
-
-        // protect some spaces
-        $css = preg_replace('/,[\s]+/', ',', $css);
-
-        // explode the values
-        $css = explode(' ', $css);
-
-        // background position to parse
-        $pos = '';
-
-        // foreach value
-        foreach ($css as $val) {
-            // try to parse the value as a color
-            $ok = false;
-            $color = $this->convertToColor($val, $ok);
-
-            // if ok => it is a color
-            if ($ok) {
-                $value['color'] = $color;
-            // else if transparent => no coloàr
-            } else if ($val=='transparent') {
-                $value['color'] = null;
-            // else
-            } else {
-                // try to parse the value as a repeat
-                $repeat = $this->convertBackgroundRepeat($val);
-
-                // if ok => it is repeat
-                if ($repeat) {
-                    $value['repeat'] = $repeat;
-                // else => it could only be a position
-                } else {
-                    $pos.= ($pos ? ' ' : '').$val;
-                }
-            }
-        }
-
-        // if we have a position to parse
-        if ($pos) {
-            // try to read it
-            $pos = $this->convertBackgroundPosition($pos, $ok);
-            if ($ok) $value['position'] = $pos;
-        }
-    }
-
-    /**
-     * parse a background color
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundColor($css)
-    {
-        $res = null;
-        if ($css=='transparent') return null;
-        else                     return $this->convertToColor($css, $res);
-    }
-
-    /**
-     * parse a background image
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundImage($css)
-    {
-        if ($css=='none')
-            return null;
-        else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
-            return $match[1];
-        else
-            return null;
-    }
-
-    /**
-     * parse a background position
-     *
-     * @access public
-     * @param  string $css
-     * @param  &boolean $res flag if conver is ok or not
-     * @return array ($x, $y)
-     */
-    public function convertBackgroundPosition($css, &$res)
-    {
-        // init the res
-        $res = false;
-
-        // explode the value
-        $css = explode(' ', $css);
-
-        // we must have 2 values. if 0 or >2 : error. if 1 => put center for 2
-        if (count($css)<2) {
-            if (!$css[0]) return null;
-            $css[1] = 'center';
-        }
-        if (count($css)>2) return null;
-
-        // prepare the values
-        $x = 0;
-        $y = 0;
-        $res = true;
-
-        // convert the first value
-        if ($css[0]=='left')        $x = '0%';
-        else if ($css[0]=='center') $x = '50%';
-        else if ($css[0]=='right')  $x = '100%';
-        else if ($css[0]=='top')    $y = '0%';
-        else if ($css[0]=='bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) $x = $css[0];
-        else if ($this->convertToMM($css[0])) $x = $this->convertToMM($css[0]);
-        else $res = false;
-
-        // convert the second value
-        if ($css[1]=='left')        $x = '0%';
-        else if ($css[1]=='right')  $x = '100%';
-        else if ($css[1]=='top')    $y = '0%';
-        else if ($css[1]=='center') $y = '50%';
-        else if ($css[1]=='bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) $y = $css[1];
-        else if ($this->convertToMM($css[1])) $y = $this->convertToMM($css[1]);
-        else $res = false;
-
-        // return the values
-        return array($x, $y);
-    }
-
-    /**
-     * parse a background repeat
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundRepeat($css)
-    {
-        switch($css)
-        {
-            case 'repeat':
-                return array(true, true);
-            case 'repeat-x':
-                return array(true, false);
-            case 'repeat-y':
-                return array(false, true);
-            case 'no-repeat':
-                return array(false, false);
-        }
-        return null;
-    }
-
-     /**
-     * convert a distance to mm
-     *
-     * @access public
-     * @param  string $css distance to convert
-     * @param  float  $old parent distance
-     * @return float  $value
-     */
-    public function convertToMM($css, $old=0.)
-    {
-        $css = trim($css);
-        if (preg_match('/^[0-9\.\-]+$/isU', $css))        $css.= 'px';
-        if (preg_match('/^[0-9\.\-]+px$/isU', $css))      $css = 25.4/96. * str_replace('px', '', $css);
-        else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) $css = 25.4/72. * str_replace('pt', '', $css);
-        else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) $css = 25.4 * str_replace('in', '', $css);
-        else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) $css = 1.*str_replace('mm', '', $css);
-        else if (preg_match('/^[0-9\.\-]+%$/isU', $css))  $css = 1.*$old*str_replace('%', '', $css)/100.;
-        else                                              $css = null;
-
-        return $css;
-    }
-
-    /**
-     * convert a css radius
-     *
-     * @access public
-     * @param  string $css
-     * @return float  $value
-     */
-    public function convertToRadius($css)
-    {
-        // explode the value
-        $css = explode(' ', $css);
-
-        foreach ($css as $k => $v) {
-            $v = trim($v);
-            if ($v) {
-                $v = $this->convertToMM($v, 0);
-                if ($v!==null) {
-                    $css[$k] = $v;
-                } else {
-                    unset($css[$k]);
-                }
-            } else {
-                unset($css[$k]);
-            }
-        }
-
-        return array_values($css);
-    }
-
-    /**
-     * convert a css color
-     *
-     * @access public
-     * @param  string $css
-     * @param  &boolean $res
-     * @return array (r,g, b)
-     */
-    public function convertToColor($css, &$res)
-    {
-        // prepare the value
-        $css = trim($css);
-        $res = true;
-
-        // if transparent => return null
-        if (strtolower($css)=='transparent') return array(null, null, null);
-
-        // HTML color
-        if (isset($this->_htmlColor[strtolower($css)])) {
-            $css = $this->_htmlColor[strtolower($css)];
-            $r = floatVal(hexdec(substr($css, 0, 2)));
-            $v = floatVal(hexdec(substr($css, 2, 2)));
-            $b = floatVal(hexdec(substr($css, 4, 2)));
-            return array($r, $v, $b);
-        }
-
-        // like #FFFFFF
-        if (preg_match('/^#[0-9A-Fa-f]{6}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 2)));
-            $v = floatVal(hexdec(substr($css, 3, 2)));
-            $b = floatVal(hexdec(substr($css, 5, 2)));
-            return array($r, $v, $b);
-        }
-
-        // like #FFF
-        if (preg_match('/^#[0-9A-F]{3}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 1).substr($css, 1, 1)));
-            $v = floatVal(hexdec(substr($css, 2, 1).substr($css, 2, 1)));
-            $b = floatVal(hexdec(substr($css, 3, 1).substr($css, 3, 1)));
-            return array($r, $v, $b);
-        }
-
-        // like rgb(100, 100, 100)
-        if (preg_match('/rgb\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
-            $r = $this->_convertSubColor($match[1]);
-            $v = $this->_convertSubColor($match[2]);
-            $b = $this->_convertSubColor($match[3]);
-            return array($r*255., $v*255., $b*255.);
-        }
-
-        // like cmyk(100, 100, 100, 100)
-        if (preg_match('/cmyk\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
-            $c = $this->_convertSubColor($match[1]);
-            $m = $this->_convertSubColor($match[2]);
-            $y = $this->_convertSubColor($match[3]);
-            $k = $this->_convertSubColor($match[4]);
-            return array($c*100., $m*100., $y*100., $k*100.);
-        }
-
-        $res = false;
-        return array(0., 0., 0.);
-    }
-
-    /**
-     * color value to convert
-     *
-     * @access protected
-     * @param  string $c
-     * @return float $c 0.->1.
-     */
-    protected function _convertSubColor($c)
-    {
-        if (substr($c, -1)=='%') {
-            $c = floatVal(substr($c, 0, -1))/100.;
-        } else {
-            $c = floatVal($c);
-            if ($c>1) $c = $c/255.;
-        }
-
-        return $c;
-    }
-
-    /**
-     * read a css content
-     *
-     * @access protected
-     * @param  &string $code
-     */
-    protected function _analyseStyle(&$code)
-    {
-        // clean the spaces
-        $code = preg_replace('/[\s]+/', ' ', $code);
-
-        // remove the comments
-        $code = preg_replace('/\/\*.*?\*\//s', '', $code);
-
-        // split each CSS code "selector { value }"
-        preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
-
-        // for each CSS code
-        for ($k=0; $k<count($match[0]); $k++) {
-
-            // selectors
-            $names = strtolower(trim($match[1][$k]));
-
-            // css style
-            $styles = trim($match[2][$k]);
-
-            // explode each value
-            $styles = explode(';', $styles);
-
-            // parse each value
-            $css = array();
-            foreach ($styles as $style) {
-                $tmp = explode(':', $style);
-                if (count($tmp)>1) {
-                    $cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp);
-                    $css[trim(strtolower($cod))] = trim($tmp);
-                }
-            }
-
-            // explode the names
-            $names = explode(',', $names);
-
-            // save the values for each names
-            foreach ($names as $name) {
-                // clean the name
-                $name = trim($name);
-
-                // if a selector with somethink lige :hover => continue
-                if (strpos($name, ':')!==false) continue;
-
-                // save the value
-                if (!isset($this->css[$name]))
-                    $this->css[$name] = $css;
-                else
-                    $this->css[$name] = array_merge($this->css[$name], $css);
-
-            }
-        }
-
-        // get he list of the keys
-        $this->cssKeys = array_flip(array_keys($this->css));
-    }
-
-    /**
-     * Extract the css files from a html code
-     *
-     * @access public
-     * @param  string   &$html
-     */
-    public function readStyle(&$html)
-    {
-        // the CSS content
-        $style = ' ';
-
-        // extract the link tags, and remove them in the html code
-        preg_match_all('/<link([^>]*)>/isU', $html, $match);
-        $html = preg_replace('/<link[^>]*>/isU', '', $html);
-        $html = preg_replace('/<\/link[^>]*>/isU', '', $html);
-
-        // analyse each link tag
-        foreach ($match[1] as $code) {
-            $tmp = array();
-
-            // read the attributes name=value
-            $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // read the attributes name="value"
-            $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // read the attributes name='value'
-            $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // if type text/css => we keep it
-            if (isset($tmp['type']) && strtolower($tmp['type'])=='text/css' && isset($tmp['href'])) {
-
-                // get the href
-                $url = $tmp['href'];
-
-                // get the content of the css file
-                $content = @file_get_contents($url);
-
-                // if "http://" in the url
-                if (strpos($url, 'http://')!==false) {
-
-                    // get the domain "http://xxx/"
-                    $url = str_replace('http://', '', $url);
-                    $url = explode('/', $url);
-                    $urlMain = 'http://'.$url[0].'/';
-
-                    // get the absolute url of the path
-                    $urlSelf = $url; unset($urlSelf[count($urlSelf)-1]); $urlSelf = 'http://'.implode('/', $urlSelf).'/';
-
-                    // adapt the url in the css content
-                    $content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$urlSelf.'$1)', $content);
-                    $content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$urlMain.'$1)', $content);
-                } else {
+	/**
+	 * reference to the pdf object
+	 * @var TCPDF
+	 */
+	protected $_pdf         = null;
+
+	protected $_htmlColor   = array(); // list of the HTML colors
+	protected $_onlyLeft    = false;   // flag if we are in a sub html => only "text-align:left" is used
+	protected $_defaultFont = null;    // default font to use if the asked font does not exist
+
+	public    $value        = array(); // current values
+	public    $css          = array(); // css values
+	public    $cssKeys      = array(); // css key, for the execution order
+	public    $table        = array(); // level history
+
+	/**
+	 * Constructor
+	 *
+	 * @param  &HTML2PDF_myPdf reference to the PDF $object
+	 * @access public
+	 */
+	public function __construct(&$pdf)
+	{
+		$this->_init();
+		$this->setPdfParent($pdf);
+	}
+
+	/**
+	 * Set the HTML2PDF parent object
+	 *
+	 * @param  &HTML2PDF reference to the HTML2PDF parent $object
+	 * @access public
+	 */
+	public function setPdfParent(&$pdf)
+	{
+		$this->_pdf = &$pdf;
+	}
+
+	/**
+	 * Inform that we want only "test-align:left" because we are in a sub HTML
+	 *
+	 * @access public
+	 */
+	public function setOnlyLeft()
+	{
+		$this->value['text-align'] = 'left';
+		$this->_onlyLeft = true;
+	}
+
+	/**
+	 * Get the vales of the parent, if exist
+	 *
+	 * @return array CSS values
+	 * @access public
+	 */
+	public function getOldValues()
+	{
+		return isset($this->table[count($this->table)-1]) ? $this->table[count($this->table)-1] : $this->value;
+	}
+
+	/**
+	 * define the Default Font to use, if the font does not exist, or if no font asked
+	 *
+	 * @param  string  default font-family. If null : Arial for no font asked, and error fot ont does not exist
+	 * @return string  old default font-family
+	 * @access public
+	 */
+	public function setDefaultFont($default = null)
+	{
+		$old = $this->_defaultFont;
+		$this->_defaultFont = $default;
+		if ($default) $this->value['font-family'] = $default;
+		return $old;
+	}
+
+	 /**
+	  * Init the object
+	  *
+	  * @access protected
+	  */
+	protected function _init()
+	{
+		// get the Web Colors from TCPDF
+		require(K_PATH_MAIN.'htmlcolors.php');
+		$this->_htmlColor = $webcolor;
+
+		// init the Style
+		$this->table = array();
+		$this->value = array();
+		$this->initStyle();
+
+		// Init the styles without legacy
+		$this->resetStyle();
+	}
+
+	/**
+	 * Init the CSS Style
+	 *
+	 * @access public
+	 */
+	public function initStyle()
+	{
+		$this->value['id_tag']       = 'body';        // tag name
+		$this->value['id_name']          = null;         // tag - attribute name
+		$this->value['id_id']            = null;         // tag - attribute id
+		$this->value['id_class']         = null;         // tag - attribute class
+		$this->value['id_lst']           = array('*');   // tag - list of legacy
+		$this->value['mini-size']        = 1.;           // specific size report for sup, sub
+		$this->value['mini-decal']       = 0;            // specific position report for sup, sub
+		$this->value['font-family']      = 'Arial';
+		$this->value['font-bold']        = false;
+		$this->value['font-italic']      = false;
+		$this->value['font-underline']   = false;
+		$this->value['font-overline']    = false;
+		$this->value['font-linethrough'] = false;
+		$this->value['text-transform']   = 'none';
+		$this->value['font-size']        = $this->convertToMM('10pt');
+		$this->value['text-indent']      = 0;
+		$this->value['text-align']       = 'left';
+		$this->value['vertical-align']   = 'middle';
+		$this->value['line-height']      = 'normal';
+
+		$this->value['position']         = null;
+		$this->value['x']                = null;
+		$this->value['y']                = null;
+		$this->value['width']            = 0;
+		$this->value['height']           = 0;
+		$this->value['top']              = null;
+		$this->value['right']            = null;
+		$this->value['bottom']           = null;
+		$this->value['left']             = null;
+		$this->value['float']            = null;
+		$this->value['display']          = null;
+		$this->value['rotate']           = null;
+		$this->value['overflow']         = 'visible';
+
+		$this->value['color']            = array(0, 0, 0);
+		$this->value['background']       = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
+		$this->value['border']           = array();
+		$this->value['padding']          = array();
+		$this->value['margin']           = array();
+		$this->value['margin-auto']      = false;
+
+		$this->value['list-style-type']  = '';
+		$this->value['list-style-image'] = '';
+
+		$this->value['xc'] = null;
+		$this->value['yc'] = null;
+	}
+
+	/**
+	 * Init the CSS Style without legacy
+	 *
+	 * @param  string  tag name
+	 * @access public
+	 */
+	public function resetStyle($tagName = '')
+	{
+		// prepare somme values
+		$border = $this->readBorder('solid 1px #000000');
+		$units = array(
+			'1px' => $this->convertToMM('1px'),
+			'5px' => $this->convertToMM('5px'),
+		);
+
+
+		// prepare the Collapse attribute
+		$collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
+		if (!in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) $collapse = false;
+
+		// set the global css values
+		$this->value['position']   = null;
+		$this->value['x']          = null;
+		$this->value['y']          = null;
+		$this->value['width']      = 0;
+		$this->value['height']     = 0;
+		$this->value['top']        = null;
+		$this->value['right']      = null;
+		$this->value['bottom']     = null;
+		$this->value['left']       = null;
+		$this->value['float']      = null;
+		$this->value['display']    = null;
+		$this->value['rotate']     = null;
+		$this->value['overflow']   = 'visible';
+		$this->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
+		$this->value['border']     = array(
+			't' => $this->readBorder('none'),
+			'r' => $this->readBorder('none'),
+			'b' => $this->readBorder('none'),
+			'l' => $this->readBorder('none'),
+			'radius' => array(
+				'tl' => array(0, 0),
+				'tr' => array(0, 0),
+				'br' => array(0, 0),
+				'bl' => array(0, 0)
+			),
+			'collapse' => $collapse,
+		);
+
+		// specific values for some tags
+		if (!in_array($tagName, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
+			$this->value['margin'] = array('t'=>0,'r'=>0,'b'=>0,'l'=>0);
+		}
+
+		if (in_array($tagName, array('input', 'select', 'textarea'))) {
+			$this->value['border']['t'] = null;
+			$this->value['border']['r'] = null;
+			$this->value['border']['b'] = null;
+			$this->value['border']['l'] = null;
+		}
+
+		if ($tagName=='p') {
+			$this->value['margin']['t'] = null;
+			$this->value['margin']['b'] = null;
+		}
+		if ($tagName=='blockquote') {
+			$this->value['margin']['t'] = 3;
+			$this->value['margin']['r'] = 3;
+			$this->value['margin']['b'] = 3;
+			$this->value['margin']['l'] = 6;
+		}
+		$this->value['margin-auto'] = false;
+
+		if (in_array($tagName, array('blockquote', 'div', 'fieldset'))) {
+			$this->value['vertical-align'] = 'top';
+		}
+
+		if (in_array($tagName, array('fieldset', 'legend'))) {
+			$this->value['border'] = array(
+				't' => $border,
+				'r' => $border,
+				'b' => $border,
+				'l' => $border,
+				'radius' => array(
+					'tl' => array($units['5px'], $units['5px']),
+					'tr' => array($units['5px'], $units['5px']),
+					'br' => array($units['5px'], $units['5px']),
+					'bl' => array($units['5px'], $units['5px'])
+				),
+				'collapse' => false,
+			);
+		}
+
+		if (in_array($tagName, array('ul', 'li'))) {
+			$this->value['list-style-type']  = '';
+			$this->value['list-style-image'] = '';
+		}
+
+		if (!in_array($tagName, array('tr', 'td'))) {
+			$this->value['padding'] = array(
+				't' => 0,
+				'r' => 0,
+				'b' => 0,
+				'l' => 0
+			);
+		} else {
+			$this->value['padding'] = array(
+				't' => $units['1px'],
+				'r' => $units['1px'],
+				'b' => $units['1px'],
+				'l' => $units['1px']
+			);
+		}
+
+		if ($tagName=='hr') {
+			$this->value['border'] = array(
+				't' => $border,
+				'r' => $border,
+				'b' => $border,
+				'l' => $border,
+				'radius' => array(
+					'tl' => array(0, 0),
+					'tr' => array(0, 0),
+					'br' => array(0, 0),
+					'bl' => array(0, 0)
+				),
+				'collapse' => false,
+			);
+			$this->convertBackground('#FFFFFF', $this->value['background']);
+		}
+
+		$this->value['xc'] = null;
+		$this->value['yc'] = null;
+	}
+
+	/**
+	 * Init the PDF Font
+	 *
+	 * @access public
+	 */
+	public function fontSet()
+	{
+		$family = strtolower($this->value['font-family']);
+
+		$b = ($this->value['font-bold']        ? 'B' : '');
+		$i = ($this->value['font-italic']      ? 'I' : '');
+		$u = ($this->value['font-underline']   ? 'U' : '');
+		$d = ($this->value['font-linethrough'] ? 'D' : '');
+		$o = ($this->value['font-overline']    ? 'O' : '');
+
+		// font style
+		$style = $b.$i;
+
+		if ($this->_defaultFont) {
+			if($family=='arial')
+				$family='helvetica';
+			elseif($family=='symbol' || $family=='zapfdingbats')
+				$style='';
+
+			$fontkey = $family.$style;
+			if (!$this->_pdf->isLoadedFont($fontkey))
+				$family = $this->_defaultFont;
+		}
+
+		if($family=='arial')
+			$family='helvetica';
+		elseif($family=='symbol' || $family=='zapfdingbats')
+			$style='';
+
+		// complete style
+		$style.= $u.$d.$o;
+
+		// size : mm => pt
+		$size = $this->value['font-size'];
+		$size = 72 * $size / 25.4;
+
+		// apply the font
+		$this->_pdf->SetFont($family, $style, $this->value['mini-size']*$size);
+		$this->_pdf->setTextColorArray($this->value['color']);
+		if ($this->value['background']['color'])
+			$this->_pdf->setFillColorArray($this->value['background']['color']);
+		else
+			$this->_pdf->setFillColor(255);
+	}
+
+	 /**
+	  * add a level in the CSS history
+	  *
+	  * @access public
+	  */
+	public function save()
+	{
+		array_push($this->table, $this->value);
+	}
+
+	 /**
+	  * remove a level in the CSS history
+	  *
+	  * @access public
+	  */
+	public function load()
+	{
+		if (count($this->table)) {
+			$this->value = array_pop($this->table);
+		}
+	}
+
+	 /**
+	  * restore the Y positiony (used after a span)
+	  *
+	  * @access public
+	  */
+	public function restorePosition()
+	{
+		if ($this->value['y']==$this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
+	}
+
+	 /**
+	  * set the New position for the current Tag
+	  *
+	  * @access public
+	  */
+	public function setPosition()
+	{
+		// get the current position
+		$currentX = $this->_pdf->getX();
+		$currentY = $this->_pdf->getY();
+
+		// save it
+		$this->value['xc'] = $currentX;
+		$this->value['yc'] = $currentY;
+
+		if ($this->value['position']=='relative' || $this->value['position']=='absolute') {
+			if ($this->value['right']!==null) {
+				$x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
+				if ($this->value['margin']['r']) $x-= $this->value['margin']['r'];
+			} else {
+				$x = $this->value['left'];
+				if ($this->value['margin']['l']) $x+= $this->value['margin']['l'];
+			}
+
+			if ($this->value['bottom']!==null) {
+				$y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
+				if ($this->value['margin']['b']) $y-= $this->value['margin']['b'];
+			} else {
+				$y = $this->value['top'];
+				if ($this->value['margin']['t']) $y+= $this->value['margin']['t'];
+			}
+
+			if ($this->value['position']=='relative') {
+				$this->value['x'] = $currentX + $x;
+				$this->value['y'] = $currentY + $y;
+			} else {
+				$this->value['x'] = $this->_getLastAbsoluteX()+$x;
+				$this->value['y'] = $this->_getLastAbsoluteY()+$y;
+			}
+		} else {
+			$this->value['x'] = $currentX;
+			$this->value['y'] = $currentY;
+			if ($this->value['margin']['l']) $this->value['x']+= $this->value['margin']['l'];
+			if ($this->value['margin']['t']) $this->value['y']+= $this->value['margin']['t'];
+		}
+
+		// save the new position
+		$this->_pdf->setXY($this->value['x'], $this->value['y']);
+	}
+
+	 /**
+	  * Analise the CSS style to convert it into Form style
+	  *
+	  * @access public
+	  * @param  array    styles
+	  */
+	public function getFormStyle()
+	{
+		$prop = array();
+
+		$prop['alignment'] = $this->value['text-align'];
+
+		if (isset($this->value['background']['color']) && is_array($this->value['background']['color'])) {
+			$prop['fillColor'] = $this->value['background']['color'];
+		}
+
+		if (isset($this->value['border']['t']['color'])) {
+			$prop['strokeColor'] = $this->value['border']['t']['color'];
+		}
+
+		if (isset($this->value['border']['t']['width'])) {
+			$prop['lineWidth'] = $this->value['border']['t']['width'];
+		}
+
+		if (isset($this->value['border']['t']['type'])) {
+			$prop['borderStyle'] = $this->value['border']['t']['type'];
+		}
+
+		if (!empty($this->value['color'])) {
+			$prop['textColor'] = $this->value['color'];
+		}
+
+		if (!empty($this->value['font-size'])) {
+			$prop['textSize'] = $this->value['font-size'];
+		}
+
+		return $prop;
+	}
+
+	 /**
+	  * Analise the CSS style to convert it into SVG style
+	  *
+	  * @access public
+	  * @param  string   tag name
+	  * @param  array    styles
+	  */
+	public function getSvgStyle($tagName, &$param)
+	{
+		// prepare
+		$tagName = strtolower($tagName);
+		$id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null; if (!$id)   $id   = null;
+		$name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) $name = null;
+
+		// read the class attribute
+		$class = array();
+		$tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
+		$tmp = explode(' ', $tmp);
+		foreach ($tmp as $k => $v) {
+			$v = trim($v);
+			if ($v) $class[] = $v;
+		}
+
+		// identify the tag, and the direct styles
+		$this->value['id_tag'] = $tagName;
+		$this->value['id_name']   = $name;
+		$this->value['id_id']     = $id;
+		$this->value['id_class']  = $class;
+		$this->value['id_lst']    = array();
+		$this->value['id_lst'][] = '*';
+		$this->value['id_lst'][] = $tagName;
+		if (!isset($this->value['svg'])) {
+			$this->value['svg'] = array(
+				'stroke'         => null,
+				'stroke-width'   => $this->convertToMM('1pt'),
+				'fill'           => null,
+				'fill-opacity'   => null,
+			);
+		}
+
+		if (count($class)) {
+			foreach ($class as $v) {
+				$this->value['id_lst'][] = '*.'.$v;
+				$this->value['id_lst'][] = '.'.$v;
+				$this->value['id_lst'][] = $tagName.'.'.$v;
+			}
+		}
+		if ($id) {
+			$this->value['id_lst'][] = '*#'.$id;
+			$this->value['id_lst'][] = '#'.$id;
+			$this->value['id_lst'][] = $tagName.'#'.$id;
+		}
+
+		// CSS style
+		$styles = $this->_getFromCSS();
+
+		// adding the style from the tag
+		$styles = array_merge($styles, $param['style']);
+
+		if (isset($styles['stroke']))        $this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
+		if (isset($styles['stroke-width']))  $this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
+		if (isset($styles['fill']))          $this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
+		if (isset($styles['fill-opacity']))  $this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
+
+		return $this->value['svg'];
+	}
+
+	/**
+	 * analyse the css properties from the HTML parsing
+	 *
+	 * @access public
+	 * @param  string  $tagName
+	 * @param  array   $param
+	 * @param  array   $legacy
+	 */
+	public function analyse($tagName, &$param, $legacy = null)
+	{
+		// prepare the informations
+		$tagName = strtolower($tagName);
+		$id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null; if (!$id)   $id   = null;
+		$name = isset($param['name']) ? strtolower(trim($param['name']))  : null; if (!$name) $name = null;
+
+		// get the class names to use
+		$class = array();
+		$tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
+		$tmp = explode(' ', $tmp);
+		foreach ($tmp as $k => $v) {
+			$v = trim($v);
+			if ($v) $class[] = $v;
+		}
+
+		// prepare the values, and the list of css tags to identify
+		$this->value['id_tag']   = $tagName;
+		$this->value['id_name']  = $name;
+		$this->value['id_id']    = $id;
+		$this->value['id_class'] = $class;
+		$this->value['id_lst']   = array();
+		$this->value['id_lst'][] = '*';
+		$this->value['id_lst'][] = $tagName;
+		if (count($class)) {
+			foreach ($class as $v) {
+				$this->value['id_lst'][] = '*.'.$v;
+				$this->value['id_lst'][] = '.'.$v;
+				$this->value['id_lst'][] = $tagName.'.'.$v;
+			}
+		}
+		if ($id) {
+			$this->value['id_lst'][] = '*#'.$id;
+			$this->value['id_lst'][] = '#'.$id;
+			$this->value['id_lst'][] = $tagName.'#'.$id;
+		}
+
+		// get the css styles from class
+		$styles = $this->_getFromCSS();
+
+		// merge with the css styles from tag
+		$styles = array_merge($styles, $param['style']);
+		if (isset($param['allwidth']) && !isset($styles['width'])) $styles['width'] = '100%';
+
+		// reset some styles, depending on the tag name
+		$this->resetStyle($tagName);
+
+		// add the legacy values
+		if ($legacy) {
+			foreach ($legacy as $legacyName => $legacyValue) {
+				if (is_array($legacyValue)) {
+					foreach($legacyValue as $legacy2Name => $legacy2Value)
+						$this->value[$legacyName][$legacy2Name] = $legacy2Value;
+				} else {
+					$this->value[$legacyName] = $legacyValue;
+				}
+			}
+		}
+
+		// some flags
+		$correctWidth = false;
+		$noWidth = true;
+
+		// read all the css styles
+		foreach ($styles as $nom => $val) {
+			switch($nom)
+			{
+				case 'font-family':
+					$val = explode(',', $val);
+					$val = trim($val[0]);
+					if ($val) $this->value['font-family'] = $val;
+					break;
+
+				case 'font-weight':
+					$this->value['font-bold'] = ($val=='bold');
+					break;
+
+				case 'font-style':
+					$this->value['font-italic'] = ($val=='italic');
+					break;
+
+				case 'text-decoration':
+					$val = explode(' ', $val);
+					$this->value['font-underline']   = (in_array('underline', $val));
+					$this->value['font-overline']    = (in_array('overline', $val));
+					$this->value['font-linethrough'] = (in_array('line-through', $val));
+					break;
+
+				case 'text-indent':
+					$this->value['text-indent'] = $this->convertToMM($val);
+					break;
+
+				case 'text-transform':
+					if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
+					$this->value['text-transform']  = $val;
+					break;
+
+				case 'font-size':
+					$val = $this->convertToMM($val, $this->value['font-size']);
+					if ($val) $this->value['font-size'] = $val;
+					break;
+
+				case 'color':
+					$res = null;
+					$this->value['color'] = $this->convertToColor($val, $res);
+					if ($tagName=='hr') {
+						$this->value['border']['l']['color'] = $this->value['color'];
+						$this->value['border']['t']['color'] = $this->value['color'];
+						$this->value['border']['r']['color'] = $this->value['color'];
+						$this->value['border']['b']['color'] = $this->value['color'];
+					}
+					break;
+
+				case 'text-align':
+					$val = strtolower($val);
+					if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
+					$this->value['text-align'] = $val;
+					break;
+
+				case 'vertical-align':
+					$this->value['vertical-align'] = $val;
+					break;
+
+				case 'width':
+					$this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
+					if ($this->value['width'] && substr($val, -1)=='%') $correctWidth=true;
+					$noWidth = false;
+					break;
+
+				case 'height':
+					$this->value['height'] = $this->convertToMM($val, $this->getLastHeight());
+					break;
+
+				case 'line-height':
+					if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val*100).'%';
+					$this->value['line-height'] = $val;
+					break;
+
+				case 'rotate':
+					if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
+					if ($val<0) $val+= 360;
+					$this->value['rotate'] = $val;
+					break;
+
+				case 'overflow':
+					if (!in_array($val, array('visible', 'hidden'))) $val = 'visible';
+					$this->value['overflow'] = $val;
+					break;
+
+				case 'padding':
+					$val = explode(' ', $val);
+					foreach ($val as $k => $v) {
+						$v = trim($v);
+						if ($v!='') {
+							$val[$k] = $v;
+						} else {
+							unset($val[$k]);
+						}
+					}
+					$val = array_values($val);
+					$this->_duplicateBorder($val);
+					$this->value['padding']['t'] = $this->convertToMM($val[0], 0);
+					$this->value['padding']['r'] = $this->convertToMM($val[1], 0);
+					$this->value['padding']['b'] = $this->convertToMM($val[2], 0);
+					$this->value['padding']['l'] = $this->convertToMM($val[3], 0);
+					break;
+
+				case 'padding-top':
+					$this->value['padding']['t'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'padding-right':
+					$this->value['padding']['r'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'padding-bottom':
+					$this->value['padding']['b'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'padding-left':
+					$this->value['padding']['l'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'margin':
+					if ($val=='auto') {
+						$this->value['margin-auto'] = true;
+						break;
+					}
+					$val = explode(' ', $val);
+					foreach ($val as $k => $v) {
+						$v = trim($v);
+						if ($v!='') {
+							$val[$k] = $v;
+						} else {
+							unset($val[$k]);
+						}
+					}
+					$val = array_values($val);
+					$this->_duplicateBorder($val);
+					$this->value['margin']['t'] = $this->convertToMM($val[0], 0);
+					$this->value['margin']['r'] = $this->convertToMM($val[1], 0);
+					$this->value['margin']['b'] = $this->convertToMM($val[2], 0);
+					$this->value['margin']['l'] = $this->convertToMM($val[3], 0);
+					break;
+
+				case 'margin-top':
+					$this->value['margin']['t'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'margin-right':
+					$this->value['margin']['r'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'margin-bottom':
+					$this->value['margin']['b'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'margin-left':
+					$this->value['margin']['l'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'border':
+					$val = $this->readBorder($val);
+					$this->value['border']['t'] = $val;
+					$this->value['border']['r'] = $val;
+					$this->value['border']['b'] = $val;
+					$this->value['border']['l'] = $val;
+					break;
+
+				case 'border-style':
+					$val = explode(' ', $val);
+					foreach ($val as $valK => $valV) {
+						if (!in_array($valV, array('solid', 'dotted', 'dashed'))) {
+							$val[$valK] = null;
+						}
+					}
+					$this->_duplicateBorder($val);
+					if ($val[0]) $this->value['border']['t']['type'] = $val[0];
+					if ($val[1]) $this->value['border']['r']['type'] = $val[1];
+					if ($val[2]) $this->value['border']['b']['type'] = $val[2];
+					if ($val[3]) $this->value['border']['l']['type'] = $val[3];
+					break;
+
+				case 'border-top-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+						$this->value['border']['t']['type'] = $val;
+					}
+					break;
+
+				case 'border-right-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+						$this->value['border']['r']['type'] = $val;
+					}
+					break;
+
+				case 'border-bottom-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+						$this->value['border']['b']['type'] = $val;
+					}
+					break;
+
+				case 'border-left-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed')))
+						$this->value['border']['l']['type'] = $val;
+					break;
+
+				case 'border-color':
+					$res = false;
+					$val = preg_replace('/,[\s]+/', ',', $val);
+					$val = explode(' ', $val);
+					foreach ($val as $valK => $valV) {
+							$val[$valK] = $this->convertToColor($valV, $res);
+							if (!$res) {
+								$val[$valK] = null;
+							}
+					}
+					$this->_duplicateBorder($val);
+					if (is_array($val[0])) $this->value['border']['t']['color'] = $val[0];
+					if (is_array($val[1])) $this->value['border']['r']['color'] = $val[1];
+					if (is_array($val[2])) $this->value['border']['b']['color'] = $val[2];
+					if (is_array($val[3])) $this->value['border']['l']['color'] = $val[3];
+
+					break;
+
+				case 'border-top-color':
+					$res = false;
+					$val = $this->convertToColor($val, $res);
+					if ($res) $this->value['border']['t']['color'] = $val;
+					break;
+
+				case 'border-right-color':
+					$res = false;
+					$val = $this->convertToColor($val, $res);
+					if ($res) $this->value['border']['r']['color'] = $val;
+					break;
+
+				case 'border-bottom-color':
+					$res = false;
+					$val = $this->convertToColor($val, $res);
+					if ($res) $this->value['border']['b']['color'] = $val;
+					break;
+
+				case 'border-left-color':
+					$res = false;
+					$val = $this->convertToColor($val, $res);
+					if ($res) $this->value['border']['l']['color'] = $val;
+					break;
+
+				case 'border-width':
+					$val = explode(' ', $val);
+					foreach ($val as $valK => $valV) {
+							$val[$valK] = $this->convertToMM($valV, 0);
+					}
+					$this->_duplicateBorder($val);
+					if ($val[0]) $this->value['border']['t']['width'] = $val[0];
+					if ($val[1]) $this->value['border']['r']['width'] = $val[1];
+					if ($val[2]) $this->value['border']['b']['width'] = $val[2];
+					if ($val[3]) $this->value['border']['l']['width'] = $val[3];
+					break;
+
+				case 'border-top-width':
+					$val = $this->convertToMM($val, 0);
+					if ($val) $this->value['border']['t']['width'] = $val;
+					break;
+
+				case 'border-right-width':
+					$val = $this->convertToMM($val, 0);
+					if ($val) $this->value['border']['r']['width'] = $val;
+					break;
+
+				case 'border-bottom-width':
+					$val = $this->convertToMM($val, 0);
+					if ($val) $this->value['border']['b']['width'] = $val;
+					break;
+
+				case 'border-left-width':
+					$val = $this->convertToMM($val, 0);
+					if ($val) $this->value['border']['l']['width'] = $val;
+					break;
+
+				case 'border-collapse':
+					if ($tagName=='table') $this->value['border']['collapse'] = ($val=='collapse');
+					break;
+
+				case 'border-radius':
+					$val = explode('/', $val);
+					if (count($val)>2) {
+						break;
+					}
+					$valH = $this->convertToRadius(trim($val[0]));
+					if (count($valH)<1 || count($valH)>4) {
+						break;
+					}
+					if (!isset($valH[1])) $valH[1] = $valH[0];
+					if (!isset($valH[2])) $valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
+					if (!isset($valH[3])) $valH[3] = $valH[1];
+					if (isset($val[1])) {
+						$valV = $this->convertToRadius(trim($val[1]));
+						if (count($valV)<1 || count($valV)>4) {
+							break;
+						}
+						if (!isset($valV[1])) $valV[1] = $valV[0];
+						if (!isset($valV[2])) $valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
+						if (!isset($valV[3])) $valV[3] = $valV[1];
+					} else {
+						$valV = $valH;
+					}
+					$this->value['border']['radius'] = array(
+								'tl' => array($valH[0], $valV[0]),
+								'tr' => array($valH[1], $valV[1]),
+								'br' => array($valH[2], $valV[2]),
+								'bl' => array($valH[3], $valV[3])
+							);
+					break;
+
+				case 'border-top-left-radius':
+					$val = $this->convertToRadius($val);
+					if (count($val)<1 || count($val)>2) {
+						break;
+					}
+					$this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-top-right-radius':
+					$val = $this->convertToRadius($val);
+					if (count($val)<1 || count($val)>2) {
+						break;
+					}
+					$this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-bottom-right-radius':
+					$val = $this->convertToRadius($val);
+					if (count($val)<1 || count($val)>2) {
+						break;
+					}
+					$this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-bottom-left-radius':
+					$val = $this->convertToRadius($val);
+					if (count($val)<1 || count($val)>2) {
+						break;
+					}
+					$this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-top':
+					$this->value['border']['t'] = $this->readBorder($val);
+					break;
+
+				case 'border-right':
+					$this->value['border']['r'] = $this->readBorder($val);
+					break;
+
+				case 'border-bottom':
+					$this->value['border']['b'] = $this->readBorder($val);
+					break;
+
+				case 'border-left':
+					$this->value['border']['l'] = $this->readBorder($val);
+					break;
+
+				case 'background-color':
+					$this->value['background']['color'] = $this->convertBackgroundColor($val);
+					break;
+
+				case 'background-image':
+					$this->value['background']['image'] = $this->convertBackgroundImage($val);
+					break;
+
+				case 'background-position':
+					$res = null;
+					$this->value['background']['position'] = $this->convertBackgroundPosition($val, $res);
+					break;
+
+				case 'background-repeat':
+					$this->value['background']['repeat'] = $this->convertBackgroundRepeat($val);
+					break;
+
+				case 'background':
+					$this->convertBackground($val, $this->value['background']);
+					break;
+
+				case 'position':
+					if ($val=='absolute')       $this->value['position'] = 'absolute';
+					else if ($val=='relative')  $this->value['position'] = 'relative';
+					else                        $this->value['position'] = null;
+					break;
+
+				case 'float':
+					if ($val=='left')           $this->value['float'] = 'left';
+					else if ($val=='right')     $this->value['float'] = 'right';
+					else                        $this->value['float'] = null;
+					break;
+
+				case 'display':
+					if ($val=='inline')         $this->value['display'] = 'inline';
+					else if ($val=='block')     $this->value['display'] = 'block';
+					else if ($val=='none')      $this->value['display'] = 'none';
+					else                        $this->value['display'] = null;
+					break;
+
+				case 'top':
+				case 'bottom':
+				case 'left':
+				case 'right':
+					$this->value[$nom] = $val;
+					break;
+
+				case 'list-style':
+				case 'list-style-type':
+				case 'list-style-image':
+					if ($nom=='list-style') $nom = 'list-style-type';
+					$this->value[$nom] = $val;
+					break;
+
+				default:
+					break;
+			}
+		}
+
+		$return = true;
+
+		// only for P tag
+		if ($this->value['margin']['t']===null) $this->value['margin']['t'] = $this->value['font-size'];
+		if ($this->value['margin']['b']===null) $this->value['margin']['b'] = $this->value['font-size'];
+
+		// force the text align to left, if asked by html2pdf
+		if ($this->_onlyLeft) $this->value['text-align'] = 'left';
+
+		// correction on the width (quick box)
+		if ($noWidth && in_array($tagName, array('div', 'blockquote', 'fieldset')) && $this->value['position']!='absolute') {
+			$this->value['width'] = $this->getLastWidth();
+			$this->value['width']-= $this->value['margin']['l'] + $this->value['margin']['r'];
+		} else {
+			if ($correctWidth) {
+				if (!in_array($tagName, array('table', 'div', 'blockquote', 'fieldset', 'hr'))) {
+					$this->value['width']-= $this->value['padding']['l'] + $this->value['padding']['r'];
+					$this->value['width']-= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
+				}
+				if (in_array($tagName, array('th', 'td'))) {
+					$this->value['width']-= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
+					$return = false;
+				}
+				if ($this->value['width']<0) $this->value['width']=0;
+			} else {
+				if ($this->value['width']) {
+					if ($this->value['border']['l']['width']) $this->value['width'] += $this->value['border']['l']['width'];
+					if ($this->value['border']['r']['width']) $this->value['width'] += $this->value['border']['r']['width'];
+					if ($this->value['padding']['l'])         $this->value['width'] += $this->value['padding']['l'];
+					if ($this->value['padding']['r'])         $this->value['width'] += $this->value['padding']['r'];
+				}
+			}
+		}
+		if ($this->value['height']) {
+			if ($this->value['border']['b']['width']) $this->value['height'] += $this->value['border']['b']['width'];
+			if ($this->value['border']['t']['width']) $this->value['height'] += $this->value['border']['t']['width'];
+			if ($this->value['padding']['b'])         $this->value['height'] += $this->value['padding']['b'];
+			if ($this->value['padding']['t'])         $this->value['height'] += $this->value['padding']['t'];
+		}
+
+		if ($this->value['top']!=null)      $this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
+		if ($this->value['bottom']!=null)   $this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
+		if ($this->value['left']!=null)     $this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
+		if ($this->value['right']!=null)    $this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
+
+		if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])    $this->value['bottom']  = null;
+		if ($this->value['left'] && $this->value['right'] && $this->value['width'])     $this->value['right']   = null;
+
+		return $return;
+	}
+
+	 /**
+	  * get the height of the current line
+	  *
+	  * @access public
+	  * @return float $height in mm
+	  */
+	public function getLineHeight()
+	{
+		$val = $this->value['line-height'];
+		if ($val=='normal') $val = '108%';
+		return $this->convertToMM($val, $this->value['font-size']);
+	}
+
+	 /**
+	  * get the width of the parent
+	  *
+	  * @access public
+	  * @param  boolean $mode true => adding padding and border
+	  * @return float $width in mm
+	  */
+	public function getLastWidth($mode = false)
+	{
+		for ($k=count($this->table)-1; $k>=0; $k--) {
+			if ($this->table[$k]['width']) {
+				$w = $this->table[$k]['width'];
+				if ($mode) {
+					$w+= $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
+					$w+= $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
+				}
+				return $w;
+			}
+		}
+		return $this->_pdf->getW() - $this->_pdf->getlMargin() - $this->_pdf->getrMargin();
+	}
+
+	 /**
+	  * get the height of the parent
+	  *
+	  * @access public
+	  * @param  boolean $mode true => adding padding and border
+	  * @return float $height in mm
+	  */
+	public function getLastHeight($mode = false)
+	{
+		for ($k=count($this->table)-1; $k>=0; $k--) {
+			if ($this->table[$k]['height']) {
+				$h = $this->table[$k]['height'];
+				if ($mode) {
+					$h+= $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
+					$h+= $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
+				}
+				return $h;
+			}
+		}
+		return $this->_pdf->getH() - $this->_pdf->gettMargin() - $this->_pdf->getbMargin();
+	}
+
+	/**
+	 * get the value of the float property
+	 *
+	 * @access public
+	 * @return $float left/right
+	 */
+	public function getFloat()
+	{
+		if ($this->value['float']=='left')    return 'left';
+		if ($this->value['float']=='right')   return 'right';
+		return null;
+	}
+
+	/**
+	 * get the last value for a specific key
+	 *
+	 * @access public
+	 * @param  string $key
+	 * @return mixed
+	 */
+	public function getLastValue($key)
+	{
+		$nb = count($this->table);
+		if ($nb>0) {
+			return $this->table[$nb-1][$key];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * get the last absolute X
+	 *
+	 * @access protected
+	 * @return float $x
+	 */
+	protected function _getLastAbsoluteX()
+	{
+		for ($k=count($this->table)-1; $k>=0; $k--) {
+			if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
+		}
+		return $this->_pdf->getlMargin();
+	}
+
+	/**
+	 * get the last absolute Y
+	 *
+	 * @access protected
+	 * @return float $y
+	 */
+	protected function _getLastAbsoluteY()
+	{
+		for ($k=count($this->table)-1; $k>=0; $k--) {
+			if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
+		}
+		return $this->_pdf->gettMargin();
+	}
+
+	/**
+	 * get the CSS properties of the current tag
+	 *
+	 * @access protected
+	 * @return array $styles
+	 */
+	protected function _getFromCSS()
+	{
+		// styles to apply
+		$styles = array();
+
+		// list of the selectors to get in the CSS files
+		$getit  = array();
+
+		// get the list of the selectors of each tags
+		$lst = array();
+		$lst[] = $this->value['id_lst'];
+		for ($i=count($this->table)-1; $i>=0; $i--) {
+			$lst[] = $this->table[$i]['id_lst'];
+		}
+
+		// foreach selectors in the CSS files, verify if it match with the list of selectors
+		foreach ($this->cssKeys as $key => $num) {
+			if ($this->_getReccursiveStyle($key, $lst)) {
+				$getit[$key] = $num;
+			}
+		}
+
+		// if we have selectors
+		if (count($getit)) {
+			// get them, but in the definition order, because of priority
+			asort($getit);
+			foreach ($getit as $key => $val) $styles = array_merge($styles, $this->css[$key]);
+		}
+
+		return $styles;
+	}
+
+	/**
+	 * identify if the selector $key match with the list of tag selectors
+	 *
+	 * @access protected
+	 * @param  string   $key CSS selector to analyse
+	 * @param  array    $lst list of the selectors of each tags
+	 * @param  string   $next next step of parsing the selector
+	 * @return boolean
+	 */
+	protected function _getReccursiveStyle($key, $lst, $next = null)
+	{
+		// if next step
+		if ($next!==null) {
+			// we remove this step
+			if ($next) $key = trim(substr($key, 0, -strlen($next)));
+			array_shift($lst);
+
+			// if no more step to identify => return false
+			if (!count($lst)) {
+				return false;
+			}
+		}
+
+		// for each selector of the current step
+		foreach ($lst[0] as $name) {
+			// if selector = key => ok
+			if ($key==$name) {
+				return true;
+			}
+
+			// if the end of the key = the selector and the next step is ok => ok
+			if (substr($key, -strlen(' '.$name))==' '.$name && $this->_getReccursiveStyle($key, $lst, $name)) {
+				return true;
+			}
+		}
+
+		// if we are not in the first step, we analyse the sub steps (the pareng tag of the current tag)
+		if ($next!==null && $this->_getReccursiveStyle($key, $lst, '')) {
+			return true;
+		}
+
+		// no corresponding found
+		return false;
+	}
+
+	/**
+	 * Analyse a border
+	 *
+	 * @access  public
+	 * @param   string $css css border properties
+	 * @return  array  border properties
+	 */
+	public function readBorder($css)
+	{
+		// border none
+		$none = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
+
+		// default value
+		$type  = 'solid';
+		$width = $this->convertToMM('1pt');
+		$color = array(0, 0, 0);
+
+		// clean up the values
+		$css = explode(' ', $css);
+		foreach ($css as $k => $v) {
+			$v = trim($v);
+			if ($v) $css[$k] = $v;
+			else    unset($css[$k]);
+		}
+		$css = array_values($css);
+
+		// read the values
+		$res = null;
+		foreach ($css as $value) {
+
+			// if no border => return none
+			if ($value=='none' || $value=='hidden') {
+				return $none;
+			}
+
+			// try to convert the value as a distance
+			$tmp = $this->convertToMM($value);
+
+			// if the convert is ok => it is a width
+			if ($tmp!==null) {
+				$width = $tmp;
+			// else, it could be the type
+			} else if (in_array($value, array('solid', 'dotted', 'dashed', 'double'))) {
+				$type = $value;
+			// else, it could be the color
+			} else {
+				$tmp = $this->convertToColor($value, $res);
+				if ($res) $color = $tmp;
+			}
+		}
+
+		// if no witdh => return none
+		if (!$width) return $none;
+
+		// return the border properties
+		return array('type' => $type, 'width' => $width, 'color' => $color);
+	}
+
+	/**
+	 * duplicate the borders if needed
+	 *
+	 * @access protected
+	 * @param  &array $val
+	 */
+	protected function _duplicateBorder(&$val)
+	{
+		// 1 value => L => RTB
+		if (count($val)==1) {
+			$val[1] = $val[0];
+			$val[2] = $val[0];
+			$val[3] = $val[0];
+		// 2 values => L => R & T => B
+		} else if (count($val)==2) {
+			$val[2] = $val[0];
+			$val[3] = $val[1];
+		// 3 values => T => B
+		} else if (count($val)==3) {
+			$val[3] = $val[1];
+		}
+	}
+
+	/**
+	 * Analyse a background
+	 *
+	 * @access public
+	 * @param  string $css css background properties
+	 * @param  &array $value parsed values (by reference, because, ther is a legacy of the parent CSS properties)
+	 */
+	public function convertBackground($css, &$value)
+	{
+		// is there a image ?
+		$text = '/url\(([^)]*)\)/isU';
+		if (preg_match($text, $css, $match)) {
+			// get the image
+			$value['image'] = $this->convertBackgroundImage($match[0]);
+
+			// remove if from the css properties
+			$css = preg_replace($text, '', $css);
+			$css = preg_replace('/[\s]+/', ' ', $css);
+		}
+
+		// protect some spaces
+		$css = preg_replace('/,[\s]+/', ',', $css);
+
+		// explode the values
+		$css = explode(' ', $css);
+
+		// background position to parse
+		$pos = '';
+
+		// foreach value
+		foreach ($css as $val) {
+			// try to parse the value as a color
+			$ok = false;
+			$color = $this->convertToColor($val, $ok);
+
+			// if ok => it is a color
+			if ($ok) {
+				$value['color'] = $color;
+			// else if transparent => no coloàr
+			} else if ($val=='transparent') {
+				$value['color'] = null;
+			// else
+			} else {
+				// try to parse the value as a repeat
+				$repeat = $this->convertBackgroundRepeat($val);
+
+				// if ok => it is repeat
+				if ($repeat) {
+					$value['repeat'] = $repeat;
+				// else => it could only be a position
+				} else {
+					$pos.= ($pos ? ' ' : '').$val;
+				}
+			}
+		}
+
+		// if we have a position to parse
+		if ($pos) {
+			// try to read it
+			$pos = $this->convertBackgroundPosition($pos, $ok);
+			if ($ok) $value['position'] = $pos;
+		}
+	}
+
+	/**
+	 * parse a background color
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @return string $value
+	 */
+	public function convertBackgroundColor($css)
+	{
+		$res = null;
+		if ($css=='transparent') return null;
+		else                     return $this->convertToColor($css, $res);
+	}
+
+	/**
+	 * parse a background image
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @return string $value
+	 */
+	public function convertBackgroundImage($css)
+	{
+		if ($css=='none')
+			return null;
+		else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
+			return $match[1];
+		else
+			return null;
+	}
+
+	/**
+	 * parse a background position
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @param  &boolean $res flag if conver is ok or not
+	 * @return array ($x, $y)
+	 */
+	public function convertBackgroundPosition($css, &$res)
+	{
+		// init the res
+		$res = false;
+
+		// explode the value
+		$css = explode(' ', $css);
+
+		// we must have 2 values. if 0 or >2 : error. if 1 => put center for 2
+		if (count($css)<2) {
+			if (!$css[0]) return null;
+			$css[1] = 'center';
+		}
+		if (count($css)>2) return null;
+
+		// prepare the values
+		$x = 0;
+		$y = 0;
+		$res = true;
+
+		// convert the first value
+		if ($css[0]=='left')        $x = '0%';
+		else if ($css[0]=='center') $x = '50%';
+		else if ($css[0]=='right')  $x = '100%';
+		else if ($css[0]=='top')    $y = '0%';
+		else if ($css[0]=='bottom') $y = '100%';
+		else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) $x = $css[0];
+		else if ($this->convertToMM($css[0])) $x = $this->convertToMM($css[0]);
+		else $res = false;
+
+		// convert the second value
+		if ($css[1]=='left')        $x = '0%';
+		else if ($css[1]=='right')  $x = '100%';
+		else if ($css[1]=='top')    $y = '0%';
+		else if ($css[1]=='center') $y = '50%';
+		else if ($css[1]=='bottom') $y = '100%';
+		else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) $y = $css[1];
+		else if ($this->convertToMM($css[1])) $y = $this->convertToMM($css[1]);
+		else $res = false;
+
+		// return the values
+		return array($x, $y);
+	}
+
+	/**
+	 * parse a background repeat
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @return string $value
+	 */
+	public function convertBackgroundRepeat($css)
+	{
+		switch($css)
+		{
+			case 'repeat':
+				return array(true, true);
+			case 'repeat-x':
+				return array(true, false);
+			case 'repeat-y':
+				return array(false, true);
+			case 'no-repeat':
+				return array(false, false);
+		}
+		return null;
+	}
+
+	 /**
+	  * convert a distance to mm
+	  *
+	  * @access public
+	  * @param  string $css distance to convert
+	  * @param  float  $old parent distance
+	  * @return float  $value
+	  */
+	public function convertToMM($css, $old=0.)
+	{
+		$css = trim($css);
+		if (preg_match('/^[0-9\.\-]+$/isU', $css))        $css.= 'px';
+		if (preg_match('/^[0-9\.\-]+px$/isU', $css))      $css = 25.4/96. * str_replace('px', '', $css);
+		else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) $css = 25.4/72. * str_replace('pt', '', $css);
+		else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) $css = 25.4 * str_replace('in', '', $css);
+		else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) $css = 1.*str_replace('mm', '', $css);
+		else if (preg_match('/^[0-9\.\-]+%$/isU', $css))  $css = 1.*$old*str_replace('%', '', $css)/100.;
+		else                                              $css = null;
+
+		return $css;
+	}
+
+	/**
+	 * convert a css radius
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @return float  $value
+	 */
+	public function convertToRadius($css)
+	{
+		// explode the value
+		$css = explode(' ', $css);
+
+		foreach ($css as $k => $v) {
+			$v = trim($v);
+			if ($v) {
+				$v = $this->convertToMM($v, 0);
+				if ($v!==null) {
+					$css[$k] = $v;
+				} else {
+					unset($css[$k]);
+				}
+			} else {
+				unset($css[$k]);
+			}
+		}
+
+		return array_values($css);
+	}
+
+	/**
+	 * convert a css color
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @param  &boolean $res
+	 * @return array (r,g, b)
+	 */
+	public function convertToColor($css, &$res)
+	{
+		// prepare the value
+		$css = trim($css);
+		$res = true;
+
+		// if transparent => return null
+		if (strtolower($css)=='transparent') return array(null, null, null);
+
+		// HTML color
+		if (isset($this->_htmlColor[strtolower($css)])) {
+			$css = $this->_htmlColor[strtolower($css)];
+			$r = floatVal(hexdec(substr($css, 0, 2)));
+			$v = floatVal(hexdec(substr($css, 2, 2)));
+			$b = floatVal(hexdec(substr($css, 4, 2)));
+			return array($r, $v, $b);
+		}
+
+		// like #FFFFFF
+		if (preg_match('/^#[0-9A-Fa-f]{6}$/isU', $css)) {
+			$r = floatVal(hexdec(substr($css, 1, 2)));
+			$v = floatVal(hexdec(substr($css, 3, 2)));
+			$b = floatVal(hexdec(substr($css, 5, 2)));
+			return array($r, $v, $b);
+		}
+
+		// like #FFF
+		if (preg_match('/^#[0-9A-F]{3}$/isU', $css)) {
+			$r = floatVal(hexdec(substr($css, 1, 1).substr($css, 1, 1)));
+			$v = floatVal(hexdec(substr($css, 2, 1).substr($css, 2, 1)));
+			$b = floatVal(hexdec(substr($css, 3, 1).substr($css, 3, 1)));
+			return array($r, $v, $b);
+		}
+
+		// like rgb(100, 100, 100)
+		if (preg_match('/rgb\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
+			$r = $this->_convertSubColor($match[1]);
+			$v = $this->_convertSubColor($match[2]);
+			$b = $this->_convertSubColor($match[3]);
+			return array($r*255., $v*255., $b*255.);
+		}
+
+		// like cmyk(100, 100, 100, 100)
+		if (preg_match('/cmyk\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
+			$c = $this->_convertSubColor($match[1]);
+			$m = $this->_convertSubColor($match[2]);
+			$y = $this->_convertSubColor($match[3]);
+			$k = $this->_convertSubColor($match[4]);
+			return array($c*100., $m*100., $y*100., $k*100.);
+		}
+
+		$res = false;
+		return array(0., 0., 0.);
+	}
+
+	/**
+	 * color value to convert
+	 *
+	 * @access protected
+	 * @param  string $c
+	 * @return float $c 0.->1.
+	 */
+	protected function _convertSubColor($c)
+	{
+		if (substr($c, -1)=='%') {
+			$c = floatVal(substr($c, 0, -1))/100.;
+		} else {
+			$c = floatVal($c);
+			if ($c>1) $c = $c/255.;
+		}
+
+		return $c;
+	}
+
+	/**
+	 * read a css content
+	 *
+	 * @access protected
+	 * @param  &string $code
+	 */
+	protected function _analyseStyle(&$code)
+	{
+		// clean the spaces
+		$code = preg_replace('/[\s]+/', ' ', $code);
+
+		// remove the comments
+		$code = preg_replace('/\/\*.*?\*\//s', '', $code);
+
+		// split each CSS code "selector { value }"
+		preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
+
+		// for each CSS code
+		for ($k=0; $k<count($match[0]); $k++) {
+
+			// selectors
+			$names = strtolower(trim($match[1][$k]));
+
+			// css style
+			$styles = trim($match[2][$k]);
+
+			// explode each value
+			$styles = explode(';', $styles);
+
+			// parse each value
+			$css = array();
+			foreach ($styles as $style) {
+				$tmp = explode(':', $style);
+				if (count($tmp)>1) {
+					$cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp);
+					$css[trim(strtolower($cod))] = trim($tmp);
+				}
+			}
+
+			// explode the names
+			$names = explode(',', $names);
+
+			// save the values for each names
+			foreach ($names as $name) {
+				// clean the name
+				$name = trim($name);
+
+				// if a selector with somethink lige :hover => continue
+				if (strpos($name, ':')!==false) continue;
+
+				// save the value
+				if (!isset($this->css[$name]))
+					$this->css[$name] = $css;
+				else
+					$this->css[$name] = array_merge($this->css[$name], $css);
+
+			}
+		}
+
+		// get he list of the keys
+		$this->cssKeys = array_flip(array_keys($this->css));
+	}
+
+	/**
+	 * Extract the css files from a html code
+	 *
+	 * @access public
+	 * @param  string   &$html
+	 */
+	public function readStyle(&$html)
+	{
+		// the CSS content
+		$style = ' ';
+
+		// extract the link tags, and remove them in the html code
+		preg_match_all('/<link([^>]*)>/isU', $html, $match);
+		$html = preg_replace('/<link[^>]*>/isU', '', $html);
+		$html = preg_replace('/<\/link[^>]*>/isU', '', $html);
+
+		// analyse each link tag
+		foreach ($match[1] as $code) {
+			$tmp = array();
+
+			// read the attributes name=value
+			$prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for ($k=0; $k<count($match[0]); $k++) {
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+			}
+
+			// read the attributes name="value"
+			$prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for ($k=0; $k<count($match[0]); $k++) {
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+			}
+
+			// read the attributes name='value'
+			$prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for ($k=0; $k<count($match[0]); $k++) {
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+			}
+
+			// if type text/css => we keep it
+			if (isset($tmp['type']) && strtolower($tmp['type'])=='text/css' && isset($tmp['href'])) {
+
+				// get the href
+				$url = $tmp['href'];
+
+				// get the content of the css file
+				$content = @file_get_contents($url);
+
+				// if "http://" in the url
+				if (strpos($url, 'http://')!==false) {
+
+					// get the domain "http://xxx/"
+					$url = str_replace('http://', '', $url);
+					$url = explode('/', $url);
+					$urlMain = 'http://'.$url[0].'/';
+
+					// get the absolute url of the path
+					$urlSelf = $url; unset($urlSelf[count($urlSelf)-1]); $urlSelf = 'http://'.implode('/', $urlSelf).'/';
+
+					// adapt the url in the css content
+					$content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$urlSelf.'$1)', $content);
+					$content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$urlMain.'$1)', $content);
+				} else {
 // @TODO correction on url in absolute on a local css content
-                    // $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
-                }
-
-                // add to the CSS content
-                $style.= $content."\n";
-            }
-        }
-
-        // extract the style tags des tags style, and remove them in the html code
-        preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-        $html = preg_replace('/<style[^>]*>(.*)<\/style[^>]*>/isU', '', $html);
-
-        // analyse each style tags
-        foreach ($match[1] as $code) {
-            // add to the CSS content
-            $code = str_replace('<!--', '', $code);
-            $code = str_replace('-->', '', $code);
-            $style.= $code."\n";
-        }
-
-        //analyse the css content
-        $this->_analyseStyle($style);
-    }
+					// $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
+				}
+
+				// add to the CSS content
+				$style.= $content."\n";
+			}
+		}
+
+		// extract the style tags des tags style, and remove them in the html code
+		preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
+		$html = preg_replace('/<style[^>]*>(.*)<\/style[^>]*>/isU', '', $html);
+
+		// analyse each style tags
+		foreach ($match[1] as $code) {
+			// add to the CSS content
+			$code = str_replace('<!--', '', $code);
+			$code = str_replace('-->', '', $code);
+			$style.= $code."\n";
+		}
+
+		//analyse the css content
+		$this->_analyseStyle($style);
+	}
 }
\ No newline at end of file

Spacing +174 added lines, -174 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * HTML2PDF Librairy - parsingCss class
  *
@@ -18,8 +18,8 @@ 
     protected $_pdf         = null;
 
     protected $_htmlColor   = array(); // list of the HTML colors
-    protected $_onlyLeft    = false;   // flag if we are in a sub html => only "text-align:left" is used
-    protected $_defaultFont = null;    // default font to use if the asked font does not exist
+    protected $_onlyLeft    = false; // flag if we are in a sub html => only "text-align:left" is used
+    protected $_defaultFont = null; // default font to use if the asked font does not exist
 
     public    $value        = array(); // current values
     public    $css          = array(); // css values
@@ -68,7 +68,7 @@ 
      */
     public function getOldValues()
     {
-        return isset($this->table[count($this->table)-1]) ? $this->table[count($this->table)-1] : $this->value;
+        return isset($this->table[count($this->table) - 1]) ? $this->table[count($this->table) - 1] : $this->value;
     }
 
     /**
@@ -94,7 +94,7 @@ 
     protected function _init()
     {
         // get the Web Colors from TCPDF
-        require(K_PATH_MAIN.'htmlcolors.php');
+        require(K_PATH_MAIN . 'htmlcolors.php');
         $this->_htmlColor = $webcolor;
 
         // init the Style
@@ -113,13 +113,13 @@ 
      */
     public function initStyle()
     {
-        $this->value['id_tag']       = 'body';        // tag name
-        $this->value['id_name']          = null;         // tag - attribute name
-        $this->value['id_id']            = null;         // tag - attribute id
-        $this->value['id_class']         = null;         // tag - attribute class
-        $this->value['id_lst']           = array('*');   // tag - list of legacy
-        $this->value['mini-size']        = 1.;           // specific size report for sup, sub
-        $this->value['mini-decal']       = 0;            // specific position report for sup, sub
+        $this->value['id_tag'] = 'body'; // tag name
+        $this->value['id_name']          = null; // tag - attribute name
+        $this->value['id_id']            = null; // tag - attribute id
+        $this->value['id_class']         = null; // tag - attribute class
+        $this->value['id_lst']           = array('*'); // tag - list of legacy
+        $this->value['mini-size']        = 1.; // specific size report for sup, sub
+        $this->value['mini-decal']       = 0; // specific position report for sup, sub
         $this->value['font-family']      = 'Arial';
         $this->value['font-bold']        = false;
         $this->value['font-italic']      = false;
@@ -212,7 +212,7 @@ 
 
         // specific values for some tags
         if (!in_array($tagName, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
-            $this->value['margin'] = array('t'=>0,'r'=>0,'b'=>0,'l'=>0);
+            $this->value['margin'] = array('t'=>0, 'r'=>0, 'b'=>0, 'l'=>0);
         }
 
         if (in_array($tagName, array('input', 'select', 'textarea'))) {
@@ -222,11 +222,11 @@ 
             $this->value['border']['l'] = null;
         }
 
-        if ($tagName=='p') {
+        if ($tagName == 'p') {
             $this->value['margin']['t'] = null;
             $this->value['margin']['b'] = null;
         }
-        if ($tagName=='blockquote') {
+        if ($tagName == 'blockquote') {
             $this->value['margin']['t'] = 3;
             $this->value['margin']['r'] = 3;
             $this->value['margin']['b'] = 3;
@@ -275,7 +275,7 @@ 
             );
         }
 
-        if ($tagName=='hr') {
+        if ($tagName == 'hr') {
             $this->value['border'] = array(
                 't' => $border,
                 'r' => $border,
@@ -305,40 +305,40 @@ 
     {
         $family = strtolower($this->value['font-family']);
 
-        $b = ($this->value['font-bold']        ? 'B' : '');
-        $i = ($this->value['font-italic']      ? 'I' : '');
-        $u = ($this->value['font-underline']   ? 'U' : '');
+        $b = ($this->value['font-bold'] ? 'B' : '');
+        $i = ($this->value['font-italic'] ? 'I' : '');
+        $u = ($this->value['font-underline'] ? 'U' : '');
         $d = ($this->value['font-linethrough'] ? 'D' : '');
-        $o = ($this->value['font-overline']    ? 'O' : '');
+        $o = ($this->value['font-overline'] ? 'O' : '');
 
         // font style
-        $style = $b.$i;
+        $style = $b . $i;
 
         if ($this->_defaultFont) {
-            if($family=='arial')
-                $family='helvetica';
-            elseif($family=='symbol' || $family=='zapfdingbats')
-                $style='';
+            if ($family == 'arial')
+                $family = 'helvetica';
+            elseif ($family == 'symbol' || $family == 'zapfdingbats')
+                $style = '';
 
-            $fontkey = $family.$style;
+            $fontkey = $family . $style;
             if (!$this->_pdf->isLoadedFont($fontkey))
                 $family = $this->_defaultFont;
         }
 
-        if($family=='arial')
-            $family='helvetica';
-        elseif($family=='symbol' || $family=='zapfdingbats')
-            $style='';
+        if ($family == 'arial')
+            $family = 'helvetica';
+        elseif ($family == 'symbol' || $family == 'zapfdingbats')
+            $style = '';
 
         // complete style
-        $style.= $u.$d.$o;
+        $style .= $u . $d . $o;
 
         // size : mm => pt
         $size = $this->value['font-size'];
         $size = 72 * $size / 25.4;
 
         // apply the font
-        $this->_pdf->SetFont($family, $style, $this->value['mini-size']*$size);
+        $this->_pdf->SetFont($family, $style, $this->value['mini-size'] * $size);
         $this->_pdf->setTextColorArray($this->value['color']);
         if ($this->value['background']['color'])
             $this->_pdf->setFillColorArray($this->value['background']['color']);
@@ -375,7 +375,7 @@ 
      */
     public function restorePosition()
     {
-        if ($this->value['y']==$this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
+        if ($this->value['y'] == $this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
     }
 
      /**
@@ -393,35 +393,35 @@ 
         $this->value['xc'] = $currentX;
         $this->value['yc'] = $currentY;
 
-        if ($this->value['position']=='relative' || $this->value['position']=='absolute') {
-            if ($this->value['right']!==null) {
+        if ($this->value['position'] == 'relative' || $this->value['position'] == 'absolute') {
+            if ($this->value['right'] !== null) {
                 $x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
-                if ($this->value['margin']['r']) $x-= $this->value['margin']['r'];
+                if ($this->value['margin']['r']) $x -= $this->value['margin']['r'];
             } else {
                 $x = $this->value['left'];
-                if ($this->value['margin']['l']) $x+= $this->value['margin']['l'];
+                if ($this->value['margin']['l']) $x += $this->value['margin']['l'];
             }
 
-            if ($this->value['bottom']!==null) {
+            if ($this->value['bottom'] !== null) {
                 $y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
-                if ($this->value['margin']['b']) $y-= $this->value['margin']['b'];
+                if ($this->value['margin']['b']) $y -= $this->value['margin']['b'];
             } else {
                 $y = $this->value['top'];
-                if ($this->value['margin']['t']) $y+= $this->value['margin']['t'];
+                if ($this->value['margin']['t']) $y += $this->value['margin']['t'];
             }
 
-            if ($this->value['position']=='relative') {
+            if ($this->value['position'] == 'relative') {
                 $this->value['x'] = $currentX + $x;
                 $this->value['y'] = $currentY + $y;
             } else {
-                $this->value['x'] = $this->_getLastAbsoluteX()+$x;
-                $this->value['y'] = $this->_getLastAbsoluteY()+$y;
+                $this->value['x'] = $this->_getLastAbsoluteX() + $x;
+                $this->value['y'] = $this->_getLastAbsoluteY() + $y;
             }
         } else {
             $this->value['x'] = $currentX;
             $this->value['y'] = $currentY;
-            if ($this->value['margin']['l']) $this->value['x']+= $this->value['margin']['l'];
-            if ($this->value['margin']['t']) $this->value['y']+= $this->value['margin']['t'];
+            if ($this->value['margin']['l']) $this->value['x'] += $this->value['margin']['l'];
+            if ($this->value['margin']['t']) $this->value['y'] += $this->value['margin']['t'];
         }
 
         // save the new position
@@ -478,7 +478,7 @@ 
     {
         // prepare
         $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null; if (!$id)   $id   = null;
+        $id   = isset($param['id']) ? strtolower(trim($param['id'])) : null; if (!$id)   $id   = null;
         $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) $name = null;
 
         // read the class attribute
@@ -509,15 +509,15 @@ 
 
         if (count($class)) {
             foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
+                $this->value['id_lst'][] = '*.' . $v;
+                $this->value['id_lst'][] = '.' . $v;
+                $this->value['id_lst'][] = $tagName . '.' . $v;
             }
         }
         if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
+            $this->value['id_lst'][] = '*#' . $id;
+            $this->value['id_lst'][] = '#' . $id;
+            $this->value['id_lst'][] = $tagName . '#' . $id;
         }
 
         // CSS style
@@ -529,7 +529,7 @@ 
         if (isset($styles['stroke']))        $this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
         if (isset($styles['stroke-width']))  $this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
         if (isset($styles['fill']))          $this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
-        if (isset($styles['fill-opacity']))  $this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
+        if (isset($styles['fill-opacity']))  $this->value['svg']['fill-opacity'] = 1. * $styles['fill-opacity'];
 
         return $this->value['svg'];
     }
@@ -546,8 +546,8 @@ 
     {
         // prepare the informations
         $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name']))  : null; if (!$name) $name = null;
+        $id   = isset($param['id']) ? strtolower(trim($param['id'])) : null; if (!$id)   $id   = null;
+        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) $name = null;
 
         // get the class names to use
         $class = array();
@@ -568,15 +568,15 @@ 
         $this->value['id_lst'][] = $tagName;
         if (count($class)) {
             foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
+                $this->value['id_lst'][] = '*.' . $v;
+                $this->value['id_lst'][] = '.' . $v;
+                $this->value['id_lst'][] = $tagName . '.' . $v;
             }
         }
         if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
+            $this->value['id_lst'][] = '*#' . $id;
+            $this->value['id_lst'][] = '#' . $id;
+            $this->value['id_lst'][] = $tagName . '#' . $id;
         }
 
         // get the css styles from class
@@ -593,7 +593,7 @@ 
         if ($legacy) {
             foreach ($legacy as $legacyName => $legacyValue) {
                 if (is_array($legacyValue)) {
-                    foreach($legacyValue as $legacy2Name => $legacy2Value)
+                    foreach ($legacyValue as $legacy2Name => $legacy2Value)
                         $this->value[$legacyName][$legacy2Name] = $legacy2Value;
                 } else {
                     $this->value[$legacyName] = $legacyValue;
@@ -607,7 +607,7 @@ 
 
         // read all the css styles
         foreach ($styles as $nom => $val) {
-            switch($nom)
+            switch ($nom)
             {
                 case 'font-family':
                     $val = explode(',', $val);
@@ -616,11 +616,11 @@ 
                     break;
 
                 case 'font-weight':
-                    $this->value['font-bold'] = ($val=='bold');
+                    $this->value['font-bold'] = ($val == 'bold');
                     break;
 
                 case 'font-style':
-                    $this->value['font-italic'] = ($val=='italic');
+                    $this->value['font-italic'] = ($val == 'italic');
                     break;
 
                 case 'text-decoration':
@@ -636,7 +636,7 @@ 
 
                 case 'text-transform':
                     if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
-                    $this->value['text-transform']  = $val;
+                    $this->value['text-transform'] = $val;
                     break;
 
                 case 'font-size':
@@ -647,7 +647,7 @@ 
                 case 'color':
                     $res = null;
                     $this->value['color'] = $this->convertToColor($val, $res);
-                    if ($tagName=='hr') {
+                    if ($tagName == 'hr') {
                         $this->value['border']['l']['color'] = $this->value['color'];
                         $this->value['border']['t']['color'] = $this->value['color'];
                         $this->value['border']['r']['color'] = $this->value['color'];
@@ -667,7 +667,7 @@ 
 
                 case 'width':
                     $this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
-                    if ($this->value['width'] && substr($val, -1)=='%') $correctWidth=true;
+                    if ($this->value['width'] && substr($val, -1) == '%') $correctWidth = true;
                     $noWidth = false;
                     break;
 
@@ -676,13 +676,13 @@ 
                     break;
 
                 case 'line-height':
-                    if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val*100).'%';
+                    if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val * 100) . '%';
                     $this->value['line-height'] = $val;
                     break;
 
                 case 'rotate':
                     if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
-                    if ($val<0) $val+= 360;
+                    if ($val < 0) $val += 360;
                     $this->value['rotate'] = $val;
                     break;
 
@@ -695,7 +695,7 @@ 
                     $val = explode(' ', $val);
                     foreach ($val as $k => $v) {
                         $v = trim($v);
-                        if ($v!='') {
+                        if ($v != '') {
                             $val[$k] = $v;
                         } else {
                             unset($val[$k]);
@@ -726,14 +726,14 @@ 
                     break;
 
                 case 'margin':
-                    if ($val=='auto') {
+                    if ($val == 'auto') {
                         $this->value['margin-auto'] = true;
                         break;
                     }
                     $val = explode(' ', $val);
                     foreach ($val as $k => $v) {
                         $v = trim($v);
-                        if ($v!='') {
+                        if ($v != '') {
                             $val[$k] = $v;
                         } else {
                             unset($val[$k]);
@@ -883,16 +883,16 @@ 
                     break;
 
                 case 'border-collapse':
-                    if ($tagName=='table') $this->value['border']['collapse'] = ($val=='collapse');
+                    if ($tagName == 'table') $this->value['border']['collapse'] = ($val == 'collapse');
                     break;
 
                 case 'border-radius':
                     $val = explode('/', $val);
-                    if (count($val)>2) {
+                    if (count($val) > 2) {
                         break;
                     }
                     $valH = $this->convertToRadius(trim($val[0]));
-                    if (count($valH)<1 || count($valH)>4) {
+                    if (count($valH) < 1 || count($valH) > 4) {
                         break;
                     }
                     if (!isset($valH[1])) $valH[1] = $valH[0];
@@ -900,7 +900,7 @@ 
                     if (!isset($valH[3])) $valH[3] = $valH[1];
                     if (isset($val[1])) {
                         $valV = $this->convertToRadius(trim($val[1]));
-                        if (count($valV)<1 || count($valV)>4) {
+                        if (count($valV) < 1 || count($valV) > 4) {
                             break;
                         }
                         if (!isset($valV[1])) $valV[1] = $valV[0];
@@ -919,7 +919,7 @@ 
 
                 case 'border-top-left-radius':
                     $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
+                    if (count($val) < 1 || count($val) > 2) {
                         break;
                     }
                     $this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
@@ -927,7 +927,7 @@ 
 
                 case 'border-top-right-radius':
                     $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
+                    if (count($val) < 1 || count($val) > 2) {
                         break;
                     }
                     $this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
@@ -935,7 +935,7 @@ 
 
                 case 'border-bottom-right-radius':
                     $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
+                    if (count($val) < 1 || count($val) > 2) {
                         break;
                     }
                     $this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
@@ -943,7 +943,7 @@ 
 
                 case 'border-bottom-left-radius':
                     $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
+                    if (count($val) < 1 || count($val) > 2) {
                         break;
                     }
                     $this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
@@ -987,21 +987,21 @@ 
                     break;
 
                 case 'position':
-                    if ($val=='absolute')       $this->value['position'] = 'absolute';
-                    else if ($val=='relative')  $this->value['position'] = 'relative';
+                    if ($val == 'absolute')       $this->value['position'] = 'absolute';
+                    else if ($val == 'relative')  $this->value['position'] = 'relative';
                     else                        $this->value['position'] = null;
                     break;
 
                 case 'float':
-                    if ($val=='left')           $this->value['float'] = 'left';
-                    else if ($val=='right')     $this->value['float'] = 'right';
+                    if ($val == 'left')           $this->value['float'] = 'left';
+                    else if ($val == 'right')     $this->value['float'] = 'right';
                     else                        $this->value['float'] = null;
                     break;
 
                 case 'display':
-                    if ($val=='inline')         $this->value['display'] = 'inline';
-                    else if ($val=='block')     $this->value['display'] = 'block';
-                    else if ($val=='none')      $this->value['display'] = 'none';
+                    if ($val == 'inline')         $this->value['display'] = 'inline';
+                    else if ($val == 'block')     $this->value['display'] = 'block';
+                    else if ($val == 'none')      $this->value['display'] = 'none';
                     else                        $this->value['display'] = null;
                     break;
 
@@ -1015,7 +1015,7 @@ 
                 case 'list-style':
                 case 'list-style-type':
                 case 'list-style-image':
-                    if ($nom=='list-style') $nom = 'list-style-type';
+                    if ($nom == 'list-style') $nom = 'list-style-type';
                     $this->value[$nom] = $val;
                     break;
 
@@ -1027,27 +1027,27 @@ 
         $return = true;
 
         // only for P tag
-        if ($this->value['margin']['t']===null) $this->value['margin']['t'] = $this->value['font-size'];
-        if ($this->value['margin']['b']===null) $this->value['margin']['b'] = $this->value['font-size'];
+        if ($this->value['margin']['t'] === null) $this->value['margin']['t'] = $this->value['font-size'];
+        if ($this->value['margin']['b'] === null) $this->value['margin']['b'] = $this->value['font-size'];
 
         // force the text align to left, if asked by html2pdf
         if ($this->_onlyLeft) $this->value['text-align'] = 'left';
 
         // correction on the width (quick box)
-        if ($noWidth && in_array($tagName, array('div', 'blockquote', 'fieldset')) && $this->value['position']!='absolute') {
+        if ($noWidth && in_array($tagName, array('div', 'blockquote', 'fieldset')) && $this->value['position'] != 'absolute') {
             $this->value['width'] = $this->getLastWidth();
-            $this->value['width']-= $this->value['margin']['l'] + $this->value['margin']['r'];
+            $this->value['width'] -= $this->value['margin']['l'] + $this->value['margin']['r'];
         } else {
             if ($correctWidth) {
                 if (!in_array($tagName, array('table', 'div', 'blockquote', 'fieldset', 'hr'))) {
-                    $this->value['width']-= $this->value['padding']['l'] + $this->value['padding']['r'];
-                    $this->value['width']-= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
+                    $this->value['width'] -= $this->value['padding']['l'] + $this->value['padding']['r'];
+                    $this->value['width'] -= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
                 }
                 if (in_array($tagName, array('th', 'td'))) {
-                    $this->value['width']-= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
+                    $this->value['width'] -= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
                     $return = false;
                 }
-                if ($this->value['width']<0) $this->value['width']=0;
+                if ($this->value['width'] < 0) $this->value['width'] = 0;
             } else {
                 if ($this->value['width']) {
                     if ($this->value['border']['l']['width']) $this->value['width'] += $this->value['border']['l']['width'];
@@ -1064,10 +1064,10 @@ 
             if ($this->value['padding']['t'])         $this->value['height'] += $this->value['padding']['t'];
         }
 
-        if ($this->value['top']!=null)      $this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
-        if ($this->value['bottom']!=null)   $this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
-        if ($this->value['left']!=null)     $this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
-        if ($this->value['right']!=null)    $this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
+        if ($this->value['top'] != null)      $this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
+        if ($this->value['bottom'] != null)   $this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
+        if ($this->value['left'] != null)     $this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
+        if ($this->value['right'] != null)    $this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
 
         if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])    $this->value['bottom']  = null;
         if ($this->value['left'] && $this->value['right'] && $this->value['width'])     $this->value['right']   = null;
@@ -1084,7 +1084,7 @@ 
     public function getLineHeight()
     {
         $val = $this->value['line-height'];
-        if ($val=='normal') $val = '108%';
+        if ($val == 'normal') $val = '108%';
         return $this->convertToMM($val, $this->value['font-size']);
     }
 
@@ -1097,12 +1097,12 @@ 
      */
     public function getLastWidth($mode = false)
     {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
+        for ($k = count($this->table) - 1; $k >= 0; $k--) {
             if ($this->table[$k]['width']) {
                 $w = $this->table[$k]['width'];
                 if ($mode) {
-                    $w+= $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
-                    $w+= $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
+                    $w += $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
+                    $w += $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
                 }
                 return $w;
             }
@@ -1119,12 +1119,12 @@ 
      */
     public function getLastHeight($mode = false)
     {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
+        for ($k = count($this->table) - 1; $k >= 0; $k--) {
             if ($this->table[$k]['height']) {
                 $h = $this->table[$k]['height'];
                 if ($mode) {
-                    $h+= $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
-                    $h+= $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
+                    $h += $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
+                    $h += $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
                 }
                 return $h;
             }
@@ -1140,8 +1140,8 @@ 
      */
     public function getFloat()
     {
-        if ($this->value['float']=='left')    return 'left';
-        if ($this->value['float']=='right')   return 'right';
+        if ($this->value['float'] == 'left')    return 'left';
+        if ($this->value['float'] == 'right')   return 'right';
         return null;
     }
 
@@ -1155,8 +1155,8 @@ 
     public function getLastValue($key)
     {
         $nb = count($this->table);
-        if ($nb>0) {
-            return $this->table[$nb-1][$key];
+        if ($nb > 0) {
+            return $this->table[$nb - 1][$key];
         } else {
             return null;
         }
@@ -1170,7 +1170,7 @@ 
      */
     protected function _getLastAbsoluteX()
     {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
+        for ($k = count($this->table) - 1; $k >= 0; $k--) {
             if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
         }
         return $this->_pdf->getlMargin();
@@ -1184,7 +1184,7 @@ 
      */
     protected function _getLastAbsoluteY()
     {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
+        for ($k = count($this->table) - 1; $k >= 0; $k--) {
             if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
         }
         return $this->_pdf->gettMargin();
@@ -1207,7 +1207,7 @@ 
         // get the list of the selectors of each tags
         $lst = array();
         $lst[] = $this->value['id_lst'];
-        for ($i=count($this->table)-1; $i>=0; $i--) {
+        for ($i = count($this->table) - 1; $i >= 0; $i--) {
             $lst[] = $this->table[$i]['id_lst'];
         }
 
@@ -1240,7 +1240,7 @@ 
     protected function _getReccursiveStyle($key, $lst, $next = null)
     {
         // if next step
-        if ($next!==null) {
+        if ($next !== null) {
             // we remove this step
             if ($next) $key = trim(substr($key, 0, -strlen($next)));
             array_shift($lst);
@@ -1254,18 +1254,18 @@ 
         // for each selector of the current step
         foreach ($lst[0] as $name) {
             // if selector = key => ok
-            if ($key==$name) {
+            if ($key == $name) {
                 return true;
             }
 
             // if the end of the key = the selector and the next step is ok => ok
-            if (substr($key, -strlen(' '.$name))==' '.$name && $this->_getReccursiveStyle($key, $lst, $name)) {
+            if (substr($key, -strlen(' ' . $name)) == ' ' . $name && $this->_getReccursiveStyle($key, $lst, $name)) {
                 return true;
             }
         }
 
         // if we are not in the first step, we analyse the sub steps (the pareng tag of the current tag)
-        if ($next!==null && $this->_getReccursiveStyle($key, $lst, '')) {
+        if ($next !== null && $this->_getReccursiveStyle($key, $lst, '')) {
             return true;
         }
 
@@ -1304,7 +1304,7 @@ 
         foreach ($css as $value) {
 
             // if no border => return none
-            if ($value=='none' || $value=='hidden') {
+            if ($value == 'none' || $value == 'hidden') {
                 return $none;
             }
 
@@ -1312,7 +1312,7 @@ 
             $tmp = $this->convertToMM($value);
 
             // if the convert is ok => it is a width
-            if ($tmp!==null) {
+            if ($tmp !== null) {
                 $width = $tmp;
             // else, it could be the type
             } else if (in_array($value, array('solid', 'dotted', 'dashed', 'double'))) {
@@ -1340,16 +1340,16 @@ 
     protected function _duplicateBorder(&$val)
     {
         // 1 value => L => RTB
-        if (count($val)==1) {
+        if (count($val) == 1) {
             $val[1] = $val[0];
             $val[2] = $val[0];
             $val[3] = $val[0];
         // 2 values => L => R & T => B
-        } else if (count($val)==2) {
+        } else if (count($val) == 2) {
             $val[2] = $val[0];
             $val[3] = $val[1];
         // 3 values => T => B
-        } else if (count($val)==3) {
+        } else if (count($val) == 3) {
             $val[3] = $val[1];
         }
     }
@@ -1393,7 +1393,7 @@ 
             if ($ok) {
                 $value['color'] = $color;
             // else if transparent => no coloàr
-            } else if ($val=='transparent') {
+            } else if ($val == 'transparent') {
                 $value['color'] = null;
             // else
             } else {
@@ -1405,7 +1405,7 @@ 
                     $value['repeat'] = $repeat;
                 // else => it could only be a position
                 } else {
-                    $pos.= ($pos ? ' ' : '').$val;
+                    $pos .= ($pos ? ' ' : '') . $val;
                 }
             }
         }
@@ -1428,7 +1428,7 @@ 
     public function convertBackgroundColor($css)
     {
         $res = null;
-        if ($css=='transparent') return null;
+        if ($css == 'transparent') return null;
         else                     return $this->convertToColor($css, $res);
     }
 
@@ -1441,7 +1441,7 @@ 
      */
     public function convertBackgroundImage($css)
     {
-        if ($css=='none')
+        if ($css == 'none')
             return null;
         else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
             return $match[1];
@@ -1466,11 +1466,11 @@ 
         $css = explode(' ', $css);
 
         // we must have 2 values. if 0 or >2 : error. if 1 => put center for 2
-        if (count($css)<2) {
+        if (count($css) < 2) {
             if (!$css[0]) return null;
             $css[1] = 'center';
         }
-        if (count($css)>2) return null;
+        if (count($css) > 2) return null;
 
         // prepare the values
         $x = 0;
@@ -1478,21 +1478,21 @@ 
         $res = true;
 
         // convert the first value
-        if ($css[0]=='left')        $x = '0%';
-        else if ($css[0]=='center') $x = '50%';
-        else if ($css[0]=='right')  $x = '100%';
-        else if ($css[0]=='top')    $y = '0%';
-        else if ($css[0]=='bottom') $y = '100%';
+        if ($css[0] == 'left')        $x = '0%';
+        else if ($css[0] == 'center') $x = '50%';
+        else if ($css[0] == 'right')  $x = '100%';
+        else if ($css[0] == 'top')    $y = '0%';
+        else if ($css[0] == 'bottom') $y = '100%';
         else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) $x = $css[0];
         else if ($this->convertToMM($css[0])) $x = $this->convertToMM($css[0]);
         else $res = false;
 
         // convert the second value
-        if ($css[1]=='left')        $x = '0%';
-        else if ($css[1]=='right')  $x = '100%';
-        else if ($css[1]=='top')    $y = '0%';
-        else if ($css[1]=='center') $y = '50%';
-        else if ($css[1]=='bottom') $y = '100%';
+        if ($css[1] == 'left')        $x = '0%';
+        else if ($css[1] == 'right')  $x = '100%';
+        else if ($css[1] == 'top')    $y = '0%';
+        else if ($css[1] == 'center') $y = '50%';
+        else if ($css[1] == 'bottom') $y = '100%';
         else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) $y = $css[1];
         else if ($this->convertToMM($css[1])) $y = $this->convertToMM($css[1]);
         else $res = false;
@@ -1510,7 +1510,7 @@ 
      */
     public function convertBackgroundRepeat($css)
     {
-        switch($css)
+        switch ($css)
         {
             case 'repeat':
                 return array(true, true);
@@ -1532,15 +1532,15 @@ 
      * @param  float  $old parent distance
      * @return float  $value
      */
-    public function convertToMM($css, $old=0.)
+    public function convertToMM($css, $old = 0.)
     {
         $css = trim($css);
-        if (preg_match('/^[0-9\.\-]+$/isU', $css))        $css.= 'px';
-        if (preg_match('/^[0-9\.\-]+px$/isU', $css))      $css = 25.4/96. * str_replace('px', '', $css);
-        else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) $css = 25.4/72. * str_replace('pt', '', $css);
+        if (preg_match('/^[0-9\.\-]+$/isU', $css))        $css .= 'px';
+        if (preg_match('/^[0-9\.\-]+px$/isU', $css))      $css = 25.4 / 96. * str_replace('px', '', $css);
+        else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) $css = 25.4 / 72. * str_replace('pt', '', $css);
         else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) $css = 25.4 * str_replace('in', '', $css);
-        else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) $css = 1.*str_replace('mm', '', $css);
-        else if (preg_match('/^[0-9\.\-]+%$/isU', $css))  $css = 1.*$old*str_replace('%', '', $css)/100.;
+        else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) $css = 1. * str_replace('mm', '', $css);
+        else if (preg_match('/^[0-9\.\-]+%$/isU', $css))  $css = 1. * $old * str_replace('%', '', $css) / 100.;
         else                                              $css = null;
 
         return $css;
@@ -1562,7 +1562,7 @@ 
             $v = trim($v);
             if ($v) {
                 $v = $this->convertToMM($v, 0);
-                if ($v!==null) {
+                if ($v !== null) {
                     $css[$k] = $v;
                 } else {
                     unset($css[$k]);
@@ -1590,7 +1590,7 @@ 
         $res = true;
 
         // if transparent => return null
-        if (strtolower($css)=='transparent') return array(null, null, null);
+        if (strtolower($css) == 'transparent') return array(null, null, null);
 
         // HTML color
         if (isset($this->_htmlColor[strtolower($css)])) {
@@ -1611,9 +1611,9 @@ 
 
         // like #FFF
         if (preg_match('/^#[0-9A-F]{3}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 1).substr($css, 1, 1)));
-            $v = floatVal(hexdec(substr($css, 2, 1).substr($css, 2, 1)));
-            $b = floatVal(hexdec(substr($css, 3, 1).substr($css, 3, 1)));
+            $r = floatVal(hexdec(substr($css, 1, 1) . substr($css, 1, 1)));
+            $v = floatVal(hexdec(substr($css, 2, 1) . substr($css, 2, 1)));
+            $b = floatVal(hexdec(substr($css, 3, 1) . substr($css, 3, 1)));
             return array($r, $v, $b);
         }
 
@@ -1622,7 +1622,7 @@ 
             $r = $this->_convertSubColor($match[1]);
             $v = $this->_convertSubColor($match[2]);
             $b = $this->_convertSubColor($match[3]);
-            return array($r*255., $v*255., $b*255.);
+            return array($r * 255., $v * 255., $b * 255.);
         }
 
         // like cmyk(100, 100, 100, 100)
@@ -1631,7 +1631,7 @@ 
             $m = $this->_convertSubColor($match[2]);
             $y = $this->_convertSubColor($match[3]);
             $k = $this->_convertSubColor($match[4]);
-            return array($c*100., $m*100., $y*100., $k*100.);
+            return array($c * 100., $m * 100., $y * 100., $k * 100.);
         }
 
         $res = false;
@@ -1647,11 +1647,11 @@ 
      */
     protected function _convertSubColor($c)
     {
-        if (substr($c, -1)=='%') {
-            $c = floatVal(substr($c, 0, -1))/100.;
+        if (substr($c, -1) == '%') {
+            $c = floatVal(substr($c, 0, -1)) / 100.;
         } else {
             $c = floatVal($c);
-            if ($c>1) $c = $c/255.;
+            if ($c > 1) $c = $c / 255.;
         }
 
         return $c;
@@ -1675,7 +1675,7 @@ 
         preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
 
         // for each CSS code
-        for ($k=0; $k<count($match[0]); $k++) {
+        for ($k = 0; $k < count($match[0]); $k++) {
 
             // selectors
             $names = strtolower(trim($match[1][$k]));
@@ -1690,7 +1690,7 @@ 
             $css = array();
             foreach ($styles as $style) {
                 $tmp = explode(':', $style);
-                if (count($tmp)>1) {
+                if (count($tmp) > 1) {
                     $cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp);
                     $css[trim(strtolower($cod))] = trim($tmp);
                 }
@@ -1705,7 +1705,7 @@ 
                 $name = trim($name);
 
                 // if a selector with somethink lige :hover => continue
-                if (strpos($name, ':')!==false) continue;
+                if (strpos($name, ':') !== false) continue;
 
                 // save the value
                 if (!isset($this->css[$name]))
@@ -1742,27 +1742,27 @@ 
 
             // read the attributes name=value
             $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
+            preg_match_all('/' . $prop . '/is', $code, $match);
+            for ($k = 0; $k < count($match[0]); $k++) {
                 $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
             }
 
             // read the attributes name="value"
             $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
+            preg_match_all('/' . $prop . '/is', $code, $match);
+            for ($k = 0; $k < count($match[0]); $k++) {
                 $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
             }
 
             // read the attributes name='value'
             $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
+            preg_match_all('/' . $prop . '/is', $code, $match);
+            for ($k = 0; $k < count($match[0]); $k++) {
                 $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
             }
 
             // if type text/css => we keep it
-            if (isset($tmp['type']) && strtolower($tmp['type'])=='text/css' && isset($tmp['href'])) {
+            if (isset($tmp['type']) && strtolower($tmp['type']) == 'text/css' && isset($tmp['href'])) {
 
                 // get the href
                 $url = $tmp['href'];
@@ -1771,26 +1771,26 @@ 
                 $content = @file_get_contents($url);
 
                 // if "http://" in the url
-                if (strpos($url, 'http://')!==false) {
+                if (strpos($url, 'http://') !== false) {
 
                     // get the domain "http://xxx/"
                     $url = str_replace('http://', '', $url);
                     $url = explode('/', $url);
-                    $urlMain = 'http://'.$url[0].'/';
+                    $urlMain = 'http://' . $url[0] . '/';
 
                     // get the absolute url of the path
-                    $urlSelf = $url; unset($urlSelf[count($urlSelf)-1]); $urlSelf = 'http://'.implode('/', $urlSelf).'/';
+                    $urlSelf = $url; unset($urlSelf[count($urlSelf) - 1]); $urlSelf = 'http://' . implode('/', $urlSelf) . '/';
 
                     // adapt the url in the css content
-                    $content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$urlSelf.'$1)', $content);
-                    $content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$urlMain.'$1)', $content);
+                    $content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url(' . $urlSelf . '$1)', $content);
+                    $content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url(' . $urlMain . '$1)', $content);
                 } else {
 // @TODO correction on url in absolute on a local css content
                     // $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
                 }
 
                 // add to the CSS content
-                $style.= $content."\n";
+                $style .= $content . "\n";
             }
         }
 
@@ -1803,7 +1803,7 @@ 
             // add to the CSS content
             $code = str_replace('<!--', '', $code);
             $code = str_replace('-->', '', $code);
-            $style.= $code."\n";
+            $style .= $code . "\n";
         }
 
         //analyse the css content

Braces +392 added lines, -156 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * HTML2PDF Librairy - parsingCss class
  *
@@ -82,7 +84,9 @@ 
     {
         $old = $this->_defaultFont;
         $this->_defaultFont = $default;
-        if ($default) $this->value['font-family'] = $default;
+        if ($default) {
+        	$this->value['font-family'] = $default;
+        }
         return $old;
     }
 
@@ -179,7 +183,9 @@ 
 
         // prepare the Collapse attribute
         $collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
-        if (!in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) $collapse = false;
+        if (!in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) {
+        	$collapse = false;
+        }
 
         // set the global css values
         $this->value['position']   = null;
@@ -315,20 +321,23 @@ 
         $style = $b.$i;
 
         if ($this->_defaultFont) {
-            if($family=='arial')
-                $family='helvetica';
-            elseif($family=='symbol' || $family=='zapfdingbats')
-                $style='';
+            if($family=='arial') {
+                            $family='helvetica';
+            } elseif($family=='symbol' || $family=='zapfdingbats') {
+                            $style='';
+            }
 
             $fontkey = $family.$style;
-            if (!$this->_pdf->isLoadedFont($fontkey))
-                $family = $this->_defaultFont;
+            if (!$this->_pdf->isLoadedFont($fontkey)) {
+                            $family = $this->_defaultFont;
+            }
         }
 
-        if($family=='arial')
-            $family='helvetica';
-        elseif($family=='symbol' || $family=='zapfdingbats')
-            $style='';
+        if($family=='arial') {
+                    $family='helvetica';
+        } elseif($family=='symbol' || $family=='zapfdingbats') {
+                    $style='';
+        }
 
         // complete style
         $style.= $u.$d.$o;
@@ -340,10 +349,11 @@ 
         // apply the font
         $this->_pdf->SetFont($family, $style, $this->value['mini-size']*$size);
         $this->_pdf->setTextColorArray($this->value['color']);
-        if ($this->value['background']['color'])
-            $this->_pdf->setFillColorArray($this->value['background']['color']);
-        else
-            $this->_pdf->setFillColor(255);
+        if ($this->value['background']['color']) {
+                    $this->_pdf->setFillColorArray($this->value['background']['color']);
+        } else {
+                    $this->_pdf->setFillColor(255);
+        }
     }
 
      /**
@@ -375,7 +385,9 @@ 
      */
     public function restorePosition()
     {
-        if ($this->value['y']==$this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
+        if ($this->value['y']==$this->_pdf->getY()) {
+        	$this->_pdf->setY($this->value['yc'], false);
+        }
     }
 
      /**
@@ -396,18 +408,26 @@ 
         if ($this->value['position']=='relative' || $this->value['position']=='absolute') {
             if ($this->value['right']!==null) {
                 $x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
-                if ($this->value['margin']['r']) $x-= $this->value['margin']['r'];
+                if ($this->value['margin']['r']) {
+                	$x-= $this->value['margin']['r'];
+                }
             } else {
                 $x = $this->value['left'];
-                if ($this->value['margin']['l']) $x+= $this->value['margin']['l'];
+                if ($this->value['margin']['l']) {
+                	$x+= $this->value['margin']['l'];
+                }
             }
 
             if ($this->value['bottom']!==null) {
                 $y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
-                if ($this->value['margin']['b']) $y-= $this->value['margin']['b'];
+                if ($this->value['margin']['b']) {
+                	$y-= $this->value['margin']['b'];
+                }
             } else {
                 $y = $this->value['top'];
-                if ($this->value['margin']['t']) $y+= $this->value['margin']['t'];
+                if ($this->value['margin']['t']) {
+                	$y+= $this->value['margin']['t'];
+                }
             }
 
             if ($this->value['position']=='relative') {
@@ -420,8 +440,12 @@ 
         } else {
             $this->value['x'] = $currentX;
             $this->value['y'] = $currentY;
-            if ($this->value['margin']['l']) $this->value['x']+= $this->value['margin']['l'];
-            if ($this->value['margin']['t']) $this->value['y']+= $this->value['margin']['t'];
+            if ($this->value['margin']['l']) {
+            	$this->value['x']+= $this->value['margin']['l'];
+            }
+            if ($this->value['margin']['t']) {
+            	$this->value['y']+= $this->value['margin']['t'];
+            }
         }
 
         // save the new position
@@ -478,8 +502,12 @@ 
     {
         // prepare
         $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) $name = null;
+        $id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null; if (!$id) {
+        	$id   = null;
+        }
+        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) {
+        	$name = null;
+        }
 
         // read the class attribute
         $class = array();
@@ -487,7 +515,9 @@ 
         $tmp = explode(' ', $tmp);
         foreach ($tmp as $k => $v) {
             $v = trim($v);
-            if ($v) $class[] = $v;
+            if ($v) {
+            	$class[] = $v;
+            }
         }
 
         // identify the tag, and the direct styles
@@ -526,10 +556,18 @@ 
         // adding the style from the tag
         $styles = array_merge($styles, $param['style']);
 
-        if (isset($styles['stroke']))        $this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
-        if (isset($styles['stroke-width']))  $this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
-        if (isset($styles['fill']))          $this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
-        if (isset($styles['fill-opacity']))  $this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
+        if (isset($styles['stroke'])) {
+        	$this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
+        }
+        if (isset($styles['stroke-width'])) {
+        	$this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
+        }
+        if (isset($styles['fill'])) {
+        	$this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
+        }
+        if (isset($styles['fill-opacity'])) {
+        	$this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
+        }
 
         return $this->value['svg'];
     }
@@ -546,8 +584,12 @@ 
     {
         // prepare the informations
         $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name']))  : null; if (!$name) $name = null;
+        $id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null; if (!$id) {
+        	$id   = null;
+        }
+        $name = isset($param['name']) ? strtolower(trim($param['name']))  : null; if (!$name) {
+        	$name = null;
+        }
 
         // get the class names to use
         $class = array();
@@ -555,7 +597,9 @@ 
         $tmp = explode(' ', $tmp);
         foreach ($tmp as $k => $v) {
             $v = trim($v);
-            if ($v) $class[] = $v;
+            if ($v) {
+            	$class[] = $v;
+            }
         }
 
         // prepare the values, and the list of css tags to identify
@@ -584,7 +628,9 @@ 
 
         // merge with the css styles from tag
         $styles = array_merge($styles, $param['style']);
-        if (isset($param['allwidth']) && !isset($styles['width'])) $styles['width'] = '100%';
+        if (isset($param['allwidth']) && !isset($styles['width'])) {
+        	$styles['width'] = '100%';
+        }
 
         // reset some styles, depending on the tag name
         $this->resetStyle($tagName);
@@ -593,8 +639,9 @@ 
         if ($legacy) {
             foreach ($legacy as $legacyName => $legacyValue) {
                 if (is_array($legacyValue)) {
-                    foreach($legacyValue as $legacy2Name => $legacy2Value)
-                        $this->value[$legacyName][$legacy2Name] = $legacy2Value;
+                    foreach($legacyValue as $legacy2Name => $legacy2Value) {
+                                            $this->value[$legacyName][$legacy2Name] = $legacy2Value;
+                    }
                 } else {
                     $this->value[$legacyName] = $legacyValue;
                 }
@@ -612,7 +659,9 @@ 
                 case 'font-family':
                     $val = explode(',', $val);
                     $val = trim($val[0]);
-                    if ($val) $this->value['font-family'] = $val;
+                    if ($val) {
+                    	$this->value['font-family'] = $val;
+                    }
                     break;
 
                 case 'font-weight':
@@ -635,13 +684,17 @@ 
                     break;
 
                 case 'text-transform':
-                    if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
+                    if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) {
+                    	$val = 'none';
+                    }
                     $this->value['text-transform']  = $val;
                     break;
 
                 case 'font-size':
                     $val = $this->convertToMM($val, $this->value['font-size']);
-                    if ($val) $this->value['font-size'] = $val;
+                    if ($val) {
+                    	$this->value['font-size'] = $val;
+                    }
                     break;
 
                 case 'color':
@@ -657,7 +710,9 @@ 
 
                 case 'text-align':
                     $val = strtolower($val);
-                    if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
+                    if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) {
+                    	$val = 'left';
+                    }
                     $this->value['text-align'] = $val;
                     break;
 
@@ -667,7 +722,9 @@ 
 
                 case 'width':
                     $this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
-                    if ($this->value['width'] && substr($val, -1)=='%') $correctWidth=true;
+                    if ($this->value['width'] && substr($val, -1)=='%') {
+                    	$correctWidth=true;
+                    }
                     $noWidth = false;
                     break;
 
@@ -676,18 +733,26 @@ 
                     break;
 
                 case 'line-height':
-                    if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val*100).'%';
+                    if (preg_match('/^[0-9\.]+$/isU', $val)) {
+                    	$val = floor($val*100).'%';
+                    }
                     $this->value['line-height'] = $val;
                     break;
 
                 case 'rotate':
-                    if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
-                    if ($val<0) $val+= 360;
+                    if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) {
+                    	$val = null;
+                    }
+                    if ($val<0) {
+                    	$val+= 360;
+                    }
                     $this->value['rotate'] = $val;
                     break;
 
                 case 'overflow':
-                    if (!in_array($val, array('visible', 'hidden'))) $val = 'visible';
+                    if (!in_array($val, array('visible', 'hidden'))) {
+                    	$val = 'visible';
+                    }
                     $this->value['overflow'] = $val;
                     break;
 
@@ -779,10 +844,18 @@ 
                         }
                     }
                     $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['type'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['type'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['type'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['type'] = $val[3];
+                    if ($val[0]) {
+                    	$this->value['border']['t']['type'] = $val[0];
+                    }
+                    if ($val[1]) {
+                    	$this->value['border']['r']['type'] = $val[1];
+                    }
+                    if ($val[2]) {
+                    	$this->value['border']['b']['type'] = $val[2];
+                    }
+                    if ($val[3]) {
+                    	$this->value['border']['l']['type'] = $val[3];
+                    }
                     break;
 
                 case 'border-top-style':
@@ -804,8 +877,9 @@ 
                     break;
 
                 case 'border-left-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed')))
-                        $this->value['border']['l']['type'] = $val;
+                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+                                            $this->value['border']['l']['type'] = $val;
+                    }
                     break;
 
                 case 'border-color':
@@ -819,35 +893,51 @@ 
                             }
                     }
                     $this->_duplicateBorder($val);
-                    if (is_array($val[0])) $this->value['border']['t']['color'] = $val[0];
-                    if (is_array($val[1])) $this->value['border']['r']['color'] = $val[1];
-                    if (is_array($val[2])) $this->value['border']['b']['color'] = $val[2];
-                    if (is_array($val[3])) $this->value['border']['l']['color'] = $val[3];
+                    if (is_array($val[0])) {
+                    	$this->value['border']['t']['color'] = $val[0];
+                    }
+                    if (is_array($val[1])) {
+                    	$this->value['border']['r']['color'] = $val[1];
+                    }
+                    if (is_array($val[2])) {
+                    	$this->value['border']['b']['color'] = $val[2];
+                    }
+                    if (is_array($val[3])) {
+                    	$this->value['border']['l']['color'] = $val[3];
+                    }
 
                     break;
 
                 case 'border-top-color':
                     $res = false;
                     $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['t']['color'] = $val;
+                    if ($res) {
+                    	$this->value['border']['t']['color'] = $val;
+                    }
                     break;
 
                 case 'border-right-color':
                     $res = false;
                     $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['r']['color'] = $val;
+                    if ($res) {
+                    	$this->value['border']['r']['color'] = $val;
+                    }
                     break;
 
                 case 'border-bottom-color':
                     $res = false;
                     $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['b']['color'] = $val;
+                    if ($res) {
+                    	$this->value['border']['b']['color'] = $val;
+                    }
                     break;
 
                 case 'border-left-color':
                     $res = false;
                     $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['l']['color'] = $val;
+                    if ($res) {
+                    	$this->value['border']['l']['color'] = $val;
+                    }
                     break;
 
                 case 'border-width':
@@ -856,34 +946,52 @@ 
                             $val[$valK] = $this->convertToMM($valV, 0);
                     }
                     $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['width'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['width'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['width'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['width'] = $val[3];
+                    if ($val[0]) {
+                    	$this->value['border']['t']['width'] = $val[0];
+                    }
+                    if ($val[1]) {
+                    	$this->value['border']['r']['width'] = $val[1];
+                    }
+                    if ($val[2]) {
+                    	$this->value['border']['b']['width'] = $val[2];
+                    }
+                    if ($val[3]) {
+                    	$this->value['border']['l']['width'] = $val[3];
+                    }
                     break;
 
                 case 'border-top-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['t']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['t']['width'] = $val;
+                    }
                     break;
 
                 case 'border-right-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['r']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['r']['width'] = $val;
+                    }
                     break;
 
                 case 'border-bottom-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['b']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['b']['width'] = $val;
+                    }
                     break;
 
                 case 'border-left-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['l']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['l']['width'] = $val;
+                    }
                     break;
 
                 case 'border-collapse':
-                    if ($tagName=='table') $this->value['border']['collapse'] = ($val=='collapse');
+                    if ($tagName=='table') {
+                    	$this->value['border']['collapse'] = ($val=='collapse');
+                    }
                     break;
 
                 case 'border-radius':
@@ -895,17 +1003,29 @@ 
                     if (count($valH)<1 || count($valH)>4) {
                         break;
                     }
-                    if (!isset($valH[1])) $valH[1] = $valH[0];
-                    if (!isset($valH[2])) $valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
-                    if (!isset($valH[3])) $valH[3] = $valH[1];
+                    if (!isset($valH[1])) {
+                    	$valH[1] = $valH[0];
+                    }
+                    if (!isset($valH[2])) {
+                    	$valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
+                    }
+                    if (!isset($valH[3])) {
+                    	$valH[3] = $valH[1];
+                    }
                     if (isset($val[1])) {
                         $valV = $this->convertToRadius(trim($val[1]));
                         if (count($valV)<1 || count($valV)>4) {
                             break;
                         }
-                        if (!isset($valV[1])) $valV[1] = $valV[0];
-                        if (!isset($valV[2])) $valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
-                        if (!isset($valV[3])) $valV[3] = $valV[1];
+                        if (!isset($valV[1])) {
+                        	$valV[1] = $valV[0];
+                        }
+                        if (!isset($valV[2])) {
+                        	$valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
+                        }
+                        if (!isset($valV[3])) {
+                        	$valV[3] = $valV[1];
+                        }
                     } else {
                         $valV = $valH;
                     }
@@ -987,22 +1107,35 @@ 
                     break;
 
                 case 'position':
-                    if ($val=='absolute')       $this->value['position'] = 'absolute';
-                    else if ($val=='relative')  $this->value['position'] = 'relative';
-                    else                        $this->value['position'] = null;
+                    if ($val=='absolute') {
+                    	$this->value['position'] = 'absolute';
+                    } else if ($val=='relative') {
+                    	$this->value['position'] = 'relative';
+                    } else {
+                    	$this->value['position'] = null;
+                    }
                     break;
 
                 case 'float':
-                    if ($val=='left')           $this->value['float'] = 'left';
-                    else if ($val=='right')     $this->value['float'] = 'right';
-                    else                        $this->value['float'] = null;
+                    if ($val=='left') {
+                    	$this->value['float'] = 'left';
+                    } else if ($val=='right') {
+                    	$this->value['float'] = 'right';
+                    } else {
+                    	$this->value['float'] = null;
+                    }
                     break;
 
                 case 'display':
-                    if ($val=='inline')         $this->value['display'] = 'inline';
-                    else if ($val=='block')     $this->value['display'] = 'block';
-                    else if ($val=='none')      $this->value['display'] = 'none';
-                    else                        $this->value['display'] = null;
+                    if ($val=='inline') {
+                    	$this->value['display'] = 'inline';
+                    } else if ($val=='block') {
+                    	$this->value['display'] = 'block';
+                    } else if ($val=='none') {
+                    	$this->value['display'] = 'none';
+                    } else {
+                    	$this->value['display'] = null;
+                    }
                     break;
 
                 case 'top':
@@ -1015,7 +1148,9 @@ 
                 case 'list-style':
                 case 'list-style-type':
                 case 'list-style-image':
-                    if ($nom=='list-style') $nom = 'list-style-type';
+                    if ($nom=='list-style') {
+                    	$nom = 'list-style-type';
+                    }
                     $this->value[$nom] = $val;
                     break;
 
@@ -1027,11 +1162,17 @@ 
         $return = true;
 
         // only for P tag
-        if ($this->value['margin']['t']===null) $this->value['margin']['t'] = $this->value['font-size'];
-        if ($this->value['margin']['b']===null) $this->value['margin']['b'] = $this->value['font-size'];
+        if ($this->value['margin']['t']===null) {
+        	$this->value['margin']['t'] = $this->value['font-size'];
+        }
+        if ($this->value['margin']['b']===null) {
+        	$this->value['margin']['b'] = $this->value['font-size'];
+        }
 
         // force the text align to left, if asked by html2pdf
-        if ($this->_onlyLeft) $this->value['text-align'] = 'left';
+        if ($this->_onlyLeft) {
+        	$this->value['text-align'] = 'left';
+        }
 
         // correction on the width (quick box)
         if ($noWidth && in_array($tagName, array('div', 'blockquote', 'fieldset')) && $this->value['position']!='absolute') {
@@ -1047,30 +1188,60 @@ 
                     $this->value['width']-= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
                     $return = false;
                 }
-                if ($this->value['width']<0) $this->value['width']=0;
+                if ($this->value['width']<0) {
+                	$this->value['width']=0;
+                }
             } else {
                 if ($this->value['width']) {
-                    if ($this->value['border']['l']['width']) $this->value['width'] += $this->value['border']['l']['width'];
-                    if ($this->value['border']['r']['width']) $this->value['width'] += $this->value['border']['r']['width'];
-                    if ($this->value['padding']['l'])         $this->value['width'] += $this->value['padding']['l'];
-                    if ($this->value['padding']['r'])         $this->value['width'] += $this->value['padding']['r'];
+                    if ($this->value['border']['l']['width']) {
+                    	$this->value['width'] += $this->value['border']['l']['width'];
+                    }
+                    if ($this->value['border']['r']['width']) {
+                    	$this->value['width'] += $this->value['border']['r']['width'];
+                    }
+                    if ($this->value['padding']['l']) {
+                    	$this->value['width'] += $this->value['padding']['l'];
+                    }
+                    if ($this->value['padding']['r']) {
+                    	$this->value['width'] += $this->value['padding']['r'];
+                    }
                 }
             }
         }
         if ($this->value['height']) {
-            if ($this->value['border']['b']['width']) $this->value['height'] += $this->value['border']['b']['width'];
-            if ($this->value['border']['t']['width']) $this->value['height'] += $this->value['border']['t']['width'];
-            if ($this->value['padding']['b'])         $this->value['height'] += $this->value['padding']['b'];
-            if ($this->value['padding']['t'])         $this->value['height'] += $this->value['padding']['t'];
+            if ($this->value['border']['b']['width']) {
+            	$this->value['height'] += $this->value['border']['b']['width'];
+            }
+            if ($this->value['border']['t']['width']) {
+            	$this->value['height'] += $this->value['border']['t']['width'];
+            }
+            if ($this->value['padding']['b']) {
+            	$this->value['height'] += $this->value['padding']['b'];
+            }
+            if ($this->value['padding']['t']) {
+            	$this->value['height'] += $this->value['padding']['t'];
+            }
         }
 
-        if ($this->value['top']!=null)      $this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
-        if ($this->value['bottom']!=null)   $this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
-        if ($this->value['left']!=null)     $this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
-        if ($this->value['right']!=null)    $this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
+        if ($this->value['top']!=null) {
+        	$this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
+        }
+        if ($this->value['bottom']!=null) {
+        	$this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
+        }
+        if ($this->value['left']!=null) {
+        	$this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
+        }
+        if ($this->value['right']!=null) {
+        	$this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
+        }
 
-        if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])    $this->value['bottom']  = null;
-        if ($this->value['left'] && $this->value['right'] && $this->value['width'])     $this->value['right']   = null;
+        if ($this->value['top'] && $this->value['bottom'] && $this->value['height']) {
+        	$this->value['bottom']  = null;
+        }
+        if ($this->value['left'] && $this->value['right'] && $this->value['width']) {
+        	$this->value['right']   = null;
+        }
 
         return $return;
     }
@@ -1084,7 +1255,9 @@ 
     public function getLineHeight()
     {
         $val = $this->value['line-height'];
-        if ($val=='normal') $val = '108%';
+        if ($val=='normal') {
+        	$val = '108%';
+        }
         return $this->convertToMM($val, $this->value['font-size']);
     }
 
@@ -1140,8 +1313,12 @@ 
      */
     public function getFloat()
     {
-        if ($this->value['float']=='left')    return 'left';
-        if ($this->value['float']=='right')   return 'right';
+        if ($this->value['float']=='left') {
+        	return 'left';
+        }
+        if ($this->value['float']=='right') {
+        	return 'right';
+        }
         return null;
     }
 
@@ -1171,7 +1348,9 @@ 
     protected function _getLastAbsoluteX()
     {
         for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
+            if ($this->table[$k]['x'] && $this->table[$k]['position']) {
+            	return $this->table[$k]['x'];
+            }
         }
         return $this->_pdf->getlMargin();
     }
@@ -1185,7 +1364,9 @@ 
     protected function _getLastAbsoluteY()
     {
         for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
+            if ($this->table[$k]['y'] && $this->table[$k]['position']) {
+            	return $this->table[$k]['y'];
+            }
         }
         return $this->_pdf->gettMargin();
     }
@@ -1222,7 +1403,9 @@ 
         if (count($getit)) {
             // get them, but in the definition order, because of priority
             asort($getit);
-            foreach ($getit as $key => $val) $styles = array_merge($styles, $this->css[$key]);
+            foreach ($getit as $key => $val) {
+            	$styles = array_merge($styles, $this->css[$key]);
+            }
         }
 
         return $styles;
@@ -1242,7 +1425,9 @@ 
         // if next step
         if ($next!==null) {
             // we remove this step
-            if ($next) $key = trim(substr($key, 0, -strlen($next)));
+            if ($next) {
+            	$key = trim(substr($key, 0, -strlen($next)));
+            }
             array_shift($lst);
 
             // if no more step to identify => return false
@@ -1294,8 +1479,11 @@ 
         $css = explode(' ', $css);
         foreach ($css as $k => $v) {
             $v = trim($v);
-            if ($v) $css[$k] = $v;
-            else    unset($css[$k]);
+            if ($v) {
+            	$css[$k] = $v;
+            } else {
+            	unset($css[$k]);
+            }
         }
         $css = array_values($css);
 
@@ -1320,12 +1508,16 @@ 
             // else, it could be the color
             } else {
                 $tmp = $this->convertToColor($value, $res);
-                if ($res) $color = $tmp;
+                if ($res) {
+                	$color = $tmp;
+                }
             }
         }
 
         // if no witdh => return none
-        if (!$width) return $none;
+        if (!$width) {
+        	return $none;
+        }
 
         // return the border properties
         return array('type' => $type, 'width' => $width, 'color' => $color);
@@ -1414,7 +1606,9 @@ 
         if ($pos) {
             // try to read it
             $pos = $this->convertBackgroundPosition($pos, $ok);
-            if ($ok) $value['position'] = $pos;
+            if ($ok) {
+            	$value['position'] = $pos;
+            }
         }
     }
 
@@ -1428,8 +1622,11 @@ 
     public function convertBackgroundColor($css)
     {
         $res = null;
-        if ($css=='transparent') return null;
-        else                     return $this->convertToColor($css, $res);
+        if ($css=='transparent') {
+        	return null;
+        } else {
+        	return $this->convertToColor($css, $res);
+        }
     }
 
     /**
@@ -1441,12 +1638,13 @@ 
      */
     public function convertBackgroundImage($css)
     {
-        if ($css=='none')
-            return null;
-        else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
-            return $match[1];
-        else
-            return null;
+        if ($css=='none') {
+                    return null;
+        } else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match)) {
+                    return $match[1];
+        } else {
+                    return null;
+        }
     }
 
     /**
@@ -1467,10 +1665,14 @@ 
 
         // we must have 2 values. if 0 or >2 : error. if 1 => put center for 2
         if (count($css)<2) {
-            if (!$css[0]) return null;
+            if (!$css[0]) {
+            	return null;
+            }
             $css[1] = 'center';
         }
-        if (count($css)>2) return null;
+        if (count($css)>2) {
+        	return null;
+        }
 
         // prepare the values
         $x = 0;
@@ -1478,24 +1680,42 @@ 
         $res = true;
 
         // convert the first value
-        if ($css[0]=='left')        $x = '0%';
-        else if ($css[0]=='center') $x = '50%';
-        else if ($css[0]=='right')  $x = '100%';
-        else if ($css[0]=='top')    $y = '0%';
-        else if ($css[0]=='bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) $x = $css[0];
-        else if ($this->convertToMM($css[0])) $x = $this->convertToMM($css[0]);
-        else $res = false;
+        if ($css[0]=='left') {
+        	$x = '0%';
+        } else if ($css[0]=='center') {
+        	$x = '50%';
+        } else if ($css[0]=='right') {
+        	$x = '100%';
+        } else if ($css[0]=='top') {
+        	$y = '0%';
+        } else if ($css[0]=='bottom') {
+        	$y = '100%';
+        } else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) {
+        	$x = $css[0];
+        } else if ($this->convertToMM($css[0])) {
+        	$x = $this->convertToMM($css[0]);
+        } else {
+        	$res = false;
+        }
 
         // convert the second value
-        if ($css[1]=='left')        $x = '0%';
-        else if ($css[1]=='right')  $x = '100%';
-        else if ($css[1]=='top')    $y = '0%';
-        else if ($css[1]=='center') $y = '50%';
-        else if ($css[1]=='bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) $y = $css[1];
-        else if ($this->convertToMM($css[1])) $y = $this->convertToMM($css[1]);
-        else $res = false;
+        if ($css[1]=='left') {
+        	$x = '0%';
+        } else if ($css[1]=='right') {
+        	$x = '100%';
+        } else if ($css[1]=='top') {
+        	$y = '0%';
+        } else if ($css[1]=='center') {
+        	$y = '50%';
+        } else if ($css[1]=='bottom') {
+        	$y = '100%';
+        } else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) {
+        	$y = $css[1];
+        } else if ($this->convertToMM($css[1])) {
+        	$y = $this->convertToMM($css[1]);
+        } else {
+        	$res = false;
+        }
 
         // return the values
         return array($x, $y);
@@ -1535,13 +1755,22 @@ 
     public function convertToMM($css, $old=0.)
     {
         $css = trim($css);
-        if (preg_match('/^[0-9\.\-]+$/isU', $css))        $css.= 'px';
-        if (preg_match('/^[0-9\.\-]+px$/isU', $css))      $css = 25.4/96. * str_replace('px', '', $css);
-        else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) $css = 25.4/72. * str_replace('pt', '', $css);
-        else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) $css = 25.4 * str_replace('in', '', $css);
-        else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) $css = 1.*str_replace('mm', '', $css);
-        else if (preg_match('/^[0-9\.\-]+%$/isU', $css))  $css = 1.*$old*str_replace('%', '', $css)/100.;
-        else                                              $css = null;
+        if (preg_match('/^[0-9\.\-]+$/isU', $css)) {
+        	$css.= 'px';
+        }
+        if (preg_match('/^[0-9\.\-]+px$/isU', $css)) {
+        	$css = 25.4/96. * str_replace('px', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) {
+        	$css = 25.4/72. * str_replace('pt', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) {
+        	$css = 25.4 * str_replace('in', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) {
+        	$css = 1.*str_replace('mm', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+%$/isU', $css)) {
+        	$css = 1.*$old*str_replace('%', '', $css)/100.;
+        } else {
+        	$css = null;
+        }
 
         return $css;
     }
@@ -1590,7 +1819,9 @@ 
         $res = true;
 
         // if transparent => return null
-        if (strtolower($css)=='transparent') return array(null, null, null);
+        if (strtolower($css)=='transparent') {
+        	return array(null, null, null);
+        }
 
         // HTML color
         if (isset($this->_htmlColor[strtolower($css)])) {
@@ -1651,7 +1882,9 @@ 
             $c = floatVal(substr($c, 0, -1))/100.;
         } else {
             $c = floatVal($c);
-            if ($c>1) $c = $c/255.;
+            if ($c>1) {
+            	$c = $c/255.;
+            }
         }
 
         return $c;
@@ -1705,13 +1938,16 @@ 
                 $name = trim($name);
 
                 // if a selector with somethink lige :hover => continue
-                if (strpos($name, ':')!==false) continue;
+                if (strpos($name, ':')!==false) {
+                	continue;
+                }
 
                 // save the value
-                if (!isset($this->css[$name]))
-                    $this->css[$name] = $css;
-                else
-                    $this->css[$name] = array_merge($this->css[$name], $css);
+                if (!isset($this->css[$name])) {
+                                    $this->css[$name] = $css;
+                } else {
+                                    $this->css[$name] = array_merge($this->css[$name], $css);
+                }
 
             }
         }

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

Doc Comments +2 added lines

@@ -38,6 +38,7 @@ 
      * change the encoding
      *
      * @param   string encoding
+     * @param string $encoding
      * @access  public
      */
     public function setEncoding($encoding)
@@ -439,6 +440,7 @@ 
      * get a full level of HTML, between an opening and closing corresponding
      *
      * @param   integer key
+     * @param integer $k
      * @return  array   actions
      */
     public function getLevel($k)

Indentation +506 added lines, -506 removed lines

@@ -11,510 +11,510 @@
 
 class HTML2PDF_parsingHtml
 {
-    protected    $_html     = '';        // HTML code to parse
-    protected    $_num      = 0;         // table number
-    protected    $_level    = 0;         // table level
-    protected    $_encoding = '';        // encoding
-    public       $code      = array();   // parsed HTML codfe
-
-    const HTML_TAB = '        ';
-
-    /**
-     * main constructor
-     *
-     * @param   string encoding
-     * @access  public
-     */
-    public function __construct($encoding = 'UTF-8')
-    {
-        $this->_num   = 0;
-        $this->_level = array($this->_num);
-        $this->_html  = '';
-        $this->code  = array();
-        $this->setEncoding($encoding);
-    }
-
-    /**
-     * change the encoding
-     *
-     * @param   string encoding
-     * @access  public
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = $encoding;
-    }
-
-    /**
-     * Define the HTML code to parse
-     *
-     * @param   string HTML code
-     * @access  public
-     */
-    public function setHTML($html)
-    {
-        // remove the HTML in comment
-        $html = preg_replace('/<!--(.*)-->/isU', '', $html);
-
-        // save the HTML code
-        $this->_html = $html;
-    }
-
-    /**
-     * parse the HTML code
-     *
-     * @access public
-     */
-    public function parse()
-    {
-        $parents = array();
-
-        // flag : are we in a <pre> Tag ?
-        $tagPreIn = false;
-
-        // action to use for each line of the content of a <pre> Tag
-        $tagPreBr = array(
-                    'name' => 'br',
-                    'close' => false,
-                    'param' => array(
-                        'style' => array(),
-                        'num'    => 0
-                    )
-                );
-
-        // tag that can be not closed
-        $tagsNotClosed = array(
-            'br', 'hr', 'img', 'col',
-            'input', 'link', 'option',
-            'circle', 'ellipse', 'path', 'rect', 'line', 'polygon', 'polyline'
-        );
-
-        // search the HTML tags
-        $tmp = array();
-        $this->_searchCode($tmp);
-
-        // all the actions to do
-        $actions = array();
-
-        // foreach part of the HTML code
-        foreach ($tmp as $part) {
-            // if it is a tag code
-            if ($part[0]=='code') {
-                // analise the HTML code
-                $res = $this->_analiseCode($part[1]);
-
-                // if it is a real HTML tag
-                if ($res) {
-                    // save the current posistion in the HTML code
-                    $res['html_pos'] = $part[2];
-
-                    // if the tag must be closed
-                    if (!in_array($res['name'], $tagsNotClosed)) {
-                        // if it is a closure tag
-                        if ($res['close']) {
-                            // HTML validation
-                            if (count($parents)<1)
-                                throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
-                            else if ($parents[count($parents)-1]!=$res['name'])
-                                throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
-                            else
-                                unset($parents[count($parents)-1]);
-                        } else {
-                            // if it is a autoclosed tag
-                            if ($res['autoclose']) {
-                                // save the opened tag
-                                $actions[] = $res;
-
-                                // prepare the closed tag
-                                $res['params'] = array();
-                                $res['close'] = true;
-                            }
-                            // else :add a child for validation
-                            else
-                                $parents[count($parents)] = $res['name'];
-                        }
-
-                        // if it is a <pre> tag (or <code> tag) not auclosed => update the flag
-                        if (($res['name']=='pre' || $res['name']=='code') && !$res['autoclose']) {
-                            $tagPreIn = !$res['close'];
-                        }
-                    }
-
-                    // save the actions to convert
-                    $actions[] = $res;
-                } else { // else (it is not a real HTML tag => we transform it in Texte
-                    $part[0]='txt';
-                }
-            }
-            // if it is text
-            if ($part[0]=='txt') {
-                // if we are not in a <pre> tag
-                if (!$tagPreIn) {
-                    // save the action
-                    $actions[] = array(
-                        'name'    => 'write',
-                        'close'    => false,
-                        'param' => array('txt' => $this->_prepareTxt($part[1])),
-                    );
-                } else { // else (if we are in a <pre> tag)
-                    // prepare the text
-                    $part[1] = str_replace("\r", '', $part[1]);
-                    $part[1] = explode("\n", $part[1]);
-
-                    // foreach line of the text
-                    foreach ($part[1] as $k => $txt) {
-                        // transform the line
-                        $txt = str_replace("\t", self::HTML_TAB, $txt);
-                        $txt = str_replace(' ', '&nbsp;', $txt);
-
-                        // add a break line
-                        if ($k>0) $actions[] = $tagPreBr;
-
-                        // save the action
-                        $actions[] = array(
-                            'name'    => 'write',
-                            'close'    => false,
-                            'param' => array('txt' => $this->_prepareTxt($txt, false)),
-                        );
-                    }
-                }
-            }
-        }
-
-        // for each indentified action, we have to clean up the begin and the end of the texte
-        // based on tags that surround it
-
-        // list of the tags to clean
-        $tagsToClean = array(
-            'page', 'page_header', 'page_footer', 'form',
-            'table', 'thead', 'tfoot', 'tr', 'td', 'th', 'br',
-            'div', 'hr', 'p', 'ul', 'ol', 'li',
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-            'bookmark', 'fieldset', 'legend',
-            'draw', 'circle', 'ellipse', 'path', 'rect', 'line', 'g', 'polygon', 'polyline',
-            'option'
-        );
-
-        // foreach action
-        $nb = count($actions);
-        for ($k=0; $k<$nb; $k++) {
-            // if it is a Text
-            if ($actions[$k]['name']=='write') {
-                // if the tag before the text is a tag to clean => ltrim on the text
-                if ($k>0 && in_array($actions[$k-1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
-
-                // if the tag after the text is a tag to clean => rtrim on the text
-                if ($k<$nb-1 && in_array($actions[$k+1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
-
-                // if the text is empty => remove the action
-                if (!strlen($actions[$k]['param']['txt']))
-                    unset($actions[$k]);
-            }
-        }
-
-        // if we are not on the level 0 => HTML validator ERROR
-        if (count($parents)) throw new HTML2PDF_exception(5, $parents);
-
-        // save the actions to do
-        $this->code = array_values($actions);
-    }
-
-    /**
-     * prepare the text
-     *
-     * @param   string texte
-     * @param   boolean true => replace multiple space+\t+\r+\n by a single space
-     * @return  string texte
-     * @access  protected
-     */
-    protected function _prepareTxt($txt, $spaces = true)
-    {
-        if ($spaces) $txt = preg_replace('/\s+/is', ' ', $txt);
-        $txt = str_replace('&euro;', '€', $txt);
-        $txt = html_entity_decode($txt, ENT_QUOTES, $this->_encoding);
-        return $txt;
-    }
-
-    /**
-     * parse the HTML code
-     *
-     * @param    &array    array's result
-     * @return   null
-     */
-    protected function _searchCode(&$tmp)
-    {
-        // initialise the array
-        $tmp = array();
-
-        // regexp to separate the tags from the texts
-        $reg = '/(<[^>]+>)|([^<]+)+/isU';
-
-        // last match found
-        $str = '';
-        $offset = 0;
-
-        // As it finds a match
-        while (preg_match($reg, $this->_html, $parse, PREG_OFFSET_CAPTURE, $offset)) {
-            // if it is a tag
-            if ($parse[1][0]) {
-                // save the previous text if it exists
-                if ($str!=='')    $tmp[] = array('txt', $str);
-
-                // save the tag, with the offset
-                $tmp[] = array('code', trim($parse[1][0]), $offset);
-
-                // init the current text
-                $str = '';
-            } else { // else (if it is a text)
-                // add the new text to the current text
-                $str.= $parse[2][0];
-            }
-
-            // Update offset to the end of the match
-            $offset = $parse[0][1] + strlen($parse[0][0]);
-            unset($parse);
-        }
-        // if a text is present in the end, we save it
-        if ($str!='') $tmp[] = array('txt', $str);
-        unset($str);
-    }
-
-    /**
-     * analise a HTML tag
-     *
-     * @param   string   HTML code to analise
-     * @return  array    corresponding action
-     */
-    protected function _analiseCode($code)
-    {
-        // name of the tag, opening, closure, autoclosure
-        $tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-        if (!preg_match('/'.$tag.'/isU', $code, $match)) return null;
-        $close     = ($match[1]=='/' ? true : false);
-        $autoclose = preg_match('/\/>$/isU', $code);
-        $name      = strtolower($match[2]);
-
-        // required parameters (depends on the tag name)
-        $param    = array();
-        $param['style'] = '';
-        if ($name=='img') {
-            $param['alt'] = '';
-            $param['src'] = '';
-        }
-        if ($name=='a') {
-            $param['href'] = '';
-        }
-
-        // read the parameters : nom=valeur
-        $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-        // read the parameters : nom="valeur"
-        $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-        // read the parameters : nom='valeur'
-        $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-        // compliance of each parameter
-        $color  = "#000000";
-        $border = null;
-        foreach ($param as $key => $val) {
-            $key = strtolower($key);
-            switch($key)
-            {
-                case 'width':
-                    unset($param[$key]);
-                    $param['style'] .= 'width: '.$val.'px; ';
-                    break;
-
-                case 'align':
-                    if ($name==='img') {
-                        unset($param[$key]);
-                        $param['style'] .= 'float: '.$val.'; ';
-                    } elseif ($name!=='table') {
-                        unset($param[$key]);
-                        $param['style'] .= 'text-align: '.$val.'; ';
-                    }
-                    break;
-
-                case 'valign':
-                    unset($param[$key]);
-                    $param['style'] .= 'vertical-align: '.$val.'; ';
-                    break;
-
-                case 'height':
-                    unset($param[$key]);
-                    $param['style'] .= 'height: '.$val.'px; ';
-                    break;
-
-                case 'bgcolor':
-                    unset($param[$key]);
-                    $param['style'] .= 'background: '.$val.'; ';
-                    break;
-
-                case 'bordercolor':
-                    unset($param[$key]);
-                    $color = $val;
-                    break;
-
-                case 'border':
-                    unset($param[$key]);
-                    if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
-                    $border = $val;
-                    break;
-
-                case 'cellpadding':
-                case 'cellspacing':
-                    if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
-                    break;
-
-                case 'colspan':
-                case 'rowspan':
-                    $val = preg_replace('/[^0-9]/isU', '', $val);
-                    if (!$val) $val = 1;
-                    $param[$key] = $val;
-                    break;
-            }
-        }
-
-        // compliance of the border
-        if ($border!==null) {
-            if ($border)    $border = 'border: solid '.$border.' '.$color;
-            else            $border = 'border: none';
-
-            $param['style'] .= $border.'; ';
-            $param['border'] = $border;
-        }
-
-        // reading styles: decomposition and standardization
-        $styles = explode(';', $param['style']);
-        $param['style'] = array();
-        foreach ($styles as $style) {
-            $tmp = explode(':', $style);
-            if (count($tmp)>1) {
-                $cod = $tmp[0];
-                unset($tmp[0]);
-                $tmp = implode(':', $tmp);
-                $param['style'][trim(strtolower($cod))] = preg_replace('/[\s]+/isU', ' ', trim($tmp));
-            }
-        }
-
-        // determining the level of table opening, with an added level
-        if (in_array($name, array('ul', 'ol', 'table')) && !$close) {
-            $this->_num++;
-            $this->_level[count($this->_level)] = $this->_num;
-        }
-
-        // get the level of the table containing the element
-        if (!isset($param['num'])) {
-            $param['num'] = $this->_level[count($this->_level)-1];
-        }
-
-        // for closures table: remove a level
-        if (in_array($name, array('ul', 'ol', 'table')) && $close) {
-            unset($this->_level[count($this->_level)-1]);
-        }
-
-        // prepare the parameters
-        if (isset($param['value']))  $param['value']  = $this->_prepareTxt($param['value']);
-        if (isset($param['alt']))    $param['alt']    = $this->_prepareTxt($param['alt']);
-        if (isset($param['title']))  $param['title']  = $this->_prepareTxt($param['title']);
-        if (isset($param['class']))  $param['class']  = $this->_prepareTxt($param['class']);
-
-        // return the new action to do
-        return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
-    }
-
-    /**
-     * get a full level of HTML, between an opening and closing corresponding
-     *
-     * @param   integer key
-     * @return  array   actions
-     */
-    public function getLevel($k)
-    {
-        // if the code does not exist => return empty
-        if (!isset($this->code[$k])) return array();
-
-        // the tag to detect
-        $detect = $this->code[$k]['name'];
-
-        // if it is a text => return
-        if ($detect=='write') {
-            return array($this->code[$k]);
-        }
-
-        //
-        $level = 0;      // depth level
-        $end = false;    // end of the search
-        $code = array(); // extract code
-
-        // while it's not ended
-        while (!$end) {
-            // current action
-            $row = $this->code[$k];
-
-            // if 'write' => we add the text
-            if ($row['name']=='write') {
-                $code[] = $row;
-            } else { // else, it is a html tag
-                $not = false; // flag for not taking into account the current tag
-
-                // if it is the searched tag
-                if ($row['name']==$detect) {
-                    // if we are just at the root level => dont take it
-                    if ($level==0) {
-                        $not = true;
-                    }
-
-                    // update the level
-                    $level+= ($row['close'] ? -1 : 1);
-
-                    // if we are now at the root level => it is the end, and dont take it
-                    if ($level==0) {
-                        $not = true;
-                        $end = true;
-                    }
-                }
-
-                // if we can takin into account the current tag => save it
-                if (!$not) {
-                    if (isset($row['style']['text-align'])) unset($row['style']['text-align']);
-                    $code[] = $row;
-                }
-            }
-
-            // it continues as long as there has code to analise
-            if (isset($this->code[$k+1]))
-                $k++;
-            else
-                $end = true;
-        }
-
-        // return the extract
-        return $code;
-    }
-
-    /**
-     * return a part of the HTML code, for error message
-     *
-     * @param   integer position
-     * @param   integer take before
-     * @param   integer take after
-     * @return  string  part of the html code
-     */
-    public function getHtmlErrorCode($pos, $before=30, $after=40)
-    {
-        return substr($this->_html, $pos-$before, $before+$after);
-    }
+	protected    $_html     = '';        // HTML code to parse
+	protected    $_num      = 0;         // table number
+	protected    $_level    = 0;         // table level
+	protected    $_encoding = '';        // encoding
+	public       $code      = array();   // parsed HTML codfe
+
+	const HTML_TAB = '        ';
+
+	/**
+	 * main constructor
+	 *
+	 * @param   string encoding
+	 * @access  public
+	 */
+	public function __construct($encoding = 'UTF-8')
+	{
+		$this->_num   = 0;
+		$this->_level = array($this->_num);
+		$this->_html  = '';
+		$this->code  = array();
+		$this->setEncoding($encoding);
+	}
+
+	/**
+	 * change the encoding
+	 *
+	 * @param   string encoding
+	 * @access  public
+	 */
+	public function setEncoding($encoding)
+	{
+		$this->_encoding = $encoding;
+	}
+
+	/**
+	 * Define the HTML code to parse
+	 *
+	 * @param   string HTML code
+	 * @access  public
+	 */
+	public function setHTML($html)
+	{
+		// remove the HTML in comment
+		$html = preg_replace('/<!--(.*)-->/isU', '', $html);
+
+		// save the HTML code
+		$this->_html = $html;
+	}
+
+	/**
+	 * parse the HTML code
+	 *
+	 * @access public
+	 */
+	public function parse()
+	{
+		$parents = array();
+
+		// flag : are we in a <pre> Tag ?
+		$tagPreIn = false;
+
+		// action to use for each line of the content of a <pre> Tag
+		$tagPreBr = array(
+					'name' => 'br',
+					'close' => false,
+					'param' => array(
+						'style' => array(),
+						'num'    => 0
+					)
+				);
+
+		// tag that can be not closed
+		$tagsNotClosed = array(
+			'br', 'hr', 'img', 'col',
+			'input', 'link', 'option',
+			'circle', 'ellipse', 'path', 'rect', 'line', 'polygon', 'polyline'
+		);
+
+		// search the HTML tags
+		$tmp = array();
+		$this->_searchCode($tmp);
+
+		// all the actions to do
+		$actions = array();
+
+		// foreach part of the HTML code
+		foreach ($tmp as $part) {
+			// if it is a tag code
+			if ($part[0]=='code') {
+				// analise the HTML code
+				$res = $this->_analiseCode($part[1]);
+
+				// if it is a real HTML tag
+				if ($res) {
+					// save the current posistion in the HTML code
+					$res['html_pos'] = $part[2];
+
+					// if the tag must be closed
+					if (!in_array($res['name'], $tagsNotClosed)) {
+						// if it is a closure tag
+						if ($res['close']) {
+							// HTML validation
+							if (count($parents)<1)
+								throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
+							else if ($parents[count($parents)-1]!=$res['name'])
+								throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
+							else
+								unset($parents[count($parents)-1]);
+						} else {
+							// if it is a autoclosed tag
+							if ($res['autoclose']) {
+								// save the opened tag
+								$actions[] = $res;
+
+								// prepare the closed tag
+								$res['params'] = array();
+								$res['close'] = true;
+							}
+							// else :add a child for validation
+							else
+								$parents[count($parents)] = $res['name'];
+						}
+
+						// if it is a <pre> tag (or <code> tag) not auclosed => update the flag
+						if (($res['name']=='pre' || $res['name']=='code') && !$res['autoclose']) {
+							$tagPreIn = !$res['close'];
+						}
+					}
+
+					// save the actions to convert
+					$actions[] = $res;
+				} else { // else (it is not a real HTML tag => we transform it in Texte
+					$part[0]='txt';
+				}
+			}
+			// if it is text
+			if ($part[0]=='txt') {
+				// if we are not in a <pre> tag
+				if (!$tagPreIn) {
+					// save the action
+					$actions[] = array(
+						'name'    => 'write',
+						'close'    => false,
+						'param' => array('txt' => $this->_prepareTxt($part[1])),
+					);
+				} else { // else (if we are in a <pre> tag)
+					// prepare the text
+					$part[1] = str_replace("\r", '', $part[1]);
+					$part[1] = explode("\n", $part[1]);
+
+					// foreach line of the text
+					foreach ($part[1] as $k => $txt) {
+						// transform the line
+						$txt = str_replace("\t", self::HTML_TAB, $txt);
+						$txt = str_replace(' ', '&nbsp;', $txt);
+
+						// add a break line
+						if ($k>0) $actions[] = $tagPreBr;
+
+						// save the action
+						$actions[] = array(
+							'name'    => 'write',
+							'close'    => false,
+							'param' => array('txt' => $this->_prepareTxt($txt, false)),
+						);
+					}
+				}
+			}
+		}
+
+		// for each indentified action, we have to clean up the begin and the end of the texte
+		// based on tags that surround it
+
+		// list of the tags to clean
+		$tagsToClean = array(
+			'page', 'page_header', 'page_footer', 'form',
+			'table', 'thead', 'tfoot', 'tr', 'td', 'th', 'br',
+			'div', 'hr', 'p', 'ul', 'ol', 'li',
+			'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+			'bookmark', 'fieldset', 'legend',
+			'draw', 'circle', 'ellipse', 'path', 'rect', 'line', 'g', 'polygon', 'polyline',
+			'option'
+		);
+
+		// foreach action
+		$nb = count($actions);
+		for ($k=0; $k<$nb; $k++) {
+			// if it is a Text
+			if ($actions[$k]['name']=='write') {
+				// if the tag before the text is a tag to clean => ltrim on the text
+				if ($k>0 && in_array($actions[$k-1]['name'], $tagsToClean))
+					$actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
+
+				// if the tag after the text is a tag to clean => rtrim on the text
+				if ($k<$nb-1 && in_array($actions[$k+1]['name'], $tagsToClean))
+					$actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
+
+				// if the text is empty => remove the action
+				if (!strlen($actions[$k]['param']['txt']))
+					unset($actions[$k]);
+			}
+		}
+
+		// if we are not on the level 0 => HTML validator ERROR
+		if (count($parents)) throw new HTML2PDF_exception(5, $parents);
+
+		// save the actions to do
+		$this->code = array_values($actions);
+	}
+
+	/**
+	 * prepare the text
+	 *
+	 * @param   string texte
+	 * @param   boolean true => replace multiple space+\t+\r+\n by a single space
+	 * @return  string texte
+	 * @access  protected
+	 */
+	protected function _prepareTxt($txt, $spaces = true)
+	{
+		if ($spaces) $txt = preg_replace('/\s+/is', ' ', $txt);
+		$txt = str_replace('&euro;', '€', $txt);
+		$txt = html_entity_decode($txt, ENT_QUOTES, $this->_encoding);
+		return $txt;
+	}
+
+	/**
+	 * parse the HTML code
+	 *
+	 * @param    &array    array's result
+	 * @return   null
+	 */
+	protected function _searchCode(&$tmp)
+	{
+		// initialise the array
+		$tmp = array();
+
+		// regexp to separate the tags from the texts
+		$reg = '/(<[^>]+>)|([^<]+)+/isU';
+
+		// last match found
+		$str = '';
+		$offset = 0;
+
+		// As it finds a match
+		while (preg_match($reg, $this->_html, $parse, PREG_OFFSET_CAPTURE, $offset)) {
+			// if it is a tag
+			if ($parse[1][0]) {
+				// save the previous text if it exists
+				if ($str!=='')    $tmp[] = array('txt', $str);
+
+				// save the tag, with the offset
+				$tmp[] = array('code', trim($parse[1][0]), $offset);
+
+				// init the current text
+				$str = '';
+			} else { // else (if it is a text)
+				// add the new text to the current text
+				$str.= $parse[2][0];
+			}
+
+			// Update offset to the end of the match
+			$offset = $parse[0][1] + strlen($parse[0][0]);
+			unset($parse);
+		}
+		// if a text is present in the end, we save it
+		if ($str!='') $tmp[] = array('txt', $str);
+		unset($str);
+	}
+
+	/**
+	 * analise a HTML tag
+	 *
+	 * @param   string   HTML code to analise
+	 * @return  array    corresponding action
+	 */
+	protected function _analiseCode($code)
+	{
+		// name of the tag, opening, closure, autoclosure
+		$tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
+		if (!preg_match('/'.$tag.'/isU', $code, $match)) return null;
+		$close     = ($match[1]=='/' ? true : false);
+		$autoclose = preg_match('/\/>$/isU', $code);
+		$name      = strtolower($match[2]);
+
+		// required parameters (depends on the tag name)
+		$param    = array();
+		$param['style'] = '';
+		if ($name=='img') {
+			$param['alt'] = '';
+			$param['src'] = '';
+		}
+		if ($name=='a') {
+			$param['href'] = '';
+		}
+
+		// read the parameters : nom=valeur
+		$prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
+		preg_match_all('/'.$prop.'/is', $code, $match);
+		for($k=0; $k<count($match[0]); $k++)
+			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+
+		// read the parameters : nom="valeur"
+		$prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
+		preg_match_all('/'.$prop.'/is', $code, $match);
+		for($k=0; $k<count($match[0]); $k++)
+			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+
+		// read the parameters : nom='valeur'
+		$prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
+		preg_match_all('/'.$prop.'/is', $code, $match);
+		for($k=0; $k<count($match[0]); $k++)
+			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+
+		// compliance of each parameter
+		$color  = "#000000";
+		$border = null;
+		foreach ($param as $key => $val) {
+			$key = strtolower($key);
+			switch($key)
+			{
+				case 'width':
+					unset($param[$key]);
+					$param['style'] .= 'width: '.$val.'px; ';
+					break;
+
+				case 'align':
+					if ($name==='img') {
+						unset($param[$key]);
+						$param['style'] .= 'float: '.$val.'; ';
+					} elseif ($name!=='table') {
+						unset($param[$key]);
+						$param['style'] .= 'text-align: '.$val.'; ';
+					}
+					break;
+
+				case 'valign':
+					unset($param[$key]);
+					$param['style'] .= 'vertical-align: '.$val.'; ';
+					break;
+
+				case 'height':
+					unset($param[$key]);
+					$param['style'] .= 'height: '.$val.'px; ';
+					break;
+
+				case 'bgcolor':
+					unset($param[$key]);
+					$param['style'] .= 'background: '.$val.'; ';
+					break;
+
+				case 'bordercolor':
+					unset($param[$key]);
+					$color = $val;
+					break;
+
+				case 'border':
+					unset($param[$key]);
+					if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
+					$border = $val;
+					break;
+
+				case 'cellpadding':
+				case 'cellspacing':
+					if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
+					break;
+
+				case 'colspan':
+				case 'rowspan':
+					$val = preg_replace('/[^0-9]/isU', '', $val);
+					if (!$val) $val = 1;
+					$param[$key] = $val;
+					break;
+			}
+		}
+
+		// compliance of the border
+		if ($border!==null) {
+			if ($border)    $border = 'border: solid '.$border.' '.$color;
+			else            $border = 'border: none';
+
+			$param['style'] .= $border.'; ';
+			$param['border'] = $border;
+		}
+
+		// reading styles: decomposition and standardization
+		$styles = explode(';', $param['style']);
+		$param['style'] = array();
+		foreach ($styles as $style) {
+			$tmp = explode(':', $style);
+			if (count($tmp)>1) {
+				$cod = $tmp[0];
+				unset($tmp[0]);
+				$tmp = implode(':', $tmp);
+				$param['style'][trim(strtolower($cod))] = preg_replace('/[\s]+/isU', ' ', trim($tmp));
+			}
+		}
+
+		// determining the level of table opening, with an added level
+		if (in_array($name, array('ul', 'ol', 'table')) && !$close) {
+			$this->_num++;
+			$this->_level[count($this->_level)] = $this->_num;
+		}
+
+		// get the level of the table containing the element
+		if (!isset($param['num'])) {
+			$param['num'] = $this->_level[count($this->_level)-1];
+		}
+
+		// for closures table: remove a level
+		if (in_array($name, array('ul', 'ol', 'table')) && $close) {
+			unset($this->_level[count($this->_level)-1]);
+		}
+
+		// prepare the parameters
+		if (isset($param['value']))  $param['value']  = $this->_prepareTxt($param['value']);
+		if (isset($param['alt']))    $param['alt']    = $this->_prepareTxt($param['alt']);
+		if (isset($param['title']))  $param['title']  = $this->_prepareTxt($param['title']);
+		if (isset($param['class']))  $param['class']  = $this->_prepareTxt($param['class']);
+
+		// return the new action to do
+		return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
+	}
+
+	/**
+	 * get a full level of HTML, between an opening and closing corresponding
+	 *
+	 * @param   integer key
+	 * @return  array   actions
+	 */
+	public function getLevel($k)
+	{
+		// if the code does not exist => return empty
+		if (!isset($this->code[$k])) return array();
+
+		// the tag to detect
+		$detect = $this->code[$k]['name'];
+
+		// if it is a text => return
+		if ($detect=='write') {
+			return array($this->code[$k]);
+		}
+
+		//
+		$level = 0;      // depth level
+		$end = false;    // end of the search
+		$code = array(); // extract code
+
+		// while it's not ended
+		while (!$end) {
+			// current action
+			$row = $this->code[$k];
+
+			// if 'write' => we add the text
+			if ($row['name']=='write') {
+				$code[] = $row;
+			} else { // else, it is a html tag
+				$not = false; // flag for not taking into account the current tag
+
+				// if it is the searched tag
+				if ($row['name']==$detect) {
+					// if we are just at the root level => dont take it
+					if ($level==0) {
+						$not = true;
+					}
+
+					// update the level
+					$level+= ($row['close'] ? -1 : 1);
+
+					// if we are now at the root level => it is the end, and dont take it
+					if ($level==0) {
+						$not = true;
+						$end = true;
+					}
+				}
+
+				// if we can takin into account the current tag => save it
+				if (!$not) {
+					if (isset($row['style']['text-align'])) unset($row['style']['text-align']);
+					$code[] = $row;
+				}
+			}
+
+			// it continues as long as there has code to analise
+			if (isset($this->code[$k+1]))
+				$k++;
+			else
+				$end = true;
+		}
+
+		// return the extract
+		return $code;
+	}
+
+	/**
+	 * return a part of the HTML code, for error message
+	 *
+	 * @param   integer position
+	 * @param   integer take before
+	 * @param   integer take after
+	 * @return  string  part of the html code
+	 */
+	public function getHtmlErrorCode($pos, $before=30, $after=40)
+	{
+		return substr($this->_html, $pos-$before, $before+$after);
+	}
 }
\ No newline at end of file

Spacing +61 added lines, -61 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * HTML2PDF Librairy - parsingHtml class
  *
@@ -11,11 +11,11 @@ 
 
 class HTML2PDF_parsingHtml
 {
-    protected    $_html     = '';        // HTML code to parse
-    protected    $_num      = 0;         // table number
-    protected    $_level    = 0;         // table level
-    protected    $_encoding = '';        // encoding
-    public       $code      = array();   // parsed HTML codfe
+    protected    $_html     = ''; // HTML code to parse
+    protected    $_num      = 0; // table number
+    protected    $_level    = 0; // table level
+    protected    $_encoding = ''; // encoding
+    public       $code      = array(); // parsed HTML codfe
 
     const HTML_TAB = '        ';
 
@@ -30,7 +30,7 @@ 
         $this->_num   = 0;
         $this->_level = array($this->_num);
         $this->_html  = '';
-        $this->code  = array();
+        $this->code = array();
         $this->setEncoding($encoding);
     }
 
@@ -99,7 +99,7 @@ 
         // foreach part of the HTML code
         foreach ($tmp as $part) {
             // if it is a tag code
-            if ($part[0]=='code') {
+            if ($part[0] == 'code') {
                 // analise the HTML code
                 $res = $this->_analiseCode($part[1]);
 
@@ -113,12 +113,12 @@ 
                         // if it is a closure tag
                         if ($res['close']) {
                             // HTML validation
-                            if (count($parents)<1)
+                            if (count($parents) < 1)
                                 throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
-                            else if ($parents[count($parents)-1]!=$res['name'])
+                            else if ($parents[count($parents) - 1] != $res['name'])
                                 throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
                             else
-                                unset($parents[count($parents)-1]);
+                                unset($parents[count($parents) - 1]);
                         } else {
                             // if it is a autoclosed tag
                             if ($res['autoclose']) {
@@ -135,7 +135,7 @@ 
                         }
 
                         // if it is a <pre> tag (or <code> tag) not auclosed => update the flag
-                        if (($res['name']=='pre' || $res['name']=='code') && !$res['autoclose']) {
+                        if (($res['name'] == 'pre' || $res['name'] == 'code') && !$res['autoclose']) {
                             $tagPreIn = !$res['close'];
                         }
                     }
@@ -143,11 +143,11 @@ 
                     // save the actions to convert
                     $actions[] = $res;
                 } else { // else (it is not a real HTML tag => we transform it in Texte
-                    $part[0]='txt';
+                    $part[0] = 'txt';
                 }
             }
             // if it is text
-            if ($part[0]=='txt') {
+            if ($part[0] == 'txt') {
                 // if we are not in a <pre> tag
                 if (!$tagPreIn) {
                     // save the action
@@ -168,7 +168,7 @@ 
                         $txt = str_replace(' ', '&nbsp;', $txt);
 
                         // add a break line
-                        if ($k>0) $actions[] = $tagPreBr;
+                        if ($k > 0) $actions[] = $tagPreBr;
 
                         // save the action
                         $actions[] = array(
@@ -197,15 +197,15 @@ 
 
         // foreach action
         $nb = count($actions);
-        for ($k=0; $k<$nb; $k++) {
+        for ($k = 0; $k < $nb; $k++) {
             // if it is a Text
-            if ($actions[$k]['name']=='write') {
+            if ($actions[$k]['name'] == 'write') {
                 // if the tag before the text is a tag to clean => ltrim on the text
-                if ($k>0 && in_array($actions[$k-1]['name'], $tagsToClean))
+                if ($k > 0 && in_array($actions[$k - 1]['name'], $tagsToClean))
                     $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
 
                 // if the tag after the text is a tag to clean => rtrim on the text
-                if ($k<$nb-1 && in_array($actions[$k+1]['name'], $tagsToClean))
+                if ($k < $nb - 1 && in_array($actions[$k + 1]['name'], $tagsToClean))
                     $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
 
                 // if the text is empty => remove the action
@@ -260,7 +260,7 @@ 
             // if it is a tag
             if ($parse[1][0]) {
                 // save the previous text if it exists
-                if ($str!=='')    $tmp[] = array('txt', $str);
+                if ($str !== '')    $tmp[] = array('txt', $str);
 
                 // save the tag, with the offset
                 $tmp[] = array('code', trim($parse[1][0]), $offset);
@@ -269,7 +269,7 @@ 
                 $str = '';
             } else { // else (if it is a text)
                 // add the new text to the current text
-                $str.= $parse[2][0];
+                $str .= $parse[2][0];
             }
 
             // Update offset to the end of the match
@@ -277,7 +277,7 @@ 
             unset($parse);
         }
         // if a text is present in the end, we save it
-        if ($str!='') $tmp[] = array('txt', $str);
+        if ($str != '') $tmp[] = array('txt', $str);
         unset($str);
     }
 
@@ -291,38 +291,38 @@ 
     {
         // name of the tag, opening, closure, autoclosure
         $tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-        if (!preg_match('/'.$tag.'/isU', $code, $match)) return null;
-        $close     = ($match[1]=='/' ? true : false);
+        if (!preg_match('/' . $tag . '/isU', $code, $match)) return null;
+        $close     = ($match[1] == '/' ? true : false);
         $autoclose = preg_match('/\/>$/isU', $code);
         $name      = strtolower($match[2]);
 
         // required parameters (depends on the tag name)
-        $param    = array();
+        $param = array();
         $param['style'] = '';
-        if ($name=='img') {
+        if ($name == 'img') {
             $param['alt'] = '';
             $param['src'] = '';
         }
-        if ($name=='a') {
+        if ($name == 'a') {
             $param['href'] = '';
         }
 
         // read the parameters : nom=valeur
         $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
+        preg_match_all('/' . $prop . '/is', $code, $match);
+        for ($k = 0; $k < count($match[0]); $k++)
             $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
 
         // read the parameters : nom="valeur"
         $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
+        preg_match_all('/' . $prop . '/is', $code, $match);
+        for ($k = 0; $k < count($match[0]); $k++)
             $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
 
         // read the parameters : nom='valeur'
         $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
+        preg_match_all('/' . $prop . '/is', $code, $match);
+        for ($k = 0; $k < count($match[0]); $k++)
             $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
 
         // compliance of each parameter
@@ -330,36 +330,36 @@ 
         $border = null;
         foreach ($param as $key => $val) {
             $key = strtolower($key);
-            switch($key)
+            switch ($key)
             {
                 case 'width':
                     unset($param[$key]);
-                    $param['style'] .= 'width: '.$val.'px; ';
+                    $param['style'] .= 'width: ' . $val . 'px; ';
                     break;
 
                 case 'align':
-                    if ($name==='img') {
+                    if ($name === 'img') {
                         unset($param[$key]);
-                        $param['style'] .= 'float: '.$val.'; ';
-                    } elseif ($name!=='table') {
+                        $param['style'] .= 'float: ' . $val . '; ';
+                    } elseif ($name !== 'table') {
                         unset($param[$key]);
-                        $param['style'] .= 'text-align: '.$val.'; ';
+                        $param['style'] .= 'text-align: ' . $val . '; ';
                     }
                     break;
 
                 case 'valign':
                     unset($param[$key]);
-                    $param['style'] .= 'vertical-align: '.$val.'; ';
+                    $param['style'] .= 'vertical-align: ' . $val . '; ';
                     break;
 
                 case 'height':
                     unset($param[$key]);
-                    $param['style'] .= 'height: '.$val.'px; ';
+                    $param['style'] .= 'height: ' . $val . 'px; ';
                     break;
 
                 case 'bgcolor':
                     unset($param[$key]);
-                    $param['style'] .= 'background: '.$val.'; ';
+                    $param['style'] .= 'background: ' . $val . '; ';
                     break;
 
                 case 'bordercolor':
@@ -369,13 +369,13 @@ 
 
                 case 'border':
                     unset($param[$key]);
-                    if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
+                    if (preg_match('/^[0-9]+$/isU', $val)) $val = $val . 'px';
                     $border = $val;
                     break;
 
                 case 'cellpadding':
                 case 'cellspacing':
-                    if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
+                    if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val . 'px';
                     break;
 
                 case 'colspan':
@@ -388,11 +388,11 @@ 
         }
 
         // compliance of the border
-        if ($border!==null) {
-            if ($border)    $border = 'border: solid '.$border.' '.$color;
+        if ($border !== null) {
+            if ($border)    $border = 'border: solid ' . $border . ' ' . $color;
             else            $border = 'border: none';
 
-            $param['style'] .= $border.'; ';
+            $param['style'] .= $border . '; ';
             $param['border'] = $border;
         }
 
@@ -401,7 +401,7 @@ 
         $param['style'] = array();
         foreach ($styles as $style) {
             $tmp = explode(':', $style);
-            if (count($tmp)>1) {
+            if (count($tmp) > 1) {
                 $cod = $tmp[0];
                 unset($tmp[0]);
                 $tmp = implode(':', $tmp);
@@ -417,12 +417,12 @@ 
 
         // get the level of the table containing the element
         if (!isset($param['num'])) {
-            $param['num'] = $this->_level[count($this->_level)-1];
+            $param['num'] = $this->_level[count($this->_level) - 1];
         }
 
         // for closures table: remove a level
         if (in_array($name, array('ul', 'ol', 'table')) && $close) {
-            unset($this->_level[count($this->_level)-1]);
+            unset($this->_level[count($this->_level) - 1]);
         }
 
         // prepare the parameters
@@ -450,13 +450,13 @@ 
         $detect = $this->code[$k]['name'];
 
         // if it is a text => return
-        if ($detect=='write') {
+        if ($detect == 'write') {
             return array($this->code[$k]);
         }
 
         //
-        $level = 0;      // depth level
-        $end = false;    // end of the search
+        $level = 0; // depth level
+        $end = false; // end of the search
         $code = array(); // extract code
 
         // while it's not ended
@@ -465,23 +465,23 @@ 
             $row = $this->code[$k];
 
             // if 'write' => we add the text
-            if ($row['name']=='write') {
+            if ($row['name'] == 'write') {
                 $code[] = $row;
             } else { // else, it is a html tag
                 $not = false; // flag for not taking into account the current tag
 
                 // if it is the searched tag
-                if ($row['name']==$detect) {
+                if ($row['name'] == $detect) {
                     // if we are just at the root level => dont take it
-                    if ($level==0) {
+                    if ($level == 0) {
                         $not = true;
                     }
 
                     // update the level
-                    $level+= ($row['close'] ? -1 : 1);
+                    $level += ($row['close'] ? -1 : 1);
 
                     // if we are now at the root level => it is the end, and dont take it
-                    if ($level==0) {
+                    if ($level == 0) {
                         $not = true;
                         $end = true;
                     }
@@ -495,7 +495,7 @@ 
             }
 
             // it continues as long as there has code to analise
-            if (isset($this->code[$k+1]))
+            if (isset($this->code[$k + 1]))
                 $k++;
             else
                 $end = true;
@@ -513,8 +513,8 @@ 
      * @param   integer take after
      * @return  string  part of the html code
      */
-    public function getHtmlErrorCode($pos, $before=30, $after=40)
+    public function getHtmlErrorCode($pos, $before = 30, $after = 40)
     {
-        return substr($this->_html, $pos-$before, $before+$after);
+        return substr($this->_html, $pos - $before, $before + $after);
     }
 }
\ No newline at end of file

Braces +86 added lines, -42 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * HTML2PDF Librairy - parsingHtml class
  *
@@ -113,12 +115,13 @@ 
                         // if it is a closure tag
                         if ($res['close']) {
                             // HTML validation
-                            if (count($parents)<1)
-                                throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
-                            else if ($parents[count($parents)-1]!=$res['name'])
-                                throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
-                            else
-                                unset($parents[count($parents)-1]);
+                            if (count($parents)<1) {
+                                                            throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
+                            } else if ($parents[count($parents)-1]!=$res['name']) {
+                                                            throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
+                            } else {
+                                                            unset($parents[count($parents)-1]);
+                            }
                         } else {
                             // if it is a autoclosed tag
                             if ($res['autoclose']) {
@@ -130,8 +133,9 @@ 
                                 $res['close'] = true;
                             }
                             // else :add a child for validation
-                            else
-                                $parents[count($parents)] = $res['name'];
+                            else {
+                                                            $parents[count($parents)] = $res['name'];
+                            }
                         }
 
                         // if it is a <pre> tag (or <code> tag) not auclosed => update the flag
@@ -168,7 +172,9 @@ 
                         $txt = str_replace(' ', '&nbsp;', $txt);
 
                         // add a break line
-                        if ($k>0) $actions[] = $tagPreBr;
+                        if ($k>0) {
+                        	$actions[] = $tagPreBr;
+                        }
 
                         // save the action
                         $actions[] = array(
@@ -201,21 +207,26 @@ 
             // if it is a Text
             if ($actions[$k]['name']=='write') {
                 // if the tag before the text is a tag to clean => ltrim on the text
-                if ($k>0 && in_array($actions[$k-1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
+                if ($k>0 && in_array($actions[$k-1]['name'], $tagsToClean)) {
+                                    $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
+                }
 
                 // if the tag after the text is a tag to clean => rtrim on the text
-                if ($k<$nb-1 && in_array($actions[$k+1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
+                if ($k<$nb-1 && in_array($actions[$k+1]['name'], $tagsToClean)) {
+                                    $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
+                }
 
                 // if the text is empty => remove the action
-                if (!strlen($actions[$k]['param']['txt']))
-                    unset($actions[$k]);
+                if (!strlen($actions[$k]['param']['txt'])) {
+                                    unset($actions[$k]);
+                }
             }
         }
 
         // if we are not on the level 0 => HTML validator ERROR
-        if (count($parents)) throw new HTML2PDF_exception(5, $parents);
+        if (count($parents)) {
+        	throw new HTML2PDF_exception(5, $parents);
+        }
 
         // save the actions to do
         $this->code = array_values($actions);
@@ -231,7 +242,9 @@ 
      */
     protected function _prepareTxt($txt, $spaces = true)
     {
-        if ($spaces) $txt = preg_replace('/\s+/is', ' ', $txt);
+        if ($spaces) {
+        	$txt = preg_replace('/\s+/is', ' ', $txt);
+        }
         $txt = str_replace('&euro;', '€', $txt);
         $txt = html_entity_decode($txt, ENT_QUOTES, $this->_encoding);
         return $txt;
@@ -260,7 +273,9 @@ 
             // if it is a tag
             if ($parse[1][0]) {
                 // save the previous text if it exists
-                if ($str!=='')    $tmp[] = array('txt', $str);
+                if ($str!=='') {
+                	$tmp[] = array('txt', $str);
+                }
 
                 // save the tag, with the offset
                 $tmp[] = array('code', trim($parse[1][0]), $offset);
@@ -277,7 +292,9 @@ 
             unset($parse);
         }
         // if a text is present in the end, we save it
-        if ($str!='') $tmp[] = array('txt', $str);
+        if ($str!='') {
+        	$tmp[] = array('txt', $str);
+        }
         unset($str);
     }
 
@@ -291,7 +308,9 @@ 
     {
         // name of the tag, opening, closure, autoclosure
         $tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-        if (!preg_match('/'.$tag.'/isU', $code, $match)) return null;
+        if (!preg_match('/'.$tag.'/isU', $code, $match)) {
+        	return null;
+        }
         $close     = ($match[1]=='/' ? true : false);
         $autoclose = preg_match('/\/>$/isU', $code);
         $name      = strtolower($match[2]);
@@ -310,20 +329,23 @@ 
         // read the parameters : nom=valeur
         $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for($k=0; $k<count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // read the parameters : nom="valeur"
         $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for($k=0; $k<count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // read the parameters : nom='valeur'
         $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for($k=0; $k<count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // compliance of each parameter
         $color  = "#000000";
@@ -369,19 +391,25 @@ 
 
                 case 'border':
                     unset($param[$key]);
-                    if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
+                    if (preg_match('/^[0-9]+$/isU', $val)) {
+                    	$val = $val.'px';
+                    }
                     $border = $val;
                     break;
 
                 case 'cellpadding':
                 case 'cellspacing':
-                    if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
+                    if (preg_match('/^([0-9]+)$/isU', $val)) {
+                    	$param[$key] = $val.'px';
+                    }
                     break;
 
                 case 'colspan':
                 case 'rowspan':
                     $val = preg_replace('/[^0-9]/isU', '', $val);
-                    if (!$val) $val = 1;
+                    if (!$val) {
+                    	$val = 1;
+                    }
                     $param[$key] = $val;
                     break;
             }
@@ -389,8 +417,11 @@ 
 
         // compliance of the border
         if ($border!==null) {
-            if ($border)    $border = 'border: solid '.$border.' '.$color;
-            else            $border = 'border: none';
+            if ($border) {
+            	$border = 'border: solid '.$border.' '.$color;
+            } else {
+            	$border = 'border: none';
+            }
 
             $param['style'] .= $border.'; ';
             $param['border'] = $border;
@@ -426,10 +457,18 @@ 
         }
 
         // prepare the parameters
-        if (isset($param['value']))  $param['value']  = $this->_prepareTxt($param['value']);
-        if (isset($param['alt']))    $param['alt']    = $this->_prepareTxt($param['alt']);
-        if (isset($param['title']))  $param['title']  = $this->_prepareTxt($param['title']);
-        if (isset($param['class']))  $param['class']  = $this->_prepareTxt($param['class']);
+        if (isset($param['value'])) {
+        	$param['value']  = $this->_prepareTxt($param['value']);
+        }
+        if (isset($param['alt'])) {
+        	$param['alt']    = $this->_prepareTxt($param['alt']);
+        }
+        if (isset($param['title'])) {
+        	$param['title']  = $this->_prepareTxt($param['title']);
+        }
+        if (isset($param['class'])) {
+        	$param['class']  = $this->_prepareTxt($param['class']);
+        }
 
         // return the new action to do
         return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
@@ -444,7 +483,9 @@ 
     public function getLevel($k)
     {
         // if the code does not exist => return empty
-        if (!isset($this->code[$k])) return array();
+        if (!isset($this->code[$k])) {
+        	return array();
+        }
 
         // the tag to detect
         $detect = $this->code[$k]['name'];
@@ -489,16 +530,19 @@ 
 
                 // if we can takin into account the current tag => save it
                 if (!$not) {
-                    if (isset($row['style']['text-align'])) unset($row['style']['text-align']);
+                    if (isset($row['style']['text-align'])) {
+                    	unset($row['style']['text-align']);
+                    }
                     $code[] = $row;
                 }
             }
 
             // it continues as long as there has code to analise
-            if (isset($this->code[$k+1]))
-                $k++;
-            else
-                $end = true;
+            if (isset($this->code[$k+1])) {
+                            $k++;
+            } else {
+                            $end = true;
+            }
         }
 
         // return the extract

includes/librairies/HTML2PDF/_tcpdf_5.0.002/barcodes.php

Doc Comments +4 added lines, -5 removed lines

@@ -325,7 +325,7 @@ 
 	/**
 	 * Encode a string to be used for CODE 39 Extended mode.
 	 * @param string $code code to represent.
-	 * @return encoded string.
+	 * @return false|string string.
 	 * @access protected
 	 */
 	protected function encode_code39_ext($code) {
@@ -376,7 +376,7 @@ 
 	/**
 	 * Calculate CODE 39 checksum (modulo 43).
 	 * @param string $code code to represent.
-	 * @return char checksum.
+	 * @return string checksum.
 	 * @access protected
 	 */
 	protected function checksum_code39($code) {
@@ -399,7 +399,6 @@ 
 	 * CODE 93 - USS-93
 	 * Compact code similar to Code 39
 	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
 	 * @return array barcode representation.
 	 * @access protected
 	 */
@@ -988,7 +987,7 @@ 
 	 * UPC-A: Universal product code seen on almost all retail products in the USA and Canada
 	 * UPC-E: Short version of UPC symbol
 	 * @param string $code code to represent.
-	 * @param string $len barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A
+	 * @param integer $len barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A
 	 * @return array barcode representation.
 	 * @access protected
 	 */
@@ -1181,7 +1180,7 @@ 
 	 * 2-Digit Ext.: Used to indicate magazines and newspaper issue numbers
 	 * 5-Digit Ext.: Used to mark suggested retail price of books
 	 * @param string $code code to represent.
-	 * @param string $len barcode type: 2 = 2-Digit, 5 = 5-Digit
+	 * @param integer $len barcode type: 2 = 2-Digit, 5 = 5-Digit
 	 * @return array barcode representation.
 	 * @access protected
 	 */

Indentation +12 added lines, -12 removed lines

@@ -51,14 +51,14 @@ 
  */
 
 	/**
-	* PHP class to creates array representations for common 1D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
-	* @name TCPDFBarcode
-	* @package com.tecnick.tcpdf
-	* @version 1.0.008
-	* @author Nicola Asuni
-	* @link http://www.tcpdf.org
-	* @license http://www.gnu.org/copyleft/lesser.html LGPL
-	*/
+	 * PHP class to creates array representations for common 1D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
+	 * @name TCPDFBarcode
+	 * @package com.tecnick.tcpdf
+	 * @version 1.0.008
+	 * @author Nicola Asuni
+	 * @link http://www.tcpdf.org
+	 * @license http://www.gnu.org/copyleft/lesser.html LGPL
+	 */
 class TCPDFBarcode {
 	
 	/**
@@ -79,7 +79,7 @@ 
 	 * <li>$arrcode['bcode'][$k]['h'] bar height in units.</li>
 	 * <li>$arrcode['bcode'][$k]['p'] bar top position (0 = top, 1 = middle)</li></ul>
 	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
+	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
 	 */
 	public function __construct($code, $type) {
 		$this->setBarcode($code, $type);
@@ -87,7 +87,7 @@ 
 	
 	/** 
 	 * Return an array representations of barcode.
- 	 * @return array
+	 * @return array
 	 */
 	public function getBarcodeArray() {
 		return $this->barcode_array;
@@ -96,8 +96,8 @@ 
 	/** 
 	 * Set the barcode.
 	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
- 	 * @return array
+	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
+	 * @return array
 	 */
 	public function setBarcode($code, $type) {
 		switch (strtoupper($type)) {

Spacing +225 added lines, -225 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 //============================================================+
 // File name   : barcodes.php
 // Begin       : 2008-06-09
@@ -234,7 +234,7 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_code39($code, $extended=false, $checksum=false) {
+	protected function barcode_code39($code, $extended = false, $checksum = false) {
 		$chr['0'] = '111221211';
 		$chr['1'] = '211211112';
 		$chr['2'] = '112211112';
@@ -293,14 +293,14 @@ 
 			$code .= $this->checksum_code39($code);
 		}
 		// add start and stop codes
-		$code = '*'.$code.'*';
+		$code = '*' . $code . '*';
 		
 		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
 		$k = 0;
 		$clen = strlen($code);
 		for ($i = 0; $i < $clen; ++$i) {
 			$char = $code{$i};
-			if(!isset($chr[$char])) {
+			if (!isset($chr[$char])) {
 				// invalid character
 				return false;
 			}
@@ -364,7 +364,7 @@ 
 			chr(124) => '%Q', chr(125) => '%R', chr(126) => '%S', chr(127) => '%T');
 		$code_ext = '';
 		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
+		for ($i = 0; $i < $clen; ++$i) {
 			if (ord($code{$i}) > 127) {
 				return false;
 			}
@@ -387,7 +387,7 @@ 
 			'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%');
 		$sum = 0;
 		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
+		for ($i = 0; $i < $clen; ++$i) {
 			$k = array_keys($chars, $code{$i});
 			$sum += $k[0];
 		}
@@ -454,41 +454,41 @@ 
 		$chr['*'] = '111141';
 		$code = strtoupper($code);
 		$encode = array(
-			chr(0) => chr(131).'U', chr(1) => chr(128).'A', chr(2) => chr(128).'B', chr(3) => chr(128).'C',
-			chr(4) => chr(128).'D', chr(5) => chr(128).'E', chr(6) => chr(128).'F', chr(7) => chr(128).'G',
-			chr(8) => chr(128).'H', chr(9) => chr(128).'I', chr(10) => chr(128).'J', chr(11) => '£K',
-			chr(12) => chr(128).'L', chr(13) => chr(128).'M', chr(14) => chr(128).'N', chr(15) => chr(128).'O',
-			chr(16) => chr(128).'P', chr(17) => chr(128).'Q', chr(18) => chr(128).'R', chr(19) => chr(128).'S',
-			chr(20) => chr(128).'T', chr(21) => chr(128).'U', chr(22) => chr(128).'V', chr(23) => chr(128).'W',
-			chr(24) => chr(128).'X', chr(25) => chr(128).'Y', chr(26) => chr(128).'Z', chr(27) => chr(131).'A',
-			chr(28) => chr(131).'B', chr(29) => chr(131).'C', chr(30) => chr(131).'D', chr(31) => chr(131).'E',
-			chr(32) => ' ', chr(33) => chr(129).'A', chr(34) => chr(129).'B', chr(35) => chr(129).'C',
-			chr(36) => chr(129).'D', chr(37) => chr(129).'E', chr(38) => chr(129).'F', chr(39) => chr(129).'G',
-			chr(40) => chr(129).'H', chr(41) => chr(129).'I', chr(42) => chr(129).'J', chr(43) => chr(129).'K',
-			chr(44) => chr(129).'L', chr(45) => '-', chr(46) => '.', chr(47) => chr(129).'O',
+			chr(0) => chr(131) . 'U', chr(1) => chr(128) . 'A', chr(2) => chr(128) . 'B', chr(3) => chr(128) . 'C',
+			chr(4) => chr(128) . 'D', chr(5) => chr(128) . 'E', chr(6) => chr(128) . 'F', chr(7) => chr(128) . 'G',
+			chr(8) => chr(128) . 'H', chr(9) => chr(128) . 'I', chr(10) => chr(128) . 'J', chr(11) => '£K',
+			chr(12) => chr(128) . 'L', chr(13) => chr(128) . 'M', chr(14) => chr(128) . 'N', chr(15) => chr(128) . 'O',
+			chr(16) => chr(128) . 'P', chr(17) => chr(128) . 'Q', chr(18) => chr(128) . 'R', chr(19) => chr(128) . 'S',
+			chr(20) => chr(128) . 'T', chr(21) => chr(128) . 'U', chr(22) => chr(128) . 'V', chr(23) => chr(128) . 'W',
+			chr(24) => chr(128) . 'X', chr(25) => chr(128) . 'Y', chr(26) => chr(128) . 'Z', chr(27) => chr(131) . 'A',
+			chr(28) => chr(131) . 'B', chr(29) => chr(131) . 'C', chr(30) => chr(131) . 'D', chr(31) => chr(131) . 'E',
+			chr(32) => ' ', chr(33) => chr(129) . 'A', chr(34) => chr(129) . 'B', chr(35) => chr(129) . 'C',
+			chr(36) => chr(129) . 'D', chr(37) => chr(129) . 'E', chr(38) => chr(129) . 'F', chr(39) => chr(129) . 'G',
+			chr(40) => chr(129) . 'H', chr(41) => chr(129) . 'I', chr(42) => chr(129) . 'J', chr(43) => chr(129) . 'K',
+			chr(44) => chr(129) . 'L', chr(45) => '-', chr(46) => '.', chr(47) => chr(129) . 'O',
 			chr(48) => '0', chr(49) => '1', chr(50) => '2', chr(51) => '3',
 			chr(52) => '4', chr(53) => '5', chr(54) => '6', chr(55) => '7',
-			chr(56) => '8', chr(57) => '9', chr(58) => chr(129).'Z', chr(59) => chr(131).'F',
-			chr(60) => chr(131).'G', chr(61) => chr(131).'H', chr(62) => chr(131).'I', chr(63) => chr(131).'J',
-			chr(64) => chr(131).'V', chr(65) => 'A', chr(66) => 'B', chr(67) => 'C',
+			chr(56) => '8', chr(57) => '9', chr(58) => chr(129) . 'Z', chr(59) => chr(131) . 'F',
+			chr(60) => chr(131) . 'G', chr(61) => chr(131) . 'H', chr(62) => chr(131) . 'I', chr(63) => chr(131) . 'J',
+			chr(64) => chr(131) . 'V', chr(65) => 'A', chr(66) => 'B', chr(67) => 'C',
 			chr(68) => 'D', chr(69) => 'E', chr(70) => 'F', chr(71) => 'G',
 			chr(72) => 'H', chr(73) => 'I', chr(74) => 'J', chr(75) => 'K',
 			chr(76) => 'L', chr(77) => 'M', chr(78) => 'N', chr(79) => 'O',
 			chr(80) => 'P', chr(81) => 'Q', chr(82) => 'R', chr(83) => 'S',
 			chr(84) => 'T', chr(85) => 'U', chr(86) => 'V', chr(87) => 'W',
-			chr(88) => 'X', chr(89) => 'Y', chr(90) => 'Z', chr(91) => chr(131).'K',
-			chr(92) => chr(131).'L', chr(93) => chr(131).'M', chr(94) => chr(131).'N', chr(95) => chr(131).'O',
-			chr(96) => chr(131).'W', chr(97) => chr(130).'A', chr(98) => chr(130).'B', chr(99) => chr(130).'C',
-			chr(100) => chr(130).'D', chr(101) => chr(130).'E', chr(102) => chr(130).'F', chr(103) => chr(130).'G',
-			chr(104) => chr(130).'H', chr(105) => chr(130).'I', chr(106) => chr(130).'J', chr(107) => chr(130).'K',
-			chr(108) => chr(130).'L', chr(109) => chr(130).'M', chr(110) => chr(130).'N', chr(111) => chr(130).'O',
-			chr(112) => chr(130).'P', chr(113) => chr(130).'Q', chr(114) => chr(130).'R', chr(115) => chr(130).'S',
-			chr(116) => chr(130).'T', chr(117) => chr(130).'U', chr(118) => chr(130).'V', chr(119) => chr(130).'W',
-			chr(120) => chr(130).'X', chr(121) => chr(130).'Y', chr(122) => chr(130).'Z', chr(123) => chr(131).'P',
-			chr(124) => chr(131).'Q', chr(125) => chr(131).'R', chr(126) => chr(131).'S', chr(127) => chr(131).'T');
+			chr(88) => 'X', chr(89) => 'Y', chr(90) => 'Z', chr(91) => chr(131) . 'K',
+			chr(92) => chr(131) . 'L', chr(93) => chr(131) . 'M', chr(94) => chr(131) . 'N', chr(95) => chr(131) . 'O',
+			chr(96) => chr(131) . 'W', chr(97) => chr(130) . 'A', chr(98) => chr(130) . 'B', chr(99) => chr(130) . 'C',
+			chr(100) => chr(130) . 'D', chr(101) => chr(130) . 'E', chr(102) => chr(130) . 'F', chr(103) => chr(130) . 'G',
+			chr(104) => chr(130) . 'H', chr(105) => chr(130) . 'I', chr(106) => chr(130) . 'J', chr(107) => chr(130) . 'K',
+			chr(108) => chr(130) . 'L', chr(109) => chr(130) . 'M', chr(110) => chr(130) . 'N', chr(111) => chr(130) . 'O',
+			chr(112) => chr(130) . 'P', chr(113) => chr(130) . 'Q', chr(114) => chr(130) . 'R', chr(115) => chr(130) . 'S',
+			chr(116) => chr(130) . 'T', chr(117) => chr(130) . 'U', chr(118) => chr(130) . 'V', chr(119) => chr(130) . 'W',
+			chr(120) => chr(130) . 'X', chr(121) => chr(130) . 'Y', chr(122) => chr(130) . 'Z', chr(123) => chr(131) . 'P',
+			chr(124) => chr(131) . 'Q', chr(125) => chr(131) . 'R', chr(126) => chr(131) . 'S', chr(127) => chr(131) . 'T');
 		$code_ext = '';
 		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
+		for ($i = 0; $i < $clen; ++$i) {
 			if (ord($code{$i}) > 127) {
 				return false;
 			}
@@ -497,13 +497,13 @@ 
 		// checksum
 		$code .= $this->checksum_code93($code);
 		// add start and stop codes
-		$code = '*'.$code.'*';
+		$code = '*' . $code . '*';
 		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
 		$k = 0;
 		$clen = strlen($code);
 		for ($i = 0; $i < $clen; ++$i) {
 			$char = $code{$i};
-			if(!isset($chr[$char])) {
+			if (!isset($chr[$char])) {
 				// invalid character
 				return false;
 			}
@@ -538,7 +538,7 @@ 
 			'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
 			'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%');
 		// translate special characters
-		$code = strtr($code, chr(128).chr(129).chr(130).chr(131), '$/+%');	
+		$code = strtr($code, chr(128) . chr(129) . chr(130) . chr(131), '$/+%');	
 		$len = strlen($code);
 		// calculate check digit C
 		$p = 1;
@@ -567,7 +567,7 @@ 
 		}
 		$check %= 47;
 		$k = $chars[$check];
-		return $c.$k;
+		return $c . $k;
 	}
 	
 	/**
@@ -579,15 +579,15 @@ 
 	protected function checksum_s25($code) {
 		$len = strlen($code);
 		$sum = 0;
-		for ($i = 0; $i < $len; $i+=2) {
+		for ($i = 0; $i < $len; $i += 2) {
 			$sum += $code{$i};
 		}
 		$sum *= 3;
-		for ($i = 1; $i < $len; $i+=2) {
+		for ($i = 1; $i < $len; $i += 2) {
 			$sum += ($code{$i});
 		}
 		$r = $sum % 10;
-		if($r > 0) {
+		if ($r > 0) {
 			$r = (10 - $r);
 		}
 		return $r;
@@ -602,7 +602,7 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_msi($code, $checksum=false) {
+	protected function barcode_msi($code, $checksum = false) {
 		$chr['0'] = '100100100100';
 		$chr['1'] = '100100100110';
 		$chr['2'] = '100100110100';
@@ -661,7 +661,7 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_s25($code, $checksum=false) {
+	protected function barcode_s25($code, $checksum = false) {
 		$chr['0'] = '10101110111010';
 		$chr['1'] = '11101010101110';
 		$chr['2'] = '10111010101110';
@@ -676,9 +676,9 @@ 
 			// add checksum
 			$code .= $this->checksum_s25($code);
 		}
-		if((strlen($code) % 2) != 0) {
+		if ((strlen($code) % 2) != 0) {
 			// add leading zero if code-length is odd
-			$code = '0'.$code;
+			$code = '0' . $code;
 		}
 		$seq = '11011010';
 		$clen = strlen($code);
@@ -708,7 +708,7 @@ 
 		$k = 0;
 		for ($i = 0; $i < $len; ++$i) {
 			$w += 1;
-			if (($i == ($len - 1)) OR (($i < ($len - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
+			if (($i == ($len - 1)) OR (($i < ($len - 1)) AND ($seq{$i} != $seq{($i + 1)}))) {
 				if ($seq{$i} == '1') {
 					$t = true; // bar
 				} else {
@@ -732,7 +732,7 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_i25($code, $checksum=false) {
+	protected function barcode_i25($code, $checksum = false) {
 		$chr['0'] = '11221';
 		$chr['1'] = '21112';
 		$chr['2'] = '12112';
@@ -749,27 +749,27 @@ 
 			// add checksum
 			$code .= $this->checksum_s25($code);
 		}
-		if((strlen($code) % 2) != 0) {
+		if ((strlen($code) % 2) != 0) {
 			// add leading zero if code-length is odd
-			$code = '0'.$code;
+			$code = '0' . $code;
 		}
 		// add start and stop codes
-		$code = 'AA'.strtolower($code).'ZA';
+		$code = 'AA' . strtolower($code) . 'ZA';
 			
 		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
 		$k = 0;
 		$clen = strlen($code);
 		for ($i = 0; $i < $clen; $i = ($i + 2)) {
 			$char_bar = $code{$i};
-			$char_space = $code{$i+1};
-			if((!isset($chr[$char_bar])) OR (!isset($chr[$char_space]))) {
+			$char_space = $code{$i + 1};
+			if ((!isset($chr[$char_bar])) OR (!isset($chr[$char_space]))) {
 				// invalid character
 				return false;
 			}
 			// create a bar-space sequence
 			$seq = '';
 			$chrlen = strlen($chr[$char_bar]);
-			for ($s = 0; $s < $chrlen; $s++){
+			for ($s = 0; $s < $chrlen; $s++) {
 				$seq .= $chr[$char_bar]{$s} . $chr[$char_space]{$s};
 			}
 			$seqlen = strlen($seq);
@@ -796,7 +796,7 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_c128($code, $type='B') {
+	protected function barcode_c128($code, $type = 'B') {
 		$chr = array(
 			'212222', /* 00 */
 			'222122', /* 01 */
@@ -908,7 +908,7 @@ 
 			'200000'  /* END */
 		);
 		$keys = '';
-		switch(strtoupper($type)) {
+		switch (strtoupper($type)) {
 			case 'A': {
 				$startid = 103;
 				$keys = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_';
@@ -919,7 +919,7 @@ 
 			}
 			case 'B': {
 				$startid = 104;
-				$keys = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~'.chr(127);
+				$keys = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~' . chr(127);
 				break;
 			}
 			case 'C': {
@@ -935,7 +935,7 @@ 
 				$new_code = '';
 				$hclen = (strlen($code) / 2);
 				for ($i = 0; $i < $hclen; ++$i) {
-					$new_code .= chr(intval($code{(2 * $i)}.$code{(2 * $i + 1)}));
+					$new_code .= chr(intval($code{(2 * $i)} . $code{(2 * $i + 1)}));
 				}
 				$code = $new_code;
 				break;
@@ -948,20 +948,20 @@ 
 		$sum = $startid;
 		$clen = strlen($code);
 		for ($i = 0; $i < $clen; ++$i) {
-			$sum +=  (strpos($keys, $code{$i}) * ($i+1));
+			$sum += (strpos($keys, $code{$i}) * ($i + 1));
 		}
 		$check = ($sum % 103);
 		// add start, check and stop codes
-		$code = chr($startid).$code.chr($check).chr(106).chr(107);
+		$code = chr($startid) . $code . chr($check) . chr(106) . chr(107);
 		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
 		$k = 0;
 		$len = strlen($code);
 		for ($i = 0; $i < $len; ++$i) {
 			$ck = strpos($keys, $code{$i});
-			if (($i == 0) OR ($i > ($len-4))) {
+			if (($i == 0) OR ($i > ($len - 4))) {
 				$char_num = ord($code{$i});
 				$seq = $chr[$char_num];
-			} elseif(($ck >= 0) AND isset($chr[$ck])) {
+			} elseif (($ck >= 0) AND isset($chr[$ck])) {
 					$seq = $chr[$ck];
 			} else {
 				// invalid character
@@ -992,7 +992,7 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_eanupc($code, $len=13) {
+	protected function barcode_eanupc($code, $len = 13) {
 		$upce = false;
 		if ($len == 6) {
 			$len = 12; // UPC-A
@@ -1004,21 +1004,21 @@ 
 		$code_len = strlen($code);
 		// calculate check digit
 		$sum_a = 0;
-		for ($i = 1; $i < $data_len; $i+=2) {
+		for ($i = 1; $i < $data_len; $i += 2) {
 			$sum_a += $code{$i};
 		}
 		if ($len > 12) {
 			$sum_a *= 3;
 		}
 		$sum_b = 0;
-		for ($i = 0; $i < $data_len; $i+=2) {
+		for ($i = 0; $i < $data_len; $i += 2) {
 			$sum_b += ($code{$i});
 		}
 		if ($len < 13) {
 			$sum_b *= 3;
 		}
 		$r = ($sum_a + $sum_b) % 10;
-		if($r > 0) {
+		if ($r > 0) {
 			$r = (10 - $r);
 		}
 		if ($code_len == $data_len) {
@@ -1030,7 +1030,7 @@ 
 		}
 		if ($len == 12) {
 			// UPC-A
-			$code = '0'.$code;
+			$code = '0' . $code;
 			++$len;
 		}
 		if ($upce) {
@@ -1038,20 +1038,20 @@ 
 			$tmp = substr($code, 4, 3);
 			if (($tmp == '000') OR ($tmp == '100') OR ($tmp == '200')) {
 				// manufacturer code ends in 000, 100, or 200
-				$upce_code = substr($code, 2, 2).substr($code, 9, 3).substr($code, 4, 1);
+				$upce_code = substr($code, 2, 2) . substr($code, 9, 3) . substr($code, 4, 1);
 			} else {
 				$tmp = substr($code, 5, 2);
 				if ($tmp == '00') {
 					// manufacturer code ends in 00
-					$upce_code = substr($code, 2, 3).substr($code, 10, 2).'3';
+					$upce_code = substr($code, 2, 3) . substr($code, 10, 2) . '3';
 				} else {
 					$tmp = substr($code, 6, 1);
 					if ($tmp == '0') {
 						// manufacturer code ends in 0
-						$upce_code = substr($code, 2, 4).substr($code, 11, 1).'4';
+						$upce_code = substr($code, 2, 4) . substr($code, 11, 1) . '4';
 					} else {
 						// manufacturer code does not end in zero
-						$upce_code = substr($code, 2, 5).substr($code, 11, 1);
+						$upce_code = substr($code, 2, 5) . substr($code, 11, 1);
 					}
 				}
 			}
@@ -1093,41 +1093,41 @@ 
 				'9'=>'1110100')
 		);
 		$parities = array(
-			'0'=>array('A','A','A','A','A','A'),
-			'1'=>array('A','A','B','A','B','B'),
-			'2'=>array('A','A','B','B','A','B'),
-			'3'=>array('A','A','B','B','B','A'),
-			'4'=>array('A','B','A','A','B','B'),
-			'5'=>array('A','B','B','A','A','B'),
-			'6'=>array('A','B','B','B','A','A'),
-			'7'=>array('A','B','A','B','A','B'),
-			'8'=>array('A','B','A','B','B','A'),
-			'9'=>array('A','B','B','A','B','A')
+			'0'=>array('A', 'A', 'A', 'A', 'A', 'A'),
+			'1'=>array('A', 'A', 'B', 'A', 'B', 'B'),
+			'2'=>array('A', 'A', 'B', 'B', 'A', 'B'),
+			'3'=>array('A', 'A', 'B', 'B', 'B', 'A'),
+			'4'=>array('A', 'B', 'A', 'A', 'B', 'B'),
+			'5'=>array('A', 'B', 'B', 'A', 'A', 'B'),
+			'6'=>array('A', 'B', 'B', 'B', 'A', 'A'),
+			'7'=>array('A', 'B', 'A', 'B', 'A', 'B'),
+			'8'=>array('A', 'B', 'A', 'B', 'B', 'A'),
+			'9'=>array('A', 'B', 'B', 'A', 'B', 'A')
 		);
 		$upce_parities = array();
 		$upce_parities[0] = array(
-			'0'=>array('B','B','B','A','A','A'),
-			'1'=>array('B','B','A','B','A','A'),
-			'2'=>array('B','B','A','A','B','A'),
-			'3'=>array('B','B','A','A','A','B'),
-			'4'=>array('B','A','B','B','A','A'),
-			'5'=>array('B','A','A','B','B','A'),
-			'6'=>array('B','A','A','A','B','B'),
-			'7'=>array('B','A','B','A','B','A'),
-			'8'=>array('B','A','B','A','A','B'),
-			'9'=>array('B','A','A','B','A','B')
+			'0'=>array('B', 'B', 'B', 'A', 'A', 'A'),
+			'1'=>array('B', 'B', 'A', 'B', 'A', 'A'),
+			'2'=>array('B', 'B', 'A', 'A', 'B', 'A'),
+			'3'=>array('B', 'B', 'A', 'A', 'A', 'B'),
+			'4'=>array('B', 'A', 'B', 'B', 'A', 'A'),
+			'5'=>array('B', 'A', 'A', 'B', 'B', 'A'),
+			'6'=>array('B', 'A', 'A', 'A', 'B', 'B'),
+			'7'=>array('B', 'A', 'B', 'A', 'B', 'A'),
+			'8'=>array('B', 'A', 'B', 'A', 'A', 'B'),
+			'9'=>array('B', 'A', 'A', 'B', 'A', 'B')
 		);
 		$upce_parities[1] = array(
-			'0'=>array('A','A','A','B','B','B'),
-			'1'=>array('A','A','B','A','B','B'),
-			'2'=>array('A','A','B','B','A','B'),
-			'3'=>array('A','A','B','B','B','A'),
-			'4'=>array('A','B','A','A','B','B'),
-			'5'=>array('A','B','B','A','A','B'),
-			'6'=>array('A','B','B','B','A','A'),
-			'7'=>array('A','B','A','B','A','B'),
-			'8'=>array('A','B','A','B','B','A'),
-			'9'=>array('A','B','B','A','B','A')
+			'0'=>array('A', 'A', 'A', 'B', 'B', 'B'),
+			'1'=>array('A', 'A', 'B', 'A', 'B', 'B'),
+			'2'=>array('A', 'A', 'B', 'B', 'A', 'B'),
+			'3'=>array('A', 'A', 'B', 'B', 'B', 'A'),
+			'4'=>array('A', 'B', 'A', 'A', 'B', 'B'),
+			'5'=>array('A', 'B', 'B', 'A', 'A', 'B'),
+			'6'=>array('A', 'B', 'B', 'B', 'A', 'A'),
+			'7'=>array('A', 'B', 'A', 'B', 'A', 'B'),
+			'8'=>array('A', 'B', 'A', 'B', 'B', 'A'),
+			'9'=>array('A', 'B', 'B', 'A', 'B', 'A')
 		);
 		$k = 0;
 		$seq = '101'; // left guard bar
@@ -1148,7 +1148,7 @@ 
 			} else {
 				$p = $parities[$code{0}];
 				for ($i = 1; $i < $half_len; ++$i) {
-					$seq .= $codes[$p[$i-1]][$code{$i}];
+					$seq .= $codes[$p[$i - 1]][$code{$i}];
 				}
 			}
 			$seq .= '01010'; // center guard bar
@@ -1161,7 +1161,7 @@ 
 		$w = 0;
 		for ($i = 0; $i < $clen; ++$i) {
 			$w += 1;
-			if (($i == ($clen - 1)) OR (($i < ($clen - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
+			if (($i == ($clen - 1)) OR (($i < ($clen - 1)) AND ($seq{$i} != $seq{($i + 1)}))) {
 				if ($seq{$i} == '1') {
 					$t = true; // bar
 				} else {
@@ -1185,14 +1185,14 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_eanext($code, $len=5) {
+	protected function barcode_eanext($code, $len = 5) {
 		//Padding
 		$code = str_pad($code, $len, '0', STR_PAD_LEFT);
 		// calculate check digit
 		if ($len == 2) {
 			$r = $code % 4;
 		} elseif ($len == 5) {
-			$r = (3 * ($code{0} + $code{2} + $code{4})) + (9 * ($code{1} + $code{3}));
+			$r = (3 * ($code{0} +$code{2} +$code{4})) + (9 * ($code{1} +$code{3}));
 			$r %= 10;
 		} else {
 			return false;
@@ -1224,22 +1224,22 @@ 
 		);
 		$parities = array();
 		$parities[2] = array(
-			'0'=>array('A','A'),
-			'1'=>array('A','B'),
-			'2'=>array('B','A'),
-			'3'=>array('B','B')
+			'0'=>array('A', 'A'),
+			'1'=>array('A', 'B'),
+			'2'=>array('B', 'A'),
+			'3'=>array('B', 'B')
 		);
 		$parities[5] = array(
-			'0'=>array('B','B','A','A','A'),
-			'1'=>array('B','A','B','A','A'),
-			'2'=>array('B','A','A','B','A'),
-			'3'=>array('B','A','A','A','B'),
-			'4'=>array('A','B','B','A','A'),
-			'5'=>array('A','A','B','B','A'),
-			'6'=>array('A','A','A','B','B'),
-			'7'=>array('A','B','A','B','A'),
-			'8'=>array('A','B','A','A','B'),
-			'9'=>array('A','A','B','A','B')
+			'0'=>array('B', 'B', 'A', 'A', 'A'),
+			'1'=>array('B', 'A', 'B', 'A', 'A'),
+			'2'=>array('B', 'A', 'A', 'B', 'A'),
+			'3'=>array('B', 'A', 'A', 'A', 'B'),
+			'4'=>array('A', 'B', 'B', 'A', 'A'),
+			'5'=>array('A', 'A', 'B', 'B', 'A'),
+			'6'=>array('A', 'A', 'A', 'B', 'B'),
+			'7'=>array('A', 'B', 'A', 'B', 'A'),
+			'8'=>array('A', 'B', 'A', 'A', 'B'),
+			'9'=>array('A', 'A', 'B', 'A', 'B')
 		);	
 		$p = $parities[$len][$r];
 		$seq = '1011'; // left guard bar
@@ -1260,33 +1260,33 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_postnet($code, $planet=false) {
+	protected function barcode_postnet($code, $planet = false) {
 		// bar lenght
 		if ($planet) {
 			$barlen = Array(
-				0 => Array(1,1,2,2,2),
-				1 => Array(2,2,2,1,1),
-				2 => Array(2,2,1,2,1),
-				3 => Array(2,2,1,1,2),
-				4 => Array(2,1,2,2,1),
-				5 => Array(2,1,2,1,2),
-				6 => Array(2,1,1,2,2),
-				7 => Array(1,2,2,2,1),
-				8 => Array(1,2,2,1,2),
-				9 => Array(1,2,1,2,2)
+				0 => Array(1, 1, 2, 2, 2),
+				1 => Array(2, 2, 2, 1, 1),
+				2 => Array(2, 2, 1, 2, 1),
+				3 => Array(2, 2, 1, 1, 2),
+				4 => Array(2, 1, 2, 2, 1),
+				5 => Array(2, 1, 2, 1, 2),
+				6 => Array(2, 1, 1, 2, 2),
+				7 => Array(1, 2, 2, 2, 1),
+				8 => Array(1, 2, 2, 1, 2),
+				9 => Array(1, 2, 1, 2, 2)
 			);
 		} else {
 			$barlen = Array(
-				0 => Array(2,2,1,1,1),
-				1 => Array(1,1,1,2,2),
-				2 => Array(1,1,2,1,2),
-				3 => Array(1,1,2,2,1),
-				4 => Array(1,2,1,1,2),
-				5 => Array(1,2,1,2,1),
-				6 => Array(1,2,2,1,1),
-				7 => Array(2,1,1,1,2),
-				8 => Array(2,1,1,2,1),
-				9 => Array(2,1,2,1,1)
+				0 => Array(2, 2, 1, 1, 1),
+				1 => Array(1, 1, 1, 2, 2),
+				2 => Array(1, 1, 2, 1, 2),
+				3 => Array(1, 1, 2, 2, 1),
+				4 => Array(1, 2, 1, 1, 2),
+				5 => Array(1, 2, 1, 2, 1),
+				6 => Array(1, 2, 2, 1, 1),
+				7 => Array(2, 1, 1, 1, 2),
+				8 => Array(2, 1, 1, 2, 1),
+				9 => Array(2, 1, 2, 1, 1)
 			);
 		}
 		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 2, 'bcode' => array());
@@ -1300,7 +1300,7 @@ 
 			$sum += intval($code{$i});
 		}
 		$chkd = ($sum % 10);
-		if($chkd > 0) {
+		if ($chkd > 0) {
 			$chkd = (10 - $chkd);
 		}
 		$code .= $chkd;
@@ -1333,7 +1333,7 @@ 
 	 * @return array barcode representation.
 	 * @access protected
 	 */
-	protected function barcode_rms4cc($code, $kix=false) {
+	protected function barcode_rms4cc($code, $kix = false) {
 		$notkix = !$kix;
 		// bar mode
 		// 1 = pos 1, length 2
@@ -1341,42 +1341,42 @@ 
 		// 3 = pos 2, length 1
 		// 4 = pos 2, length 2
 		$barmode = array(
-			'0' => array(3,3,2,2),
-			'1' => array(3,4,1,2),
-			'2' => array(3,4,2,1),
-			'3' => array(4,3,1,2),
-			'4' => array(4,3,2,1),
-			'5' => array(4,4,1,1),
-			'6' => array(3,1,4,2),
-			'7' => array(3,2,3,2),
-			'8' => array(3,2,4,1),
-			'9' => array(4,1,3,2),
-			'A' => array(4,1,4,1),
-			'B' => array(4,2,3,1),
-			'C' => array(3,1,2,4),
-			'D' => array(3,2,1,4),
-			'E' => array(3,2,2,3),
-			'F' => array(4,1,1,4),
-			'G' => array(4,1,2,3),
-			'H' => array(4,2,1,3),
-			'I' => array(1,3,4,2),
-			'J' => array(1,4,3,2),
-			'K' => array(1,4,4,1),
-			'L' => array(2,3,3,2),
-			'M' => array(2,3,4,1),
-			'N' => array(2,4,3,1),
-			'O' => array(1,3,2,4),
-			'P' => array(1,4,1,4),
-			'Q' => array(1,4,2,3),
-			'R' => array(2,3,1,4),
-			'S' => array(2,3,2,3),
-			'T' => array(2,4,1,3),
-			'U' => array(1,1,4,4),
-			'V' => array(1,2,3,4),
-			'W' => array(1,2,4,3),
-			'X' => array(2,1,3,4),
-			'Y' => array(2,1,4,3),
-			'Z' => array(2,2,3,3)		
+			'0' => array(3, 3, 2, 2),
+			'1' => array(3, 4, 1, 2),
+			'2' => array(3, 4, 2, 1),
+			'3' => array(4, 3, 1, 2),
+			'4' => array(4, 3, 2, 1),
+			'5' => array(4, 4, 1, 1),
+			'6' => array(3, 1, 4, 2),
+			'7' => array(3, 2, 3, 2),
+			'8' => array(3, 2, 4, 1),
+			'9' => array(4, 1, 3, 2),
+			'A' => array(4, 1, 4, 1),
+			'B' => array(4, 2, 3, 1),
+			'C' => array(3, 1, 2, 4),
+			'D' => array(3, 2, 1, 4),
+			'E' => array(3, 2, 2, 3),
+			'F' => array(4, 1, 1, 4),
+			'G' => array(4, 1, 2, 3),
+			'H' => array(4, 2, 1, 3),
+			'I' => array(1, 3, 4, 2),
+			'J' => array(1, 4, 3, 2),
+			'K' => array(1, 4, 4, 1),
+			'L' => array(2, 3, 3, 2),
+			'M' => array(2, 3, 4, 1),
+			'N' => array(2, 4, 3, 1),
+			'O' => array(1, 3, 2, 4),
+			'P' => array(1, 4, 1, 4),
+			'Q' => array(1, 4, 2, 3),
+			'R' => array(2, 3, 1, 4),
+			'S' => array(2, 3, 2, 3),
+			'T' => array(2, 4, 1, 3),
+			'U' => array(1, 1, 4, 4),
+			'V' => array(1, 2, 3, 4),
+			'W' => array(1, 2, 4, 3),
+			'X' => array(2, 1, 3, 4),
+			'Y' => array(2, 1, 4, 3),
+			'Z' => array(2, 2, 3, 3)		
 		);
 		$code = strtoupper($code);
 		$len = strlen($code);
@@ -1384,42 +1384,42 @@ 
 		if ($notkix) {
 			// table for checksum calculation (row,col)
 			$checktable = array(
-				'0' => array(1,1),
-				'1' => array(1,2),
-				'2' => array(1,3),
-				'3' => array(1,4),
-				'4' => array(1,5),
-				'5' => array(1,0),
-				'6' => array(2,1),
-				'7' => array(2,2),
-				'8' => array(2,3),
-				'9' => array(2,4),
-				'A' => array(2,5),
-				'B' => array(2,0),
-				'C' => array(3,1),
-				'D' => array(3,2),
-				'E' => array(3,3),
-				'F' => array(3,4),
-				'G' => array(3,5),
-				'H' => array(3,0),
-				'I' => array(4,1),
-				'J' => array(4,2),
-				'K' => array(4,3),
-				'L' => array(4,4),
-				'M' => array(4,5),
-				'N' => array(4,0),
-				'O' => array(5,1),
-				'P' => array(5,2),
-				'Q' => array(5,3),
-				'R' => array(5,4),
-				'S' => array(5,5),
-				'T' => array(5,0),
-				'U' => array(0,1),
-				'V' => array(0,2),
-				'W' => array(0,3),
-				'X' => array(0,4),
-				'Y' => array(0,5),
-				'Z' => array(0,0)
+				'0' => array(1, 1),
+				'1' => array(1, 2),
+				'2' => array(1, 3),
+				'3' => array(1, 4),
+				'4' => array(1, 5),
+				'5' => array(1, 0),
+				'6' => array(2, 1),
+				'7' => array(2, 2),
+				'8' => array(2, 3),
+				'9' => array(2, 4),
+				'A' => array(2, 5),
+				'B' => array(2, 0),
+				'C' => array(3, 1),
+				'D' => array(3, 2),
+				'E' => array(3, 3),
+				'F' => array(3, 4),
+				'G' => array(3, 5),
+				'H' => array(3, 0),
+				'I' => array(4, 1),
+				'J' => array(4, 2),
+				'K' => array(4, 3),
+				'L' => array(4, 4),
+				'M' => array(4, 5),
+				'N' => array(4, 0),
+				'O' => array(5, 1),
+				'P' => array(5, 2),
+				'Q' => array(5, 3),
+				'R' => array(5, 4),
+				'S' => array(5, 5),
+				'T' => array(5, 0),
+				'U' => array(0, 1),
+				'V' => array(0, 2),
+				'W' => array(0, 3),
+				'X' => array(0, 4),
+				'Y' => array(0, 5),
+				'Z' => array(0, 0)
 			);
 			$row = 0;
 			$col = 0;
@@ -1429,7 +1429,7 @@ 
 			}
 			$row %= 6;
 			$col %= 6;
-			$chk = array_keys($checktable, array($row,$col));
+			$chk = array_keys($checktable, array($row, $col));
 			$code .= $chk[0];
 			++$len;
 		}
@@ -1511,7 +1511,7 @@ 
 		$k = 0;
 		$w = 0;
 		$seq = '';
-		$code = 'A'.strtoupper($code).'A';
+		$code = 'A' . strtoupper($code) . 'A';
 		$len = strlen($code);
 		for ($i = 0; $i < $len; ++$i) {
 			if (!isset($chr[$code{$i}])) {
@@ -1603,7 +1603,7 @@ 
 			$code .= $check;
 			++$len;
 		}
-		$code = 'S'.$code.'S';
+		$code = 'S' . $code . 'S';
 		$len += 3;
 		for ($i = 0; $i < $len; ++$i) {
 			if (!isset($chr[$code{$i}])) {
@@ -1679,7 +1679,7 @@ 
 					break;
 				}
 			}
-		} while($code != 0);
+		} while ($code != 0);
 		$seq = strrev($seq);
 		$k = 0;
 		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 2, 'bcode' => array());
@@ -1722,10 +1722,10 @@ 
 	 * @access protected
 	 */
 	protected function barcode_imb($code) {
-		$asc_chr = array(4,0,2,6,3,5,1,9,8,7,1,2,0,6,4,8,2,9,5,3,0,1,3,7,4,6,8,9,2,0,5,1,9,4,3,8,6,7,1,2,4,3,9,5,7,8,3,0,2,1,4,0,9,1,7,0,2,4,6,3,7,1,9,5,8);
-		$dsc_chr = array(7,1,9,5,8,0,2,4,6,3,5,8,9,7,3,0,6,1,7,4,6,8,9,2,5,1,7,5,4,3,8,7,6,0,2,5,4,9,3,0,1,6,8,2,0,4,5,9,6,7,5,2,6,3,8,5,1,9,8,7,4,0,2,6,3);
-		$asc_pos = array(3,0,8,11,1,12,8,11,10,6,4,12,2,7,9,6,7,9,2,8,4,0,12,7,10,9,0,7,10,5,7,9,6,8,2,12,1,4,2,0,1,5,4,6,12,1,0,9,4,7,5,10,2,6,9,11,2,12,6,7,5,11,0,3,2);
-		$dsc_pos = array(2,10,12,5,9,1,5,4,3,9,11,5,10,1,6,3,4,1,10,0,2,11,8,6,1,12,3,8,6,4,4,11,0,6,1,9,11,5,3,7,3,10,7,11,8,2,10,3,5,8,0,3,12,11,8,4,5,1,3,0,7,12,9,8,10);
+		$asc_chr = array(4, 0, 2, 6, 3, 5, 1, 9, 8, 7, 1, 2, 0, 6, 4, 8, 2, 9, 5, 3, 0, 1, 3, 7, 4, 6, 8, 9, 2, 0, 5, 1, 9, 4, 3, 8, 6, 7, 1, 2, 4, 3, 9, 5, 7, 8, 3, 0, 2, 1, 4, 0, 9, 1, 7, 0, 2, 4, 6, 3, 7, 1, 9, 5, 8);
+		$dsc_chr = array(7, 1, 9, 5, 8, 0, 2, 4, 6, 3, 5, 8, 9, 7, 3, 0, 6, 1, 7, 4, 6, 8, 9, 2, 5, 1, 7, 5, 4, 3, 8, 7, 6, 0, 2, 5, 4, 9, 3, 0, 1, 6, 8, 2, 0, 4, 5, 9, 6, 7, 5, 2, 6, 3, 8, 5, 1, 9, 8, 7, 4, 0, 2, 6, 3);
+		$asc_pos = array(3, 0, 8, 11, 1, 12, 8, 11, 10, 6, 4, 12, 2, 7, 9, 6, 7, 9, 2, 8, 4, 0, 12, 7, 10, 9, 0, 7, 10, 5, 7, 9, 6, 8, 2, 12, 1, 4, 2, 0, 1, 5, 4, 6, 12, 1, 0, 9, 4, 7, 5, 10, 2, 6, 9, 11, 2, 12, 6, 7, 5, 11, 0, 3, 2);
+		$dsc_pos = array(2, 10, 12, 5, 9, 1, 5, 4, 3, 9, 11, 5, 10, 1, 6, 3, 4, 1, 10, 0, 2, 11, 8, 6, 1, 12, 3, 8, 6, 4, 4, 11, 0, 6, 1, 9, 11, 5, 3, 7, 3, 10, 7, 11, 8, 2, 10, 3, 5, 8, 0, 3, 12, 11, 8, 4, 5, 1, 3, 0, 7, 12, 9, 8, 10);
 		$code_arr = explode('-', $code);
 		$tracking_number = $code_arr[0];
 		if (isset($code_arr[1])) {
@@ -1773,7 +1773,7 @@ 
 		$fcs = $this->imb_crc11fcs($binary_code_arr);
 		// exclude first 2 bits from first byte
 		$first_byte = sprintf('%2s', dechex((hexdec($binary_code_arr[0]) << 2) >> 2));
-		$binary_code_102bit = $first_byte.substr($binary_code, 2);
+		$binary_code_102bit = $first_byte . substr($binary_code, 2);
 		// convert binary data to codewords
 		$codewords = array();
 		$data = $this->hex_to_dec($binary_code_102bit);
@@ -1793,7 +1793,7 @@ 
 		// convert codewords to characters
 		$characters = array();
 		$bitmask = 512;
-		foreach($codewords as $k => $val) {
+		foreach ($codewords as $k => $val) {
 			if ($val <= 1286) {
 				$chrcode = $table5of13[$val];
 			} else {
@@ -1848,11 +1848,11 @@ 
 	public function dec_to_hex($number) {
 		$i = 0;
 		$hex = array();
-		if($number == 0) {
+		if ($number == 0) {
 			return '00';
 		}
-		while($number > 0) {
-			if($number == 0) {
+		while ($number > 0) {
+			if ($number == 0) {
 				array_push($hex, '0');
 			} else {
 				array_push($hex, strtoupper(dechex(bcmod($number, '16'))));
@@ -1873,7 +1873,7 @@ 
 		$dec = 0;
 		$bitval = 1;
 		$len = strlen($hex);
-		for($pos = ($len - 1); $pos >= 0; --$pos) {
+		for ($pos = ($len - 1); $pos >= 0; --$pos) {
 			$dec = bcadd($dec, bcmul(hexdec($hex{$pos}), $bitval));
 			$bitval = bcmul($bitval, 16);
 		}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/librairies/HTML2PDF/_tcpdf_5.0.002/fonts/utils/makefont.php

Doc Comments +6 added lines

@@ -234,6 +234,8 @@ 
 
 /**
  * Read UFM file
+ * @param string $file
+ * @param string $cidtogidmap
  */
 function ReadUFM($file, &$cidtogidmap) {
 	//Prepare empty CIDToGIDMap
@@ -526,6 +528,10 @@ 
 	return rtrim($s);
 }
 
+/**
+ * @param string $file
+ * @param string $s
+ */
 function SaveToFile($file, $s, $mode='t') {
 	$f = fopen($file, 'w'.$mode);
 	if(!$f) {

Spacing +102 added lines, -102 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 //============================================================+
 // File name   : makefont.php
 // Begin       : 2004-12-31
@@ -55,15 +55,15 @@ 
  * @param string $enc Name of the encoding table to use. Omit this parameter for TrueType Unicode, OpenType Unicode and symbolic fonts like Symbol or ZapfDingBats.
  * @param array $patch Optional modification of the encoding
  */
-function MakeFont($fontfile, $fmfile, $embedded=true, $enc='cp1252', $patch=array()) {
+function MakeFont($fontfile, $fmfile, $embedded = true, $enc = 'cp1252', $patch = array()) {
 	//Generate a font definition file
 	set_magic_quotes_runtime(0);
 	ini_set('auto_detect_line_endings', '1');
 	if (!file_exists($fontfile)) {
-		die('Error: file not found: '.$fontfile);
+		die('Error: file not found: ' . $fontfile);
 	}
 	if (!file_exists($fmfile)) {
-		die('Error: file not found: '.$fmfile);
+		die('Error: file not found: ' . $fmfile);
 	}
 	$cidtogidmap = '';
 	$map = array();
@@ -77,7 +77,7 @@ 
 		} elseif ($ffext == 'pfb') {
 			$type = 'Type1';
 		} else {
-			die('Error: unrecognized font file extension: '.$ffext);
+			die('Error: unrecognized font file extension: ' . $ffext);
 		}
 		if ($enc) {
 			$map = ReadMap($enc);
@@ -98,25 +98,25 @@ 
 		if (($ffext == 'ttf') OR ($ffext == 'otf')) {
 			$type = 'TrueTypeUnicode';
 		} else {
-			die('Error: not a TrueType font: '.$ffext);
+			die('Error: not a TrueType font: ' . $ffext);
 		}
 		$fm = ReadUFM($fmfile, $cidtogidmap);
 		$dw = $fm['MissingWidth'];
 		$fd = MakeFontDescriptor($fm, false);
 	}
 	//Start generation
-	$s = '<?php'."\n";
-	$s .= '$type=\''.$type."';\n";
-	$s .= '$name=\''.$fm['FontName']."';\n";
-	$s .= '$desc='.$fd.";\n";
+	$s = '<?php' . "\n";
+	$s .= '$type=\'' . $type . "';\n";
+	$s .= '$name=\'' . $fm['FontName'] . "';\n";
+	$s .= '$desc=' . $fd . ";\n";
 	if (!isset($fm['UnderlinePosition'])) {
 		$fm['UnderlinePosition'] = -100;
 	}
 	if (!isset($fm['UnderlineThickness'])) {
 		$fm['UnderlineThickness'] = 50;
 	}
-	$s .= '$up='.$fm['UnderlinePosition'].";\n";
-	$s .= '$ut='.$fm['UnderlineThickness'].";\n";
+	$s .= '$up=' . $fm['UnderlinePosition'] . ";\n";
+	$s .= '$ut=' . $fm['UnderlineThickness'] . ";\n";
 	if ($dw <= 0) {
 		if (isset($fm['Widths'][32]) AND ($fm['Widths'][32] > 0)) {
 			// assign default space width
@@ -125,20 +125,20 @@ 
 			$dw = 600;
 		}
 	}
-	$s .= '$dw='.$dw.";\n";
+	$s .= '$dw=' . $dw . ";\n";
 	$w = MakeWidthArray($fm);
-	$s .= '$cw='.$w.";\n";
-	$s .= '$enc=\''.$enc."';\n";
-	$s .= '$diff=\''.$diff."';\n";
+	$s .= '$cw=' . $w . ";\n";
+	$s .= '$enc=\'' . $enc . "';\n";
+	$s .= '$diff=\'' . $diff . "';\n";
 	$basename = substr(basename($fmfile), 0, -4);
 	if ($embedded) {
 		//Embedded font
 		if (($type == 'TrueType') OR ($type == 'TrueTypeUnicode')) {
 			CheckTTF($fontfile);
 		}
-		$f = fopen($fontfile,'rb');
+		$f = fopen($fontfile, 'rb');
 		if (!$f) {
-			die('Error: Unable to open '.$fontfile);
+			die('Error: Unable to open ' . $fontfile);
 		}
 		$file = fread($f, filesize($fontfile));
 		fclose($f);
@@ -156,7 +156,7 @@ 
 			$size1 = $pos + 6;
 			if ($header AND (ord($file{$size1}) == 128)) {
 				//Strip second binary header
-				$file = substr($file, 0, $size1).substr($file, $size1+6);
+				$file = substr($file, 0, $size1) . substr($file, $size1 + 6);
 			}
 			$pos = strpos($file, '00000000');
 			if (!$pos) {
@@ -167,41 +167,41 @@ 
 		}
 		$basename = strtolower($basename);
 		if (function_exists('gzcompress')) {
-			$cmp = $basename.'.z';
+			$cmp = $basename . '.z';
 			SaveToFile($cmp, gzcompress($file, 9), 'b');
-			$s .= '$file=\''.$cmp."';\n";
-			print "Font file compressed (".$cmp.")\n";
+			$s .= '$file=\'' . $cmp . "';\n";
+			print "Font file compressed (" . $cmp . ")\n";
 			if (!empty($cidtogidmap)) {
-				$cmp = $basename.'.ctg.z';
+				$cmp = $basename . '.ctg.z';
 				SaveToFile($cmp, gzcompress($cidtogidmap, 9), 'b');
-				print "CIDToGIDMap created and compressed (".$cmp.")\n";
-				$s .= '$ctg=\''.$cmp."';\n";
+				print "CIDToGIDMap created and compressed (" . $cmp . ")\n";
+				$s .= '$ctg=\'' . $cmp . "';\n";
 			}
 		} else {
-			$s .= '$file=\''.basename($fontfile)."';\n";
+			$s .= '$file=\'' . basename($fontfile) . "';\n";
 			print "Notice: font file could not be compressed (zlib extension not available)\n";
 			if (!empty($cidtogidmap)) {
-				$cmp = $basename.'.ctg';
+				$cmp = $basename . '.ctg';
 				$f = fopen($cmp, 'wb');
 				fwrite($f, $cidtogidmap);
 				fclose($f);
-				print "CIDToGIDMap created (".$cmp.")\n";
-				$s .= '$ctg=\''.$cmp."';\n";
+				print "CIDToGIDMap created (" . $cmp . ")\n";
+				$s .= '$ctg=\'' . $cmp . "';\n";
 			}
 		}
-		if($type == 'Type1') {
-			$s .= '$size1='.$size1.";\n";
-			$s .= '$size2='.$size2.";\n";
+		if ($type == 'Type1') {
+			$s .= '$size1=' . $size1 . ";\n";
+			$s .= '$size2=' . $size2 . ";\n";
 		} else {
-			$s.='$originalsize='.filesize($fontfile).";\n";
+			$s .= '$originalsize=' . filesize($fontfile) . ";\n";
 		}
 	} else {
 		//Not embedded font
-		$s .= '$file='."'';\n";
+		$s .= '$file=' . "'';\n";
 	}
 	$s .= "?>";
-	SaveToFile($basename.'.php',$s);
-	print "Font definition file generated (".$basename.".php)\n";
+	SaveToFile($basename . '.php', $s);
+	print "Font definition file generated (" . $basename . ".php)\n";
 }
 
 /**
@@ -210,22 +210,22 @@ 
  */
 function ReadMap($enc) {
 	//Read a map file
-	$file = dirname(__FILE__).'/enc/'.strtolower($enc).'.map';
+	$file = dirname(__FILE__) . '/enc/' . strtolower($enc) . '.map';
 	$a = file($file);
 	if (empty($a)) {
-		die('Error: encoding not found: '.$enc);
+		die('Error: encoding not found: ' . $enc);
 	}
 	$cc2gn = array();
 	foreach ($a as $l) {
 		if ($l{0} == '!') {
-			$e = preg_split('/[ \\t]+/',rtrim($l));
-			$cc = hexdec(substr($e[0],1));
+			$e = preg_split('/[ \\t]+/', rtrim($l));
+			$cc = hexdec(substr($e[0], 1));
 			$gn = $e[2];
 			$cc2gn[$cc] = $gn;
 		}
 	}
-	for($i = 0; $i <= 255; $i++) {
-		if(!isset($cc2gn[$i])) {
+	for ($i = 0; $i <= 255; $i++) {
+		if (!isset($cc2gn[$i])) {
 			$cc2gn[$i] = '.notdef';
 		}
 	}
@@ -245,14 +245,14 @@ 
 	}
 	$widths = array();
 	$fm = array();
-	foreach($a as $l) {
-		$e = explode(' ',chop($l));
-		if(count($e) < 2) {
+	foreach ($a as $l) {
+		$e = explode(' ', chop($l));
+		if (count($e) < 2) {
 			continue;
 		}
 		$code = $e[0];
 		$param = $e[1];
-		if($code == 'U') {
+		if ($code == 'U') {
 			// U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
 			//Character metrics
 			$cc = (int)$e[1];
@@ -261,7 +261,7 @@ 
 			$w = $e[4];
 			$glyph = $e[10];
 			$widths[$cc] = $w;
-			if($cc == ord('X')) {
+			if ($cc == ord('X')) {
 				$fm['CapXHeight'] = $e[13];
 			}
 			// Set GID
@@ -270,37 +270,37 @@ 
 				$cidtogidmap{(($cc * 2) + 1)} = chr($glyph & 0xFF);
 			}
 		}
-		if((isset($gn) AND ($gn == '.notdef')) AND (!isset($fm['MissingWidth']))) {
+		if ((isset($gn) AND ($gn == '.notdef')) AND (!isset($fm['MissingWidth']))) {
 			$fm['MissingWidth'] = $w;
 		}
-		} elseif($code == 'FontName') {
+		} elseif ($code == 'FontName') {
 			$fm['FontName'] = $param;
-		} elseif($code == 'Weight') {
+		} elseif ($code == 'Weight') {
 			$fm['Weight'] = $param;
-		} elseif($code == 'ItalicAngle') {
+		} elseif ($code == 'ItalicAngle') {
 			$fm['ItalicAngle'] = (double)$param;
-		} elseif($code == 'Ascender') {
+		} elseif ($code == 'Ascender') {
 			$fm['Ascender'] = (int)$param;
-		} elseif($code == 'Descender') {
+		} elseif ($code == 'Descender') {
 			$fm['Descender'] = (int)$param;
-		} elseif($code == 'UnderlineThickness') {
+		} elseif ($code == 'UnderlineThickness') {
 			$fm['UnderlineThickness'] = (int)$param;
-		} elseif($code == 'UnderlinePosition') {
+		} elseif ($code == 'UnderlinePosition') {
 			$fm['UnderlinePosition'] = (int)$param;
-		} elseif($code == 'IsFixedPitch') {
+		} elseif ($code == 'IsFixedPitch') {
 			$fm['IsFixedPitch'] = ($param == 'true');
-		} elseif($code == 'FontBBox') {
+		} elseif ($code == 'FontBBox') {
 			$fm['FontBBox'] = array($e[1], $e[2], $e[3], $e[4]);
-		} elseif($code == 'CapHeight') {
+		} elseif ($code == 'CapHeight') {
 			$fm['CapHeight'] = (int)$param;
-		} elseif($code == 'StdVW') {
+		} elseif ($code == 'StdVW') {
 			$fm['StdVW'] = (int)$param;
 		}
 	}
-	if(!isset($fm['MissingWidth'])) {
+	if (!isset($fm['MissingWidth'])) {
 		$fm['MissingWidth'] = 600;
 	}
-	if(!isset($fm['FontName'])) {
+	if (!isset($fm['FontName'])) {
 		die('FontName not found');
 	}
 	$fm['Widths'] = $widths;
@@ -310,10 +310,10 @@ 
 /**
  * Read AFM file
  */
-function ReadAFM($file,&$map) {
+function ReadAFM($file, &$map) {
 	//Read a font metric file
 	$a = file($file);
-	if(empty($a)) {
+	if (empty($a)) {
 		die('File not found');
 	}
 	$widths = array();
@@ -353,7 +353,7 @@ 
 		'combiningdotbelow'=>'dotbelowcomb',
 		'dongsign'=>'dong'
 		);
-	foreach($a as $l) {
+	foreach ($a as $l) {
 		$e = explode(' ', rtrim($l));
 		if (count($e) < 2) {
 			continue;
@@ -381,34 +381,34 @@ 
 				$widths[$cc] = $w;
 			} else {
 				$widths[$gn] = $w;
-				if($gn == 'X') {
+				if ($gn == 'X') {
 					$fm['CapXHeight'] = $e[13];
 				}
 			}
-			if($gn == '.notdef') {
+			if ($gn == '.notdef') {
 				$fm['MissingWidth'] = $w;
 			}
-		} elseif($code == 'FontName') {
+		} elseif ($code == 'FontName') {
 			$fm['FontName'] = $param;
-		} elseif($code == 'Weight') {
+		} elseif ($code == 'Weight') {
 			$fm['Weight'] = $param;
-		} elseif($code == 'ItalicAngle') {
+		} elseif ($code == 'ItalicAngle') {
 			$fm['ItalicAngle'] = (double)$param;
-		} elseif($code == 'Ascender') {
+		} elseif ($code == 'Ascender') {
 			$fm['Ascender'] = (int)$param;
-		} elseif($code == 'Descender') {
+		} elseif ($code == 'Descender') {
 			$fm['Descender'] = (int)$param;
-		} elseif($code == 'UnderlineThickness') {
+		} elseif ($code == 'UnderlineThickness') {
 			$fm['UnderlineThickness'] = (int)$param;
-		} elseif($code == 'UnderlinePosition') {
+		} elseif ($code == 'UnderlinePosition') {
 			$fm['UnderlinePosition'] = (int)$param;
-		} elseif($code == 'IsFixedPitch') {
+		} elseif ($code == 'IsFixedPitch') {
 			$fm['IsFixedPitch'] = ($param == 'true');
-		} elseif($code == 'FontBBox') {
+		} elseif ($code == 'FontBBox') {
 			$fm['FontBBox'] = array($e[1], $e[2], $e[3], $e[4]);
-		} elseif($code == 'CapHeight') {
+		} elseif ($code == 'CapHeight') {
 			$fm['CapHeight'] = (int)$param;
-		} elseif($code == 'StdVW') {
+		} elseif ($code == 'StdVW') {
 			$fm['StdVW'] = (int)$param;
 		}
 	}
@@ -425,7 +425,7 @@ 
 		//Order widths according to map
 		for ($i = 0; $i <= 255; $i++) {
 			if (!isset($widths[$map[$i]])) {
-				print "Warning: character ".$map[$i]." is missing\n";
+				print "Warning: character " . $map[$i] . " is missing\n";
 				$widths[$i] = $widths['.notdef'];
 			} else {
 				$widths[$i] = $widths[$map[$i]];
@@ -436,13 +436,13 @@ 
 	return $fm;
 }
 
-function MakeFontDescriptor($fm, $symbolic=false) {
+function MakeFontDescriptor($fm, $symbolic = false) {
 	//Ascent
 	$asc = (isset($fm['Ascender']) ? $fm['Ascender'] : 1000);
-	$fd = "array('Ascent'=>".$asc;
+	$fd = "array('Ascent'=>" . $asc;
 	//Descent
 	$desc = (isset($fm['Descender']) ? $fm['Descender'] : -200);
-	$fd .= ",'Descent'=>".$desc;
+	$fd .= ",'Descent'=>" . $desc;
 	//CapHeight
 	if (isset($fm['CapHeight'])) {
 		$ch = $fm['CapHeight'];
@@ -451,31 +451,31 @@ 
 	} else {
 		$ch = $asc;
 	}
-	$fd .= ",'CapHeight'=>".$ch;
+	$fd .= ",'CapHeight'=>" . $ch;
 	//Flags
 	$flags = 0;
 	if (isset($fm['IsFixedPitch']) AND $fm['IsFixedPitch']) {
-		$flags += 1<<0;
+		$flags += 1 << 0;
 	}
 	if ($symbolic) {
-		$flags += 1<<2;
+		$flags += 1 << 2;
 	} else {
-		$flags += 1<<5;
+		$flags += 1 << 5;
 	}
 	if (isset($fm['ItalicAngle']) AND ($fm['ItalicAngle'] != 0)) {
-		$flags += 1<<6;
+		$flags += 1 << 6;
 	}
-	$fd .= ",'Flags'=>".$flags;
+	$fd .= ",'Flags'=>" . $flags;
 	//FontBBox
 	if (isset($fm['FontBBox'])) {
 		$fbb = $fm['FontBBox'];
 	} else {
 		$fbb = array(0, ($desc - 100), 1000, ($asc + 100));
 	}
-	$fd .= ",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
+	$fd .= ",'FontBBox'=>'[" . $fbb[0] . ' ' . $fbb[1] . ' ' . $fbb[2] . ' ' . $fbb[3] . "]'";
 	//ItalicAngle
 	$ia = (isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
-	$fd .= ",'ItalicAngle'=>".$ia;
+	$fd .= ",'ItalicAngle'=>" . $ia;
 	//StemV
 	if (isset($fm['StdVW'])) {
 		$stemv = $fm['StdVW'];
@@ -484,10 +484,10 @@ 
 	} else {
 		$stemv = 70;
 	}
-	$fd .= ",'StemV'=>".$stemv;
+	$fd .= ",'StemV'=>" . $stemv;
 	//MissingWidth
-	if(isset($fm['MissingWidth'])) {
-		$fd .= ",'MissingWidth'=>".$fm['MissingWidth'];
+	if (isset($fm['MissingWidth'])) {
+		$fd .= ",'MissingWidth'=>" . $fm['MissingWidth'];
 	}
 	$fd .= ')';
 	return $fd;
@@ -501,7 +501,7 @@ 
 	$c = 0;
 	foreach ($cw as $i => $w) {
 		if (is_numeric($i)) {
-			$els[] = (((($c++)%10) == 0) ? "\n" : '').$i.'=>'.$w;
+			$els[] = (((($c++) % 10) == 0) ? "\n" : '') . $i . '=>' . $w;
 		}
 	}
 	$s .= implode(',', $els);
@@ -516,20 +516,20 @@ 
 	$last = 0;
 	for ($i = 32; $i <= 255; $i++) {
 		if ($map[$i] != $ref[$i]) {
-			if ($i != $last+1) {
-				$s .= $i.' ';
+			if ($i != $last + 1) {
+				$s .= $i . ' ';
 			}
 			$last = $i;
-			$s .= '/'.$map[$i].' ';
+			$s .= '/' . $map[$i] . ' ';
 		}
 	}
 	return rtrim($s);
 }
 
-function SaveToFile($file, $s, $mode='t') {
-	$f = fopen($file, 'w'.$mode);
-	if(!$f) {
-		die('Can\'t write to file '.$file);
+function SaveToFile($file, $s, $mode = 't') {
+	$f = fopen($file, 'w' . $mode);
+	if (!$f) {
+		die('Can\'t write to file ' . $file);
 	}
 	fwrite($f, $s, strlen($s));
 	fclose($f);
@@ -549,7 +549,7 @@ 
 	//Check if font license allows embedding
 	$f = fopen($file, 'rb');
 	if (!$f) {
-		die('Error: unable to open '.$file);
+		die('Error: unable to open ' . $file);
 	}
 	//Extract number of tables
 	fseek($f, 4, SEEK_CUR);
@@ -578,7 +578,7 @@ 
 	$pp = ($fsType & 0x04) != 0;
 	$e = ($fsType & 0x08) != 0;
 	fclose($f);
-	if($rl AND (!$pp) AND (!$e)) {
+	if ($rl AND (!$pp) AND (!$e)) {
 		print "Warning: font license does not allow embedding\n";
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/librairies/HTML2PDF/_tcpdf_5.0.002/qrcode.php

Doc Comments +12 added lines, -14 removed lines

@@ -268,7 +268,7 @@ 
     	 * Convert a string to an array (needed for PHP4 compatibility)
     	 * @param string $string The input string.
     	 * @param int $split_length Maximum length of the chunk.
-    	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
+    	 * @return  string[] the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
     	 */
 		function str_split($string, $split_length=1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
@@ -803,7 +803,7 @@ 
 		/**
 		 * Get frame value at specified position
 		 * @param array $at x,y position
-		 * @return value at specified position
+		 * @return integer at specified position
 		 */
 		protected function getFrameAt($at) {
 			return ord($this->frame[$at['y']][$at['x']]);
@@ -946,8 +946,8 @@ 
 		/**
 		 * Write Format Information on frame and returns the number of black bits
 		 * @param int $width frame width
-		 * @param array $frame frame
-		 * @param array $mask masking mode
+		 * @param integer $frame frame
+		 * @param integer $mask masking mode
 		 * @param int $level error correction level
 		 * @return int blacks
 		 */
@@ -1071,7 +1071,7 @@ 
 		 * Return bitmask
 		 * @param int $maskNo mask number
 		 * @param int $width width
-		 * @param array $frame frame
+		 * @param integer $frame frame
 		 * @return array bitmask
 		 */
 		protected function generateMaskNo($maskNo, $width, $frame) {
@@ -1703,7 +1703,7 @@ 
 		 * @param array items input items
 		 * @param int $mode encoding mode.
 		 * @param int $size size of data (byte).
-		 * @param array $data array of input data.
+		 * @param string[] $data array of input data.
 		 * @return items
 		 *
 		 */
@@ -1792,7 +1792,7 @@ 
 		/**
 		 * Look up the alphabet-numeric convesion table (see JIS X0510:2004, pp.19).
 		 * @param int $c character value
-		 * @return value
+		 * @return integer
 		 */
 		protected function lookAnTable($c) {
 			return (($c > 127)?-1:$this->anTable[$c]);
@@ -2094,7 +2094,7 @@ 
 
 		/**
 		 * mergeBitStream
-		 * @param array $bstream
+		 * @param integer $items
 		 * @return array bitstream
 		 */
 		 protected function mergeBitStream($items) {
@@ -2231,7 +2231,7 @@ 
 
 		/**
 		 * Convert bitstream to bytes
-		 * @param array $bitstream original bitstream
+		 * @param array $bstream original bitstream
 		 * @return array of bytes
 		 */
 		 protected function bitstreamToByte($bstream) {
@@ -2384,7 +2384,7 @@ 
 		 * Return an array of ECC specification.
 		 * @param int $version version
 		 * @param int $level error correction level
-		 * @param array $spec an array of ECC specification contains as following: {# of type1 blocks, # of data code, # of ecc code, # of type2 blocks, # of data code}
+		 * @param integer[] $spec an array of ECC specification contains as following: {# of type1 blocks, # of data code, # of ecc code, # of type2 blocks, # of data code}
 		 * @return array spec
 		 */
 		protected function getEccSpec($version, $level, $spec) {
@@ -2414,7 +2414,6 @@ 
 		/**
 		 * Put an alignment marker.
 		 * @param array $frame frame
-		 * @param int $width width
 		 * @param int $ox X center coordinate of the pattern
 		 * @param int $oy Y center coordinate of the pattern
 		 * @return array frame
@@ -2438,7 +2437,7 @@ 
 		/**
 		 * Put an alignment pattern.
 		 * @param int $version version
-		 * @param array $fram frame
+		 * @param array $frame frame
 		 * @param int $width width
 		 * @return array frame
 		 */
@@ -2508,7 +2507,6 @@ 
 		/**
 		 * Put a finder pattern.
 		 * @param array $frame frame
-		 * @param int $width width
 		 * @param int $ox X center coordinate of the pattern
 		 * @param int $oy Y center coordinate of the pattern
 		 * @return array frame
@@ -2678,7 +2676,7 @@ 
 		/**
 		 * Return data length
 		 * @param array $spec
-		 * @return int value
+		 * @return double value
 		 */
 		 protected function rsDataLength($spec) {
 			return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);

Indentation +24 added lines, -24 removed lines

@@ -173,29 +173,29 @@ 
 	/**
 	 * Maximum matrix size for maximum version (version 40 is 177*177 matrix).
 	 */
-    define('QRSPEC_WIDTH_MAX', 177);
+	define('QRSPEC_WIDTH_MAX', 177);
 
 	// -----------------------------------------------------
 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-    define('QRCAP_WIDTH',    0);
+	define('QRCAP_WIDTH',    0);
 
-    /**
+	/**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-    define('QRCAP_WORDS',    1);
+	define('QRCAP_WORDS',    1);
 
-    /**
+	/**
 	 * Matrix index to get remainder from $capacity array.
 	 */
-    define('QRCAP_REMINDER', 2);
+	define('QRCAP_REMINDER', 2);
 
-    /**
+	/**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-    define('QRCAP_EC',       3);
+	define('QRCAP_EC',       3);
 
 	// -----------------------------------------------------
 
@@ -204,33 +204,33 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-    define('STRUCTURE_HEADER_BITS',  20);
+	define('STRUCTURE_HEADER_BITS',  20);
 
-    /**
+	/**
 	 * Max number of symbols for structured mode
 	 */
-    define('MAX_STRUCTURED_SYMBOLS', 16);
+	define('MAX_STRUCTURED_SYMBOLS', 16);
 
 	// -----------------------------------------------------
 
-    // Masks
+	// Masks
 
-    /**
+	/**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-    define('N1',  3);
+	define('N1',  3);
 
-    /**
+	/**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
 	define('N2',  3);
 
-    /**
+	/**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
 	 */
 	define('N3', 40);
 
-    /**
+	/**
 	 * Down point base value for case 4 mask pattern (ration of dark modules in whole)
 	 */
 	define('N4', 10);
@@ -264,12 +264,12 @@ 
 
 	// for compaibility with PHP4
 	if (!function_exists('str_split')) {
-    	/**
-    	 * Convert a string to an array (needed for PHP4 compatibility)
-    	 * @param string $string The input string.
-    	 * @param int $split_length Maximum length of the chunk.
-    	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
-    	 */
+		/**
+		 * Convert a string to an array (needed for PHP4 compatibility)
+		 * @param string $string The input string.
+		 * @param int $split_length Maximum length of the chunk.
+		 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
+		 */
 		function str_split($string, $split_length=1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
 				do {
@@ -2622,7 +2622,7 @@ 
 		}
 
 		/**
-		* Return block number 1
+		 * Return block number 1
 		 * @param array $spec
 		 * @return int value
 		 */

Spacing +236 added lines, -236 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 //============================================================+
 // File name   : qrcode.php
 // Begin       : 2010-03-22
@@ -180,12 +180,12 @@ 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-    define('QRCAP_WIDTH',    0);
+    define('QRCAP_WIDTH', 0);
 
     /**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-    define('QRCAP_WORDS',    1);
+    define('QRCAP_WORDS', 1);
 
     /**
 	 * Matrix index to get remainder from $capacity array.
@@ -195,7 +195,7 @@ 
     /**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-    define('QRCAP_EC',       3);
+    define('QRCAP_EC', 3);
 
 	// -----------------------------------------------------
 
@@ -204,7 +204,7 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-    define('STRUCTURE_HEADER_BITS',  20);
+    define('STRUCTURE_HEADER_BITS', 20);
 
     /**
 	 * Max number of symbols for structured mode
@@ -218,12 +218,12 @@ 
     /**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-    define('N1',  3);
+    define('N1', 3);
 
     /**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
-	define('N2',  3);
+	define('N2', 3);
 
     /**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
@@ -270,7 +270,7 @@ 
     	 * @param int $split_length Maximum length of the chunk.
     	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
     	 */
-		function str_split($string, $split_length=1) {
+		function str_split($string, $split_length = 1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
 				do {
 					$c = strlen($string);
@@ -481,7 +481,7 @@ 
 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
 			36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, //
-			 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1, //
+			 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, //
 			-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //
 			25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, //
 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
@@ -494,47 +494,47 @@ 
 		 * @access protected
 		 */
 		protected $capacity = array(
-			array(  0,    0, 0, array(   0,    0,    0,    0)), //
-			array( 21,   26, 0, array(   7,   10,   13,   17)), //  1
-			array( 25,   44, 7, array(  10,   16,   22,   28)), //
-			array( 29,   70, 7, array(  15,   26,   36,   44)), //
-			array( 33,  100, 7, array(  20,   36,   52,   64)), //
-			array( 37,  134, 7, array(  26,   48,   72,   88)), //  5
-			array( 41,  172, 7, array(  36,   64,   96,  112)), //
-			array( 45,  196, 0, array(  40,   72,  108,  130)), //
-			array( 49,  242, 0, array(  48,   88,  132,  156)), //
-			array( 53,  292, 0, array(  60,  110,  160,  192)), //
-			array( 57,  346, 0, array(  72,  130,  192,  224)), // 10
-			array( 61,  404, 0, array(  80,  150,  224,  264)), //
-			array( 65,  466, 0, array(  96,  176,  260,  308)), //
-			array( 69,  532, 0, array( 104,  198,  288,  352)), //
-			array( 73,  581, 3, array( 120,  216,  320,  384)), //
-			array( 77,  655, 3, array( 132,  240,  360,  432)), // 15
-			array( 81,  733, 3, array( 144,  280,  408,  480)), //
-			array( 85,  815, 3, array( 168,  308,  448,  532)), //
-			array( 89,  901, 3, array( 180,  338,  504,  588)), //
-			array( 93,  991, 3, array( 196,  364,  546,  650)), //
-			array( 97, 1085, 3, array( 224,  416,  600,  700)), // 20
-			array(101, 1156, 4, array( 224,  442,  644,  750)), //
-			array(105, 1258, 4, array( 252,  476,  690,  816)), //
-			array(109, 1364, 4, array( 270,  504,  750,  900)), //
-			array(113, 1474, 4, array( 300,  560,  810,  960)), //
-			array(117, 1588, 4, array( 312,  588,  870, 1050)), // 25
-			array(121, 1706, 4, array( 336,  644,  952, 1110)), //
-			array(125, 1828, 4, array( 360,  700, 1020, 1200)), //
-			array(129, 1921, 3, array( 390,  728, 1050, 1260)), //
-			array(133, 2051, 3, array( 420,  784, 1140, 1350)), //
-			array(137, 2185, 3, array( 450,  812, 1200, 1440)), // 30
-			array(141, 2323, 3, array( 480,  868, 1290, 1530)), //
-			array(145, 2465, 3, array( 510,  924, 1350, 1620)), //
-			array(149, 2611, 3, array( 540,  980, 1440, 1710)), //
-			array(153, 2761, 3, array( 570, 1036, 1530, 1800)), //
-			array(157, 2876, 0, array( 570, 1064, 1590, 1890)), // 35
-			array(161, 3034, 0, array( 600, 1120, 1680, 1980)), //
-			array(165, 3196, 0, array( 630, 1204, 1770, 2100)), //
-			array(169, 3362, 0, array( 660, 1260, 1860, 2220)), //
-			array(173, 3532, 0, array( 720, 1316, 1950, 2310)), //
-			array(177, 3706, 0, array( 750, 1372, 2040, 2430))  // 40
+			array(0, 0, 0, array(0, 0, 0, 0)), //
+			array(21, 26, 0, array(7, 10, 13, 17)), //  1
+			array(25, 44, 7, array(10, 16, 22, 28)), //
+			array(29, 70, 7, array(15, 26, 36, 44)), //
+			array(33, 100, 7, array(20, 36, 52, 64)), //
+			array(37, 134, 7, array(26, 48, 72, 88)), //  5
+			array(41, 172, 7, array(36, 64, 96, 112)), //
+			array(45, 196, 0, array(40, 72, 108, 130)), //
+			array(49, 242, 0, array(48, 88, 132, 156)), //
+			array(53, 292, 0, array(60, 110, 160, 192)), //
+			array(57, 346, 0, array(72, 130, 192, 224)), // 10
+			array(61, 404, 0, array(80, 150, 224, 264)), //
+			array(65, 466, 0, array(96, 176, 260, 308)), //
+			array(69, 532, 0, array(104, 198, 288, 352)), //
+			array(73, 581, 3, array(120, 216, 320, 384)), //
+			array(77, 655, 3, array(132, 240, 360, 432)), // 15
+			array(81, 733, 3, array(144, 280, 408, 480)), //
+			array(85, 815, 3, array(168, 308, 448, 532)), //
+			array(89, 901, 3, array(180, 338, 504, 588)), //
+			array(93, 991, 3, array(196, 364, 546, 650)), //
+			array(97, 1085, 3, array(224, 416, 600, 700)), // 20
+			array(101, 1156, 4, array(224, 442, 644, 750)), //
+			array(105, 1258, 4, array(252, 476, 690, 816)), //
+			array(109, 1364, 4, array(270, 504, 750, 900)), //
+			array(113, 1474, 4, array(300, 560, 810, 960)), //
+			array(117, 1588, 4, array(312, 588, 870, 1050)), // 25
+			array(121, 1706, 4, array(336, 644, 952, 1110)), //
+			array(125, 1828, 4, array(360, 700, 1020, 1200)), //
+			array(129, 1921, 3, array(390, 728, 1050, 1260)), //
+			array(133, 2051, 3, array(420, 784, 1140, 1350)), //
+			array(137, 2185, 3, array(450, 812, 1200, 1440)), // 30
+			array(141, 2323, 3, array(480, 868, 1290, 1530)), //
+			array(145, 2465, 3, array(510, 924, 1350, 1620)), //
+			array(149, 2611, 3, array(540, 980, 1440, 1710)), //
+			array(153, 2761, 3, array(570, 1036, 1530, 1800)), //
+			array(157, 2876, 0, array(570, 1064, 1590, 1890)), // 35
+			array(161, 3034, 0, array(600, 1120, 1680, 1980)), //
+			array(165, 3196, 0, array(630, 1204, 1770, 2100)), //
+			array(169, 3362, 0, array(660, 1260, 1860, 2220)), //
+			array(173, 3532, 0, array(720, 1316, 1950, 2310)), //
+			array(177, 3706, 0, array(750, 1372, 2040, 2430))  // 40
 		);
 
 		/**
@@ -543,9 +543,9 @@ 
 		 */
 		protected $lengthTableBits = array(
 			array(10, 12, 14),
-			array( 9, 11, 13),
-			array( 8, 16, 16),
-			array( 8, 10, 12)
+			array(9, 11, 13),
+			array(8, 16, 16),
+			array(8, 10, 12)
 		);
 
 		/**
@@ -554,47 +554,47 @@ 
 		 * @access protected
 		 */
 		protected $eccTable = array(
-			array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)), //
-			array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //  1
-			array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //
-			array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)), //
-			array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)), //
-			array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), //  5
-			array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)), //
-			array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)), //
-			array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)), //
-			array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)), //
-			array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), // 10
-			array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)), //
-			array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)), //
-			array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)), //
-			array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)), //
-			array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), // 15
-			array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)), //
-			array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)), //
-			array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)), //
-			array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)), //
-			array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), // 20
-			array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)), //
-			array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)), //
-			array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)), //
-			array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)), //
-			array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), // 25
-			array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)), //
-			array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)), //
-			array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)), //
-			array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)), //
-			array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
-			array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)), //
-			array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)), //
-			array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)), //
-			array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)), //
-			array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), // 35
-			array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)), //
-			array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)), //
-			array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)), //
-			array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)), //
-			array(array(19,  6), array(18, 31), array(34, 34), array(20, 61))  // 40
+			array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)), //
+			array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), //  1
+			array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), //
+			array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)), //
+			array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)), //
+			array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), //  5
+			array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)), //
+			array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)), //
+			array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)), //
+			array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)), //
+			array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), // 10
+			array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)), //
+			array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)), //
+			array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)), //
+			array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)), //
+			array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), // 15
+			array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)), //
+			array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)), //
+			array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)), //
+			array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)), //
+			array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), // 20
+			array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)), //
+			array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)), //
+			array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)), //
+			array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)), //
+			array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), // 25
+			array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)), //
+			array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)), //
+			array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)), //
+			array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)), //
+			array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
+			array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)), //
+			array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)), //
+			array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)), //
+			array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)), //
+			array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), // 35
+			array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)), //
+			array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)), //
+			array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)), //
+			array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)), //
+			array(array(19, 6), array(18, 31), array(34, 34), array(20, 61))  // 40
 		);
 
 		/**
@@ -604,9 +604,9 @@ 
 		 * @access protected
 		 */
 		protected $alignmentPattern = array(
-			array( 0,  0),
-			array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), //  1- 5
-			array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
+			array(0, 0),
+			array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), //  1- 5
+			array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
 			array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), // 11-15
 			array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), // 16-20
 			array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), // 21-25
@@ -679,7 +679,7 @@ 
 			foreach ($qrTab as $line) {
 				$arrAdd = array();
 				foreach (str_split($line) as $char) {
-					$arrAdd[] = ($char=='1')?1:0;
+					$arrAdd[] = ($char == '1') ? 1 : 0;
 				}
 				$barcode_array['bcode'][] = $arrAdd;
 			}
@@ -704,8 +704,8 @@ 
 			$len = count($frame);
 			// the frame is square (width = height)
 			foreach ($frame as &$frameLine) {
-				for ($i=0; $i<$len; $i++) {
-					$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
+				for ($i = 0; $i < $len; $i++) {
+					$frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0';
 				}
 			}
 			return $frame;
@@ -755,10 +755,10 @@ 
 			$this->dir = -1;
 			$this->bit = -1;
 			// inteleaved data and ecc codes
-			for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
+			for ($i = 0; $i < ($this->dataLength + $this->eccLength); $i++) {
 				$code = $this->getCode();
 				$bit = 0x80;
-				for ($j=0; $j<8; $j++) {
+				for ($j = 0; $j < 8; $j++) {
 					$addr = $this->getNextPosition();
 					$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
 					$bit = $bit >> 1;
@@ -766,7 +766,7 @@ 
 			}
 			// remainder bits
 			$j = $this->getRemainder($this->version);
-			for ($i=0; $i<$j; $i++) {
+			for ($i = 0; $i < $j; $i++) {
 				$addr = $this->getNextPosition();
 				$this->setFrameAt($addr, 0x02);
 			}
@@ -856,7 +856,7 @@ 
 				}
 				$this->x = $x;
 				$this->y = $y;
-			} while(ord($this->frame[$y][$x]) & 0x80);
+			} while (ord($this->frame[$y][$x]) & 0x80);
 			return array('x'=>$x, 'y'=>$y);
 		}
 
@@ -877,7 +877,7 @@ 
 			$dataPos = 0;
 			$eccPos = 0;
 			$endfor = $this->rsBlockNum1($spec);
-			for ($i=0; $i < $endfor; ++$i) {
+			for ($i = 0; $i < $endfor; ++$i) {
 				$ecc = array_slice($this->ecccode, $eccPos);
 				$this->rsblocks[$blockNo] = array();
 				$this->rsblocks[$blockNo]['dataLength'] = $dl;
@@ -885,7 +885,7 @@ 
 				$this->rsblocks[$blockNo]['eccLength'] = $el;
 				$ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc);
 				$this->rsblocks[$blockNo]['ecc'] = $ecc;
-				$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
+				$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
 				$dataPos += $dl;
 				$eccPos += $el;
 				$blockNo++;
@@ -900,7 +900,7 @@ 
 				return -1;
 			}
 			$endfor = $this->rsBlockNum2($spec);
-			for ($i=0; $i < $endfor; ++$i) {
+			for ($i = 0; $i < $endfor; ++$i) {
 				$ecc = array_slice($this->ecccode, $eccPos);
 				$this->rsblocks[$blockNo] = array();
 				$this->rsblocks[$blockNo]['dataLength'] = $dl;
@@ -953,8 +953,8 @@ 
 		 */
 		 protected function writeFormatInformation($width, &$frame, $mask, $level) {
 			$blacks = 0;
-			$format =  $this->getFormatInfo($mask, $level);
-			for ($i=0; $i<8; ++$i) {
+			$format = $this->getFormatInfo($mask, $level);
+			for ($i = 0; $i < 8; ++$i) {
 				if ($format & 1) {
 					$blacks += 2;
 					$v = 0x85;
@@ -969,7 +969,7 @@ 
 				}
 				$format = $format >> 1;
 			}
-			for ($i=0; $i<7; ++$i) {
+			for ($i = 0; $i < 7; ++$i) {
 			if ($format & 1) {
 				$blacks += 2;
 				$v = 0x85;
@@ -1076,13 +1076,13 @@ 
 		 */
 		protected function generateMaskNo($maskNo, $width, $frame) {
 			$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-			for ($y=0; $y<$width; ++$y) {
-				for ($x=0; $x<$width; ++$x) {
+			for ($y = 0; $y < $width; ++$y) {
+				for ($x = 0; $x < $width; ++$x) {
 					if (ord($frame[$y][$x]) & 0x80) {
 						$bitMask[$y][$x] = 0;
 					} else {
-						$maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
-						$bitMask[$y][$x] = ($maskFunc == 0)?1:0;
+						$maskFunc = call_user_func(array($this, 'mask' . $maskNo), $x, $y);
+						$bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;
 					}
 				}
 			}
@@ -1098,7 +1098,7 @@ 
 		 * @param boolean $maskGenOnly
 		 * @return int b
 		 */
-		 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
+		 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly = false) {
 			$b = 0;
 			$bitMask = array();
 			$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
@@ -1106,8 +1106,8 @@ 
 				return;
 			}
 			$d = $s;
-			for ($y=0; $y<$width; ++$y) {
-				for ($x=0; $x<$width; ++$x) {
+			for ($y = 0; $y < $width; ++$y) {
+				for ($x = 0; $x < $width; ++$x) {
 					if ($bitMask[$y][$x] == 1) {
 						$d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
 					}
@@ -1139,20 +1139,20 @@ 
 		 */
 		 protected function calcN1N3($length) {
 			$demerit = 0;
-			for ($i=0; $i<$length; ++$i) {
+			for ($i = 0; $i < $length; ++$i) {
 				if ($this->runLength[$i] >= 5) {
 					$demerit += (N1 + ($this->runLength[$i] - 5));
 				}
 				if ($i & 1) {
-					if (($i >= 3) AND ($i < ($length-2)) AND ($this->runLength[$i] % 3 == 0)) {
+					if (($i >= 3) AND ($i < ($length - 2)) AND ($this->runLength[$i] % 3 == 0)) {
 						$fact = (int)($this->runLength[$i] / 3);
-						if (($this->runLength[$i-2] == $fact)
-							AND ($this->runLength[$i-1] == $fact)
-							AND ($this->runLength[$i+1] == $fact)
-							AND ($this->runLength[$i+2] == $fact)) {
-							if (($this->runLength[$i-3] < 0) OR ($this->runLength[$i-3] >= (4 * $fact))) {
+						if (($this->runLength[$i - 2] == $fact)
+							AND ($this->runLength[$i - 1] == $fact)
+							AND ($this->runLength[$i + 1] == $fact)
+							AND ($this->runLength[$i + 2] == $fact)) {
+							if (($this->runLength[$i - 3] < 0) OR ($this->runLength[$i - 3] >= (4 * $fact))) {
 								$demerit += N3;
-							} elseif ((($i+3) >= $length) OR ($this->runLength[$i+3] >= (4 * $fact))) {
+							} elseif ((($i + 3) >= $length) OR ($this->runLength[$i + 3] >= (4 * $fact))) {
 								$demerit += N3;
 							}
 						}
@@ -1171,17 +1171,17 @@ 
 		 protected function evaluateSymbol($width, $frame) {
 			$head = 0;
 			$demerit = 0;
-			for ($y=0; $y<$width; ++$y) {
+			for ($y = 0; $y < $width; ++$y) {
 				$head = 0;
 				$this->runLength[0] = 1;
 				$frameY = $frame[$y];
 				if ($y > 0) {
-					$frameYM = $frame[$y-1];
+					$frameYM = $frame[$y - 1];
 				}
-				for ($x=0; $x<$width; ++$x) {
+				for ($x = 0; $x < $width; ++$x) {
 					if (($x > 0) AND ($y > 0)) {
-						$b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
-						$w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
+						$b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);
+						$w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);
 						if (($b22 | ($w22 ^ 1)) & 1) {
 							$demerit += N2;
 						}
@@ -1191,7 +1191,7 @@ 
 						$head = 1;
 						$this->runLength[$head] = 1;
 					} elseif ($x > 0) {
-						if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
+						if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {
 							$head++;
 							$this->runLength[$head] = 1;
 						} else {
@@ -1199,18 +1199,18 @@ 
 						}
 					}
 				}
-				$demerit += $this->calcN1N3($head+1);
+				$demerit += $this->calcN1N3($head + 1);
 			}
-			for ($x=0; $x<$width; ++$x) {
+			for ($x = 0; $x < $width; ++$x) {
 				$head = 0;
 				$this->runLength[0] = 1;
-				for ($y=0; $y<$width; ++$y) {
+				for ($y = 0; $y < $width; ++$y) {
 					if (($y == 0) AND (ord($frame[$y][$x]) & 1)) {
 						$this->runLength[0] = -1;
 						$head = 1;
 						$this->runLength[$head] = 1;
 					} elseif ($y > 0) {
-						if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
+						if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {
 							$head++;
 							$this->runLength[$head] = 1;
 						} else {
@@ -1218,7 +1218,7 @@ 
 						}
 					}
 				}
-				$demerit += $this->calcN1N3($head+1);
+				$demerit += $this->calcN1N3($head + 1);
 			}
 			return $demerit;
 		}
@@ -1237,8 +1237,8 @@ 
 			$checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
 			if (QR_FIND_FROM_RANDOM !== false) {
 				$howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
-				for ($i = 0; $i <  $howManuOut; ++$i) {
-					$remPos = rand (0, count($checked_masks)-1);
+				for ($i = 0; $i < $howManuOut; ++$i) {
+					$remPos = rand(0, count($checked_masks) - 1);
 					unset($checked_masks[$remPos]);
 					$checked_masks = array_values($checked_masks);
 				}
@@ -1276,7 +1276,7 @@ 
 			if ($pos >= strlen($str)) {
 				return false;
 			}
-			return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
+			return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));
 		}
 
 		/**
@@ -1307,8 +1307,8 @@ 
 			} elseif ($this->isalnumat($this->dataStr, $pos)) {
 				return QR_MODE_AN;
 			} elseif ($this->hint == QR_MODE_KJ) {
-				if ($pos+1 < strlen($this->dataStr)) {
-					$d = $this->dataStr[$pos+1];
+				if ($pos + 1 < strlen($this->dataStr)) {
+					$d = $this->dataStr[$pos + 1];
 					$word = (ord($c) << 8) | ord($d);
 					if (($word >= 0x8140 && $word <= 0x9ffc) OR ($word >= 0xe040 && $word <= 0xebbf)) {
 						return QR_MODE_KJ;
@@ -1325,7 +1325,7 @@ 
 		 protected function eatNum() {
 			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
 			$p = 0;
-			while($this->isdigitat($this->dataStr, $p)) {
+			while ($this->isdigitat($this->dataStr, $p)) {
 				$p++;
 			}
 			$run = $p;
@@ -1341,7 +1341,7 @@ 
 			if ($mode == QR_MODE_AN) {
 				$dif = $this->estimateBitsModeNum($run) + 4 + $ln
 				+ $this->estimateBitsModeAn(1)        // + 4 + la
-				- $this->estimateBitsModeAn($run + 1);// - 4 - la
+				- $this->estimateBitsModeAn($run + 1); // - 4 - la
 				if ($dif > 0) {
 					return $this->eatAn();
 				}
@@ -1355,13 +1355,13 @@ 
 		 * @return int run
 		 */
 		 protected function eatAn() {
-			$la = $this->lengthIndicator(QR_MODE_AN,  $this->version);
+			$la = $this->lengthIndicator(QR_MODE_AN, $this->version);
 			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
 			$p = 0;
-			while($this->isalnumat($this->dataStr, $p)) {
+			while ($this->isalnumat($this->dataStr, $p)) {
 				if ($this->isdigitat($this->dataStr, $p)) {
 					$q = $p;
-					while($this->isdigitat($this->dataStr, $q)) {
+					while ($this->isdigitat($this->dataStr, $q)) {
 						$q++;
 					}
 					$dif = $this->estimateBitsModeAn($p) // + 4 + la
@@ -1395,7 +1395,7 @@ 
 		 */
 		 protected function eatKanji() {
 			$p = 0;
-			while($this->identifyMode($p) == QR_MODE_KJ) {
+			while ($this->identifyMode($p) == QR_MODE_KJ) {
 				$p += 2;
 			}
 			$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
@@ -1411,14 +1411,14 @@ 
 			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
 			$p = 1;
 			$dataStrLen = strlen($this->dataStr);
-			while($p < $dataStrLen) {
+			while ($p < $dataStrLen) {
 				$mode = $this->identifyMode($p);
 				if ($mode == QR_MODE_KJ) {
 					break;
 				}
 				if ($mode == QR_MODE_NM) {
 					$q = $p;
-					while($this->isdigitat($this->dataStr, $q)) {
+					while ($this->isdigitat($this->dataStr, $q)) {
 						$q++;
 					}
 					$dif = $this->estimateBitsMode8($p) // + 4 + l8
@@ -1431,7 +1431,7 @@ 
 					}
 				} elseif ($mode == QR_MODE_AN) {
 					$q = $p;
-					while($this->isalnumat($this->dataStr, $q)) {
+					while ($this->isalnumat($this->dataStr, $q)) {
 						$q++;
 					}
 					$dif = $this->estimateBitsMode8($p)  // + 4 + l8
@@ -1524,7 +1524,7 @@ 
 		 * @param array $bstream
 		 * @return array input item
 		 */
-		 protected function newInputItem($mode, $size, $data, $bstream=null) {
+		 protected function newInputItem($mode, $size, $data, $bstream = null) {
 			$setData = array_slice($data, 0, $size);
 			if (count($setData) < $size) {
 				$setData = array_merge($setData, array_fill(0, ($size - count($setData)), 0));
@@ -1552,18 +1552,18 @@ 
 			$val = 0x1;
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_NM, $version), $inputitem['size']);
-			for ($i=0; $i < $words; ++$i) {
-				$val  = (ord($inputitem['data'][$i*3  ]) - ord('0')) * 100;
-				$val += (ord($inputitem['data'][$i*3+1]) - ord('0')) * 10;
-				$val += (ord($inputitem['data'][$i*3+2]) - ord('0'));
+			for ($i = 0; $i < $words; ++$i) {
+				$val  = (ord($inputitem['data'][$i * 3]) - ord('0')) * 100;
+				$val += (ord($inputitem['data'][$i * 3 + 1]) - ord('0')) * 10;
+				$val += (ord($inputitem['data'][$i * 3 + 2]) - ord('0'));
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 10, $val);
 			}
 			if ($inputitem['size'] - $words * 3 == 1) {
-				$val = ord($inputitem['data'][$words*3]) - ord('0');
+				$val = ord($inputitem['data'][$words * 3]) - ord('0');
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
 			} elseif (($inputitem['size'] - ($words * 3)) == 2) {
-				$val  = (ord($inputitem['data'][$words*3  ]) - ord('0')) * 10;
-				$val += (ord($inputitem['data'][$words*3+1]) - ord('0'));
+				$val  = (ord($inputitem['data'][$words * 3]) - ord('0')) * 10;
+				$val += (ord($inputitem['data'][$words * 3 + 1]) - ord('0'));
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 7, $val);
 			}
 			return $inputitem;
@@ -1580,9 +1580,9 @@ 
 			$inputitem['bstream'] = array();
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']); //DEBUG
-			for ($i=0; $i < $words; ++$i) {
-				$val  = (int)$this->lookAnTable(ord($inputitem['data'][$i*2  ])) * 45;
-				$val += (int)$this->lookAnTable(ord($inputitem['data'][$i*2+1]));
+			for ($i = 0; $i < $words; ++$i) {
+				$val  = (int)$this->lookAnTable(ord($inputitem['data'][$i * 2])) * 45;
+				$val += (int)$this->lookAnTable(ord($inputitem['data'][$i * 2 + 1]));
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val);
 			}
 			if ($inputitem['size'] & 1) {
@@ -1602,7 +1602,7 @@ 
 			$inputitem['bstream'] = array();
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x4);
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_8B, $version), $inputitem['size']);
-			for ($i=0; $i < $inputitem['size']; ++$i) {
+			for ($i = 0; $i < $inputitem['size']; ++$i) {
 				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, ord($inputitem['data'][$i]));
 			}
 			return $inputitem;
@@ -1618,8 +1618,8 @@ 
 			$inputitem['bstream'] = array();
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x8);
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int)($inputitem['size'] / 2));
-			for ($i=0; $i<$inputitem['size']; $i+=2) {
-				$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i+1]);
+			for ($i = 0; $i < $inputitem['size']; $i += 2) {
+				$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i + 1]);
 				if ($val <= 0x9ffc) {
 					$val -= 0x8140;
 				} else {
@@ -1664,7 +1664,7 @@ 
 				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st1['bstream']);
 				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
 			} else {
-				switch($inputitem['mode']) {
+				switch ($inputitem['mode']) {
 					case QR_MODE_NM: {
 						$inputitem = $this->encodeModeNum($inputitem, $version);
 						break;
@@ -1742,7 +1742,7 @@ 
 			$parity = 0;
 			foreach ($items as $item) {
 				if ($item['mode'] != QR_MODE_ST) {
-					for ($i=$item['size']-1; $i>=0; --$i) {
+					for ($i = $item['size'] - 1; $i >= 0; --$i) {
 						$parity ^= $item['data'][$i];
 					}
 				}
@@ -1757,8 +1757,8 @@ 
 		 * @return boolean true or false
 		 */
 		 protected function checkModeNum($size, $data) {
-			for ($i=0; $i<$size; ++$i) {
-				if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))){
+			for ($i = 0; $i < $size; ++$i) {
+				if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))) {
 					return false;
 				}
 			}
@@ -1773,7 +1773,7 @@ 
 		 protected function estimateBitsModeNum($size) {
 			$w = (int)$size / 3;
 			$bits = $w * 10;
-			switch($size - $w * 3) {
+			switch ($size - $w * 3) {
 				case 1: {
 					$bits += 4;
 					break;
@@ -1795,7 +1795,7 @@ 
 		 * @return value
 		 */
 		protected function lookAnTable($c) {
-			return (($c > 127)?-1:$this->anTable[$c]);
+			return (($c > 127) ?-1 : $this->anTable[$c]);
 		}
 
 		/**
@@ -1805,7 +1805,7 @@ 
 		 * @return boolean true or false
 		 */
 		 protected function checkModeAn($size, $data) {
-			for ($i=0; $i<$size; ++$i) {
+			for ($i = 0; $i < $size; ++$i) {
 				if ($this->lookAnTable(ord($data[$i])) == -1) {
 					return false;
 				}
@@ -1855,8 +1855,8 @@ 
 			if ($size & 1) {
 				return false;
 			}
-			for ($i=0; $i<$size; $i+=2) {
-				$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
+			for ($i = 0; $i < $size; $i += 2) {
+				$val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
 				if (($val < 0x8140) OR (($val > 0x9ffc) AND ($val < 0xe040)) OR ($val > 0xebbf)) {
 					return false;
 				}
@@ -1875,7 +1875,7 @@ 
 			if ($size <= 0) {
 				return false;
 			}
-			switch($mode) {
+			switch ($mode) {
 				case QR_MODE_NM: {
 					return $this->checkModeNum($size, $data);
 				}
@@ -1910,7 +1910,7 @@ 
 				$version = 1;
 			}
 			foreach ($items as $item) {
-				switch($item['mode']) {
+				switch ($item['mode']) {
 					case QR_MODE_NM: {
 						$bits = $this->estimateBitsModeNum($item['size']);
 						break;
@@ -1970,7 +1970,7 @@ 
 		 */
 		 protected function lengthOfCode($mode, $version, $bits) {
 			$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
-			switch($mode) {
+			switch ($mode) {
 				case QR_MODE_NM: {
 					$chunks = (int)($payload / 10);
 					$remain = $payload - $chunks * 10;
@@ -2084,8 +2084,8 @@ 
 			$padlen = $maxwords - $words;
 			if ($padlen > 0) {
 				$padbuf = array();
-				for ($i=0; $i<$padlen; ++$i) {
-					$padbuf[$i] = ($i&1)?0x11:0xec;
+				for ($i = 0; $i < $padlen; ++$i) {
+					$padbuf[$i] = ($i & 1) ? 0x11 : 0xec;
 				}
 				$padding = $this->appendBytes($padding, $padlen, $padbuf);
 			}
@@ -2148,7 +2148,7 @@ 
 		 protected function newFromNum($bits, $num) {
 			$bstream = $this->allocate($bits);
 			$mask = 1 << ($bits - 1);
-			for ($i=0; $i<$bits; ++$i) {
+			for ($i = 0; $i < $bits; ++$i) {
 				if ($num & $mask) {
 					$bstream[$i] = 1;
 				} else {
@@ -2167,10 +2167,10 @@ 
 		 */
 		 protected function newFromBytes($size, $data) {
 			$bstream = $this->allocate($size * 8);
-			$p=0;
-			for ($i=0; $i<$size; ++$i) {
+			$p = 0;
+			for ($i = 0; $i < $size; ++$i) {
 				$mask = 0x80;
-				for ($j=0; $j<8; ++$j) {
+				for ($j = 0; $j < 8; ++$j) {
 					if ($data[$i] & $mask) {
 						$bstream[$p] = 1;
 					} else {
@@ -2242,9 +2242,9 @@ 
 			$data = array_fill(0, (int)(($size + 7) / 8), 0);
 			$bytes = (int)($size / 8);
 			$p = 0;
-			for ($i=0; $i<$bytes; $i++) {
+			for ($i = 0; $i < $bytes; $i++) {
 				$v = 0;
-				for ($j=0; $j<8; $j++) {
+				for ($j = 0; $j < 8; $j++) {
 					$v = $v << 1;
 					$v |= $bstream[$p];
 					$p++;
@@ -2253,7 +2253,7 @@ 
 			}
 			if ($size & 7) {
 				$v = 0;
-				for ($j=0; $j<($size & 7); $j++) {
+				for ($j = 0; $j < ($size & 7); $j++) {
 					$v = $v << 1;
 					$v |= $bstream[$p];
 					$p++;
@@ -2276,8 +2276,8 @@ 
 		 * @param int $replLen length of the repl string
 		 * @return array srctab
 		 */
-		 protected function qrstrset($srctab, $x, $y, $repl, $replLen=false) {
-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
+		 protected function qrstrset($srctab, $x, $y, $repl, $replLen = false) {
+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ? substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));
 			return $srctab;
 		}
 
@@ -2297,7 +2297,7 @@ 
 		 * @param int $level error correction level
 		 * @return int ECC size (bytes)
 		 */
-		protected function getECCLength($version, $level){
+		protected function getECCLength($version, $level) {
 			return $this->capacity[$version][QRCAP_EC][$level];
 		}
 
@@ -2326,8 +2326,8 @@ 
 		 * @return int version number
 		 */
 		protected function getMinimumVersion($size, $level) {
-			for ($i=1; $i <= QRSPEC_VERSION_MAX; ++$i) {
-				$words  = $this->capacity[$i][QRCAP_WORDS] - $this->capacity[$i][QRCAP_EC][$level];
+			for ($i = 1; $i <= QRSPEC_VERSION_MAX; ++$i) {
+				$words = $this->capacity[$i][QRCAP_WORDS] - $this->capacity[$i][QRCAP_EC][$level];
 				if ($words >= $size) {
 					return $i;
 				}
@@ -2404,7 +2404,7 @@ 
 			} else {
 				$spec[0] = $b1;
 				$spec[1] = (int)($data / ($b1 + $b2));
-				$spec[2] = (int)($ecc  / ($b1 + $b2));
+				$spec[2] = (int)($ecc / ($b1 + $b2));
 				$spec[3] = $b2;
 				$spec[4] = $spec[1] + 1;
 			}
@@ -2429,8 +2429,8 @@ 
 				);
 			$yStart = $oy - 2;
 			$xStart = $ox - 2;
-			for ($y=0; $y < 5; $y++) {
-				$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
+			for ($y = 0; $y < 5; $y++) {
+				$frame = $this->qrstrset($frame, $xStart, $yStart + $y, $finder[$y]);
 			}
 			return $frame;
 		}
@@ -2460,15 +2460,15 @@ 
 			}
 			$cx = $this->alignmentPattern[$version][0];
 			$wo = $w - 1;
-			for ($x=1; $x < $wo; ++$x) {
+			for ($x = 1; $x < $wo; ++$x) {
 				$frame = $this->putAlignmentMarker($frame, 6, $cx);
-				$frame = $this->putAlignmentMarker($frame, $cx,  6);
+				$frame = $this->putAlignmentMarker($frame, $cx, 6);
 				$cx += $d;
 			}
 			$cy = $this->alignmentPattern[$version][0];
-			for ($y=0; $y < $wo; ++$y) {
+			for ($y = 0; $y < $wo; ++$y) {
 				$cx = $this->alignmentPattern[$version][0];
-				for ($x=0; $x < $wo; ++$x) {
+				for ($x = 0; $x < $wo; ++$x) {
 					$frame = $this->putAlignmentMarker($frame, $cx, $cy);
 					$cx += $d;
 				}
@@ -2523,7 +2523,7 @@ 
 			"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
 			"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
 			);
-			for ($y=0; $y < 7; $y++) {
+			for ($y = 0; $y < 7; $y++) {
 				$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
 			}
 			return $frame;
@@ -2536,7 +2536,7 @@ 
 		 */
 		protected function createFrame($version) {
 			$width = $this->capacity[$version][QRCAP_WIDTH];
-			$frameLine = str_repeat ("\0", $width);
+			$frameLine = str_repeat("\0", $width);
 			$frame = array_fill(0, $width, $frameLine);
 			// Finder pattern
 			$frame = $this->putFinderPattern($frame, 0, 0);
@@ -2544,7 +2544,7 @@ 
 			$frame = $this->putFinderPattern($frame, 0, $width - 7);
 			// Separator
 			$yOffset = $width - 7;
-			for ($y=0; $y < 7; ++$y) {
+			for ($y = 0; $y < 7; ++$y) {
 				$frame[$y][7] = "\xc0";
 				$frame[$y][$width - 8] = "\xc0";
 				$frame[$yOffset][7] = "\xc0";
@@ -2552,22 +2552,22 @@ 
 			}
 			$setPattern = str_repeat("\xc0", 8);
 			$frame = $this->qrstrset($frame, 0, 7, $setPattern);
-			$frame = $this->qrstrset($frame, $width-8, 7, $setPattern);
+			$frame = $this->qrstrset($frame, $width - 8, 7, $setPattern);
 			$frame = $this->qrstrset($frame, 0, $width - 8, $setPattern);
 			// Format info
 			$setPattern = str_repeat("\x84", 9);
 			$frame = $this->qrstrset($frame, 0, 8, $setPattern);
 			$frame = $this->qrstrset($frame, $width - 8, 8, $setPattern, 8);
 			$yOffset = $width - 8;
-			for ($y=0; $y < 8; ++$y,++$yOffset) {
+			for ($y = 0; $y < 8; ++$y, ++$yOffset) {
 				$frame[$y][8] = "\x84";
 				$frame[$yOffset][8] = "\x84";
 			}
 			// Timing pattern
 			$wo = $width - 15;
-			for ($i=1; $i < $wo; ++$i) {
-				$frame[6][7+$i] = chr(0x90 | ($i & 1));
-				$frame[7+$i][6] = chr(0x90 | ($i & 1));
+			for ($i = 1; $i < $wo; ++$i) {
+				$frame[6][7 + $i] = chr(0x90 | ($i & 1));
+				$frame[7 + $i][6] = chr(0x90 | ($i & 1));
 			}
 			// Alignment pattern
 			$frame = $this->putAlignmentPattern($version, $frame, $width);
@@ -2575,16 +2575,16 @@ 
 			if ($version >= 7) {
 				$vinf = $this->getVersionPattern($version);
 				$v = $vinf;
-				for ($x=0; $x<6; ++$x) {
-					for ($y=0; $y<3; ++$y) {
-						$frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
+				for ($x = 0; $x < 6; ++$x) {
+					for ($y = 0; $y < 3; ++$y) {
+						$frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));
 						$v = $v >> 1;
 					}
 				}
 				$v = $vinf;
-				for ($y=0; $y<6; ++$y) {
-					for ($x=0; $x<3; ++$x) {
-						$frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
+				for ($y = 0; $y < 6; ++$y) {
+					for ($x = 0; $x < 3; ++$x) {
+						$frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));
 						$v = $v >> 1;
 					}
 				}
@@ -2755,16 +2755,16 @@ 
 			if (($symsize < 0) OR ($symsize > 8)) {
 				return $rs;
 			}
-			if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
+			if (($fcr < 0) OR ($fcr >= (1 << $symsize))) {
 				return $rs;
 			}
-			if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
+			if (($prim <= 0) OR ($prim >= (1 << $symsize))) {
 				return $rs;
 			}
-			if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
+			if (($nroots < 0) OR ($nroots >= (1 << $symsize))) {
 				return $rs;
 			}
-			if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
+			if (($pad < 0) OR ($pad >= ((1 << $symsize) - 1 - $nroots))) {
 				return $rs;
 			}
 			$rs = array();
@@ -2774,13 +2774,13 @@ 
 			$rs['alpha_to'] = array_fill(0, ($rs['nn'] + 1), 0);
 			$rs['index_of'] = array_fill(0, ($rs['nn'] + 1), 0);
 			// PHP style macro replacement ;)
-			$NN =& $rs['nn'];
-			$A0 =& $NN;
+			$NN = & $rs['nn'];
+			$A0 = & $NN;
 			// Generate Galois field lookup tables
 			$rs['index_of'][0] = $A0; // log(zero) = -inf
 			$rs['alpha_to'][$A0] = 0; // alpha**-inf = 0
 			$sr = 1;
-			for ($i=0; $i<$rs['nn']; ++$i) {
+			for ($i = 0; $i < $rs['nn']; ++$i) {
 				$rs['index_of'][$sr] = $i;
 				$rs['alpha_to'][$i] = $sr;
 				$sr <<= 1;
@@ -2800,21 +2800,21 @@ 
 			$rs['nroots'] = $nroots;
 			$rs['gfpoly'] = $gfpoly;
 			// Find prim-th root of 1, used in decoding
-			for ($iprim=1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
+			for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
 				; // intentional empty-body loop!
 			}
 			$rs['iprim'] = (int)($iprim / $prim);
 			$rs['genpoly'][0] = 1;
 
 
-			for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
-				$rs['genpoly'][$i+1] = 1;
+			for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) {
+				$rs['genpoly'][$i + 1] = 1;
 				// Multiply rs->genpoly[] by  @**(root + x)
 				for ($j = $i; $j > 0; --$j) {
 					if ($rs['genpoly'][$j] != 0) {
-						$rs['genpoly'][$j] = $rs['genpoly'][$j-1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
+						$rs['genpoly'][$j] = $rs['genpoly'][$j - 1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
 					} else {
-						$rs['genpoly'][$j] = $rs['genpoly'][$j-1];
+						$rs['genpoly'][$j] = $rs['genpoly'][$j - 1];
 					}
 				}
 				// rs->genpoly[0] can never be zero
@@ -2835,26 +2835,26 @@ 
 		 * @return parity array
 		 */
 		 protected function encode_rs_char($rs, $data, $parity) {
-			$MM       =& $rs['mm']; // bits per symbol
-			$NN       =& $rs['nn']; // the total number of symbols in a RS block
-			$ALPHA_TO =& $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
-			$INDEX_OF =& $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
-			$GENPOLY  =& $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
-			$NROOTS   =& $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
-			$FCR      =& $rs['fcr']; // first consecutive root, index form
-			$PRIM     =& $rs['prim']; // primitive element, index form
-			$IPRIM    =& $rs['iprim']; // prim-th root of 1, index form
-			$PAD      =& $rs['pad']; // the number of pad symbols in a block
-			$A0       =& $NN;
+			$MM       = & $rs['mm']; // bits per symbol
+			$NN       = & $rs['nn']; // the total number of symbols in a RS block
+			$ALPHA_TO = & $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
+			$INDEX_OF = & $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
+			$GENPOLY  = & $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
+			$NROOTS   = & $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
+			$FCR      = & $rs['fcr']; // first consecutive root, index form
+			$PRIM     = & $rs['prim']; // primitive element, index form
+			$IPRIM    = & $rs['iprim']; // prim-th root of 1, index form
+			$PAD      = & $rs['pad']; // the number of pad symbols in a block
+			$A0       = & $NN;
 			$parity = array_fill(0, $NROOTS, 0);
-			for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
+			for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) {
 				$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
 				if ($feedback != $A0) {
 					// feedback term is non-zero
 					// This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
 					// always be for the polynomials constructed by init_rs()
 					$feedback = $this->modnn($rs, $NN - $GENPOLY[$NROOTS] + $feedback);
-					for ($j=1; $j < $NROOTS; ++$j) {
+					for ($j = 1; $j < $NROOTS; ++$j) {
 					$parity[$j] ^= $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[($NROOTS - $j)])];
 					}
 				}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *