Eoxia / wpshop

includes/librairies/install.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -280,7 +280,7 @@ 
 	 *
 	 * @param integer $i The wpshop db version to execute operation for
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public static function execute_operation_on_db_for_update($i){
 		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update, $wpshop_db_request, $wpshop_db_delete;
@@ -547,6 +547,7 @@ 
 
 	/**
 	 * Manage special operation on wpshop plugin update
+	 * @param integer $version
 	 */
 	public static function make_specific_operation_on_update($version){
 		global $wpdb, $wp_rewrite;

Indentation +5 added lines, -5 removed lines

@@ -23,10 +23,10 @@ 
 class wpshop_install {
 
 	/**
-	*	Define the action launch when plugin is activate
-	*
-	* @return void
-	*/
+	 *	Define the action launch when plugin is activate
+	 *
+	 * @return void
+	 */
 	public static function install_on_activation(){
 		/*	Create the different option needed for the plugin work properly	*/
 		add_option('wpshop_db_options', array('db_version' => 0));
@@ -442,7 +442,7 @@ 
 	 *
 	 * @param array $eav_content The complete array with all element to create into database
 	 * @param boolean $do_changes The current state of changes to do
-	 	*
+	 *
 	 * @return boolean If there are changes to do or not
 	 */
 	public static function update_eav_content( $eav_content, $do_changes ) {

Spacing +589 added lines, -589 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'));
 }
 
 /**
@@ -27,7 +27,7 @@ 
 	*
 	* @return void
 	*/
-	public static function install_on_activation(){
+	public static function install_on_activation() {
 		/*	Create the different option needed for the plugin work properly	*/
 		add_option('wpshop_db_options', array('db_version' => 0));
 		add_option('wpshop_shop_default_currency', WPSHOP_SHOP_DEFAULT_CURRENCY);
@@ -40,7 +40,7 @@ 
 	/**
 	 *	Create the default pages
 	 */
-	public static function wpshop_insert_default_pages( $pages_type = '' ) {
+	public static function wpshop_insert_default_pages($pages_type = '') {
 		global $wpdb, $wp_rewrite;
 
 		/**	if we will create any new pages we need to flush page cache */
@@ -57,48 +57,48 @@ 
 		);
 
 		/**	Get defined shop type	*/
-		$wpshop_shop_type = !empty( $pages_type ) ? $pages_type : get_option( 'wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE );
+		$wpshop_shop_type = !empty($pages_type) ? $pages_type : get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
 
 		/**	Get the default datas for installation - Pages	*/
-		$xml_default_pages = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_pages.xml' );
-		$defined_default_pages = new SimpleXMLElement( $xml_default_pages );
-		foreach ( $defined_default_pages->xpath( '//pages/page' ) as $page ) {
-			if ( ( $wpshop_shop_type == $page->attributes()->shop_type ) || ( 'sale' == $wpshop_shop_type ) ) {
+		$xml_default_pages = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_pages.xml');
+		$defined_default_pages = new SimpleXMLElement($xml_default_pages);
+		foreach ($defined_default_pages->xpath('//pages/page') as $page) {
+			if (($wpshop_shop_type == $page->attributes()->shop_type) || ('sale' == $wpshop_shop_type)) {
 				$page_id = null;
 
 				/**	Do a specific check for cart page, for old wpshop installation	*/
-				if ( 'wpshop_cart_page_id' == (string)$page->attributes()->code ) {
+				if ('wpshop_cart_page_id' == (string)$page->attributes()->code) {
 					$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_content LIKE %s	AND post_type != %s", '%[wpshop_basket]%', 'revision');
 					$page_id = $wpdb->get_var($query);
 
-					wp_update_post( array(
+					wp_update_post(array(
 						'ID' => $page_id,
 						'post_content' => (string)$page->content,
-					) );
+					));
 				}
 
 				/**	Check if a page exists with the current content readed form xml file	*/
-				if ( empty( $page_id ) ) {
+				if (empty($page_id)) {
 					$query = $wpdb->prepare("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE %s AND post_type != %s", '%' . (string)$page->content . '%', 'revision');
 					$page_id = $wpdb->get_var($query);
 				}
 
 				/**	If the page does not exists create it	*/
-				if ( empty( $page_id ) ) {
-					$default_page_args  = wp_parse_args( array(
-						'post_title' 	=> __( (string)$page->title, 'wpshop' ),
-						'post_name' 	=> __( (string)$page->slug, 'wpshop' ),
-						'post_content' 	=> __( (string)$page->content, 'wpshop' ),
+				if (empty($page_id)) {
+					$default_page_args = wp_parse_args(array(
+						'post_title' 	=> __((string)$page->title, 'wpshop'),
+						'post_name' 	=> __((string)$page->slug, 'wpshop'),
+						'post_content' 	=> __((string)$page->content, 'wpshop'),
 						'menu_order' 	=> (string)$page->attributes()->position,
-					), $page_default_args );
+					), $page_default_args);
 
-					$page_id = wp_insert_post( $default_page_args );
+					$page_id = wp_insert_post($default_page_args);
 					$created_pages[] = (string)$page->attributes()->code;
 				}
 
 				/**	If the page is created or already exists associated the page to the good service	*/
-				if ( !empty( $page_id ) ) {
-					add_option( (string)$page->attributes()->code, $page_id );
+				if (!empty($page_id)) {
+					add_option((string)$page->attributes()->code, $page_id);
 
 					$page_creation = true;
 				}
@@ -107,18 +107,18 @@ 
 		}
 
 		/**	Check if page have been created in order to do specific action	*/
-		if ( !empty( $created_pages ) ) {
+		if (!empty($created_pages)) {
 			/**	If cart page and checkout page have just been created, change cart page id into checkout page id	*/
-			if ( in_array( 'wpshop_cart_page_id', $created_pages ) && in_array( 'wpshop_checkout_page_id', $created_pages ) ) {
-				update_option( 'wpshop_cart_page_id', get_option( 'wpshop_checkout_page_id' ) );
+			if (in_array('wpshop_cart_page_id', $created_pages) && in_array('wpshop_checkout_page_id', $created_pages)) {
+				update_option('wpshop_cart_page_id', get_option('wpshop_checkout_page_id'));
 			}
 
 		}
 
 		wp_cache_flush();
 		/** If new page => empty cache */
-		if ( $page_creation ) {
-			wp_cache_delete( 'all_page_ids', 'pages' );
+		if ($page_creation) {
+			wp_cache_delete('all_page_ids', 'pages');
 		//	$wp_rewrite->flush_rules();
 		}
 	}
@@ -138,54 +138,54 @@ 
 		);
 
 		/**	Get the default datas for installation - sample products	*/
-		$sample_datas = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/sample_datas.xml' );
-		$defined_sample_datas = new SimpleXMLElement( $sample_datas, LIBXML_NOCDATA );
+		$sample_datas = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/sample_datas.xml');
+		$defined_sample_datas = new SimpleXMLElement($sample_datas, LIBXML_NOCDATA);
 
 		$namespaces = $defined_sample_datas->getDocNamespaces();
-		if ( ! isset( $namespaces['wp'] ) )
+		if (!isset($namespaces['wp']))
 			$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
-		if ( ! isset( $namespaces['excerpt'] ) )
+		if (!isset($namespaces['excerpt']))
 			$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
 
-		foreach ( $defined_sample_datas->xpath( '//wpshop_products/wpshop_product' ) as $product ) {
-			$dc = $product->children( 'http://purl.org/dc/elements/1.1/' );
-			$content = $product->children( 'http://purl.org/rss/1.0/modules/content/' );
-			$excerpt = $product->children( $namespaces['excerpt'] );
-			$wp = $product->children( $namespaces['wp'] );
+		foreach ($defined_sample_datas->xpath('//wpshop_products/wpshop_product') as $product) {
+			$dc = $product->children('http://purl.org/dc/elements/1.1/');
+			$content = $product->children('http://purl.org/rss/1.0/modules/content/');
+			$excerpt = $product->children($namespaces['excerpt']);
+			$wp = $product->children($namespaces['wp']);
 
-			$product_args  = wp_parse_args( array(
+			$product_args = wp_parse_args(array(
 				'post_title' => (string)$product->title,
-				'post_name' => (string) $wp->post_name,
-				'post_content' => (string) $content->encoded,
-				'post_excerpt' => (string) $excerpt->encoded,
-				'post_type' => (string) $wp->post_type,
-			), $product_default_args );
+				'post_name' => (string)$wp->post_name,
+				'post_content' => (string)$content->encoded,
+				'post_excerpt' => (string)$excerpt->encoded,
+				'post_type' => (string)$wp->post_type,
+			), $product_default_args);
 
-			$product_id = wp_insert_post( $product_args );
+			$product_id = wp_insert_post($product_args);
 
-			foreach ( $wp->postmeta as $meta ) {
-				update_post_meta( $product_id, (string)$meta->meta_key, (string)$meta->meta_value);
+			foreach ($wp->postmeta as $meta) {
+				update_post_meta($product_id, (string)$meta->meta_key, (string)$meta->meta_value);
 			}
 
-			foreach ( $defined_sample_datas->xpath( '//wps_pdt_variations/wps_pdt_variation/wp:post_parent[. ="' . $wp->post_id . '"]/parent::*' ) as $product_variation ) {
-				$wps_pdt_var_dc = $product_variation->children( 'http://purl.org/dc/elements/1.1/' );
-				$wps_pdt_var_content = $product_variation->children( 'http://purl.org/rss/1.0/modules/content/' );
-				$wps_pdt_var_excerpt = $product_variation->children( $namespaces['excerpt'] );
-				$wps_pdt_var_wp = $product_variation->children( $namespaces['wp'] );
+			foreach ($defined_sample_datas->xpath('//wps_pdt_variations/wps_pdt_variation/wp:post_parent[. ="' . $wp->post_id . '"]/parent::*') as $product_variation) {
+				$wps_pdt_var_dc = $product_variation->children('http://purl.org/dc/elements/1.1/');
+				$wps_pdt_var_content = $product_variation->children('http://purl.org/rss/1.0/modules/content/');
+				$wps_pdt_var_excerpt = $product_variation->children($namespaces['excerpt']);
+				$wps_pdt_var_wp = $product_variation->children($namespaces['wp']);
 
-				$product_args  = wp_parse_args( array(
+				$product_args = wp_parse_args(array(
 						'post_title' => (string)$product_variation->title,
-						'post_name' => (string) $wps_pdt_var_wp->post_name,
-						'post_content' => (string) $wps_pdt_var_content->encoded,
-						'post_excerpt' => (string) $wps_pdt_var_excerpt->encoded,
-						'post_type' => (string) $wps_pdt_var_wp->post_type,
+						'post_name' => (string)$wps_pdt_var_wp->post_name,
+						'post_content' => (string)$wps_pdt_var_content->encoded,
+						'post_excerpt' => (string)$wps_pdt_var_excerpt->encoded,
+						'post_type' => (string)$wps_pdt_var_wp->post_type,
 						'post_parent' => $product_id,
-				), $product_default_args );
+				), $product_default_args);
 
-				$product_variation_id = wp_insert_post( $product_args );
+				$product_variation_id = wp_insert_post($product_args);
 
-				foreach ( $wps_pdt_var_wp->postmeta as $meta ) {
-					update_post_meta( $product_variation_id, (string)$meta->meta_key, (string)$meta->meta_value);
+				foreach ($wps_pdt_var_wp->postmeta as $meta) {
+					update_post_meta($product_variation_id, (string)$meta->meta_key, (string)$meta->meta_value);
 				}
 			}
 		}
@@ -219,17 +219,17 @@ 
 		$version_nb_delta = $current_def_max_version - $current_db_version;
 
 		/*	Check if there are modification to do	*/
-		if($current_def_max_version >= $current_db_version){
+		if ($current_def_max_version >= $current_db_version) {
 			/*	Check the lowest version of db to execute	*/
 			$lowest_version_to_execute = $current_def_max_version - $version_nb_delta;
 
-			for($i = $lowest_version_to_execute; $i <= $current_def_max_version; $i++){
+			for ($i = $lowest_version_to_execute; $i <= $current_def_max_version; $i++) {
 				$do_changes = self::execute_operation_on_db_for_update($i);
 			}
 		}
 
 		/*	Update the db version option value	*/
-		if($do_changes){
+		if ($do_changes) {
 			$db_version = get_option('wpshop_db_options', 0);
 			$db_version['db_version'] = $new_version;
 			update_option('wpshop_db_options', $db_version);
@@ -242,31 +242,31 @@ 
 	 * @param integer $i The current plugin db version
 	 * @return boolean If the changes are done correctly or not
 	 */
-	public static function alter_db_structure_on_update( $i ) {
+	public static function alter_db_structure_on_update($i) {
 		$do_changes = false;
 		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_request, $wpshop_db_delete;
 
 		/*	Check if there are modification to do	*/
-		if(isset($wpshop_update_way[$i])){
+		if (isset($wpshop_update_way[$i])) {
 			/*	Check if there are modification to make on table	*/
-			if(isset($wpshop_db_table_list[$i])){
-				foreach($wpshop_db_table_list[$i] as $table_name){
+			if (isset($wpshop_db_table_list[$i])) {
+				foreach ($wpshop_db_table_list[$i] as $table_name) {
 					dbDelta($wpshop_db_table[$table_name]);
 				}
 				$do_changes = true;
 			}
 
 			/*	Request maker	*/
-			if(isset($wpshop_db_request[$i]) && is_array($wpshop_db_request) && is_array($wpshop_db_request[$i]) && (count($wpshop_db_request[$i]) > 0)){
-				foreach($wpshop_db_request[$i] as $request){
+			if (isset($wpshop_db_request[$i]) && is_array($wpshop_db_request) && is_array($wpshop_db_request[$i]) && (count($wpshop_db_request[$i]) > 0)) {
+				foreach ($wpshop_db_request[$i] as $request) {
 					$wpdb->query($request);
 					$do_changes = true;
 				}
 			}
 
 			/*	Delete datas	*/
-			if(isset($wpshop_db_delete[$i]) && is_array($wpshop_db_delete) && is_array($wpshop_db_delete[$i]) && (count($wpshop_db_delete[$i]) > 0)){
-				foreach($wpshop_db_delete[$i] as $request){
+			if (isset($wpshop_db_delete[$i]) && is_array($wpshop_db_delete) && is_array($wpshop_db_delete[$i]) && (count($wpshop_db_delete[$i]) > 0)) {
+				foreach ($wpshop_db_delete[$i] as $request) {
 					$wpdb->query($request);
 				}
 			}
@@ -282,12 +282,12 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function execute_operation_on_db_for_update($i){
+	public static function execute_operation_on_db_for_update($i) {
 		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update, $wpshop_db_request, $wpshop_db_delete;
 		$do_changes = false;
 
 		/*	Check if there are modification to do	*/
-		if(isset($wpshop_update_way[$i])){
+		if (isset($wpshop_update_way[$i])) {
 			$do_changes = self::alter_db_structure_on_update($i);
 
 
@@ -295,16 +295,16 @@ 
 			/*		Insert data		*/
 			/********************/
 			/*	Options content	*/
-			if(isset($wpshop_db_options_add[$i]) && is_array($wpshop_db_options_add) && is_array($wpshop_db_options_add[$i]) && (count($wpshop_db_options_add[$i]) > 0)){
-				foreach($wpshop_db_options_add[$i] as $option_name => $option_content){
+			if (isset($wpshop_db_options_add[$i]) && is_array($wpshop_db_options_add) && is_array($wpshop_db_options_add[$i]) && (count($wpshop_db_options_add[$i]) > 0)) {
+				foreach ($wpshop_db_options_add[$i] as $option_name => $option_content) {
 					add_option($option_name, $option_content, '', 'yes');
 				}
 				$do_changes = true;
 			}
-			if(isset($wpshop_db_options_update[$i]) && is_array($wpshop_db_options_update) && is_array($wpshop_db_options_update[$i]) && (count($wpshop_db_options_update[$i]) > 0)){
-				foreach($wpshop_db_options_update[$i] as $option_name => $option_content){
+			if (isset($wpshop_db_options_update[$i]) && is_array($wpshop_db_options_update) && is_array($wpshop_db_options_update[$i]) && (count($wpshop_db_options_update[$i]) > 0)) {
+				foreach ($wpshop_db_options_update[$i] as $option_name => $option_content) {
 					$option_current_content = get_option($option_name);
-					foreach($option_content as $option_key => $option_value){
+					foreach ($option_content as $option_key => $option_value) {
 						$option_current_content[$option_key] = $option_value;
 					}
 					update_option($option_name, $option_current_content);
@@ -313,18 +313,18 @@ 
 			}
 
 			/*	Eav content	*/
-			if(isset($wpshop_eav_content[$i]) && is_array($wpshop_eav_content) && is_array($wpshop_eav_content[$i]) && (count($wpshop_eav_content[$i]) > 0)){
+			if (isset($wpshop_eav_content[$i]) && is_array($wpshop_eav_content) && is_array($wpshop_eav_content[$i]) && (count($wpshop_eav_content[$i]) > 0)) {
 				$do_changes = self::add_content_to_eav($wpshop_eav_content[$i], $do_changes);
 			}
 			/*	Eav content update	*/
-			if(isset($wpshop_eav_content_update[$i]) && is_array($wpshop_eav_content_update) && is_array($wpshop_eav_content_update[$i]) && (count($wpshop_eav_content_update[$i]) > 0)){
+			if (isset($wpshop_eav_content_update[$i]) && is_array($wpshop_eav_content_update) && is_array($wpshop_eav_content_update[$i]) && (count($wpshop_eav_content_update[$i]) > 0)) {
 				$do_changes = self::add_content_to_eav($wpshop_eav_content_update[$i], $do_changes);
 			}
 
 			/*	Add datas	*/
-			if(isset($wpshop_db_content_add[$i]) && is_array($wpshop_db_content_add) && is_array($wpshop_db_content_add[$i]) && (count($wpshop_db_content_add[$i]) > 0)){
-				foreach($wpshop_db_content_add[$i] as $table_name => $def){
-					foreach($def as $information_index => $table_information){
+			if (isset($wpshop_db_content_add[$i]) && is_array($wpshop_db_content_add) && is_array($wpshop_db_content_add[$i]) && (count($wpshop_db_content_add[$i]) > 0)) {
+				foreach ($wpshop_db_content_add[$i] as $table_name => $def) {
+					foreach ($def as $information_index => $table_information) {
 						$wpdb->insert($table_name, $table_information, '%s');
 						$do_changes = true;
 					}
@@ -332,9 +332,9 @@ 
 			}
 
 			/*	Update datas	*/
-			if(isset($wpshop_db_content_update[$i]) && is_array($wpshop_db_content_update) && is_array($wpshop_db_content_update[$i]) && (count($wpshop_db_content_update[$i]) > 0)){
-				foreach($wpshop_db_content_update[$i] as $table_name => $def){
-					foreach($def as $information_index => $table_information){
+			if (isset($wpshop_db_content_update[$i]) && is_array($wpshop_db_content_update) && is_array($wpshop_db_content_update[$i]) && (count($wpshop_db_content_update[$i]) > 0)) {
+				foreach ($wpshop_db_content_update[$i] as $table_name => $def) {
+					foreach ($def as $information_index => $table_information) {
 						$wpdb->update($table_name, $table_information['datas'], $table_information['where'], '%s', '%s');
 						$do_changes = true;
 					}
@@ -355,54 +355,54 @@ 
 	 *
 	 * @return boolean If there are changes to do or not
 	 */
-	public static function add_content_to_eav( $eav_content, $do_changes ) {
+	public static function add_content_to_eav($eav_content, $do_changes) {
 		global $wpdb;
 		/*	Create entities if entites are set to be created for the current version	*/
-		if(isset($eav_content['entities']) && is_array($eav_content['entities']) && is_array($eav_content['entities']) && (count($eav_content['entities']) > 0)){
-			foreach($eav_content['entities'] as $entity){
+		if (isset($eav_content['entities']) && is_array($eav_content['entities']) && is_array($eav_content['entities']) && (count($eav_content['entities']) > 0)) {
+			foreach ($eav_content['entities'] as $entity) {
 				/*	Creation de l'entité produit dans la table des posts	*/
-				wpshop_entities::create_cpt_from_csv_file( $entity );
+				wpshop_entities::create_cpt_from_csv_file($entity);
 			}
 			$do_changes = true;
 		}
 
 		/*	Create attributes for a given entity if attributes are set to be created for current version	*/
 		if (!empty($eav_content['attributes']) && is_array($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)) {
-			foreach($eav_content['attributes'] as $entity_code){
-				wpshop_entities::create_cpt_attributes_from_csv_file( $entity_code );
+			foreach ($eav_content['attributes'] as $entity_code) {
+				wpshop_entities::create_cpt_attributes_from_csv_file($entity_code);
 			}
 			$do_changes = true;
 		}
 
 		/*	Create attribute groups for a given entity if attributes groups are set to be created for current version	*/
-		if(isset($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)){
-			foreach($eav_content['attribute_groups'] as $entity_code => $attribute_set){
+		if (isset($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)) {
+			foreach ($eav_content['attribute_groups'] as $entity_code => $attribute_set) {
 				$entity_id = wpshop_entities::get_entity_identifier_from_code($entity_code);
 
-				if($entity_id > 0){
-					foreach($attribute_set as $set_name => $set_groups){
+				if ($entity_id > 0) {
+					foreach ($attribute_set as $set_name => $set_groups) {
 						$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE entity_id = %d AND name = LOWER(%s)", $entity_id, wpshop_tools::slugify($set_name, array('noAccent', 'noSpaces', 'lowerCase')));
 						$attribute_set_id = $wpdb->get_var($query);
-						if($attribute_set_id <= 0){
+						if ($attribute_set_id <= 0) {
 							$attribute_set_content = array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_id' => $entity_id, 'name' => $set_name);
-							if($set_name == 'default'){
+							if ($set_name == 'default') {
 								$attribute_set_content['default_set'] = 'yes';
 							}
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_SET, $attribute_set_content);
 							$attribute_set_id = $wpdb->insert_id;
 						}
 
-						if($attribute_set_id > 0){
-							foreach($set_groups as $set_group_infos){
+						if ($attribute_set_id > 0) {
+							foreach ($set_groups as $set_group_infos) {
 								$set_group_infos_details = $set_group_infos['details'];
 								unset($set_group_infos['details']);
 								/*	Change an attribute set status if definition specify this param 	*/
-								if(isset($set_group_infos['status'])){
+								if (isset($set_group_infos['status'])) {
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('last_update_date' => current_time('mysql', 0), 'status' => $set_group_infos['status']), array('id' => $attribute_set_id));
 								}
 								$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, $set_group_infos['code']);
 								$attribute_set_section_id = $wpdb->get_var($query);
-								if($attribute_set_section_id <= 0){
+								if ($attribute_set_section_id <= 0) {
 									$new_set_section_infos = $set_group_infos;
 									$new_set_section_infos['status'] = (isset($new_set_section_infos['status']) ? $new_set_section_infos['status'] : 'valid');
 									$new_set_section_infos['creation_date'] = current_time('mysql', 0);
@@ -411,15 +411,15 @@ 
 									$attribute_set_section_id = $wpdb->insert_id;
 								}
 
-								if(($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details) && (count($set_group_infos_details) > 0))){
+								if (($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details) && (count($set_group_infos_details) > 0))) {
 									$query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
 									$last_position = $wpdb->get_var($query);
 									$position = (int)$last_position + 1;
-									foreach($set_group_infos_details as $attribute_code){
+									foreach ($set_group_infos_details as $attribute_code) {
 										$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_code, $entity_id);
 										$attribute_id = $wpdb->get_row($query);
 
-										if($attribute_id->id > 0){
+										if ($attribute_id->id > 0) {
 											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $attribute_id->id, 'position' => $position));
 											$position++;
 										}
@@ -445,13 +445,13 @@ 
 	 	*
 	 * @return boolean If there are changes to do or not
 	 */
-	public static function update_eav_content( $eav_content, $do_changes ) {
+	public static function update_eav_content($eav_content, $do_changes) {
 		/*	Update attributes fo a given entity if attributes are set to be updated for current version	*/
-		if(isset($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)){
-			foreach($eav_content['attributes'] as $entity_code => $attribute_definition){
-				foreach($attribute_definition as $attribute_def){
+		if (isset($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)) {
+			foreach ($eav_content['attributes'] as $entity_code => $attribute_definition) {
+				foreach ($attribute_definition as $attribute_def) {
 					$option_list_for_attribute = '';
-					if(isset($attribute_def['backend_input_values'])){
+					if (isset($attribute_def['backend_input_values'])) {
 						$option_list_for_attribute = $attribute_def['backend_input_values'];
 						unset($attribute_def['backend_input_values']);
 					}
@@ -465,10 +465,10 @@ 
 					$attribute_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $attribute_def['code']));
 
 					/*	Insert option values if there are some to add for the current attribute	*/
-					if(($option_list_for_attribute != '') && (is_array($option_list_for_attribute))){
-						foreach($option_list_for_attribute as $option_code => $option_value){
+					if (($option_list_for_attribute != '') && (is_array($option_list_for_attribute))) {
+						foreach ($option_list_for_attribute as $option_code => $option_value) {
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $attribute_id, 'label' => ((substr($option_code, 0, 2) != '__') ? $option_value : __(substr($option_code, 2), 'wpshop')), 'value' => $option_value));
-							if($option_code == $attribute_def['default_value']){
+							if ($option_code == $attribute_def['default_value']) {
 								$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('last_update_date' => current_time('mysql', 0), 'default_value' => $wpdb->insert_id), array('id' => $attribute_id, 'default_value' => $option_code));
 							}
 						}
@@ -479,30 +479,30 @@ 
 		}
 
 		/*	Update attribute groups fo a given entity if attributes groups are set to be updated for current version	*/
-		if(is_array($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)){
-			foreach($eav_content['attribute_groups'] as $entity_code => $attribute_set){
+		if (is_array($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)) {
+			foreach ($eav_content['attribute_groups'] as $entity_code => $attribute_set) {
 				$entity_id = wpshop_entities::get_entity_identifier_from_code($entity_code);
 
-				if($entity_id > 0){
-					foreach($attribute_set as $set_name => $set_groups){
+				if ($entity_id > 0) {
+					foreach ($attribute_set as $set_name => $set_groups) {
 						$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE entity_id = %d AND name = LOWER(%s)", $entity_id, wpshop_tools::slugify($set_name, array('noAccent', 'noSpaces', 'lowerCase')));
 						$attribute_set_id = $wpdb->get_var($query);
-						if($attribute_set_id <= 0){
+						if ($attribute_set_id <= 0) {
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_SET, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_id' => $entity_id, 'name' => $set_name));
 							$attribute_set_id = $wpdb->insert_id;
 						}
 
-						if($attribute_set_id > 0){
-							foreach($set_groups as $set_group_infos){
+						if ($attribute_set_id > 0) {
+							foreach ($set_groups as $set_group_infos) {
 								$set_group_infos_details = $set_group_infos['details'];
 								unset($set_group_infos['details']);
 								/*	Change an attribute set status if definition specify this param 	*/
-								if(isset($set_group_infos['status'])){
+								if (isset($set_group_infos['status'])) {
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('last_update_date' => current_time('mysql', 0), 'status' => $set_group_infos['status']), array('id' => $attribute_set_id));
 								}
 								$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, $set_group_infos['code']);
 								$attribute_set_section_id = $wpdb->get_var($query);
-								if($attribute_set_section_id <= 0){
+								if ($attribute_set_section_id <= 0) {
 									$new_set_section_infos = $set_group_infos;
 									$new_set_section_infos['status'] = (isset($new_set_section_infos['status']) ? $new_set_section_infos['status'] : 'valid');
 									$new_set_section_infos['creation_date'] = current_time('mysql', 0);
@@ -510,24 +510,24 @@ 
 									$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos);
 									$attribute_set_section_id = $wpdb->insert_id;
 								}
-								else{
+								else {
 									$new_set_section_infos = $set_group_infos;
 									$new_set_section_infos['last_update_date'] = current_time('mysql', 0);
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos, array('id' => $attribute_set_section_id));
 								}
 
-								if(($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details))){
-									if(count($set_group_infos_details) <= 0){
+								if (($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details))) {
+									if (count($set_group_infos_details) <= 0) {
 										$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('last_update_date' => current_time('mysql', 0), 'status' => 'deleted'), array('entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id));
 									}
-									else{
+									else {
 										$query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
 										$last_position = $wpdb->get_var($query);
 										$position = (int)$last_position + 1;
-										foreach($set_group_infos_details as $attribute_code){
+										foreach ($set_group_infos_details as $attribute_code) {
 											$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_code, $entity_id);
 											$attribute_id = $wpdb->get_var($query);
-											if($attribute_id > 0){
+											if ($attribute_id > 0) {
 												$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $attribute_id, 'position' => $position));
 												$position++;
 											}
@@ -548,11 +548,11 @@ 
 	/**
 	 * Manage special operation on wpshop plugin update
 	 */
-	public static function make_specific_operation_on_update($version){
+	public static function make_specific_operation_on_update($version) {
 		global $wpdb, $wp_rewrite;
 		$wpshop_shop_type = get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
 
-		switch($version){
+		switch ($version) {
 			case 3:
 			case 6:
  				self::wpshop_insert_default_pages($wpshop_shop_type);
@@ -561,38 +561,38 @@ 
 			break;
 			case 8:
 				/**	Change metaboxes order for product in case it already exists	*/
-				$query = $wpdb->prepare( "SELECT umeta_id, meta_value FROM {$wpdb->usermeta} WHERE meta_key = %s", 'meta-box-order_wpshop_product' );
-				$customer_metaboxes_order = $wpdb->get_results( $query );
-				if ( !empty( $customer_metaboxes_order ) ) {
-					foreach ( $customer_metaboxes_order as $customer_metabox_order ) {
+				$query = $wpdb->prepare("SELECT umeta_id, meta_value FROM {$wpdb->usermeta} WHERE meta_key = %s", 'meta-box-order_wpshop_product');
+				$customer_metaboxes_order = $wpdb->get_results($query);
+				if (!empty($customer_metaboxes_order)) {
+					foreach ($customer_metaboxes_order as $customer_metabox_order) {
 						$do_changes = false;
-						$current_order = unserialize( $customer_metabox_order->meta_value );
-						if ( array_key_exists( 'normal', $current_order ) && ( false !== strpos( 'wpshop_product_important_datas', $current_order[ 'normal' ] ) ) ) {
-							str_replace( 'wpshop_product_important_datas,', '', $current_order[ 'normal' ] );
+						$current_order = unserialize($customer_metabox_order->meta_value);
+						if (array_key_exists('normal', $current_order) && (false !== strpos('wpshop_product_important_datas', $current_order['normal']))) {
+							str_replace('wpshop_product_important_datas,', '', $current_order['normal']);
 							$do_changes = true;
 						}
 
-						if ( array_key_exists( 'side', $current_order ) ) {
-							str_replace( 'wpshop_product_important_datas,', '', $current_order[ 'side' ] );
-							str_replace( 'submitdiv,', 'submitdiv,wpshop_product_important_datas,', $current_order[ 'side' ] );
+						if (array_key_exists('side', $current_order)) {
+							str_replace('wpshop_product_important_datas,', '', $current_order['side']);
+							str_replace('submitdiv,', 'submitdiv,wpshop_product_important_datas,', $current_order['side']);
 							$do_changes = true;
 						}
 
-						if ( true === $do_changes ) {
-							$wpdb->update( $wpdb->usermeta, array( 'meta_value' => serialize( $current_order ), ), array( 'umeta_id' => $customer_metabox_order->umeta_id ) );
+						if (true === $do_changes) {
+							$wpdb->update($wpdb->usermeta, array('meta_value' => serialize($current_order),), array('umeta_id' => $customer_metabox_order->umeta_id));
 						}
 					}
 				}
 				else {
-					$users = get_users( array( 'role' => 'administrator', ) );
-					if ( !empty( $users ) ) {
-						foreach ( $users as $user ) {
+					$users = get_users(array('role' => 'administrator',));
+					if (!empty($users)) {
+						foreach ($users as $user) {
 							$user_meta = array(
 								'side' => 'submitdiv,formatdiv,wpshop_product_important_datas,wpshop_product_categorydiv,pageparentdiv,wps_barcode_product,wpshop_product_actions,wpshop_product_options,postimagediv',
 								'normal' => 'wpshop_product_fixed_tab,postexcerpt,trackbacksdiv,postcustom,commentstatusdiv,slugdiv,authordiv,wpshop_wpshop_variations,wps_media_manager,wpshop_product_order_historic',
 								'advanced' => '',
 							);
-							update_user_meta( $user->ID, 'meta-box-order_wpshop_product', $user_meta );
+							update_user_meta($user->ID, 'meta-box-order_wpshop_product', $user_meta);
 						}
 					}
 				}
@@ -608,7 +608,7 @@ 
 				$tax_id = $wpdb->get_var($wpdb->prepare("SELECT ATT_OPT.id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATT_OPT WHERE attribute_id = %d AND value = '20'", $product_prices->tx_tva));
 				$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " WHERE attribute_id = %d", $product_prices->product_price);
 				$price_list = $wpdb->get_results($query);
-				foreach($price_list as $existing_ttc_price){
+				foreach ($price_list as $existing_ttc_price) {
 					$tax_rate = 1.20;
 					$price_ht = $existing_ttc_price->value / $tax_rate;
 					$tax_amount = $existing_ttc_price->value - $price_ht;
@@ -619,24 +619,24 @@ 
 				}
 
 				/*	Update orders structure into database	*/
-				$orders_id = $wpdb->get_results('SELECT ID FROM '.$wpdb->posts.' WHERE post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'"');
+				$orders_id = $wpdb->get_results('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"');
 				foreach ($orders_id as $o) {
 					$myorder = get_post_meta($o->ID, '_order_postmeta', true);
 					$neworder = array();
 					$items = array();
 
-					if(!isset($myorder['order_tva'])){
+					if (!isset($myorder['order_tva'])) {
 						$order_total_ht = 0;
 						$order_total_ttc = 0;
 						$order_tva = array('20'=>0);
 
 						foreach ($myorder['order_items'] as $item) {
 							/* item */
-							$pu_ht = $item['cost']/1.20;
-							$pu_tva = $item['cost']-$pu_ht;
-							$total_ht = $pu_ht*$item['qty'];
-							$tva_total_amount = $pu_tva*$item['qty'];
-							$total_ttc = $item['cost']*$item['qty'];
+							$pu_ht = $item['cost'] / 1.20;
+							$pu_tva = $item['cost'] - $pu_ht;
+							$total_ht = $pu_ht * $item['qty'];
+							$tva_total_amount = $pu_tva * $item['qty'];
+							$total_ttc = $item['cost'] * $item['qty'];
 							/* item */
 							$order_total_ht += $total_ht;
 							$order_total_ttc += $total_ttc;
@@ -683,7 +683,7 @@ 
 							'order_total_ttc' => $order_total_ttc,
 							'order_grand_total' => $order_total_ttc,
 							'order_shipping_cost' => number_format(0, 2, '.', ''),
-							'order_tva' => array_map(array( 'wpshop_tools', 'number_format_hack' ), $order_tva),
+							'order_tva' => array_map(array('wpshop_tools', 'number_format_hack'), $order_tva),
 							'order_items' => $items
 						);
 						/* Update the order postmeta */
@@ -698,29 +698,29 @@ 
 			case 12:
 				$query = "SELECT ID FROM " . $wpdb->users;
 				$user_list = $wpdb->get_results($query);
-				foreach($user_list as $user){
+				foreach ($user_list as $user) {
 					$user_first_name = get_user_meta($user->ID, 'first_name', true);
 					$user_last_name = get_user_meta($user->ID, 'last_name', true);
 					$shipping_info = get_user_meta($user->ID, 'shipping_info', true);
 
-					if(($user_first_name == '') && !empty($shipping_info['first_name'])){
+					if (($user_first_name == '') && !empty($shipping_info['first_name'])) {
 						update_user_meta($user->ID, 'first_name', $shipping_info['first_name']);
 					}
 
-					if(($user_last_name == '') && !empty($shipping_info['last_name'])){
+					if (($user_last_name == '') && !empty($shipping_info['last_name'])) {
 						update_user_meta($user->ID, 'last_name', $shipping_info['last_name']);
 					}
 				}
 
 				/*	Update orders structure into database	*/
-				$orders_id = $wpdb->get_results('SELECT ID FROM '.$wpdb->posts.' WHERE post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'"');
-				foreach($orders_id as $o){
+				$orders_id = $wpdb->get_results('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"');
+				foreach ($orders_id as $o) {
 					$myorder = get_post_meta($o->ID, '_order_postmeta', true);
-					if(!empty($myorder)){
+					if (!empty($myorder)) {
 						$new_items = array();
-						foreach($myorder['order_items'] as $item){
+						foreach ($myorder['order_items'] as $item) {
 							$new_items = $item;
-							$new_items['item_discount_type'] = !empty($item['item_discount_rate'])?$item['item_discount_rate']:'amount';
+							$new_items['item_discount_type'] = !empty($item['item_discount_rate']) ? $item['item_discount_rate'] : 'amount';
 							// unset($new_items['item_discount_rate']);
 							$new_items['item_discount_value'] = 0;
 						}
@@ -740,12 +740,12 @@ 
 			break;
 			case 13:
 				$attribute_used_for_sort_by = wpshop_attributes::getElement('yes', "'valid', 'moderated', 'notused'", 'is_used_for_sort_by', true);
-				foreach($attribute_used_for_sort_by as $attribute){
+				foreach ($attribute_used_for_sort_by as $attribute) {
 					$data = query_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
-					foreach($data as $post){
+					foreach ($data as $post) {
 						$postmeta = get_post_meta($post->ID, '_wpshop_product_metadata', true);
-						if(!empty($postmeta[$attribute->code])) {
-							update_post_meta($post->ID, '_'.$attribute->code, $postmeta[$attribute->code]);
+						if (!empty($postmeta[$attribute->code])) {
+							update_post_meta($post->ID, '_' . $attribute->code, $postmeta[$attribute->code]);
 						}
 					}
 					wp_reset_query();
@@ -758,9 +758,9 @@ 
 				);
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = %s", 'yes');
 				$default_attribute_set = $wpdb->get_var($query);
-				foreach($products as $product){
+				foreach ($products as $product) {
 					$p_att_set_id = get_post_meta($product->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
-					if(empty($p_att_set_id)){
+					if (empty($p_att_set_id)) {
 						/*	Update the attribute set id for the current product	*/
 						update_post_meta($product->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $default_attribute_set);
 					}
@@ -786,16 +786,16 @@ 
 				 */
 				$query = $wpdb->prepare("SELECT ATTR_OPT.id, ATTR_OPT.value, ATTR_OPT.label, ATTR_OPT.position, ATTR_OPT.attribute_id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATTR_OPT INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR ON (ATTR.id = ATTR_OPT.attribute_id) WHERE ATTR_OPT.status=%s AND ATTR.code=%s", 'valid', 'manage_stock');
 				$manage_stock_option = $wpdb->get_results($query);
-				if( !empty( $manage_stock_option ) ){
+				if (!empty($manage_stock_option)) {
 					$no_is_present = false;
 					$attribute_id = $manage_stock_option[0]->attribute_id;
 					foreach ($manage_stock_option as $manage_definition) {
-						if( strtolower( __( $manage_definition->value, 'wpshop' ) ) == strtolower( __( 'no', 'wpshop' ) ) ) {
+						if (strtolower(__($manage_definition->value, 'wpshop')) == strtolower(__('no', 'wpshop'))) {
 							$no_is_present = true;
 						}
 					}
-					if ( !$no_is_present ) {
-						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql',0), 'last_update_date'=>current_time('mysql',0),'attribute_id'=>$attribute_id, 'value'=>'no', 'label'=>__('No', 'wpshop')));
+					if (!$no_is_present) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql', 0), 'last_update_date'=>current_time('mysql', 0), 'attribute_id'=>$attribute_id, 'value'=>'no', 'label'=>__('No', 'wpshop')));
 					}
 				}
 
@@ -814,29 +814,29 @@ 
 WHERE ATTR_DET.attribute_id IN (" . $attribute_ids . ")"
 						, 'prices', __('default', 'wpshop'));
 				$list = $wpdb->get_results($query);
-				if(!empty($list)){
+				if (!empty($list)) {
 					$change_order = true;
 					$old_value = $list[0]->attribute_group_id;
 					unset($list[0]);
-					if(!empty($list)){
+					if (!empty($list)) {
 						foreach ($list as $data) {
-							if ( $old_value !=  $data->attribute_group_id) {
+							if ($old_value != $data->attribute_group_id) {
 								$change_order = false;
 							}
 						}
 						if ($change_order) {
-							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;
@@ -852,7 +852,7 @@ 
 			case 22:
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 				$product_entity_id = $wpdb->get_var($query);
-				if(empty($product_entityd_id) || ($product_entity_id <= 0) || !$product_entity_id){
+				if (empty($product_entityd_id) || ($product_entity_id <= 0) || !$product_entity_id) {
 					/*	Create the product entity into post table	*/
 					$product_entity = array(
 						'post_title' => __('Products', 'wpshop'),
@@ -862,7 +862,7 @@ 
 						'post_author' => 1,
 						'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES
 					);
-					$product_entity_id = wp_insert_post( $product_entity );
+					$product_entity_id = wp_insert_post($product_entity);
 				}
 
 				/*	Update eav table with the new entity id for product	*/
@@ -886,12 +886,12 @@ 
 			break;
 			case 23:
 				/*	Delete duplicate entities	*/
-				$query = ("SELECT ID FROM " . $wpdb->posts . " WHERE post_name LIKE '%".WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT."%' ");
+				$query = ("SELECT ID FROM " . $wpdb->posts . " WHERE post_name LIKE '%" . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "%' ");
 				$product_entity_list = $wpdb->get_results($query);
-				if ( count($product_entity_list) > 1 ) {
+				if (count($product_entity_list) > 1) {
 					$i = 0;
-					foreach($product_entity_list as $product_entity){
-						if ($i>0) {
+					foreach ($product_entity_list as $product_entity) {
+						if ($i > 0) {
 							wp_delete_post($product_entity->ID);
 						}
 					}
@@ -902,16 +902,16 @@ 
 				/*	Update the link status for disabled attribute set	*/
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE status = %s", 'deleted');
 				$deleted_attribute_group = $wpdb->get_results($query);
-				if(!empty($deleted_attribute_group)) {
-					foreach($deleted_attribute_group as $group){
+				if (!empty($deleted_attribute_group)) {
+					foreach ($deleted_attribute_group as $group) {
 						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0)), array('attribute_group_id' => $group->id));
 					}
 				}
 
 				/*	Update entities meta management	*/
 				$entities = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES));
-				if(!empty($entities)){
-					foreach($entities as $entity){
+				if (!empty($entities)) {
+					foreach ($entities as $entity) {
 						$support = get_post_meta($entity->ID, '_wpshop_entity_support', true);
 						$rewrite = get_post_meta($entity->ID, '_wpshop_entity_rewrite', true);
 						update_post_meta($entity->ID, '_wpshop_entity_params', array('support' => $support, 'rewrite' => array('slug' => $rewrite)));
@@ -931,7 +931,7 @@ 
 				/*	Get entities that have been created a lot of time and delete them	*/
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE (post_name LIKE '%%" . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "-%%' OR post_name LIKE '%%" . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "-%%') AND post_type=%s", WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
 				$entities_to_delete = $wpdb->get_results($query);
-				if ( !empty($entities_to_delete) && is_array($entities_to_delete) ) {
+				if (!empty($entities_to_delete) && is_array($entities_to_delete)) {
 					foreach ($entities_to_delete as $entity) {
 						wp_delete_post($entity->ID, true);
 					}
@@ -940,14 +940,14 @@ 
 				/*	Get post list that are children of entities created a lot of time */
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "-%");
 				$entities_to_update = $wpdb->get_results($query);
-				if ( !empty($entities_to_update) && is_array($entities_to_update) ) {
+				if (!empty($entities_to_update) && is_array($entities_to_update)) {
 					foreach ($entities_to_update as $entity) {
 						wp_update_post(array('ID' => $entity->ID, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS));
 					}
 				}
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "-%");
 				$entities_to_update = $wpdb->get_results($query);
-				if ( !empty($entities_to_update) && is_array($entities_to_update) ) {
+				if (!empty($entities_to_update) && is_array($entities_to_update)) {
 					foreach ($entities_to_update as $entity) {
 						wp_update_post(array('ID' => $entity->ID, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
 					}
@@ -955,12 +955,12 @@ 
 
 				/*	Change addons managament	*/
 				$wpshop_addons_options = get_option('wpshop_addons_state', array());
-				if ( !empty($wpshop_addons_options) ) {
-					foreach ($wpshop_addons_options as $addon_name => $addon_state ) {
+				if (!empty($wpshop_addons_options)) {
+					foreach ($wpshop_addons_options as $addon_name => $addon_state) {
 						$options_args = array();
 						$options_args[$addon_name]['activate'] = $addon_state;
 						$options_args[$addon_name]['activation_date'] = current_time('mysql', 0);
-						if (! $addon_state ) $options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
+						if (!$addon_state) $options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
 						add_option(WPSHOP_ADDONS_OPTION_NAME, $options_args);
 					}
 					delete_option('wpshop_addons_state');
@@ -973,7 +973,7 @@ 
 				return true;
 			break;
 			case 26:
-				$query = "SELECT post_id, meta_value FROM " .$wpdb->postmeta. " WHERE meta_key = '_order_postmeta' ";
+				$query = "SELECT post_id, meta_value FROM " . $wpdb->postmeta . " WHERE meta_key = '_order_postmeta' ";
 				$results = $wpdb->get_results($query);
 				foreach ($results as $result) {
 					$order_info = unserialize($result->meta_value);
@@ -990,36 +990,36 @@ 
 			break;
 
 			case 29:
-				$billing_title = __( 'Billing address', 'wpshop' );
-				$shipping_title = __( 'Shipping address', 'wpshop' );
+				$billing_title = __('Billing address', 'wpshop');
+				$shipping_title = __('Shipping address', 'wpshop');
 
 				//UPDATE USERS ADDRESSES
-				$billing_address_set_id_query = 'SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE name = "' .$billing_title. '"';
-				$shipping_address_set_id_query = 'SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE name = "' .$shipping_title. '"';
+				$billing_address_set_id_query = 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . $billing_title . '"';
+				$shipping_address_set_id_query = 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . $shipping_title . '"';
 
 				$billing_address_set_id = $wpdb->get_var($billing_address_set_id_query);
 				$shipping_address_set_id = $wpdb->get_var($shipping_address_set_id_query);
 
 
 				//Add Address & Google Map API KEY options
-				add_option( 'wpshop_billing_address', array('choice' => $billing_address_set_id), '', 'yes' );
-				add_option( 'wpshop_shipping_address_choice', array('activate'=>'on', 'choice'=> $shipping_address_set_id), '', 'yes' );
-				add_option( 'wpshop_google_map_api_key', '', '', 'yes' );
+				add_option('wpshop_billing_address', array('choice' => $billing_address_set_id), '', 'yes');
+				add_option('wpshop_shipping_address_choice', array('activate'=>'on', 'choice'=> $shipping_address_set_id), '', 'yes');
+				add_option('wpshop_google_map_api_key', '', '', 'yes');
 
 
 
-				$query = 'SELECT * FROM ' .$wpdb->users. '';
+				$query = 'SELECT * FROM ' . $wpdb->users . '';
 				$results = $wpdb->get_results($query);
 				foreach ($results as $result) {
-					$billing_infos = get_user_meta( $result->ID, 'billing_info', true );
-					$shipping_infos = get_user_meta( $result->ID, 'shipping_info', true );
-					if ( !empty($billing_infos) ) {
+					$billing_infos = get_user_meta($result->ID, 'billing_info', true);
+					$shipping_infos = get_user_meta($result->ID, 'shipping_info', true);
+					if (!empty($billing_infos)) {
 						//Save Billing Infos
 						$billing_address = array();
-						if ( !empty($billing_infos['civility']) ) {
-							switch ( $billing_infos['civility'] ) {
+						if (!empty($billing_infos['civility'])) {
+							switch ($billing_infos['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 								break;
 								case 2:
 									$civility = $madam_id;
@@ -1030,7 +1030,7 @@ 
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$billing_address = array('address_title' => $billing_title,
 							'address_last_name' => !empty($billing_infos['last_name']) ? $billing_infos['last_name'] : '',
@@ -1058,16 +1058,16 @@ 
 						$post_address_id = wp_insert_post($post_address);
 
 						//Create the post_meta with the address infos
-						update_post_meta($post_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', $billing_address);
-						update_post_meta($post_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_attribute_set_id', $billing_address_set_id);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', $billing_address);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $billing_address_set_id);
 					}
 
-					if ( !empty($shipping_infos) ) {
+					if (!empty($shipping_infos)) {
 						//Save Shipping Infos
-						if ( !empty($shipping_infos['civility']) ) {
-							switch ( $shipping_infos['civility'] ) {
+						if (!empty($shipping_infos['civility'])) {
+							switch ($shipping_infos['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1078,7 +1078,7 @@ 
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$shipping_address = array();
 						$shipping_address = array('address_title' => $shipping_title,
@@ -1103,22 +1103,22 @@ 
 						);
 						$post_address_id = wp_insert_post($post_address);
 						//Create the post_meta with the address infos
-						update_post_meta($post_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', $shipping_address);
-						update_post_meta($post_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_attribute_set_id', $shipping_address_set_id);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', $shipping_address);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $shipping_address_set_id);
 					}
 				}
 
 				// FORMATE THE ORDER ADDRESSES INFOS
-				$results = query_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1) );
-				foreach ( $results as $result ) {
+				$results = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1));
+				foreach ($results as $result) {
 					$address = get_post_meta($result->ID, '_order_info', true);
 
 					$billing_address = array();
-					if ( !empty($address['billing']) ) {
-						if ( !empty($address['billing']['civility']) ) {
-							switch ( $address['billing']['civility'] ) {
+					if (!empty($address['billing'])) {
+						if (!empty($address['billing']['civility'])) {
+							switch ($address['billing']['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1127,12 +1127,12 @@ 
 									$civility = $miss_id;
 									break;
 								default:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$billing_address = array('address_title' => $billing_title,
 							'address_last_name' => !empty($address['billing']['last_name']) ? $address['billing']['last_name'] : '',
@@ -1151,11 +1151,11 @@ 
 					}
 
 					$shipping_address = array();
-					if ( !empty($address['shipping']) ) {
-						if ( !empty($address['shipping']['civility']) ) {
-							switch ( $address['shipping']['civility'] ) {
+					if (!empty($address['shipping'])) {
+						if (!empty($address['shipping']['civility'])) {
+							switch ($address['shipping']['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1166,7 +1166,7 @@ 
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$shipping_address = array('address_title' => $shipping_title,
 							'address_last_name' => !empty($address['shipping']['last_name']) ? $address['shipping']['last_name'] : '',
@@ -1191,11 +1191,11 @@ 
 
 				/*	Update entities meta management	*/
 				$entities = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, 'posts_per_page' => -1));
-				if(!empty($entities)){
-					foreach($entities as $entity){
+				if (!empty($entities)) {
+					foreach ($entities as $entity) {
 						$params = get_post_meta($entity->ID, '_wpshop_entity_params', true);
-						$support = ( !empty($params['support']) ) ? $params['support'] : '';
-						$rewrite = ( !empty($params['rewrite']) ) ? $params['rewrite'] : '';
+						$support = (!empty($params['support'])) ? $params['support'] : '';
+						$rewrite = (!empty($params['rewrite'])) ? $params['rewrite'] : '';
 
 						$display_admin_menu = 'on';
 
@@ -1205,35 +1205,35 @@ 
 				wp_reset_query();
 
 				// Default Weight unity and Currency Options
-				add_option( 'wpshop_shop_weight_group', 3, '', 'yes' );
-				add_option( 'wpshop_shop_default_weight_unity', 6, '', 'yes' );
-				add_option( 'wpshop_shop_currency_group', 4, '', 'yes' );
+				add_option('wpshop_shop_weight_group', 3, '', 'yes');
+				add_option('wpshop_shop_default_weight_unity', 6, '', 'yes');
+				add_option('wpshop_shop_currency_group', 4, '', 'yes');
 
 				$default_currency = get_option('wpshop_shop_default_currency');
-				foreach ( unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v ) {
-					if ( $default_currency == $k ) {
+				foreach (unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v) {
+					if ($default_currency == $k) {
 						$symbol = $v;
 					}
 				}
-				if ( !empty($symbol) ) {
-					$query = 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE name = "'.html_entity_decode($symbol, ENT_QUOTES, 'UTF-8').'"';
+				if (!empty($symbol)) {
+					$query = 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE name = "' . html_entity_decode($symbol, ENT_QUOTES, 'UTF-8') . '"';
 					$currency = $wpdb->get_row($query);
-					if ( !empty($currency) ) {
+					if (!empty($currency)) {
 						update_option('wpshop_shop_default_currency', $currency->id);
 						// Update the change rate of the default currency
-						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id) );
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id));
 					}
 				}
 
 				// Update the field for variation and user definition field
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_for_variation' => 'yes'), array('is_user_defined' => 'yes') );
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_for_variation' => 'yes'), array('is_user_defined' => 'yes'));
 				// Update field type for frontend output selection
 				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'text'), array());
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'textarea'), array('backend_input' => 'textarea') );
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'multiple-select') );
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'select') );
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'textarea'), array('backend_input' => 'textarea'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'multiple-select'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'select'));
 
-				add_option('wpshop_cart_option', array( 'product_added_to_cart' => array('dialog_msg'), 'product_added_to_quotation' => array('cart_page')) );
+				add_option('wpshop_cart_option', array('product_added_to_cart' => array('dialog_msg'), 'product_added_to_quotation' => array('cart_page')));
 
 				return true;
 			break;
@@ -1247,22 +1247,22 @@ 
 				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'product_reference'));
 
 				/**	Insert new message for admin when a customer make an order	*/
-				$admin_new_order_message = get_option( 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' );
-				if ( empty($admin_new_order_message) ) {
-					wps_message_ctr::createMessage( 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' );
+				$admin_new_order_message = get_option('WPSHOP_NEW_ORDER_ADMIN_MESSAGE');
+				if (empty($admin_new_order_message)) {
+					wps_message_ctr::createMessage('WPSHOP_NEW_ORDER_ADMIN_MESSAGE');
 				}
 				/**	Update all amount for paypal orders	*/
 				$query = $wpdb->prepare("SELECT post_id FROM " . $wpdb->postmeta . " WHERE meta_key = %s AND meta_value = %s ", '_wpshop_payment_method', 'paypal');
-				$paypal_payment_list = $wpdb->get_results( $query );
-				if ( !empty($paypal_payment_list) ) {
-					foreach ( $paypal_payment_list as $post ) {
-						$order_meta = get_post_meta( $post->post_id, '_order_postmeta', true );
-						$order_payment_meta = get_post_meta( $post->post_id, 'wpshop_payment_return_data', true );
-						if ( !empty($order_meta['order_status']) && ($order_meta['order_status'] == 'incorrect_amount') ) {
-							if ( !empty($order_meta['order_grand_total']) && !empty($order_payment_meta['mc_gross']) ) {
+				$paypal_payment_list = $wpdb->get_results($query);
+				if (!empty($paypal_payment_list)) {
+					foreach ($paypal_payment_list as $post) {
+						$order_meta = get_post_meta($post->post_id, '_order_postmeta', true);
+						$order_payment_meta = get_post_meta($post->post_id, 'wpshop_payment_return_data', true);
+						if (!empty($order_meta['order_status']) && ($order_meta['order_status'] == 'incorrect_amount')) {
+							if (!empty($order_meta['order_grand_total']) && !empty($order_payment_meta['mc_gross'])) {
 								$order_amount_to_pay = number_format($order_meta['order_grand_total'], 5);
 								$order_amount_payed = number_format(floatval($order_payment_meta['mc_gross']), 5);
-								if ($order_amount_payed == $order_amount_to_pay ) {
+								if ($order_amount_payed == $order_amount_to_pay) {
 									wpshop_payment::setOrderPaymentStatus($order_id, 'completed');
 								}
 							}
@@ -1273,17 +1273,17 @@ 
 				/**	Save existing orders address information	*/
 				$billing_title = __('Billing address', 'wpshop');
 				$shipping_title = __('Shipping address', 'wpshop');
-				$results = query_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1) );
-				foreach ( $results as $result ) {
+				$results = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1));
+				foreach ($results as $result) {
 					$address = get_post_meta($result->ID, '_order_info', true);
 					$address_format = array();
 
 					$billing_address = array();
-					if ( !empty($address['billing']) && empty($address['billing']['id']) ) {
-						if ( !empty($address['billing']['civility']) ) {
-							switch ( $address['billing']['civility'] ) {
+					if (!empty($address['billing']) && empty($address['billing']['id'])) {
+						if (!empty($address['billing']['civility'])) {
+							switch ($address['billing']['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1292,12 +1292,12 @@ 
 									$civility = $miss_id;
 									break;
 								default:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$billing_address = array('address_title' => $billing_title,
 							'address_last_name' => !empty($address['billing']['last_name']) ? $address['billing']['last_name'] : '',
@@ -1313,17 +1313,17 @@ 
 							'tva_intra' => !empty($address['billing']['company_tva_intra']) ? $address['billing']['company_tva_intra'] : '',
 							'civility' => $civility
 						);
-						$billing_address_option = get_option( 'wpshop_billing_address' );
+						$billing_address_option = get_option('wpshop_billing_address');
 						$address_format['billing']['id'] = $billing_address_option['choice'];
 						$address_format['billing']['address'] = $shipping_address;
 					}
 
 					$shipping_address = array();
-					if ( !empty($address['shipping']) && empty($address['shipping']['id']) ) {
-						if ( !empty($address['shipping']['civility']) ) {
-							switch ( $address['shipping']['civility'] ) {
+					if (!empty($address['shipping']) && empty($address['shipping']['id'])) {
+						if (!empty($address['shipping']['civility'])) {
+							switch ($address['shipping']['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1347,19 +1347,19 @@ 
 							'country' => !empty($address['shipping']['country']) ? $address['shipping']['country'] : '',
 							'civility' => $civility
 						);
-						$shipping_address_options = get_option( 'wpshop_shipping_address_choice' );
+						$shipping_address_options = get_option('wpshop_shipping_address_choice');
 						$address_format['shipping']['id'] = $shipping_address_options['choice'];
 						$address_format['shipping']['address'] = $shipping_address;
 					}
 
-					if ( !empty($address_format) ) {
+					if (!empty($address_format)) {
 						update_post_meta($result->ID, '_order_info', $address_format);
 					}
 				}
 
 				/**	Delete username from frontend form	*/
 				$attribute_login = wpshop_attributes::getElement('user_login', "'valid'", 'code');
-				if ( !empty($attribute_login) ) {
+				if (!empty($attribute_login)) {
 					$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0), 'position' => 0), array('attribute_id' => $attribute_login->id));
 				}
 
@@ -1370,9 +1370,9 @@ 
 
 			case '31':
 				/**	Change order structure in order to support several payment	*/
-				$existing_orders = query_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1, 'post_status' => array('draft', 'trash', 'publish')) );
-				if ( !empty($existing_orders) ) {
-					foreach ( $existing_orders as $order_main_informations) {
+				$existing_orders = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1, 'post_status' => array('draft', 'trash', 'publish')));
+				if (!empty($existing_orders)) {
+					foreach ($existing_orders as $order_main_informations) {
 						/**	Transfer payment return data form old meta to new	*/
 						$order_payment_return_data = get_post_meta($order_main_informations->ID, 'wpshop_payment_return_data', true);
 						update_post_meta($order_main_informations->ID, '_wpshop_payment_return_data', $order_payment_return_data);
@@ -1380,7 +1380,7 @@ 
 
 						/**	Transfer old payment storage method to new storage method	*/
 						$order_meta = get_post_meta($order_main_informations->ID, '_order_postmeta', true);
-						if ( !empty($order_meta['order_status']) ) {
+						if (!empty($order_meta['order_status'])) {
 							$order_meta['order_payment']['customer_choice'] = array('method' => (!empty($order_meta['payment_method']) ? $order_meta['payment_method'] : (!empty($order_meta['order_payment']['customer_choice']) ? $order_meta['order_payment']['customer_choice'] : '')));
 							unset($order_meta['payment_method']);
 							$order_meta['order_payment']['received'][0]['waited_amount'] = !empty($order_meta['order_grand_total']) ? $order_meta['order_grand_total'] : 0;
@@ -1389,9 +1389,9 @@ 
 							$order_meta['order_payment']['received'][0]['status'] = 'waiting_payment';
 							$order_meta['order_payment']['received'][0]['comment'] = '';
 							$order_meta['order_payment']['received'][0]['author'] = $order_meta['order_payment']['customer_choice'] == 'check' ? 1 : $order_meta['customer_id'];
-							if ( in_array($order_meta['order_status'], array('completed', 'shipped')) ) {
+							if (in_array($order_meta['order_status'], array('completed', 'shipped'))) {
 								$order_meta['order_payment']['received'][0]['received_amount'] = $order_meta['order_grand_total'];
-								$order_meta['order_payment']['received'][0]['payment_reference'] = wpshop_payment::get_payment_transaction_number_old_way( $order_main_informations->ID );
+								$order_meta['order_payment']['received'][0]['payment_reference'] = wpshop_payment::get_payment_transaction_number_old_way($order_main_informations->ID);
 								$order_meta['order_payment']['received'][0]['date'] = $order_meta['order_payment_date'];
 								$order_meta['order_payment']['received'][0]['status'] = 'payment_received';
 								$order_meta['order_payment']['received'][0]['comment'] = '';
@@ -1421,43 +1421,43 @@ 
 				wp_reset_query();
 
 				$default_currency = get_option('wpshop_shop_default_currency');
-				foreach ( unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v ) {
-					if ( $default_currency == $k ) {
+				foreach (unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v) {
+					if ($default_currency == $k) {
 						$symbol = $v;
 					}
 				}
-				if ( !empty($symbol) ) {
-					$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE name = "'.html_entity_decode($symbol, ENT_QUOTES, 'UTF-8').'"', '');
+				if (!empty($symbol)) {
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE name = "' . html_entity_decode($symbol, ENT_QUOTES, 'UTF-8') . '"', '');
 					$currency = $wpdb->get_row($query);
-					if ( !empty($currency) ) {
+					if (!empty($currency)) {
 						update_option('wpshop_shop_default_currency', $currency->id);
 						// Update the change rate of the default currency
-						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id) );
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id));
 					}
 				}
 
 				$shipping_confirmation_message = get_option('WPSHOP_SHIPPING_CONFIRMATION_MESSAGE');
-				if ( !empty($shipping_confirmation_message) ) {
+				if (!empty($shipping_confirmation_message)) {
 					$message = __('Hello [customer_first_name] [customer_last_name], this email confirms that your order ([order_key]) has just been shipped (order date : [order_date], tracking number : [order_trackingNumber]). Thank you for your loyalty. Have a good day.', 'wpshop');
 					$post = array('ID'=> $shipping_confirmation_message, 'post_content' => $message);
-					wp_update_post( $post );
+					wp_update_post($post);
 				}
 				return true;
 			break;
 			case '32':
 				/**	Update product set id that are null 	*/
-				$query = $wpdb->prepare( "UPDATE " . $wpdb->postmeta . " SET meta_value = (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = 'yes' AND entity_id = '" . wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) . "') WHERE meta_key = %s AND ((meta_value = '') OR (meta_value = null))", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id' );
+				$query = $wpdb->prepare("UPDATE " . $wpdb->postmeta . " SET meta_value = (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = 'yes' AND entity_id = '" . wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) . "') WHERE meta_key = %s AND ((meta_value = '') OR (meta_value = null))", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id');
 				$wpdb->query($query);
 
-				$addons_options = get_option( WPSHOP_ADDONS_OPTION_NAME );
-				if ( !empty($addons_options) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) && $addons_options['WPSHOP_ADDONS_QUOTATION']['activate'] ) {
-					$admin_new_quotation_message = get_option( 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' );
-					if ( empty($admin_new_quotation_message) ) {
-						wps_message_ctr::createMessage( 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' );
+				$addons_options = get_option(WPSHOP_ADDONS_OPTION_NAME);
+				if (!empty($addons_options) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) && $addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) {
+					$admin_new_quotation_message = get_option('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
+					if (empty($admin_new_quotation_message)) {
+						wps_message_ctr::createMessage('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
 					}
-					$admin_new_quotation_confirm_message = get_option( 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' );
-					if ( empty($admin_new_quotation_confirm_message) ) {
-						wps_message_ctr::createMessage( 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' );
+					$admin_new_quotation_confirm_message = get_option('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
+					if (empty($admin_new_quotation_confirm_message)) {
+						wps_message_ctr::createMessage('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
 					}
 				}
 
@@ -1477,8 +1477,8 @@ 
 				/** Update VAT Rate*/
 				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'tx_tva', 'eco_taxe_rate_tva');
 				$attribute_ids = $wpdb->get_results($query);
-				foreach ( $attribute_ids as $attribute_id) {
-					$query = $wpdb->prepare('UPDATE ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' SET value = replace(value, "-", ".") WHERE attribute_id = %d', $attribute_id->id);
+				foreach ($attribute_ids as $attribute_id) {
+					$query = $wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' SET value = replace(value, "-", ".") WHERE attribute_id = %d', $attribute_id->id);
 					$wpdb->query($query);
 				}
 
@@ -1487,78 +1487,78 @@ 
 
 			case '33' :
 				/** Update the user_mail for the new system of log in/register */
-				$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes" WHERE code = "user_email"');
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "user_email"');
 
 				/** Put discount attributes in price attribute set section*/
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE code = %s', 'prices');
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'prices');
 				$prices_section_id = $wpdb->get_var($query);
 
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s OR code = %s', 'discount_rate', 'discount_amount');
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'discount_rate', 'discount_amount');
 				$attributes = $wpdb->get_results($query);
-				if ( !empty($attributes) && !empty($prices_section_id) ) {
-					foreach ( $attributes as $attribute) {
-						$query = $wpdb->query('UPDATE '.WPSHOP_DBT_ATTRIBUTE_DETAILS.' SET attribute_group_id = '. $prices_section_id .' WHERE attribute_id = '.$attribute->id);
+				if (!empty($attributes) && !empty($prices_section_id)) {
+					foreach ($attributes as $attribute) {
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' SET attribute_group_id = ' . $prices_section_id . ' WHERE attribute_id = ' . $attribute->id);
 					}
 				}
 				return true;
 			break;
 
 			case '34' :
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE code = %s', 'prices');
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'prices');
 				$prices_section_id = $wpdb->get_var($query);
 
-				$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM '.WPSHOP_DBT_ATTRIBUTE_DETAILS.' WHERE attribute_group_id = %d', $prices_section_id);
+				$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_group_id = %d', $prices_section_id);
 				$last_position_id = $wpdb->get_var($query);
 
-				$query = $wpdb->prepare('SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_DETAILS.' WHERE  attribute_group_id = %d AND position = %d', $prices_section_id, $last_position_id);
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE  attribute_group_id = %d AND position = %d', $prices_section_id, $last_position_id);
 				$attribute_example = $wpdb->get_row($query);
 
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s OR code = %s', 'special_from', 'special_to');
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'special_from', 'special_to');
 				$attributes = $wpdb->get_results($query);
 				$i = 1;
-				if ( !empty($attributes) && !empty($prices_section_id) ) {
+				if (!empty($attributes) && !empty($prices_section_id)) {
 
-					foreach ( $attributes as $attribute) {
-						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('attribute_group_id' => $prices_section_id), array('attribute_id' => $attribute->id) );
+					foreach ($attributes as $attribute) {
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('attribute_group_id' => $prices_section_id), array('attribute_id' => $attribute->id));
 						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attribute_example->entity_type_id, 'attribute_set_id' => $attribute_example->attribute_set_id, 'attribute_group_id' => $prices_section_id, 'attribute_id' => $attribute->id, 'position' => $last_position_id + $i));
 						$i++;
 					}
 				}
 				$discount_options = get_option('wpshop_catalog_product_option');
-				$status =  ( !empty($discount_options) && !empty($discount_options['discount']) ) ? 'valid' : 'notused';
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount from', 'wpshop'), 'status' => $status ), array('code' => 'special_from') );
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount to', 'wpshop'), 'status' => $status ), array('code' => 'special_to') );
+				$status = (!empty($discount_options) && !empty($discount_options['discount'])) ? 'valid' : 'notused';
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount from', 'wpshop'), 'status' => $status), array('code' => 'special_from'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount to', 'wpshop'), 'status' => $status), array('code' => 'special_to'));
 				return true;
 			break;
 
 
 			case '35' :
-				$wpdb->update( $wpdb->posts, array('post_status'=>'draft'), array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) );
+				$wpdb->update($wpdb->posts, array('post_status'=>'draft'), array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS));
 				return true;
 			break;
 
 			case '36' :
 				wpshop_entities::create_cpt_attributes_from_csv_file(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
-				@set_time_limit( 900 );
+				@set_time_limit(900);
 				/** Change the path for old categories pictures */
-				@chmod(WPSHOP_UPLOAD_DIR .'wpshop_product_category', 0755);
+				@chmod(WPSHOP_UPLOAD_DIR . 'wpshop_product_category', 0755);
 
-				$query = 'SELECT * FROM ' .$wpdb->terms;
+				$query = 'SELECT * FROM ' . $wpdb->terms;
 				$terms = $wpdb->get_results($query);
-				if ( !empty($terms) ) {
-					foreach ( $terms as $term ) {
-						@chmod(WPSHOP_UPLOAD_DIR .'wpshop_product_category/'.$term->term_id, 0755);
+				if (!empty($terms)) {
+					foreach ($terms as $term) {
+						@chmod(WPSHOP_UPLOAD_DIR . 'wpshop_product_category/' . $term->term_id, 0755);
 						/** Check if a picture exists **/
-						$term_option =  get_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' .$term->term_id );
-						if ( !empty($term_option) && !empty($term_option['wpshop_category_picture']) && is_file(WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture']) ) {
+						$term_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $term->term_id);
+						if (!empty($term_option) && !empty($term_option['wpshop_category_picture']) && is_file(WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture'])) {
 							$wp_upload_dir = wp_upload_dir();
 							$img_path = WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture'];
 							$img_basename = basename($img_path);
-							$wp_filetype = wp_check_filetype($img_basename, null );
+							$wp_filetype = wp_check_filetype($img_basename, null);
 							/** Check if there is an image with the same name, if yes we add a rand number to image's name **/
-							$rand_name = ( is_file($wp_upload_dir['path'] . '/' .$img_basename) ) ? rand() : '';
-							$img_basename = ( !empty($rand_name) ) ? $rand_name.'_'.$img_basename : $img_basename;
-							if ( copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename) ) {
+							$rand_name = (is_file($wp_upload_dir['path'] . '/' . $img_basename)) ? rand() : '';
+							$img_basename = (!empty($rand_name)) ? $rand_name . '_' . $img_basename : $img_basename;
+							if (copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename)) {
 								$attachment = array(
 										'guid' => $wp_upload_dir['url'] . '/' . $img_basename,
 										'post_mime_type' => $wp_filetype['type'],
@@ -1566,14 +1566,14 @@ 
 										'post_content' => '',
 										'post_status' => 'inherit'
 								);
-								$attach_id = wp_insert_attachment( $attachment, $wp_upload_dir['path'] . '/' . $img_basename);
+								$attach_id = wp_insert_attachment($attachment, $wp_upload_dir['path'] . '/' . $img_basename);
 								/** Generate differnts sizes for this image **/
 								require_once(ABSPATH . 'wp-admin/includes/image.php');
-								$attach_data = wp_generate_attachment_metadata( $attach_id, $wp_upload_dir['path'] . '/' . $img_basename );
-								wp_update_attachment_metadata( $attach_id, $attach_data );
+								$attach_data = wp_generate_attachment_metadata($attach_id, $wp_upload_dir['path'] . '/' . $img_basename);
+								wp_update_attachment_metadata($attach_id, $attach_data);
 								/** Update option picture **/
 								$term_option['wpshop_category_picture'] = $attach_id;
-								update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' .$term->term_id , $term_option);
+								update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $term->term_id, $term_option);
 							}
 						}
 					}
@@ -1581,16 +1581,16 @@ 
 
 
 				/** Change metabox Hidden Nav Menu Definition to display WPShop categories' metabox **/
-				$query = $wpdb->prepare('SELECT * FROM ' .$wpdb->usermeta. ' WHERE meta_key = %s', 'metaboxhidden_nav-menus');
-				$meta_keys = $wpdb->get_results( $query );
-				if ( !empty($meta_keys) && is_array( $meta_keys) ) {
-					foreach ( $meta_keys as $meta_key ) {
+				$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->usermeta . ' WHERE meta_key = %s', 'metaboxhidden_nav-menus');
+				$meta_keys = $wpdb->get_results($query);
+				if (!empty($meta_keys) && is_array($meta_keys)) {
+					foreach ($meta_keys as $meta_key) {
 						$user_id = $meta_key->user_id;
 						$meta_value = unserialize($meta_key->meta_value);
-						if ( !empty( $meta_value) && is_array($meta_value) ) {
+						if (!empty($meta_value) && is_array($meta_value)) {
 							$data_to_delete = array_search('add-wpshop_product_category', $meta_value);
-							if ( $data_to_delete !== false ) {
-								unset( $meta_value[$data_to_delete] );
+							if ($data_to_delete !== false) {
+								unset($meta_value[$data_to_delete]);
 							}
 						}
 						update_user_meta($user_id, 'metaboxhidden_nav-menus', $meta_value);
@@ -1600,39 +1600,39 @@ 
 			break;
 
 			case '37' :
-				@set_time_limit( 900 );
+				@set_time_limit(900);
 				/** Change the path for old categories pictures */
-				@chmod(WPSHOP_UPLOAD_DIR .'wpshop/wpshop_product_category', 0755);
+				@chmod(WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category', 0755);
 				/** Read all categories folders **/
-				$categories_main_dir = WPSHOP_UPLOAD_DIR .'wpshop/wpshop_product_category';
-				if ( file_exists($categories_main_dir) ) {
+				$categories_main_dir = WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category';
+				if (file_exists($categories_main_dir)) {
 					$main_folder_content = scandir($categories_main_dir);
 					/** For each category folder **/
-					foreach ( $main_folder_content as $category_folder ) {
-						if ( $category_folder && substr( $category_folder, 0, 1) != '.' ) {
+					foreach ($main_folder_content as $category_folder) {
+						if ($category_folder && substr($category_folder, 0, 1) != '.') {
 							$category_id = $category_folder;
-							@chmod(WPSHOP_UPLOAD_DIR .'wpshop/wpshop_product_category/'.$category_id, 0755);
-							$scan_category_folder = opendir($categories_main_dir.'/'.$category_folder);
+							@chmod(WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category/' . $category_id, 0755);
+							$scan_category_folder = opendir($categories_main_dir . '/' . $category_folder);
 							/** For each Picture of category **/
 							$file_time = 0;
 							$save_this_picture = false;
-							while(false !== ($fichier = readdir($scan_category_folder))) {
-								if ( $fichier && substr( $fichier, 0, 1) != '.' ) {
-									if ( $file_time < filemtime($categories_main_dir . '/'. $category_id . '/'. $fichier) ) {
+							while (false !== ($fichier = readdir($scan_category_folder))) {
+								if ($fichier && substr($fichier, 0, 1) != '.') {
+									if ($file_time < filemtime($categories_main_dir . '/' . $category_id . '/' . $fichier)) {
 										$save_this_picture = true;
-										$file_time = filemtime($categories_main_dir . '/'. $category_id . '/'. $fichier);
+										$file_time = filemtime($categories_main_dir . '/' . $category_id . '/' . $fichier);
 									}
 									/** Select category option **/
-									$term_option =  get_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' .$category_id );
+									$term_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
 									$wp_upload_dir = wp_upload_dir();
-									$img_path = $categories_main_dir . '/' . $category_id .'/'. $fichier;
+									$img_path = $categories_main_dir . '/' . $category_id . '/' . $fichier;
 									$img_basename = basename($img_path);
-									$wp_filetype = wp_check_filetype($img_basename, null );
+									$wp_filetype = wp_check_filetype($img_basename, null);
 									/** Check if there is an image with the same name, if yes we add a rand number to image's name **/
-									$rand_name = ( is_file($wp_upload_dir['path'] . '/' .$img_basename) ) ? rand() : '';
-									$img_basename = ( !empty($rand_name) ) ? $rand_name.'_'.$img_basename : $img_basename;
+									$rand_name = (is_file($wp_upload_dir['path'] . '/' . $img_basename)) ? rand() : '';
+									$img_basename = (!empty($rand_name)) ? $rand_name . '_' . $img_basename : $img_basename;
 
-									if ( copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename) ) {
+									if (copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename)) {
 										$attachment = array(
 												'guid' => $wp_upload_dir['url'] . '/' . $img_basename,
 												'post_mime_type' => $wp_filetype['type'],
@@ -1640,15 +1640,15 @@ 
 												'post_content' => '',
 												'post_status' => 'inherit'
 										);
-										$attach_id = wp_insert_attachment( $attachment, $wp_upload_dir['path'] . '/' . $img_basename);
+										$attach_id = wp_insert_attachment($attachment, $wp_upload_dir['path'] . '/' . $img_basename);
 										/** Generate differnts sizes for this image **/
 										require_once(ABSPATH . 'wp-admin/includes/image.php');
-										$attach_data = wp_generate_attachment_metadata( $attach_id, $wp_upload_dir['path'] . '/' . $img_basename );
-										wp_update_attachment_metadata( $attach_id, $attach_data );
+										$attach_data = wp_generate_attachment_metadata($attach_id, $wp_upload_dir['path'] . '/' . $img_basename);
+										wp_update_attachment_metadata($attach_id, $attach_data);
 										/** Update option picture **/
-										$term_option['wpshop_category_picture'] =  $attach_id;
-										if ( $save_this_picture ) {
-											update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' .$category_id , $term_option);
+										$term_option['wpshop_category_picture'] = $attach_id;
+										if ($save_this_picture) {
+											update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id, $term_option);
 										}
 										$save_this_picture = false;
 									}
@@ -1661,33 +1661,33 @@ 
 				break;
 
 			case '38' :
-				wps_message_ctr::createMessage( 'WPSHOP_QUOTATION_UPDATE_MESSAGE' );
+				wps_message_ctr::createMessage('WPSHOP_QUOTATION_UPDATE_MESSAGE');
 				return true;
 			break;
 
 			case '39' :
 				$attribute_def = wpshop_attributes::getElement('tx_tva', "'valid'", 'code');
 				/** Check if the 7% VAT Rate is not already created **/
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d AND value = %s',  $attribute_def->id, '7');
-				$exist_vat_rate = $wpdb->get_results( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND value = %s', $attribute_def->id, '7');
+				$exist_vat_rate = $wpdb->get_results($query);
 
-				if ( empty($exist_vat_rate) ) {
+				if (empty($exist_vat_rate)) {
 					/** Get Max Position **/
-					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d', $attribute_def->id);
-					$max_position = $wpdb->get_var( $query );
+					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $attribute_def->id);
+					$max_position = $wpdb->get_var($query);
 
-					if ( !empty( $attribute_def) && !empty($attribute_def->id)  ) {
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' =>  $attribute_def->id, 'position' => (int)$max_position + 1, 'value' => '7', 'label' => '7') );
+					if (!empty($attribute_def) && !empty($attribute_def->id)) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' =>  $attribute_def->id, 'position' => (int)$max_position + 1, 'value' => '7', 'label' => '7'));
 					}
 				}
 
 				/** Filter Search optimization **/
-				@set_time_limit( 900 );
-				$query = $wpdb->prepare('SELECT term_id FROM '.$wpdb->term_taxonomy.' WHERE taxonomy = %s ', WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
-				$categories = $wpdb->get_results( $query );
+				@set_time_limit(900);
+				$query = $wpdb->prepare('SELECT term_id FROM ' . $wpdb->term_taxonomy . ' WHERE taxonomy = %s ', WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
+				$categories = $wpdb->get_results($query);
 				$cats = array();
-				if ( !empty($categories) ) {
-					foreach($categories as $category) {
+				if (!empty($categories)) {
+					foreach ($categories as $category) {
 						$cats[] = $category->term_id;
 					}
 					$wpshop_filter_search = new wps_filter_search();
@@ -1699,116 +1699,116 @@ 
 			case '40' :
 				/**	Store watt in puissance unit group	*/
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('puissance', 'wpshop'));
-				$puissance_unit_group_id = $wpdb->get_var( $query );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $puissance_unit_group_id), array('unit' => 'watt') );
+				$puissance_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $puissance_unit_group_id), array('unit' => 'watt'));
 
 				/**	Store day/week/year in duration unit group	*/
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('duration', 'wpshop'));
-				$duration_unit_group_id = $wpdb->get_var( $query );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'day') );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'week') );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'year') );
+				$duration_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'day'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'week'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'year'));
 
 				/**	Store day/week/year in duration unit group	*/
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('length', 'wpshop'));
-				$length_unit_group_id = $wpdb->get_var( $query );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $length_unit_group_id), array('unit' => 'cm') );
+				$length_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $length_unit_group_id), array('unit' => 'cm'));
 				return true;
 			break;
 
 			case '41':
 				/**	Get distinct attribute set and delete doublons	*/
 				$query = "SELECT DISTINCT( name ) AS name, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " GROUP BY name HAVING COUNT(id) > 1";
-				$list_of_set = $wpdb->get_results( $query );
-				foreach ( $list_of_set as $set_infos ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id );
-					$wpdb->query( $query );
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id);
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_SET );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_SET);
 
 				/**	Get and delete attribute set section	*/
 				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " )";
-				$wpdb->query( $query );
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_GROUP );
+				$wpdb->query($query);
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_GROUP);
 
 				/**	Get and delete attribute set details	*/
 				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " ) OR attribute_group_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " )";
-				$wpdb->query( $query );
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS );
+				$wpdb->query($query);
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
 
 				$query = "SELECT attribute_set_id, attribute_group_id, attribute_id, MIN(id) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " GROUP BY attribute_set_id, attribute_group_id, attribute_id HAVING COUNT(id) > 1";
-				$affectation_list = $wpdb->get_results( $query );
-				foreach ( $affectation_list as $affectation_to_treat ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d AND id != %d", $affectation_to_treat->attribute_set_id, $affectation_to_treat->attribute_group_id, $affectation_to_treat->attribute_id, $affectation_to_treat->min_id );
-					$wpdb->query( $query );
+				$affectation_list = $wpdb->get_results($query);
+				foreach ($affectation_list as $affectation_to_treat) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d AND id != %d", $affectation_to_treat->attribute_set_id, $affectation_to_treat->attribute_group_id, $affectation_to_treat->attribute_id, $affectation_to_treat->min_id);
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
 
 				/**	Get and delete double unit	*/
 				$query = "SELECT DISTINCT( unit ) AS unit, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " GROUP BY unit HAVING COUNT(id) > 1";
-				$list_of_set = $wpdb->get_results( $query );
-				foreach ( $list_of_set as $set_infos ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " WHERE unit = %s AND id != %d", $set_infos->unit, $set_infos->min_id );
-					$wpdb->query( $query );
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " WHERE unit = %s AND id != %d", $set_infos->unit, $set_infos->min_id);
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT);
 
 				$query = "SELECT DISTINCT( name ) AS name, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " GROUP BY name HAVING COUNT(id) > 1";
-				$list_of_set = $wpdb->get_results( $query );
-				foreach ( $list_of_set as $set_infos ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id );
-					$wpdb->query( $query );
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id);
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
 
 				/**	Get and delete attribute set details	*/
 				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " ) OR attribute_group_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " )";
-				$wpdb->query( $query );
+				$wpdb->query($query);
 				$query = "SELECT GROUP_CONCAT( id ) AS list_id, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " GROUP BY attribute_set_id, attribute_group_id, attribute_id HAVING COUNT(id) > 1";
-				$affectation_list = $wpdb->get_results( $query );
-				foreach ( $affectation_list as $list ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE id IN (" . ( substr($list->list_id, -1) == ',' ? substr($list->list_id, 0, -1) : $list->list_id ) . ") AND id != %d", $list->min_id , '');
-					$wpdb->query( $query );
+				$affectation_list = $wpdb->get_results($query);
+				foreach ($affectation_list as $list) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE id IN (" . (substr($list->list_id, -1) == ',' ? substr($list->list_id, 0, -1) : $list->list_id) . ") AND id != %d", $list->min_id, '');
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
 
 				return true;
 			break;
 
 			case '42' :
-				$available_downloadable_product = get_option( 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' );
-				if ( empty($available_downloadable_product) ) {
-					wps_message_ctr::createMessage( 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' );
+				$available_downloadable_product = get_option('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE');
+				if (empty($available_downloadable_product)) {
+					wps_message_ctr::createMessage('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE');
 				}
 				return true;
 			break;
 
 			case '43' :
-				$available_downloadable_product = get_option( 'WPSHOP_ORDER_IS_CANCELED' );
-				if ( empty($available_downloadable_product) ) {
-					wps_message_ctr::createMessage( 'WPSHOP_ORDER_IS_CANCELED' );
+				$available_downloadable_product = get_option('WPSHOP_ORDER_IS_CANCELED');
+				if (empty($available_downloadable_product)) {
+					wps_message_ctr::createMessage('WPSHOP_ORDER_IS_CANCELED');
 				}
 				return true;
 			break;
 
 			case '44' :
 				$display_option = get_option('wpshop_display_option');
-				if ( !empty($display_option) && empty($display_option['latest_products_ordered']) ) {
+				if (!empty($display_option) && empty($display_option['latest_products_ordered'])) {
 					$display_option['latest_products_ordered'] = 3;
 					update_option('wpshop_display_option', $display_option);
 				}
 
 				/** Check messages for customization **/
-				$messages = array( 'WPSHOP_SIGNUP_MESSAGE' => WPSHOP_SIGNUP_MESSAGE, 'WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_SHIPPING_CONFIRMATION_MESSAGE' => WPSHOP_SHIPPING_CONFIRMATION_MESSAGE, 'WPSHOP_ORDER_UPDATE_MESSAGE' => WPSHOP_ORDER_UPDATE_MESSAGE, 'WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE' => WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE, 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' => WPSHOP_NEW_ORDER_ADMIN_MESSAGE, 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' => WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' => WPSHOP_QUOTATION_CONFIRMATION_MESSAGE, 'WPSHOP_QUOTATION_UPDATE_MESSAGE' => WPSHOP_QUOTATION_UPDATE_MESSAGE, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' => WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE, 'WPSHOP_ORDER_IS_CANCELED' => WPSHOP_ORDER_IS_CANCELED);
-				if ( !empty( $messages) ) {
-					foreach ($messages as $key => $message ) {
-						$message_option = get_option( $key );
-						if ( !empty( $message_option) ) {
-							$post_message =  get_post( $message_option );
-							$original_message = ( !empty($post_message) && !empty($post_message->post_content) ) ? $post_message->post_content : '';
+				$messages = array('WPSHOP_SIGNUP_MESSAGE' => WPSHOP_SIGNUP_MESSAGE, 'WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_SHIPPING_CONFIRMATION_MESSAGE' => WPSHOP_SHIPPING_CONFIRMATION_MESSAGE, 'WPSHOP_ORDER_UPDATE_MESSAGE' => WPSHOP_ORDER_UPDATE_MESSAGE, 'WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE' => WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE, 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' => WPSHOP_NEW_ORDER_ADMIN_MESSAGE, 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' => WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' => WPSHOP_QUOTATION_CONFIRMATION_MESSAGE, 'WPSHOP_QUOTATION_UPDATE_MESSAGE' => WPSHOP_QUOTATION_UPDATE_MESSAGE, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' => WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE, 'WPSHOP_ORDER_IS_CANCELED' => WPSHOP_ORDER_IS_CANCELED);
+				if (!empty($messages)) {
+					foreach ($messages as $key => $message) {
+						$message_option = get_option($key);
+						if (!empty($message_option)) {
+							$post_message = get_post($message_option);
+							$original_message = (!empty($post_message) && !empty($post_message->post_content)) ? $post_message->post_content : '';
 							$tags = array('<p>', '</p>');
-							if ( str_replace( $tags, '', $original_message) == str_replace( $tags, '', __( $message, 'wpshop' ) ) ) {
-								wp_update_post( array( 'ID' => $message_option, 'post_content' => wps_message_ctr::customize_message($original_message) ) );
+							if (str_replace($tags, '', $original_message) == str_replace($tags, '', __($message, 'wpshop'))) {
+								wp_update_post(array('ID' => $message_option, 'post_content' => wps_message_ctr::customize_message($original_message)));
 							}
 						}
 					}
@@ -1824,8 +1824,8 @@ 
 			break;
 
 			case '46':
-				wps_message_ctr::createMessage( 'WPSHOP_FORGOT_PASSWORD_MESSAGE' );
-				wps_message_ctr::customize_message( WPSHOP_FORGOT_PASSWORD_MESSAGE );
+				wps_message_ctr::createMessage('WPSHOP_FORGOT_PASSWORD_MESSAGE');
+				wps_message_ctr::customize_message(WPSHOP_FORGOT_PASSWORD_MESSAGE);
 				return true;
 			break;
 
@@ -1838,17 +1838,17 @@ 
 				@ini_set('max_execution_time', '500');
 
 				$count_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-				$output_type_option = get_option( 'wpshop_display_option' );
+				$output_type_option = get_option('wpshop_display_option');
 				$output_type = $output_type_option['wpshop_display_list_type'];
 
-				for( $i = 0; $i <= $count_products->publish; $i+= 20 ) {
-					$query = $wpdb->prepare( 'SELECT * FROM '. $wpdb->posts .' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT '.$i.', 20', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish' );
-					$products = $wpdb->get_results( $query );
-					if ( !empty($products) ) {
-						foreach( $products as $product ) {
+				for ($i = 0; $i <= $count_products->publish; $i += 20) {
+					$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT ' . $i . ', 20', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
+					$products = $wpdb->get_results($query);
+					if (!empty($products)) {
+						foreach ($products as $product) {
 							$p = wpshop_products::get_product_data($product->ID);
-							$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type) );
-							update_post_meta(  $product->ID, '_wps_price_infos', $price );
+							$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type));
+							update_post_meta($product->ID, '_wps_price_infos', $price);
 						}
 					}
 				}
@@ -1857,15 +1857,15 @@ 
 			break;
 
 			case '49' :
-				update_option( 'wpshop_send_invoice', true);
+				update_option('wpshop_send_invoice', true);
 				return true;
 			break;
 
 			case '50' :
-				$price_display_option = get_option( 'wpshop_catalog_product_option' );
+				$price_display_option = get_option('wpshop_catalog_product_option');
 				$price_display_option['price_display']['text_from'] = 'on';
 				$price_display_option['price_display']['lower_price'] = 'on';
-				update_option( 'wpshop_catalog_product_option', $price_display_option );
+				update_option('wpshop_catalog_product_option', $price_display_option);
 
  				self::wpshop_insert_default_pages();
 
@@ -1874,45 +1874,45 @@ 
 
 			case '51' :
 				/**	Insert new message for direct payment link	*/
-				$direct_payment_link_message = get_option( 'WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE' );
-				if ( empty($direct_payment_link_message) ) {
-					wps_message_ctr::createMessage( 'WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE' );
+				$direct_payment_link_message = get_option('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE');
+				if (empty($direct_payment_link_message)) {
+					wps_message_ctr::createMessage('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE');
 				}
 				return true;
 			break;
 
 			case '52' :
-				$account_page_option = get_option( 'wpshop_myaccount_page_id' );
-				if( !empty($account_page_option) ) {
-					$page_account = get_post( $account_page_option );
-					$page_content = ( !empty($page_account) && !empty($page_account->post_content) ) ? str_replace( '[wpshop_myaccount]', '[wps_account_dashboard]', $page_account->post_content ) : '[wps_account_dashboard]';
-					wp_update_post( array('ID' => $account_page_option, 'post_content' => $page_content ) );
+				$account_page_option = get_option('wpshop_myaccount_page_id');
+				if (!empty($account_page_option)) {
+					$page_account = get_post($account_page_option);
+					$page_content = (!empty($page_account) && !empty($page_account->post_content)) ? str_replace('[wpshop_myaccount]', '[wps_account_dashboard]', $page_account->post_content) : '[wps_account_dashboard]';
+					wp_update_post(array('ID' => $account_page_option, 'post_content' => $page_content));
 				}
 				return true;
 			break;
 
 			case '53' :
-				$payment_modes_option = get_option( 'wps_payment_mode' );
-				if( !empty($payment_modes_option) && !empty($payment_modes_option['mode']) ) {
+				$payment_modes_option = get_option('wps_payment_mode');
+				if (!empty($payment_modes_option) && !empty($payment_modes_option['mode'])) {
 					$payment_modes_option['mode']['cash_on_delivery'] = array(
-							'name' => __( 'Cash on delivery', 'wpshop'),
-							'logo' => WPSHOP_TEMPLATES_URL.'wpshop/cheque.png',
-							'description' => __( 'Pay your order on delivery', 'wpshop') );
+							'name' => __('Cash on delivery', 'wpshop'),
+							'logo' => WPSHOP_TEMPLATES_URL . 'wpshop/cheque.png',
+							'description' => __('Pay your order on delivery', 'wpshop') );
 
-					update_option( 'wps_payment_mode' ,$payment_modes_option );
+					update_option('wps_payment_mode', $payment_modes_option);
 				}
 
 				// Mass action on products to add a flag on variation definition
-				$products = get_posts( array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) );
-				if( !empty($products) ) {
-					foreach( $products as $p ) {
+				$products = get_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
+				if (!empty($products)) {
+					foreach ($products as $p) {
 						$post_id = $p->ID;
-						$check_product_have_variations = wpshop_products::get_variation( $post_id );
-						if( !empty($check_product_have_variations) ) {
-							$variation_flag =  wpshop_products::check_variation_type( $post_id );
-							$variation_defining = get_post_meta( $post_id, '_wpshop_variation_defining', true );
+						$check_product_have_variations = wpshop_products::get_variation($post_id);
+						if (!empty($check_product_have_variations)) {
+							$variation_flag = wpshop_products::check_variation_type($post_id);
+							$variation_defining = get_post_meta($post_id, '_wpshop_variation_defining', true);
 							$variation_defining['variation_type'] = $variation_flag;
-							update_post_meta( $post_id, '_wpshop_variation_defining', $variation_defining );
+							update_post_meta($post_id, '_wpshop_variation_defining', $variation_defining);
 						}
 					}
 				}
@@ -1921,28 +1921,28 @@ 
 
 			case '54' :
 				// Change shortcode of sign up page
-				$signup_page_id = get_option( 'wpshop_signup_page_id' );
-				if( !empty($signup_page_id) ) {
-					$signup_page = get_post( $signup_page_id );
-					$signup_page_content = ( !empty($signup_page) && !empty($signup_page->post_content) ) ? str_replace( '[wpshop_signup]', '[wps_account_dashboard]', $signup_page->post_content ) : '[wps_account_dashboard]';
-					wp_update_post( array('ID' => $signup_page_id, 'post_content' => $signup_page_content ) );
+				$signup_page_id = get_option('wpshop_signup_page_id');
+				if (!empty($signup_page_id)) {
+					$signup_page = get_post($signup_page_id);
+					$signup_page_content = (!empty($signup_page) && !empty($signup_page->post_content)) ? str_replace('[wpshop_signup]', '[wps_account_dashboard]', $signup_page->post_content) : '[wps_account_dashboard]';
+					wp_update_post(array('ID' => $signup_page_id, 'post_content' => $signup_page_content));
 				}
 
 				// Change Terms of sale default content
-				$terms_page_id = get_option( 'wpshop_terms_of_sale_page_id' );
-				if( !empty($terms_page_id) ) {
-					$terms_sale_page = get_post( $terms_page_id );
-					if( !empty($terms_sale_page) && !empty($terms_sale_page->post_content) && $terms_sale_page->post_content == '[wpshop_terms_of_sale]' ) {
-						$data  = '<h1>'.__( 'Your terms of sale', 'wpshop' ).'</h1>';
-						$data .= '<h3>'.__( 'Rule', 'wpshop' ).' 1</h3>';
+				$terms_page_id = get_option('wpshop_terms_of_sale_page_id');
+				if (!empty($terms_page_id)) {
+					$terms_sale_page = get_post($terms_page_id);
+					if (!empty($terms_sale_page) && !empty($terms_sale_page->post_content) && $terms_sale_page->post_content == '[wpshop_terms_of_sale]') {
+						$data  = '<h1>' . __('Your terms of sale', 'wpshop') . '</h1>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 1</h3>';
 						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-						$data .= '<h3>'.__( 'Rule', 'wpshop' ).' 2</h3>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 2</h3>';
 						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-						$data .= '<h3>'.__( 'Rule', 'wpshop' ).' 3</h3>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 3</h3>';
 						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-						$data .= '<h3>'.__( 'Credits', 'wpshop' ).'</h3>';
-						$data .= sprintf( __( '%s uses <a href="http://www.wpshop.fr/" target="_blank" title="%s uses WPShop e-commerce plug-in for Wordpress">WPShop e-commerce for Wordpress</a>', 'wpshop'), get_bloginfo('name'), get_bloginfo('name') );
-						wp_update_post( array('ID' => $terms_page_id, 'post_content' => $data ) );
+						$data .= '<h3>' . __('Credits', 'wpshop') . '</h3>';
+						$data .= sprintf(__('%s uses <a href="http://www.wpshop.fr/" target="_blank" title="%s uses WPShop e-commerce plug-in for Wordpress">WPShop e-commerce for Wordpress</a>', 'wpshop'), get_bloginfo('name'), get_bloginfo('name'));
+						wp_update_post(array('ID' => $terms_page_id, 'post_content' => $data));
 					}
 				}
 
@@ -1951,58 +1951,58 @@ 
 
 
 			case '55' :
-				$checkout_page_id = get_option( 'wpshop_checkout_page_id' );
-				$checkout_page = get_post( $checkout_page_id );
-				$checkout_page_content = ( !empty($checkout_page) && !empty($checkout_page->post_content) ) ? str_replace( '[wpshop_checkout]', '[wps_checkout]', $checkout_page->post_content ) : '[wps_checkout]';
-				wp_update_post( array('ID' => $checkout_page_id, 'post_content' => $checkout_page_content ) );
+				$checkout_page_id = get_option('wpshop_checkout_page_id');
+				$checkout_page = get_post($checkout_page_id);
+				$checkout_page_content = (!empty($checkout_page) && !empty($checkout_page->post_content)) ? str_replace('[wpshop_checkout]', '[wps_checkout]', $checkout_page->post_content) : '[wps_checkout]';
+				wp_update_post(array('ID' => $checkout_page_id, 'post_content' => $checkout_page_content));
 
 				// Update cart page id
-				update_option( 'wpshop_cart_page_id', $checkout_page_id );
+				update_option('wpshop_cart_page_id', $checkout_page_id);
 				return true;
 			break;
 
 
 			case '56' :
 				$wps_entities = new wpshop_entities();
-				$customer_entity_id = $wps_entities->get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d ORDER BY id LIMIT 1', $customer_entity_id );
-				$set = $wpdb->get_row( $query );
-				if( !empty($set) ) {
-					$wpdb->update( WPSHOP_DBT_ATTRIBUTE_SET,
-							array( 'default_set' => 'yes' ),
-							array( 'id' => $set->id) );
+				$customer_entity_id = $wps_entities->get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d ORDER BY id LIMIT 1', $customer_entity_id);
+				$set = $wpdb->get_row($query);
+				if (!empty($set)) {
+					$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET,
+							array('default_set' => 'yes'),
+							array('id' => $set->id));
 				}
 				// Update Opinions activation option
-				update_option( 'wps_opinion', array( 'active' => 'on') );
+				update_option('wps_opinion', array('active' => 'on'));
 				return true;
 			break;
 
 			case '57' :
-				$wpshop_cart_option = get_option( 'wpshop_cart_option' );
+				$wpshop_cart_option = get_option('wpshop_cart_option');
 				$wpshop_cart_option['display_newsletter']['site_subscription'][] = 'yes';
 				$wpshop_cart_option['display_newsletter']['partner_subscription'][] = 'yes';
 
-				update_option( 'wpshop_cart_option', $wpshop_cart_option );
+				update_option('wpshop_cart_option', $wpshop_cart_option);
 				return true;
 			break;
 
 			case '58' :
 				/** Turn customers publish into draft **/
-				$query = $wpdb->prepare( "UPDATE {$wpdb->posts} SET post_status = %s WHERE post_type = %s", "draft", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$wpdb->query( $query );
+				$query = $wpdb->prepare("UPDATE {$wpdb->posts} SET post_status = %s WHERE post_type = %s", "draft", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$wpdb->query($query);
 
 				$attribute_def = wpshop_attributes::getElement('tx_tva', "'valid'", 'code');
 				/** Check if the 0% VAT Rate is not already created **/
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d AND value = %s',  $attribute_def->id, '0');
-				$exist_vat_rate = $wpdb->get_results( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND value = %s', $attribute_def->id, '0');
+				$exist_vat_rate = $wpdb->get_results($query);
 
-				if ( empty($exist_vat_rate) ) {
+				if (empty($exist_vat_rate)) {
 					/** Get Max Position **/
-					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d', $attribute_def->id);
-					$max_position = $wpdb->get_var( $query );
+					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $attribute_def->id);
+					$max_position = $wpdb->get_var($query);
 
-					if ( !empty( $attribute_def) && !empty($attribute_def->id)  ) {
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' =>  $attribute_def->id, 'position' => (int)$max_position + 1, 'value' => '0', 'label' => '0') );
+					if (!empty($attribute_def) && !empty($attribute_def->id)) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' =>  $attribute_def->id, 'position' => (int)$max_position + 1, 'value' => '0', 'label' => '0'));
 					}
 				}
 				return true;
@@ -2014,31 +2014,31 @@ 
 				$args = array(
 						'posts_per_page'   => -1,
 						'post_type'        => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
-						'post_status'	   => array( 'publish', 'draft', 'trash' ),
+						'post_status'	   => array('publish', 'draft', 'trash'),
 				);
-				$posts = get_posts( $args );
+				$posts = get_posts($args);
 				$result = array();
-				foreach( $posts as $post ) {
+				foreach ($posts as $post) {
 					$array = array();
 					$array['Post'] = $post;
-					$array['PrincipalThumbnailID'] = get_post_meta( $post->ID, '_thumbnail_id', true);
-					$array['Attachments'] = get_attached_media( $allowed, $post->ID );
-					$array['TrueAttachmentsString'] = get_post_meta( $post->ID, '_wps_product_media', true );
-					if( !empty( $array['TrueAttachmentsString'] ) ) {
-						$TrueAttachments_id = explode( ',', $array['TrueAttachmentsString'] );
+					$array['PrincipalThumbnailID'] = get_post_meta($post->ID, '_thumbnail_id', true);
+					$array['Attachments'] = get_attached_media($allowed, $post->ID);
+					$array['TrueAttachmentsString'] = get_post_meta($post->ID, '_wps_product_media', true);
+					if (!empty($array['TrueAttachmentsString'])) {
+						$TrueAttachments_id = explode(',', $array['TrueAttachmentsString']);
 					}
 					$array['OldAttachmentsString'] = '';
-					foreach( $array['Attachments'] as $attachment ) {
-						$filename =  basename( get_attached_file( $attachment->ID ) );
-						$pos_ext = strrpos( $filename, '.' );
-						$filename_no_ext = substr( $filename, 0, $pos_ext );
-						if( ( empty($TrueAttachments_id) || !in_array( $attachment->ID, $TrueAttachments_id ) ) && !( preg_match('#'.$filename_no_ext.'#', $post->post_content) ) && ( ( empty( $array['PrincipalThumbnailID'] ) || $attachment->ID != $array['PrincipalThumbnailID'] ) ) ) {
+					foreach ($array['Attachments'] as $attachment) {
+						$filename = basename(get_attached_file($attachment->ID));
+						$pos_ext = strrpos($filename, '.');
+						$filename_no_ext = substr($filename, 0, $pos_ext);
+						if ((empty($TrueAttachments_id) || !in_array($attachment->ID, $TrueAttachments_id)) && !(preg_match('#' . $filename_no_ext . '#', $post->post_content)) && ((empty($array['PrincipalThumbnailID']) || $attachment->ID != $array['PrincipalThumbnailID']))) {
 							$array['OldAttachmentsString'] .= $attachment->ID . ',';
 						}
 					}
 					unset($TrueAttachments_id);
 					$result[$post->ID] = $array['TrueAttachmentsString'] . $array['OldAttachmentsString'];
-					update_post_meta( $post->ID, '_wps_product_media', $result[$post->ID] );
+					update_post_meta($post->ID, '_wps_product_media', $result[$post->ID]);
 				}
 				return true;
 			break;
@@ -2048,26 +2048,26 @@ 
 				wps_message_ctr::create_default_message();
 
 				/** Update entries for quick add */
-				$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_required = "yes", is_used_in_quick_add_form = "yes" WHERE code = "barcode"');
-				$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes" WHERE code = "product_stock"');
-				$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes" WHERE code = "manage_stock"');
-				switch( WPSHOP_PRODUCT_PRICE_PILOT ) {
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_required = "yes", is_used_in_quick_add_form = "yes" WHERE code = "barcode"');
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "product_stock"');
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "manage_stock"');
+				switch (WPSHOP_PRODUCT_PRICE_PILOT) {
 					case 'HT':
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "price_ht"');
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "no" WHERE code = "tx_tva"');
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "product_price"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "price_ht"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no" WHERE code = "tx_tva"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "product_price"');
 						break;
 					default:
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "product_price"');
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes" WHERE code = "tx_tva"');
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "price_ht"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "product_price"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "tx_tva"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "price_ht"');
 						break;
 				}
 
 				/* Default country with WP language */
 				$wpshop_country_default_choice_option = get_option('wpshop_country_default_choice');
-				if ( empty($wpshop_country_default_choice_option) ) {
-					update_option( 'wpshop_country_default_choice', substr( get_bloginfo( 'language' ), 3) );
+				if (empty($wpshop_country_default_choice_option)) {
+					update_option('wpshop_country_default_choice', substr(get_bloginfo('language'), 3));
 				}
 				return true;
 			break;
@@ -2078,9 +2078,9 @@ 
 
  				/* Hide admin bar */
  				$wpshop_display_option = get_option('wpshop_display_option');
- 				if( !empty($wpshop_display_option) && empty($wpshop_display_option['wpshop_hide_admin_bar']) ) {
+ 				if (!empty($wpshop_display_option) && empty($wpshop_display_option['wpshop_hide_admin_bar'])) {
  					$wpshop_display_option['wpshop_hide_admin_bar'] = 'on';
- 					update_option( 'wpshop_display_option', $wpshop_display_option );
+ 					update_option('wpshop_display_option', $wpshop_display_option);
  				}
 
 				return true;
@@ -2094,30 +2094,30 @@ 
 			break;
 
 			case '63':
-				$data = get_option( 'wps_shipping_mode' );
-				if ( empty($data['modes']['default_shipping_mode_for_pos']) ) {
+				$data = get_option('wps_shipping_mode');
+				if (empty($data['modes']['default_shipping_mode_for_pos'])) {
 					$data['modes']['default_shipping_mode_for_pos']['name'] = __('No Delivery', 'wpshop');
 					$data['modes']['default_shipping_mode_for_pos']['explanation'] = __('Delivery method for point of sale.', 'wpshop');
-					update_option( 'wps_shipping_mode', $data );
+					update_option('wps_shipping_mode', $data);
 				}
 				return true;
 			break;
 
 			case '64':
-				$options = get_option( 'wpshop_catalog_product_option' );
-				if ( !empty( $options['wpshop_catalog_product_slug_with_category'] ) ) {
-					unset( $options['wpshop_catalog_product_slug_with_category'] );
-					update_option( 'wpshop_catalog_product_option', $options );
+				$options = get_option('wpshop_catalog_product_option');
+				if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
+					unset($options['wpshop_catalog_product_slug_with_category']);
+					update_option('wpshop_catalog_product_option', $options);
 				}
 				return true;
 			break;
 			
 			case '65':
-				$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'company_customer', $entity_id );
-				$company_id = $wpdb->get_var( $query );
-				if( !isset( $company_id ) ) {
-					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE, array(
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'company_customer', $entity_id);
+				$company_id = $wpdb->get_var($query);
+				if (!isset($company_id)) {
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
 						'is_visible_in_front' => 'no',
 						'is_visible_in_front_listing' => 'yes',
 						'is_global' => 'no',
@@ -2160,14 +2160,14 @@ 
 						'backend_css_class' => NULL,
 						'frontend_help_message' => NULL,
 						'entity_id' => $entity_id
-					) );
+					));
 					$company_id = $wpdb->insert_id;
 				}
 				
-				$query = $wpdb->prepare( 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'is_provider', $entity_id );
-				$is_provider_id = $wpdb->get_var( $query );
-				if( !isset( $is_provider_id ) ) {
-					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE, array(
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'is_provider', $entity_id);
+				$is_provider_id = $wpdb->get_var($query);
+				if (!isset($is_provider_id)) {
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
 						'is_visible_in_front' => 'no',
 						'is_visible_in_front_listing' => 'yes',
 						'is_global' => 'no',
@@ -2210,80 +2210,80 @@ 
 						'backend_css_class' => NULL,
 						'frontend_help_message' => NULL,
 						'entity_id' => $entity_id
-					) );
+					));
 					$is_provider_id = $wpdb->insert_id;
-					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
 						'status'				=> 'valid',
 						'attribute_id' 			=> $is_provider_id,
 						'creation_date_value' 	=> current_time('mysql'),
 						'value' 				=> 'yes',
 						'label' 				=> 'Yes',
-					) );
-					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
+					));
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
 						'status'				=> 'valid',
 						'attribute_id' 			=> $is_provider_id,
 						'creation_date_value' 	=> current_time('mysql'),
 						'value' 				=> 'no',
 						'label' 				=> 'No',
-					) );
+					));
 					$default_value = $wpdb->insert_id;
-					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array( 'default_value' => $default_value ), array( 'id' => $is_provider_id ) );
+					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('default_value' => $default_value), array('id' => $is_provider_id));
 				}
 				
-				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $company_id );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $company_id);
 				$company_section_detail_id = $wpdb->get_var($query);
 				
-				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $is_provider_id );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $is_provider_id);
 				$is_provider_section_detail_id = $wpdb->get_var($query);
 				
-				if( !isset( $is_provider_section_detail_id ) || !isset( $company_section_detail_id ) ) {
-					$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id );
+				if (!isset($is_provider_section_detail_id) || !isset($company_section_detail_id)) {
+					$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
 					$attribute_set_id = $wpdb->get_var($query);
 					
 					$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, 'account');
 					$attribute_set_section_id = $wpdb->get_var($query);
 					
-					$query = $wpdb->prepare( 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_id, $attribute_set_id, $attribute_set_section_id );
-					$attributes_set_details = $wpdb->get_results( $query );
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_id, $attribute_set_id, $attribute_set_section_id);
+					$attributes_set_details = $wpdb->get_results($query);
 					$set_details_id_postion_order = array();
-					foreach( $attributes_set_details as $attribute_set_detail ) {
-						$query = $wpdb->prepare( 'SELECT code FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d', $attribute_set_detail->attribute_id );
-						$attribute_set_detail_code = $wpdb->get_var( $query );
-						if( $attribute_set_detail_code == 'last_name' ) {
+					foreach ($attributes_set_details as $attribute_set_detail) {
+						$query = $wpdb->prepare('SELECT code FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d', $attribute_set_detail->attribute_id);
+						$attribute_set_detail_code = $wpdb->get_var($query);
+						if ($attribute_set_detail_code == 'last_name') {
 							$set_details_id_postion_order[1] = $attribute_set_detail->attribute_id;
 						}
-						if( $attribute_set_detail_code == 'first_name' ) {
+						if ($attribute_set_detail_code == 'first_name') {
 							$set_details_id_postion_order[2] = $attribute_set_detail->attribute_id;
 						}
-						if( $attribute_set_detail_code == 'user_email' ) {
+						if ($attribute_set_detail_code == 'user_email') {
 							$set_details_id_postion_order[3] = $attribute_set_detail->attribute_id;
 						}
-						if( $attribute_set_detail_code == 'user_pass' ) {
+						if ($attribute_set_detail_code == 'user_pass') {
 							$set_details_id_postion_order[4] = $attribute_set_detail->attribute_id;
 						}
 					}
-					$max_position = count( $set_details_id_postion_order );
+					$max_position = count($set_details_id_postion_order);
 					
-					if( !isset( $company_section_detail_id ) ) {
+					if (!isset($company_section_detail_id)) {
 						$max_position = $max_position + 1;
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $company_id, 'position' => (int)$max_position ) );
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $company_id, 'position' => (int)$max_position));
 						$set_details_id_postion_order[$max_position] = $company_id;
 						$company_section_detail_id = $wpdb->insert_id;
 					}
 					
-					if( !isset( $is_provider_section_detail_id ) ) {
+					if (!isset($is_provider_section_detail_id)) {
 						$max_position = $max_position + 1;
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $is_provider_id, 'position' => (int)$max_position ) );
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $is_provider_id, 'position' => (int)$max_position));
 						$set_details_id_postion_order[$max_position] = $is_provider_id;
 						$is_provider_section_detail_id = $wpdb->insert_id;
 					}
 					
-					foreach( $set_details_id_postion_order as $pos => $attr_id ) {
-						$wpdb->update( WPSHOP_DBT_ATTRIBUTE_DETAILS, array( 'position' => $pos ), array( 'attribute_id' => $attr_id, 'attribute_set_id' => $attribute_set_id, 'entity_type_id' => $entity_id, 'attribute_group_id' => $attribute_set_section_id ), array( '%d' ), array( '%d', '%d', '%d', '%d' ) );
+					foreach ($set_details_id_postion_order as $pos => $attr_id) {
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('position' => $pos), array('attribute_id' => $attr_id, 'attribute_set_id' => $attribute_set_id, 'entity_type_id' => $entity_id, 'attribute_group_id' => $attribute_set_section_id), array('%d'), array('%d', '%d', '%d', '%d'));
 					}
 				}
 				
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_SET, array( 'name' => __( 'Free product', 'wpshop' ), 'slug' => 'free_product' ), array( 'name' => 'free_product' ), array( '%s', '%s' ), array( '%s' ) );
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('name' => __('Free product', 'wpshop'), 'slug' => 'free_product'), array('name' => 'free_product'), array('%s', '%s'), array('%s'));
 				
 				return true;
 			break;
@@ -2307,23 +2307,23 @@ 
 	 * Method called when deactivating the plugin
 	 * @see register_deactivation_hook()
 	 */
-	function uninstall_wpshop(){
+	function uninstall_wpshop() {
 		global $wpdb;
 
-		if(WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION && in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))){
+		if (WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION && in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))) {
 			$query = $wpdb->query("DROP TABLE `wp_wpshop__attribute`, `wp_wpshop__attributes_unit`, `wp_wpshop__attributes_unit_groups`, `wp_wpshop__attribute_set`, `wp_wpshop__attribute_set_section`, `wp_wpshop__attribute_set_section_details`, `wp_wpshop__attribute_value_datetime`, `wp_wpshop__attribute_value_decimal`, `wp_wpshop__attribute_value_integer`, `wp_wpshop__attribute_value_text`, `wp_wpshop__attribute_value_varchar`, `wp_wpshop__attribute_value__histo`, `wp_wpshop__cart`, `wp_wpshop__cart_contents`, `wp_wpshop__documentation`, `wp_wpshop__entity`, `wp_wpshop__historique`, `wp_wpshop__message`, `wp_wpshop__attribute_value_options`;");
 			$query = $wpdb->query("DELETE FROM " . $wpdb->options . " WHERE `option_name` LIKE '%wpshop%';");
 
 			$wpshop_products_posts = $wpdb->get_results("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE 'wpshop_%';");
 			$list = '  ';
-			foreach($wpshop_products_posts as $post){
+			foreach ($wpshop_products_posts as $post) {
 				$list .= "'" . $post->ID . "', ";
 			}
 			$list = substr($list, 0, -2);
 
 			$wpshop_products_posts = $wpdb->get_results("SELECT ID FROM " . $wpdb->posts . " WHERE post_parent IN (" . $list . ");");
 			$list_attachment = '  ';
-			foreach($wpshop_products_posts as $post){
+			foreach ($wpshop_products_posts as $post) {
 				$list_attachment .= "'" . $post->ID . "', ";
 			}
 			$list_attachment = substr($list_attachment, 0, -2);
@@ -2337,9 +2337,9 @@ 
 
 		/*	Unset administrator permission	*/
 		$adminRole = get_role('administrator');
-		foreach($adminRole->capabilities as $capabilityName => $capability){
-			if(substr($capabilityName, 0, 7) == 'wpshop_'){
-				if($adminRole->has_cap($capabilityName)){
+		foreach ($adminRole->capabilities as $capabilityName => $capability) {
+			if (substr($capabilityName, 0, 7) == 'wpshop_') {
+				if ($adminRole->has_cap($capabilityName)) {
 					$adminRole->remove_cap($capabilityName);
 				}
 			}

Braces +21 added lines, -24 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -142,10 +144,12 @@ 
 		$defined_sample_datas = new SimpleXMLElement( $sample_datas, LIBXML_NOCDATA );
 
 		$namespaces = $defined_sample_datas->getDocNamespaces();
-		if ( ! isset( $namespaces['wp'] ) )
-			$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
-		if ( ! isset( $namespaces['excerpt'] ) )
-			$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
+		if ( ! isset( $namespaces['wp'] ) ) {
+					$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
+		}
+		if ( ! isset( $namespaces['excerpt'] ) ) {
+					$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
+		}
 
 		foreach ( $defined_sample_datas->xpath( '//wpshop_products/wpshop_product' ) as $product ) {
 			$dc = $product->children( 'http://purl.org/dc/elements/1.1/' );
@@ -509,8 +513,7 @@ 
 									$new_set_section_infos['attribute_set_id'] = $attribute_set_id;
 									$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos);
 									$attribute_set_section_id = $wpdb->insert_id;
-								}
-								else{
+								} else{
 									$new_set_section_infos = $set_group_infos;
 									$new_set_section_infos['last_update_date'] = current_time('mysql', 0);
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos, array('id' => $attribute_set_section_id));
@@ -519,8 +522,7 @@ 
 								if(($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details))){
 									if(count($set_group_infos_details) <= 0){
 										$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('last_update_date' => current_time('mysql', 0), 'status' => 'deleted'), array('entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id));
-									}
-									else{
+									} else{
 										$query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
 										$last_position = $wpdb->get_var($query);
 										$position = (int)$last_position + 1;
@@ -582,8 +584,7 @@ 
 							$wpdb->update( $wpdb->usermeta, array( 'meta_value' => serialize( $current_order ), ), array( 'umeta_id' => $customer_metabox_order->umeta_id ) );
 						}
 					}
-				}
-				else {
+				} else {
 					$users = get_users( array( 'role' => 'administrator', ) );
 					if ( !empty( $users ) ) {
 						foreach ( $users as $user ) {
@@ -960,7 +961,9 @@ 
 						$options_args = array();
 						$options_args[$addon_name]['activate'] = $addon_state;
 						$options_args[$addon_name]['activation_date'] = current_time('mysql', 0);
-						if (! $addon_state ) $options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
+						if (! $addon_state ) {
+							$options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
+						}
 						add_option(WPSHOP_ADDONS_OPTION_NAME, $options_args);
 					}
 					delete_option('wpshop_addons_state');
@@ -1028,8 +1031,7 @@ 
 									$civility = $miss_id;
 								break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$billing_address = array('address_title' => $billing_title,
@@ -1076,8 +1078,7 @@ 
 									$civility = $miss_id;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$shipping_address = array();
@@ -1130,8 +1131,7 @@ 
 									$civility = $mister_id ;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$billing_address = array('address_title' => $billing_title,
@@ -1164,8 +1164,7 @@ 
 									$civility = $miss_id;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$shipping_address = array('address_title' => $shipping_title,
@@ -1295,8 +1294,7 @@ 
 									$civility = $mister_id ;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$billing_address = array('address_title' => $billing_title,
@@ -1332,8 +1330,7 @@ 
 									$civility = $miss_id;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id;
 						}
 						$shipping_address = array('address_title' => $shipping_title,

includes/librairies/payments/cic.class.php

Doc Comments +12 added lines

@@ -79,6 +79,9 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
+	/**
+	 * @param string[] $aConstants
+	 */
 	private function _checkTpeParams($aConstants) {
 
 		for ($i = 0; $i < count($aConstants); $i++)
@@ -105,6 +108,9 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
+	/**
+	 * @param CMCIC_Tpe $oTpe
+	 */
 	function __construct($oTpe) {
 
 		$this->_sUsableKey = $this->_getUsableKey($oTpe);
@@ -147,6 +153,9 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
+	/**
+	 * @param string $sData
+	 */
 	public function computeHmac($sData) {
 
 		return strtolower(hash_hmac("sha1", $sData, $this->_sUsableKey));
@@ -196,6 +205,9 @@ 
 //                           ********************
 //              Encodage des caract�res sp�ciaux au format HTML
 // ----------------------------------------------------------------------------
+/**
+ * @param string $data
+ */
 function HtmlEncode ($data)
 {
     $SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";

Indentation +16 added lines, -16 removed lines

@@ -198,22 +198,22 @@
 // ----------------------------------------------------------------------------
 function HtmlEncode ($data)
 {
-    $SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
-    $encoded_data = "";
-    $result = "";
-    for ($i=0; $i<strlen($data); $i++)
-    {
-        if (strchr($SAFE_OUT_CHARS, $data{$i})) {
-            $result .= $data{$i};
-        }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
-            $result .= "&#x" . $var . ";";
-        }
-        else
-            $result .= $data{$i};
-
-    }
-    return $result;
+	$SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
+	$encoded_data = "";
+	$result = "";
+	for ($i=0; $i<strlen($data); $i++)
+	{
+		if (strchr($SAFE_OUT_CHARS, $data{$i})) {
+			$result .= $data{$i};
+		}
+		else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+			$result .= "&#x" . $var . ";";
+		}
+		else
+			$result .= $data{$i};
+
+	}
+	return $result;
 }
 
 class wpshop_CIC {

Braces +18 added lines, -16 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' ) ) {
@@ -81,9 +83,10 @@ 
 
 	private function _checkTpeParams($aConstants) {
 
-		for ($i = 0; $i < count($aConstants); $i++)
-			if (!defined($aConstants[$i]))
+		for ($i = 0; $i < count($aConstants); $i++) {
+					if (!defined($aConstants[$i]))
 				die ("Erreur param�tre " . $aConstants[$i] . " ind�fini");
+		}
 	}
 
 }
@@ -126,13 +129,14 @@ 
 
 		$cca0=ord($hexFinal);
 
-		if ($cca0>70 && $cca0<97)
-			$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
-		else {
-			if (substr($hexFinal, 1, 1)=="M")
-				$hexStrKey .= substr($hexFinal, 0, 1) . "0";
-			else
-				$hexStrKey .= substr($hexFinal, 0, 2);
+		if ($cca0>70 && $cca0<97) {
+					$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
+		} else {
+			if (substr($hexFinal, 1, 1)=="M") {
+							$hexStrKey .= substr($hexFinal, 0, 1) . "0";
+			} else {
+							$hexStrKey .= substr($hexFinal, 0, 2);
+			}
 		}
 
 		return pack("H*", $hexStrKey);
@@ -205,12 +209,11 @@ 
     {
         if (strchr($SAFE_OUT_CHARS, $data{$i})) {
             $result .= $data{$i};
-        }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+        } else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
             $result .= "&#x" . $var . ";";
+        } else {
+                    $result .= $data{$i};
         }
-        else
-            $result .= $data{$i};
 
     }
     return $result;
@@ -329,8 +332,7 @@ 
 			wpshop_payment::check_order_payment_total_amount($CMCIC_bruteVars['reference'], $params_array, $payment_status);
 
 			$receipt = CMCIC_CGI2_MACOK;
-		}
-		else {
+		} else {
 			// your code if the HMAC doesn't match
 			$receipt = CMCIC_CGI2_MACNOTOK.$cgi2_fields;
 		}

Spacing +81 added lines, -81 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'));
 }
 
 
@@ -13,11 +13,11 @@ 
 ***************************************************************************************/
 
 
-define("CMCIC_CTLHMAC","V1.04.sha1.php--[CtlHmac%s%s]-%s");
+define("CMCIC_CTLHMAC", "V1.04.sha1.php--[CtlHmac%s%s]-%s");
 define("CMCIC_CTLHMACSTR", "CtlHmac%s%s");
-define("CMCIC_CGI2_RECEIPT","version=2\ncdr=%s");
-define("CMCIC_CGI2_MACOK","0");
-define("CMCIC_CGI2_MACNOTOK","1\n");
+define("CMCIC_CGI2_RECEIPT", "version=2\ncdr=%s");
+define("CMCIC_CGI2_MACOK", "0");
+define("CMCIC_CGI2_MACNOTOK", "1\n");
 define("CMCIC_CGI2_FIELDS", "%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*");
 define("CMCIC_CGI1_FIELDS", "%s*%s*%s%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s");
 define("CMCIC_URLPAIEMENT", "paiement.cgi");
@@ -25,15 +25,15 @@ 
 class CMCIC_Tpe {
 
 
-	public $sVersion;	// Version du TPE - TPE Version (Ex : 3.0)
-	public $sNumero;	// Numero du TPE - TPE Number (Ex : 1234567)
-	public $sCodeSociete;	// Code Societe - Company code (Ex : companyname)
-	public $sLangue;	// Langue - Language (Ex : FR, DE, EN, ..)
-	public $sUrlOK;		// Url de retour OK - Return URL OK
-	public $sUrlKO;		// Url de retour KO - Return URL KO
-	public $sUrlPaiement;	// Url du serveur de paiement - Payment Server URL (Ex : https://paiement.creditmutuel.fr/paiement.cgi)
+	public $sVersion; // Version du TPE - TPE Version (Ex : 3.0)
+	public $sNumero; // Numero du TPE - TPE Number (Ex : 1234567)
+	public $sCodeSociete; // Code Societe - Company code (Ex : companyname)
+	public $sLangue; // Langue - Language (Ex : FR, DE, EN, ..)
+	public $sUrlOK; // Url de retour OK - Return URL OK
+	public $sUrlKO; // Url de retour KO - Return URL KO
+	public $sUrlPaiement; // Url du serveur de paiement - Payment Server URL (Ex : https://paiement.creditmutuel.fr/paiement.cgi)
 
-	private $_sCle;		// La cl� - The Key
+	private $_sCle; // La cl� - The Key
 
 
 	// Constructeur / Constructor
@@ -52,8 +52,8 @@ 
 		$this->sCodeSociete = CMCIC_CODESOCIETE;
 		$this->sLangue = $sLangue;
 
-		$this->sUrlOK = wpshop_payment::get_success_payment_url();;
-		$this->sUrlKO = wpshop_payment::get_cancel_payment_url();;
+		$this->sUrlOK = wpshop_payment::get_success_payment_url(); ;
+		$this->sUrlKO = wpshop_payment::get_cancel_payment_url(); ;
 
 	}
 
@@ -97,7 +97,7 @@ 
 
 class CMCIC_Hmac {
 
-	private $_sUsableKey;	// La cl� du TPE en format op�rationnel / The usable TPE key
+	private $_sUsableKey; // La cl� du TPE en format op�rationnel / The usable TPE key
 
 	// ----------------------------------------------------------------------------
 	//
@@ -119,17 +119,17 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
-	private function _getUsableKey($oTpe){
+	private function _getUsableKey($oTpe) {
 
 		$hexStrKey  = substr($oTpe->getCle(), 0, 38);
 		$hexFinal   = "" . substr($oTpe->getCle(), 38, 2) . "00";
 
-		$cca0=ord($hexFinal);
+		$cca0 = ord($hexFinal);
 
-		if ($cca0>70 && $cca0<97)
-			$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
+		if ($cca0 > 70 && $cca0 < 97)
+			$hexStrKey .= chr($cca0 - 23) . substr($hexFinal, 1, 1);
 		else {
-			if (substr($hexFinal, 1, 1)=="M")
+			if (substr($hexFinal, 1, 1) == "M")
 				$hexStrKey .= substr($hexFinal, 0, 1) . "0";
 			else
 				$hexStrKey .= substr($hexFinal, 0, 2);
@@ -170,17 +170,17 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
-	public function hmac_sha1 ($key, $data) {
+	public function hmac_sha1($key, $data) {
 
 		$length = 64; // block length for SHA1
-		if (strlen($key) > $length) { $key = pack("H*",sha1($key)); }
+		if (strlen($key) > $length) { $key = pack("H*", sha1($key)); }
 		$key  = str_pad($key, $length, chr(0x00));
 		$ipad = str_pad('', $length, chr(0x36));
 		$opad = str_pad('', $length, chr(0x5c));
-		$k_ipad = $key ^ $ipad ;
+		$k_ipad = $key ^ $ipad;
 		$k_opad = $key ^ $opad;
 
-		return sha1($k_opad  . pack("H*",sha1($k_ipad . $data)));
+		return sha1($k_opad . pack("H*", sha1($k_ipad . $data)));
 	}
 
 }
@@ -196,17 +196,17 @@ 
 //                           ********************
 //              Encodage des caract�res sp�ciaux au format HTML
 // ----------------------------------------------------------------------------
-function HtmlEncode ($data)
+function HtmlEncode($data)
 {
     $SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
     $encoded_data = "";
     $result = "";
-    for ($i=0; $i<strlen($data); $i++)
+    for ($i = 0; $i < strlen($data); $i++)
     {
         if (strchr($SAFE_OUT_CHARS, $data{$i})) {
             $result .= $data{$i};
         }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+        else if (($var = bin2hex(substr($data, $i, 1))) <= "7F") {
             $result .= "&#x" . $var . ";";
         }
         else
@@ -220,21 +220,21 @@ 
 
 	public function __construct() {
 		global $wpshop;
-		$cic_option = get_option( 'wpshop_addons' );
-		if ( !empty($cic_option) && !empty($cic_option['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']) ) {
+		$cic_option = get_option('wpshop_addons');
+		if (!empty($cic_option) && !empty($cic_option['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC'])) {
 			/** Check if SystemPay is registred in Payment Main Option **/
-			$payment_option = get_option( 'wps_payment_mode' );
-			if ( !empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('cic', $payment_option['mode']) ) {
+			$payment_option = get_option('wps_payment_mode');
+			if (!empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('cic', $payment_option['mode'])) {
 				$payment_option['mode']['cic']['name'] = __('CIC', 'wpshop');
-				$payment_option['mode']['cic']['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/cic_payment_logo.jpg';
+				$payment_option['mode']['cic']['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg';
 				$payment_option['mode']['cic']['description'] = __('Reservation of products upon confirmation of payment.', 'wpshop');
-				update_option( 'wps_payment_mode', $payment_option );
+				update_option('wps_payment_mode', $payment_option);
 			}
 		}
 
-		$paymentListener = !empty( $_GET['paymentListener'] ) ? sanitize_text_field( $_GET['paymentListener'] ) : '';
+		$paymentListener = !empty($_GET['paymentListener']) ? sanitize_text_field($_GET['paymentListener']) : '';
 
-		if(!empty($paymentListener) && $paymentListener=='cic') {
+		if (!empty($paymentListener) && $paymentListener == 'cic') {
 			header("Pragma: no-cache");
 			header("Content-type: text/plain");
 			self::display_response();
@@ -278,7 +278,7 @@ 
 		if ($oHmac->computeHmac($cgi2_fields) == strtolower($CMCIC_bruteVars['MAC'])) {
 			wpshop_payment::save_payment_return_data($CMCIC_bruteVars['reference']);
 			$payment_status = 'denied';
-			switch($CMCIC_bruteVars['code-retour']) {
+			switch ($CMCIC_bruteVars['code-retour']) {
 				case "Annulation" :
 					// Attention : an autorization may still be delivered for this payment
 					//wpshop_payment::setOrderPaymentStatus($CMCIC_bruteVars['reference'], 'denied');
@@ -319,15 +319,15 @@ 
 				break;
 			}
 
-			$order_meta = get_post_meta( $CMCIC_bruteVars['reference'], '_order_postmeta', true);
+			$order_meta = get_post_meta($CMCIC_bruteVars['reference'], '_order_postmeta', true);
 			$params_array = array(
 				'method' => 'cic',
-				'waited_amount' => number_format( (float)$order_meta['order_amount_to_pay_now'], 2, '.', ''),
-				'status' => (($payment_status == 'completed') ? ( ( number_format( (float)$order_meta['order_amount_to_pay_now'], 2, '.', '') == number_format( (float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '' ) ) ? 'payment_received' : 'incorrect_amount' ) : $payment_status),
+				'waited_amount' => number_format((float)$order_meta['order_amount_to_pay_now'], 2, '.', ''),
+				'status' => (($payment_status == 'completed') ? ((number_format((float)$order_meta['order_amount_to_pay_now'], 2, '.', '') == number_format((float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '')) ? 'payment_received' : 'incorrect_amount') : $payment_status),
 				'author' => $order_meta['customer_id'],
 				'payment_reference' => $CMCIC_bruteVars['numauto'],
 				'date' => current_time('mysql', 0),
-				'received_amount' => number_format( (float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '' )
+				'received_amount' => number_format((float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '')
 			);
 			wpshop_payment::check_order_payment_total_amount($CMCIC_bruteVars['reference'], $params_array, $payment_status);
 
@@ -335,11 +335,11 @@ 
 		}
 		else {
 			// your code if the HMAC doesn't match
-			$receipt = CMCIC_CGI2_MACNOTOK.$cgi2_fields;
+			$receipt = CMCIC_CGI2_MACNOTOK . $cgi2_fields;
 		}
 
 		// Send receipt to CMCIC server
-		printf (CMCIC_CGI2_RECEIPT, $receipt);
+		printf(CMCIC_CGI2_RECEIPT, $receipt);
 	}
 
 	public static function display_form($oid) {
@@ -349,10 +349,10 @@ 
 		$order_customer_info = get_post_meta($oid, '_order_info', true);
 		//$currency_code = wpshop_tools::wpshop_get_currency($code=true);
 		$current_currency = get_option('wpshop_shop_default_currency');
-		$query = $wpdb->prepare('SELECT code_iso FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
-		$currency_code = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT code_iso FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id =%d ', $current_currency);
+		$currency_code = $wpdb->get_var($query);
 
-		if(!empty($order) && !empty($currency_code)) {
+		if (!empty($order) && !empty($currency_code)) {
 
 			$sOptions = "";
 			// ----------------------------------------------------------------------------
@@ -360,12 +360,12 @@ 
 			//  That's your job to set actual order fields. Here is a stub.
 			// -----------------------------------------------------------------------------
 			$sReference = $oid; // Reference: unique, alphaNum (A-Z a-z 0-9), 12 characters max
-			$sMontant = number_format($order['order_grand_total'],2,'.',''); // Amount : format  "xxxxx.yy" (no spaces)
+			$sMontant = number_format($order['order_grand_total'], 2, '.', ''); // Amount : format  "xxxxx.yy" (no spaces)
 			$sDevise  = $currency_code; // Currency : ISO 4217 compliant
 			$sTexteLibre = ""; // free texte : a bigger reference, session context for the return on the merchant website
 			$sDate = date("d/m/Y:H:i:s"); // transaction date : format d/m/y:h:m:s
 			$sLangue = "FR"; // Language of the company code
-			$sEmail = $order_customer_info['billing']['address']['address_user_email'];//"dev@eoxia.com"; // customer email
+			$sEmail = $order_customer_info['billing']['address']['address_user_email']; //"dev@eoxia.com"; // customer email
 			///////////////////////////////////////////////////////////////////////////////////////////
 			$sNbrEch = ""; //$sNbrEch = "4"; // between 2 and 4
 			$sDateEcheance1 = ""; // date echeance 1 - format dd/mm/yyyy //$sDateEcheance1 = date("d/m/Y");
@@ -386,7 +386,7 @@ 
 			$CtlHmac = sprintf(CMCIC_CTLHMAC, $oTpe->sVersion, $oTpe->sNumero, $oHmac->computeHmac(sprintf(CMCIC_CTLHMACSTR, $oTpe->sVersion, $oTpe->sNumero)));
 
 			// Data to certify
-			$PHP1_FIELDS = sprintf(CMCIC_CGI1_FIELDS,     $oTpe->sNumero,
+			$PHP1_FIELDS = sprintf(CMCIC_CGI1_FIELDS, $oTpe->sNumero,
 															$sDate,
 															$sMontant,
 															$sDevise,
@@ -413,30 +413,30 @@ 
 		?>
 		<script type="text/javascript">jQuery(document).ready(function(){ jQuery('#PaymentRequest_cic').submit(); });</script>
 		<div class="paypalPaymentLoading"><span><?php _e('Redirect to the CIC site in progress, please wait...', 'wpshop'); ?></span></div>
-		<form action="<?php echo $oTpe->sUrlPaiement;?>" method="post" id="PaymentRequest_cic">
-			<input type="hidden" name="version"             id="version"        value="<?php echo $oTpe->sVersion;?>" />
-			<input type="hidden" name="TPE"                 id="TPE"            value="<?php echo $oTpe->sNumero;?>" />
-			<input type="hidden" name="date"                id="date"           value="<?php echo $sDate;?>" />
-			<input type="hidden" name="montant"             id="montant"        value="<?php echo $sMontant . $sDevise;?>" />
-			<input type="hidden" name="reference"           id="reference"      value="<?php echo $sReference;?>" />
-			<input type="hidden" name="MAC"                 id="MAC"            value="<?php echo $sMAC;?>" />
-			<input type="hidden" name="url_retour"          id="url_retour"     value="<?php echo $oTpe->sUrlKO;?>" />
-			<input type="hidden" name="url_retour_ok"       id="url_retour_ok"  value="<?php echo $oTpe->sUrlOK;?>" />
-			<input type="hidden" name="url_retour_err"      id="url_retour_err" value="<?php echo $oTpe->sUrlKO;?>" />
-			<input type="hidden" name="lgue"                id="lgue"           value="<?php echo $oTpe->sLangue;?>" />
-			<input type="hidden" name="societe"             id="societe"        value="<?php echo $oTpe->sCodeSociete;?>" />
-			<input type="hidden" name="texte-libre"         id="texte-libre"    value="<?php echo HtmlEncode($sTexteLibre);?>" />
-			<input type="hidden" name="mail"                id="mail"           value="<?php echo $sEmail;?>" />
+		<form action="<?php echo $oTpe->sUrlPaiement; ?>" method="post" id="PaymentRequest_cic">
+			<input type="hidden" name="version"             id="version"        value="<?php echo $oTpe->sVersion; ?>" />
+			<input type="hidden" name="TPE"                 id="TPE"            value="<?php echo $oTpe->sNumero; ?>" />
+			<input type="hidden" name="date"                id="date"           value="<?php echo $sDate; ?>" />
+			<input type="hidden" name="montant"             id="montant"        value="<?php echo $sMontant . $sDevise; ?>" />
+			<input type="hidden" name="reference"           id="reference"      value="<?php echo $sReference; ?>" />
+			<input type="hidden" name="MAC"                 id="MAC"            value="<?php echo $sMAC; ?>" />
+			<input type="hidden" name="url_retour"          id="url_retour"     value="<?php echo $oTpe->sUrlKO; ?>" />
+			<input type="hidden" name="url_retour_ok"       id="url_retour_ok"  value="<?php echo $oTpe->sUrlOK; ?>" />
+			<input type="hidden" name="url_retour_err"      id="url_retour_err" value="<?php echo $oTpe->sUrlKO; ?>" />
+			<input type="hidden" name="lgue"                id="lgue"           value="<?php echo $oTpe->sLangue; ?>" />
+			<input type="hidden" name="societe"             id="societe"        value="<?php echo $oTpe->sCodeSociete; ?>" />
+			<input type="hidden" name="texte-libre"         id="texte-libre"    value="<?php echo HtmlEncode($sTexteLibre); ?>" />
+			<input type="hidden" name="mail"                id="mail"           value="<?php echo $sEmail; ?>" />
 			<!-- Uniquement pour le Paiement fractionn� -->
-			<input type="hidden" name="nbrech"              id="nbrech"         value="<?php echo $sNbrEch;?>" />
-			<input type="hidden" name="dateech1"            id="dateech1"       value="<?php echo $sDateEcheance1;?>" />
-			<input type="hidden" name="montantech1"         id="montantech1"    value="<?php echo $sMontantEcheance1;?>" />
-			<input type="hidden" name="dateech2"            id="dateech2"       value="<?php echo $sDateEcheance2;?>" />
-			<input type="hidden" name="montantech2"         id="montantech2"    value="<?php echo $sMontantEcheance2;?>" />
-			<input type="hidden" name="dateech3"            id="dateech3"       value="<?php echo $sDateEcheance3;?>" />
-			<input type="hidden" name="montantech3"         id="montantech3"    value="<?php echo $sMontantEcheance3;?>" />
-			<input type="hidden" name="dateech4"            id="dateech4"       value="<?php echo $sDateEcheance4;?>" />
-			<input type="hidden" name="montantech4"         id="montantech4"    value="<?php echo $sMontantEcheance4;?>" />
+			<input type="hidden" name="nbrech"              id="nbrech"         value="<?php echo $sNbrEch; ?>" />
+			<input type="hidden" name="dateech1"            id="dateech1"       value="<?php echo $sDateEcheance1; ?>" />
+			<input type="hidden" name="montantech1"         id="montantech1"    value="<?php echo $sMontantEcheance1; ?>" />
+			<input type="hidden" name="dateech2"            id="dateech2"       value="<?php echo $sDateEcheance2; ?>" />
+			<input type="hidden" name="montantech2"         id="montantech2"    value="<?php echo $sMontantEcheance2; ?>" />
+			<input type="hidden" name="dateech3"            id="dateech3"       value="<?php echo $sDateEcheance3; ?>" />
+			<input type="hidden" name="montantech3"         id="montantech3"    value="<?php echo $sMontantEcheance3; ?>" />
+			<input type="hidden" name="dateech4"            id="dateech4"       value="<?php echo $sDateEcheance4; ?>" />
+			<input type="hidden" name="montantech4"         id="montantech4"    value="<?php echo $sMontantEcheance4; ?>" />
 			<!-- -->
 			<noscript><input type="submit" name="bouton"              id="bouton"         value="Connexion / Connection" /></noscript>
 		</form>
@@ -448,16 +448,16 @@ 
 	}
 
 
-	function display_admin_part( $k ) {
+	function display_admin_part($k) {
 		$cmcic_params = get_option('wpshop_cmcic_params', array());
 		$output = '';
-		$output .= '<h2>' .__('CIC configurations', 'wpshop'). '</h2>';
+		$output .= '<h2>' . __('CIC configurations', 'wpshop') . '</h2>';
 		$output .= '<div class="wps_shipping_mode_configuration_part">';
-		$output .= '<label class="simple_right">'.__('Key', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[cle]" type="text" value="'.$cmcic_params['cle'].'" /><br />';
-		$output .= '<label class="simple_right">'.__('TPE', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[tpe]" type="text" value="'.$cmcic_params['tpe'].'" /><br />';
-		$output .= '<label class="simple_right">'.__('Version', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[version]" type="text" value="'.$cmcic_params['version'].'" /> => 3.0<br />';
-		$output .= '<label class="simple_right">'.__('Serveur', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[serveur]" type="text" value="'.$cmcic_params['serveur'].'" /><br />';
-		$output .= '<label class="simple_right">'.__('Company code', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[codesociete]" type="text" value="'.$cmcic_params['codesociete'].'" /><br />';
+		$output .= '<label class="simple_right">' . __('Key', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[cle]" type="text" value="' . $cmcic_params['cle'] . '" /><br />';
+		$output .= '<label class="simple_right">' . __('TPE', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[tpe]" type="text" value="' . $cmcic_params['tpe'] . '" /><br />';
+		$output .= '<label class="simple_right">' . __('Version', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[version]" type="text" value="' . $cmcic_params['version'] . '" /> => 3.0<br />';
+		$output .= '<label class="simple_right">' . __('Serveur', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[serveur]" type="text" value="' . $cmcic_params['serveur'] . '" /><br />';
+		$output .= '<label class="simple_right">' . __('Company code', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[codesociete]" type="text" value="' . $cmcic_params['codesociete'] . '" /><br />';
 		$output .= '</div>';
 
 		return $output;

includes/librairies/payments/payment.class.php

Doc Comments +7 added lines, -2 removed lines

@@ -38,6 +38,10 @@ 
 		return $url;
 	}
 
+	/**
+	 * @param string $param
+	 * @param string $value
+	 */
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
 		if($interoguation_marker_pos===false)
@@ -86,7 +90,7 @@ 
 	 * Display the list of payment methods available
 	 *
 	 * @param integer $order_id The order id if existing - Useful when user does not finish its order and want to validateit later
-	 * @return string The different payment method
+	 * @return string[] The different payment method
 	 */
 	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
 		$output = '';
@@ -377,7 +381,7 @@ 
 	 * Allows to inform customer that he would pay a partial amount on this order
 	 *
 	 * @param float $current_order_total The current order total to pay before partial amount calcul
-	 * @return array The amount to pay / A html output with amount to pay and different information
+	 * @return string The amount to pay / A html output with amount to pay and different information
 	 */
 	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
 		$output = '';
@@ -482,6 +486,7 @@ 
 	 * @param array $order_meta The complete order meta informations
 	 * @param integer $payment_index The payment to add/update data for
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
+	 * @param integer $order_id
 	 * @return array The order new meta informations
 	 */
 	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {

Indentation +6 added lines, -6 removed lines

@@ -218,8 +218,8 @@ 
 
 
 	/**
-	* Reduce the stock regarding the order
-	*/
+	 * Reduce the stock regarding the order
+	 */
 	function the_order_payment_is_completed($order_id, $txn_id = null) {
 		// Donnees commandes
 		$order = get_post_meta($order_id, '_order_postmeta', true);
@@ -293,8 +293,8 @@ 
 	}
 
 	/**
-	* Get payment method
-	*/
+	 * Get payment method
+	 */
 	function get_payment_method($post_id){
 		$pm = __('Nc','wpshop');
 		$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
@@ -321,8 +321,8 @@ 
 	}
 
 	/**
-	* Set payment transaction number
-	*/
+	 * Set payment transaction number
+	 */
 	function display_payment_receiver_interface($post_id) {
 		$payment_validation = '';
 		$display_button = false;

Braces +13 added lines, -14 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' ) ) {
@@ -40,9 +42,11 @@ 
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if($interoguation_marker_pos===false) {
+					return $url.'?'.$param.'='.$value;
+		} else {
+			return $url.'&'.$param.'='.$value;
+		}
 	}
 
 	/**
@@ -167,8 +171,7 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
 					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
-					}
-					else {
+					} else {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
@@ -200,8 +203,7 @@ 
 
 						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
-						}
-						else {
+						} else {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
 						}
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
@@ -629,8 +631,7 @@ 
 					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
 						$payment_status = 'pos';
 					}
-				}
-				else {
+				} else {
 					$payment_status = 'partially_paid';
 				}
 
@@ -655,16 +656,14 @@ 
 				}
 
 				$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
-			}
-			else {
+			} else {
 				$payment_status = $bank_response;
 			}
 
 			$order_meta['order_status'] = $payment_status;
 			if( !$save_metadata ) {
 				return 	$order_meta;
-			}
-			else {
+			} else {
 				update_post_meta( $order_id, '_order_postmeta', $order_meta);
 			}
 			update_post_meta( $order_id, '_wpshop_order_status', $payment_status);

Spacing +192 added lines, -192 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -20,29 +20,29 @@ 
 
 		$wpshop_paypal = new wpshop_paypal();
 		// If the CIC payment method is active
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if(WPSHOP_PAYMENT_METHOD_CIC && ( !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']) ) ) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if (WPSHOP_PAYMENT_METHOD_CIC && (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']))) {
 			$wpshop_cic = new wpshop_CIC();
 		}
-		wpshop_tools::create_custom_hook ('wpshop_bankserver_reponse');
+		wpshop_tools::create_custom_hook('wpshop_bankserver_reponse');
 
 	}
 
 	public static function get_success_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_page_id')));
 		return self::construct_url_parameters($url, 'paymentResult', 'success');
 	}
 
 	public static function get_cancel_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_nok_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_nok_page_id')));
 		return $url;
 	}
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if ($interoguation_marker_pos === false)
+			return $url . '?' . $param . '=' . $value;
+		else return $url . '&' . $param . '=' . $value;
 	}
 
 	/**
@@ -51,23 +51,23 @@ 
 	public static function wpshop_payment_result() {
 		global $wpdb;
 		$user_ID = get_current_user_id();
-		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
-		$order_post_id = $wpdb->get_var( $query );
-		if ( !empty($order_post_id) ) {
-			$order_postmeta = get_post_meta($order_post_id , '_wpshop_order_status', true);
-			if ( !empty($order_postmeta) ) {
-				switch ( $order_postmeta ) {
+		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
+		$order_post_id = $wpdb->get_var($query);
+		if (!empty($order_post_id)) {
+			$order_postmeta = get_post_meta($order_post_id, '_wpshop_order_status', true);
+			if (!empty($order_postmeta)) {
+				switch ($order_postmeta) {
 					case 'awaiting_payment':
-						echo __('We wait your payment.','wpshop');
+						echo __('We wait your payment.', 'wpshop');
 					break;
 					case 'completed':
-						echo __('Thank you ! Your payment has been recorded.','wpshop');
+						echo __('Thank you ! Your payment has been recorded.', 'wpshop');
 					break;
 					case 'partially_paid':
-						echo __('Thank you ! Your first payment has been recorded.','wpshop');
+						echo __('Thank you ! Your first payment has been recorded.', 'wpshop');
 					break;
 					default:
-						echo __('Your payment and your order has been cancelled.','wpshop');
+						echo __('Your payment and your order has been cancelled.', 'wpshop');
 					break;
 				}
 			}
@@ -88,56 +88,56 @@ 
 	 * @param integer $order_id The order id if existing - Useful when user does not finish its order and want to validateit later
 	 * @return string The different payment method
 	 */
-	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
+	function __display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
 		$output = '';
 		/**	Get available payment method	*/
 		$paymentMethod = get_option('wpshop_paymentMethod', array());
 
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
 
 		if ($cart_type == 'cart') {
 			$payment_methods = array();
-			if(!empty($paymentMethod['paypal'])) {
+			if (!empty($paymentMethod['paypal'])) {
 				$payment_methods['paypal'] = array('payment_method_name' => __('CB with Paypal', 'wpshop'),
 														'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/paypal.png',
-														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.','wpshop')
+														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.', 'wpshop')
 								 );
 			}
-			if(!empty($paymentMethod['checks'])) {
+			if (!empty($paymentMethod['checks'])) {
 				$payment_methods['check'] = array('payment_method_name' => __('Check', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' => __('Reservation of products upon receipt of the check.','wpshop')
+						'payment_method_explanation' => __('Reservation of products upon receipt of the check.', 'wpshop')
 				);
 			}
-			if(!empty($paymentMethod['banktransfer'])) {
+			if (!empty($paymentMethod['banktransfer'])) {
 				$payment_methods['banktransfer'] = array('payment_method_name' => __('Bank transfer', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' =>__('Reservation of product receipt of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of product receipt of payment.', 'wpshop')
 				);
 			}
-			if(WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
+			if (WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
 				$payment_methods['cic'] = array('payment_method_name' =>__('Credit card', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg',
-						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.', 'wpshop')
 				);
 			}
 			$payment_methods = apply_filters('wpshop_payment_method', $payment_methods);
 
 			$payment_method_table = array();
 
-			if ( !empty( $paymentMethod['display_position'] ) ) {
+			if (!empty($paymentMethod['display_position'])) {
 				$position_determinated = false;
-				foreach ( $paymentMethod['display_position'] as $key => $position) {
-					if ( $position != null) {
+				foreach ($paymentMethod['display_position'] as $key => $position) {
+					if ($position != null) {
 						$position_determinated = true;
 					}
 				}
-				if ( $position_determinated ) {
-					for ( $i = 1; $i < count( $paymentMethod['display_position'] ) + 1; $i++) {
-						foreach ( $paymentMethod['display_position'] as $key => $position ) {
-							if ( $position == $i  && !empty($paymentMethod[$key])) {
+				if ($position_determinated) {
+					for ($i = 1; $i < count($paymentMethod['display_position']) + 1; $i++) {
+						foreach ($paymentMethod['display_position'] as $key => $position) {
+							if ($position == $i && !empty($paymentMethod[$key])) {
 								if ($key == 'checks') {
 									$key = 'check';
 								}
@@ -148,16 +148,16 @@ 
 					$payment_methods = $payment_method_table;
 				}
 			}
-			if (!empty($payment_methods) ) {
+			if (!empty($payment_methods)) {
 
-				foreach( $payment_methods as  $payment_method_identifier =>  $payment_method_def ) {
+				foreach ($payment_methods as  $payment_method_identifier =>  $payment_method_def) {
 					$tpl_component = array();
 					$checked = $active = '';
 					$payment_identifier_for_test = $payment_method_identifier;
 					if ($payment_method_identifier == 'check') {
 						$payment_identifier_for_test = 'checks';
 					}
-					if ( !empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
+					if (!empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
 						$checked = ' checked="checked"';
 						$active = ' active';
 
@@ -165,11 +165,11 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = $active;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = $checked;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
-					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
+					if (!empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? wp_get_attachment_image($payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo')) : '';
 					}
 					else {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? '<img src="' . $payment_method_def['payment_method_icon'] . '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = $payment_method_def['payment_method_name'];
@@ -180,32 +180,32 @@ 
 			}
 		}
 
-		return array( $output, $paymentMethod['mode'] );
+		return array($output, $paymentMethod['mode']);
 	}
 
 
-	public static function display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
-		$payment_option = get_option( 'wps_payment_mode' );
+	public static function display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
+		$payment_option = get_option('wps_payment_mode');
 		$output = '';
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
-		if( $cart_type == 'cart' ) {
-			if ( !empty($payment_option) && !empty($payment_option['mode']) ) {
-				foreach( $payment_option['mode'] as $payment_id => $payment_config ) {
-					if( !empty($payment_config['active']) ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? ' active' : '');
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? 'checked="checked"' : '');
+		if ($cart_type == 'cart') {
+			if (!empty($payment_option) && !empty($payment_option['mode'])) {
+				foreach ($payment_option['mode'] as $payment_id => $payment_config) {
+					if (!empty($payment_config['active'])) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? ' active' : '');
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? 'checked="checked"' : '');
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_id;
 
-						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
+						if (!empty($payment_config['logo']) && (int)$payment_config['logo'] != 0) {
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? wp_get_attachment_image($payment_config['logo'], 'thumbnail', false) : '';
 						}
 						else {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? '<img src="' . $payment_config['logo'] . '" alt="' . $payment_config['name'] . '" />' : '';
 						}
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = ( !empty($payment_config['description']) ) ? $payment_config['description'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = (!empty($payment_config['name'])) ? $payment_config['name'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = (!empty($payment_config['description'])) ? $payment_config['description'] : '';
 						$output .= wpshop_display::display_template_element('wpshop_checkout_page_payment_method_bloc', $tpl_component, array('type' => 'payment_method', 'id' => $payment_id));
 						unset($tpl_component);
 					}
@@ -227,13 +227,13 @@ 
 
 		$wps_message = new wps_message_ctr();
 
-		if(!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
-			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '' );
-			$first_name = ( !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+		if (!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
+			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '');
+			$first_name = (!empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
 			// Envoie du message de confirmation de paiement au client
-			switch($order['payment_method']) {
+			switch ($order['payment_method']) {
 				case 'check':
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']));
 				break;
@@ -250,24 +250,24 @@ 
 	}
 
 
-	function setOrderPaymentStatus( $order_id, $payment_status ) {
+	function setOrderPaymentStatus($order_id, $payment_status) {
 		/**	Get order main information	*/
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 		$send_email = false;
 
-		if ( !empty($order) ) {
+		if (!empty($order)) {
 			/**	Change order status to given status	*/
 			$order['order_status'] = strtolower($payment_status);
 			/**	Put order status into a single meta, allowing to use it easily later	*/
 			update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 			/**	In case the set status is completed, make specific treatment: add the completed date	*/
-			if ( $payment_status == 'completed' ) {
+			if ($payment_status == 'completed') {
 				/**	Read order items list, if not empty and check if each item is set to manage stock or not */
 				if (!empty($order['order_items'])) {
 					foreach ($order['order_items'] as $o) {
-						$product = wpshop_products::get_product_data( $o['item_id'] );
-						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop') ) {
+						$product = wpshop_products::get_product_data($o['item_id']);
+						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop')) {
 							wpshop_products::reduce_product_stock_qty($o['item_id'], $o['item_qty']);
 						}
 					}
@@ -281,7 +281,7 @@ 
 			}
 
 			/**	Send email to customer when specific case need it	*/
-			if ( $send_email ) {
+			if ($send_email) {
 				/**	Get information about customer that make the order	*/
 				$order_info = get_post_meta($order_id, '_order_info', true);
 				$mail_tpl_component = array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']);
@@ -295,25 +295,25 @@ 
 	/**
 	* Get payment method
 	*/
-	function get_payment_method($post_id){
-		$pm = __('Nc','wpshop');
+	function get_payment_method($post_id) {
+		$pm = __('Nc', 'wpshop');
 		$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
-		if ( !empty($order_postmeta['payment_method']) ) {
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
-					$pm = __('Check','wpshop');
+					$pm = __('Check', 'wpshop');
 				break;
 				case 'paypal':
-					$pm = __('Paypal','wpshop');
+					$pm = __('Paypal', 'wpshop');
 				break;
 				case 'banktransfer':
-					$pm = __('Bank transfer','wpshop');
+					$pm = __('Bank transfer', 'wpshop');
 				break;
 				case 'cic':
-					$pm = __('Credit card','wpshop');
+					$pm = __('Credit card', 'wpshop');
 				break;
 				default:
-					$pm = __('Nc','wpshop');
+					$pm = __('Nc', 'wpshop');
 				break;
 			}
 		}
@@ -333,38 +333,38 @@ 
 
 		$paymentMethod = $paymentMethod['mode'];
 		$payment_validation .= '
-<div id="order_payment_method_'.$post_id.'" class="wpshop_cls wpshopHide" >
-	<input type="hidden" id="used_method_payment_'.$post_id.'" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
-	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id.'" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
+<div id="order_payment_method_'.$post_id . '" class="wpshop_cls wpshopHide" >
+	<input type="hidden" id="used_method_payment_'.$post_id . '" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
+	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id . '" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
 
-		if(!empty($order_postmeta['payment_method'])){
+		if (!empty($order_postmeta['payment_method'])) {
 			$payment_validation .= sprintf(__('Selected payment method: %s', 'wpshop'), __($order_postmeta['payment_method'], 'wpshop')) . '<br/>';
 		}
 
-		if(!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="paypal" id="payment_method_paypal" /><label for="payment_method_paypal" >' . __('Paypal', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="check" id="payment_method_check" /><label for="payment_method_check" >' . __('Check', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic'])) ) && empty($order_postmeta['payment_method'])) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if ((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']))) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="cb" id="payment_method_cb" /><label for="payment_method_cb" >' . __('Credit card', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(empty($payment_transaction)){
-			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_'.$post_id.'" />';
+		if (empty($payment_transaction)) {
+			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_' . $post_id . '" />';
 			$display_button = true;
 		}
 
-		if($display_button){
+		if ($display_button) {
 			$payment_validation .= '
-		<br/><br/><a class="button payment_method_validate order_'.$post_id.' wpshop_clear" >'.__('Validate payment method', 'wpshop').'</a>';
+		<br/><br/><a class="button payment_method_validate order_'.$post_id . ' wpshop_clear" >' . __('Validate payment method', 'wpshop') . '</a>';
 		}
 
 		$payment_validation .= '
@@ -379,21 +379,21 @@ 
 	 * @param float $current_order_total The current order total to pay before partial amount calcul
 	 * @return array The amount to pay / A html output with amount to pay and different information
 	 */
-	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
+	function partial_payment_calcul($current_order_total, $for = 'for_all') {
 		$output = '';
 		$tpl_component = array();
 
 		/**	Get current configuration	*/
 		$partial_payment_configuration = get_option('wpshop_payment_partial', array($for => array(), 'for_quotation' => array()));
-		if ( !empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on') ) {
+		if (!empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on')) {
 			$amount_of_partial_payment = 0;
-			if ( !empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate']) ) {
+			if (!empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate'])) {
 				$amount_of_partial_payment = $partial_payment_configuration[$for]['value'];
 			}
 
 			$partial_amount_to_pay = 0;
 			$type_of_partial_payment = null;
-			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type']) ) {
+			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type'])) {
 				switch ($partial_payment_configuration[$for]['type']) {
 					case 'percentage':
 						$type_of_partial_payment = '%';
@@ -453,7 +453,7 @@ 
 	function set_payment_transaction_number($order_id, $transaction_number) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
-		if ( !empty($order_postmeta['order_payment']['received']) ) {
+		if (!empty($order_postmeta['order_payment']['received'])) {
 			if (count($order_postmeta['order_payment']['received']) == 1) {
 				$order_postmeta['order_payment']['received'][0]['payment_reference'] = $transaction_number;
 			}
@@ -467,10 +467,10 @@ 
 	 *
 	 * @param integer $order_id
 	 */
-	function save_payment_return_data( $order_id ) {
+	function save_payment_return_data($order_id) {
 		$data = wpshop_tools::getMethode();
 
-		$current_payment_return = get_post_meta( $order_id, '_wpshop_payment_return_data', true);
+		$current_payment_return = get_post_meta($order_id, '_wpshop_payment_return_data', true);
 		$current_payment_return[] = $data;
 
 		update_post_meta($order_id, '_wpshop_payment_return_data', $current_payment_return);
@@ -484,23 +484,23 @@ 
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
 	 * @return array The order new meta informations
 	 */
-	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {
-
-		$order_meta['order_payment']['received'][$payment_index]['method'] = ( !empty($params['method']) ) ? $params['method'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = ( !empty($params['waited_amount']) ) ? $params['waited_amount'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['status'] = ( !empty($params['status']) ) ? $params['status'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['author'] = ( !empty($params['author']) ) ? $params['author'] : get_current_user_id();
-		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] =( !empty($params['payment_reference']) ) ? $params['payment_reference'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['date'] = ( !empty($params['date']) ) ? $params['date'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = ( !empty($params['received_amount']) ) ? $params['received_amount'] : null;
+	public static function add_new_payment_to_order($order_id, $order_meta, $payment_index, $params, $bank_response) {
+
+		$order_meta['order_payment']['received'][$payment_index]['method'] = (!empty($params['method'])) ? $params['method'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = (!empty($params['waited_amount'])) ? $params['waited_amount'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['status'] = (!empty($params['status'])) ? $params['status'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['author'] = (!empty($params['author'])) ? $params['author'] : get_current_user_id();
+		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] = (!empty($params['payment_reference'])) ? $params['payment_reference'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['date'] = (!empty($params['date'])) ? $params['date'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = (!empty($params['received_amount'])) ? $params['received_amount'] : null;
 		$order_meta['order_payment']['received'][$payment_index]['comment'] = '';
 
 		$order_info = get_post_meta($order_id, '_order_info', true);
-		if(!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
+		if (!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
 
 			/**	Generate an invoice number for the current payment. Check if the payment is complete or not	*/
-			if ( empty($order_meta['order_invoice_ref']) ) {
-				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number( $order_id );
+			if (empty($order_meta['order_invoice_ref'])) {
+				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number($order_id);
 			}
 		}
 
@@ -513,13 +513,13 @@ 
 	 * @param string $payment_method
 	 * @return integer $key : array id of [order_payment][received] in the order postmeta
 	 */
-	public static function get_order_waiting_payment_array_id ( $oid, $payment_method ) {
+	public static function get_order_waiting_payment_array_id($oid, $payment_method) {
 		$key = 0;
-		$order_meta = get_post_meta( $oid, '_order_postmeta', true);
-		if ( !empty($order_meta) ) {
-			$key = count( $order_meta['order_payment']['received'] );
-			foreach ( $order_meta['order_payment']['received'] as $k => $payment_test) {
-				if ( !array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */ ) {
+		$order_meta = get_post_meta($oid, '_order_postmeta', true);
+		if (!empty($order_meta)) {
+			$key = count($order_meta['order_payment']['received']);
+			foreach ($order_meta['order_payment']['received'] as $k => $payment_test) {
+				if (!array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */) {
 					$key = $k;
 				}
 			}
@@ -534,52 +534,52 @@ 
 	 * @param array $params_array
 	 * @return string
 	 */
-	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true ) {
+	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true) {
 		global $wpshop_payment; global $wpdb;
-		$order_meta = ( !empty($order_meta) ) ? $order_meta : get_post_meta( $order_id, '_order_postmeta', true);
+		$order_meta = (!empty($order_meta)) ? $order_meta : get_post_meta($order_id, '_order_postmeta', true);
 
 		$wps_message = new wps_message_ctr();
-		if ( !empty($order_meta) ) {
+		if (!empty($order_meta)) {
 			$order_info = get_post_meta($order_id, '_order_info', true);
-			$user_data = get_userdata( $order_meta['customer_id'] );
-			$email = ( !empty($user_data) && !empty($user_data->user_email) ) ? $user_data->user_email : '';
+			$user_data = get_userdata($order_meta['customer_id']);
+			$email = (!empty($user_data) && !empty($user_data->user_email)) ? $user_data->user_email : '';
 // 			$email = ( !empty($order_info) &&  !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : '' ;
-			$first_name = (!empty($order_info) && !empty($order_info['billing']) &&  !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+			$first_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
-			$key = self::get_order_waiting_payment_array_id( $order_id, $params_array['method']);
+			$key = self::get_order_waiting_payment_array_id($order_id, $params_array['method']);
 			$order_grand_total = $order_meta['order_grand_total'];
-			$total_received = ( ( !empty($params_array['status']) && ( $params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount']) ) ? $params_array['received_amount'] : 0 );
-			foreach ( $order_meta['order_payment']['received'] as $received ) {
-				$total_received += ( ( !empty($received['status']) && ( $received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount']) ) ? $received['received_amount'] : 0 );
+			$total_received = ((!empty($params_array['status']) && ($params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount'])) ? $params_array['received_amount'] : 0);
+			foreach ($order_meta['order_payment']['received'] as $received) {
+				$total_received += ((!empty($received['status']) && ($received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount'])) ? $received['received_amount'] : 0);
 			}
 			$order_meta['order_amount_to_pay_now'] = $order_grand_total - $total_received;
-			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order( $order_id, $order_meta, $key, $params_array, $bank_response );
+			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order($order_id, $order_meta, $key, $params_array, $bank_response);
 
 			if ($bank_response == 'completed') {
 
-				if ( number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total,2, '.', '') ) {
+				if (number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total, 2, '.', '')) {
 					$payment_status = 'completed';
 
-					$order_meta['order_invoice_ref'] = ( empty ($order_meta['order_invoice_ref'] ) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : $order_meta['order_invoice_ref'] ;
+					$order_meta['order_invoice_ref'] = (empty ($order_meta['order_invoice_ref']) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref'])) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : $order_meta['order_invoice_ref'];
 					$order_meta['order_invoice_date'] = current_time('mysql', 0);
 
 					if (!empty($order_meta['order_items'])) {
 						foreach ($order_meta['order_items'] as $item_id => $o) {
 							$pid = $o['item_id'];
-							if (strpos($item_id,'__') !== false) {
-								$product_data_id = explode( '__', $item_id );
-								$pid = ( !empty($product_data_id) && !empty($product_data_id[1]) ) ? $product_data_id[1] : $pid;
+							if (strpos($item_id, '__') !== false) {
+								$product_data_id = explode('__', $item_id);
+								$pid = (!empty($product_data_id) && !empty($product_data_id[1])) ? $product_data_id[1] : $pid;
 							}
-							$product = wpshop_products::get_product_data( $pid );
-							if ( get_post_type( $pid ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation ( $pid );
+							$product = wpshop_products::get_product_data($pid);
+							if (get_post_type($pid) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($pid);
 								$parent_post = $parent_def['parent_post'];
-								$product = wpshop_products::get_product_data( $parent_post->ID );
+								$product = wpshop_products::get_product_data($parent_post->ID);
 							}
 
-							if (!empty($product) && !empty($product['manage_stock']) && strtolower( __($product['manage_stock'], 'wpshop') ) == strtolower( __('Yes', 'wpshop') ) ) {
-								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid );
+							if (!empty($product) && !empty($product['manage_stock']) && strtolower(__($product['manage_stock'], 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
+								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid);
 							}
 						}
 					}
@@ -588,45 +588,45 @@ 
 					update_post_meta($order_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '_completed_date', current_time('mysql', 0));
 
 					/** Check if the order content a downloadable product **/
-					if ( !empty($order_meta['order_items']) ) {
-						foreach( $order_meta['order_items'] as $key_value => $item ) {
+					if (!empty($order_meta['order_items'])) {
+						foreach ($order_meta['order_items'] as $key_value => $item) {
 							$key_value = $item['item_id'];
 							/** Check if it's a product with signle variation, check the parent product **/
-							if ( !empty($item['item_id']) && get_post_type( $item['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_item = wpshop_products::get_parent_variation( $item['item_id'] );
+							if (!empty($item['item_id']) && get_post_type($item['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_item = wpshop_products::get_parent_variation($item['item_id']);
 								$key_value = $parent_item['parent_post']->ID;
 								$parent_post_metadata = $parent_item['parent_post_meta'];
-								if ( !empty($parent_post_metadata['is_downloadable_']) ) {
-									$query = $wpdb->prepare( 'SELECT value FROM '. WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS .' WHERE id = %d', $parent_post_metadata['is_downloadable_'] );
-									$downloadable_option_value = $wpdb->get_var( $query );
-									if ( !empty( $downloadable_option_value) ) {
+								if (!empty($parent_post_metadata['is_downloadable_'])) {
+									$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_post_metadata['is_downloadable_']);
+									$downloadable_option_value = $wpdb->get_var($query);
+									if (!empty($downloadable_option_value)) {
 										$item['item_is_downloadable_'] = $downloadable_option_value;
 									}
 
 								}
 							}
 
-							if ( !empty($item) && !empty($item['item_is_downloadable_']) && ( __( $item['item_is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __( $item['item_is_downloadable_'], 'wpshop') == __('yes', 'wpshop') ) ) {
-								$download_codes = get_user_meta($order_meta['customer_id'], '_order_download_codes_'.$order_id, true);
+							if (!empty($item) && !empty($item['item_is_downloadable_']) && (__($item['item_is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __($item['item_is_downloadable_'], 'wpshop') == __('yes', 'wpshop'))) {
+								$download_codes = get_user_meta($order_meta['customer_id'], '_order_download_codes_' . $order_id, true);
 
-								if ( !empty($download_codes) && !empty($download_codes[$key_value]) && !empty($download_codes[$key_value]['download_code']) ) {
-									$link = '<a href="' . admin_url( 'admin-post.php?action=download_file&amp;oid=' . $order_id . '&amp;download=' . $download_codes[$key_value]['download_code'] ) . '">' . __('Download','wpshop') . '</a>';
-									$wps_message->wpshop_prepared_email($email, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'download_product_link' => $link), array() );
+								if (!empty($download_codes) && !empty($download_codes[$key_value]) && !empty($download_codes[$key_value]['download_code'])) {
+									$link = '<a href="' . admin_url('admin-post.php?action=download_file&amp;oid=' . $order_id . '&amp;download=' . $download_codes[$key_value]['download_code']) . '">' . __('Download', 'wpshop') . '</a>';
+									$wps_message->wpshop_prepared_email($email, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'download_product_link' => $link), array());
 								}
 							}
 						}
 					}
 
 					// Send confirmation e-mail to administrator
-					if ( empty($_SESSION['wps-pos-addon']) ) {
+					if (empty($_SESSION['wps-pos-addon'])) {
 						$email_option = get_option('wpshop_emails');
-						if(  !empty($email_option) && !empty($email_option['send_confirmation_order_message']) ){
-							wpshop_checkout::send_order_email_to_administrator( $order_id, $user_data );
+						if (!empty($email_option) && !empty($email_option['send_confirmation_order_message'])) {
+							wpshop_checkout::send_order_email_to_administrator($order_id, $user_data);
 						}
 					}
 
 					// POS Status
-					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
+					if (!empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos') {
 						$payment_status = 'pos';
 					}
 				}
@@ -635,23 +635,23 @@ 
 				}
 
 				$order_meta['order_status'] = $payment_status;
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 				$save_metadata = false;
 
-				$allow_send_invoice = get_option( 'wpshop_send_invoice' );
-				$invoice_attachment_file = ( !empty($allow_send_invoice) ) ? wpshop_modules_billing::generate_invoice_for_email( $order_id, $order_meta['order_payment']['received'][$key]['invoice_ref'] ) : '';
+				$allow_send_invoice = get_option('wpshop_send_invoice');
+				$invoice_attachment_file = (!empty($allow_send_invoice)) ? wpshop_modules_billing::generate_invoice_for_email($order_id, $order_meta['order_payment']['received'][$key]['invoice_ref']) : '';
 
-				$email_option = get_option( 'wpshop_emails' );
+				$email_option = get_option('wpshop_emails');
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				$payment_method_option = get_option( 'wps_payment_mode' );
-				$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode'])  && !empty($order_meta['order_payment']['customer_choice']['method'])  && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+				$payment_method_option = get_option('wps_payment_mode');
+				$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
 
-				if ( !empty($email_option) && !empty($email_option['send_confirmation_order_message']) && $payment_status == 'completed' ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method ) );
+				if (!empty($email_option) && !empty($email_option['send_confirmation_order_message']) && $payment_status == 'completed') {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method));
 				}
 
 				$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
@@ -661,13 +661,13 @@ 
 			}
 
 			$order_meta['order_status'] = $payment_status;
-			if( !$save_metadata ) {
+			if (!$save_metadata) {
 				return 	$order_meta;
 			}
 			else {
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
-			update_post_meta( $order_id, '_wpshop_order_status', $payment_status);
+			update_post_meta($order_id, '_wpshop_order_status', $payment_status);
 		}
 	}
 
@@ -679,11 +679,11 @@ 
 	 * @param integer $order_id The order identifier we want to get the old transaction reference for
 	 * @return integer
 	 */
-	public static function get_payment_transaction_number_old_way($order_id){
+	public static function get_payment_transaction_number_old_way($order_id) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 		$transaction_indentifier = 0;
-		if(!empty($order_postmeta['payment_method'])){
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
 					$transaction_indentifier = get_post_meta($order_id, '_order_check_number', true);
 					break;
@@ -702,26 +702,26 @@ 
 		return $transaction_indentifier;
 	}
 
-	public static function reverify_payment_invoice_ref( $order_id, $index_payment ) {
+	public static function reverify_payment_invoice_ref($order_id, $index_payment) {
 		$status = false;
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		if( !empty( $order_meta ) && !empty( $order_meta['order_payment'] ) && !empty( $order_meta['order_payment']['received'] ) && !empty( $order_meta['order_payment']['received'][$index_payment] ) && empty( $order_meta['order_payment']['received'][$index_payment]['invoice_ref'] ) ) {
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		if (!empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received']) && !empty($order_meta['order_payment']['received'][$index_payment]) && empty($order_meta['order_payment']['received'][$index_payment]['invoice_ref'])) {
 			$order_invoice = $invoice_ref = false;
 
-			end( $order_meta['order_payment']['received'] );
-			$last_payment = key( $order_meta['order_payment']['received'] );
-			if( $last_payment == $index_payment ) {
+			end($order_meta['order_payment']['received']);
+			$last_payment = key($order_meta['order_payment']['received']);
+			if ($last_payment == $index_payment) {
 				$payments = 0;
-				foreach( $order_meta['order_payment']['received'] as $payment ) {
-					$payments += ( $payment['status'] == 'payment_received' ) ? $payment['received_amount'] : 0;
+				foreach ($order_meta['order_payment']['received'] as $payment) {
+					$payments += ($payment['status'] == 'payment_received') ? $payment['received_amount'] : 0;
 				}
-				if( $order_meta['order_grand_total'] <= $payments ) {
-					if( $order_meta['order_status'] == 'partially_paid' ) {
-						$order_status_meta = get_post_meta( $order_id, '_wpshop_order_status', true );
+				if ($order_meta['order_grand_total'] <= $payments) {
+					if ($order_meta['order_status'] == 'partially_paid') {
+						$order_status_meta = get_post_meta($order_id, '_wpshop_order_status', true);
 						$order_meta['order_status'] = 'completed';
-						$status = (bool)update_post_meta( $order_id, '_wpshop_order_status', 'completed' );
+						$status = (bool)update_post_meta($order_id, '_wpshop_order_status', 'completed');
 					}
-					if( !empty( $order_meta['order_invoice_ref'] ) ) {
+					if (!empty($order_meta['order_invoice_ref'])) {
 						$invoice_ref = $order_meta['order_invoice_ref'];
 						$status = true;
 					} else {
@@ -732,16 +732,16 @@ 
 				$status = true;
 			}
 
-			if( $status ) {
-				if( empty( $invoice_ref ) ) {
-					$invoice_ref = wpshop_modules_billing::generate_invoice_number( $order_id );
-					if( $order_invoice ) {
+			if ($status) {
+				if (empty($invoice_ref)) {
+					$invoice_ref = wpshop_modules_billing::generate_invoice_number($order_id);
+					if ($order_invoice) {
 						$order_meta['order_invoice_ref'] = $invoice_ref;
 					}
 				}
 
 				$order_meta['order_payment']['received'][$index_payment]['invoice_ref'] = $invoice_ref;
-				$status = (bool)update_post_meta( $order_id, '_order_postmeta', $order_meta );
+				$status = (bool)update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
 		}
 		return $status;

includes/librairies/pdf/font/makefont/makefont.php

Doc Comments +4 added lines

@@ -229,6 +229,10 @@
 	return rtrim($s);
 }
 
+/**
+ * @param string $file
+ * @param string $s
+ */
 function SaveToFile($file, $s, $mode)
 {
 	$f=fopen($file,'w'.$mode);

includes/librairies/pdf/fpdf.php

Doc Comments +48 added lines

@@ -165,6 +165,10 @@ 
 	$this->PDFVersion='1.3';
 }
 
+/**
+ * @param double $left
+ * @param double $top
+ */
 function SetMargins($left, $top, $right=null)
 {
 	//Set left, top and right margins
@@ -195,6 +199,9 @@ 
 	$this->rMargin=$margin;
 }
 
+/**
+ * @param boolean $auto
+ */
 function SetAutoPageBreak($auto, $margin=0)
 {
 	//Set auto page break mode and triggering margin
@@ -203,6 +210,9 @@ 
 	$this->PageBreakTrigger=$this->h-$margin;
 }
 
+/**
+ * @param string $zoom
+ */
 function SetDisplayMode($zoom, $layout='continuous')
 {
 	//Set display mode in viewer
@@ -216,6 +226,9 @@ 
 		$this->Error('Incorrect layout display mode: '.$layout);
 }
 
+/**
+ * @param boolean $compress
+ */
 function SetCompression($compress)
 {
 	//Set page compression
@@ -271,6 +284,9 @@ 
 	$this->AliasNbPages=$alias;
 }
 
+/**
+ * @param string $msg
+ */
 function Error($msg)
 {
 	//Fatal error
@@ -444,6 +460,12 @@ 
 	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
 }
 
+/**
+ * @param integer $x
+ * @param integer $y
+ * @param integer $w
+ * @param integer $h
+ */
 function Rect($x, $y, $w, $h, $style='')
 {
 	//Draw a rectangle
@@ -504,6 +526,9 @@ 
 	}
 }
 
+/**
+ * @param string $family
+ */
 function SetFont($family, $style='', $size=0)
 {
 	//Select a font; size given in points
@@ -595,6 +620,10 @@ 
 	$this->links[$link]=array($page, $y);
 }
 
+/**
+ * @param double $y
+ * @param string $link
+ */
 function Link($x, $y, $w, $h, $link)
 {
 	//Put a link on the page
@@ -697,6 +726,11 @@ 
 		$this->x+=$w;
 }
 
+/**
+ * @param integer $w
+ * @param integer $h
+ * @param string $txt
+ */
 function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
 	//Output text with automatic or explicit line breaks
@@ -988,6 +1022,10 @@ 
 		$this->y=$this->h+$y;
 }
 
+/**
+ * @param integer $x
+ * @param integer $y
+ */
 function SetXY($x, $y)
 {
 	//Set x and y positions
@@ -1080,6 +1118,9 @@ 
 		@set_magic_quotes_runtime(0);
 }
 
+/**
+ * @param string $format
+ */
 function _getpageformat($format)
 {
 	$format=strtolower($format);
@@ -1096,6 +1137,10 @@ 
 	return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
 }
 
+/**
+ * @param string $orientation
+ * @param string $format
+ */
 function _beginpage($orientation, $format)
 {
 	$this->page++;
@@ -1226,6 +1271,9 @@ 
 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
 }
 
+/**
+ * @param string $file
+ */
 function _parsepng($file)
 {
 	//Extract info from a PNG file

Spacing +861 added lines, -861 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
 /*	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'));
 }
 
 /*******************************************************************************
@@ -13,360 +13,360 @@ 
 * Auteur :  Olivier PLATHEY                                                    *
 *******************************************************************************/
 
-define('FPDF_VERSION','1.6');
+define('FPDF_VERSION', '1.6');
 
 class wpshop_FPDF
 {
-var $page;               //current page number
-var $n;                  //current object number
-var $offsets;            //array of object offsets
-var $buffer;             //buffer holding in-memory PDF
-var $pages;              //array containing pages
-var $state;              //current document state
-var $compress;           //compression flag
-var $k;                  //scale factor (number of points in user unit)
-var $DefOrientation;     //default orientation
-var $CurOrientation;     //current orientation
-var $PageFormats;        //available page formats
-var $DefPageFormat;      //default page format
-var $CurPageFormat;      //current page format
-var $PageSizes;          //array storing non-default page sizes
-var $wPt,$hPt;           //dimensions of current page in points
-var $w,$h;               //dimensions of current page in user unit
-var $lMargin;            //left margin
-var $tMargin;            //top margin
-var $rMargin;            //right margin
-var $bMargin;            //page break margin
-var $cMargin;            //cell margin
-var $x,$y;               //current position in user unit
-var $lasth;              //height of last printed cell
-var $LineWidth;          //line width in user unit
-var $CoreFonts;          //array of standard font names
-var $fonts;              //array of used fonts
-var $FontFiles;          //array of font files
-var $diffs;              //array of encoding differences
-var $FontFamily;         //current font family
-var $FontStyle;          //current font style
-var $underline;          //underlining flag
-var $CurrentFont;        //current font info
-var $FontSizePt;         //current font size in points
-var $FontSize;           //current font size in user unit
-var $DrawColor;          //commands for drawing color
-var $FillColor;          //commands for filling color
-var $TextColor;          //commands for text color
-var $ColorFlag;          //indicates whether fill and text colors are different
-var $ws;                 //word spacing
-var $images;             //array of used images
-var $PageLinks;          //array of links in pages
-var $links;              //array of internal links
-var $AutoPageBreak;      //automatic page breaking
-var $PageBreakTrigger;   //threshold used to trigger page breaks
-var $InHeader;           //flag set when processing header
-var $InFooter;           //flag set when processing footer
-var $ZoomMode;           //zoom display mode
-var $LayoutMode;         //layout display mode
-var $title;              //title
-var $subject;            //subject
-var $author;             //author
-var $keywords;           //keywords
-var $creator;            //creator
-var $AliasNbPages;       //alias for total number of pages
-var $PDFVersion;         //PDF version number
+var $page; //current page number
+var $n; //current object number
+var $offsets; //array of object offsets
+var $buffer; //buffer holding in-memory PDF
+var $pages; //array containing pages
+var $state; //current document state
+var $compress; //compression flag
+var $k; //scale factor (number of points in user unit)
+var $DefOrientation; //default orientation
+var $CurOrientation; //current orientation
+var $PageFormats; //available page formats
+var $DefPageFormat; //default page format
+var $CurPageFormat; //current page format
+var $PageSizes; //array storing non-default page sizes
+var $wPt, $hPt; //dimensions of current page in points
+var $w, $h; //dimensions of current page in user unit
+var $lMargin; //left margin
+var $tMargin; //top margin
+var $rMargin; //right margin
+var $bMargin; //page break margin
+var $cMargin; //cell margin
+var $x, $y; //current position in user unit
+var $lasth; //height of last printed cell
+var $LineWidth; //line width in user unit
+var $CoreFonts; //array of standard font names
+var $fonts; //array of used fonts
+var $FontFiles; //array of font files
+var $diffs; //array of encoding differences
+var $FontFamily; //current font family
+var $FontStyle; //current font style
+var $underline; //underlining flag
+var $CurrentFont; //current font info
+var $FontSizePt; //current font size in points
+var $FontSize; //current font size in user unit
+var $DrawColor; //commands for drawing color
+var $FillColor; //commands for filling color
+var $TextColor; //commands for text color
+var $ColorFlag; //indicates whether fill and text colors are different
+var $ws; //word spacing
+var $images; //array of used images
+var $PageLinks; //array of links in pages
+var $links; //array of internal links
+var $AutoPageBreak; //automatic page breaking
+var $PageBreakTrigger; //threshold used to trigger page breaks
+var $InHeader; //flag set when processing header
+var $InFooter; //flag set when processing footer
+var $ZoomMode; //zoom display mode
+var $LayoutMode; //layout display mode
+var $title; //title
+var $subject; //subject
+var $author; //author
+var $keywords; //keywords
+var $creator; //creator
+var $AliasNbPages; //alias for total number of pages
+var $PDFVersion; //PDF version number
 
 /*******************************************************************************
 *                                                                              *
 *                               Public methods                                 *
 *                                                                              *
 *******************************************************************************/
-function wpshop_FPDF($orientation='P', $unit='mm', $format='A4')
+function wpshop_FPDF($orientation = 'P', $unit = 'mm', $format = 'A4')
 {
 	//Some checks
 	$this->_dochecks();
 	//Initialization of properties
-	$this->page=0;
-	$this->n=2;
-	$this->buffer='';
-	$this->pages=array();
-	$this->PageSizes=array();
-	$this->state=0;
-	$this->fonts=array();
-	$this->FontFiles=array();
-	$this->diffs=array();
-	$this->images=array();
-	$this->links=array();
-	$this->InHeader=false;
-	$this->InFooter=false;
-	$this->lasth=0;
-	$this->FontFamily='';
-	$this->FontStyle='';
-	$this->FontSizePt=12;
-	$this->underline=false;
-	$this->DrawColor='0 G';
-	$this->FillColor='0 g';
-	$this->TextColor='0 g';
-	$this->ColorFlag=false;
-	$this->ws=0;
+	$this->page = 0;
+	$this->n = 2;
+	$this->buffer = '';
+	$this->pages = array();
+	$this->PageSizes = array();
+	$this->state = 0;
+	$this->fonts = array();
+	$this->FontFiles = array();
+	$this->diffs = array();
+	$this->images = array();
+	$this->links = array();
+	$this->InHeader = false;
+	$this->InFooter = false;
+	$this->lasth = 0;
+	$this->FontFamily = '';
+	$this->FontStyle = '';
+	$this->FontSizePt = 12;
+	$this->underline = false;
+	$this->DrawColor = '0 G';
+	$this->FillColor = '0 g';
+	$this->TextColor = '0 g';
+	$this->ColorFlag = false;
+	$this->ws = 0;
 	//Standard fonts
-	$this->CoreFonts=array('courier'=>'Courier', 'courierB'=>'Courier-Bold', 'courierI'=>'Courier-Oblique', 'courierBI'=>'Courier-BoldOblique',
+	$this->CoreFonts = array('courier'=>'Courier', 'courierB'=>'Courier-Bold', 'courierI'=>'Courier-Oblique', 'courierBI'=>'Courier-BoldOblique',
 		'helvetica'=>'Helvetica', 'helveticaB'=>'Helvetica-Bold', 'helveticaI'=>'Helvetica-Oblique', 'helveticaBI'=>'Helvetica-BoldOblique',
 		'times'=>'Times-Roman', 'timesB'=>'Times-Bold', 'timesI'=>'Times-Italic', 'timesBI'=>'Times-BoldItalic',
 		'symbol'=>'Symbol', 'zapfdingbats'=>'ZapfDingbats');
 	//Scale factor
-	if($unit=='pt')
-		$this->k=1;
-	elseif($unit=='mm')
-		$this->k=72/25.4;
-	elseif($unit=='cm')
-		$this->k=72/2.54;
-	elseif($unit=='in')
-		$this->k=72;
+	if ($unit == 'pt')
+		$this->k = 1;
+	elseif ($unit == 'mm')
+		$this->k = 72 / 25.4;
+	elseif ($unit == 'cm')
+		$this->k = 72 / 2.54;
+	elseif ($unit == 'in')
+		$this->k = 72;
 	else
-		$this->Error('Incorrect unit: '.$unit);
+		$this->Error('Incorrect unit: ' . $unit);
 	//Page format
-	$this->PageFormats=array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
-		'letter'=>array(612,792), 'legal'=>array(612,1008));
-	if(is_string($format))
-		$format=$this->_getpageformat($format);
-	$this->DefPageFormat=$format;
-	$this->CurPageFormat=$format;
+	$this->PageFormats = array('a3'=>array(841.89, 1190.55), 'a4'=>array(595.28, 841.89), 'a5'=>array(420.94, 595.28),
+		'letter'=>array(612, 792), 'legal'=>array(612, 1008));
+	if (is_string($format))
+		$format = $this->_getpageformat($format);
+	$this->DefPageFormat = $format;
+	$this->CurPageFormat = $format;
 	//Page orientation
-	$orientation=strtolower($orientation);
-	if($orientation=='p' || $orientation=='portrait')
+	$orientation = strtolower($orientation);
+	if ($orientation == 'p' || $orientation == 'portrait')
 	{
-		$this->DefOrientation='P';
-		$this->w=$this->DefPageFormat[0];
-		$this->h=$this->DefPageFormat[1];
+		$this->DefOrientation = 'P';
+		$this->w = $this->DefPageFormat[0];
+		$this->h = $this->DefPageFormat[1];
 	}
-	elseif($orientation=='l' || $orientation=='landscape')
+	elseif ($orientation == 'l' || $orientation == 'landscape')
 	{
-		$this->DefOrientation='L';
-		$this->w=$this->DefPageFormat[1];
-		$this->h=$this->DefPageFormat[0];
+		$this->DefOrientation = 'L';
+		$this->w = $this->DefPageFormat[1];
+		$this->h = $this->DefPageFormat[0];
 	}
 	else
-		$this->Error('Incorrect orientation: '.$orientation);
-	$this->CurOrientation=$this->DefOrientation;
-	$this->wPt=$this->w*$this->k;
-	$this->hPt=$this->h*$this->k;
+		$this->Error('Incorrect orientation: ' . $orientation);
+	$this->CurOrientation = $this->DefOrientation;
+	$this->wPt = $this->w * $this->k;
+	$this->hPt = $this->h * $this->k;
 	//Page margins (1 cm)
-	$margin=28.35/$this->k;
-	$this->SetMargins($margin,$margin);
+	$margin = 28.35 / $this->k;
+	$this->SetMargins($margin, $margin);
 	//Interior cell margin (1 mm)
-	$this->cMargin=$margin/10;
+	$this->cMargin = $margin / 10;
 	//Line width (0.2 mm)
-	$this->LineWidth=.567/$this->k;
+	$this->LineWidth = .567 / $this->k;
 	//Automatic page break
-	$this->SetAutoPageBreak(true,2*$margin);
+	$this->SetAutoPageBreak(true, 2 * $margin);
 	//Full width display mode
 	$this->SetDisplayMode('fullwidth');
 	//Enable compression
 	$this->SetCompression(true);
 	//Set default PDF version number
-	$this->PDFVersion='1.3';
+	$this->PDFVersion = '1.3';
 }
 
-function SetMargins($left, $top, $right=null)
+function SetMargins($left, $top, $right = null)
 {
 	//Set left, top and right margins
-	$this->lMargin=$left;
-	$this->tMargin=$top;
-	if($right===null)
-		$right=$left;
-	$this->rMargin=$right;
+	$this->lMargin = $left;
+	$this->tMargin = $top;
+	if ($right === null)
+		$right = $left;
+	$this->rMargin = $right;
 }
 
 function SetLeftMargin($margin)
 {
 	//Set left margin
-	$this->lMargin=$margin;
-	if($this->page>0 && $this->x<$margin)
-		$this->x=$margin;
+	$this->lMargin = $margin;
+	if ($this->page > 0 && $this->x < $margin)
+		$this->x = $margin;
 }
 
 function SetTopMargin($margin)
 {
 	//Set top margin
-	$this->tMargin=$margin;
+	$this->tMargin = $margin;
 }
 
 function SetRightMargin($margin)
 {
 	//Set right margin
-	$this->rMargin=$margin;
+	$this->rMargin = $margin;
 }
 
-function SetAutoPageBreak($auto, $margin=0)
+function SetAutoPageBreak($auto, $margin = 0)
 {
 	//Set auto page break mode and triggering margin
-	$this->AutoPageBreak=$auto;
-	$this->bMargin=$margin;
-	$this->PageBreakTrigger=$this->h-$margin;
+	$this->AutoPageBreak = $auto;
+	$this->bMargin = $margin;
+	$this->PageBreakTrigger = $this->h - $margin;
 }
 
-function SetDisplayMode($zoom, $layout='continuous')
+function SetDisplayMode($zoom, $layout = 'continuous')
 {
 	//Set display mode in viewer
-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
-		$this->ZoomMode=$zoom;
+	if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom))
+		$this->ZoomMode = $zoom;
 	else
-		$this->Error('Incorrect zoom display mode: '.$zoom);
-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
-		$this->LayoutMode=$layout;
+		$this->Error('Incorrect zoom display mode: ' . $zoom);
+	if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default')
+		$this->LayoutMode = $layout;
 	else
-		$this->Error('Incorrect layout display mode: '.$layout);
+		$this->Error('Incorrect layout display mode: ' . $layout);
 }
 
 function SetCompression($compress)
 {
 	//Set page compression
-	if(function_exists('gzcompress'))
-		$this->compress=$compress;
+	if (function_exists('gzcompress'))
+		$this->compress = $compress;
 	else
-		$this->compress=false;
+		$this->compress = false;
 }
 
-function SetTitle($title, $isUTF8=false)
+function SetTitle($title, $isUTF8 = false)
 {
 	//Title of document
-	if($isUTF8)
-		$title=$this->_UTF8toUTF16($title);
-	$this->title=$title;
+	if ($isUTF8)
+		$title = $this->_UTF8toUTF16($title);
+	$this->title = $title;
 }
 
-function SetSubject($subject, $isUTF8=false)
+function SetSubject($subject, $isUTF8 = false)
 {
 	//Subject of document
-	if($isUTF8)
-		$subject=$this->_UTF8toUTF16($subject);
-	$this->subject=$subject;
+	if ($isUTF8)
+		$subject = $this->_UTF8toUTF16($subject);
+	$this->subject = $subject;
 }
 
-function SetAuthor($author, $isUTF8=false)
+function SetAuthor($author, $isUTF8 = false)
 {
 	//Author of document
-	if($isUTF8)
-		$author=$this->_UTF8toUTF16($author);
-	$this->author=$author;
+	if ($isUTF8)
+		$author = $this->_UTF8toUTF16($author);
+	$this->author = $author;
 }
 
-function SetKeywords($keywords, $isUTF8=false)
+function SetKeywords($keywords, $isUTF8 = false)
 {
 	//Keywords of document
-	if($isUTF8)
-		$keywords=$this->_UTF8toUTF16($keywords);
-	$this->keywords=$keywords;
+	if ($isUTF8)
+		$keywords = $this->_UTF8toUTF16($keywords);
+	$this->keywords = $keywords;
 }
 
-function SetCreator($creator, $isUTF8=false)
+function SetCreator($creator, $isUTF8 = false)
 {
 	//Creator of document
-	if($isUTF8)
-		$creator=$this->_UTF8toUTF16($creator);
-	$this->creator=$creator;
+	if ($isUTF8)
+		$creator = $this->_UTF8toUTF16($creator);
+	$this->creator = $creator;
 }
 
-function AliasNbPages($alias='{nb}')
+function AliasNbPages($alias = '{nb}')
 {
 	//Define an alias for total number of pages
-	$this->AliasNbPages=$alias;
+	$this->AliasNbPages = $alias;
 }
 
 function Error($msg)
 {
 	//Fatal error
-	die('<b>FPDF error:</b> '.$msg);
+	die('<b>FPDF error:</b> ' . $msg);
 }
 
 function Open()
 {
 	//Begin document
-	$this->state=1;
+	$this->state = 1;
 }
 
 function Close()
 {
 	//Terminate document
-	if($this->state==3)
+	if ($this->state == 3)
 		return;
-	if($this->page==0)
+	if ($this->page == 0)
 		$this->AddPage();
 	//Page footer
-	$this->InFooter=true;
+	$this->InFooter = true;
 	$this->Footer();
-	$this->InFooter=false;
+	$this->InFooter = false;
 	//Close page
 	$this->_endpage();
 	//Close document
 	$this->_enddoc();
 }
 
-function AddPage($orientation='', $format='')
+function AddPage($orientation = '', $format = '')
 {
 	//Start a new page
-	if($this->state==0)
+	if ($this->state == 0)
 		$this->Open();
-	$family=$this->FontFamily;
-	$style=$this->FontStyle.($this->underline ? 'U' : '');
-	$size=$this->FontSizePt;
-	$lw=$this->LineWidth;
-	$dc=$this->DrawColor;
-	$fc=$this->FillColor;
-	$tc=$this->TextColor;
-	$cf=$this->ColorFlag;
-	if($this->page>0)
+	$family = $this->FontFamily;
+	$style = $this->FontStyle . ($this->underline ? 'U' : '');
+	$size = $this->FontSizePt;
+	$lw = $this->LineWidth;
+	$dc = $this->DrawColor;
+	$fc = $this->FillColor;
+	$tc = $this->TextColor;
+	$cf = $this->ColorFlag;
+	if ($this->page > 0)
 	{
 		//Page footer
-		$this->InFooter=true;
+		$this->InFooter = true;
 		$this->Footer();
-		$this->InFooter=false;
+		$this->InFooter = false;
 		//Close page
 		$this->_endpage();
 	}
 	//Start new page
-	$this->_beginpage($orientation,$format);
+	$this->_beginpage($orientation, $format);
 	//Set line cap style to square
 	$this->_out('2 J');
 	//Set line width
-	$this->LineWidth=$lw;
-	$this->_out(sprintf('%.2F w',$lw*$this->k));
+	$this->LineWidth = $lw;
+	$this->_out(sprintf('%.2F w', $lw * $this->k));
 	//Set font
-	if($family)
-		$this->SetFont($family,$style,$size);
+	if ($family)
+		$this->SetFont($family, $style, $size);
 	//Set colors
-	$this->DrawColor=$dc;
-	if($dc!='0 G')
+	$this->DrawColor = $dc;
+	if ($dc != '0 G')
 		$this->_out($dc);
-	$this->FillColor=$fc;
-	if($fc!='0 g')
+	$this->FillColor = $fc;
+	if ($fc != '0 g')
 		$this->_out($fc);
-	$this->TextColor=$tc;
-	$this->ColorFlag=$cf;
+	$this->TextColor = $tc;
+	$this->ColorFlag = $cf;
 	//Page header
-	$this->InHeader=true;
+	$this->InHeader = true;
 	$this->Header();
-	$this->InHeader=false;
+	$this->InHeader = false;
 	//Restore line width
-	if($this->LineWidth!=$lw)
+	if ($this->LineWidth != $lw)
 	{
-		$this->LineWidth=$lw;
-		$this->_out(sprintf('%.2F w',$lw*$this->k));
+		$this->LineWidth = $lw;
+		$this->_out(sprintf('%.2F w', $lw * $this->k));
 	}
 	//Restore font
-	if($family)
-		$this->SetFont($family,$style,$size);
+	if ($family)
+		$this->SetFont($family, $style, $size);
 	//Restore colors
-	if($this->DrawColor!=$dc)
+	if ($this->DrawColor != $dc)
 	{
-		$this->DrawColor=$dc;
+		$this->DrawColor = $dc;
 		$this->_out($dc);
 	}
-	if($this->FillColor!=$fc)
+	if ($this->FillColor != $fc)
 	{
-		$this->FillColor=$fc;
+		$this->FillColor = $fc;
 		$this->_out($fc);
 	}
-	$this->TextColor=$tc;
-	$this->ColorFlag=$cf;
+	$this->TextColor = $tc;
+	$this->ColorFlag = $cf;
 }
 
 function Header()
@@ -385,230 +385,230 @@ 
 	return $this->page;
 }
 
-function SetDrawColor($r, $g=null, $b=null)
+function SetDrawColor($r, $g = null, $b = null)
 {
 	//Set color for all stroking operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->DrawColor=sprintf('%.3F G',$r/255);
+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)
+		$this->DrawColor = sprintf('%.3F G', $r / 255);
 	else
-		$this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
-	if($this->page>0)
+		$this->DrawColor = sprintf('%.3F %.3F %.3F RG', $r / 255, $g / 255, $b / 255);
+	if ($this->page > 0)
 		$this->_out($this->DrawColor);
 }
 
-function SetFillColor($r, $g=null, $b=null)
+function SetFillColor($r, $g = null, $b = null)
 {
 	//Set color for all filling operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->FillColor=sprintf('%.3F g',$r/255);
+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)
+		$this->FillColor = sprintf('%.3F g', $r / 255);
 	else
-		$this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag=($this->FillColor!=$this->TextColor);
-	if($this->page>0)
+		$this->FillColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
+	$this->ColorFlag = ($this->FillColor != $this->TextColor);
+	if ($this->page > 0)
 		$this->_out($this->FillColor);
 }
 
-function SetTextColor($r, $g=null, $b=null)
+function SetTextColor($r, $g = null, $b = null)
 {
 	//Set color for text
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->TextColor=sprintf('%.3F g',$r/255);
+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)
+		$this->TextColor = sprintf('%.3F g', $r / 255);
 	else
-		$this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag=($this->FillColor!=$this->TextColor);
+		$this->TextColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
+	$this->ColorFlag = ($this->FillColor != $this->TextColor);
 }
 
 function GetStringWidth($s)
 {
 	//Get width of a string in the current font
-	$s=(string)$s;
-	$cw=&$this->CurrentFont['cw'];
-	$w=0;
-	$l=strlen($s);
-	for($i=0;$i<$l;$i++)
-		$w+=$cw[$s[$i]];
-	return $w*$this->FontSize/1000;
+	$s = (string)$s;
+	$cw = &$this->CurrentFont['cw'];
+	$w = 0;
+	$l = strlen($s);
+	for ($i = 0; $i < $l; $i++)
+		$w += $cw[$s[$i]];
+	return $w * $this->FontSize / 1000;
 }
 
 function SetLineWidth($width)
 {
 	//Set line width
-	$this->LineWidth=$width;
-	if($this->page>0)
-		$this->_out(sprintf('%.2F w',$width*$this->k));
+	$this->LineWidth = $width;
+	if ($this->page > 0)
+		$this->_out(sprintf('%.2F w', $width * $this->k));
 }
 
 function Line($x1, $y1, $x2, $y2)
 {
 	//Draw a line
-	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
+	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k));
 }
 
-function Rect($x, $y, $w, $h, $style='')
+function Rect($x, $y, $w, $h, $style = '')
 {
 	//Draw a rectangle
-	if($style=='F')
-		$op='f';
-	elseif($style=='FD' || $style=='DF')
-		$op='B';
+	if ($style == 'F')
+		$op = 'f';
+	elseif ($style == 'FD' || $style == 'DF')
+		$op = 'B';
 	else
-		$op='S';
-	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+		$op = 'S';
+	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
 }
 
-function AddFont($family, $style='', $file='')
+function AddFont($family, $style = '', $file = '')
 {
 	//Add a TrueType or Type1 font
-	$family=strtolower($family);
-	if($file=='')
-		$file=str_replace(' ','',$family).strtolower($style).'.php';
-	if($family=='arial')
-		$family='helvetica';
-	$style=strtoupper($style);
-	if($style=='IB')
-		$style='BI';
-	$fontkey=$family.$style;
-	if(isset($this->fonts[$fontkey]))
+	$family = strtolower($family);
+	if ($file == '')
+		$file = str_replace(' ', '', $family) . strtolower($style) . '.php';
+	if ($family == 'arial')
+		$family = 'helvetica';
+	$style = strtoupper($style);
+	if ($style == 'IB')
+		$style = 'BI';
+	$fontkey = $family . $style;
+	if (isset($this->fonts[$fontkey]))
 		return;
-	include($this->_getfontpath().$file);
-	if(!isset($name))
+	include($this->_getfontpath() . $file);
+	if (!isset($name))
 		$this->Error('Could not include font definition file');
-	$i=count($this->fonts)+1;
-	$this->fonts[$fontkey]=array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file);
-	if($diff)
+	$i = count($this->fonts) + 1;
+	$this->fonts[$fontkey] = array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file);
+	if ($diff)
 	{
 		//Search existing encodings
-		$d=0;
-		$nb=count($this->diffs);
-		for($i=1;$i<=$nb;$i++)
+		$d = 0;
+		$nb = count($this->diffs);
+		for ($i = 1; $i <= $nb; $i++)
 		{
-			if($this->diffs[$i]==$diff)
+			if ($this->diffs[$i] == $diff)
 			{
-				$d=$i;
+				$d = $i;
 				break;
 			}
 		}
-		if($d==0)
+		if ($d == 0)
 		{
-			$d=$nb+1;
-			$this->diffs[$d]=$diff;
+			$d = $nb + 1;
+			$this->diffs[$d] = $diff;
 		}
-		$this->fonts[$fontkey]['diff']=$d;
+		$this->fonts[$fontkey]['diff'] = $d;
 	}
-	if($file)
+	if ($file)
 	{
-		if($type=='TrueType')
-			$this->FontFiles[$file]=array('length1'=>$originalsize);
+		if ($type == 'TrueType')
+			$this->FontFiles[$file] = array('length1'=>$originalsize);
 		else
-			$this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);
+			$this->FontFiles[$file] = array('length1'=>$size1, 'length2'=>$size2);
 	}
 }
 
-function SetFont($family, $style='', $size=0)
+function SetFont($family, $style = '', $size = 0)
 {
 	//Select a font; size given in points
 	global $fpdf_charwidths;
 
-	$family=strtolower($family);
-	if($family=='')
-		$family=$this->FontFamily;
-	if($family=='arial')
-		$family='helvetica';
-	elseif($family=='symbol' || $family=='zapfdingbats')
-		$style='';
-	$style=strtoupper($style);
-	if(strpos($style,'U')!==false)
+	$family = strtolower($family);
+	if ($family == '')
+		$family = $this->FontFamily;
+	if ($family == 'arial')
+		$family = 'helvetica';
+	elseif ($family == 'symbol' || $family == 'zapfdingbats')
+		$style = '';
+	$style = strtoupper($style);
+	if (strpos($style, 'U') !== false)
 	{
-		$this->underline=true;
-		$style=str_replace('U','',$style);
+		$this->underline = true;
+		$style = str_replace('U', '', $style);
 	}
 	else
-		$this->underline=false;
-	if($style=='IB')
-		$style='BI';
-	if($size==0)
-		$size=$this->FontSizePt;
+		$this->underline = false;
+	if ($style == 'IB')
+		$style = 'BI';
+	if ($size == 0)
+		$size = $this->FontSizePt;
 	//Test if font is already selected
-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
+	if ($this->FontFamily == $family && $this->FontStyle == $style && $this->FontSizePt == $size)
 		return;
 	//Test if used for the first time
-	$fontkey=$family.$style;
-	if(!isset($this->fonts[$fontkey]))
+	$fontkey = $family . $style;
+	if (!isset($this->fonts[$fontkey]))
 	{
 		//Check if one of the standard fonts
-		if(isset($this->CoreFonts[$fontkey]))
+		if (isset($this->CoreFonts[$fontkey]))
 		{
-			if(!isset($fpdf_charwidths[$fontkey]))
+			if (!isset($fpdf_charwidths[$fontkey]))
 			{
 				//Load metric file
-				$file=$family;
-				if($family=='times' || $family=='helvetica')
-					$file.=strtolower($style);
-				include($this->_getfontpath().$file.'.php');
-				if(!isset($fpdf_charwidths[$fontkey]))
+				$file = $family;
+				if ($family == 'times' || $family == 'helvetica')
+					$file .= strtolower($style);
+				include($this->_getfontpath() . $file . '.php');
+				if (!isset($fpdf_charwidths[$fontkey]))
 					$this->Error('Could not include font metric file');
 			}
-			$i=count($this->fonts)+1;
-			$name=$this->CoreFonts[$fontkey];
-			$cw=$fpdf_charwidths[$fontkey];
-			$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);
+			$i = count($this->fonts) + 1;
+			$name = $this->CoreFonts[$fontkey];
+			$cw = $fpdf_charwidths[$fontkey];
+			$this->fonts[$fontkey] = array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);
 		}
 		else
-			$this->Error('Undefined font: '.$family.' '.$style);
+			$this->Error('Undefined font: ' . $family . ' ' . $style);
 	}
 	//Select it
-	$this->FontFamily=$family;
-	$this->FontStyle=$style;
-	$this->FontSizePt=$size;
-	$this->FontSize=$size/$this->k;
-	$this->CurrentFont=&$this->fonts[$fontkey];
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+	$this->FontFamily = $family;
+	$this->FontStyle = $style;
+	$this->FontSizePt = $size;
+	$this->FontSize = $size / $this->k;
+	$this->CurrentFont = &$this->fonts[$fontkey];
+	if ($this->page > 0)
+		$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
 }
 
 function SetFontSize($size)
 {
 	//Set font size in points
-	if($this->FontSizePt==$size)
+	if ($this->FontSizePt == $size)
 		return;
-	$this->FontSizePt=$size;
-	$this->FontSize=$size/$this->k;
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+	$this->FontSizePt = $size;
+	$this->FontSize = $size / $this->k;
+	if ($this->page > 0)
+		$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
 }
 
 function AddLink()
 {
 	//Create a new internal link
-	$n=count($this->links)+1;
-	$this->links[$n]=array(0, 0);
+	$n = count($this->links) + 1;
+	$this->links[$n] = array(0, 0);
 	return $n;
 }
 
-function SetLink($link, $y=0, $page=-1)
+function SetLink($link, $y = 0, $page = -1)
 {
 	//Set destination of internal link
-	if($y==-1)
-		$y=$this->y;
-	if($page==-1)
-		$page=$this->page;
-	$this->links[$link]=array($page, $y);
+	if ($y == -1)
+		$y = $this->y;
+	if ($page == -1)
+		$page = $this->page;
+	$this->links[$link] = array($page, $y);
 }
 
 function Link($x, $y, $w, $h, $link)
 {
 	//Put a link on the page
-	$this->PageLinks[$this->page][]=array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
+	$this->PageLinks[$this->page][] = array($x * $this->k, $this->hPt - $y * $this->k, $w * $this->k, $h * $this->k, $link);
 }
 
 function Text($x, $y, $txt)
 {
 	//Output a string
-	$s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if($this->underline && $txt!='')
-		$s.=' '.$this->_dounderline($x,$y,$txt);
-	if($this->ColorFlag)
-		$s='q '.$this->TextColor.' '.$s.' Q';
+	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET', $x * $this->k, ($this->h - $y) * $this->k, $this->_escape($txt));
+	if ($this->underline && $txt != '')
+		$s .= ' ' . $this->_dounderline($x, $y, $txt);
+	if ($this->ColorFlag)
+		$s = 'q ' . $this->TextColor . ' ' . $s . ' Q';
 	$this->_out($s);
 }
 
@@ -618,268 +618,268 @@ 
 	return $this->AutoPageBreak;
 }
 
-function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
+function Cell($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = false, $link = '')
 {
 	//Output a cell
-	$k=$this->k;
-	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+	$k = $this->k;
+	if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
 	{
 		//Automatic page break
-		$x=$this->x;
-		$ws=$this->ws;
-		if($ws>0)
+		$x = $this->x;
+		$ws = $this->ws;
+		if ($ws > 0)
 		{
-			$this->ws=0;
+			$this->ws = 0;
 			$this->_out('0 Tw');
 		}
-		$this->AddPage($this->CurOrientation,$this->CurPageFormat);
-		$this->x=$x;
-		if($ws>0)
+		$this->AddPage($this->CurOrientation, $this->CurPageFormat);
+		$this->x = $x;
+		if ($ws > 0)
 		{
-			$this->ws=$ws;
-			$this->_out(sprintf('%.3F Tw',$ws*$k));
+			$this->ws = $ws;
+			$this->_out(sprintf('%.3F Tw', $ws * $k));
 		}
 	}
-	if($w==0)
-		$w=$this->w-$this->rMargin-$this->x;
-	$s='';
-	if($fill || $border==1)
+	if ($w == 0)
+		$w = $this->w - $this->rMargin - $this->x;
+	$s = '';
+	if ($fill || $border == 1)
 	{
-		if($fill)
-			$op=($border==1) ? 'B' : 'f';
+		if ($fill)
+			$op = ($border == 1) ? 'B' : 'f';
 		else
-			$op='S';
-		$s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
+			$op = 'S';
+		$s = sprintf('%.2F %.2F %.2F %.2F re %s ', $this->x * $k, ($this->h - $this->y) * $k, $w * $k, -$h * $k, $op);
 	}
-	if(is_string($border))
+	if (is_string($border))
 	{
-		$x=$this->x;
-		$y=$this->y;
-		if(strpos($border,'L')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'T')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-		if(strpos($border,'R')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'B')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		$x = $this->x;
+		$y = $this->y;
+		if (strpos($border, 'L') !== false)
+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, $x * $k, ($this->h - ($y + $h)) * $k);
+		if (strpos($border, 'T') !== false)
+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - $y) * $k);
+		if (strpos($border, 'R') !== false)
+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', ($x + $w) * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
+		if (strpos($border, 'B') !== false)
+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - ($y + $h)) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
 	}
-	if($txt!=='')
+	if ($txt !== '')
 	{
-		if($align=='R')
-			$dx=$w-$this->cMargin-$this->GetStringWidth($txt);
-		elseif($align=='C')
-			$dx=($w-$this->GetStringWidth($txt))/2;
+		if ($align == 'R')
+			$dx = $w - $this->cMargin - $this->GetStringWidth($txt);
+		elseif ($align == 'C')
+			$dx = ($w - $this->GetStringWidth($txt)) / 2;
 		else
-			$dx=$this->cMargin;
-		if($this->ColorFlag)
-			$s.='q '.$this->TextColor.' ';
-		$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
-		$s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
-		if($this->underline)
-			$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-		if($this->ColorFlag)
-			$s.=' Q';
-		if($link)
-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+			$dx = $this->cMargin;
+		if ($this->ColorFlag)
+			$s .= 'q ' . $this->TextColor . ' ';
+		$txt2 = str_replace(')', '\\)', str_replace('(', '\\(', str_replace('\\', '\\\\', $txt)));
+		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET', ($this->x + $dx) * $k, ($this->h - ($this->y + .5 * $h + .3 * $this->FontSize)) * $k, $txt2);
+		if ($this->underline)
+			$s .= ' ' . $this->_dounderline($this->x + $dx, $this->y + .5 * $h + .3 * $this->FontSize, $txt);
+		if ($this->ColorFlag)
+			$s .= ' Q';
+		if ($link)
+			$this->Link($this->x + $dx, $this->y + .5 * $h - .5 * $this->FontSize, $this->GetStringWidth($txt), $this->FontSize, $link);
 	}
-	if($s)
+	if ($s)
 		$this->_out($s);
-	$this->lasth=$h;
-	if($ln>0)
+	$this->lasth = $h;
+	if ($ln > 0)
 	{
 		//Go to next line
-		$this->y+=$h;
-		if($ln==1)
-			$this->x=$this->lMargin;
+		$this->y += $h;
+		if ($ln == 1)
+			$this->x = $this->lMargin;
 	}
 	else
-		$this->x+=$w;
+		$this->x += $w;
 }
 
-function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
+function MultiCell($w, $h, $txt, $border = 0, $align = 'J', $fill = false)
 {
 	//Output text with automatic or explicit line breaks
-	$cw=&$this->CurrentFont['cw'];
-	if($w==0)
-		$w=$this->w-$this->rMargin-$this->x;
-	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s=str_replace("\r",'',$txt);
-	$nb=strlen($s);
-	if($nb>0 && $s[$nb-1]=="\n")
+	$cw = &$this->CurrentFont['cw'];
+	if ($w == 0)
+		$w = $this->w - $this->rMargin - $this->x;
+	$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+	$s = str_replace("\r", '', $txt);
+	$nb = strlen($s);
+	if ($nb > 0 && $s[$nb - 1] == "\n")
 		$nb--;
-	$b=0;
-	if($border)
+	$b = 0;
+	if ($border)
 	{
-		if($border==1)
+		if ($border == 1)
 		{
-			$border='LTRB';
-			$b='LRT';
-			$b2='LR';
+			$border = 'LTRB';
+			$b = 'LRT';
+			$b2 = 'LR';
 		}
 		else
 		{
-			$b2='';
-			if(strpos($border,'L')!==false)
-				$b2.='L';
-			if(strpos($border,'R')!==false)
-				$b2.='R';
-			$b=(strpos($border,'T')!==false) ? $b2.'T' : $b2;
+			$b2 = '';
+			if (strpos($border, 'L') !== false)
+				$b2 .= 'L';
+			if (strpos($border, 'R') !== false)
+				$b2 .= 'R';
+			$b = (strpos($border, 'T') !== false) ? $b2 . 'T' : $b2;
 		}
 	}
-	$sep=-1;
-	$i=0;
-	$j=0;
-	$l=0;
-	$ns=0;
-	$nl=1;
-	while($i<$nb)
+	$sep = -1;
+	$i = 0;
+	$j = 0;
+	$l = 0;
+	$ns = 0;
+	$nl = 1;
+	while ($i < $nb)
 	{
 		//Get next character
-		$c=$s[$i];
-		if($c=="\n")
+		$c = $s[$i];
+		if ($c == "\n")
 		{
 			//Explicit line break
-			if($this->ws>0)
+			if ($this->ws > 0)
 			{
-				$this->ws=0;
+				$this->ws = 0;
 				$this->_out('0 Tw');
 			}
-			$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+			$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
 			$i++;
-			$sep=-1;
-			$j=$i;
-			$l=0;
-			$ns=0;
+			$sep = -1;
+			$j = $i;
+			$l = 0;
+			$ns = 0;
 			$nl++;
-			if($border && $nl==2)
-				$b=$b2;
+			if ($border && $nl == 2)
+				$b = $b2;
 			continue;
 		}
-		if($c==' ')
+		if ($c == ' ')
 		{
-			$sep=$i;
-			$ls=$l;
+			$sep = $i;
+			$ls = $l;
 			$ns++;
 		}
-		$l+=$cw[$c];
-		if($l>$wmax)
+		$l += $cw[$c];
+		if ($l > $wmax)
 		{
 			//Automatic line break
-			if($sep==-1)
+			if ($sep == -1)
 			{
-				if($i==$j)
+				if ($i == $j)
 					$i++;
-				if($this->ws>0)
+				if ($this->ws > 0)
 				{
-					$this->ws=0;
+					$this->ws = 0;
 					$this->_out('0 Tw');
 				}
-				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+				$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
 			}
 			else
 			{
-				if($align=='J')
+				if ($align == 'J')
 				{
-					$this->ws=($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
-					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
+					$this->ws = ($ns > 1) ? ($wmax - $ls) / 1000 * $this->FontSize / ($ns - 1) : 0;
+					$this->_out(sprintf('%.3F Tw', $this->ws * $this->k));
 				}
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
-				$i=$sep+1;
+				$this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);
+				$i = $sep + 1;
 			}
-			$sep=-1;
-			$j=$i;
-			$l=0;
-			$ns=0;
+			$sep = -1;
+			$j = $i;
+			$l = 0;
+			$ns = 0;
 			$nl++;
-			if($border && $nl==2)
-				$b=$b2;
+			if ($border && $nl == 2)
+				$b = $b2;
 		}
 		else
 			$i++;
 	}
 	//Last chunk
-	if($this->ws>0)
+	if ($this->ws > 0)
 	{
-		$this->ws=0;
+		$this->ws = 0;
 		$this->_out('0 Tw');
 	}
-	if($border && strpos($border,'B')!==false)
-		$b.='B';
-	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-	$this->x=$this->lMargin;
+	if ($border && strpos($border, 'B') !== false)
+		$b .= 'B';
+	$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
+	$this->x = $this->lMargin;
 }
 
-function Write($h, $txt, $link='')
+function Write($h, $txt, $link = '')
 {
 	//Output text in flowing mode
-	$cw=&$this->CurrentFont['cw'];
-	$w=$this->w-$this->rMargin-$this->x;
-	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s=str_replace("\r",'',$txt);
-	$nb=strlen($s);
-	$sep=-1;
-	$i=0;
-	$j=0;
-	$l=0;
-	$nl=1;
-	while($i<$nb)
+	$cw = &$this->CurrentFont['cw'];
+	$w = $this->w - $this->rMargin - $this->x;
+	$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+	$s = str_replace("\r", '', $txt);
+	$nb = strlen($s);
+	$sep = -1;
+	$i = 0;
+	$j = 0;
+	$l = 0;
+	$nl = 1;
+	while ($i < $nb)
 	{
 		//Get next character
-		$c=$s[$i];
-		if($c=="\n")
+		$c = $s[$i];
+		if ($c == "\n")
 		{
 			//Explicit line break
-			$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
+			$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
 			$i++;
-			$sep=-1;
-			$j=$i;
-			$l=0;
-			if($nl==1)
+			$sep = -1;
+			$j = $i;
+			$l = 0;
+			if ($nl == 1)
 			{
-				$this->x=$this->lMargin;
-				$w=$this->w-$this->rMargin-$this->x;
-				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+				$this->x = $this->lMargin;
+				$w = $this->w - $this->rMargin - $this->x;
+				$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
 			}
 			$nl++;
 			continue;
 		}
-		if($c==' ')
-			$sep=$i;
-		$l+=$cw[$c];
-		if($l>$wmax)
+		if ($c == ' ')
+			$sep = $i;
+		$l += $cw[$c];
+		if ($l > $wmax)
 		{
 			//Automatic line break
-			if($sep==-1)
+			if ($sep == -1)
 			{
-				if($this->x>$this->lMargin)
+				if ($this->x > $this->lMargin)
 				{
 					//Move to next line
-					$this->x=$this->lMargin;
-					$this->y+=$h;
-					$w=$this->w-$this->rMargin-$this->x;
-					$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+					$this->x = $this->lMargin;
+					$this->y += $h;
+					$w = $this->w - $this->rMargin - $this->x;
+					$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
 					$i++;
 					$nl++;
 					continue;
 				}
-				if($i==$j)
+				if ($i == $j)
 					$i++;
-				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
+				$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
 			}
 			else
 			{
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);
-				$i=$sep+1;
+				$this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', 0, $link);
+				$i = $sep + 1;
 			}
-			$sep=-1;
-			$j=$i;
-			$l=0;
-			if($nl==1)
+			$sep = -1;
+			$j = $i;
+			$l = 0;
+			if ($nl == 1)
 			{
-				$this->x=$this->lMargin;
-				$w=$this->w-$this->rMargin-$this->x;
-				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+				$this->x = $this->lMargin;
+				$w = $this->w - $this->rMargin - $this->x;
+				$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
 			}
 			$nl++;
 		}
@@ -887,74 +887,74 @@ 
 			$i++;
 	}
 	//Last chunk
-	if($i!=$j)
-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);
+	if ($i != $j)
+		$this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j), 0, 0, '', 0, $link);
 }
 
-function Ln($h=null)
+function Ln($h = null)
 {
 	//Line feed; default value is last cell height
-	$this->x=$this->lMargin;
-	if($h===null)
-		$this->y+=$this->lasth;
+	$this->x = $this->lMargin;
+	if ($h === null)
+		$this->y += $this->lasth;
 	else
-		$this->y+=$h;
+		$this->y += $h;
 }
 
-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
+function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '')
 {
 	//Put an image on the page
-	if(!isset($this->images[$file]))
+	if (!isset($this->images[$file]))
 	{
 		//First use of this image, get info
-		if($type=='')
+		if ($type == '')
 		{
-			$pos=strrpos($file,'.');
-			if(!$pos)
-				$this->Error('Image file has no extension and no type was specified: '.$file);
-			$type=substr($file,$pos+1);
+			$pos = strrpos($file, '.');
+			if (!$pos)
+				$this->Error('Image file has no extension and no type was specified: ' . $file);
+			$type = substr($file, $pos + 1);
 		}
-		$type=strtolower($type);
-		if($type=='jpeg')
-			$type='jpg';
-		$mtd='_parse'.$type;
-		if(!method_exists($this,$mtd))
-			$this->Error('Unsupported image type: '.$type);
-		$info=$this->$mtd($file);
-		$info['i']=count($this->images)+1;
-		$this->images[$file]=$info;
+		$type = strtolower($type);
+		if ($type == 'jpeg')
+			$type = 'jpg';
+		$mtd = '_parse' . $type;
+		if (!method_exists($this, $mtd))
+			$this->Error('Unsupported image type: ' . $type);
+		$info = $this->$mtd($file);
+		$info['i'] = count($this->images) + 1;
+		$this->images[$file] = $info;
 	}
 	else
-		$info=$this->images[$file];
+		$info = $this->images[$file];
 	//Automatic width and height calculation if needed
-	if($w==0 && $h==0)
+	if ($w == 0 && $h == 0)
 	{
 		//Put image at 72 dpi
-		$w=$info['w']/$this->k;
-		$h=$info['h']/$this->k;
+		$w = $info['w'] / $this->k;
+		$h = $info['h'] / $this->k;
 	}
-	elseif($w==0)
-		$w=$h*$info['w']/$info['h'];
-	elseif($h==0)
-		$h=$w*$info['h']/$info['w'];
+	elseif ($w == 0)
+		$w = $h * $info['w'] / $info['h'];
+	elseif ($h == 0)
+		$h = $w * $info['h'] / $info['w'];
 	//Flowing mode
-	if($y===null)
+	if ($y === null)
 	{
-		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+		if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
 		{
 			//Automatic page break
-			$x2=$this->x;
-			$this->AddPage($this->CurOrientation,$this->CurPageFormat);
-			$this->x=$x2;
+			$x2 = $this->x;
+			$this->AddPage($this->CurOrientation, $this->CurPageFormat);
+			$this->x = $x2;
 		}
-		$y=$this->y;
-		$this->y+=$h;
+		$y = $this->y;
+		$this->y += $h;
 	}
-	if($x===null)
-		$x=$this->x;
-	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
-	if($link)
-		$this->Link($x,$y,$w,$h,$link);
+	if ($x === null)
+		$x = $this->x;
+	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q', $w * $this->k, $h * $this->k, $x * $this->k, ($this->h - ($y + $h)) * $this->k, $info['i']));
+	if ($link)
+		$this->Link($x, $y, $w, $h, $link);
 }
 
 function GetX()
@@ -966,10 +966,10 @@ 
 function SetX($x)
 {
 	//Set x position
-	if($x>=0)
-		$this->x=$x;
+	if ($x >= 0)
+		$this->x = $x;
 	else
-		$this->x=$this->w+$x;
+		$this->x = $this->w + $x;
 }
 
 function GetY()
@@ -981,11 +981,11 @@ 
 function SetY($y)
 {
 	//Set y position and reset x
-	$this->x=$this->lMargin;
-	if($y>=0)
-		$this->y=$y;
+	$this->x = $this->lMargin;
+	if ($y >= 0)
+		$this->y = $y;
 	else
-		$this->y=$this->h+$y;
+		$this->y = $this->h + $y;
 }
 
 function SetXY($x, $y)
@@ -995,69 +995,69 @@ 
 	$this->SetX($x);
 }
 
-function Output($name='', $dest='')
+function Output($name = '', $dest = '')
 {
 	//Output PDF to some destination
-	if($this->state<3)
+	if ($this->state < 3)
 		$this->Close();
-	$dest=strtoupper($dest);
-	if($dest=='')
+	$dest = strtoupper($dest);
+	if ($dest == '')
 	{
-		if($name=='')
+		if ($name == '')
 		{
-			$name='doc.pdf';
-			$dest='I';
+			$name = 'doc.pdf';
+			$dest = 'I';
 		}
 		else
-			$dest='F';
+			$dest = 'F';
 	}
-	switch($dest)
+	switch ($dest)
 	{
 		case 'I':
 			//Send to standard output
-			if(ob_get_length())
+			if (ob_get_length())
 				$this->Error('Some data has already been output, can\'t send PDF file');
-			if(php_sapi_name()!='cli')
+			if (php_sapi_name() != 'cli')
 			{
 				//We send to a browser
 				header('Content-Type: application/pdf');
-				if(headers_sent())
+				if (headers_sent())
 					$this->Error('Some data has already been output, can\'t send PDF file');
-				header('Content-Length: '.strlen($this->buffer));
-				header('Content-Disposition: inline; filename="'.$name.'"');
+				header('Content-Length: ' . strlen($this->buffer));
+				header('Content-Disposition: inline; filename="' . $name . '"');
 				header('Cache-Control: private, max-age=0, must-revalidate');
 				header('Pragma: public');
-				ini_set('zlib.output_compression','0');
+				ini_set('zlib.output_compression', '0');
 			}
 			echo $this->buffer;
 			break;
 		case 'D':
 			//Download file
-			if(ob_get_length())
+			if (ob_get_length())
 				$this->Error('Some data has already been output, can\'t send PDF file');
 			header('Content-Type: application/x-download');
-			if(headers_sent())
+			if (headers_sent())
 				$this->Error('Some data has already been output, can\'t send PDF file');
-			header('Content-Length: '.strlen($this->buffer));
-			header('Content-Disposition: attachment; filename="'.$name.'"');
+			header('Content-Length: ' . strlen($this->buffer));
+			header('Content-Disposition: attachment; filename="' . $name . '"');
 			header('Cache-Control: private, max-age=0, must-revalidate');
 			header('Pragma: public');
-			ini_set('zlib.output_compression','0');
+			ini_set('zlib.output_compression', '0');
 			echo $this->buffer;
 			break;
 		case 'F':
 			//Save to local file
-			$f=fopen($name,'wb');
-			if(!$f)
-				$this->Error('Unable to create output file: '.$name);
-			fwrite($f,$this->buffer,strlen($this->buffer));
+			$f = fopen($name, 'wb');
+			if (!$f)
+				$this->Error('Unable to create output file: ' . $name);
+			fwrite($f, $this->buffer, strlen($this->buffer));
 			fclose($f);
 			break;
 		case 'S':
 			//Return as a string
 			return $this->buffer;
 		default:
-			$this->Error('Incorrect output destination: '.$dest);
+			$this->Error('Incorrect output destination: ' . $dest);
 	}
 	return '';
 }
@@ -1070,124 +1070,124 @@ 
 function _dochecks()
 {
 	//Check availability of %F
-	if(sprintf('%.1F',1.0)!='1.0')
+	if (sprintf('%.1F', 1.0) != '1.0')
 		$this->Error('This version of PHP is not supported');
 	//Check mbstring overloading
-	if(ini_get('mbstring.func_overload') & 2)
+	if (ini_get('mbstring.func_overload') & 2)
 		$this->Error('mbstring overloading must be disabled');
 	//Disable runtime magic quotes
-	if(get_magic_quotes_runtime())
+	if (get_magic_quotes_runtime())
 		@set_magic_quotes_runtime(0);
 }
 
 function _getpageformat($format)
 {
-	$format=strtolower($format);
-	if(!isset($this->PageFormats[$format]))
-		$this->Error('Unknown page format: '.$format);
-	$a=$this->PageFormats[$format];
-	return array($a[0]/$this->k, $a[1]/$this->k);
+	$format = strtolower($format);
+	if (!isset($this->PageFormats[$format]))
+		$this->Error('Unknown page format: ' . $format);
+	$a = $this->PageFormats[$format];
+	return array($a[0] / $this->k, $a[1] / $this->k);
 }
 
 function _getfontpath()
 {
-	if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))
-		define('FPDF_FONTPATH',dirname(__FILE__).'/font/');
+	if (!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__) . '/font'))
+		define('FPDF_FONTPATH', dirname(__FILE__) . '/font/');
 	return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
 }
 
 function _beginpage($orientation, $format)
 {
 	$this->page++;
-	$this->pages[$this->page]='';
-	$this->state=2;
-	$this->x=$this->lMargin;
-	$this->y=$this->tMargin;
-	$this->FontFamily='';
+	$this->pages[$this->page] = '';
+	$this->state = 2;
+	$this->x = $this->lMargin;
+	$this->y = $this->tMargin;
+	$this->FontFamily = '';
 	//Check page size
-	if($orientation=='')
-		$orientation=$this->DefOrientation;
+	if ($orientation == '')
+		$orientation = $this->DefOrientation;
 	else
-		$orientation=strtoupper($orientation[0]);
-	if($format=='')
-		$format=$this->DefPageFormat;
+		$orientation = strtoupper($orientation[0]);
+	if ($format == '')
+		$format = $this->DefPageFormat;
 	else
 	{
-		if(is_string($format))
-			$format=$this->_getpageformat($format);
+		if (is_string($format))
+			$format = $this->_getpageformat($format);
 	}
-	if($orientation!=$this->CurOrientation || $format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1])
+	if ($orientation != $this->CurOrientation || $format[0] != $this->CurPageFormat[0] || $format[1] != $this->CurPageFormat[1])
 	{
 		//New size
-		if($orientation=='P')
+		if ($orientation == 'P')
 		{
-			$this->w=$format[0];
-			$this->h=$format[1];
+			$this->w = $format[0];
+			$this->h = $format[1];
 		}
 		else
 		{
-			$this->w=$format[1];
-			$this->h=$format[0];
+			$this->w = $format[1];
+			$this->h = $format[0];
 		}
-		$this->wPt=$this->w*$this->k;
-		$this->hPt=$this->h*$this->k;
-		$this->PageBreakTrigger=$this->h-$this->bMargin;
-		$this->CurOrientation=$orientation;
-		$this->CurPageFormat=$format;
+		$this->wPt = $this->w * $this->k;
+		$this->hPt = $this->h * $this->k;
+		$this->PageBreakTrigger = $this->h - $this->bMargin;
+		$this->CurOrientation = $orientation;
+		$this->CurPageFormat = $format;
 	}
-	if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1])
-		$this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
+	if ($orientation != $this->DefOrientation || $format[0] != $this->DefPageFormat[0] || $format[1] != $this->DefPageFormat[1])
+		$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
 }
 
 function _endpage()
 {
-	$this->state=1;
+	$this->state = 1;
 }
 
 function _escape($s)
 {
 	//Escape special characters in strings
-	$s=str_replace('\\','\\\\',$s);
-	$s=str_replace('(','\\(',$s);
-	$s=str_replace(')','\\)',$s);
-	$s=str_replace("\r",'\\r',$s);
+	$s = str_replace('\\', '\\\\', $s);
+	$s = str_replace('(', '\\(', $s);
+	$s = str_replace(')', '\\)', $s);
+	$s = str_replace("\r", '\\r', $s);
 	return $s;
 }
 
 function _textstring($s)
 {
 	//Format a text string
-	return '('.$this->_escape($s).')';
+	return '(' . $this->_escape($s) . ')';
 }
 
 function _UTF8toUTF16($s)
 {
 	//Convert UTF-8 to UTF-16BE with BOM
-	$res="\xFE\xFF";
-	$nb=strlen($s);
-	$i=0;
-	while($i<$nb)
+	$res = "\xFE\xFF";
+	$nb = strlen($s);
+	$i = 0;
+	while ($i < $nb)
 	{
-		$c1=ord($s[$i++]);
-		if($c1>=224)
+		$c1 = ord($s[$i++]);
+		if ($c1 >= 224)
 		{
 			//3-byte character
-			$c2=ord($s[$i++]);
-			$c3=ord($s[$i++]);
-			$res.=chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
-			$res.=chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
+			$c2 = ord($s[$i++]);
+			$c3 = ord($s[$i++]);
+			$res .= chr((($c1 & 0x0F) << 4) + (($c2 & 0x3C) >> 2));
+			$res .= chr((($c2 & 0x03) << 6) + ($c3 & 0x3F));
 		}
-		elseif($c1>=192)
+		elseif ($c1 >= 192)
 		{
 			//2-byte character
-			$c2=ord($s[$i++]);
-			$res.=chr(($c1 & 0x1C)>>2);
-			$res.=chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
+			$c2 = ord($s[$i++]);
+			$res .= chr(($c1 & 0x1C) >> 2);
+			$res .= chr((($c1 & 0x03) << 6) + ($c2 & 0x3F));
 		}
 		else
 		{
 			//Single-byte character
-			$res.="\0".chr($c1);
+			$res .= "\0" . chr($c1);
 		}
 	}
 	return $res;
@@ -1196,32 +1196,32 @@ 
 function _dounderline($x, $y, $txt)
 {
 	//Underline text
-	$up=$this->CurrentFont['up'];
-	$ut=$this->CurrentFont['ut'];
-	$w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
-	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
+	$up = $this->CurrentFont['up'];
+	$ut = $this->CurrentFont['ut'];
+	$w = $this->GetStringWidth($txt) + $this->ws * substr_count($txt, ' ');
+	return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - ($y - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt);
 }
 
 function _parsejpg($file)
 {
 	//Extract info from a JPEG file
-	$a=GetImageSize($file);
-	if(!$a)
-		$this->Error('Missing or incorrect image file: '.$file);
-	if($a[2]!=2)
-		$this->Error('Not a JPEG file: '.$file);
-	if(!isset($a['channels']) || $a['channels']==3)
-		$colspace='DeviceRGB';
-	elseif($a['channels']==4)
-		$colspace='DeviceCMYK';
+	$a = GetImageSize($file);
+	if (!$a)
+		$this->Error('Missing or incorrect image file: ' . $file);
+	if ($a[2] != 2)
+		$this->Error('Not a JPEG file: ' . $file);
+	if (!isset($a['channels']) || $a['channels'] == 3)
+		$colspace = 'DeviceRGB';
+	elseif ($a['channels'] == 4)
+		$colspace = 'DeviceCMYK';
 	else
-		$colspace='DeviceGray';
-	$bpc=isset($a['bits']) ? $a['bits'] : 8;
+		$colspace = 'DeviceGray';
+	$bpc = isset($a['bits']) ? $a['bits'] : 8;
 	//Read whole file
-	$f=fopen($file,'rb');
-	$data='';
-	while(!feof($f))
-		$data.=fread($f,8192);
+	$f = fopen($file, 'rb');
+	$data = '';
+	while (!feof($f))
+		$data .= fread($f, 8192);
 	fclose($f);
 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
 }
@@ -1229,82 +1229,82 @@ 
 function _parsepng($file)
 {
 	//Extract info from a PNG file
-	$f=fopen($file,'rb');
-	if(!$f)
-		$this->Error('Can\'t open image file: '.$file);
+	$f = fopen($file, 'rb');
+	if (!$f)
+		$this->Error('Can\'t open image file: ' . $file);
 	//Check signature
-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-		$this->Error('Not a PNG file: '.$file);
+	if ($this->_readstream($f, 8) != chr(137) . 'PNG' . chr(13) . chr(10) . chr(26) . chr(10))
+		$this->Error('Not a PNG file: ' . $file);
 	//Read header chunk
-	$this->_readstream($f,4);
-	if($this->_readstream($f,4)!='IHDR')
-		$this->Error('Incorrect PNG file: '.$file);
-	$w=$this->_readint($f);
-	$h=$this->_readint($f);
-	$bpc=ord($this->_readstream($f,1));
-	if($bpc>8)
-		$this->Error('16-bit depth not supported: '.$file);
-	$ct=ord($this->_readstream($f,1));
-	if($ct==0)
-		$colspace='DeviceGray';
-	elseif($ct==2)
-		$colspace='DeviceRGB';
-	elseif($ct==3)
-		$colspace='Indexed';
+	$this->_readstream($f, 4);
+	if ($this->_readstream($f, 4) != 'IHDR')
+		$this->Error('Incorrect PNG file: ' . $file);
+	$w = $this->_readint($f);
+	$h = $this->_readint($f);
+	$bpc = ord($this->_readstream($f, 1));
+	if ($bpc > 8)
+		$this->Error('16-bit depth not supported: ' . $file);
+	$ct = ord($this->_readstream($f, 1));
+	if ($ct == 0)
+		$colspace = 'DeviceGray';
+	elseif ($ct == 2)
+		$colspace = 'DeviceRGB';
+	elseif ($ct == 3)
+		$colspace = 'Indexed';
 	else
-		$this->Error('Alpha channel not supported: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown compression method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown filter method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Interlacing not supported: '.$file);
-	$this->_readstream($f,4);
-	$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
+		$this->Error('Alpha channel not supported: ' . $file);
+	if (ord($this->_readstream($f, 1)) != 0)
+		$this->Error('Unknown compression method: ' . $file);
+	if (ord($this->_readstream($f, 1)) != 0)
+		$this->Error('Unknown filter method: ' . $file);
+	if (ord($this->_readstream($f, 1)) != 0)
+		$this->Error('Interlacing not supported: ' . $file);
+	$this->_readstream($f, 4);
+	$parms = '/DecodeParms <</Predictor 15 /Colors ' . ($ct == 2 ? 3 : 1) . ' /BitsPerComponent ' . $bpc . ' /Columns ' . $w . '>>';
 	//Scan chunks looking for palette, transparency and image data
-	$pal='';
-	$trns='';
-	$data='';
+	$pal = '';
+	$trns = '';
+	$data = '';
 	do
 	{
-		$n=$this->_readint($f);
-		$type=$this->_readstream($f,4);
-		if($type=='PLTE')
+		$n = $this->_readint($f);
+		$type = $this->_readstream($f, 4);
+		if ($type == 'PLTE')
 		{
 			//Read palette
-			$pal=$this->_readstream($f,$n);
-			$this->_readstream($f,4);
+			$pal = $this->_readstream($f, $n);
+			$this->_readstream($f, 4);
 		}
-		elseif($type=='tRNS')
+		elseif ($type == 'tRNS')
 		{
 			//Read transparency info
-			$t=$this->_readstream($f,$n);
-			if($ct==0)
-				$trns=array(ord(substr($t,1,1)));
-			elseif($ct==2)
-				$trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
+			$t = $this->_readstream($f, $n);
+			if ($ct == 0)
+				$trns = array(ord(substr($t, 1, 1)));
+			elseif ($ct == 2)
+				$trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));
 			else
 			{
-				$pos=strpos($t,chr(0));
-				if($pos!==false)
-					$trns=array($pos);
+				$pos = strpos($t, chr(0));
+				if ($pos !== false)
+					$trns = array($pos);
 			}
-			$this->_readstream($f,4);
+			$this->_readstream($f, 4);
 		}
-		elseif($type=='IDAT')
+		elseif ($type == 'IDAT')
 		{
 			//Read image data block
-			$data.=$this->_readstream($f,$n);
-			$this->_readstream($f,4);
+			$data .= $this->_readstream($f, $n);
+			$this->_readstream($f, 4);
 		}
-		elseif($type=='IEND')
+		elseif ($type == 'IEND')
 			break;
 		else
-			$this->_readstream($f,$n+4);
+			$this->_readstream($f, $n + 4);
 	}
-	while($n);
-	if($colspace=='Indexed' && empty($pal))
-		$this->Error('Missing palette in '.$file);
+	while ($n);
+	if ($colspace == 'Indexed' && empty($pal))
+		$this->Error('Missing palette in ' . $file);
 	fclose($f);
 	return array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'parms'=>$parms, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);
 }
@@ -1312,16 +1312,16 @@ 
 function _readstream($f, $n)
 {
 	//Read n bytes from stream
-	$res='';
-	while($n>0 && !feof($f))
+	$res = '';
+	while ($n > 0 && !feof($f))
 	{
-		$s=fread($f,$n);
-		if($s===false)
+		$s = fread($f, $n);
+		if ($s === false)
 			$this->Error('Error while reading stream');
-		$n-=strlen($s);
-		$res.=$s;
+		$n -= strlen($s);
+		$res .= $s;
 	}
-	if($n>0)
+	if ($n > 0)
 		$this->Error('Unexpected end of stream');
 	return $res;
 }
@@ -1329,28 +1329,28 @@ 
 function _readint($f)
 {
 	//Read a 4-byte integer from stream
-	$a=unpack('Ni',$this->_readstream($f,4));
+	$a = unpack('Ni', $this->_readstream($f, 4));
 	return $a['i'];
 }
 
 function _parsegif($file)
 {
 	//Extract info from a GIF file (via PNG conversion)
-	if(!function_exists('imagepng'))
+	if (!function_exists('imagepng'))
 		$this->Error('GD extension is required for GIF support');
-	if(!function_exists('imagecreatefromgif'))
+	if (!function_exists('imagecreatefromgif'))
 		$this->Error('GD has no GIF read support');
-	$im=imagecreatefromgif($file);
-	if(!$im)
-		$this->Error('Missing or incorrect image file: '.$file);
-	imageinterlace($im,0);
-	$tmp=tempnam('.','gif');
-	if(!$tmp)
+	$im = imagecreatefromgif($file);
+	if (!$im)
+		$this->Error('Missing or incorrect image file: ' . $file);
+	imageinterlace($im, 0);
+	$tmp = tempnam('.', 'gif');
+	if (!$tmp)
 		$this->Error('Unable to create a temporary file');
-	if(!imagepng($im,$tmp))
+	if (!imagepng($im, $tmp))
 		$this->Error('Error while saving to temporary file');
 	imagedestroy($im);
-	$info=$this->_parsepng($tmp);
+	$info = $this->_parsepng($tmp);
 	unlink($tmp);
 	return $info;
 }
@@ -1359,8 +1359,8 @@ 
 {
 	//Begin a new object
 	$this->n++;
-	$this->offsets[$this->n]=strlen($this->buffer);
-	$this->_out($this->n.' 0 obj');
+	$this->offsets[$this->n] = strlen($this->buffer);
+	$this->_out($this->n . ' 0 obj');
 }
 
 function _putstream($s)
@@ -1373,162 +1373,162 @@ 
 function _out($s)
 {
 	//Add a line to the document
-	if($this->state==2)
-		$this->pages[$this->page].=$s."\n";
+	if ($this->state == 2)
+		$this->pages[$this->page] .= $s . "\n";
 	else
-		$this->buffer.=$s."\n";
+		$this->buffer .= $s . "\n";
 }
 
 function _putpages()
 {
-	$nb=$this->page;
-	if(!empty($this->AliasNbPages))
+	$nb = $this->page;
+	if (!empty($this->AliasNbPages))
 	{
 		//Replace number of pages
-		for($n=1;$n<=$nb;$n++)
-			$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
+		for ($n = 1; $n <= $nb; $n++)
+			$this->pages[$n] = str_replace($this->AliasNbPages, $nb, $this->pages[$n]);
 	}
-	if($this->DefOrientation=='P')
+	if ($this->DefOrientation == 'P')
 	{
-		$wPt=$this->DefPageFormat[0]*$this->k;
-		$hPt=$this->DefPageFormat[1]*$this->k;
+		$wPt = $this->DefPageFormat[0] * $this->k;
+		$hPt = $this->DefPageFormat[1] * $this->k;
 	}
 	else
 	{
-		$wPt=$this->DefPageFormat[1]*$this->k;
-		$hPt=$this->DefPageFormat[0]*$this->k;
+		$wPt = $this->DefPageFormat[1] * $this->k;
+		$hPt = $this->DefPageFormat[0] * $this->k;
 	}
-	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-	for($n=1;$n<=$nb;$n++)
+	$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
+	for ($n = 1; $n <= $nb; $n++)
 	{
 		//Page
 		$this->_newobj();
 		$this->_out('<</Type /Page');
 		$this->_out('/Parent 1 0 R');
-		if(isset($this->PageSizes[$n]))
-			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
+		if (isset($this->PageSizes[$n]))
+			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $this->PageSizes[$n][0], $this->PageSizes[$n][1]));
 		$this->_out('/Resources 2 0 R');
-		if(isset($this->PageLinks[$n]))
+		if (isset($this->PageLinks[$n]))
 		{
 			//Links
-			$annots='/Annots [';
-			foreach($this->PageLinks[$n] as $pl)
+			$annots = '/Annots [';
+			foreach ($this->PageLinks[$n] as $pl)
 			{
-				$rect=sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
-				$annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-				if(is_string($pl[4]))
-					$annots.='/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
+				$rect = sprintf('%.2F %.2F %.2F %.2F', $pl[0], $pl[1], $pl[0] + $pl[2], $pl[1] - $pl[3]);
+				$annots .= '<</Type /Annot /Subtype /Link /Rect [' . $rect . '] /Border [0 0 0] ';
+				if (is_string($pl[4]))
+					$annots .= '/A <</S /URI /URI ' . $this->_textstring($pl[4]) . '>>>>';
 				else
 				{
-					$l=$this->links[$pl[4]];
-					$h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
-					$annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);
+					$l = $this->links[$pl[4]];
+					$h = isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
+					$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>', 1 + 2 * $l[0], $h - $l[1] * $this->k);
 				}
 			}
-			$this->_out($annots.']');
+			$this->_out($annots . ']');
 		}
-		$this->_out('/Contents '.($this->n+1).' 0 R>>');
+		$this->_out('/Contents ' . ($this->n + 1) . ' 0 R>>');
 		$this->_out('endobj');
 		//Page content
-		$p=($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];
+		$p = ($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];
 		$this->_newobj();
-		$this->_out('<<'.$filter.'/Length '.strlen($p).'>>');
+		$this->_out('<<' . $filter . '/Length ' . strlen($p) . '>>');
 		$this->_putstream($p);
 		$this->_out('endobj');
 	}
 	//Pages root
-	$this->offsets[1]=strlen($this->buffer);
+	$this->offsets[1] = strlen($this->buffer);
 	$this->_out('1 0 obj');
 	$this->_out('<</Type /Pages');
-	$kids='/Kids [';
-	for($i=0;$i<$nb;$i++)
-		$kids.=(3+2*$i).' 0 R ';
-	$this->_out($kids.']');
-	$this->_out('/Count '.$nb);
-	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
+	$kids = '/Kids [';
+	for ($i = 0; $i < $nb; $i++)
+		$kids .= (3 + 2 * $i) . ' 0 R ';
+	$this->_out($kids . ']');
+	$this->_out('/Count ' . $nb);
+	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $wPt, $hPt));
 	$this->_out('>>');
 	$this->_out('endobj');
 }
 
 function _putfonts()
 {
-	$nf=$this->n;
-	foreach($this->diffs as $diff)
+	$nf = $this->n;
+	foreach ($this->diffs as $diff)
 	{
 		//Encodings
 		$this->_newobj();
-		$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
+		$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences [' . $diff . ']>>');
 		$this->_out('endobj');
 	}
-	foreach($this->FontFiles as $file=>$info)
+	foreach ($this->FontFiles as $file=>$info)
 	{
 		//Font file embedding
 		$this->_newobj();
-		$this->FontFiles[$file]['n']=$this->n;
-		$font='';
-		$f=fopen($this->_getfontpath().$file,'rb',1);
-		if(!$f)
+		$this->FontFiles[$file]['n'] = $this->n;
+		$font = '';
+		$f = fopen($this->_getfontpath() . $file, 'rb', 1);
+		if (!$f)
 			$this->Error('Font file not found');
-		while(!feof($f))
-			$font.=fread($f,8192);
+		while (!feof($f))
+			$font .= fread($f, 8192);
 		fclose($f);
-		$compressed=(substr($file,-2)=='.z');
-		if(!$compressed && isset($info['length2']))
+		$compressed = (substr($file, -2) == '.z');
+		if (!$compressed && isset($info['length2']))
 		{
-			$header=(ord($font[0])==128);
-			if($header)
+			$header = (ord($font[0]) == 128);
+			if ($header)
 			{
 				//Strip first binary header
-				$font=substr($font,6);
+				$font = substr($font, 6);
 			}
-			if($header && ord($font[$info['length1']])==128)
+			if ($header && ord($font[$info['length1']]) == 128)
 			{
 				//Strip second binary header
-				$font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
+				$font = substr($font, 0, $info['length1']) . substr($font, $info['length1'] + 6);
 			}
 		}
-		$this->_out('<</Length '.strlen($font));
-		if($compressed)
+		$this->_out('<</Length ' . strlen($font));
+		if ($compressed)
 			$this->_out('/Filter /FlateDecode');
-		$this->_out('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
-			$this->_out('/Length2 '.$info['length2'].' /Length3 0');
+		$this->_out('/Length1 ' . $info['length1']);
+		if (isset($info['length2']))
+			$this->_out('/Length2 ' . $info['length2'] . ' /Length3 0');
 		$this->_out('>>');
 		$this->_putstream($font);
 		$this->_out('endobj');
 	}
-	foreach($this->fonts as $k=>$font)
+	foreach ($this->fonts as $k=>$font)
 	{
 		//Font objects
-		$this->fonts[$k]['n']=$this->n+1;
-		$type=$font['type'];
-		$name=$font['name'];
-		if($type=='core')
+		$this->fonts[$k]['n'] = $this->n + 1;
+		$type = $font['type'];
+		$name = $font['name'];
+		if ($type == 'core')
 		{
 			//Standard font
 			$this->_newobj();
 			$this->_out('<</Type /Font');
-			$this->_out('/BaseFont /'.$name);
+			$this->_out('/BaseFont /' . $name);
 			$this->_out('/Subtype /Type1');
-			if($name!='Symbol' && $name!='ZapfDingbats')
+			if ($name != 'Symbol' && $name != 'ZapfDingbats')
 				$this->_out('/Encoding /WinAnsiEncoding');
 			$this->_out('>>');
 			$this->_out('endobj');
 		}
-		elseif($type=='Type1' || $type=='TrueType')
+		elseif ($type == 'Type1' || $type == 'TrueType')
 		{
 			//Additional Type1 or TrueType font
 			$this->_newobj();
 			$this->_out('<</Type /Font');
-			$this->_out('/BaseFont /'.$name);
-			$this->_out('/Subtype /'.$type);
+			$this->_out('/BaseFont /' . $name);
+			$this->_out('/Subtype /' . $type);
 			$this->_out('/FirstChar 32 /LastChar 255');
-			$this->_out('/Widths '.($this->n+1).' 0 R');
-			$this->_out('/FontDescriptor '.($this->n+2).' 0 R');
-			if($font['enc'])
+			$this->_out('/Widths ' . ($this->n + 1) . ' 0 R');
+			$this->_out('/FontDescriptor ' . ($this->n + 2) . ' 0 R');
+			if ($font['enc'])
 			{
-				if(isset($font['diff']))
-					$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
+				if (isset($font['diff']))
+					$this->_out('/Encoding ' . ($nf + $font['diff']) . ' 0 R');
 				else
 					$this->_out('/Encoding /WinAnsiEncoding');
 			}
@@ -1536,29 +1536,29 @@ 
 			$this->_out('endobj');
 			//Widths
 			$this->_newobj();
-			$cw=&$font['cw'];
-			$s='[';
-			for($i=32;$i<=255;$i++)
-				$s.=$cw[chr($i)].' ';
-			$this->_out($s.']');
+			$cw = &$font['cw'];
+			$s = '[';
+			for ($i = 32; $i <= 255; $i++)
+				$s .= $cw[chr($i)] . ' ';
+			$this->_out($s . ']');
 			$this->_out('endobj');
 			//Descriptor
 			$this->_newobj();
-			$s='<</Type /FontDescriptor /FontName /'.$name;
-			foreach($font['desc'] as $k=>$v)
-				$s.=' /'.$k.' '.$v;
-			$file=$font['file'];
-			if($file)
-				$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
-			$this->_out($s.'>>');
+			$s = '<</Type /FontDescriptor /FontName /' . $name;
+			foreach ($font['desc'] as $k=>$v)
+				$s .= ' /' . $k . ' ' . $v;
+			$file = $font['file'];
+			if ($file)
+				$s .= ' /FontFile' . ($type == 'Type1' ? '' : '2') . ' ' . $this->FontFiles[$file]['n'] . ' 0 R';
+			$this->_out($s . '>>');
 			$this->_out('endobj');
 		}
 		else
 		{
 			//Allow for additional types
-			$mtd='_put'.strtolower($type);
-			if(!method_exists($this,$mtd))
-				$this->Error('Unsupported font type: '.$type);
+			$mtd = '_put' . strtolower($type);
+			if (!method_exists($this, $mtd))
+				$this->Error('Unsupported font type: ' . $type);
 			$this->$mtd($font);
 		}
 	}
@@ -1566,46 +1566,46 @@ 
 
 function _putimages()
 {
-	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+	$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
 	reset($this->images);
-	while(list($file,$info)=each($this->images))
+	while (list($file, $info) = each($this->images))
 	{
 		$this->_newobj();
-		$this->images[$file]['n']=$this->n;
+		$this->images[$file]['n'] = $this->n;
 		$this->_out('<</Type /XObject');
 		$this->_out('/Subtype /Image');
-		$this->_out('/Width '.$info['w']);
-		$this->_out('/Height '.$info['h']);
-		if($info['cs']=='Indexed')
-			$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+		$this->_out('/Width ' . $info['w']);
+		$this->_out('/Height ' . $info['h']);
+		if ($info['cs'] == 'Indexed')
+			$this->_out('/ColorSpace [/Indexed /DeviceRGB ' . (strlen($info['pal']) / 3 - 1) . ' ' . ($this->n + 1) . ' 0 R]');
 		else
 		{
-			$this->_out('/ColorSpace /'.$info['cs']);
-			if($info['cs']=='DeviceCMYK')
+			$this->_out('/ColorSpace /' . $info['cs']);
+			if ($info['cs'] == 'DeviceCMYK')
 				$this->_out('/Decode [1 0 1 0 1 0 1 0]');
 		}
-		$this->_out('/BitsPerComponent '.$info['bpc']);
-		if(isset($info['f']))
-			$this->_out('/Filter /'.$info['f']);
-		if(isset($info['parms']))
+		$this->_out('/BitsPerComponent ' . $info['bpc']);
+		if (isset($info['f']))
+			$this->_out('/Filter /' . $info['f']);
+		if (isset($info['parms']))
 			$this->_out($info['parms']);
-		if(isset($info['trns']) && is_array($info['trns']))
+		if (isset($info['trns']) && is_array($info['trns']))
 		{
-			$trns='';
-			for($i=0;$i<count($info['trns']);$i++)
-				$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';
-			$this->_out('/Mask ['.$trns.']');
+			$trns = '';
+			for ($i = 0; $i < count($info['trns']); $i++)
+				$trns .= $info['trns'][$i] . ' ' . $info['trns'][$i] . ' ';
+			$this->_out('/Mask [' . $trns . ']');
 		}
-		$this->_out('/Length '.strlen($info['data']).'>>');
+		$this->_out('/Length ' . strlen($info['data']) . '>>');
 		$this->_putstream($info['data']);
 		unset($this->images[$file]['data']);
 		$this->_out('endobj');
 		//Palette
-		if($info['cs']=='Indexed')
+		if ($info['cs'] == 'Indexed')
 		{
 			$this->_newobj();
-			$pal=($this->compress) ? gzcompress($info['pal']) : $info['pal'];
-			$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
+			$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];
+			$this->_out('<<' . $filter . '/Length ' . strlen($pal) . '>>');
 			$this->_putstream($pal);
 			$this->_out('endobj');
 		}
@@ -1614,16 +1614,16 @@ 
 
 function _putxobjectdict()
 {
-	foreach($this->images as $image)
-		$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
+	foreach ($this->images as $image)
+		$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
 }
 
 function _putresourcedict()
 {
 	$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
 	$this->_out('/Font <<');
-	foreach($this->fonts as $font)
-		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
+	foreach ($this->fonts as $font)
+		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
 	$this->_out('>>');
 	$this->_out('/XObject <<');
 	$this->_putxobjectdict();
@@ -1635,7 +1635,7 @@ 
 	$this->_putfonts();
 	$this->_putimages();
 	//Resource dictionary
-	$this->offsets[2]=strlen($this->buffer);
+	$this->offsets[2] = strlen($this->buffer);
 	$this->_out('2 0 obj');
 	$this->_out('<<');
 	$this->_putresourcedict();
@@ -1645,50 +1645,50 @@ 
 
 function _putinfo()
 {
-	$this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION));
-	if(!empty($this->title))
-		$this->_out('/Title '.$this->_textstring($this->title));
-	if(!empty($this->subject))
-		$this->_out('/Subject '.$this->_textstring($this->subject));
-	if(!empty($this->author))
-		$this->_out('/Author '.$this->_textstring($this->author));
-	if(!empty($this->keywords))
-		$this->_out('/Keywords '.$this->_textstring($this->keywords));
-	if(!empty($this->creator))
-		$this->_out('/Creator '.$this->_textstring($this->creator));
-	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
+	$this->_out('/Producer ' . $this->_textstring('FPDF ' . FPDF_VERSION));
+	if (!empty($this->title))
+		$this->_out('/Title ' . $this->_textstring($this->title));
+	if (!empty($this->subject))
+		$this->_out('/Subject ' . $this->_textstring($this->subject));
+	if (!empty($this->author))
+		$this->_out('/Author ' . $this->_textstring($this->author));
+	if (!empty($this->keywords))
+		$this->_out('/Keywords ' . $this->_textstring($this->keywords));
+	if (!empty($this->creator))
+		$this->_out('/Creator ' . $this->_textstring($this->creator));
+	$this->_out('/CreationDate ' . $this->_textstring('D:' . @date('YmdHis')));
 }
 
 function _putcatalog()
 {
 	$this->_out('/Type /Catalog');
 	$this->_out('/Pages 1 0 R');
-	if($this->ZoomMode=='fullpage')
+	if ($this->ZoomMode == 'fullpage')
 		$this->_out('/OpenAction [3 0 R /Fit]');
-	elseif($this->ZoomMode=='fullwidth')
+	elseif ($this->ZoomMode == 'fullwidth')
 		$this->_out('/OpenAction [3 0 R /FitH null]');
-	elseif($this->ZoomMode=='real')
+	elseif ($this->ZoomMode == 'real')
 		$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
-	elseif(!is_string($this->ZoomMode))
-		$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
-	if($this->LayoutMode=='single')
+	elseif (!is_string($this->ZoomMode))
+		$this->_out('/OpenAction [3 0 R /XYZ null null ' . ($this->ZoomMode / 100) . ']');
+	if ($this->LayoutMode == 'single')
 		$this->_out('/PageLayout /SinglePage');
-	elseif($this->LayoutMode=='continuous')
+	elseif ($this->LayoutMode == 'continuous')
 		$this->_out('/PageLayout /OneColumn');
-	elseif($this->LayoutMode=='two')
+	elseif ($this->LayoutMode == 'two')
 		$this->_out('/PageLayout /TwoColumnLeft');
 }
 
 function _putheader()
 {
-	$this->_out('%PDF-'.$this->PDFVersion);
+	$this->_out('%PDF-' . $this->PDFVersion);
 }
 
 function _puttrailer()
 {
-	$this->_out('/Size '.($this->n+1));
-	$this->_out('/Root '.$this->n.' 0 R');
-	$this->_out('/Info '.($this->n-1).' 0 R');
+	$this->_out('/Size ' . ($this->n + 1));
+	$this->_out('/Root ' . $this->n . ' 0 R');
+	$this->_out('/Info ' . ($this->n - 1) . ' 0 R');
 }
 
 function _enddoc()
@@ -1709,12 +1709,12 @@ 
 	$this->_out('>>');
 	$this->_out('endobj');
 	//Cross-ref
-	$o=strlen($this->buffer);
+	$o = strlen($this->buffer);
 	$this->_out('xref');
-	$this->_out('0 '.($this->n+1));
+	$this->_out('0 ' . ($this->n + 1));
 	$this->_out('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
-		$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	for ($i = 1; $i <= $this->n; $i++)
+		$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
 	//Trailer
 	$this->_out('trailer');
 	$this->_out('<<');
@@ -1723,13 +1723,13 @@ 
 	$this->_out('startxref');
 	$this->_out($o);
 	$this->_out('%%EOF');
-	$this->state=3;
+	$this->state = 3;
 }
 //End of class
 }
 
 //Handle special IE contype request
-if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=='contype')
+if (isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] == 'contype')
 {
 	header('Content-Type: application/pdf');
 	exit;

Braces +562 added lines, -432 removed lines

@@ -112,21 +112,23 @@ 
 		'times'=>'Times-Roman', 'timesB'=>'Times-Bold', 'timesI'=>'Times-Italic', 'timesBI'=>'Times-BoldItalic',
 		'symbol'=>'Symbol', 'zapfdingbats'=>'ZapfDingbats');
 	//Scale factor
-	if($unit=='pt')
-		$this->k=1;
-	elseif($unit=='mm')
-		$this->k=72/25.4;
-	elseif($unit=='cm')
-		$this->k=72/2.54;
-	elseif($unit=='in')
-		$this->k=72;
-	else
-		$this->Error('Incorrect unit: '.$unit);
+	if($unit=='pt') {
+			$this->k=1;
+	} elseif($unit=='mm') {
+			$this->k=72/25.4;
+	} elseif($unit=='cm') {
+			$this->k=72/2.54;
+	} elseif($unit=='in') {
+			$this->k=72;
+	} else {
+			$this->Error('Incorrect unit: '.$unit);
+	}
 	//Page format
 	$this->PageFormats=array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
 		'letter'=>array(612,792), 'legal'=>array(612,1008));
-	if(is_string($format))
-		$format=$this->_getpageformat($format);
+	if(is_string($format)) {
+			$format=$this->_getpageformat($format);
+	}
 	$this->DefPageFormat=$format;
 	$this->CurPageFormat=$format;
 	//Page orientation
@@ -136,15 +138,14 @@ 
 		$this->DefOrientation='P';
 		$this->w=$this->DefPageFormat[0];
 		$this->h=$this->DefPageFormat[1];
-	}
-	elseif($orientation=='l' || $orientation=='landscape')
+	} elseif($orientation=='l' || $orientation=='landscape')
 	{
 		$this->DefOrientation='L';
 		$this->w=$this->DefPageFormat[1];
 		$this->h=$this->DefPageFormat[0];
+	} else {
+			$this->Error('Incorrect orientation: '.$orientation);
 	}
-	else
-		$this->Error('Incorrect orientation: '.$orientation);
 	$this->CurOrientation=$this->DefOrientation;
 	$this->wPt=$this->w*$this->k;
 	$this->hPt=$this->h*$this->k;
@@ -170,8 +171,9 @@ 
 	//Set left, top and right margins
 	$this->lMargin=$left;
 	$this->tMargin=$top;
-	if($right===null)
-		$right=$left;
+	if($right===null) {
+			$right=$left;
+	}
 	$this->rMargin=$right;
 }
 
@@ -179,9 +181,10 @@ 
 {
 	//Set left margin
 	$this->lMargin=$margin;
-	if($this->page>0 && $this->x<$margin)
-		$this->x=$margin;
-}
+	if($this->page>0 && $this->x<$margin) {
+			$this->x=$margin;
+	}
+	}
 
 function SetTopMargin($margin)
 {
@@ -206,62 +209,70 @@ 
 function SetDisplayMode($zoom, $layout='continuous')
 {
 	//Set display mode in viewer
-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
-		$this->ZoomMode=$zoom;
-	else
-		$this->Error('Incorrect zoom display mode: '.$zoom);
-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
-		$this->LayoutMode=$layout;
-	else
-		$this->Error('Incorrect layout display mode: '.$layout);
-}
+	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom)) {
+			$this->ZoomMode=$zoom;
+	} else {
+			$this->Error('Incorrect zoom display mode: '.$zoom);
+	}
+	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default') {
+			$this->LayoutMode=$layout;
+	} else {
+			$this->Error('Incorrect layout display mode: '.$layout);
+	}
+	}
 
 function SetCompression($compress)
 {
 	//Set page compression
-	if(function_exists('gzcompress'))
-		$this->compress=$compress;
-	else
-		$this->compress=false;
-}
+	if(function_exists('gzcompress')) {
+			$this->compress=$compress;
+	} else {
+			$this->compress=false;
+	}
+	}
 
 function SetTitle($title, $isUTF8=false)
 {
 	//Title of document
-	if($isUTF8)
-		$title=$this->_UTF8toUTF16($title);
+	if($isUTF8) {
+			$title=$this->_UTF8toUTF16($title);
+	}
 	$this->title=$title;
 }
 
 function SetSubject($subject, $isUTF8=false)
 {
 	//Subject of document
-	if($isUTF8)
-		$subject=$this->_UTF8toUTF16($subject);
+	if($isUTF8) {
+			$subject=$this->_UTF8toUTF16($subject);
+	}
 	$this->subject=$subject;
 }
 
 function SetAuthor($author, $isUTF8=false)
 {
 	//Author of document
-	if($isUTF8)
-		$author=$this->_UTF8toUTF16($author);
+	if($isUTF8) {
+			$author=$this->_UTF8toUTF16($author);
+	}
 	$this->author=$author;
 }
 
 function SetKeywords($keywords, $isUTF8=false)
 {
 	//Keywords of document
-	if($isUTF8)
-		$keywords=$this->_UTF8toUTF16($keywords);
+	if($isUTF8) {
+			$keywords=$this->_UTF8toUTF16($keywords);
+	}
 	$this->keywords=$keywords;
 }
 
 function SetCreator($creator, $isUTF8=false)
 {
 	//Creator of document
-	if($isUTF8)
-		$creator=$this->_UTF8toUTF16($creator);
+	if($isUTF8) {
+			$creator=$this->_UTF8toUTF16($creator);
+	}
 	$this->creator=$creator;
 }
 
@@ -286,10 +297,12 @@ 
 function Close()
 {
 	//Terminate document
-	if($this->state==3)
-		return;
-	if($this->page==0)
-		$this->AddPage();
+	if($this->state==3) {
+			return;
+	}
+	if($this->page==0) {
+			$this->AddPage();
+	}
 	//Page footer
 	$this->InFooter=true;
 	$this->Footer();
@@ -303,8 +316,9 @@ 
 function AddPage($orientation='', $format='')
 {
 	//Start a new page
-	if($this->state==0)
-		$this->Open();
+	if($this->state==0) {
+			$this->Open();
+	}
 	$family=$this->FontFamily;
 	$style=$this->FontStyle.($this->underline ? 'U' : '');
 	$size=$this->FontSizePt;
@@ -330,15 +344,18 @@ 
 	$this->LineWidth=$lw;
 	$this->_out(sprintf('%.2F w',$lw*$this->k));
 	//Set font
-	if($family)
-		$this->SetFont($family,$style,$size);
+	if($family) {
+			$this->SetFont($family,$style,$size);
+	}
 	//Set colors
 	$this->DrawColor=$dc;
-	if($dc!='0 G')
-		$this->_out($dc);
+	if($dc!='0 G') {
+			$this->_out($dc);
+	}
 	$this->FillColor=$fc;
-	if($fc!='0 g')
-		$this->_out($fc);
+	if($fc!='0 g') {
+			$this->_out($fc);
+	}
 	$this->TextColor=$tc;
 	$this->ColorFlag=$cf;
 	//Page header
@@ -352,8 +369,9 @@ 
 		$this->_out(sprintf('%.2F w',$lw*$this->k));
 	}
 	//Restore font
-	if($family)
-		$this->SetFont($family,$style,$size);
+	if($family) {
+			$this->SetFont($family,$style,$size);
+	}
 	//Restore colors
 	if($this->DrawColor!=$dc)
 	{
@@ -388,33 +406,38 @@ 
 function SetDrawColor($r, $g=null, $b=null)
 {
 	//Set color for all stroking operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->DrawColor=sprintf('%.3F G',$r/255);
-	else
-		$this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
-	if($this->page>0)
-		$this->_out($this->DrawColor);
-}
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->DrawColor=sprintf('%.3F G',$r/255);
+	} else {
+			$this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
+	}
+	if($this->page>0) {
+			$this->_out($this->DrawColor);
+	}
+	}
 
 function SetFillColor($r, $g=null, $b=null)
 {
 	//Set color for all filling operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->FillColor=sprintf('%.3F g',$r/255);
-	else
-		$this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->FillColor=sprintf('%.3F g',$r/255);
+	} else {
+			$this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	}
 	$this->ColorFlag=($this->FillColor!=$this->TextColor);
-	if($this->page>0)
-		$this->_out($this->FillColor);
-}
+	if($this->page>0) {
+			$this->_out($this->FillColor);
+	}
+	}
 
 function SetTextColor($r, $g=null, $b=null)
 {
 	//Set color for text
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->TextColor=sprintf('%.3F g',$r/255);
-	else
-		$this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->TextColor=sprintf('%.3F g',$r/255);
+	} else {
+			$this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	}
 	$this->ColorFlag=($this->FillColor!=$this->TextColor);
 }
 
@@ -425,8 +448,9 @@ 
 	$cw=&$this->CurrentFont['cw'];
 	$w=0;
 	$l=strlen($s);
-	for($i=0;$i<$l;$i++)
-		$w+=$cw[$s[$i]];
+	for($i=0;$i<$l;$i++) {
+			$w+=$cw[$s[$i]];
+	}
 	return $w*$this->FontSize/1000;
 }
 
@@ -434,9 +458,10 @@ 
 {
 	//Set line width
 	$this->LineWidth=$width;
-	if($this->page>0)
-		$this->_out(sprintf('%.2F w',$width*$this->k));
-}
+	if($this->page>0) {
+			$this->_out(sprintf('%.2F w',$width*$this->k));
+	}
+	}
 
 function Line($x1, $y1, $x2, $y2)
 {
@@ -447,12 +472,13 @@ 
 function Rect($x, $y, $w, $h, $style='')
 {
 	//Draw a rectangle
-	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';
+	}
 	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
 }
 
@@ -460,19 +486,24 @@ 
 {
 	//Add a TrueType or Type1 font
 	$family=strtolower($family);
-	if($file=='')
-		$file=str_replace(' ','',$family).strtolower($style).'.php';
-	if($family=='arial')
-		$family='helvetica';
+	if($file=='') {
+			$file=str_replace(' ','',$family).strtolower($style).'.php';
+	}
+	if($family=='arial') {
+			$family='helvetica';
+	}
 	$style=strtoupper($style);
-	if($style=='IB')
-		$style='BI';
+	if($style=='IB') {
+			$style='BI';
+	}
 	$fontkey=$family.$style;
-	if(isset($this->fonts[$fontkey]))
-		return;
+	if(isset($this->fonts[$fontkey])) {
+			return;
+	}
 	include($this->_getfontpath().$file);
-	if(!isset($name))
-		$this->Error('Could not include font definition file');
+	if(!isset($name)) {
+			$this->Error('Could not include font definition file');
+	}
 	$i=count($this->fonts)+1;
 	$this->fonts[$fontkey]=array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file);
 	if($diff)
@@ -497,10 +528,11 @@ 
 	}
 	if($file)
 	{
-		if($type=='TrueType')
-			$this->FontFiles[$file]=array('length1'=>$originalsize);
-		else
-			$this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);
+		if($type=='TrueType') {
+					$this->FontFiles[$file]=array('length1'=>$originalsize);
+		} else {
+					$this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);
+		}
 	}
 }
 
@@ -510,27 +542,32 @@ 
 	global $fpdf_charwidths;
 
 	$family=strtolower($family);
-	if($family=='')
-		$family=$this->FontFamily;
-	if($family=='arial')
-		$family='helvetica';
-	elseif($family=='symbol' || $family=='zapfdingbats')
-		$style='';
+	if($family=='') {
+			$family=$this->FontFamily;
+	}
+	if($family=='arial') {
+			$family='helvetica';
+	} elseif($family=='symbol' || $family=='zapfdingbats') {
+			$style='';
+	}
 	$style=strtoupper($style);
 	if(strpos($style,'U')!==false)
 	{
 		$this->underline=true;
 		$style=str_replace('U','',$style);
+	} else {
+			$this->underline=false;
+	}
+	if($style=='IB') {
+			$style='BI';
+	}
+	if($size==0) {
+			$size=$this->FontSizePt;
 	}
-	else
-		$this->underline=false;
-	if($style=='IB')
-		$style='BI';
-	if($size==0)
-		$size=$this->FontSizePt;
 	//Test if font is already selected
-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
-		return;
+	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {
+			return;
+	}
 	//Test if used for the first time
 	$fontkey=$family.$style;
 	if(!isset($this->fonts[$fontkey]))
@@ -542,19 +579,21 @@ 
 			{
 				//Load metric file
 				$file=$family;
-				if($family=='times' || $family=='helvetica')
-					$file.=strtolower($style);
+				if($family=='times' || $family=='helvetica') {
+									$file.=strtolower($style);
+				}
 				include($this->_getfontpath().$file.'.php');
-				if(!isset($fpdf_charwidths[$fontkey]))
-					$this->Error('Could not include font metric file');
+				if(!isset($fpdf_charwidths[$fontkey])) {
+									$this->Error('Could not include font metric file');
+				}
 			}
 			$i=count($this->fonts)+1;
 			$name=$this->CoreFonts[$fontkey];
 			$cw=$fpdf_charwidths[$fontkey];
 			$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);
+		} else {
+					$this->Error('Undefined font: '.$family.' '.$style);
 		}
-		else
-			$this->Error('Undefined font: '.$family.' '.$style);
 	}
 	//Select it
 	$this->FontFamily=$family;
@@ -562,20 +601,23 @@ 
 	$this->FontSizePt=$size;
 	$this->FontSize=$size/$this->k;
 	$this->CurrentFont=&$this->fonts[$fontkey];
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-}
+	if($this->page>0) {
+			$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+	}
+	}
 
 function SetFontSize($size)
 {
 	//Set font size in points
-	if($this->FontSizePt==$size)
-		return;
+	if($this->FontSizePt==$size) {
+			return;
+	}
 	$this->FontSizePt=$size;
 	$this->FontSize=$size/$this->k;
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-}
+	if($this->page>0) {
+			$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+	}
+	}
 
 function AddLink()
 {
@@ -588,10 +630,12 @@ 
 function SetLink($link, $y=0, $page=-1)
 {
 	//Set destination of internal link
-	if($y==-1)
-		$y=$this->y;
-	if($page==-1)
-		$page=$this->page;
+	if($y==-1) {
+			$y=$this->y;
+	}
+	if($page==-1) {
+			$page=$this->page;
+	}
 	$this->links[$link]=array($page, $y);
 }
 
@@ -605,10 +649,12 @@ 
 {
 	//Output a string
 	$s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if($this->underline && $txt!='')
-		$s.=' '.$this->_dounderline($x,$y,$txt);
-	if($this->ColorFlag)
-		$s='q '.$this->TextColor.' '.$s.' Q';
+	if($this->underline && $txt!='') {
+			$s.=' '.$this->_dounderline($x,$y,$txt);
+	}
+	if($this->ColorFlag) {
+			$s='q '.$this->TextColor.' '.$s.' Q';
+	}
 	$this->_out($s);
 }
 
@@ -640,74 +686,89 @@ 
 			$this->_out(sprintf('%.3F Tw',$ws*$k));
 		}
 	}
-	if($w==0)
-		$w=$this->w-$this->rMargin-$this->x;
+	if($w==0) {
+			$w=$this->w-$this->rMargin-$this->x;
+	}
 	$s='';
 	if($fill || $border==1)
 	{
-		if($fill)
-			$op=($border==1) ? 'B' : 'f';
-		else
-			$op='S';
+		if($fill) {
+					$op=($border==1) ? 'B' : 'f';
+		} else {
+					$op='S';
+		}
 		$s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
 	}
 	if(is_string($border))
 	{
 		$x=$this->x;
 		$y=$this->y;
-		if(strpos($border,'L')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'T')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-		if(strpos($border,'R')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'B')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		if(strpos($border,'L')!==false) {
+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+		}
+		if(strpos($border,'T')!==false) {
+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+		}
+		if(strpos($border,'R')!==false) {
+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		}
+		if(strpos($border,'B')!==false) {
+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		}
 	}
 	if($txt!=='')
 	{
-		if($align=='R')
-			$dx=$w-$this->cMargin-$this->GetStringWidth($txt);
-		elseif($align=='C')
-			$dx=($w-$this->GetStringWidth($txt))/2;
-		else
-			$dx=$this->cMargin;
-		if($this->ColorFlag)
-			$s.='q '.$this->TextColor.' ';
+		if($align=='R') {
+					$dx=$w-$this->cMargin-$this->GetStringWidth($txt);
+		} elseif($align=='C') {
+					$dx=($w-$this->GetStringWidth($txt))/2;
+		} else {
+					$dx=$this->cMargin;
+		}
+		if($this->ColorFlag) {
+					$s.='q '.$this->TextColor.' ';
+		}
 		$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
 		$s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
-		if($this->underline)
-			$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-		if($this->ColorFlag)
-			$s.=' Q';
-		if($link)
-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
-	}
-	if($s)
-		$this->_out($s);
+		if($this->underline) {
+					$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+		}
+		if($this->ColorFlag) {
+					$s.=' Q';
+		}
+		if($link) {
+					$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+		}
+	}
+	if($s) {
+			$this->_out($s);
+	}
 	$this->lasth=$h;
 	if($ln>0)
 	{
 		//Go to next line
 		$this->y+=$h;
-		if($ln==1)
-			$this->x=$this->lMargin;
+		if($ln==1) {
+					$this->x=$this->lMargin;
+		}
+	} else {
+			$this->x+=$w;
+	}
 	}
-	else
-		$this->x+=$w;
-}
 
 function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
 	//Output text with automatic or explicit line breaks
 	$cw=&$this->CurrentFont['cw'];
-	if($w==0)
-		$w=$this->w-$this->rMargin-$this->x;
+	if($w==0) {
+			$w=$this->w-$this->rMargin-$this->x;
+	}
 	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
 	$s=str_replace("\r",'',$txt);
 	$nb=strlen($s);
-	if($nb>0 && $s[$nb-1]=="\n")
-		$nb--;
+	if($nb>0 && $s[$nb-1]=="\n") {
+			$nb--;
+	}
 	$b=0;
 	if($border)
 	{
@@ -716,14 +777,15 @@ 
 			$border='LTRB';
 			$b='LRT';
 			$b2='LR';
-		}
-		else
+		} else
 		{
 			$b2='';
-			if(strpos($border,'L')!==false)
-				$b2.='L';
-			if(strpos($border,'R')!==false)
-				$b2.='R';
+			if(strpos($border,'L')!==false) {
+							$b2.='L';
+			}
+			if(strpos($border,'R')!==false) {
+							$b2.='R';
+			}
 			$b=(strpos($border,'T')!==false) ? $b2.'T' : $b2;
 		}
 	}
@@ -752,8 +814,9 @@ 
 			$l=0;
 			$ns=0;
 			$nl++;
-			if($border && $nl==2)
-				$b=$b2;
+			if($border && $nl==2) {
+							$b=$b2;
+			}
 			continue;
 		}
 		if($c==' ')
@@ -768,16 +831,16 @@ 
 			//Automatic line break
 			if($sep==-1)
 			{
-				if($i==$j)
-					$i++;
+				if($i==$j) {
+									$i++;
+				}
 				if($this->ws>0)
 				{
 					$this->ws=0;
 					$this->_out('0 Tw');
 				}
 				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-			}
-			else
+			} else
 			{
 				if($align=='J')
 				{
@@ -792,11 +855,12 @@ 
 			$l=0;
 			$ns=0;
 			$nl++;
-			if($border && $nl==2)
-				$b=$b2;
+			if($border && $nl==2) {
+							$b=$b2;
+			}
+		} else {
+					$i++;
 		}
-		else
-			$i++;
 	}
 	//Last chunk
 	if($this->ws>0)
@@ -804,8 +868,9 @@ 
 		$this->ws=0;
 		$this->_out('0 Tw');
 	}
-	if($border && strpos($border,'B')!==false)
-		$b.='B';
+	if($border && strpos($border,'B')!==false) {
+			$b.='B';
+	}
 	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
 	$this->x=$this->lMargin;
 }
@@ -844,8 +909,9 @@ 
 			$nl++;
 			continue;
 		}
-		if($c==' ')
-			$sep=$i;
+		if($c==' ') {
+					$sep=$i;
+		}
 		$l+=$cw[$c];
 		if($l>$wmax)
 		{
@@ -863,11 +929,11 @@ 
 					$nl++;
 					continue;
 				}
-				if($i==$j)
-					$i++;
+				if($i==$j) {
+									$i++;
+				}
 				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
-			}
-			else
+			} else
 			{
 				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);
 				$i=$sep+1;
@@ -882,24 +948,26 @@ 
 				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
 			}
 			$nl++;
+		} else {
+					$i++;
 		}
-		else
-			$i++;
 	}
 	//Last chunk
-	if($i!=$j)
-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);
-}
+	if($i!=$j) {
+			$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);
+	}
+	}
 
 function Ln($h=null)
 {
 	//Line feed; default value is last cell height
 	$this->x=$this->lMargin;
-	if($h===null)
-		$this->y+=$this->lasth;
-	else
-		$this->y+=$h;
-}
+	if($h===null) {
+			$this->y+=$this->lasth;
+	} else {
+			$this->y+=$h;
+	}
+	}
 
 function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
 {
@@ -910,33 +978,36 @@ 
 		if($type=='')
 		{
 			$pos=strrpos($file,'.');
-			if(!$pos)
-				$this->Error('Image file has no extension and no type was specified: '.$file);
+			if(!$pos) {
+							$this->Error('Image file has no extension and no type was specified: '.$file);
+			}
 			$type=substr($file,$pos+1);
 		}
 		$type=strtolower($type);
-		if($type=='jpeg')
-			$type='jpg';
+		if($type=='jpeg') {
+					$type='jpg';
+		}
 		$mtd='_parse'.$type;
-		if(!method_exists($this,$mtd))
-			$this->Error('Unsupported image type: '.$type);
+		if(!method_exists($this,$mtd)) {
+					$this->Error('Unsupported image type: '.$type);
+		}
 		$info=$this->$mtd($file);
 		$info['i']=count($this->images)+1;
 		$this->images[$file]=$info;
+	} else {
+			$info=$this->images[$file];
 	}
-	else
-		$info=$this->images[$file];
 	//Automatic width and height calculation if needed
 	if($w==0 && $h==0)
 	{
 		//Put image at 72 dpi
 		$w=$info['w']/$this->k;
 		$h=$info['h']/$this->k;
+	} elseif($w==0) {
+			$w=$h*$info['w']/$info['h'];
+	} elseif($h==0) {
+			$h=$w*$info['h']/$info['w'];
 	}
-	elseif($w==0)
-		$w=$h*$info['w']/$info['h'];
-	elseif($h==0)
-		$h=$w*$info['h']/$info['w'];
 	//Flowing mode
 	if($y===null)
 	{
@@ -950,12 +1021,14 @@ 
 		$y=$this->y;
 		$this->y+=$h;
 	}
-	if($x===null)
-		$x=$this->x;
+	if($x===null) {
+			$x=$this->x;
+	}
 	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
-	if($link)
-		$this->Link($x,$y,$w,$h,$link);
-}
+	if($link) {
+			$this->Link($x,$y,$w,$h,$link);
+	}
+	}
 
 function GetX()
 {
@@ -966,11 +1039,12 @@ 
 function SetX($x)
 {
 	//Set x position
-	if($x>=0)
-		$this->x=$x;
-	else
-		$this->x=$this->w+$x;
-}
+	if($x>=0) {
+			$this->x=$x;
+	} else {
+			$this->x=$this->w+$x;
+	}
+	}
 
 function GetY()
 {
@@ -982,11 +1056,12 @@ 
 {
 	//Set y position and reset x
 	$this->x=$this->lMargin;
-	if($y>=0)
-		$this->y=$y;
-	else
-		$this->y=$this->h+$y;
-}
+	if($y>=0) {
+			$this->y=$y;
+	} else {
+			$this->y=$this->h+$y;
+	}
+	}
 
 function SetXY($x, $y)
 {
@@ -998,8 +1073,9 @@ 
 function Output($name='', $dest='')
 {
 	//Output PDF to some destination
-	if($this->state<3)
-		$this->Close();
+	if($this->state<3) {
+			$this->Close();
+	}
 	$dest=strtoupper($dest);
 	if($dest=='')
 	{
@@ -1007,22 +1083,24 @@ 
 		{
 			$name='doc.pdf';
 			$dest='I';
+		} else {
+					$dest='F';
 		}
-		else
-			$dest='F';
 	}
 	switch($dest)
 	{
 		case 'I':
 			//Send to standard output
-			if(ob_get_length())
-				$this->Error('Some data has already been output, can\'t send PDF file');
+			if(ob_get_length()) {
+							$this->Error('Some data has already been output, can\'t send PDF file');
+			}
 			if(php_sapi_name()!='cli')
 			{
 				//We send to a browser
 				header('Content-Type: application/pdf');
-				if(headers_sent())
-					$this->Error('Some data has already been output, can\'t send PDF file');
+				if(headers_sent()) {
+									$this->Error('Some data has already been output, can\'t send PDF file');
+				}
 				header('Content-Length: '.strlen($this->buffer));
 				header('Content-Disposition: inline; filename="'.$name.'"');
 				header('Cache-Control: private, max-age=0, must-revalidate');
@@ -1033,11 +1111,13 @@ 
 			break;
 		case 'D':
 			//Download file
-			if(ob_get_length())
-				$this->Error('Some data has already been output, can\'t send PDF file');
+			if(ob_get_length()) {
+							$this->Error('Some data has already been output, can\'t send PDF file');
+			}
 			header('Content-Type: application/x-download');
-			if(headers_sent())
-				$this->Error('Some data has already been output, can\'t send PDF file');
+			if(headers_sent()) {
+							$this->Error('Some data has already been output, can\'t send PDF file');
+			}
 			header('Content-Length: '.strlen($this->buffer));
 			header('Content-Disposition: attachment; filename="'.$name.'"');
 			header('Cache-Control: private, max-age=0, must-revalidate');
@@ -1048,8 +1128,9 @@ 
 		case 'F':
 			//Save to local file
 			$f=fopen($name,'wb');
-			if(!$f)
-				$this->Error('Unable to create output file: '.$name);
+			if(!$f) {
+							$this->Error('Unable to create output file: '.$name);
+			}
 			fwrite($f,$this->buffer,strlen($this->buffer));
 			fclose($f);
 			break;
@@ -1070,29 +1151,34 @@ 
 function _dochecks()
 {
 	//Check availability of %F
-	if(sprintf('%.1F',1.0)!='1.0')
-		$this->Error('This version of PHP is not supported');
+	if(sprintf('%.1F',1.0)!='1.0') {
+			$this->Error('This version of PHP is not supported');
+	}
 	//Check mbstring overloading
-	if(ini_get('mbstring.func_overload') & 2)
-		$this->Error('mbstring overloading must be disabled');
+	if(ini_get('mbstring.func_overload') & 2) {
+			$this->Error('mbstring overloading must be disabled');
+	}
 	//Disable runtime magic quotes
-	if(get_magic_quotes_runtime())
-		@set_magic_quotes_runtime(0);
-}
+	if(get_magic_quotes_runtime()) {
+			@set_magic_quotes_runtime(0);
+	}
+	}
 
 function _getpageformat($format)
 {
 	$format=strtolower($format);
-	if(!isset($this->PageFormats[$format]))
-		$this->Error('Unknown page format: '.$format);
+	if(!isset($this->PageFormats[$format])) {
+			$this->Error('Unknown page format: '.$format);
+	}
 	$a=$this->PageFormats[$format];
 	return array($a[0]/$this->k, $a[1]/$this->k);
 }
 
 function _getfontpath()
 {
-	if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))
-		define('FPDF_FONTPATH',dirname(__FILE__).'/font/');
+	if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font')) {
+			define('FPDF_FONTPATH',dirname(__FILE__).'/font/');
+	}
 	return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
 }
 
@@ -1105,16 +1191,18 @@ 
 	$this->y=$this->tMargin;
 	$this->FontFamily='';
 	//Check page size
-	if($orientation=='')
-		$orientation=$this->DefOrientation;
-	else
-		$orientation=strtoupper($orientation[0]);
-	if($format=='')
-		$format=$this->DefPageFormat;
-	else
+	if($orientation=='') {
+			$orientation=$this->DefOrientation;
+	} else {
+			$orientation=strtoupper($orientation[0]);
+	}
+	if($format=='') {
+			$format=$this->DefPageFormat;
+	} else
 	{
-		if(is_string($format))
-			$format=$this->_getpageformat($format);
+		if(is_string($format)) {
+					$format=$this->_getpageformat($format);
+		}
 	}
 	if($orientation!=$this->CurOrientation || $format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1])
 	{
@@ -1123,8 +1211,7 @@ 
 		{
 			$this->w=$format[0];
 			$this->h=$format[1];
-		}
-		else
+		} else
 		{
 			$this->w=$format[1];
 			$this->h=$format[0];
@@ -1135,9 +1222,10 @@ 
 		$this->CurOrientation=$orientation;
 		$this->CurPageFormat=$format;
 	}
-	if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1])
-		$this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
-}
+	if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1]) {
+			$this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
+	}
+	}
 
 function _endpage()
 {
@@ -1176,15 +1264,13 @@ 
 			$c3=ord($s[$i++]);
 			$res.=chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
 			$res.=chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
-		}
-		elseif($c1>=192)
+		} elseif($c1>=192)
 		{
 			//2-byte character
 			$c2=ord($s[$i++]);
 			$res.=chr(($c1 & 0x1C)>>2);
 			$res.=chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
-		}
-		else
+		} else
 		{
 			//Single-byte character
 			$res.="\0".chr($c1);
@@ -1206,22 +1292,26 @@ 
 {
 	//Extract info from a JPEG file
 	$a=GetImageSize($file);
-	if(!$a)
-		$this->Error('Missing or incorrect image file: '.$file);
-	if($a[2]!=2)
-		$this->Error('Not a JPEG file: '.$file);
-	if(!isset($a['channels']) || $a['channels']==3)
-		$colspace='DeviceRGB';
-	elseif($a['channels']==4)
-		$colspace='DeviceCMYK';
-	else
-		$colspace='DeviceGray';
+	if(!$a) {
+			$this->Error('Missing or incorrect image file: '.$file);
+	}
+	if($a[2]!=2) {
+			$this->Error('Not a JPEG file: '.$file);
+	}
+	if(!isset($a['channels']) || $a['channels']==3) {
+			$colspace='DeviceRGB';
+	} elseif($a['channels']==4) {
+			$colspace='DeviceCMYK';
+	} else {
+			$colspace='DeviceGray';
+	}
 	$bpc=isset($a['bits']) ? $a['bits'] : 8;
 	//Read whole file
 	$f=fopen($file,'rb');
 	$data='';
-	while(!feof($f))
-		$data.=fread($f,8192);
+	while(!feof($f)) {
+			$data.=fread($f,8192);
+	}
 	fclose($f);
 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
 }
@@ -1230,35 +1320,43 @@ 
 {
 	//Extract info from a PNG file
 	$f=fopen($file,'rb');
-	if(!$f)
-		$this->Error('Can\'t open image file: '.$file);
+	if(!$f) {
+			$this->Error('Can\'t open image file: '.$file);
+	}
 	//Check signature
-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-		$this->Error('Not a PNG file: '.$file);
+	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
+			$this->Error('Not a PNG file: '.$file);
+	}
 	//Read header chunk
 	$this->_readstream($f,4);
-	if($this->_readstream($f,4)!='IHDR')
-		$this->Error('Incorrect PNG file: '.$file);
+	if($this->_readstream($f,4)!='IHDR') {
+			$this->Error('Incorrect PNG file: '.$file);
+	}
 	$w=$this->_readint($f);
 	$h=$this->_readint($f);
 	$bpc=ord($this->_readstream($f,1));
-	if($bpc>8)
-		$this->Error('16-bit depth not supported: '.$file);
+	if($bpc>8) {
+			$this->Error('16-bit depth not supported: '.$file);
+	}
 	$ct=ord($this->_readstream($f,1));
-	if($ct==0)
-		$colspace='DeviceGray';
-	elseif($ct==2)
-		$colspace='DeviceRGB';
-	elseif($ct==3)
-		$colspace='Indexed';
-	else
-		$this->Error('Alpha channel not supported: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown compression method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown filter method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Interlacing not supported: '.$file);
+	if($ct==0) {
+			$colspace='DeviceGray';
+	} elseif($ct==2) {
+			$colspace='DeviceRGB';
+	} elseif($ct==3) {
+			$colspace='Indexed';
+	} else {
+			$this->Error('Alpha channel not supported: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Unknown compression method: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Unknown filter method: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Interlacing not supported: '.$file);
+	}
 	$this->_readstream($f,4);
 	$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
 	//Scan chunks looking for palette, transparency and image data
@@ -1274,37 +1372,37 @@ 
 			//Read palette
 			$pal=$this->_readstream($f,$n);
 			$this->_readstream($f,4);
-		}
-		elseif($type=='tRNS')
+		} elseif($type=='tRNS')
 		{
 			//Read transparency info
 			$t=$this->_readstream($f,$n);
-			if($ct==0)
-				$trns=array(ord(substr($t,1,1)));
-			elseif($ct==2)
-				$trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
-			else
+			if($ct==0) {
+							$trns=array(ord(substr($t,1,1)));
+			} elseif($ct==2) {
+							$trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
+			} else
 			{
 				$pos=strpos($t,chr(0));
-				if($pos!==false)
-					$trns=array($pos);
+				if($pos!==false) {
+									$trns=array($pos);
+				}
 			}
 			$this->_readstream($f,4);
-		}
-		elseif($type=='IDAT')
+		} elseif($type=='IDAT')
 		{
 			//Read image data block
 			$data.=$this->_readstream($f,$n);
 			$this->_readstream($f,4);
+		} elseif($type=='IEND') {
+					break;
+		} else {
+					$this->_readstream($f,$n+4);
 		}
-		elseif($type=='IEND')
-			break;
-		else
-			$this->_readstream($f,$n+4);
 	}
 	while($n);
-	if($colspace=='Indexed' && empty($pal))
-		$this->Error('Missing palette in '.$file);
+	if($colspace=='Indexed' && empty($pal)) {
+			$this->Error('Missing palette in '.$file);
+	}
 	fclose($f);
 	return array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'parms'=>$parms, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);
 }
@@ -1316,13 +1414,15 @@ 
 	while($n>0 && !feof($f))
 	{
 		$s=fread($f,$n);
-		if($s===false)
-			$this->Error('Error while reading stream');
+		if($s===false) {
+					$this->Error('Error while reading stream');
+		}
 		$n-=strlen($s);
 		$res.=$s;
 	}
-	if($n>0)
-		$this->Error('Unexpected end of stream');
+	if($n>0) {
+			$this->Error('Unexpected end of stream');
+	}
 	return $res;
 }
 
@@ -1336,19 +1436,24 @@ 
 function _parsegif($file)
 {
 	//Extract info from a GIF file (via PNG conversion)
-	if(!function_exists('imagepng'))
-		$this->Error('GD extension is required for GIF support');
-	if(!function_exists('imagecreatefromgif'))
-		$this->Error('GD has no GIF read support');
+	if(!function_exists('imagepng')) {
+			$this->Error('GD extension is required for GIF support');
+	}
+	if(!function_exists('imagecreatefromgif')) {
+			$this->Error('GD has no GIF read support');
+	}
 	$im=imagecreatefromgif($file);
-	if(!$im)
-		$this->Error('Missing or incorrect image file: '.$file);
+	if(!$im) {
+			$this->Error('Missing or incorrect image file: '.$file);
+	}
 	imageinterlace($im,0);
 	$tmp=tempnam('.','gif');
-	if(!$tmp)
-		$this->Error('Unable to create a temporary file');
-	if(!imagepng($im,$tmp))
-		$this->Error('Error while saving to temporary file');
+	if(!$tmp) {
+			$this->Error('Unable to create a temporary file');
+	}
+	if(!imagepng($im,$tmp)) {
+			$this->Error('Error while saving to temporary file');
+	}
 	imagedestroy($im);
 	$info=$this->_parsepng($tmp);
 	unlink($tmp);
@@ -1373,11 +1478,12 @@ 
 function _out($s)
 {
 	//Add a line to the document
-	if($this->state==2)
-		$this->pages[$this->page].=$s."\n";
-	else
-		$this->buffer.=$s."\n";
-}
+	if($this->state==2) {
+			$this->pages[$this->page].=$s."\n";
+	} else {
+			$this->buffer.=$s."\n";
+	}
+	}
 
 function _putpages()
 {
@@ -1385,15 +1491,15 @@ 
 	if(!empty($this->AliasNbPages))
 	{
 		//Replace number of pages
-		for($n=1;$n<=$nb;$n++)
-			$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
+		for($n=1;$n<=$nb;$n++) {
+					$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
+		}
 	}
 	if($this->DefOrientation=='P')
 	{
 		$wPt=$this->DefPageFormat[0]*$this->k;
 		$hPt=$this->DefPageFormat[1]*$this->k;
-	}
-	else
+	} else
 	{
 		$wPt=$this->DefPageFormat[1]*$this->k;
 		$hPt=$this->DefPageFormat[0]*$this->k;
@@ -1405,8 +1511,9 @@ 
 		$this->_newobj();
 		$this->_out('<</Type /Page');
 		$this->_out('/Parent 1 0 R');
-		if(isset($this->PageSizes[$n]))
-			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
+		if(isset($this->PageSizes[$n])) {
+					$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
+		}
 		$this->_out('/Resources 2 0 R');
 		if(isset($this->PageLinks[$n]))
 		{
@@ -1416,9 +1523,9 @@ 
 			{
 				$rect=sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
 				$annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-				if(is_string($pl[4]))
-					$annots.='/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
-				else
+				if(is_string($pl[4])) {
+									$annots.='/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
+				} else
 				{
 					$l=$this->links[$pl[4]];
 					$h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
@@ -1441,8 +1548,9 @@ 
 	$this->_out('1 0 obj');
 	$this->_out('<</Type /Pages');
 	$kids='/Kids [';
-	for($i=0;$i<$nb;$i++)
-		$kids.=(3+2*$i).' 0 R ';
+	for($i=0;$i<$nb;$i++) {
+			$kids.=(3+2*$i).' 0 R ';
+	}
 	$this->_out($kids.']');
 	$this->_out('/Count '.$nb);
 	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
@@ -1467,10 +1575,12 @@ 
 		$this->FontFiles[$file]['n']=$this->n;
 		$font='';
 		$f=fopen($this->_getfontpath().$file,'rb',1);
-		if(!$f)
-			$this->Error('Font file not found');
-		while(!feof($f))
-			$font.=fread($f,8192);
+		if(!$f) {
+					$this->Error('Font file not found');
+		}
+		while(!feof($f)) {
+					$font.=fread($f,8192);
+		}
 		fclose($f);
 		$compressed=(substr($file,-2)=='.z');
 		if(!$compressed && isset($info['length2']))
@@ -1488,11 +1598,13 @@ 
 			}
 		}
 		$this->_out('<</Length '.strlen($font));
-		if($compressed)
-			$this->_out('/Filter /FlateDecode');
+		if($compressed) {
+					$this->_out('/Filter /FlateDecode');
+		}
 		$this->_out('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
-			$this->_out('/Length2 '.$info['length2'].' /Length3 0');
+		if(isset($info['length2'])) {
+					$this->_out('/Length2 '.$info['length2'].' /Length3 0');
+		}
 		$this->_out('>>');
 		$this->_putstream($font);
 		$this->_out('endobj');
@@ -1510,12 +1622,12 @@ 
 			$this->_out('<</Type /Font');
 			$this->_out('/BaseFont /'.$name);
 			$this->_out('/Subtype /Type1');
-			if($name!='Symbol' && $name!='ZapfDingbats')
-				$this->_out('/Encoding /WinAnsiEncoding');
+			if($name!='Symbol' && $name!='ZapfDingbats') {
+							$this->_out('/Encoding /WinAnsiEncoding');
+			}
 			$this->_out('>>');
 			$this->_out('endobj');
-		}
-		elseif($type=='Type1' || $type=='TrueType')
+		} elseif($type=='Type1' || $type=='TrueType')
 		{
 			//Additional Type1 or TrueType font
 			$this->_newobj();
@@ -1527,10 +1639,11 @@ 
 			$this->_out('/FontDescriptor '.($this->n+2).' 0 R');
 			if($font['enc'])
 			{
-				if(isset($font['diff']))
-					$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
-				else
-					$this->_out('/Encoding /WinAnsiEncoding');
+				if(isset($font['diff'])) {
+									$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
+				} else {
+									$this->_out('/Encoding /WinAnsiEncoding');
+				}
 			}
 			$this->_out('>>');
 			$this->_out('endobj');
@@ -1538,27 +1651,30 @@ 
 			$this->_newobj();
 			$cw=&$font['cw'];
 			$s='[';
-			for($i=32;$i<=255;$i++)
-				$s.=$cw[chr($i)].' ';
+			for($i=32;$i<=255;$i++) {
+							$s.=$cw[chr($i)].' ';
+			}
 			$this->_out($s.']');
 			$this->_out('endobj');
 			//Descriptor
 			$this->_newobj();
 			$s='<</Type /FontDescriptor /FontName /'.$name;
-			foreach($font['desc'] as $k=>$v)
-				$s.=' /'.$k.' '.$v;
+			foreach($font['desc'] as $k=>$v) {
+							$s.=' /'.$k.' '.$v;
+			}
 			$file=$font['file'];
-			if($file)
-				$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+			if($file) {
+							$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+			}
 			$this->_out($s.'>>');
 			$this->_out('endobj');
-		}
-		else
+		} else
 		{
 			//Allow for additional types
 			$mtd='_put'.strtolower($type);
-			if(!method_exists($this,$mtd))
-				$this->Error('Unsupported font type: '.$type);
+			if(!method_exists($this,$mtd)) {
+							$this->Error('Unsupported font type: '.$type);
+			}
 			$this->$mtd($font);
 		}
 	}
@@ -1576,24 +1692,28 @@ 
 		$this->_out('/Subtype /Image');
 		$this->_out('/Width '.$info['w']);
 		$this->_out('/Height '.$info['h']);
-		if($info['cs']=='Indexed')
-			$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
-		else
+		if($info['cs']=='Indexed') {
+					$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+		} else
 		{
 			$this->_out('/ColorSpace /'.$info['cs']);
-			if($info['cs']=='DeviceCMYK')
-				$this->_out('/Decode [1 0 1 0 1 0 1 0]');
+			if($info['cs']=='DeviceCMYK') {
+							$this->_out('/Decode [1 0 1 0 1 0 1 0]');
+			}
 		}
 		$this->_out('/BitsPerComponent '.$info['bpc']);
-		if(isset($info['f']))
-			$this->_out('/Filter /'.$info['f']);
-		if(isset($info['parms']))
-			$this->_out($info['parms']);
+		if(isset($info['f'])) {
+					$this->_out('/Filter /'.$info['f']);
+		}
+		if(isset($info['parms'])) {
+					$this->_out($info['parms']);
+		}
 		if(isset($info['trns']) && is_array($info['trns']))
 		{
 			$trns='';
-			for($i=0;$i<count($info['trns']);$i++)
-				$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';
+			for($i=0;$i<count($info['trns']);$i++) {
+							$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';
+			}
 			$this->_out('/Mask ['.$trns.']');
 		}
 		$this->_out('/Length '.strlen($info['data']).'>>');
@@ -1614,16 +1734,18 @@ 
 
 function _putxobjectdict()
 {
-	foreach($this->images as $image)
-		$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
-}
+	foreach($this->images as $image) {
+			$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
+	}
+	}
 
 function _putresourcedict()
 {
 	$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
 	$this->_out('/Font <<');
-	foreach($this->fonts as $font)
-		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
+	foreach($this->fonts as $font) {
+			$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
+	}
 	$this->_out('>>');
 	$this->_out('/XObject <<');
 	$this->_putxobjectdict();
@@ -1646,16 +1768,21 @@ 
 function _putinfo()
 {
 	$this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION));
-	if(!empty($this->title))
-		$this->_out('/Title '.$this->_textstring($this->title));
-	if(!empty($this->subject))
-		$this->_out('/Subject '.$this->_textstring($this->subject));
-	if(!empty($this->author))
-		$this->_out('/Author '.$this->_textstring($this->author));
-	if(!empty($this->keywords))
-		$this->_out('/Keywords '.$this->_textstring($this->keywords));
-	if(!empty($this->creator))
-		$this->_out('/Creator '.$this->_textstring($this->creator));
+	if(!empty($this->title)) {
+			$this->_out('/Title '.$this->_textstring($this->title));
+	}
+	if(!empty($this->subject)) {
+			$this->_out('/Subject '.$this->_textstring($this->subject));
+	}
+	if(!empty($this->author)) {
+			$this->_out('/Author '.$this->_textstring($this->author));
+	}
+	if(!empty($this->keywords)) {
+			$this->_out('/Keywords '.$this->_textstring($this->keywords));
+	}
+	if(!empty($this->creator)) {
+			$this->_out('/Creator '.$this->_textstring($this->creator));
+	}
 	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
 }
 
@@ -1663,21 +1790,23 @@ 
 {
 	$this->_out('/Type /Catalog');
 	$this->_out('/Pages 1 0 R');
-	if($this->ZoomMode=='fullpage')
-		$this->_out('/OpenAction [3 0 R /Fit]');
-	elseif($this->ZoomMode=='fullwidth')
-		$this->_out('/OpenAction [3 0 R /FitH null]');
-	elseif($this->ZoomMode=='real')
-		$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
-	elseif(!is_string($this->ZoomMode))
-		$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
-	if($this->LayoutMode=='single')
-		$this->_out('/PageLayout /SinglePage');
-	elseif($this->LayoutMode=='continuous')
-		$this->_out('/PageLayout /OneColumn');
-	elseif($this->LayoutMode=='two')
-		$this->_out('/PageLayout /TwoColumnLeft');
-}
+	if($this->ZoomMode=='fullpage') {
+			$this->_out('/OpenAction [3 0 R /Fit]');
+	} elseif($this->ZoomMode=='fullwidth') {
+			$this->_out('/OpenAction [3 0 R /FitH null]');
+	} elseif($this->ZoomMode=='real') {
+			$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
+	} elseif(!is_string($this->ZoomMode)) {
+			$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
+	}
+	if($this->LayoutMode=='single') {
+			$this->_out('/PageLayout /SinglePage');
+	} elseif($this->LayoutMode=='continuous') {
+			$this->_out('/PageLayout /OneColumn');
+	} elseif($this->LayoutMode=='two') {
+			$this->_out('/PageLayout /TwoColumnLeft');
+	}
+	}
 
 function _putheader()
 {
@@ -1713,8 +1842,9 @@ 
 	$this->_out('xref');
 	$this->_out('0 '.($this->n+1));
 	$this->_out('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
-		$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	for($i=1;$i<=$this->n;$i++) {
+			$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	}
 	//Trailer
 	$this->_out('trailer');
 	$this->_out('<<');

includes/librairies/pdf/fpdf_extends.class.php

Doc Comments +12 added lines

@@ -57,6 +57,10 @@ 
 	}
 
 	// Cr�ation r�cursive de dossiers
+
+	/**
+	 * @param string $path
+	 */
 	function make_recursiv_dir($path, $rights = 0777) {
 		if (!@is_dir($path)) {
 			$folder_path = array($path);
@@ -313,6 +317,11 @@ 
 	}
 
 	// Affiche un ligne de la facture
+
+	/**
+	 * @param integer[] $dim_array
+	 * @param string $currency
+	 */
 	function row($row, $dim_array, $currency) {
 
 		// S�curit�
@@ -336,6 +345,9 @@ 
 		$this->Ln();
 	}
 
+	/**
+	 * @param string $currency
+	 */
 	function total($order_id, $currency, $invoice_id = null) {
 
 		/* Donn�es commande */

Spacing +108 added lines, -108 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'));
 }
 
 DEFINE('EUR', chr(128)); // Sigle �
@@ -21,7 +21,7 @@ 
 
 	function WordWrap(&$text, $maxwidth) {
 		$text = trim($text);
-		if ($text==='')
+		if ($text === '')
 			return 0;
 		$space = $this->GetStringWidth(' ');
 		$lines = explode("\n", $text);
@@ -39,16 +39,16 @@ 
 				if ($width + $wordwidth <= $maxwidth)
 				{
 					$width += $wordwidth + $space;
-					$text .= $word.' ';
+					$text .= $word . ' ';
 				}
 				else
 				{
 					$width = $wordwidth + $space;
-					$text = rtrim($text)."\n".$word.' ';
+					$text = rtrim($text) . "\n" . $word . ' ';
 					$count++;
 				}
 			}
-			$text = rtrim($text)."\n";
+			$text = rtrim($text) . "\n";
 			$count++;
 		}
 		$text = rtrim($text);
@@ -65,28 +65,28 @@ 
 			return;
 		}
 
-		while(!@is_dir(dirname(end($folder_path))) && dirname(end($folder_path)) != '/' && dirname(end($folder_path)) != '.' && dirname(end($folder_path)) != '') {
+		while (!@is_dir(dirname(end($folder_path))) && dirname(end($folder_path)) != '/' && dirname(end($folder_path)) != '.' && dirname(end($folder_path)) != '') {
 			array_push($folder_path, dirname(end($folder_path)));
 		}
 
-		while($parent_folder_path = array_pop($folder_path)) {
-			if(!@mkdir($parent_folder_path, $rights)) {
+		while ($parent_folder_path = array_pop($folder_path)) {
+			if (!@mkdir($parent_folder_path, $rights)) {
 				user_error("Can't create folder \"$parent_folder_path\".\n");
 			}
 		}
 	}
 
-	function invoice_export( $order_id, $invoice_id = null ) {
+	function invoice_export($order_id, $invoice_id = null) {
 
 		$current_user_id = get_current_user_id();
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 
-		if($order['customer_id']==$current_user_id OR is_admin()) {
+		if ($order['customer_id'] == $current_user_id OR is_admin()) {
 
 			if (in_array($order['order_status'], array('completed', 'shipped', 'partially_paid'))) {
 				$invoice_dir = WP_CONTENT_DIR . "/uploads/wpshop_invoices/";
 				$filename = $this->get_invoice_filename($order_id);
-				$invoice_url = $invoice_dir.$filename;
+				$invoice_url = $invoice_dir . $filename;
 
 				// If the invoice has not been already generated
 // 				if ( !file_exists($invoice_url) ) {
@@ -94,15 +94,15 @@ 
 
 					// Currency management
 					$currency = $order['order_currency'];
-					if($currency == 'EUR')$currency = EUR;
-					else $currency = html_entity_decode( wpshop_tools::wpshop_get_sigle($currency) );
+					if ($currency == 'EUR')$currency = EUR;
+					else $currency = html_entity_decode(wpshop_tools::wpshop_get_sigle($currency));
 
 					// On d�finit un alias pour le nombre de pages total
 					$this->AliasNbPages();
 					// On ajoute une page au document
 					$this->AddPage();
 					// On lui applique une police
-					$this->SetFont('Arial','',10);
+					$this->SetFont('Arial', '', 10);
 					// Coordonn�es magasin
 					$this->store_head($order_id);
 					// Coordonn�es client
@@ -125,14 +125,14 @@ 
 					$path = $invoice_url;
 					$this->Output($path, "F");
 					// On force le t�l�chargement de la facture
-					$Fichier_a_telecharger = $refdate.".pdf";
+					$Fichier_a_telecharger = $refdate . ".pdf";
 					$this->forceDownload($Fichier_a_telecharger, $path, filesize($path));
 // 				}
 // 				else $this->forceDownload($filename, $invoice_url, filesize($invoice_url));
 			}
-			else echo __('The payment regarding the invoice you requested isn\'t completed','wpshop');
+			else echo __('The payment regarding the invoice you requested isn\'t completed', 'wpshop');
 		}
-		else echo __('You don\'t have the rights to access this invoice.','wpshop');
+		else echo __('You don\'t have the rights to access this invoice.', 'wpshop');
 	}
 
 	/** Force le t�l�chargement d'un fichier */
@@ -157,13 +157,13 @@ 
 		$emails = get_option('wpshop_emails', array());
 
 		//Positionnement
-		$this->SetY(55);$this->SetX(12);
+		$this->SetY(55); $this->SetX(12);
 		// Cadre client destinataire
 		$this->rect(10, 52, 80, 40);
 
 		$xsize = 80;
 
-		if(!empty($company) && !empty($emails)) {
+		if (!empty($company) && !empty($emails)) {
 			// Infos
 			$store_name = utf8_decode(utf8_encode($company['company_name']));
 			$store_email = !empty($emails['contact_email']) ? $emails['contact_email'] : null;
@@ -176,19 +176,19 @@ 
 			$store_country = utf8_decode(utf8_encode($company['company_country']));
 
 			// Gras pour le titre
-			$this->SetFont('','B',10);
-			$this->Cell($xsize,5,$store_name,0,1,'L'); $this->SetX(12);
+			$this->SetFont('', 'B', 10);
+			$this->Cell($xsize, 5, $store_name, 0, 1, 'L'); $this->SetX(12);
 			// Police normale pour le reste
-			$this->SetFont('','',9);
-			$this->Cell($xsize,4,$store_street_adress,0,1,'L'); $this->SetX(12);
-			if (!empty($store_suburb)){$this->Cell(80,4,$store_suburb,0,1,'L');} $this->SetX(12);
-			$this->Cell($xsize,4,$store_postcode . ' ' . $store_city,0,1,'L'); $this->SetX(12);
+			$this->SetFont('', '', 9);
+			$this->Cell($xsize, 4, $store_street_adress, 0, 1, 'L'); $this->SetX(12);
+			if (!empty($store_suburb)) {$this->Cell(80, 4, $store_suburb, 0, 1, 'L'); } $this->SetX(12);
+			$this->Cell($xsize, 4, $store_postcode . ' ' . $store_city, 0, 1, 'L'); $this->SetX(12);
 			//if ($store_state != ''){$this->Cell(80,4,$store_state,0,1,'L');} $this->SetX(12);
-			$this->Cell($xsize,4,$store_country,0,1,'L'); $this->SetX(12);
-			$this->Cell($xsize,4,$store_email,0,1,'L'); $this->SetX(12);
+			$this->Cell($xsize, 4, $store_country, 0, 1, 'L'); $this->SetX(12);
+			$this->Cell($xsize, 4, $store_email, 0, 1, 'L'); $this->SetX(12);
 		}
 		else {
-			$this->Cell($xsize,5,_('Nc','wpshop'),0,1,'L');
+			$this->Cell($xsize, 5, _('Nc', 'wpshop'), 0, 1, 'L');
 		}
 	}
 
@@ -198,16 +198,16 @@ 
 		$customer_data = $customer_data['billing']['address'];
 
 		// FPDF ne d�codant pas l'UTF-8, on le fait via PHP
-		$customer_firstname = ( !empty($customer_data['address_first_name']) ) ? utf8_decode(utf8_encode($customer_data['address_first_name'])) : null;
-		$customer_lastname = ( !empty($customer_data['address_last_name']) ) ? utf8_decode(utf8_encode($customer_data['address_last_name'])) : null;
-		$customer_company = ( !empty($customer_data['company']) ) ? utf8_decode(utf8_encode($customer_data['company'])) : null;
-		$customer_street_adress = ( !empty($customer_data['address']) ) ? utf8_decode(utf8_encode($customer_data['address'])) : null;
-		$customer_city = ( !empty($customer_data['city']) ) ? utf8_decode(utf8_encode($customer_data['city'])) : null;
-		$customer_postcode = ( !empty($customer_data['postcode']) ) ? utf8_decode(utf8_encode($customer_data['postcode'])) : null;
-		$customer_state = ( !empty($customer_data['state']) ) ? utf8_decode(utf8_encode($customer_data['state'])) : null;
-		$customer_country = ( !empty($customer_data['country']) ) ? utf8_decode(utf8_encode($customer_data['country'])) : null;
+		$customer_firstname = (!empty($customer_data['address_first_name'])) ? utf8_decode(utf8_encode($customer_data['address_first_name'])) : null;
+		$customer_lastname = (!empty($customer_data['address_last_name'])) ? utf8_decode(utf8_encode($customer_data['address_last_name'])) : null;
+		$customer_company = (!empty($customer_data['company'])) ? utf8_decode(utf8_encode($customer_data['company'])) : null;
+		$customer_street_adress = (!empty($customer_data['address'])) ? utf8_decode(utf8_encode($customer_data['address'])) : null;
+		$customer_city = (!empty($customer_data['city'])) ? utf8_decode(utf8_encode($customer_data['city'])) : null;
+		$customer_postcode = (!empty($customer_data['postcode'])) ? utf8_decode(utf8_encode($customer_data['postcode'])) : null;
+		$customer_state = (!empty($customer_data['state'])) ? utf8_decode(utf8_encode($customer_data['state'])) : null;
+		$customer_country = (!empty($customer_data['country'])) ? utf8_decode(utf8_encode($customer_data['country'])) : null;
 
-		$customer_tva_intra = ( !empty($customer_data['company_tva_intra']) ) ? utf8_decode(utf8_encode($customer_data['company_tva_intra'])) : null;
+		$customer_tva_intra = (!empty($customer_data['company_tva_intra'])) ? utf8_decode(utf8_encode($customer_data['company_tva_intra'])) : null;
 
 		$xsize = 80;
 
@@ -219,16 +219,16 @@ 
 		// Et on �cris
 		// On r�gle la police d'�criture
 		// gras pour le titre
-		$this->SetFont('','B',10);
-		$this->Cell($xsize,5,$customer_lastname.' '.$customer_firstname.(!empty($customer_company)?', '.$customer_company:null),0,1,'L'); $this->SetX(102);
+		$this->SetFont('', 'B', 10);
+		$this->Cell($xsize, 5, $customer_lastname . ' ' . $customer_firstname . (!empty($customer_company) ? ', ' . $customer_company : null), 0, 1, 'L'); $this->SetX(102);
 		// Police normale pour le reste
-		$this->SetFont('','',9);
-		$this->Cell($xsize,4,$customer_street_adress,0,1,'L'); $this->SetX(102);
-		if (!empty($customer_suburb)){$this->Cell($xsize,4,$customer_suburb,0,1,'L');} $this->SetX(102);
-		$this->Cell($xsize,4,$customer_postcode . ' ' . $customer_city,0,1,'L'); $this->SetX(102);
-		if ($customer_state != ''){$this->Cell($xsize,4,$customer_state,0,1,'L');} $this->SetX(102);
-		$this->Cell($xsize,4,$customer_country . ' ',0,1,'L'); $this->SetX(102);
-		if ($customer_tva_intra != ''){$this->Cell($xsize,4,__('TVA Intracommunautaire','wpshop').' : '.$customer_tva_intra,0,1,'L');}
+		$this->SetFont('', '', 9);
+		$this->Cell($xsize, 4, $customer_street_adress, 0, 1, 'L'); $this->SetX(102);
+		if (!empty($customer_suburb)) {$this->Cell($xsize, 4, $customer_suburb, 0, 1, 'L'); } $this->SetX(102);
+		$this->Cell($xsize, 4, $customer_postcode . ' ' . $customer_city, 0, 1, 'L'); $this->SetX(102);
+		if ($customer_state != '') {$this->Cell($xsize, 4, $customer_state, 0, 1, 'L'); } $this->SetX(102);
+		$this->Cell($xsize, 4, $customer_country . ' ', 0, 1, 'L'); $this->SetX(102);
+		if ($customer_tva_intra != '') {$this->Cell($xsize, 4, __('TVA Intracommunautaire', 'wpshop') . ' : ' . $customer_tva_intra, 0, 1, 'L'); }
 	}
 
 	// R�f�rence et date de facturation
@@ -238,34 +238,34 @@ 
 		// On r�cup�re la r�f�rence
 		//$invoice_ref = 'FA'.date('ym').'-0001';
 		// On r�cup�re la date de facturation
-		$invoice_add_date = substr($order['order_date'],0,10);
+		$invoice_add_date = substr($order['order_date'], 0, 10);
 		// On r�cup�re la date d'�ch�ance
 		//$invoice_max_date = '';
 
 		// Positionnement
-		$this->SetY(25); $this->SetX(135); $this->SetFont('','B',14);
-		$this->Cell(50, 5, utf8_decode(__( 'Ref. : ', 'wpshop' )) . $invoice_ref,0,1,'L');
+		$this->SetY(25); $this->SetX(135); $this->SetFont('', 'B', 14);
+		$this->Cell(50, 5, utf8_decode(__('Ref. : ', 'wpshop')) . $invoice_ref, 0, 1, 'L');
 		// Positionnement
-		$this->SetX(135); $this->SetFont('','',9);
-		$this->Cell(50, 4, utf8_decode(__( 'Billing date : ', 'wpshop' )) . $invoice_add_date,0,1,'L');
+		$this->SetX(135); $this->SetFont('', '', 9);
+		$this->Cell(50, 4, utf8_decode(__('Billing date : ', 'wpshop')) . $invoice_add_date, 0, 1, 'L');
 
-		$this->SetX(135); $this->SetFont('','',9);
-		$this->Cell(50, 4, utf8_decode(__( 'Payment method : ', 'wpshop' )) . utf8_decode(wpshop_payment::get_payment_method($order_id)), 0, 1, 'L');
+		$this->SetX(135); $this->SetFont('', '', 9);
+		$this->Cell(50, 4, utf8_decode(__('Payment method : ', 'wpshop')) . utf8_decode(wpshop_payment::get_payment_method($order_id)), 0, 1, 'L');
 
-		$this->SetX(135); $this->SetFont('','',9);
-		$this->Cell(50, 4, utf8_decode(__( 'Transaction id : ', 'wpshop' )) . wpshop_payment::get_payment_transaction_number($order_id), 0, 1, 'L');
+		$this->SetX(135); $this->SetFont('', '', 9);
+		$this->Cell(50, 4, utf8_decode(__('Transaction id : ', 'wpshop')) . wpshop_payment::get_payment_transaction_number($order_id), 0, 1, 'L');
 
 		//$this->SetX(135);
 		//$this->Cell(50, 4, utf8_decode(__( 'Date d\'�ch�ance : ', 'wpshop' )) . $invoice_max_date,0,1,'L');
 
-		return $invoice_ref.'_'.$invoice_add_date;
+		return $invoice_ref . '_' . $invoice_add_date;
 	}
 
 	function get_invoice_filename($order_id) {
 		$order = get_post_meta($order_id, '_order_postmeta', true);
-		$invoice_add_date = substr($order['order_date'],0,10);
+		$invoice_add_date = substr($order['order_date'], 0, 10);
 		$order_invoice_ref = $order['order_invoice_ref'];
-		return $order_invoice_ref.'_'.$invoice_add_date.'.pdf';
+		return $order_invoice_ref . '_' . $invoice_add_date . '.pdf';
 	}
 
 	/**
@@ -275,13 +275,13 @@ 
 	 * @param integer $invoice_id Optionnal An invoice ID, this parameter could be used to call an invoice for a partial payment
 	 */
 	function rows($order_id, $currency, $invoice_id = null) {
-		$title_ref = utf8_decode(__( 'Reference', 'wpshop' ));
-		$title_name = utf8_decode(__( 'Designation', 'wpshop' ));
-		$title_qty = utf8_decode(__( 'Qty', 'wpshop' ));
-		$title_baseprice = utf8_decode(__( 'PU HT', 'wpshop' ));
-		$title_discount = utf8_decode(__( 'Discount', 'wpshop' ));
-		$title_tax = utf8_decode(__( 'TVA (Tax)', 'wpshop' ));
-		$title_price = utf8_decode(__( 'Total ET', 'wpshop' ));
+		$title_ref = utf8_decode(__('Reference', 'wpshop'));
+		$title_name = utf8_decode(__('Designation', 'wpshop'));
+		$title_qty = utf8_decode(__('Qty', 'wpshop'));
+		$title_baseprice = utf8_decode(__('PU HT', 'wpshop'));
+		$title_discount = utf8_decode(__('Discount', 'wpshop'));
+		$title_tax = utf8_decode(__('TVA (Tax)', 'wpshop'));
+		$title_price = utf8_decode(__('Total ET', 'wpshop'));
 
 		/**	Set title for invoice line table	*/
 		$header = array($title_ref, $title_name, $title_qty, $title_baseprice, $title_discount, $title_tax, $title_price);
@@ -289,23 +289,23 @@ 
 		/**	Set column size	*/
 		$w = array(26, 75, 10, 15, 15, 30, 20);
 
-		$this->setXY(10,100);
-		for($i=0;$i<count($header);$i++) {
-			$this->Cell($w[$i],5,$header[$i],1,0,'C');
+		$this->setXY(10, 100);
+		for ($i = 0; $i < count($header); $i++) {
+			$this->Cell($w[$i], 5, $header[$i], 1, 0, 'C');
 		}
 		$this->Ln();
 
 		/**	Get the order content	*/
 		$order_data = get_post_meta($order_id, '_order_postmeta', true);
-		if ( in_array($order_data['order_status'], array('completed', 'shipped') ) ) {
+		if (in_array($order_data['order_status'], array('completed', 'shipped'))) {
 			/**	Foreach item in order: add a row to invoice	*/
 			foreach ($order_data['order_items'] as $o) {
 				$this->row($o, $w, $currency);
 			}
 		}
-		else if (in_array($order_data['order_status'], array('partially_paid')) && !empty($order_data['order_payment']) && !empty($order_data['order_payment']['received']) ) {
-			foreach ( $order_data['order_payment']['received'] as $payment_info ) {
-				if ( !is_array($payment_info) ) {
+		else if (in_array($order_data['order_status'], array('partially_paid')) && !empty($order_data['order_payment']) && !empty($order_data['order_payment']['received'])) {
+			foreach ($order_data['order_payment']['received'] as $payment_info) {
+				if (!is_array($payment_info)) {
 
 				}
 			}
@@ -326,13 +326,13 @@ 
 		$total_ht = !empty($row['item_total_ht']) ? $row['item_total_ht'] : 'Nc';
 
 		// On affiche les valeurs
-		$this->Cell($dim_array[0],8,$product_reference,'LRB',0,'C');
-		$this->Cell($dim_array[1],8,$product_name,'LRB',0,'L');
-		$this->Cell($dim_array[2],8,$qty_invoiced,'LRB',0,'C');
-		$this->Cell($dim_array[3],8,number_format($item_pu_ht,2,'.',' ').' '.$currency,'LRB',0,'C');
-		$this->Cell($dim_array[4],8,number_format($discount_amount,2,'.',' ').' '.$currency,'LRB',0,'C');
-		$this->Cell($dim_array[5],8,number_format($item_tva_total_amount,2,'.',' ').' '.$currency.' (' . round($tax_rate, 2) . '%)','LRB',0,'C');
-		$this->Cell($dim_array[6],8,number_format($total_ht,2,'.',' ').' '.$currency,'LRB',0,'C');
+		$this->Cell($dim_array[0], 8, $product_reference, 'LRB', 0, 'C');
+		$this->Cell($dim_array[1], 8, $product_name, 'LRB', 0, 'L');
+		$this->Cell($dim_array[2], 8, $qty_invoiced, 'LRB', 0, 'C');
+		$this->Cell($dim_array[3], 8, number_format($item_pu_ht, 2, '.', ' ') . ' ' . $currency, 'LRB', 0, 'C');
+		$this->Cell($dim_array[4], 8, number_format($discount_amount, 2, '.', ' ') . ' ' . $currency, 'LRB', 0, 'C');
+		$this->Cell($dim_array[5], 8, number_format($item_tva_total_amount, 2, '.', ' ') . ' ' . $currency . ' (' . round($tax_rate, 2) . '%)', 'LRB', 0, 'C');
+		$this->Cell($dim_array[6], 8, number_format($total_ht, 2, '.', ' ') . ' ' . $currency, 'LRB', 0, 'C');
 		$this->Ln();
 	}
 
@@ -344,30 +344,30 @@ 
 		// D�calage
 		$this->Ln();
 
-		$this->Cell(105,10);
-		$this->Cell(50,8,__('Total ET','wpshop'),1);
-		$this->Cell(35,8,number_format($order['order_total_ht'],2,'.',' ') . ' ' . $currency,1,0,'C'); $this->Ln();
+		$this->Cell(105, 10);
+		$this->Cell(50, 8, __('Total ET', 'wpshop'), 1);
+		$this->Cell(35, 8, number_format($order['order_total_ht'], 2, '.', ' ') . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 
-		foreach($order['order_tva'] as $k => $v) {
-			$this->Cell(105,10);
-			$this->Cell(50,8,__('Tax','wpshop').' '.$k.'%',1); $this->Cell(35,8,number_format($v,2,'.',' ') . ' ' . $currency,1,0,'C'); $this->Ln();
+		foreach ($order['order_tva'] as $k => $v) {
+			$this->Cell(105, 10);
+			$this->Cell(50, 8, __('Tax', 'wpshop') . ' ' . $k . '%', 1); $this->Cell(35, 8, number_format($v, 2, '.', ' ') . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 		}
 
-		$this->Cell(105,10);
-		$this->Cell(50,8,__('Shipping','wpshop'),1); $this->Cell(35,8,number_format($order['order_shipping_cost'],2,'.',' ') . ' ' . $currency,1,0,'C'); $this->Ln();
+		$this->Cell(105, 10);
+		$this->Cell(50, 8, __('Shipping', 'wpshop'), 1); $this->Cell(35, 8, number_format($order['order_shipping_cost'], 2, '.', ' ') . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 
-		if(!empty($order['order_grand_total_before_discount']) && $order['order_grand_total_before_discount'] != $order['order_grand_total']){
-			$this->Cell(105,10);
-			$this->Cell(50,8,utf8_decode(__('Total ATI before discount','wpshop')),1);
-			$this->Cell(35,8,number_format($order['order_grand_total_before_discount'],2).' '.$currency,1,0,'C'); $this->Ln();
+		if (!empty($order['order_grand_total_before_discount']) && $order['order_grand_total_before_discount'] != $order['order_grand_total']) {
+			$this->Cell(105, 10);
+			$this->Cell(50, 8, utf8_decode(__('Total ATI before discount', 'wpshop')), 1);
+			$this->Cell(35, 8, number_format($order['order_grand_total_before_discount'], 2) . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 
-			$this->Cell(105,10);
-			$this->Cell(50,8,__('Discount','wpshop'),1);
-			$this->Cell(35,8,'-'.number_format($order['order_discount_amount_total_cart'],2).' '.$currency,1,0,'C'); $this->Ln();
+			$this->Cell(105, 10);
+			$this->Cell(50, 8, __('Discount', 'wpshop'), 1);
+			$this->Cell(35, 8, '-' . number_format($order['order_discount_amount_total_cart'], 2) . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 		}
 
-		$this->Cell(105,10);
-		$this->Cell(50,8,__('Total ATI','wpshop'),1); $this->SetFont('','B',10); $this->Cell(35,8,number_format($order['order_grand_total'],2,'.',' ') . ' ' . $currency,1,0,'C'); $this->Ln();
+		$this->Cell(105, 10);
+		$this->Cell(50, 8, __('Total ATI', 'wpshop'), 1); $this->SetFont('', 'B', 10); $this->Cell(35, 8, number_format($order['order_grand_total'], 2, '.', ' ') . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 	}
 
 	function rib($store_number)
@@ -414,25 +414,25 @@ 
 		$tva_intra = $store['company_tva_intra'];
 		$currency = wpshop_tools::wpshop_get_currency(true);
 
-		$this->SetFont('','',10);
-		$this->SetXY(10,-50);
+		$this->SetFont('', '', 10);
+		$this->SetXY(10, -50);
 
-		if(isset($store['company_member_of_a_approved_management_center']) && $store['company_member_of_a_approved_management_center']) {
-			$this->MultiCell(190,4,utf8_decode(__('Member of an approved management center, accepting as such payments by check.', 'wpshop')),0,'L',FALSE);
+		if (isset($store['company_member_of_a_approved_management_center']) && $store['company_member_of_a_approved_management_center']) {
+			$this->MultiCell(190, 4, utf8_decode(__('Member of an approved management center, accepting as such payments by check.', 'wpshop')), 0, 'L', FALSE);
 			$this->Ln();
 		}
-		$this->MultiCell(190,4,utf8_decode(__('Law 83-629 of 07.12.83, Art. 8: "The administrative authorization does not confer any official character to the company or persons who benefit. It is in no way the responsibility of government."', 'wpshop')),0,'L',FALSE);
+		$this->MultiCell(190, 4, utf8_decode(__('Law 83-629 of 07.12.83, Art. 8: "The administrative authorization does not confer any official character to the company or persons who benefit. It is in no way the responsibility of government."', 'wpshop')), 0, 'L', FALSE);
 		$this->Ln();
-		$this->MultiCell(190,4,utf8_decode($store_name.', '.$society_type.__(' capital of ', 'wpshop').$society_capital.' '.$currency.'. SIRET : '.$siret.'. TVA Intracommunautaire : '.$tva_intra),0,'L',FALSE);
+		$this->MultiCell(190, 4, utf8_decode($store_name . ', ' . $society_type . __(' capital of ', 'wpshop') . $society_capital . ' ' . $currency . '. SIRET : ' . $siret . '. TVA Intracommunautaire : ' . $tva_intra), 0, 'L', FALSE);
 	}
 
 	//En-t�te
 	function Header( ) {
-		$this->SetFont('Arial','B',15);
+		$this->SetFont('Arial', 'B', 15);
 		//D�calage � droite
 		$this->Cell(70);
 		//Titre
-		$this->Cell(30,10,'FACTURE',0,0,'L');
+		$this->Cell(30, 10, 'FACTURE', 0, 0, 'L');
 	}
 
 	//Pied de page
@@ -440,9 +440,9 @@ 
 		//Positionnement � 1,5 cm du bas
 		$this->SetY(-15);
 		//Police Arial italique 8
-		$this->SetFont('Arial','I',8);
+		$this->SetFont('Arial', 'I', 8);
 		//Num�ro de page
-		$this->Cell(0,10,$this->PageNo() . '/{nb}',0,0,'C');
+		$this->Cell(0, 10, $this->PageNo() . '/{nb}', 0, 0, 'C');
 	}
 }
 

Braces +19 added lines, -15 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' ) ) {
@@ -21,8 +23,9 @@ 
 
 	function WordWrap(&$text, $maxwidth) {
 		$text = trim($text);
-		if ($text==='')
-			return 0;
+		if ($text==='') {
+					return 0;
+		}
 		$space = $this->GetStringWidth(' ');
 		$lines = explode("\n", $text);
 		$text = '';
@@ -40,8 +43,7 @@ 
 				{
 					$width += $wordwidth + $space;
 					$text .= $word.' ';
-				}
-				else
+				} else
 				{
 					$width = $wordwidth + $space;
 					$text = rtrim($text)."\n".$word.' ';
@@ -60,8 +62,7 @@ 
 	function make_recursiv_dir($path, $rights = 0777) {
 		if (!@is_dir($path)) {
 			$folder_path = array($path);
-		}
-		else {
+		} else {
 			return;
 		}
 
@@ -94,8 +95,11 @@ 
 
 					// Currency management
 					$currency = $order['order_currency'];
-					if($currency == 'EUR')$currency = EUR;
-					else $currency = html_entity_decode( wpshop_tools::wpshop_get_sigle($currency) );
+					if($currency == 'EUR') {
+						$currency = EUR;
+					} else {
+						$currency = html_entity_decode( wpshop_tools::wpshop_get_sigle($currency) );
+					}
 
 					// On d�finit un alias pour le nombre de pages total
 					$this->AliasNbPages();
@@ -129,10 +133,12 @@ 
 					$this->forceDownload($Fichier_a_telecharger, $path, filesize($path));
 // 				}
 // 				else $this->forceDownload($filename, $invoice_url, filesize($invoice_url));
+			} else {
+				echo __('The payment regarding the invoice you requested isn\'t completed','wpshop');
 			}
-			else echo __('The payment regarding the invoice you requested isn\'t completed','wpshop');
+		} else {
+			echo __('You don\'t have the rights to access this invoice.','wpshop');
 		}
-		else echo __('You don\'t have the rights to access this invoice.','wpshop');
 	}
 
 	/** Force le t�l�chargement d'un fichier */
@@ -186,8 +192,7 @@ 
 			//if ($store_state != ''){$this->Cell(80,4,$store_state,0,1,'L');} $this->SetX(12);
 			$this->Cell($xsize,4,$store_country,0,1,'L'); $this->SetX(12);
 			$this->Cell($xsize,4,$store_email,0,1,'L'); $this->SetX(12);
-		}
-		else {
+		} else {
 			$this->Cell($xsize,5,_('Nc','wpshop'),0,1,'L');
 		}
 	}
@@ -302,8 +307,7 @@ 
 			foreach ($order_data['order_items'] as $o) {
 				$this->row($o, $w, $currency);
 			}
-		}
-		else if (in_array($order_data['order_status'], array('partially_paid')) && !empty($order_data['order_payment']) && !empty($order_data['order_payment']['received']) ) {
+		} else if (in_array($order_data['order_status'], array('partially_paid')) && !empty($order_data['order_payment']) && !empty($order_data['order_payment']['received']) ) {
 			foreach ( $order_data['order_payment']['received'] as $payment_info ) {
 				if ( !is_array($payment_info) ) {
 

includes/librairies/purchase/checkout.class.php

Doc Comments +4 added lines

@@ -260,6 +260,10 @@
 		}
 	}
 
+	/**
+	 * @param string $token
+	 * @param string $login
+	 */
 	public static function direct_payment_link( $token, $order_id, $login ) {
 
 		global $wpdb;

Indentation +2 added lines, -2 removed lines

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

Braces +15 added lines, -14 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -58,12 +60,13 @@ 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
 						update_post_meta($order_id, '_wpshop_order_customer_id', $user_id);
+					} else {
+						$wpshop->add_error(__('You don\'t own the order', 'wpshop'));
 					}
-					else $wpshop->add_error(__('You don\'t own the order', 'wpshop'));
+				} else {
+					$wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 				}
-				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
-			}
-			else{
+			} else{
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
 					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
@@ -106,7 +109,9 @@ 
 
 				}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if(!empty($download_codes)) {
+					update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				}
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -128,8 +133,7 @@ 
 				// Si c'est un devis
 				if ( $paymentMethod == 'quotation' ) {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
-				}
-				else {
+				} else {
 					$order['order_key'] = wpshop_orders::get_new_order_reference();
 				}
 
@@ -190,8 +194,7 @@ 
 
 				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
-				}
-				else {
+				} else {
 					$email_option = get_option( 'wpshop_emails' );
 					if ( empty($email_option['send_confirmation_order_message']) ) {
 						$payment_method_option = get_option( 'wps_payment_mode' );
@@ -245,8 +248,7 @@ 
 
 			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
-			}
-			else {
+			} else {
 				$message_type = 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE';
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}
@@ -288,8 +290,7 @@ 
 				$_SESSION['order_id'] = $order_id;
 				$wpdb->update($wpdb->users, array('user_activation_key' => ''), array('user_login' => $login) );
 				wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ) );
-			}
-			else {
+			} else {
 				wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_myaccount_page_id') ) ) );
 			}
 

Spacing +75 added lines, -75 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -25,11 +25,11 @@ 
 	/** Constructor of the class
 	* @return void
 	*/
-	function __construct () {
+	function __construct() {
 	}
 
 
-	public static function process_checkout($paymentMethod='paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
+	public static function process_checkout($paymentMethod = 'paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
 
 		global $wpdb, $wpshop, $wpshop_cart;
 		$wps_message = new wps_message_ctr();
@@ -38,22 +38,22 @@ 
 		if (is_user_logged_in()) :
 			$user_id = get_current_user_id();
 
-		if ( $customer_id != 0 ) {
+		if ($customer_id != 0) {
 			$user_id = $customer_id;
 		}
 
 			// If the order is already created in the db
-			if(!empty($order_id) && is_numeric($order_id)) {
+			if (!empty($order_id) && is_numeric($order_id)) {
 				$order = get_post_meta($order_id, '_order_postmeta', true);
 
-				if(!empty($order)) {
-					if($order['customer_id'] == $user_id) {
+				if (!empty($order)) {
+					if ($order['customer_id'] == $user_id) {
 						$order['payment_method'] = $paymentMethod;
-						$_SESSION['order_id'] = wpshop_tools::varSanitizer( $order_id );
+						$_SESSION['order_id'] = wpshop_tools::varSanitizer($order_id);
 						// Store cart in session
 						//wpshop_cart::store_cart_in_session($order);
 						// Add a payment
-						$order['order_payment']['received'][] = array( 'method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id() );
+						$order['order_payment']['received'][] = array('method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id());
 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
@@ -63,12 +63,12 @@ 
 				}
 				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 			}
-			else{
+			else {
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
+					'post_title' => sprintf(__('Order - %s', 'wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
 					'post_status' => 'publish',
-					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field( $_POST['wps-customer-comment'] ) : '',
+					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field($_POST['wps-customer-comment']) : '',
 					'post_author' => $user_id,
 					'comment_status' => 'closed'
 				);
@@ -78,7 +78,7 @@ 
 				$order_tva = array();
 
 				//$cart = (array)$wpshop_cart->cart;
-				if ( !empty($_SESSION['cart']) && !empty( $_SESSION['cart']['shipping_method']) ) {
+				if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['shipping_method'])) {
 					$_SESSION['cart']['shipping_method'] = __('Standard shipping method', 'wpshop');
 				}
 				$cart = (array)$_SESSION['cart'];
@@ -90,23 +90,23 @@ 
 				$_SESSION['order_id'] = $order_id;
 
 				// Cr�ation des codes de t�l�chargement si il y a des produits t�l�chargeable dans le panier
-				if ( !empty( $cart['order_items']  ) ) {
-				foreach($cart['order_items'] as $c) {
+				if (!empty($cart['order_items'])) {
+				foreach ($cart['order_items'] as $c) {
 					$product = wpshop_products::get_product_data($c['item_id']);
 					/** Check if it's a variation and check the parent product **/
-					if ( get_post_type( $c['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-						$parent_def = wpshop_products::get_parent_variation( $c['item_id'] );
-						if ( !empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_']) ) {
+					if (get_post_type($c['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+						$parent_def = wpshop_products::get_parent_variation($c['item_id']);
+						if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_'])) {
 							$product['is_downloadable_'] = $parent_def['parent_post_meta']['is_downloadable_'];
 						}
 					}
-					if(!empty($product['is_downloadable_'])) {
+					if (!empty($product['is_downloadable_'])) {
 						$download_codes[$c['item_id']] = array('item_id' => $c['item_id'], 'download_code' => uniqid('', true));
 					}
 
 				}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if (!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_' . $order_id, $download_codes);
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -121,12 +121,12 @@ 
 					'order_payment' 		=> array(
 					'customer_choice' 		=> array('method' => $paymentMethod),
 					'received'				=> array('0' => array('method' => $paymentMethod, 'waited_amount' => $cart['order_amount_to_pay_now'], 'status' =>  'waiting_payment', 'author' => $user_id)),
-					'shipping_method'       => ( ( !empty( $_SESSION['shipping_method']) ) ? wpshop_tools::varSanitizer( $_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop') )
+					'shipping_method'       => ((!empty($_SESSION['shipping_method'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop'))
 					),
 				), $cart);
 
 				// Si c'est un devis
-				if ( $paymentMethod == 'quotation' ) {
+				if ($paymentMethod == 'quotation') {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
 				}
 				else {
@@ -134,9 +134,9 @@ 
 				}
 
 				//Round final amount
-				$order['order_grand_total'] = number_format( round($order['order_grand_total'], 2), 2, '.', '');
-				$order['order_total_ttc'] = number_format( round($order['order_total_ttc'], 2), 2, '.', '');
-				$order['order_amount_to_pay_now'] = number_format( round($order['order_amount_to_pay_now'], 2), 2, '.', '');
+				$order['order_grand_total'] = number_format(round($order['order_grand_total'], 2), 2, '.', '');
+				$order['order_total_ttc'] = number_format(round($order['order_total_ttc'], 2), 2, '.', '');
+				$order['order_amount_to_pay_now'] = number_format(round($order['order_amount_to_pay_now'], 2), 2, '.', '');
 
 				/** On enregistre la commande	*/
 				update_post_meta($order_id, '_order_postmeta', $order);
@@ -145,75 +145,75 @@ 
 				update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 
-				do_action( 'wps_order_extra_save', $order_id );
+				do_action('wps_order_extra_save', $order_id);
 
 				//Add an action to extra actions on order save
 				// @TODO : REQUEST
-				$args = array( 'order_id' => $order_id, 'posted_data' => $_REQUEST);
-				wpshop_tools::create_custom_hook( 'wps_order_extra_save_action', $args );
+				$args = array('order_id' => $order_id, 'posted_data' => $_REQUEST);
+				wpshop_tools::create_custom_hook('wps_order_extra_save_action', $args);
 
 				/**	Set custmer information for the order	*/
-				$shipping_address =  ( !empty($shipping_address_option) && !empty($shipping_address_option['activate']) ) ? ( ( !empty($_SESSION['shipping_address']) ) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id ) : '';
-				$billing_address =  ( !empty($_SESSION['billing_address']) ) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
+				$shipping_address = (!empty($shipping_address_option) && !empty($shipping_address_option['activate'])) ? ((!empty($_SESSION['shipping_address'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id) : '';
+				$billing_address = (!empty($_SESSION['billing_address'])) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
 
 
-				if ( !empty( $billing_address) ) {
+				if (!empty($billing_address)) {
 					wpshop_orders::set_order_customer_addresses($user_id, $order_id, $shipping_address, $billing_address);
 				}
 
-				if ( !empty($_SESSION['shipping_address_to_save']) ) {
+				if (!empty($_SESSION['shipping_address_to_save'])) {
 					$order_infos_postmeta = get_post_meta($order_id, '_order_info', true);
 					$order_infos_postmeta['shipping']['address'] = $_SESSION['shipping_address_to_save'];
 					$order_infos_postmeta['shipping']['address_id'] = '';
 					update_post_meta($order_id, '_order_info', $order_infos_postmeta);
-					unset( $_SESSION['shipping_address_to_save'] );
+					unset($_SESSION['shipping_address_to_save']);
 				}
 
 
 				/** Save Coupon use **/
-				if ( !empty($_SESSION['cart']['coupon_id']) ) {
+				if (!empty($_SESSION['cart']['coupon_id'])) {
 					$wps_coupon_mdl = new wps_coupon_model();
-					$wps_coupon_mdl->save_coupon_use( $_SESSION['cart']['coupon_id'] );
+					$wps_coupon_mdl->save_coupon_use($_SESSION['cart']['coupon_id']);
 				}
 
 				/**	Notify the customer as the case	*/
 				$user_info = get_userdata($user_id);
 				$email = $user_info->user_email;
-				$first_name = $user_info->user_firstname ;
+				$first_name = $user_info->user_firstname;
 				$last_name = $user_info->user_lastname;
 
 				// Envoie du message de confirmation de commande au client
-				$order_meta = get_post_meta( $order_id, '_order_postmeta', true);
+				$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
+				if (!empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 				}
 				else {
-					$email_option = get_option( 'wpshop_emails' );
-					if ( empty($email_option['send_confirmation_order_message']) ) {
-						$payment_method_option = get_option( 'wps_payment_mode' );
-						$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+					$email_option = get_option('wpshop_emails');
+					if (empty($email_option['send_confirmation_order_message'])) {
+						$payment_method_option = get_option('wps_payment_mode');
+						$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
-						$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' ) );
+						$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 					}
 				}
 
-				if ( empty($_SESSION['wps-pos-addon']) ) {
+				if (empty($_SESSION['wps-pos-addon'])) {
 					$email_option = get_option('wpshop_emails');
-					if( empty($email_option) || ( !empty($email_option) && empty($email_option['send_confirmation_order_message']) ) ){
-						self::send_order_email_to_administrator( $order_id, $user_info );
+					if (empty($email_option) || (!empty($email_option) && empty($email_option['send_confirmation_order_message']))) {
+						self::send_order_email_to_administrator($order_id, $user_info);
 					}
 				}
 
 
 				/** IF Order amount is 0, Finish the Order **/
-				if ( $cart['order_amount_to_pay_now'] == 0 ) {
+				if ($cart['order_amount_to_pay_now'] == 0) {
 					$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 					$payment_status = 'completed';
-					$params_array = array (
+					$params_array = array(
 						'method' =>'free',
 						'waited_amount' => $order_meta['order_amount_to_pay_now'],
 						'status' =>  'payment_received',
@@ -224,14 +224,14 @@ 
 					);
 					wpshop_payment::check_order_payment_total_amount($order_id, $params_array, $payment_status);
 				}
-				apply_filters( 'wpshop_finish_order_extra_actions', $order_id);
+				apply_filters('wpshop_finish_order_extra_actions', $order_id);
 			}
 		endif;
 		return $order_id;
 	}
 
-	public static function send_order_email_to_administrator ( $order_id, $customer_infos = ''  ) {
-		if ( !empty($order_id) ) {
+	public static function send_order_email_to_administrator($order_id, $customer_infos = '') {
+		if (!empty($order_id)) {
 			$wps_message = new wps_message_ctr();
 			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
 			//Send email to administrator(s)
@@ -239,11 +239,11 @@ 
 			$shop_admin_email = $shop_admin_email_option['contact_email'];
 			$order_tmp_key = '';
 
-			$shipping_mode_option = get_option( 'wps_shipping_mode' );
-			$shipping_method = ( !empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ( (!empty($order_infos['order_payment']['shipping_method']) ) ? $order_infos['order_payment']['shipping_method'] : '' );
+			$shipping_mode_option = get_option('wps_shipping_mode');
+			$shipping_method = (!empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ((!empty($order_infos['order_payment']['shipping_method'])) ? $order_infos['order_payment']['shipping_method'] : '');
 
 
-			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
+			if (!empty($order_infos) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key'])) {
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
 			}
 			else {
@@ -251,23 +251,23 @@ 
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}
 
-			$payment_method_option = get_option( 'wps_payment_mode' );
-			$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
+			$payment_method_option = get_option('wps_payment_mode');
+			$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
 
-			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => ( !empty($customer_infos) && !empty($customer_infos->user_email) ) ? $customer_infos->user_email : '' , 'customer_last_name' => ( !empty($customer_infos) && !empty($customer_infos->user_lastname) ) ? $customer_infos->user_lastname : '', 'customer_first_name' => ( !empty($customer_infos) && !empty($customer_infos->user_firstname) ) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '','order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' );
+			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => (!empty($customer_infos) && !empty($customer_infos->user_email)) ? $customer_infos->user_email : '', 'customer_last_name' => (!empty($customer_infos) && !empty($customer_infos->user_lastname)) ? $customer_infos->user_lastname : '', 'customer_first_name' => (!empty($customer_infos) && !empty($customer_infos->user_firstname)) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '');
 
-			$wps_message->wpshop_prepared_email( $shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
+			$wps_message->wpshop_prepared_email($shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
 		}
 	}
 
-	public static function direct_payment_link( $token, $order_id, $login ) {
+	public static function direct_payment_link($token, $order_id, $login) {
 
 		global $wpdb;
-		if( !empty($token) && !empty($order_id) && !empty($login) ) {
+		if (!empty($token) && !empty($order_id) && !empty($login)) {
 			/** Verify informations **/
-			$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->users. ' WHERE user_login = %s AND user_activation_key = %s', $login, $token);
-			$user_infos = $wpdb->get_row( $query );
-			if( !empty($user_infos) ) {
+			$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->users . ' WHERE user_login = %s AND user_activation_key = %s', $login, $token);
+			$user_infos = $wpdb->get_row($query);
+			if (!empty($user_infos)) {
 				/** Connect the user **/
 				$secure_cookie = is_ssl() ? true : false;
 				wp_set_auth_cookie($user_infos->ID, true, $secure_cookie);
@@ -276,21 +276,21 @@ 
 				$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 				$_SESSION['cart'] = array();
 				$_SESSION['cart']['order_items'] = array();
-				if ( !empty($order_meta) && !empty( $order_meta['order_items']) ) {
+				if (!empty($order_meta) && !empty($order_meta['order_items'])) {
 					$wpshop_cart_type = 'cart';
-					foreach( $order_meta['order_items'] as $item ) {;
+					foreach ($order_meta['order_items'] as $item) {;
 						$_SESSION['cart']['order_items'][$item['item_id']] = $item;
 					}
 					$wps_cart_ctr = new wps_cart();
-					$order = $wps_cart_ctr->calcul_cart_information( array() );
-					$wps_cart_ctr->store_cart_in_session( $order );
+					$order = $wps_cart_ctr->calcul_cart_information(array());
+					$wps_cart_ctr->store_cart_in_session($order);
 				}
 				$_SESSION['order_id'] = $order_id;
-				$wpdb->update($wpdb->users, array('user_activation_key' => ''), array('user_login' => $login) );
-				wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ) );
+				$wpdb->update($wpdb->users, array('user_activation_key' => ''), array('user_login' => $login));
+				wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))));
 			}
 			else {
-				wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_myaccount_page_id') ) ) );
+				wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))));
 			}
 
 		}

includes/librairies/purchase/orders.class.php

Doc Comments +6 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
 
 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
-	* @return int
+	* @return string
 	*/
 	public static function get_new_order_reference(){
 		$number_figures = get_option('wpshop_order_number_figures', false);
@@ -285,7 +285,7 @@ 
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
-	* @return int
+	* @return string
 	*/
 	public static function get_new_pre_order_reference($save = true){
 		$number_figures = get_option('wpshop_order_number_figures', false);
@@ -650,6 +650,10 @@ 
 
 		return $output;
 	}
+
+	/**
+	 * @param boolean $state
+	 */
 	static function display_customer_pay_quotation( $state, $oid ) {
 		$btn = '<a role="button" class="wps-bton-' . ( ( $state ) ? 'third' : 'second' ) . '-mini-rounded quotation_is_payable_by_customer" href="#" >'.__('Customer can pay', 'wpshop').'</a>';
 		if( $state ) {

Indentation +7 added lines, -7 removed lines

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

Braces +14 added lines, -23 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Products management method file
  *
@@ -132,8 +134,7 @@ 
 		$order_main_info .= '<div class="wps-product-section">';
 		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
 			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
-		}
-		else{
+		} else{
 			if(!empty($order_postmeta['order_key'])){
 				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
 			}
@@ -148,8 +149,7 @@ 
 				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $order->ID;
 				$order_invoice_download = wpshop_display::display_template_element('wpshop_admin_order_payment_received_invoice_download_links', $sub_tpl_component, array(), 'admin');
 				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
-			}
-			else {
+			} else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
 			}
 		}
@@ -195,8 +195,7 @@ 
 			if ( empty($credit_meta) ) {
 				if( $order_postmeta['order_status'] == 'refunded') {
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .WPSHOP_TEMPLATES_URL. 'invoice.php?order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
-				}
-				else {
+				} else {
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
@@ -276,8 +275,7 @@ 
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
-		else { $order_current_number++; }
+		if(!$order_current_number) { $order_current_number = 1; } else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
 		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
@@ -297,8 +295,7 @@ 
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
-		else { $order_current_number++; }
+		if(!$order_current_number) { $order_current_number = 1; } else { $order_current_number++; }
 		if($save){
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
@@ -332,8 +329,7 @@ 
 					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
 				}
 			}
-		}
-		else {
+		} else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
 			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
 			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
@@ -394,8 +390,7 @@ 
 				case "order_billing":
 					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
 						$billing = $addresses['billing']['address'];
-					}
-					else if ( !empty($addresses['billing']) ) {
+					} else if ( !empty($addresses['billing']) ) {
 						$billing = $addresses['billing'];
 					}
 					if ( !empty($billing) ) {
@@ -403,8 +398,7 @@ 
 						echo empty($billing['company'])?'<br />':', <i>'.$billing['company'].'</i><br />';
 						echo (!empty($billing['address']) ? $billing['address'] : null).'<br />';
 						echo (!empty($billing['postcode']) ? $billing['postcode'] : null).' '.(!empty($billing['city']) ? $billing['city'] : null).', '.(!empty($billing['country']) ? $billing['country'] : null);
-					}
-					else {
+					} else {
 						echo __('No information available for user billing', 'wpshop');
 					}
 				break;
@@ -412,8 +406,7 @@ 
 				case "order_shipping":
 					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
 						$shipping = $addresses['shipping']['address'];
-					}
-					else if ( !empty($addresses['shipping']) ) {
+					} else if ( !empty($addresses['shipping']) ) {
 						$shipping = $addresses['shipping'];
 					}
 					if ( !empty($shipping) ) {
@@ -421,8 +414,7 @@ 
 						echo empty($shipping['company'])?'<br />':', <i>'.$shipping['company'].'</i><br />';
 						echo (!empty($shipping['address']) ? $shipping['address'] : null).'<br />';
 						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null).' '.(!empty($shipping['city']) ? $shipping['city'] : null).', '.(!empty($shipping['country']) ? $shipping['country'] : null);
-					}
-					else{
+					} else{
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
@@ -435,8 +427,7 @@ 
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
 							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader">'.__('Mark as shipped', 'wpshop').'</a> ';
-						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						} else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';

Spacing +138 added lines, -138 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Products management method file
  *
@@ -10,8 +10,8 @@ 
  */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -70,7 +70,7 @@ 
 		/**	Add action button	*/
 		add_meta_box(
 			'wpshop_order_actions',
-			'<span class="dashicons dashicons-info"></span> '.__('Actions on order', 'wpshop'),
+			'<span class="dashicons dashicons-info"></span> ' . __('Actions on order', 'wpshop'),
 			array('wpshop_orders', 'order_actions'),
 				WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'high'
 		);
@@ -110,7 +110,7 @@ 
 	 *
 	 * @param object $order The current order being edited
 	 */
-	public static function order_actions( $order ) {
+	public static function order_actions($order) {
 		$output = '';
 
 		$order_status = unserialize(WPSHOP_ORDER_STATUS);
@@ -118,37 +118,37 @@ 
 
 		$tpl_component = array();
 
-		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url( get_delete_post_link($order->ID) ) , 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') :  __('Move to Trash', 'wpshop'))), array(), 'admin');
-		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can( "delete_post", $order->ID ) ? $delete_button : '';
+		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url(get_delete_post_link($order->ID)), 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') : __('Move to Trash', 'wpshop'))), array(), 'admin');
+		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can("delete_post", $order->ID) ? $delete_button : '';
 
 		/**	Add an action list	*/
 		$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] = '';
 
 		/**	Display main information about the order	*/
 		$order_main_info = '';
-		if(!empty($order_postmeta['order_date'])){
-			$order_main_info .=  '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>'.__('Order date','wpshop').' : </strong><br/>'.mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true).'</div>';
+		if (!empty($order_postmeta['order_date'])) {
+			$order_main_info .= '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>' . __('Order date', 'wpshop') . ' : </strong><br/>' . mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true) . '</div>';
 		}
 		$order_main_info .= '<div class="wps-product-section">';
-		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
-			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
+		if (empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))) {
+			$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Temporary quotation reference', 'wpshop') . ': </strong>' . self::get_new_pre_order_reference(false) . '<br/>';
 		}
-		else{
-			if(!empty($order_postmeta['order_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
+		else {
+			if (!empty($order_postmeta['order_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Order reference', 'wpshop') . ' : </strong>' . $order_postmeta['order_key'] . '<br/>';
 			}
-			if(!empty($order_postmeta['order_temporary_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Pre-order reference','wpshop').': </strong>'.$order_postmeta['order_temporary_key'].'<br/>';
-				$post_ID = !empty( $_GET['post'] ) ? (int) $_GET['post'] : 0;
-				$order_main_info .= '<a href="' .WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $post_ID . '&mode=pdf">' .__('Download the quotation', 'wpshop'). '</a><br />';
+			if (!empty($order_postmeta['order_temporary_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Pre-order reference', 'wpshop') . ': </strong>' . $order_postmeta['order_temporary_key'] . '<br/>';
+				$post_ID = !empty($_GET['post']) ? (int)$_GET['post'] : 0;
+				$order_main_info .= '<a href="' . WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $post_ID . '&mode=pdf">' . __('Download the quotation', 'wpshop') . '</a><br />';
 			}
-			if(!empty($order_postmeta['order_invoice_ref'])){
+			if (!empty($order_postmeta['order_invoice_ref'])) {
 				$sub_tpl_component = array();
 				$sub_tpl_component['ADMIN_ORDER_RECEIVED_PAYMENT_INVOICE_REF'] = $order_postmeta['order_invoice_ref'];
 				$sub_tpl_component['ADMIN_ORDER_PAYMENT_RECEIVED_LINE_CLASSES'] = '';
 				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $order->ID;
 				$order_invoice_download = wpshop_display::display_template_element('wpshop_admin_order_payment_received_invoice_download_links', $sub_tpl_component, array(), 'admin');
-				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Invoice number', 'wpshop') . ': </strong>' . $order_postmeta['order_invoice_ref'] . '<br/>' . $order_invoice_download . '';
 			}
 			else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
@@ -158,7 +158,7 @@ 
 
 
 		/*Add the current order status in display**/
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= ( !empty($order_postmeta['order_status']) ) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) ) : '';
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= (!empty($order_postmeta['order_status'])) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop'))) : '';
 
 			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= $order_main_info;
 
@@ -168,37 +168,37 @@ 
 		 * To check because notification is not really send
 		 *
 		 */
-		if ( !empty($order->post_author) ) {
+		if (!empty($order->post_author)) {
 			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '
 			<div class="wps-product-section wpshop_order_notify_customer_on_update_container" >
-				<input type="checkbox" name="notif_the_customer" id="wpshop_order_notif_the_customer_on_update" /> <label for="wpshop_order_notif_the_customer_on_update" >'.__('Send a notification to the customer', 'wpshop').'</label>
-				<!-- <br/><input type="checkbox" name="notif_the_customer_sendsms" id="wpshop_order_notif_the_customer_sendsms_on_update" /> <label for="wpshop_order_nnotif_the_customer_sendsms_on_update" >'.__('Send a SMS to the customer', 'wpshop').'</label> -->
+				<input type="checkbox" name="notif_the_customer" id="wpshop_order_notif_the_customer_on_update" /> <label for="wpshop_order_notif_the_customer_on_update" >'.__('Send a notification to the customer', 'wpshop') . '</label>
+				<!-- <br/><input type="checkbox" name="notif_the_customer_sendsms" id="wpshop_order_notif_the_customer_sendsms_on_update" /> <label for="wpshop_order_nnotif_the_customer_sendsms_on_update" >'.__('Send a SMS to the customer', 'wpshop') . '</label> -->
 			</div>';
 		}
 
-		if( ( ( !empty($order_postmeta['cart_type']) && $order_postmeta['cart_type'] == 'quotation' ) || !empty( $order_postmeta['order_temporary_key'] ) ) && $order_postmeta['order_status'] != 'canceled' && (float) $order_postmeta['order_amount_to_pay_now'] != (float) 0 ) {
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section">' . self::display_customer_pay_quotation( isset( $order_postmeta['pay_quotation'] ), $order->ID ) . '</div>';
+		if (((!empty($order_postmeta['cart_type']) && $order_postmeta['cart_type'] == 'quotation') || !empty($order_postmeta['order_temporary_key'])) && $order_postmeta['order_status'] != 'canceled' && (float)$order_postmeta['order_amount_to_pay_now'] != (float)0) {
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section">' . self::display_customer_pay_quotation(isset($order_postmeta['pay_quotation']), $order->ID) . '</div>';
 		}
 
 		/*Add the button regarding the order status**/
-		if ( !empty($order_postmeta['order_status']) ) {
-			switch ( $order_postmeta['order_status'] ) {
+		if (!empty($order_postmeta['order_status'])) {
+			switch ($order_postmeta['order_status']) {
 				case 'awaiting_payment':
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><a role="button" class="wps-bton-second-mini-rounded send_direct_payment_link" href="#" >'.__('Send a payment link to customer', 'wpshop').'</a></div>';
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_'.$order->ID.'" >'.__('Cancel this order', 'wpshop').'</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><a role="button" class="wps-bton-second-mini-rounded send_direct_payment_link" href="#" >' . __('Send a payment link to customer', 'wpshop') . '</a></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_' . $order->ID . '" >' . __('Cancel this order', 'wpshop') . '</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
 				break;
 				/*case 'completed' || 'shipped':
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_resend_order_to_customer" ><button class="wps-bton-second-mini-rounded wps_resend_order_to_customer order_' .$order->ID. '">' . __('Resend this order to customer', 'wpshop') . '</button><input type="hidden" id="resendordertocustomer_order_hidden_indicator" name="resendordertocustomer_order_hidden_indicator" /></div>';
 				break;*/
 			}
-			$credit_meta = get_post_meta( $order->ID, '_wps_order_credit', true );
+			$credit_meta = get_post_meta($order->ID, '_wps_order_credit', true);
 
-			if ( empty($credit_meta) ) {
-				if( $order_postmeta['order_status'] == 'refunded') {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .WPSHOP_TEMPLATES_URL. 'invoice.php?order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
+			if (empty($credit_meta)) {
+				if ($order_postmeta['order_status'] == 'refunded') {
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' . __('Credit Slip number', 'wpshop') . ' : <strong>' . ((!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref'])) ? '<a href="' . WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $order->ID . '&amp;invoice_ref=' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '&credit_slip=ok" target="_blank">' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '</a>' : '') . '</strong></div>';
 				}
 				else {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' . $order->ID . '">' . __('Refund this order', 'wpshop') . '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
 		}
@@ -210,7 +210,7 @@ 
 	function order_container_in_admin() {
 		global $post;
 		$output  = '<div id="wps_order_content_container">';
-		$output .= self::order_content( $post );
+		$output .= self::order_content($post);
 		$output .= '</div>';
 		echo $output;
 	}
@@ -221,13 +221,13 @@ 
 	 *
 	 * @param order $post The complete order content
 	 */
-	function order_content( $post ) {
+	function order_content($post) {
 		$order_content = '';
 
 		$order = get_post_meta($post->ID, '_order_postmeta', true);
 
 		$order_content .= '<div id="order_product_container" class="order_product_container wpshop_cls" >';
-		if($order){/*	Read the order content if the order has product	*/
+		if ($order) {/*	Read the order content if the order has product	*/
 			$order_content .= '<input type="hidden" value="" name="order_products_to_delete" id="order_products_to_delete" />' . wpshop_cart::display_cart(true, $order, 'admin');
 			if (empty($order['order_invoice_ref'])) {
 				$order_content .= '<div id="order_refresh_button_container" class="wpshop_clear_block" ><input type="button" class="button-primary alignright wpshopHide" id="wpshop_admin_order_recalculate" value="' . __('Refresh order informations', 'wpshop') . '" /></div>';
@@ -245,18 +245,18 @@ 
 	/** Generate the billing reference regarding the order $order_id
 	 * @return void
 	*/
-	function order_generate_billing_number($order_id, $force_invoicing = false){
+	function order_generate_billing_number($order_id, $force_invoicing = false) {
 		global $wpdb, $wpshop_modules_billing;
 
 		// Get the order from the db
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 
 		// If the payment is completed
-		if(($order['order_status']=='completed') || $force_invoicing) {
+		if (($order['order_status'] == 'completed') || $force_invoicing) {
 
 			// If the reference hasn't been generated yet
-			if(empty($order['order_invoice_ref'])) {
-				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number( $order_id );
+			if (empty($order['order_invoice_ref'])) {
+				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number($order_id);
 
 				update_post_meta($order_id, '_order_postmeta', $order);
 			}
@@ -267,45 +267,45 @@ 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
 	* @return int
 	*/
-	public static function get_new_order_reference(){
+	public static function get_new_order_reference() {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_ORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_ORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
 	* @return int
 	*/
-	public static function get_new_pre_order_reference($save = true){
+	public static function get_new_pre_order_reference($save = true) {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
-		if($save){
+		if ($save) {
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_PREORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_PREORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 
@@ -320,24 +320,24 @@ 
 	 *
 	 *	@return void
 	 */
-	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id='', $billing_address_id=''){
+	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id = '', $billing_address_id = '') {
 		/**	Get order informations	*/
 		$billing_info['id'] = get_post_meta($billing_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-		$billing_info['address'] = get_post_meta($billing_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-		$billing_info['address_id'] = ( !empty($_SESSION['billing_address']) ) ? intval( $_SESSION['billing_address'] ) : '';
-		if ( !empty($_SESSION['shipping_partner_id']) ) {
-			$partner_address_id = get_post_meta( $_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
+		$billing_info['address'] = get_post_meta($billing_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+		$billing_info['address_id'] = (!empty($_SESSION['billing_address'])) ? intval($_SESSION['billing_address']) : '';
+		if (!empty($_SESSION['shipping_partner_id'])) {
+			$partner_address_id = get_post_meta($_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
 			if (!empty($partner_address_id)) {
-				foreach( $partner_address_id as $address_id ) {
+				foreach ($partner_address_id as $address_id) {
 					$shipping_info['id'] = get_post_meta($address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
+					$shipping_info['address'] = get_post_meta($address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
 				}
 			}
 		}
 		else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
+			$shipping_info['address'] = get_post_meta($shipping_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+			$shipping_info['address_id'] = (!empty($_SESSION['shipping_address'])) ? intval($_SESSION['shipping_address']) : '';
 		}
 
 		$order_info = array('billing' => $billing_info, 'shipping' => $shipping_info);
@@ -350,7 +350,7 @@ 
 	/** Set the custom colums
 	 * @return array
 	*/
-	static function orders_edit_columns($columns){
+	static function orders_edit_columns($columns) {
 	  $columns = array(
 		'cb' => '<input type="checkbox" />',
 		'order_identifier' => __('Identifiers', 'wpshop'),
@@ -370,40 +370,40 @@ 
 	 * @return array
 	*/
 	public static function orders_custom_columns($column, $post_id) {
-		if ( get_post_type( $post_id ) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) {
+		if (get_post_type($post_id) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
 			global $civility, $order_status;
 
 			$metadata = get_post_custom();
 
-			$order_postmeta = isset($metadata['_order_postmeta'][0])?unserialize($metadata['_order_postmeta'][0]):'';
-			$addresses = get_post_meta($post_id,'_order_info', true);
+			$order_postmeta = isset($metadata['_order_postmeta'][0]) ? unserialize($metadata['_order_postmeta'][0]) : '';
+			$addresses = get_post_meta($post_id, '_order_info', true);
 
-			switch($column){
+			switch ($column) {
 				case "order_identifier":
-					if( !empty( $order_postmeta['order_key'] ) ) {
+					if (!empty($order_postmeta['order_key'])) {
 						echo '<b>' . $order_postmeta['order_key'] . '</b><br>';
 					}
-					if( !empty( $order_postmeta['order_invoice_ref'] ) ) {
-						echo ( !empty($order_postmeta['order_temporary_key'] ) ? '<b>' . $order_postmeta['order_invoice_ref'] . '</b>' :  '<i>' . $order_postmeta['order_invoice_ref'] . '</i>' );
+					if (!empty($order_postmeta['order_invoice_ref'])) {
+						echo (!empty($order_postmeta['order_temporary_key']) ? '<b>' . $order_postmeta['order_invoice_ref'] . '</b>' : '<i>' . $order_postmeta['order_invoice_ref'] . '</i>');
 					}
 				break;
 
 				case "order_status":
-					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_'.$post_id.'">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
+					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_' . $post_id . '">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
 				break;
 
 				case "order_billing":
-					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
+					if (!empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address'])) {
 						$billing = $addresses['billing']['address'];
 					}
-					else if ( !empty($addresses['billing']) ) {
+					else if (!empty($addresses['billing'])) {
 						$billing = $addresses['billing'];
 					}
-					if ( !empty($billing) ) {
-						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null).' <strong>'.(!empty($billing['address_first_name']) ? $billing['address_first_name'] : null).' '.(!empty($billing['address_last_name']) ? $billing['address_last_name'] : null).'</strong>';
-						echo empty($billing['company'])?'<br />':', <i>'.$billing['company'].'</i><br />';
-						echo (!empty($billing['address']) ? $billing['address'] : null).'<br />';
-						echo (!empty($billing['postcode']) ? $billing['postcode'] : null).' '.(!empty($billing['city']) ? $billing['city'] : null).', '.(!empty($billing['country']) ? $billing['country'] : null);
+					if (!empty($billing)) {
+						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null) . ' <strong>' . (!empty($billing['address_first_name']) ? $billing['address_first_name'] : null) . ' ' . (!empty($billing['address_last_name']) ? $billing['address_last_name'] : null) . '</strong>';
+						echo empty($billing['company']) ? '<br />' : ', <i>' . $billing['company'] . '</i><br />';
+						echo (!empty($billing['address']) ? $billing['address'] : null) . '<br />';
+						echo (!empty($billing['postcode']) ? $billing['postcode'] : null) . ' ' . (!empty($billing['city']) ? $billing['city'] : null) . ', ' . (!empty($billing['country']) ? $billing['country'] : null);
 					}
 					else {
 						echo __('No information available for user billing', 'wpshop');
@@ -411,33 +411,33 @@ 
 				break;
 
 				case "order_shipping":
-					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
+					if (!empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address'])) {
 						$shipping = $addresses['shipping']['address'];
 					}
-					else if ( !empty($addresses['shipping']) ) {
+					else if (!empty($addresses['shipping'])) {
 						$shipping = $addresses['shipping'];
 					}
-					if ( !empty($shipping) ) {
-						echo '<strong>'.(!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null).' '.(!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null).'</strong>';
-						echo empty($shipping['company'])?'<br />':', <i>'.$shipping['company'].'</i><br />';
-						echo (!empty($shipping['address']) ? $shipping['address'] : null).'<br />';
-						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null).' '.(!empty($shipping['city']) ? $shipping['city'] : null).', '.(!empty($shipping['country']) ? $shipping['country'] : null);
+					if (!empty($shipping)) {
+						echo '<strong>' . (!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null) . ' ' . (!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null) . '</strong>';
+						echo empty($shipping['company']) ? '<br />' : ', <i>' . $shipping['company'] . '</i><br />';
+						echo (!empty($shipping['address']) ? $shipping['address'] : null) . '<br />';
+						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null) . ' ' . (!empty($shipping['city']) ? $shipping['city'] : null) . ', ' . (!empty($shipping['country']) ? $shipping['country'] : null);
 					}
-					else{
+					else {
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
 
 				case "order_type":
-						echo '<a href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.(!empty($order_postmeta['order_temporary_key']) ? __('Quotation','wpshop') :  __('Basic order','wpshop')).'</a>';
+						echo '<a href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . (!empty($order_postmeta['order_temporary_key']) ? __('Quotation', 'wpshop') : __('Basic order', 'wpshop')) . '</a>';
 						$buttons = '<p class="row-actions">';
 						// Voir la commande
-						$buttons .= '<a class="button button-small" href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.__('View', 'wpshop').'</a>';
+						$buttons .= '<a class="button button-small" href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . __('View', 'wpshop') . '</a>';
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
-							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader">'.__('Mark as shipped', 'wpshop').'</a> ';
+							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_' . $post_id . ' wps-bton-loader">' . __('Mark as shipped', 'wpshop') . '</a> ';
 						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment')) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';
@@ -450,7 +450,7 @@ 
 
 				case "order_total":
 					$currency = !empty($order_postmeta['order_currency']) ? $order_postmeta['order_currency'] : get_option('wpshop_shop_default_currency');
-					echo isset( $order_postmeta['order_grand_total'] ) ? number_format( $order_postmeta['order_grand_total'], 2, '.', '' ).' '.  wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
+					echo isset($order_postmeta['order_grand_total']) ? number_format($order_postmeta['order_grand_total'], 2, '.', '') . ' ' . wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
 				break;
 
 				/*case "order_actions":
@@ -478,10 +478,10 @@ 
 	}
 
 	public static function list_table_filters() {
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
 		if (isset($post_type)) {
 			if (post_type_exists($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER)) {
@@ -493,23 +493,23 @@ 
 				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, $entity_filter, '', 'index');
 				$min = $entity_filter_btpf;
 				$max = $entity_filter_btps;
-				echo ' <label for="entity_filter_btpf">'.__('Between two prices', 'wpshop').'</label> ';
-				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="'.__('Minimum price', 'wpshop').'"', null);
-				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="'.__('Maximum price', 'wpshop').'"', null);
+				echo ' <label for="entity_filter_btpf">' . __('Between two prices', 'wpshop') . '</label> ';
+				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="' . __('Minimum price', 'wpshop') . '"', null);
+				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="' . __('Maximum price', 'wpshop') . '"', null);
 			}
 		}
 	}
 
 	public static function list_table_filter_parse_query($query) {
 		global $pagenow, $wpdb;
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
-		if ( is_admin() && ($pagenow == 'edit.php') && !empty( $post_type ) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) && !empty( $entity_filter ) ) {
+		if (is_admin() && ($pagenow == 'edit.php') && !empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) && !empty($entity_filter)) {
 			$check = null;
-			switch ( $entity_filter ) {
+			switch ($entity_filter) {
 				case 'all':
 					$sql_query = $wpdb->prepare(
 						"SELECT ID
@@ -573,27 +573,27 @@ 
 						break;
 			}
 
-			if ( !empty( $check ) ) {
-				if( !empty($no_btp) && $no_btp == 'yes' ) {
+			if (!empty($check)) {
+				if (!empty($no_btp) && $no_btp == 'yes') {
 					$min = 'minimum';
 					$max = 'maximum';
 				} else {
-					$min = ( !empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf']) ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : 'minimum';
-					$max = ( !empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps']) ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : 'maximum';
+					$min = (!empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf'])) ? sanitize_text_field($_GET['entity_filter_btpf']) : 'minimum';
+					$max = (!empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps'])) ? sanitize_text_field($_GET['entity_filter_btps']) : 'maximum';
 				}
 				$results = $wpdb->get_results($sql_query);
 				$post_id_list = array();
 				$i = 0;
-				foreach($results as $item){
+				foreach ($results as $item) {
 					$meta_value = get_post_meta($item->ID, '_order_postmeta');
-					$price = ( !empty( $meta_value[0]['order_grand_total'] ) ) ? $meta_value[0]['order_grand_total'] : '';
-					if( $price >= $min || $min == 'minimum' ) {
-						if( $price <= $max || $max == 'maximum' ) {
+					$price = (!empty($meta_value[0]['order_grand_total'])) ? $meta_value[0]['order_grand_total'] : '';
+					if ($price >= $min || $min == 'minimum') {
+						if ($price <= $max || $max == 'maximum') {
 							$post_id_list[] = $item->ID;
 						}
 					}
 				}
-				if( empty($post_id_list) ) {
+				if (empty($post_id_list)) {
 					$post_id_list[] = 'no_result';
 				}
 				$query->query_vars[$check] = $post_id_list;
@@ -604,66 +604,66 @@ 
 
 
 
-	function latest_products_ordered ( $orders ) {
+	function latest_products_ordered($orders) {
 		global $wpdb;
 		$product_id = $output = '';
 		$products = array();
 		$display_option = get_option('wpshop_display_option');
-		if ( !empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered']) ) {
-			foreach( $orders as $order ) {
-				$order_content = get_post_meta( $order->ID, '_order_postmeta', true );
-				if ( !empty($order_content) && !empty( $order_content['order_items']) ) {
+		if (!empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered'])) {
+			foreach ($orders as $order) {
+				$order_content = get_post_meta($order->ID, '_order_postmeta', true);
+				if (!empty($order_content) && !empty($order_content['order_items'])) {
 
-					foreach( $order_content['order_items'] as $item ) {
-						if ( count( $products) >= $display_option['latest_products_ordered'] ) {
+					foreach ($order_content['order_items'] as $item) {
+						if (count($products) >= $display_option['latest_products_ordered']) {
 							continue;
 						}
 						$product_id = $item['item_id'];
-						if ( !empty( $item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition']) ) {
-							$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-							if ( !empty( $parent_def ) ) {
+						if (!empty($item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition'])) {
+							$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+							if (!empty($parent_def)) {
 								$parent_post = $parent_def['parent_post'];
 								$product_id = $parent_post->ID;
 							}
 						}
 
-						if ( !in_array($product_id, $products) ) {
+						if (!in_array($product_id, $products)) {
 							$products[] = $product_id;
 						}
 					}
 				}
 			}
-			if ( !empty($products) ) {
+			if (!empty($products)) {
 				$products_id = implode(",", $products);
-				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' .$products_id. '"]')) );
+				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' . $products_id . '"]')));
 			}
 		}
 		return $output;
 	}
 
-	function get_order_list_for_customer( $customer_id ) {
+	function get_order_list_for_customer($customer_id) {
 		global $wpdb;
 		$output = '';
 
-		if( !empty($customer_id) ) {
-			 $query = $wpdb->prepare( 'SELECT *
-							 		   FROM ' .$wpdb->posts. '
+		if (!empty($customer_id)) {
+			 $query = $wpdb->prepare('SELECT *
+							 		   FROM ' .$wpdb->posts . '
 							 		   WHERE post_author = %d
-							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			 $orders = $wpdb->get_results( $query );
+							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			 $orders = $wpdb->get_results($query);
 
-			 foreach( $orders as $order ) {
+			 foreach ($orders as $order) {
 
 			 }
 		}
 
 		return $output;
 	}
-	static function display_customer_pay_quotation( $state, $oid ) {
-		$btn = '<a role="button" class="wps-bton-' . ( ( $state ) ? 'third' : 'second' ) . '-mini-rounded quotation_is_payable_by_customer" href="#" >'.__('Customer can pay', 'wpshop').'</a>';
-		if( $state ) {
-			$url = wp_nonce_url( admin_url( 'admin-ajax.php?action=wps_checkout_quotation&order_id=' . $oid . '&is_link=link' ), 'wps_checkout_quotation', '_wpnonce' );
-			$btn .= '<br><a href="' . $url . '">' . __( 'Pay link', 'wpshop' ) . '</a>';
+	static function display_customer_pay_quotation($state, $oid) {
+		$btn = '<a role="button" class="wps-bton-' . (($state) ? 'third' : 'second') . '-mini-rounded quotation_is_payable_by_customer" href="#" >' . __('Customer can pay', 'wpshop') . '</a>';
+		if ($state) {
+			$url = wp_nonce_url(admin_url('admin-ajax.php?action=wps_checkout_quotation&order_id=' . $oid . '&is_link=link'), 'wps_checkout_quotation', '_wpnonce');
+			$btn .= '<br><a href="' . $url . '">' . __('Pay link', 'wpshop') . '</a>';
 		}
 		return $btn;
 	}

includes/modules/billing/billing.php

Doc Comments +4 added lines, -3 removed lines

@@ -864,7 +864,7 @@ 
 
 		/**
 		 * Generate Sender part invoice template
-		 * @return Ambigous <string, string>
+		 * @return string <string, string>
 		 */
 		public static function generate_invoice_sender_part() {
 			$output ='';
@@ -909,7 +909,7 @@ 
 		 * Generate Receiver part template
 		 * @param unknown_type $order_id
 		 * @param unknown_type $bon_colisage
-		 * @return Ambigous <string, string>
+		 * @return string <string, string>
 		 */
 		public static function generate_receiver_part( $order_id, $bon_colisage = false ) {
 			$output = '';
@@ -966,7 +966,7 @@ 
 
 		/**
 		 * Genrate Footer invoice
-		 * @return Ambigous <string, string>
+		 * @return string <string, string>
 		 */
 		public static function generate_footer_invoice(){
 			$output ='';
@@ -1012,6 +1012,7 @@ 
 		 * @param float $tva_rate
 		 * @param id $product_id
 		 * @param string $invoice_ref
+		 * @param integer $order_id
 		 */
 		public static function check_product_price( $price_ht, $price_ati, $tva_amount, $tva_rate, $product_id, $invoice_ref, $order_id ) {
 			$checking = true;

Spacing +324 added lines, -324 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Billing module bootstrap file
  *
@@ -9,7 +9,7 @@ 
  */
 
 /**	Check if billing class does not exist before creating the class	*/
-if ( !class_exists("wpshop_modules_billing") ) {
+if (!class_exists("wpshop_modules_billing")) {
 
 	/**
 	 * Billing module utilities definition
@@ -25,15 +25,15 @@ 
 		 */
 		function __construct() {
 			/**	Add custom template for current module	*/
-			add_filter( 'wpshop_custom_template', array( &$this, 'custom_template_load' ) );
+			add_filter('wpshop_custom_template', array(&$this, 'custom_template_load'));
 
 			/**	In case wpshop is set on sale mode and not on view catalog only, Ad billign options	*/
-			if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {
-				$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';
-				$old_wpshop_shop_type = !empty( $_POST['old_wpshop_shop_type'] ) ? sanitize_text_field( $_POST['old_wpshop_shop_type'] ) : '';
+			if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
+				$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+				$old_wpshop_shop_type = !empty($_POST['old_wpshop_shop_type']) ? sanitize_text_field($_POST['old_wpshop_shop_type']) : '';
 
-				if ( ( $wpshop_shop_type == '' || $wpshop_shop_type != 'presentation' )
-					&& ( $old_wpshop_shop_type == '' && $old_wpshop_shop_type != 'presentation' ) ) {
+				if (($wpshop_shop_type == '' || $wpshop_shop_type != 'presentation')
+					&& ($old_wpshop_shop_type == '' && $old_wpshop_shop_type != 'presentation')) {
 						/**	Add module option to wpshop general options	*/
 						add_filter('wpshop_options', array(&$this, 'add_options'), 9);
 						add_action('wsphop_options', array(&$this, 'declare_options'), 8);
@@ -41,7 +41,7 @@ 
 			}
 
 			// Filter
-			add_filter( 'wps_order_saving_admin_extra_action', array( $this, 'force_invoice_generation_on_order'), 50, 2 );
+			add_filter('wps_order_saving_admin_extra_action', array($this, 'force_invoice_generation_on_order'), 50, 2);
 		}
 
 		/**
@@ -51,17 +51,17 @@ 
 		 *
 		 * @return array The template with new elements
 		 */
-		function custom_template_load( $templates ) {
+		function custom_template_load($templates) {
 			include('templates/common/main_elements.tpl.php');
 			$wpshop_template = $tpl_element;
 			/*	Get custom frontend template	*/
-			if ( is_file(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php') ) {
+			if (is_file(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php')) {
 				require_once(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php');
 				if (!empty($tpl_element))
-					$wpshop_template['common']['custom'] = ($tpl_element);unset($tpl_element);
+					$wpshop_template['common']['custom'] = ($tpl_element); unset($tpl_element);
 			}
 			$wpshop_display = new wpshop_display();
-			$templates = $wpshop_display->add_modules_template_to_internal( $wpshop_template, $templates );
+			$templates = $wpshop_display->add_modules_template_to_internal($wpshop_template, $templates);
 
 			unset($tpl_element);
 
@@ -71,9 +71,9 @@ 
 		/**
 		 * Declare option groups for the module
 		 */
-		function add_options( $option_group ) {
+		function add_options($option_group) {
 			$option_group['wpshop_billing_info'] =
-				array(	'label' => __('Billing', 'wpshop'),
+				array('label' => __('Billing', 'wpshop'),
 						'subgroups' => array(
 							'wpshop_billing_info' => array('class' => ' wpshop_admin_box_options_billing'),
 						),
@@ -86,7 +86,7 @@ 
 		 * Declare the different options in groups for the module
 		 */
 		function declare_options() {
-			add_settings_section('wpshop_billing_info','<span class="dashicons dashicons-admin-generic"></span>'. __('Billing settings', 'wpshop'), array(&$this, 'billing_options_main_explanation'), 'wpshop_billing_info');
+			add_settings_section('wpshop_billing_info', '<span class="dashicons dashicons-admin-generic"></span>' . __('Billing settings', 'wpshop'), array(&$this, 'billing_options_main_explanation'), 'wpshop_billing_info');
 
 			register_setting('wpshop_options', 'wpshop_billing_number_figures', array(&$this, 'wpshop_options_validate_billing_number_figures'));
 			add_settings_field('wpshop_billing_number_figures', __('Number of figures', 'wpshop'), array(&$this, 'wpshop_billing_number_figures_field'), 'wpshop_billing_info', 'wpshop_billing_info');
@@ -95,30 +95,30 @@ 
 			add_settings_field('wpshop_billing_address_choice', __('Billing address choice', 'wpshop'), array(&$this, 'wpshop_billing_address_choice_field'), 'wpshop_billing_info', 'wpshop_billing_info');
 			add_settings_field('wpshop_billing_address_include_into_register', '', array(&$this, 'wpshop_billing_address_include_into_register_field'), 'wpshop_billing_info', 'wpshop_billing_info');
 
-			$quotation_option = get_option( 'wpshop_addons' );
-			if ( !empty($quotation_option) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']['activate']) ) {
-				add_settings_section('wpshop_quotation_info', '<span class="dashicons dashicons-clipboard"></span>' .__('Quotation settings', 'wpshop'), array(&$this, 'quotation_options_main_explanation'), 'wpshop_billing_info');
+			$quotation_option = get_option('wpshop_addons');
+			if (!empty($quotation_option) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']['activate'])) {
+				add_settings_section('wpshop_quotation_info', '<span class="dashicons dashicons-clipboard"></span>' . __('Quotation settings', 'wpshop'), array(&$this, 'quotation_options_main_explanation'), 'wpshop_billing_info');
 
 				register_setting('wpshop_options', 'wpshop_quotation_validate_time', array(&$this, 'wpshop_options_validate_quotation_validate_time'));
 				add_settings_field('wpshop_quotation_validate_time', __('Quotation validate time', 'wpshop'), array(&$this, 'wpshop_quotation_validate_time_field'), 'wpshop_billing_info', 'wpshop_quotation_info');
 				$payment_option = get_option('wps_payment_mode');
-				if ( !empty($payment_option) && !empty($payment_option['mode']) && !empty($payment_option['mode']['banktransfer']) && !empty($payment_option['mode']['banktransfer']['active']) ) {
+				if (!empty($payment_option) && !empty($payment_option['mode']) && !empty($payment_option['mode']['banktransfer']) && !empty($payment_option['mode']['banktransfer']['active'])) {
 					register_setting('wpshop_options', 'wpshop_paymentMethod_options[banktransfer][add_in_quotation]', array(&$this, 'wpshop_options_validate_wpshop_bic_to_quotation'));
 					add_settings_field('wpshop_paymentMethod_options[banktransfer][add_in_quotation]', __('Add your BIC to your quotations', 'wpshop'), array(&$this, 'wpshop_bic_to_quotation_field'), 'wpshop_billing_info', 'wpshop_quotation_info');
 				}
 				register_setting('wpshop_options', 'wpshop_payment_partial', array(&$this, 'wpshop_quotation_payment_partial_validation'));
-				add_settings_field('wpshop_payment_partial', __( 'Quotation partial payment'), array(&$this, 'wpshop_quotation_payment_partial'), 'wpshop_billing_info', 'wpshop_quotation_info');
+				add_settings_field('wpshop_payment_partial', __('Quotation partial payment'), array(&$this, 'wpshop_quotation_payment_partial'), 'wpshop_billing_info', 'wpshop_quotation_info');
 			}
 
 		}
 
-		function wpshop_options_validate_wpshop_bic_to_quotation ($input) {
+		function wpshop_options_validate_wpshop_bic_to_quotation($input) {
 			return $input;
 		}
 
-		function wpshop_bic_to_quotation_field () {
+		function wpshop_bic_to_quotation_field() {
 			$add_quotation_option = get_option('wpshop_paymentMethod_options');
-			$output = '<input type="checkbox" name="wpshop_paymentMethod_options[banktransfer][add_in_quotation]" id="wpshop_paymentMethod_options[banktransfer][add_in_quotation]"  ' .( ( !empty($add_quotation_option) && !empty($add_quotation_option['banktransfer']) && !empty($add_quotation_option['banktransfer']['add_in_quotation']) ) ? 'checked="checked"' : ''). ' />';
+			$output = '<input type="checkbox" name="wpshop_paymentMethod_options[banktransfer][add_in_quotation]" id="wpshop_paymentMethod_options[banktransfer][add_in_quotation]"  ' . ((!empty($add_quotation_option) && !empty($add_quotation_option['banktransfer']) && !empty($add_quotation_option['banktransfer']['add_in_quotation'])) ? 'checked="checked"' : '') . ' />';
 			echo $output;
 		}
 
@@ -129,44 +129,44 @@ 
 
 		}
 
-		function wpshop_options_validate_quotation_validate_time ($input) {
+		function wpshop_options_validate_quotation_validate_time($input) {
 			return $input;
 		}
 
 		function wpshop_billing_number_figures_field() {
 			$wpshop_billing_number_figures = get_option('wpshop_billing_number_figures');
-			$readonly = !empty($wpshop_billing_number_figures) ? 'readonly="readonly"': null;
-			if(empty($wpshop_billing_number_figures)) $wpshop_billing_number_figures=5;
+			$readonly = !empty($wpshop_billing_number_figures) ? 'readonly="readonly"' : null;
+			if (empty($wpshop_billing_number_figures)) $wpshop_billing_number_figures = 5;
 
-			echo '<input name="wpshop_billing_number_figures" type="text" value="'.$wpshop_billing_number_figures.'" '.$readonly.' />
-		<a href="#" title="'.__('Number of figures to make appear on invoices','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+			echo '<input name="wpshop_billing_number_figures" type="text" value="' . $wpshop_billing_number_figures . '" ' . $readonly . ' />
+		<a href="#" title="'.__('Number of figures to make appear on invoices', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 		}
 
-		function wpshop_options_validate_billing_number_figures( $input ) {
+		function wpshop_options_validate_billing_number_figures($input) {
 			return $input;
 		}
 
-		function wpshop_billing_address_validator( $input ){
+		function wpshop_billing_address_validator($input) {
 			global $wpdb;
-			$t = wps_address::get_addresss_form_fields_by_type ( $input['choice'] );
+			$t = wps_address::get_addresss_form_fields_by_type($input['choice']);
 
 			$the_code = '';
-			foreach( $t[$input['choice']] as $group_id => $group_def ) {
-				if ( !empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && array_key_exists( $input['integrate_into_register_form_matching_field']['user_email'], $group_def['content']) ) {
+			foreach ($t[$input['choice']] as $group_id => $group_def) {
+				if (!empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && array_key_exists($input['integrate_into_register_form_matching_field']['user_email'], $group_def['content'])) {
 					$the_code = $group_def['content'][$input['integrate_into_register_form_matching_field']['user_email']]['name'];
 					continue;
 				}
 			}
 			$the_code;
 
-			if ( !empty($input['integrate_into_register_form']) && $input['integrate_into_register_form'] == 'yes' ) {
-				if ( !empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && $the_code == 'address_user_email') {
+			if (!empty($input['integrate_into_register_form']) && $input['integrate_into_register_form'] == 'yes') {
+				if (!empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && $the_code == 'address_user_email') {
 					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('_need_verification' => 'no'), array('code' => $the_code));
 				}
 			}
 
-			$billing_option = get_option( 'wpshop_billing_address' );
-			if( !empty($billing_option) && !empty( $billing_option['display_model'] ) ) {
+			$billing_option = get_option('wpshop_billing_address');
+			if (!empty($billing_option) && !empty($billing_option['display_model'])) {
 				$input['display_model'] = $billing_option['display_model'];
 			}
 
@@ -179,10 +179,10 @@ 
 
 			$wpshop_billing_address = get_option('wpshop_billing_address');
 
-			$query = $wpdb->prepare('SELECT ID FROM ' .$wpdb->posts. ' WHERE post_name = "%s" AND post_type = "%s"', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_name = "%s" AND post_type = "%s"', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
 			$entity_id = $wpdb->get_var($query);
 
-			$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $entity_id);
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
 			$content = $wpdb->get_results($query);
 
 			/*	Field for billing address type choice	*/
@@ -191,21 +191,21 @@ 
 			$input_def['possible_value'] = $content;
 			$input_def['type'] = 'select';
 			$input_def['value'] = $wpshop_billing_address['choice'];
-			$output .= '<div>' .wpshop_form::check_input_type($input_def). '</div>';
+			$output .= '<div>' . wpshop_form::check_input_type($input_def) . '</div>';
 
 			/*	Field for integrate billign form into register form	*/
 			$input_def = array();
 			$input_def['name'] = 'wpshop_billing_address[integrate_into_register_form]';
 			$input_def['id'] = 'wpshop_billing_address_integrate_into_register_form';
-			$input_def['possible_value'] = array( 'yes' => __('Integrate billing form into register form', 'wpshop') );
+			$input_def['possible_value'] = array('yes' => __('Integrate billing form into register form', 'wpshop'));
 			$input_def['valueToPut'] = 'index';
 			$input_def['options_label']['original'] = true;
 			$input_def['option'] = ' class="wpshop_billing_address_integrate_into_register_form" ';
 			$input_def['type'] = 'checkbox';
-			$input_def['value'] = array( !empty($wpshop_billing_address['integrate_into_register_form']) ? $wpshop_billing_address['integrate_into_register_form'] : '' );
+			$input_def['value'] = array(!empty($wpshop_billing_address['integrate_into_register_form']) ? $wpshop_billing_address['integrate_into_register_form'] : '');
 			$output .= '
 <div class="wpshop_include_billing_form_into_register_container" >
-	' .wpshop_form::check_input_type($input_def). '
+	' .wpshop_form::check_input_type($input_def) . '
 	<input type="hidden" name="wpshop_ajax_integrate_billin_into_register" id="wpshop_ajax_integrate_billin_into_register" value="' . wp_create_nonce('wpshop_ajax_integrate_billin_into_register') . '" />
 	<input type="hidden" name="wpshop_include_billing_form_into_register_where_value" id="wpshop_include_billing_form_into_register_where_value" value="' . (!empty($wpshop_billing_address['integrate_into_register_form_after_field']) ? $wpshop_billing_address['integrate_into_register_form_after_field'] : '') . '" />
 	<div class="wpshop_include_billing_form_into_register_where" ></div>
@@ -218,13 +218,13 @@ 
 
 		}
 
-		function wpshop_quotation_validate_time_field () {
+		function wpshop_quotation_validate_time_field() {
 			$quotation_option = get_option('wpshop_quotation_validate_time');
-			$output  = '<input type="text" name="wpshop_quotation_validate_time[number]" id="wpshop_quotation_validate_time[number]" style="width:50px;" value="' .( ( !empty($quotation_option) && !empty($quotation_option['number']) ) ? $quotation_option['number'] : null ). '" />';
+			$output  = '<input type="text" name="wpshop_quotation_validate_time[number]" id="wpshop_quotation_validate_time[number]" style="width:50px;" value="' . ((!empty($quotation_option) && !empty($quotation_option['number'])) ? $quotation_option['number'] : null) . '" />';
 			$output .= '<select name="wpshop_quotation_validate_time[time_type]" id="wpshop_quotation_validate_time[time_type]">';
-			$output .= '<option value="day" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'day') ? 'selected="selected"' : ''). '>' .__('Days', 'wpshop'). '</option>';
-			$output .= '<option value="month" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'month') ? 'selected="selected"' : ''). '>' .__('Months', 'wpshop'). '</option>';
-			$output .= '<option value="year" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'year') ? 'selected="selected"' : ''). '>' .__('Years', 'wpshop'). '</option>';
+			$output .= '<option value="day" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'day') ? 'selected="selected"' : '') . '>' . __('Days', 'wpshop') . '</option>';
+			$output .= '<option value="month" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'month') ? 'selected="selected"' : '') . '>' . __('Months', 'wpshop') . '</option>';
+			$output .= '<option value="year" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'year') ? 'selected="selected"' : '') . '>' . __('Years', 'wpshop') . '</option>';
 			$output .= '</select>';
 
 			echo $output;
@@ -237,19 +237,19 @@ 
 		 *
 		 * @return string The new invoice number
 		 */
-		public static function generate_invoice_number( $order_id ) {
+		public static function generate_invoice_number($order_id) {
 			/**	Get configuration about the number of figure dor invoice number	*/
 
 			$number_figures = get_option('wpshop_billing_number_figures', false);
 
 			/** If the number doesn't exist, we create a default one */
-			if(!$number_figures) {
+			if (!$number_figures) {
 				update_option('wpshop_billing_number_figures', 5);
 			}
 
 			/** sleep my script, SLEEP I SAY ! **/
-			$rand_time = rand( 1000, 200000 );
-			usleep( $rand_time );
+			$rand_time = rand(1000, 200000);
+			usleep($rand_time);
 			/** GET UP !! **/
 
 			/**	Get last invoice number	*/
@@ -265,14 +265,14 @@ 
 
 			/** Check if number exists **/
 			$billing_current_number_checking = get_option('wpshop_billing_current_number', false);
-			if ( $billing_current_number_checking == $billing_current_number ) {
+			if ($billing_current_number_checking == $billing_current_number) {
 				$billing_current_number++;
 			}
 
 			update_option('wpshop_billing_current_number', $billing_current_number);
 
 			/**	Create the new invoice number with all parameters viewed above	*/
-			$invoice_ref = WPSHOP_BILLING_REFERENCE_PREFIX . ((string)sprintf('%0'.$number_figures.'d', $billing_current_number));
+			$invoice_ref = WPSHOP_BILLING_REFERENCE_PREFIX . ((string)sprintf('%0' . $number_figures . 'd', $billing_current_number));
 
 			return $invoice_ref;
 		}
@@ -286,67 +286,67 @@ 
 		 *
 		 * @return string The invoice output in case no error is found. The error in other case
 		 */
-		public static function generate_html_invoice( $order_id, $invoice_ref ) {
+		public static function generate_html_invoice($order_id, $invoice_ref) {
 			global $wpdb;
 
-			$date_output_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
+			$date_output_format = get_option('date_format') . ' ' . get_option('time_format');
 			$count_products = 0;
 
-			if ( !empty($order_id) ) {
+			if (!empty($order_id)) {
 				$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
 				$discounts_exists = false;
 
-				$is_quotation = ( empty($order_postmeta['order_key']) && !empty($order_postmeta['order_temporary_key']) ) ? true : false;
+				$is_quotation = (empty($order_postmeta['order_key']) && !empty($order_postmeta['order_temporary_key'])) ? true : false;
 				/** Check if it's a partial payment bill **/
 				$is_partial_payment = false;
-				if( isset( $order_postmeta['order_payment']['received'] ) && !empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid' ) {
-					foreach( $order_postmeta['order_payment']['received'] as $key => $payment ) {
-						if( isset( $payment['invoice_ref'] ) && $payment['invoice_ref'] == $invoice_ref ) {
+				if (isset($order_postmeta['order_payment']['received']) && !empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid') {
+					foreach ($order_postmeta['order_payment']['received'] as $key => $payment) {
+						if (isset($payment['invoice_ref']) && $payment['invoice_ref'] == $invoice_ref) {
 							$is_partial_payment = true;
 							break;
 						}
 					}
-				} elseif( !empty($invoice_ref) && !empty($order_postmeta['order_invoice_ref'])  && $order_postmeta['order_invoice_ref'] != $invoice_ref ) {
+				} elseif (!empty($invoice_ref) && !empty($order_postmeta['order_invoice_ref']) && $order_postmeta['order_invoice_ref'] != $invoice_ref) {
 					$is_partial_payment = true;
-				} elseif( empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid' ) {
+				} elseif (empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid') {
 					$is_partial_payment = true;
 				}
 
 				/** Check it is a shipping slip **/
-				$bon_colisage = !empty( $_GET['bon_colisage'] ) ? sanitize_key( $_GET['bon_colisage'] ) : false;
-				if ( $bon_colisage ) $bon_colisage = true;
+				$bon_colisage = !empty($_GET['bon_colisage']) ? sanitize_key($_GET['bon_colisage']) : false;
+				if ($bon_colisage) $bon_colisage = true;
 
-				if ( !empty($order_postmeta) ) {
+				if (!empty($order_postmeta)) {
 					$tpl_component = array();
 
 					/** Billing Header **/
 					//Logo
 					$logo_options = get_option('wpshop_logo');
-					$tpl_component['INVOICE_LOGO'] = ( !empty($logo_options) ) ? '<img src="' .$logo_options .'" alt="" />' : '';
+					$tpl_component['INVOICE_LOGO'] = (!empty($logo_options)) ? '<img src="' . $logo_options . '" alt="" />' : '';
 
 					// Title
-					$tpl_component['INVOICE_TITLE'] = ($is_partial_payment) ? __('Bill payment', 'wpshop') : ( ( $is_quotation ) ?  __('Quotation', 'wpshop') : __('Invoice', 'wpshop') );
+					$tpl_component['INVOICE_TITLE'] = ($is_partial_payment) ? __('Bill payment', 'wpshop') : (($is_quotation) ? __('Quotation', 'wpshop') : __('Invoice', 'wpshop'));
 
 // 					if ( empty($order_postmeta['order_invoice_ref']) ) {
 // 						$tpl_component['INVOICE_TITLE'] = __('Bill payment', 'wpshop');
 // 						$is_partial_payment = true;
 // 					}
 
-					if ( $bon_colisage ) {
-						$tpl_component['INVOICE_TITLE'] = __( 'Products List', 'wpshop' );
+					if ($bon_colisage) {
+						$tpl_component['INVOICE_TITLE'] = __('Products List', 'wpshop');
 					}
 
-					$tpl_component['INVOICE_ORDER_INVOICE_REF'] = ( !empty($invoice_ref) ) ? $invoice_ref : (!empty($order_postmeta['order_invoice_ref']) ? $order_postmeta['order_invoice_ref'] : null);
-					if ( $bon_colisage ) {
+					$tpl_component['INVOICE_ORDER_INVOICE_REF'] = (!empty($invoice_ref)) ? $invoice_ref : (!empty($order_postmeta['order_invoice_ref']) ? $order_postmeta['order_invoice_ref'] : null);
+					if ($bon_colisage) {
 						$tpl_component['INVOICE_ORDER_INVOICE_REF'] = '';
 					}
-					$tpl_component['INVOICE_ORDER_KEY_INDICATION'] = ( $is_quotation ) ? sprintf( __('Ref. %s', 'wpshop'),$order_postmeta['order_temporary_key']) : sprintf( __('Order n. %s', 'wpshop'), $order_postmeta['order_key'] );
-					$tpl_component['INVOICE_ORDER_DATE_INDICATION'] = ( $is_quotation ) ? sprintf( __('Quotation date %s', 'wpshop'), mysql2date($date_output_format ,$order_postmeta['order_date'], true) ) : sprintf( __('Order date %s', 'wpshop'), mysql2date($date_output_format ,$order_postmeta['order_date'], true) );
+					$tpl_component['INVOICE_ORDER_KEY_INDICATION'] = ($is_quotation) ? sprintf(__('Ref. %s', 'wpshop'), $order_postmeta['order_temporary_key']) : sprintf(__('Order n. %s', 'wpshop'), $order_postmeta['order_key']);
+					$tpl_component['INVOICE_ORDER_DATE_INDICATION'] = ($is_quotation) ? sprintf(__('Quotation date %s', 'wpshop'), mysql2date($date_output_format, $order_postmeta['order_date'], true)) : sprintf(__('Order date %s', 'wpshop'), mysql2date($date_output_format, $order_postmeta['order_date'], true));
 
 					/** Validate period for Quotation **/
-					if ( $is_quotation ) {
-						$quotation_validate_period = self::quotation_validate_period( $order_postmeta['order_date'] );
+					if ($is_quotation) {
+						$quotation_validate_period = self::quotation_validate_period($order_postmeta['order_date']);
 					}
 					else {
 						$tpl_component['INVOICE_VALIDATE_TIME'] = '';
@@ -354,22 +354,22 @@ 
 
 					$tpl_component['INVOICE_VALIDATE_TIME'] = empty($tpl_component['INVOICE_VALIDATE_TIME']) ? '' : $tpl_component['INVOICE_VALIDATE_TIME'];
 
-					$tpl_component['AMOUNT_INFORMATION'] = ( !$bon_colisage ) ? sprintf( __('Amount are shown in %s', 'wpshop'), wpshop_tools::wpshop_get_currency( true ) ) : '';
+					$tpl_component['AMOUNT_INFORMATION'] = (!$bon_colisage) ? sprintf(__('Amount are shown in %s', 'wpshop'), wpshop_tools::wpshop_get_currency(true)) : '';
 
 
 
 					// Sender & receiver addresses
 					$tpl_component['INVOICE_SENDER'] = self::generate_invoice_sender_part( );
-					$tpl_component['INVOICE_RECEIVER'] = self::generate_receiver_part( $order_id, $bon_colisage );
+					$tpl_component['INVOICE_RECEIVER'] = self::generate_receiver_part($order_id, $bon_colisage);
 
 					$tpl_component['INVOICE_TRACKING'] = '';
 					$first = false;
-					if( !empty($order_postmeta['order_trackingNumber']) ) {
+					if (!empty($order_postmeta['order_trackingNumber'])) {
 						$tpl_component['INVOICE_TRACKING'] = __('Tracking : ', 'wpshop') . $order_postmeta['order_trackingNumber'];
 						$first = true;
 					}
-					if( !empty($order_postmeta['order_trackingLink']) ) {
-						if( !$first ) {
+					if (!empty($order_postmeta['order_trackingLink'])) {
+						if (!$first) {
 							$tpl_component['INVOICE_TRACKING'] = __('Tracking : ', 'wpshop') . $order_postmeta['order_trackingLink'];
 						} else {
 							$tpl_component['INVOICE_TRACKING'] .= ' - ' . $order_postmeta['order_trackingLink'];
@@ -379,22 +379,22 @@ 
 
 					/** Items Tab **/
 					$order_tva = array();
-					if ( $bon_colisage ) {
+					if ($bon_colisage) {
 						$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('bon_colisage_row_header', array(), array(), 'common');
 					}
 					else {
 						$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('invoice_row_header', array(), array(), 'common');
 						//if ( !$is_quotation ) {
 							/** Check if products have discounts **/
-							if ( !empty($order_postmeta['order_items']) && !$is_partial_payment ) {
-								foreach( $order_postmeta['order_items'] as $item_id => $item ) {
-									if ( !empty($item['item_global_discount_value']) || !empty($item['item_unit_discount_value']) ) {
+							if (!empty($order_postmeta['order_items']) && !$is_partial_payment) {
+								foreach ($order_postmeta['order_items'] as $item_id => $item) {
+									if (!empty($item['item_global_discount_value']) || !empty($item['item_unit_discount_value'])) {
 										$discounts_exists = true;
 									}
 								}
 							}
 
-							if ( $discounts_exists ) {
+							if ($discounts_exists) {
 								$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('invoice_row_header_with_discount', array(), array(), 'common');
 							}
 
@@ -404,113 +404,113 @@ 
 					$total_discounted = 0;
 					$tpl_component['INVOICE_ROWS'] = '';
 
-					if( !$is_partial_payment ) {
-						if ( !empty($order_postmeta['order_items']) ) {
-							foreach( $order_postmeta['order_items'] as $item_id => $item ) {
+					if (!$is_partial_payment) {
+						if (!empty($order_postmeta['order_items'])) {
+							foreach ($order_postmeta['order_items'] as $item_id => $item) {
 								$sub_tpl_component = array();
 								$count_products += $item['item_qty'];
-								$barcode = get_post_meta( $item['item_id'], '_barcode', true );
-								if ( empty($barcode) ) {
-									$product_metadata = get_post_meta( $item['item_id'], '_wpshop_product_metadata', true );
-									$barcode = ( !empty($product_metadata) && !empty($product_metadata['barcode']) ) ? $product_metadata['barcode'] : '';
-
-									if( empty($barcode) ) {
-										$product_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-										$att_def = wpshop_attributes::getElement( 'barcode', '"valid"', 'code' );
-										$query = $wpdb->prepare( 'SELECT value FROM ' .$wpdb->prefix. 'wpshop__attribute_value_'.$att_def->data_type. ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d AND value != ""', $product_entity, $att_def->id, $item['item_id'] );
-										$barcode = $wpdb->get_var( $query );
+								$barcode = get_post_meta($item['item_id'], '_barcode', true);
+								if (empty($barcode)) {
+									$product_metadata = get_post_meta($item['item_id'], '_wpshop_product_metadata', true);
+									$barcode = (!empty($product_metadata) && !empty($product_metadata['barcode'])) ? $product_metadata['barcode'] : '';
+
+									if (empty($barcode)) {
+										$product_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+										$att_def = wpshop_attributes::getElement('barcode', '"valid"', 'code');
+										$query = $wpdb->prepare('SELECT value FROM ' . $wpdb->prefix . 'wpshop__attribute_value_' . $att_def->data_type . ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d AND value != ""', $product_entity, $att_def->id, $item['item_id']);
+										$barcode = $wpdb->get_var($query);
 									}
 								}
-								$sub_tpl_component['INVOICE_ROW_ITEM_BARCODE'] = ( !empty($barcode) ) ? $barcode : '-';
+								$sub_tpl_component['INVOICE_ROW_ITEM_BARCODE'] = (!empty($barcode)) ? $barcode : '-';
 
-								$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = ( !empty($barcode) ) ? $barcode : $item['item_ref'];
+								$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = (!empty($barcode)) ? $barcode : $item['item_ref'];
 
 								/** Item name **/
 								$is_variation = false;
-								if( get_post_type( $item['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+								if (get_post_type($item['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
 									$is_variation = true;
-									$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-									if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+									$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+									if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 										$parent_post = $parent_def['parent_post'];
 										$item_parent_id = $parent_post->ID;
-										$item_title =  $parent_post->post_title;
+										$item_title = $parent_post->post_title;
 									}
 								} else {
 									$item_title = $item['item_name'];
 								}
 								$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = $item_title;
 								/**	Get attribute order for current product	*/
-								$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+								$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 								$output_order = array();
-								if ( count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail) ) {
-									foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-										foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-											if ( !empty($attribute_def->code) )
+								if (count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail)) {
+									foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+										foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+											if (!empty($attribute_def->code))
 												$output_order[$attribute_def->code] = $position;
 										}
 									}
 								}
-								$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $item['item_meta'], $output_order, 'invoice_print', 'common');
+								$variation_attribute_ordered = wpshop_products::get_selected_variation_display($item['item_meta'], $output_order, 'invoice_print', 'common');
 								ksort($variation_attribute_ordered['attribute_list']);
 								$detail_tpl_component['CART_PRODUCT_MORE_INFO'] = '';
-								foreach ( $variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output ) {
+								foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
 									$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= $attribute_variation_to_output;
 								}
 								$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = !empty($detail_tpl_component['CART_PRODUCT_MORE_INFO']) ? wpshop_display::display_template_element('invoice_row_item_detail', $detail_tpl_component, array(), 'common') : '';
-								unset( $detail_tpl_component );
+								unset($detail_tpl_component);
 
 								$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = $item['item_qty'];
-								$sub_tpl_component['INVOICE_ROW_ITEM_PU_TTC'] = ( ( !empty($item['item_pu_ttc_before_discount']) ) ? number_format( $item['item_pu_ttc_before_discount'], 2, '.', '' ) : number_format( $item['item_pu_ttc'], 2, '.', '' ) );
-								$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = ( ( !empty($item['item_pu_ht_before_discount']) ) ? number_format( $item['item_pu_ht_before_discount'], 2, '.', '' ) : number_format( $item['item_pu_ht'], 2, '.', '' ) );
-								$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] =  ( !empty($item['item_discount_value']) )  ?  number_format($item['item_discount_value'], 2, '.', '') : number_format(0, 2, '.', '' );
-								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] =  number_format( ($item['item_pu_ht'] * $item['item_qty']), 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_PU_TTC'] = ((!empty($item['item_pu_ttc_before_discount'])) ? number_format($item['item_pu_ttc_before_discount'], 2, '.', '') : number_format($item['item_pu_ttc'], 2, '.', ''));
+								$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = ((!empty($item['item_pu_ht_before_discount'])) ? number_format($item['item_pu_ht_before_discount'], 2, '.', '') : number_format($item['item_pu_ht'], 2, '.', ''));
+								$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = (!empty($item['item_discount_value'])) ? number_format($item['item_discount_value'], 2, '.', '') : number_format(0, 2, '.', '');
+								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format(($item['item_pu_ht'] * $item['item_qty']), 2, '.', '');
 								/** TVA **/
-								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format($item['item_tva_total_amount'], 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format($item['item_tva_total_amount'], 2, '.', '');
 								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = $item['item_tva_rate'];
 
 
-								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format( $item['item_total_ttc'], 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format($item['item_total_ttc'], 2, '.', '');
 
 
 								/** Checking Rate amount **/
-								if ( !$bon_colisage ) {
-								 $checking = self::check_product_price( $item['item_total_ht'],  $item['item_total_ttc'], $item['item_tva_total_amount'], $item['item_tva_rate'], $item['item_id'], $invoice_ref, $order_id );
-								 if( !$checking ) {
+								if (!$bon_colisage) {
+								 $checking = self::check_product_price($item['item_total_ht'], $item['item_total_ttc'], $item['item_tva_total_amount'], $item['item_tva_rate'], $item['item_id'], $invoice_ref, $order_id);
+								 if (!$checking) {
 								 	return __('Invoice cannot be generate because an error was found. The website administrator has been warned.', 'wpshop');
 								 }
 								}
 
-								if ( $bon_colisage ) {
+								if ($bon_colisage) {
 									$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('bon_colisage_row', $sub_tpl_component, array(), 'common');
 								}
 								else {
-									if ( $discounts_exists ) {
+									if ($discounts_exists) {
 										$discounted_total_per_item = $item['item_total_ht'];
 										/** Unit Discount **/
-										if ( !empty($item['item_unit_discount_amount']) && !empty($item['item_unit_discount_value']) ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( $item['item_unit_discount_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( $item['item_unit_discount_value'], 2, '.', '');
+										if (!empty($item['item_unit_discount_amount']) && !empty($item['item_unit_discount_value'])) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format($item['item_unit_discount_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format($item['item_unit_discount_value'], 2, '.', '');
 											$discounted_total_per_item = $discounted_total_per_item - $item['item_unit_discount_amount'];
 										}
 										else {
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 										}
 
 										/** Global Discount **/
-										if ( !empty($item['item_global_discount_amount']) && !empty($item['item_global_discount_value']) ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( $item['item_global_discount_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( $item['item_global_discount_value'], 2, '.', '');
+										if (!empty($item['item_global_discount_amount']) && !empty($item['item_global_discount_value'])) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format($item['item_global_discount_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format($item['item_global_discount_value'], 2, '.', '');
 											$discounted_total_per_item = $discounted_total_per_item - $item['item_global_discount_amount'];
 										}
 										else {
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 										}
 
 										$total_discounted += $discounted_total_per_item;
 										/** Total HT Discounted **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = number_format( $discounted_total_per_item, 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = number_format($discounted_total_per_item, 2, '.', '');
 
 										$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row_with_discount', $sub_tpl_component, array(), 'common');
 									}
@@ -518,14 +518,14 @@ 
 										$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row', $sub_tpl_component, array(), 'common');
 									}
 								}
-								unset( $sub_tpl_component );
+								unset($sub_tpl_component);
 
 								/** Check TVA **/
-								if ( empty($order_tva[ $item['item_tva_rate'] ]) ) {
-									$order_tva[ $item['item_tva_rate'] ] = $item['item_tva_total_amount'];
+								if (empty($order_tva[$item['item_tva_rate']])) {
+									$order_tva[$item['item_tva_rate']] = $item['item_tva_total_amount'];
 								}
 								else {
-									$order_tva[ $item['item_tva_rate'] ] += $item['item_tva_total_amount'];
+									$order_tva[$item['item_tva_rate']] += $item['item_tva_total_amount'];
 								}
 
 							}
@@ -536,33 +536,33 @@ 
 
 						/** Display Partials payments **/
 						$total_partial_payment = 0; $last_payment = 0;
-						$order_invoice_ref = ( !empty($order_postmeta['order_invoice_ref']) ) ? $order_postmeta['order_invoice_ref'] : '';
-						if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage ) {
-							foreach( $order_postmeta['order_payment']['received'] as $received_payment ) {
-								if ( !empty($received_payment['invoice_ref']) && $received_payment['invoice_ref'] != $order_invoice_ref ) {
-									if ( intval( substr($received_payment['invoice_ref'], 2) ) == intval( substr($tpl_component['INVOICE_ORDER_INVOICE_REF'], 2) )) {
+						$order_invoice_ref = (!empty($order_postmeta['order_invoice_ref'])) ? $order_postmeta['order_invoice_ref'] : '';
+						if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage) {
+							foreach ($order_postmeta['order_payment']['received'] as $received_payment) {
+								if (!empty($received_payment['invoice_ref']) && $received_payment['invoice_ref'] != $order_invoice_ref) {
+									if (intval(substr($received_payment['invoice_ref'], 2)) == intval(substr($tpl_component['INVOICE_ORDER_INVOICE_REF'], 2))) {
 										$sub_tpl_component = array();
 										$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = $received_payment['invoice_ref'];
 
 										/** Item name **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf( __('Partial payment on order %1$s', 'wpshop'), $order_postmeta['order_key'], __( $received_payment['method'], 'wpshop'), $received_payment['payment_reference']);
+										$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf(__('Partial payment on order %1$s', 'wpshop'), $order_postmeta['order_key'], __($received_payment['method'], 'wpshop'), $received_payment['payment_reference']);
 										$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = '';
 										$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = 1;
-										$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
-										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] =  number_format(0, 2, '.', '' );
-										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
 
 										/** TVA **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '');
 										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = 0;
-										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
 
-										if ( $discounts_exists ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = '-'.number_format( $received_payment['received_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+										if ($discounts_exists) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 
 											$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row_with_discount', $sub_tpl_component, array(), 'common');
 										}
@@ -571,11 +571,11 @@ 
 										}
 									}
 
-									unset( $sub_tpl_component );
-									$total_partial_payment += ( !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'] : 0;
+									unset($sub_tpl_component);
+									$total_partial_payment += (!empty($received_payment['received_amount'])) ? $received_payment['received_amount'] : 0;
 								}
-								else if( 'payment_received' == $received_payment[ 'status' ] ) {
-									$last_payment += ( !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'] : 0;
+								else if ('payment_received' == $received_payment['status']) {
+									$last_payment += (!empty($received_payment['received_amount'])) ? $received_payment['received_amount'] : 0;
 								}
 
 							}
@@ -584,24 +584,24 @@ 
 					else {
 						/** Display Partials payments **/
 						$total_partial_payment = 0; $last_payment = 0;
-						if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage ) {
-							foreach( $order_postmeta['order_payment']['received'] as $key => $received_payment ) {
-								if ( !empty($received_payment['invoice_ref']) && !empty($invoice_ref) && $received_payment['invoice_ref'] == $invoice_ref ) {
+						if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage) {
+							foreach ($order_postmeta['order_payment']['received'] as $key => $received_payment) {
+								if (!empty($received_payment['invoice_ref']) && !empty($invoice_ref) && $received_payment['invoice_ref'] == $invoice_ref) {
 									$sub_tpl_component = array();
 									$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = $received_payment['invoice_ref'];
 									/** Item name **/
-									$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf( __('Partial payment %4$d on order %1$s', 'wpshop'), $order_postmeta['order_key'], __( $received_payment['method'], 'wpshop'), $received_payment['payment_reference'], $key+1);
+									$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf(__('Partial payment %4$d on order %1$s', 'wpshop'), $order_postmeta['order_key'], __($received_payment['method'], 'wpshop'), $received_payment['payment_reference'], $key + 1);
 									$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = '';
 									$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = 1;
-									$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = number_format( $received_payment['received_amount'], 2, '.', '' );
-									$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '' );
-									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format( $received_payment['received_amount'], 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = number_format($received_payment['received_amount'], 2, '.', '');
+									$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format($received_payment['received_amount'], 2, '.', '');
 									/** TVA **/
-									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '');
 									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = 0;
-									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format( $received_payment['received_amount'], 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format($received_payment['received_amount'], 2, '.', '');
 									$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 									$total_partial_payment += $received_payment['received_amount'];
 								}
 							}
@@ -614,126 +614,126 @@ 
 					/** Summary of order **/
 					$summary_tpl_component = array();
 					$tpl_component['INVOICE_SUMMARY_PART'] = $summary_tpl_component['INVOICE_SUMMARY_TAXES'] = '';
-					if ( !$bon_colisage ) {
-						if ( !empty( $order_tva ) ) {
-							foreach( $order_tva as $tax_rate => $tax_amount ) {
-								if ( $tax_amount > 0 ) {
-									$tax_rate = ( !empty($tax_rate) && $tax_rate == 'VAT_shipping_cost' ) ?  __('on Shipping cost', 'wpshop').' '.WPSHOP_VAT_ON_SHIPPING_COST : $tax_rate;
-									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf( __('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%' );
+					if (!$bon_colisage) {
+						if (!empty($order_tva)) {
+							foreach ($order_tva as $tax_rate => $tax_amount) {
+								if ($tax_amount > 0) {
+									$tax_rate = (!empty($tax_rate) && $tax_rate == 'VAT_shipping_cost') ? __('on Shipping cost', 'wpshop') . ' ' . WPSHOP_VAT_ON_SHIPPING_COST : $tax_rate;
+									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf(__('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%');
 									$sub_tpl_component['SUMMARY_ROW_VALUE'] = wpshop_display::format_field_output('wpshop_product_price', $tax_amount) . ' ' . wpshop_tools::wpshop_get_currency();
 									$summary_tpl_component['INVOICE_SUMMARY_TAXES'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 								}
-								elseif( $is_partial_payment ) {
+								elseif ($is_partial_payment) {
 									$tax_rate = 0;
-									$tax_amount = number_format( 0, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
-									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf( __('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%' );
+									$tax_amount = number_format(0, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
+									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf(__('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%');
 									$sub_tpl_component['SUMMARY_ROW_VALUE'] = wpshop_display::format_field_output('wpshop_product_price', $tax_amount) . ' ' . wpshop_tools::wpshop_get_currency();
 									$summary_tpl_component['INVOICE_SUMMARY_TAXES'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 								}
 							}
 						}
 
 						/** If Discount Exist **/
 						// Checking Discounts on order
-						if( !empty($order_postmeta['order_discount_type']) && $order_postmeta['order_discount_value'] ) {
+						if (!empty($order_postmeta['order_discount_type']) && $order_postmeta['order_discount_value']) {
 							$discounts_exists = true;
 							// Calcul discount on Order
-							switch( $order_postmeta['order_discount_type'] ) {
+							switch ($order_postmeta['order_discount_type']) {
 								case 'amount':
-									$total_discounted += number_format( str_replace( ',', '.', $order_postmeta['order_discount_value'] ), 2, '.', '' );
+									$total_discounted += number_format(str_replace(',', '.', $order_postmeta['order_discount_value']), 2, '.', '');
 									break;
 								case 'percent':
-									$total_discounted += number_format( $order_postmeta['order_grand_total_before_discount'], 2, '.', '') * ( number_format( str_replace( ',', '.', $order_postmeta['order_discount_value']), 2, '.', '') / 100 );
+									$total_discounted += number_format($order_postmeta['order_grand_total_before_discount'], 2, '.', '') * (number_format(str_replace(',', '.', $order_postmeta['order_discount_value']), 2, '.', '') / 100);
 									break;
 							}
 						}
-						if ( !empty($total_discounted) && $discounts_exists ) {
+						if (!empty($total_discounted) && $discounts_exists) {
 							$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Discounted Total', 'wpshop');
-							$sub_tpl_component['SUMMARY_ROW_VALUE'] = number_format( $total_discounted, 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency();
+							$sub_tpl_component['SUMMARY_ROW_VALUE'] = number_format($total_discounted, 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency();
 							$summary_tpl_component['INVOICE_SUMMARY_TOTAL_DISCOUNTED'] = wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-							unset( $sub_tpl_component );
+							unset($sub_tpl_component);
 						}
 						else {
 							$summary_tpl_component['INVOICE_SUMMARY_TOTAL_DISCOUNTED'] = '';
 						}
 
 						$shipping_cost = 0;
-						if ( !$is_partial_payment ) {
-							if( !empty($order_postmeta['order_shipping_cost']) ) {
+						if (!$is_partial_payment) {
+							if (!empty($order_postmeta['order_shipping_cost'])) {
 								$shipping_cost = $order_postmeta['order_shipping_cost'];
 							}
 						}
-						$price_piloting = get_option( 'wpshop_shop_price_piloting', 'TTC' );
-						$shipping_taxes = 'HT' == $price_piloting ? ( WPSHOP_VAT_ON_SHIPPING_COST / 100 ) * $shipping_cost : $shipping_cost - ( $shipping_cost / ( 1 + WPSHOP_VAT_ON_SHIPPING_COST / 100 ) );
-						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = number_format( $shipping_cost, 2, ',', '' );
-						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST_TAXES'] = number_format( $shipping_taxes, 2, ',', '' );
+						$price_piloting = get_option('wpshop_shop_price_piloting', 'TTC');
+						$shipping_taxes = 'HT' == $price_piloting ? (WPSHOP_VAT_ON_SHIPPING_COST / 100) * $shipping_cost : $shipping_cost - ($shipping_cost / (1 + WPSHOP_VAT_ON_SHIPPING_COST / 100));
+						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = number_format($shipping_cost, 2, ',', '');
+						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST_TAXES'] = number_format($shipping_taxes, 2, ',', '');
 						//$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = ( $is_partial_payment ) ? number_format( 0, 2, ',', '') : number_format( ( (!empty($order_postmeta['order_shipping_cost']) ) ? $order_postmeta['order_shipping_cost'] : 0 ), 2, ',', '' );
 
-						$summary_tpl_component['INVOICE_ORDER_GRAND_TOTAL'] = ( $is_partial_payment ) ?  number_format(0, 2, ',', '' ) : number_format( $order_postmeta['order_grand_total'], 2, ',', ''); // - $total_partial_payment , 2, ',', '' );
-						$summary_tpl_component['INVOICE_ORDER_TOTAL_HT'] = ( $is_partial_payment ) ?  number_format(0, 2, ',', '' ) : number_format( $order_postmeta['order_total_ht'], 2, ',', '' );
+						$summary_tpl_component['INVOICE_ORDER_GRAND_TOTAL'] = ($is_partial_payment) ? number_format(0, 2, ',', '') : number_format($order_postmeta['order_grand_total'], 2, ',', ''); // - $total_partial_payment , 2, ',', '' );
+						$summary_tpl_component['INVOICE_ORDER_TOTAL_HT'] = ($is_partial_payment) ? number_format(0, 2, ',', '') : number_format($order_postmeta['order_total_ht'], 2, ',', '');
 
 						$summary_tpl_component['TOTAL_BEFORE_DISCOUNT'] = number_format($order_postmeta['order_grand_total_before_discount'], 2, ',', '');
 
 						$total_payment = 0;
 
 						/** Amount paid **/
-						if ( empty($order_postmeta['order_invoice_ref']) ) {
+						if (empty($order_postmeta['order_invoice_ref'])) {
 							foreach ($order_postmeta['order_payment']['received'] as $key => $value) {
-								if ( !empty($value['invoice_ref']) && $value['invoice_ref'] === $tpl_component['INVOICE_ORDER_INVOICE_REF'] ) {
+								if (!empty($value['invoice_ref']) && $value['invoice_ref'] === $tpl_component['INVOICE_ORDER_INVOICE_REF']) {
 									$total_payment = number_format($value['received_amount'], 2, ',', '');
 								}
 							}
 						}
 						else {
-							$total_payment = ( ($total_partial_payment+$last_payment) !== $order_postmeta['order_grand_total'] ) ? number_format($total_partial_payment+$last_payment, 2, ',', '') : $order_postmeta['order_grand_total'];
+							$total_payment = (($total_partial_payment + $last_payment) !== $order_postmeta['order_grand_total']) ? number_format($total_partial_payment + $last_payment, 2, ',', '') : $order_postmeta['order_grand_total'];
 						}
 
 						$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Amount already paid', 'wpshop');
-						$sub_tpl_component['SUMMARY_ROW_VALUE'] = ( !$is_partial_payment ) ? number_format( $last_payment, 2, ',', '') .' ' . wpshop_tools::wpshop_get_currency() : $total_payment .' ' . wpshop_tools::wpshop_get_currency();
+						$sub_tpl_component['SUMMARY_ROW_VALUE'] = (!$is_partial_payment) ? number_format($last_payment, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency() : $total_payment . ' ' . wpshop_tools::wpshop_get_currency();
 						//$sub_tpl_component['SUMMARY_ROW_VALUE'] = ( $is_partial_payment ) ?  number_format($total_partial_payment, 2, ',', '' ). ' ' . wpshop_tools::wpshop_get_currency() : number_format($order_postmeta['order_grand_total'], 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
 						$summary_tpl_component['INVOICE_SUMMARY_MORE'] = wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-						unset( $sub_tpl_component );
+						unset($sub_tpl_component);
 
 						$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Number of products', 'wpshop');
 						$sub_tpl_component['SUMMARY_ROW_VALUE'] = $count_products;
 						$summary_tpl_component['INVOICE_SUMMARY_MORE'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-						unset( $sub_tpl_component );
+						unset($sub_tpl_component);
 
 
 						/** If Discount Exist **/
-						if ( !empty($order_postmeta['coupon_id']) && !empty($order_postmeta['order_discount_value']) ) {
+						if (!empty($order_postmeta['coupon_id']) && !empty($order_postmeta['order_discount_value'])) {
 							$tpl_discount_component = array();
 							$tpl_discount_component['DISCOUNT_VALUE'] = ($order_postmeta['order_discount_type'] == 'percent') ? number_format($order_postmeta['order_discount_amount_total_cart'], 2, ',', '') : number_format($order_postmeta['order_discount_value'], 2, ',', '');
 
 							$tpl_discount_component['TOTAL_BEFORE_DISCOUNT'] = number_format($order_postmeta['order_grand_total_before_discount'], 2, ',', '');
 							$summary_tpl_component['INVOICE_ORDER_DISCOUNT'] = wpshop_display::display_template_element('invoice_discount_part', $tpl_discount_component, array(), 'common');
-							unset( $tpl_discount_component );
+							unset($tpl_discount_component);
 						}
 						else {
 							$summary_tpl_component['INVOICE_ORDER_DISCOUNT'] = '';
 						}
 
-						$summary_tpl_component[ 'PRICE_PILOTING' ] = 'HT' == $price_piloting ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' );
+						$summary_tpl_component['PRICE_PILOTING'] = 'HT' == $price_piloting ? __('ET', 'wpshop') : __('ATI', 'wpshop');
 
 						$tpl_component['INVOICE_SUMMARY_PART'] = wpshop_display::display_template_element('invoice_summary_part', $summary_tpl_component, array(), 'common');
-						unset( $summary_tpl_component );
+						unset($summary_tpl_component);
 					}
 
 
 					/** IBAN Include on quotation **/
-					if ( $is_quotation ) {
+					if ($is_quotation) {
 						/** If admin want to include his IBAN to quotation */
 						$iban_options = get_option('wpshop_paymentMethod_options');
 						$payment_options = get_option('wps_payment_mode');
-						if ( !empty($payment_options) && !empty($payment_options['mode']) && !empty($payment_options['mode']['banktransfer']) && !empty($payment_options['mode']['banktransfer']['active']) && $payment_options['mode']['banktransfer']['active'] == 'on' ) {
-							if ( !empty($iban_options) && !empty($iban_options['banktransfer']) /*&& !empty($iban_options['banktransfer']['add_in_quotation'])*/ ) {
-								$tpl_component['IBAN_INFOS']  = __('Payment by Bank Transfer on this bank account', 'wpshop'). ' : <br/>';
-								$tpl_component['IBAN_INFOS'] .= __('Bank name', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['bank_name']) ) ? $iban_options['banktransfer']['bank_name'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('IBAN', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['iban']) ) ? $iban_options['banktransfer']['iban'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('BIC/SWIFT', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['bic']) ) ? $iban_options['banktransfer']['bic'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('Account owner name', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['accountowner']) ) ? $iban_options['banktransfer']['accountowner'] : ''). '<br/>';
+						if (!empty($payment_options) && !empty($payment_options['mode']) && !empty($payment_options['mode']['banktransfer']) && !empty($payment_options['mode']['banktransfer']['active']) && $payment_options['mode']['banktransfer']['active'] == 'on') {
+							if (!empty($iban_options) && !empty($iban_options['banktransfer']) /*&& !empty($iban_options['banktransfer']['add_in_quotation'])*/) {
+								$tpl_component['IBAN_INFOS']  = __('Payment by Bank Transfer on this bank account', 'wpshop') . ' : <br/>';
+								$tpl_component['IBAN_INFOS'] .= __('Bank name', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['bank_name'])) ? $iban_options['banktransfer']['bank_name'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('IBAN', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['iban'])) ? $iban_options['banktransfer']['iban'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('BIC/SWIFT', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['bic'])) ? $iban_options['banktransfer']['bic'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('Account owner name', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['accountowner'])) ? $iban_options['banktransfer']['accountowner'] : '') . '<br/>';
 							}
 						}
 						else {
@@ -746,8 +746,8 @@ 
 
 
 					/** Received payements **/
-					if ( !$is_partial_payment && !$bon_colisage  && !empty($order_postmeta['order_invoice_ref']) ) {
-						$tpl_component['RECEIVED_PAYMENT'] = self::generate_received_payment_part( $order_id );
+					if (!$is_partial_payment && !$bon_colisage && !empty($order_postmeta['order_invoice_ref'])) {
+						$tpl_component['RECEIVED_PAYMENT'] = self::generate_received_payment_part($order_id);
 					}
 					else {
 						$tpl_component['RECEIVED_PAYMENT'] = '';
@@ -760,11 +760,11 @@ 
 					$output = wpshop_display::display_template_element('invoice_page_content', $tpl_component, array(), 'common');
 				}
 				else {
-					$output =  __('No order information has been found', 'wpshop');
+					$output = __('No order information has been found', 'wpshop');
 				}
 			}
 			else {
-				$output =  __('You requested a page that does not exist anymore. Please verify your request or ask the site administrator', 'wpshop');
+				$output = __('You requested a page that does not exist anymore. Please verify your request or ask the site administrator', 'wpshop');
 			}
 			return $output;
 		}
@@ -775,61 +775,61 @@ 
 		 * @param integer $order_id
 		 * @return string
 		 */
-		public static function generate_received_payment_part( $order_id ) {
-			$date_ouput_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
+		public static function generate_received_payment_part($order_id) {
+			$date_ouput_format = get_option('date_format') . ' ' . get_option('time_format');
 			$output = '';
 			$tpl_component = array();
 			$tpl_component['ORDER_RECEIVED_PAYMENT_ROWS'] = '';
-			if ( !empty($order_id) ) {
+			if (!empty($order_id)) {
 				$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
-				if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) ) {
-					$wps_payment_option = get_option( 'wps_payment_mode' );
-					foreach( $order_postmeta['order_payment']['received'] as $payment ) {
-						if ( !empty($payment) ) {
+				if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received'])) {
+					$wps_payment_option = get_option('wps_payment_mode');
+					foreach ($order_postmeta['order_payment']['received'] as $payment) {
+						if (!empty($payment)) {
 							$sub_tpl_component = array();
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_RECEIVED_AMOUNT'] = ( !empty($payment['received_amount']) ) ? number_format( $payment['received_amount'], 2, ',', '' ).' '.wpshop_tools::wpshop_get_currency() : 0;
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_DATE'] = (!empty($payment['date']) ) ? mysql2date($date_ouput_format, $payment['date'], true) : '';
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_METHOD'] = ( ( !empty( $payment[ 'method' ] ) && is_array( $wps_payment_option ) && array_key_exists( strtolower( $payment['method'] ), $wps_payment_option[ 'mode' ] ) && !empty( $wps_payment_option[ 'mode' ][ strtolower( $payment['method'] ) ][ 'name' ] ) ) ? $wps_payment_option[ 'mode' ][ strtolower( $payment['method'] ) ][ 'name' ] : ( !empty( $payment[ 'method' ] ) ? __( $payment[ 'method' ], 'wpshop' ) : '' ) );
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_PAYMENT_REFERENCE'] = ( !empty($payment['payment_reference']) ) ? $payment['payment_reference'] : '';
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_INVOICE_REF'] = ( !empty($payment['invoice_ref']) ) ? $payment['invoice_ref'] : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_RECEIVED_AMOUNT'] = (!empty($payment['received_amount'])) ? number_format($payment['received_amount'], 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency() : 0;
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_DATE'] = (!empty($payment['date'])) ? mysql2date($date_ouput_format, $payment['date'], true) : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_METHOD'] = ((!empty($payment['method']) && is_array($wps_payment_option) && array_key_exists(strtolower($payment['method']), $wps_payment_option['mode']) && !empty($wps_payment_option['mode'][strtolower($payment['method'])]['name'])) ? $wps_payment_option['mode'][strtolower($payment['method'])]['name'] : (!empty($payment['method']) ? __($payment['method'], 'wpshop') : ''));
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_PAYMENT_REFERENCE'] = (!empty($payment['payment_reference'])) ? $payment['payment_reference'] : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_INVOICE_REF'] = (!empty($payment['invoice_ref'])) ? $payment['invoice_ref'] : '';
 							$tpl_component['ORDER_RECEIVED_PAYMENT_ROWS'] .= wpshop_display::display_template_element('received_payment_row', $sub_tpl_component, array('type' => 'invoice_line', 'id' => 'partial_payment'), 'common');
 						}
 					}
 				}
 				$output = wpshop_display::display_template_element('received_payment', $tpl_component, array('type' => 'invoice_line', 'id' => 'partial_payment'), 'common');
-				unset( $tpl_component );
+				unset($tpl_component);
 			}
 			return $output;
 		}
 
 
 		/** Return the validity period of a quotation **/
-		public static function quotation_validate_period( $quotation_date ) {
+		public static function quotation_validate_period($quotation_date) {
 			$quotation_options = get_option('wpshop_quotation_validate_time');
-			if ( !empty($quotation_options) && !empty($quotation_options['number']) && !empty($quotation_options['time_type']) ) {
+			if (!empty($quotation_options) && !empty($quotation_options['number']) && !empty($quotation_options['time_type'])) {
 				$timestamp_quotation = strtotime($quotation_date);
 				$timestamp_validity_date_quotation = 0;
 				$query = '';
 				$date = '';
 				global $wpdb;
-				switch ( $quotation_options['time_type'] ) {
+				switch ($quotation_options['time_type']) {
 					case 'day' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " DAY) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " DAY) ");
 						break;
 					case 'month' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " MONTH) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " MONTH) ");
 						break;
 					case 'year' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " YEAR) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " YEAR) ");
 						break;
 					default :
 						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL 15 DAY) ");
 						break;
 				}
-				if ( $query != null) {
+				if ($query != null) {
 					$date = mysql2date('d F Y', $wpdb->get_var($query), true);
 				}
-				return  sprintf( __('Quotation validity date %s', 'wpshop'), $date ) ;
+				return  sprintf(__('Quotation validity date %s', 'wpshop'), $date);
 			}
 		}
 
@@ -839,19 +839,19 @@ 
 		 * @param string $invoice_ref
 		 * @return string
 		 */
-		public static function generate_invoice_for_email ( $order_id, $invoice_ref = '' ) {
+		public static function generate_invoice_for_email($order_id, $invoice_ref = '') {
 			/** Generate the PDF file for the invoice **/
 			$is_ok = false;
-			if ( !empty($invoice_ref) ) {
-				require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+			if (!empty($invoice_ref)) {
+				require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 				try {
-					$html_content =  wpshop_modules_billing::generate_html_invoice( $order_id, $invoice_ref );
+					$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref);
 					$html_content = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
 					$html2pdf = new HTML2PDF('P', 'A4', 'fr');
 
 					$html2pdf->setDefaultFont('Arial');
 					$html2pdf->writeHTML($html_content);
-					$html2pdf->Output(WPSHOP_UPLOAD_DIR.$invoice_ref.'.pdf', 'F');
+					$html2pdf->Output(WPSHOP_UPLOAD_DIR . $invoice_ref . '.pdf', 'F');
 					$is_ok = true;
 				}
 				catch (HTML2PDF_exception $e) {
@@ -859,7 +859,7 @@ 
 					exit;
 				}
 			}
-			return ( $is_ok ) ? WPSHOP_UPLOAD_DIR.$invoice_ref.'.pdf' : '';
+			return ($is_ok) ? WPSHOP_UPLOAD_DIR . $invoice_ref . '.pdf' : '';
 		}
 
 		/**
@@ -867,38 +867,38 @@ 
 		 * @return Ambigous <string, string>
 		 */
 		public static function generate_invoice_sender_part() {
-			$output ='';
+			$output = '';
 			$company = get_option('wpshop_company_info', array());
 			$emails = get_option('wpshop_emails', array());
-			if ( !empty($company) ) {
-				$tpl_component['COMPANY_EMAIL'] = ( !empty($emails) && !empty($emails['contact_email']) ) ? $emails['contact_email'] : '';
+			if (!empty($company)) {
+				$tpl_component['COMPANY_EMAIL'] = (!empty($emails) && !empty($emails['contact_email'])) ? $emails['contact_email'] : '';
 				$tpl_component['COMPANY_WEBSITE'] = get_option('siteurl');
-				foreach ( $company as $company_info_key => $company_info_value ) {
+				foreach ($company as $company_info_key => $company_info_value) {
 					switch ($company_info_key) {
 						case 'company_rcs' :
-							$data = ( !empty($company_info_value) ) ? __('RCS', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('RCS', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_capital' :
-							$data = ( !empty($company_info_value) ) ? __('Capital', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('Capital', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siren' :
-							$data = ( !empty($company_info_value) ) ? __('SIREN', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIREN', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siret' :
-							$data = ( !empty($company_info_value) ) ? __('SIRET', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIRET', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_tva_intra' :
-							$data = ( !empty($company_info_value) ) ? __('TVA Intracommunautaire', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('TVA Intracommunautaire', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_legal_statut' :
 							$array_state_compagny = wpshop_company_options::get_legal_status();
-							$data = ( !empty( $array_state_compagny ) && !empty( $array_state_compagny[$company_info_value] ) ) ? $array_state_compagny[$company_info_value] : __( 'Auto-Entrepreneur', 'wpshop' ) ;
+							$data = (!empty($array_state_compagny) && !empty($array_state_compagny[$company_info_value])) ? $array_state_compagny[$company_info_value] : __('Auto-Entrepreneur', 'wpshop');
 							break;
 						default :
 							$data = $company_info_value;
 							break;
 					}
-					$tpl_component[ strtoupper( $company_info_key) ] = $data;
+					$tpl_component[strtoupper($company_info_key)] = $data;
 				}
 				$output = wpshop_display::display_template_element('invoice_sender_formatted_address', $tpl_component, array(), 'common');
 			}
@@ -911,49 +911,49 @@ 
 		 * @param unknown_type $bon_colisage
 		 * @return Ambigous <string, string>
 		 */
-		public static function generate_receiver_part( $order_id, $bon_colisage = false ) {
+		public static function generate_receiver_part($order_id, $bon_colisage = false) {
 			$output = '';
 			$order_customer_postmeta = get_post_meta($order_id, '_order_info', true);
-			$order_postmeta = get_post_meta( $order_id, '_order_postmeta', true );
-			$address_info = ( $bon_colisage ) ? ( ( !empty($order_customer_postmeta['shipping']) && !empty($order_customer_postmeta['shipping']['address']) && is_array($order_customer_postmeta['shipping']['address']) )  ? $order_customer_postmeta['shipping']['address'] : array() ) : ( ( !empty($order_customer_postmeta['billing']) && !empty($order_customer_postmeta['billing']['address']) && is_array($order_customer_postmeta['billing']['address']) )  ? $order_customer_postmeta['billing']['address'] : array() );
+			$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
+			$address_info = ($bon_colisage) ? ((!empty($order_customer_postmeta['shipping']) && !empty($order_customer_postmeta['shipping']['address']) && is_array($order_customer_postmeta['shipping']['address'])) ? $order_customer_postmeta['shipping']['address'] : array()) : ((!empty($order_customer_postmeta['billing']) && !empty($order_customer_postmeta['billing']['address']) && is_array($order_customer_postmeta['billing']['address'])) ? $order_customer_postmeta['billing']['address'] : array());
 
 
-			if ( !empty($order_customer_postmeta) && !empty($address_info) ) {
+			if (!empty($order_customer_postmeta) && !empty($address_info)) {
 				$default_address_attributes = array('CIVILITY', 'ADDRESS_LAST_NAME', 'ADDRESS_FIRST_NAME', 'ADDRESS', 'POSTCODE', 'CITY', 'STATE', 'COUNTRY', 'PHONE', 'ADDRESS_USER_EMAIL', 'COMPANY');
-				foreach ( $default_address_attributes as $default_address_attribute ) {
+				foreach ($default_address_attributes as $default_address_attribute) {
 					$tpl_component[$default_address_attribute] = '';
 				}
 
-				foreach ( $address_info as $order_customer_info_key => $order_customer_info_value ) {
+				foreach ($address_info as $order_customer_info_key => $order_customer_info_value) {
 					$tpl_component[strtoupper($order_customer_info_key)] = '';
-					if ( $order_customer_info_key == 'civility') {
+					if ($order_customer_info_key == 'civility') {
 						global $wpdb;
-						$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id= %d', $order_customer_info_value);
+						$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id= %d', $order_customer_info_value);
 						$civility = $wpdb->get_row($query);
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($civility) ) ? (!empty($civility->label)) ? $civility->label : __($civility->value, 'wpshop') : '';
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($civility)) ? (!empty($civility->label)) ? $civility->label : __($civility->value, 'wpshop') : '';
 					}
-					else if( $order_customer_info_key == 'country') {
+					else if ($order_customer_info_key == 'country') {
 						foreach (unserialize(WPSHOP_COUNTRY_LIST) as $key=>$value) {
-							if ( $order_customer_info_value == $key) {
+							if ($order_customer_info_value == $key) {
 								$tpl_component[strtoupper($order_customer_info_key)] = $value;
 							}
 						}
 					}
-					elseif( $order_customer_info_key == 'phone' ){
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value) ) ? __('Phone', 'wpshop').' : '.$order_customer_info_value : '';
+					elseif ($order_customer_info_key == 'phone') {
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value)) ? __('Phone', 'wpshop') . ' : ' . $order_customer_info_value : '';
 					}
 					else {
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value) ) ? $order_customer_info_value : '';
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value)) ? $order_customer_info_value : '';
 					}
 				}
 
-				if ( empty($tpl_component['PHONE']) ) {
-					$tpl_component['PHONE'] = ( !empty( $order_customer_postmeta['billing']['address']['phone']) ) ? __('Phone', 'wpshop').' : '.$order_customer_postmeta['billing']['address']['phone'] : '';
+				if (empty($tpl_component['PHONE'])) {
+					$tpl_component['PHONE'] = (!empty($order_customer_postmeta['billing']['address']['phone'])) ? __('Phone', 'wpshop') . ' : ' . $order_customer_postmeta['billing']['address']['phone'] : '';
 				}
 
-				if ( empty($tpl_component['ADDRESS_USER_EMAIL']) || ( empty($tpl_component['ADDRESS_USER_EMAIL']) && $bon_colisage ) ){
-					$user_info = get_userdata( $order_postmeta['customer_id'] );
-					$tpl_component['ADDRESS_USER_EMAIL'] = ( !empty($user_info) && !empty($user_info->user_email) ) ? $user_info->user_email : '';
+				if (empty($tpl_component['ADDRESS_USER_EMAIL']) || (empty($tpl_component['ADDRESS_USER_EMAIL']) && $bon_colisage)) {
+					$user_info = get_userdata($order_postmeta['customer_id']);
+					$tpl_component['ADDRESS_USER_EMAIL'] = (!empty($user_info) && !empty($user_info->user_email)) ? $user_info->user_email : '';
 				}
 
 
@@ -968,36 +968,36 @@ 
 		 * Genrate Footer invoice
 		 * @return Ambigous <string, string>
 		 */
-		public static function generate_footer_invoice(){
-			$output ='';
+		public static function generate_footer_invoice() {
+			$output = '';
 			$company = get_option('wpshop_company_info', array());
 			$emails = get_option('wpshop_emails', array());
-			if ( !empty($company) ) {
-				$tpl_component['COMPANY_EMAIL'] = ( !empty($emails) && !empty($emails['contact_email']) ) ? $emails['contact_email'] : '';
+			if (!empty($company)) {
+				$tpl_component['COMPANY_EMAIL'] = (!empty($emails) && !empty($emails['contact_email'])) ? $emails['contact_email'] : '';
 				$tpl_component['COMPANY_WEBSITE'] = site_url();
-				foreach ( $company as $company_info_key => $company_info_value ) {
+				foreach ($company as $company_info_key => $company_info_value) {
 
 					switch ($company_info_key) {
 						case 'company_rcs' :
-							$data = ( !empty($company_info_value) ) ? __('RCS', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('RCS', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_capital' :
-							$data = ( !empty($company_info_value) ) ? __('Capital', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('Capital', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siren' :
-							$data = ( !empty($company_info_value) ) ? __('SIREN', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIREN', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siret' :
-							$data = ( !empty($company_info_value) ) ? __('SIRET', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIRET', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_tva_intra' :
-							$data = ( !empty($company_info_value) ) ? __('TVA Intracommunautaire', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('TVA Intracommunautaire', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						default :
 							$data = $company_info_value;
 							break;
 					}
-					$tpl_component[ strtoupper( $company_info_key) ] = $data;
+					$tpl_component[strtoupper($company_info_key)] = $data;
 				}
 				$output = wpshop_display::display_template_element('invoice_footer', $tpl_component, array(), 'common');
 			}
@@ -1013,33 +1013,33 @@ 
 		 * @param id $product_id
 		 * @param string $invoice_ref
 		 */
-		public static function check_product_price( $price_ht, $price_ati, $tva_amount, $tva_rate, $product_id, $invoice_ref, $order_id ) {
+		public static function check_product_price($price_ht, $price_ati, $tva_amount, $tva_rate, $product_id, $invoice_ref, $order_id) {
 			$checking = true;
-			$error_percent =  1;
+			$error_percent = 1;
 
 			/** Check VAT Amount **/
-			$formatted_tva_amount = number_format( $tva_amount, 2, '.', '' );
-			$formatted_price_ht = number_format( $price_ht, 2, '.', '' );
-			$formatted_price_ati = number_format( $price_ati, 2, '.', '' );
-			$calculated_price_excluding_tax = $price_ati / ( 1 + ($tva_rate / 100) );
+			$formatted_tva_amount = number_format($tva_amount, 2, '.', '');
+			$formatted_price_ht = number_format($price_ht, 2, '.', '');
+			$formatted_price_ati = number_format($price_ati, 2, '.', '');
+			$calculated_price_excluding_tax = $price_ati / (1 + ($tva_rate / 100));
 			$unformatted = $formatted_price_ati - $calculated_price_excluding_tax;
-			$checked_tva_amount = number_format( $unformatted, 2, '.', '' );
+			$checked_tva_amount = number_format($unformatted, 2, '.', '');
 
-			if ( ( $checked_tva_amount < ($formatted_tva_amount / ( 1 + ($error_percent / 100) ) ) ) || ( $checked_tva_amount > ($formatted_tva_amount * (1 + ($error_percent / 100) ) ) )  ) {
+			if (($checked_tva_amount < ($formatted_tva_amount / (1 + ($error_percent / 100)))) || ($checked_tva_amount > ($formatted_tva_amount * (1 + ($error_percent / 100))))) {
 				$error_infos = array();
-				$error_infos['real_datas']['price_ati'] =  $formatted_price_ati;
-				$error_infos['real_datas']['price_ht'] =  $formatted_price_ht;
-				$error_infos['real_datas']['tva_amount'] =  $formatted_tva_amount;
+				$error_infos['real_datas']['price_ati'] = $formatted_price_ati;
+				$error_infos['real_datas']['price_ht'] = $formatted_price_ht;
+				$error_infos['real_datas']['tva_amount'] = $formatted_tva_amount;
 
 				$error_infos['corrected_data'] = $checked_tva_amount;
-				self::invoice_error_check_administrator( $invoice_ref, __('VAT error', 'wpshop'), $product_id, $order_id, $error_infos );
+				self::invoice_error_check_administrator($invoice_ref, __('VAT error', 'wpshop'), $product_id, $order_id, $error_infos);
 				$checking = false;
 			}
 
 			/** Check price ati **/
-			$checked_price_ati =  $formatted_price_ht * ( 1 + ( $tva_rate / 100) );
-			if ( ( $checked_price_ati < ($formatted_price_ati /( 1 + ($error_percent / 100) ) ) ) || ( $checked_price_ati > ($formatted_price_ati * (1 + ($error_percent / 100)) ) )  ) {
-				self::invoice_error_check_administrator( $invoice_ref, __('ATI Price error', 'wpshop'), $product_id, $order_id );
+			$checked_price_ati = $formatted_price_ht * (1 + ($tva_rate / 100));
+			if (($checked_price_ati < ($formatted_price_ati / (1 + ($error_percent / 100)))) || ($checked_price_ati > ($formatted_price_ati * (1 + ($error_percent / 100))))) {
+				self::invoice_error_check_administrator($invoice_ref, __('ATI Price error', 'wpshop'), $product_id, $order_id);
 				$checking = false;
 			}
 
@@ -1052,29 +1052,29 @@ 
 		 * @param string $object
 		 * @param unknown_type $product_id
 		 */
-		function invoice_error_check_administrator( $invoice_ref, $object, $product_id, $order_id, $errors_infos = array() ) {
-			$wpshop_email_option = get_option( 'wpshop_emails');
-			if ( !empty($wpshop_email_option) && !empty($wpshop_email_option['contact_email']) ) {
+		function invoice_error_check_administrator($invoice_ref, $object, $product_id, $order_id, $errors_infos = array()) {
+			$wpshop_email_option = get_option('wpshop_emails');
+			if (!empty($wpshop_email_option) && !empty($wpshop_email_option['contact_email'])) {
 				$headers = "MIME-Version: 1.0\r\n";
 				$headers .= "Content-type: text/html; charset=UTF-8\r\n";
-				$headers .= 'From: '.get_bloginfo('name').' <'.$wpshop_email_option['noreply_email'].'>' . "\r\n";
-				$message  = '<b>'.__('Error type', 'wpshop').' : </b>'.$object.'<br/>';
-				$message .= '<b>'.__( 'Product', 'wpshop').' : </b>'.get_the_title(  $product_id ).'<br/>';
-				$message .= '<b>'.__( 'Invoice ref', 'wpshop').' : </b>'.$invoice_ref.'<br/>';
-				$message .= '<b>'.__( 'Order ID', 'wpshop').' : </b>'.$order_id.'<br/>';
-
-				if ( !empty($errors_infos) && !empty($errors_infos['real_datas']) ) {
-					$message .='<b>' .__( 'Bad datas', 'wpshop').' :</b> <ul>';
-					foreach( $errors_infos['real_datas'] as $k => $errors_info ) {
-						$message .= '<li><b>'.$k.' : </b>'.$errors_info.'</li>';
+				$headers .= 'From: ' . get_bloginfo('name') . ' <' . $wpshop_email_option['noreply_email'] . '>' . "\r\n";
+				$message  = '<b>' . __('Error type', 'wpshop') . ' : </b>' . $object . '<br/>';
+				$message .= '<b>' . __('Product', 'wpshop') . ' : </b>' . get_the_title($product_id) . '<br/>';
+				$message .= '<b>' . __('Invoice ref', 'wpshop') . ' : </b>' . $invoice_ref . '<br/>';
+				$message .= '<b>' . __('Order ID', 'wpshop') . ' : </b>' . $order_id . '<br/>';
+
+				if (!empty($errors_infos) && !empty($errors_infos['real_datas'])) {
+					$message .= '<b>' . __('Bad datas', 'wpshop') . ' :</b> <ul>';
+					foreach ($errors_infos['real_datas'] as $k => $errors_info) {
+						$message .= '<li><b>' . $k . ' : </b>' . $errors_info . '</li>';
 					}
 					$message .= '</ul>';
-					if ( !empty($errors_infos['corrected_data']) ) {
-						$message .= '<b>' . __( 'Good value', 'wpshop' ) . ' : </b>' . $errors_infos['corrected_data'];
+					if (!empty($errors_infos['corrected_data'])) {
+						$message .= '<b>' . __('Good value', 'wpshop') . ' : </b>' . $errors_infos['corrected_data'];
 					}
 				}
 
-				wp_mail( $wpshop_email_option['contact_email'], __('Error on invoice generation', 'wpshop') , $message, $headers);
+				wp_mail($wpshop_email_option['contact_email'], __('Error on invoice generation', 'wpshop'), $message, $headers);
 			}
 		}
 
@@ -1084,9 +1084,9 @@ 
 		 * @param array $posted_datas
 		 * @return string
 		 */
-		function force_invoice_generation_on_order( $order_metadata, $posted_datas ) {
-			if ( !empty ($posted_datas['action_triggered_from']) && $posted_datas['action_triggered_from'] == 'generate_invoice') {
-				$order_metadata['order_invoice_ref'] = $this->generate_invoice_number( $posted_datas['post_ID'] );
+		function force_invoice_generation_on_order($order_metadata, $posted_datas) {
+			if (!empty ($posted_datas['action_triggered_from']) && $posted_datas['action_triggered_from'] == 'generate_invoice') {
+				$order_metadata['order_invoice_ref'] = $this->generate_invoice_number($posted_datas['post_ID']);
 			}
 			return $order_metadata;
 		}
@@ -1101,12 +1101,12 @@ 
 		$partial_payment_current_config = get_option('wpshop_payment_partial', array('for_quotation' => array()));
 
 		$partial_for_quotation_is_activate = false;
-		if ( !empty($partial_payment_current_config) && !empty($partial_payment_current_config['for_quotation']) && !empty($partial_payment_current_config['for_quotation']['activate']) ) {
+		if (!empty($partial_payment_current_config) && !empty($partial_payment_current_config['for_quotation']) && !empty($partial_payment_current_config['for_quotation']['activate'])) {
 			$partial_for_quotation_is_activate = true;
 		}
 
 		$output .= '
-			<input type="checkbox" name="wpshop_payment_partial[for_quotation][activate]"' . ($partial_for_quotation_is_activate ? ' checked="checked"' : '') . ' id="wpshop_payment_partial_on_quotation_activation_state" /> <label for="wpshop_payment_partial_on_quotation_activation_state" >' . __('Activate partial command for quotations', 'wpshop') . '</label><a href="#" title="'.__('If you want that customer pay a part o f total amount of there order, check this box then fill fields below','wpshop').'" class="wpshop_infobulle_marker">?</a>
+			<input type="checkbox" name="wpshop_payment_partial[for_quotation][activate]"' . ($partial_for_quotation_is_activate ? ' checked="checked"' : '') . ' id="wpshop_payment_partial_on_quotation_activation_state" /> <label for="wpshop_payment_partial_on_quotation_activation_state" >' . __('Activate partial command for quotations', 'wpshop') . '</label><a href="#" title="' . __('If you want that customer pay a part o f total amount of there order, check this box then fill fields below', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>
 			<div class="wpshop_partial_payment_quotation_config_container' . ($partial_for_quotation_is_activate ? '' : ' wpshopHide') . '" id="wpshop_partial_payment_quotation_config_container" >
 				<div class="alignleft" >
 					' . __('Value of partial payment', 'wpshop') . '<br/>
@@ -1128,6 +1128,6 @@ 
 }
 
 /**	Instanciate the module utilities if not	*/
-if ( class_exists("wpshop_modules_billing") ) {
+if (class_exists("wpshop_modules_billing")) {
 	$wpshop_modules_billing = new wpshop_modules_billing();
 }

Braces +40 added lines, -55 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Billing module bootstrap file
  *
@@ -57,8 +59,10 @@ 
 			/*	Get custom frontend template	*/
 			if ( is_file(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php') ) {
 				require_once(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php');
-				if (!empty($tpl_element))
-					$wpshop_template['common']['custom'] = ($tpl_element);unset($tpl_element);
+				if (!empty($tpl_element)) {
+									$wpshop_template['common']['custom'] = ($tpl_element);
+				}
+				unset($tpl_element);
 			}
 			$wpshop_display = new wpshop_display();
 			$templates = $wpshop_display->add_modules_template_to_internal( $wpshop_template, $templates );
@@ -136,7 +140,9 @@ 
 		function wpshop_billing_number_figures_field() {
 			$wpshop_billing_number_figures = get_option('wpshop_billing_number_figures');
 			$readonly = !empty($wpshop_billing_number_figures) ? 'readonly="readonly"': null;
-			if(empty($wpshop_billing_number_figures)) $wpshop_billing_number_figures=5;
+			if(empty($wpshop_billing_number_figures)) {
+				$wpshop_billing_number_figures=5;
+			}
 
 			echo '<input name="wpshop_billing_number_figures" type="text" value="'.$wpshop_billing_number_figures.'" '.$readonly.' />
 		<a href="#" title="'.__('Number of figures to make appear on invoices','wpshop').'" class="wpshop_infobulle_marker">?</a>';
@@ -258,8 +264,7 @@ 
 			/** If the counter doesn't exist, we initiate it */
 			if (!$billing_current_number) {
 				$billing_current_number = 1;
-			}
-			else {
+			} else {
 				$billing_current_number++;
 			}
 
@@ -315,7 +320,9 @@ 
 
 				/** Check it is a shipping slip **/
 				$bon_colisage = !empty( $_GET['bon_colisage'] ) ? sanitize_key( $_GET['bon_colisage'] ) : false;
-				if ( $bon_colisage ) $bon_colisage = true;
+				if ( $bon_colisage ) {
+					$bon_colisage = true;
+				}
 
 				if ( !empty($order_postmeta) ) {
 					$tpl_component = array();
@@ -347,8 +354,7 @@ 
 					/** Validate period for Quotation **/
 					if ( $is_quotation ) {
 						$quotation_validate_period = self::quotation_validate_period( $order_postmeta['order_date'] );
-					}
-					else {
+					} else {
 						$tpl_component['INVOICE_VALIDATE_TIME'] = '';
 					}
 
@@ -381,8 +387,7 @@ 
 					$order_tva = array();
 					if ( $bon_colisage ) {
 						$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('bon_colisage_row_header', array(), array(), 'common');
-					}
-					else {
+					} else {
 						$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('invoice_row_header', array(), array(), 'common');
 						//if ( !$is_quotation ) {
 							/** Check if products have discounts **/
@@ -445,8 +450,9 @@ 
 								if ( count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail) ) {
 									foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
 										foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-											if ( !empty($attribute_def->code) )
-												$output_order[$attribute_def->code] = $position;
+											if ( !empty($attribute_def->code) ) {
+																							$output_order[$attribute_def->code] = $position;
+											}
 										}
 									}
 								}
@@ -482,8 +488,7 @@ 
 
 								if ( $bon_colisage ) {
 									$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('bon_colisage_row', $sub_tpl_component, array(), 'common');
-								}
-								else {
+								} else {
 									if ( $discounts_exists ) {
 										$discounted_total_per_item = $item['item_total_ht'];
 										/** Unit Discount **/
@@ -491,8 +496,7 @@ 
 											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( $item['item_unit_discount_amount'], 2, '.', '');
 											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( $item['item_unit_discount_value'], 2, '.', '');
 											$discounted_total_per_item = $discounted_total_per_item - $item['item_unit_discount_amount'];
-										}
-										else {
+										} else {
 											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
 											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
 										}
@@ -502,8 +506,7 @@ 
 											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( $item['item_global_discount_amount'], 2, '.', '');
 											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( $item['item_global_discount_value'], 2, '.', '');
 											$discounted_total_per_item = $discounted_total_per_item - $item['item_global_discount_amount'];
-										}
-										else {
+										} else {
 											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
 											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
 										}
@@ -513,8 +516,7 @@ 
 										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = number_format( $discounted_total_per_item, 2, '.', '');
 
 										$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row_with_discount', $sub_tpl_component, array(), 'common');
-									}
-									else {
+									} else {
 										$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row', $sub_tpl_component, array(), 'common');
 									}
 								}
@@ -523,8 +525,7 @@ 
 								/** Check TVA **/
 								if ( empty($order_tva[ $item['item_tva_rate'] ]) ) {
 									$order_tva[ $item['item_tva_rate'] ] = $item['item_tva_total_amount'];
-								}
-								else {
+								} else {
 									$order_tva[ $item['item_tva_rate'] ] += $item['item_tva_total_amount'];
 								}
 
@@ -565,23 +566,20 @@ 
 											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
 
 											$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row_with_discount', $sub_tpl_component, array(), 'common');
-										}
-										else {
+										} else {
 											$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row', $sub_tpl_component, array(), 'common');
 										}
 									}
 
 									unset( $sub_tpl_component );
 									$total_partial_payment += ( !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'] : 0;
-								}
-								else if( 'payment_received' == $received_payment[ 'status' ] ) {
+								} else if( 'payment_received' == $received_payment[ 'status' ] ) {
 									$last_payment += ( !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'] : 0;
 								}
 
 							}
 						}
-					}
-					else {
+					} else {
 						/** Display Partials payments **/
 						$total_partial_payment = 0; $last_payment = 0;
 						if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage ) {
@@ -623,8 +621,7 @@ 
 									$sub_tpl_component['SUMMARY_ROW_VALUE'] = wpshop_display::format_field_output('wpshop_product_price', $tax_amount) . ' ' . wpshop_tools::wpshop_get_currency();
 									$summary_tpl_component['INVOICE_SUMMARY_TAXES'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
 									unset( $sub_tpl_component );
-								}
-								elseif( $is_partial_payment ) {
+								} elseif( $is_partial_payment ) {
 									$tax_rate = 0;
 									$tax_amount = number_format( 0, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
 									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf( __('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%' );
@@ -654,8 +651,7 @@ 
 							$sub_tpl_component['SUMMARY_ROW_VALUE'] = number_format( $total_discounted, 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency();
 							$summary_tpl_component['INVOICE_SUMMARY_TOTAL_DISCOUNTED'] = wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
 							unset( $sub_tpl_component );
-						}
-						else {
+						} else {
 							$summary_tpl_component['INVOICE_SUMMARY_TOTAL_DISCOUNTED'] = '';
 						}
 
@@ -685,8 +681,7 @@ 
 									$total_payment = number_format($value['received_amount'], 2, ',', '');
 								}
 							}
-						}
-						else {
+						} else {
 							$total_payment = ( ($total_partial_payment+$last_payment) !== $order_postmeta['order_grand_total'] ) ? number_format($total_partial_payment+$last_payment, 2, ',', '') : $order_postmeta['order_grand_total'];
 						}
 
@@ -710,8 +705,7 @@ 
 							$tpl_discount_component['TOTAL_BEFORE_DISCOUNT'] = number_format($order_postmeta['order_grand_total_before_discount'], 2, ',', '');
 							$summary_tpl_component['INVOICE_ORDER_DISCOUNT'] = wpshop_display::display_template_element('invoice_discount_part', $tpl_discount_component, array(), 'common');
 							unset( $tpl_discount_component );
-						}
-						else {
+						} else {
 							$summary_tpl_component['INVOICE_ORDER_DISCOUNT'] = '';
 						}
 
@@ -735,12 +729,10 @@ 
 								$tpl_component['IBAN_INFOS'] .= __('BIC/SWIFT', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['bic']) ) ? $iban_options['banktransfer']['bic'] : ''). '<br/>';
 								$tpl_component['IBAN_INFOS'] .= __('Account owner name', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['accountowner']) ) ? $iban_options['banktransfer']['accountowner'] : ''). '<br/>';
 							}
-						}
-						else {
+						} else {
 							$tpl_component['IBAN_INFOS'] = '';
 						}
-					}
-					else {
+					} else {
 						$tpl_component['IBAN_INFOS'] = '';
 					}
 
@@ -748,8 +740,7 @@ 
 					/** Received payements **/
 					if ( !$is_partial_payment && !$bon_colisage  && !empty($order_postmeta['order_invoice_ref']) ) {
 						$tpl_component['RECEIVED_PAYMENT'] = self::generate_received_payment_part( $order_id );
-					}
-					else {
+					} else {
 						$tpl_component['RECEIVED_PAYMENT'] = '';
 					}
 
@@ -758,12 +749,10 @@ 
 					$tpl_component['INVOICE_FOOTER'] = self::generate_footer_invoice();
 
 					$output = wpshop_display::display_template_element('invoice_page_content', $tpl_component, array(), 'common');
-				}
-				else {
+				} else {
 					$output =  __('No order information has been found', 'wpshop');
 				}
-			}
-			else {
+			} else {
 				$output =  __('You requested a page that does not exist anymore. Please verify your request or ask the site administrator', 'wpshop');
 			}
 			return $output;
@@ -853,8 +842,7 @@ 
 					$html2pdf->writeHTML($html_content);
 					$html2pdf->Output(WPSHOP_UPLOAD_DIR.$invoice_ref.'.pdf', 'F');
 					$is_ok = true;
-				}
-				catch (HTML2PDF_exception $e) {
+				} catch (HTML2PDF_exception $e) {
 					echo $e;
 					exit;
 				}
@@ -931,18 +919,15 @@ 
 						$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id= %d', $order_customer_info_value);
 						$civility = $wpdb->get_row($query);
 						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($civility) ) ? (!empty($civility->label)) ? $civility->label : __($civility->value, 'wpshop') : '';
-					}
-					else if( $order_customer_info_key == 'country') {
+					} else if( $order_customer_info_key == 'country') {
 						foreach (unserialize(WPSHOP_COUNTRY_LIST) as $key=>$value) {
 							if ( $order_customer_info_value == $key) {
 								$tpl_component[strtoupper($order_customer_info_key)] = $value;
 							}
 						}
-					}
-					elseif( $order_customer_info_key == 'phone' ){
+					} elseif( $order_customer_info_key == 'phone' ){
 						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value) ) ? __('Phone', 'wpshop').' : '.$order_customer_info_value : '';
-					}
-					else {
+					} else {
 						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value) ) ? $order_customer_info_value : '';
 					}
 				}