Eoxia / wpshop

includes/modules/wps_barcode/controller/wps_barcode_ajax.ctr.php

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 
 	/**
 	 * Generate barcode image
-	 * @param object $barcode Instance of wps_barcodegen
+	 * @param wps_barcodegen $barcode Instance of wps_barcodegen
 	 * @param string $meta Numerical code of barcode
 	 * @param string $type Texte for complete message
 	 * @param string $price Price of product

Braces +16 added lines, -19 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 class wps_barcode_ajax {
 	public function __construct() {
@@ -10,8 +12,9 @@ 
 	public function imgProduct() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'imgProduct' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'imgProduct' ) ) {
+					wp_die();
+		}
 
 		global $meta, $barcode, $post_ID, $wpdb, $table_prefix, $gg;
 		require_once('wps_barcodegen.ctr.php');
@@ -50,8 +53,9 @@ 
 	public function imgCoupons() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'imgProduct' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'imgProduct' ) ) {
+					wp_die();
+		}
 
 		global $meta, $barcode, $post_ID, $wpdb, $table_prefix;
 
@@ -90,8 +94,7 @@ 
 				$code = $type.$date.$id;
 				$meta = $barcode->checksum($code);
 				add_post_meta($post_ID, 'wpshop_coupon_barcode', $meta);
-			}
-			else {
+			} else {
 				$meta = $result['wpshop_coupon_barcode'][0];
 			}
 
@@ -105,8 +108,7 @@ 
 			$array = array('img' => $barcode);
 			echo json_encode($array);
 			wp_die();
-		}
-		else {
+		} else {
 			echo '<p>'.__('None bardcode generated as coupon has not created.',
 					'wps_barcode').'</p>';
 			wp_die();
@@ -158,8 +160,7 @@ 
 			for ($i=0; $i<42 ; $i++) {
 				if( substr($binCode, $i, 1) === '0' ) {
 					$color = imagecolorallocate($im, 255, 255, 255);
-				}
-				else {
+				} else {
 					$color = imagecolorallocate($im, 0, 0, 0);
 				}
 
@@ -187,8 +188,7 @@ 
 			for ($i=42; $i<84 ; $i++) {
 				if( substr($binCode, $i, 1) === '0' ) {
 					$color = imagecolorallocate($im, 255, 255, 255);
-				}
-				else {
+				} else {
 					$color = imagecolorallocate($im, 0, 0, 0);
 				}
 
@@ -241,12 +241,10 @@ 
 				$coupon_postmeta = get_post_meta($post_ID, 'wpshop_coupon_discount_type');
 				if ( $coupon_postmeta[0] === 'percent' ) {
 					$price = $price.' %';
-				}
-				else {
+				} else {
 					$price = sprintf( number_format( $price, 2 ). ' '.$currency);
 				}
-			}
-			else {
+			} else {
 				$price = sprintf( number_format( $price, 2 ). ' '.$currency);
 			}
 
@@ -282,8 +280,7 @@ 
 					} catch (Exception $e) {
 						echo __('Generation problem', 'wps_barcode');
 					}*/
-		}
-		else {
+		} else {
 			return '<p>'.sprintf( __('None bardcode generated as you did create %s.',
 					'wps_barcode'), $type).'</p>';
 		}

Spacing +96 added lines, -96 removed lines

@@ -1,15 +1,15 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 class wps_barcode_ajax {
 	public function __construct() {
-		add_action( 'wp_ajax_barcode_img_product', array($this, 'imgProduct') );
-		add_action( 'wp_ajax_barcode_img_coupons', array($this, 'imgCoupons') );
+		add_action('wp_ajax_barcode_img_product', array($this, 'imgProduct'));
+		add_action('wp_ajax_barcode_img_coupons', array($this, 'imgCoupons'));
 	}
 
 	public function imgProduct() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'imgProduct' ) )
+		if (!wp_verify_nonce($_wpnonce, 'imgProduct'))
 			wp_die();
 
 		global $meta, $barcode, $post_ID, $wpdb, $table_prefix, $gg;
@@ -23,17 +23,17 @@ 
 
 		/*Select value of barcode*/
 		$result = $wpdb->get_results(
-				'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR.
-				' WHERE attribute_id=(SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE.
-				' WHERE code = "barcode") AND entity_id="'.$post_ID.'"', ARRAY_A);
+				'SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR .
+				' WHERE attribute_id=(SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE .
+				' WHERE code = "barcode") AND entity_id="' . $post_ID . '"', ARRAY_A);
 		$meta = !empty($result) ? $result[0]['value'] : '';
 
 		/*Get price of product*/
-		$result = $wpdb->get_results('SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL.
-				' WHERE attribute_id=(SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE.
-				' WHERE code="'.WPSHOP_PRODUCT_PRICE_TTC.'") AND entity_id='.$post_ID, ARRAY_A);
+		$result = $wpdb->get_results('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL .
+				' WHERE attribute_id=(SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE .
+				' WHERE code="' . WPSHOP_PRODUCT_PRICE_TTC . '") AND entity_id=' . $post_ID, ARRAY_A);
 
-		if ( !empty($result) && $result[0]['value'] >= 0) {
+		if (!empty($result) && $result[0]['value'] >= 0) {
 			$price = $result[0]['value'];
 
 			$post = get_post($post_ID, ARRAY_A);
@@ -47,9 +47,9 @@ 
 	}
 
 	public function imgCoupons() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'imgProduct' ) )
+		if (!wp_verify_nonce($_wpnonce, 'imgProduct'))
 			wp_die();
 
 		global $meta, $barcode, $post_ID, $wpdb, $table_prefix;
@@ -65,14 +65,14 @@ 
 		$country = '000';
 		$result = get_post_meta($post_ID);
 
-		if ( !empty($result) ) {
-			if ( empty($result['wpshop_coupon_barcode']) ) {
+		if (!empty($result)) {
+			if (empty($result['wpshop_coupon_barcode'])) {
 				$conf = get_option('wps_barcode');
 				if ($conf['type'] === 'internal') {
 					$type = $conf['internal_coupons'];
 
-					$query = $wpdb->get_results('SELECT post_date FROM '.
-							$table_prefix.'posts WHERE ID='.$post_ID, ARRAY_A);
+					$query = $wpdb->get_results('SELECT post_date FROM ' .
+							$table_prefix . 'posts WHERE ID=' . $post_ID, ARRAY_A);
 
 					$pDate = new DateTime($query[0]['post_date']);
 					$date = $pDate->format('my');
@@ -80,13 +80,13 @@ 
 
 				$len = strlen($post_ID);
 				$ref = '';
-				if ( $len < 5 ) {
-					for ($i=0; $i <= $len; $i++) {
+				if ($len < 5) {
+					for ($i = 0; $i <= $len; $i++) {
 						$ref .= '0';
 					}
 				}
-				$id = $ref.$post_ID;
-				$code = $type.$date.$id;
+				$id = $ref . $post_ID;
+				$code = $type . $date . $id;
 				$meta = $barcode->checksum($code);
 				add_post_meta($post_ID, 'wpshop_coupon_barcode', $meta);
 			}
@@ -94,8 +94,8 @@ 
 				$meta = $result['wpshop_coupon_barcode'][0];
 			}
 
-			$query = $wpdb->get_results('SELECT post_title FROM '.
-					$table_prefix.'posts WHERE ID='.$post_ID, ARRAY_A);
+			$query = $wpdb->get_results('SELECT post_title FROM ' .
+					$table_prefix . 'posts WHERE ID=' . $post_ID, ARRAY_A);
 
 			$post = get_post($post_ID, ARRAY_A);
 
@@ -106,8 +106,8 @@ 
 			wp_die();
 		}
 		else {
-			echo '<p>'.__('None bardcode generated as coupon has not created.',
-					'wps_barcode').'</p>';
+			echo '<p>' . __('None bardcode generated as coupon has not created.',
+					'wps_barcode') . '</p>';
 			wp_die();
 		}
 	}
@@ -121,44 +121,44 @@ 
 	 * @param string $title Title of product
 	 */
 	public function generate_image(&$barcode, $meta, $type, $price, $title, $post_ID = 0) {
-		if ( !extension_loaded('gd') ) {
-			return '<p>'.__('Library GD is requiered.', 'wps_barcode').'</p>';
+		if (!extension_loaded('gd')) {
+			return '<p>' . __('Library GD is requiered.', 'wps_barcode') . '</p>';
 		}
-		if ( !empty($meta) ) {
+		if (!empty($meta)) {
 			$barcode->setGenerateCode($meta);
 			$binCode = $barcode->getBinCode();
 
 			$px = 3.779528;
-			$x = round(66*$px); //249.449 px
-			$y = round(50*$px); //188.976 px
-			$bar_size = round(63.393/72); //0.880 px
+			$x = round(66 * $px); //249.449 px
+			$y = round(50 * $px); //188.976 px
+			$bar_size = round(63.393 / 72); //0.880 px
 
 			$len = 0;
 			$test = '';
 
-			while ($len !== strlen($binCode) ) {
-				$test .= substr($binCode, $len, 7).' ';
-				$len = $len+7;
+			while ($len !== strlen($binCode)) {
+				$test .= substr($binCode, $len, 7) . ' ';
+				$len = $len + 7;
 			}
 
 			$im = imagecreate($x, $y);
 			$background_color = imagecolorallocate($im, 255, 255, 255);
-			$start = round(5.79*$px); //21.883
+			$start = round(5.79 * $px); //21.883
 
 			/*Write First left guard*/
-			$this->imgNormalGuard($im, $start, $start+$bar_size,
+			$this->imgNormalGuard($im, $start, $start + $bar_size,
 					imagecolorallocate($im, 0, 0, 0));
-			$this->imgNormalGuard($im, $start+($bar_size*2),
-					$start+($bar_size*3), imagecolorallocate($im, 255, 255, 255));
-			$this->imgNormalGuard($im, $start+($bar_size*4),
-					$start+($bar_size*5), imagecolorallocate($im, 0, 0, 0));
+			$this->imgNormalGuard($im, $start + ($bar_size * 2),
+					$start + ($bar_size * 3), imagecolorallocate($im, 255, 255, 255));
+			$this->imgNormalGuard($im, $start + ($bar_size * 4),
+					$start + ($bar_size * 5), imagecolorallocate($im, 0, 0, 0));
 
-			$pos = $start+($bar_size*7);
-			$newPos = $pos+$bar_size;
+			$pos = $start + ($bar_size * 7);
+			$newPos = $pos + $bar_size;
 
 			/*Write left barcode*/
-			for ($i=0; $i<42 ; $i++) {
-				if( substr($binCode, $i, 1) === '0' ) {
+			for ($i = 0; $i < 42; $i++) {
+				if (substr($binCode, $i, 1) === '0') {
 					$color = imagecolorallocate($im, 255, 255, 255);
 				}
 				else {
@@ -166,108 +166,108 @@ 
 				}
 
 				$this->imgSymbole($im, $pos, $newPos, $color);
-				$newPos = $pos+$bar_size;
-				$pos = $newPos+$bar_size;
+				$newPos = $pos + $bar_size;
+				$pos = $newPos + $bar_size;
 			}
 
 			/*Writer center guard*/
 			$pos = $newPos;
-			$this->imgNormalGuard($im, $pos, $newPos+$bar_size,
+			$this->imgNormalGuard($im, $pos, $newPos + $bar_size,
 					imagecolorallocate($im, 255, 255, 255));
-			$this->imgNormalGuard($im, $pos+($bar_size*2),
-					$newPos+($bar_size*3), imagecolorallocate($im, 0, 0, 0));
-			$this->imgNormalGuard($im, $pos+($bar_size*4),
-					$newPos+($bar_size*5), imagecolorallocate($im, 255, 255, 255));
-			$this->imgNormalGuard($im, $pos+($bar_size*6),
-					$newPos+($bar_size*7), imagecolorallocate($im, 0, 0, 0));
-			$this->imgNormalGuard($im, $pos+($bar_size*8),
-					$newPos+($bar_size*9), imagecolorallocate($im, 255, 255, 255));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 2),
+					$newPos + ($bar_size * 3), imagecolorallocate($im, 0, 0, 0));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 4),
+					$newPos + ($bar_size * 5), imagecolorallocate($im, 255, 255, 255));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 6),
+					$newPos + ($bar_size * 7), imagecolorallocate($im, 0, 0, 0));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 8),
+					$newPos + ($bar_size * 9), imagecolorallocate($im, 255, 255, 255));
 
-			$pos = $newPos+($bar_size*10);
+			$pos = $newPos + ($bar_size * 10);
 
 			/*Write right barcode*/
-			for ($i=42; $i<84 ; $i++) {
-				if( substr($binCode, $i, 1) === '0' ) {
+			for ($i = 42; $i < 84; $i++) {
+				if (substr($binCode, $i, 1) === '0') {
 					$color = imagecolorallocate($im, 255, 255, 255);
 				}
 				else {
 					$color = imagecolorallocate($im, 0, 0, 0);
 				}
 
-				$newPos = $pos+$bar_size;
+				$newPos = $pos + $bar_size;
 
 				$this->imgSymbole($im, $pos, $newPos, $color);
-				$pos = $newPos+$bar_size;
+				$pos = $newPos + $bar_size;
 			}
 
 			/*Write right guard*/
-			$pos = $newPos+$bar_size;
-			$this->imgNormalGuard($im, $pos, $pos+$bar_size,
+			$pos = $newPos + $bar_size;
+			$this->imgNormalGuard($im, $pos, $pos + $bar_size,
 					imagecolorallocate($im, 0, 0, 0));
-			$this->imgNormalGuard($im, $pos+($bar_size*2),
-					$pos+($bar_size*3), imagecolorallocate($im, 255, 255, 255));
-			$this->imgNormalGuard($im, $pos+($bar_size*4),
-					$pos+($bar_size*5), imagecolorallocate($im, 0, 0, 0));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 2),
+					$pos + ($bar_size * 3), imagecolorallocate($im, 255, 255, 255));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 4),
+					$pos + ($bar_size * 5), imagecolorallocate($im, 0, 0, 0));
 
 			$textSize = 16;
-			$font = WPS_BARCODE_FONTS.'/arialbd.ttf';
-			imagettftext($im, $textSize, 0, 8, $y-$start-5,
+			$font = WPS_BARCODE_FONTS . '/arialbd.ttf';
+			imagettftext($im, $textSize, 0, 8, $y - $start - 5,
 			imagecolorallocate($im, 0, 0, 0), $font, substr($meta, 0, 1));
 
 			$continue = true;
 			$i = 28; $j = 0;
 
 			/*Write left number code*/
-			while ($j<5) {
-				$j=$j+1;
-				imagettftext($im, $textSize, 0, $i, $y-$start-5,
+			while ($j < 5) {
+				$j = $j + 1;
+				imagettftext($im, $textSize, 0, $i, $y - $start - 5,
 				imagecolorallocate($im, 0, 0, 0), $font, substr($meta, $j, 1));
-				$i = $i+14;
+				$i = $i + 14;
 			}
 
 			/*Write right number code*/
-			while ($j<11) {
-				$j=$j+1;
-				imagettftext($im, $textSize, 0, $i+6, $y-$start-5,
+			while ($j < 11) {
+				$j = $j + 1;
+				imagettftext($im, $textSize, 0, $i + 6, $y - $start - 5,
 					imagecolorallocate($im, 0, 0, 0), $font, substr($meta, $j, 1));
-				$i = $i+15;
+				$i = $i + 15;
 			}
-			imagettftext($im, $textSize, 0, $i+4, $y-$start-5,
-				imagecolorallocate($im, 0, 0, 0), $font, substr($meta, $j+1, 1));
+			imagettftext($im, $textSize, 0, $i + 4, $y - $start - 5,
+				imagecolorallocate($im, 0, 0, 0), $font, substr($meta, $j + 1, 1));
 
 			/*Write ref product and price*/
 			$textSize = 12;
 			$currency = (wpshop_tools::wpshop_get_currency() === '&euro;') ? "€" : wpshop_tools::wpshop_get_currency();
 
-			if ( $type === __('coupon', 'wps_barcode') ) {
+			if ($type === __('coupon', 'wps_barcode')) {
 				$coupon_postmeta = get_post_meta($post_ID, 'wpshop_coupon_discount_type');
-				if ( $coupon_postmeta[0] === 'percent' ) {
-					$price = $price.' %';
+				if ($coupon_postmeta[0] === 'percent') {
+					$price = $price . ' %';
 				}
 				else {
-					$price = sprintf( number_format( $price, 2 ). ' '.$currency);
+					$price = sprintf(number_format($price, 2) . ' ' . $currency);
 				}
 			}
 			else {
-				$price = sprintf( number_format( $price, 2 ). ' '.$currency);
+				$price = sprintf(number_format($price, 2) . ' ' . $currency);
 			}
 
-			imagettftext($im, $textSize, 0, 20, round(6*$px),
+			imagettftext($im, $textSize, 0, 20, round(6 * $px),
 				imagecolorallocate($im, 0, 0, 0), $font, $title);
-			imagettftext($im, $textSize, 0, ($x/2)+40, round(6*$px),
+			imagettftext($im, $textSize, 0, ($x / 2) + 40, round(6 * $px),
 				imagecolorallocate($im, 0, 0, 0), $font, $price);
 
 			ob_start();
 			imagepng($im);
 			$img = ob_get_clean();
 
-			return '<p><img src="data:image/png;base64,'.base64_encode($img).
-			'" id="barcode" width="160" height="90" /></p>'.
+			return '<p><img src="data:image/png;base64,' . base64_encode($img) .
+			'" id="barcode" width="160" height="90" /></p>' .
 
-			'<p style="text-align: right"><button class="button '.
-					'button-primary button-large" type="button"'.
-					'id="print_barcode">'.
-					__('Print', 'wps_barcode').'</button></p>';
+			'<p style="text-align: right"><button class="button ' .
+					'button-primary button-large" type="button"' .
+					'id="print_barcode">' .
+					__('Print', 'wps_barcode') . '</button></p>';
 
 					/*wp_mkdir_p( WPS_BARCODE_UPLOAD );
 
@@ -286,8 +286,8 @@ 
 					}*/
 		}
 		else {
-			return '<p>'.sprintf( __('None bardcode generated as you did create %s.',
-					'wps_barcode'), $type).'</p>';
+			return '<p>' . sprintf(__('None bardcode generated as you did create %s.',
+					'wps_barcode'), $type) . '</p>';
 		}
 	}
 
@@ -299,7 +299,7 @@ 
 	 * @param integer $color Color of rectangle
 	 */
 	private function imgNormalGuard(&$image, $pos, $size, $color) {
-		imagefilledrectangle($image, $pos, 180*0.25,$size, 180-10, $color );
+		imagefilledrectangle($image, $pos, 180 * 0.25, $size, 180 - 10, $color);
 	}
 
 	/**
@@ -310,6 +310,6 @@ 
 	 * @param integer $color Color of rectangle
 	 */
 	private function imgSymbole(&$image, $pos, $size, $color) {
-		imagefilledrectangle($image, $pos, 180*0.25,$size, 180-40, $color );
+		imagefilledrectangle($image, $pos, 180 * 0.25, $size, 180 - 40, $color);
 	}
 }

includes/modules/wps_barcode/controller/wps_barcodegen.ctr.php

Doc Comments +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
 
 	/**
 	 * get binary code of barcode
-	 * @return binary code
+	 * @return string code
 	 */
 	public function getBinCode() {
 		return $this->binCode;

Indentation +8 added lines, -8 removed lines

@@ -52,7 +52,7 @@ 
 	/**
 	 * Write line of log
 	 * @param string $string Line writing
-	*/
+	 */
 	public function writeLog($string) {
 		$this->log .= $string;
 	}
@@ -68,7 +68,7 @@ 
 	/**
 	 * Set generate code for barcode has been generate
 	 * @param string $code Number code of barcode
-	*/
+	 */
 	public function setGenerateCode($code) {
 		$code = $this->checksum( substr($code, 0, 12) );
 		$this->originalCode = $code;
@@ -155,7 +155,7 @@ 
 
 	/**
 	 * Read INI configuration for country generate code
-	*/
+	 */
 	private function readGencodeIni() {
 		$ini = parse_ini_file('assets/config/gencode.ini', true);
 
@@ -172,7 +172,7 @@ 
 
 	/**
 	 * Read INI general configuration
-	*/
+	 */
 	private function readConfigIni() {
 		$ini = parse_ini_file('assets/config/config.ini', true);
 
@@ -190,7 +190,7 @@ 
 	 * Cut and parse string for generate code
 	 * @param string $ctry Country number code
 	 * @return array String exploding with explode PHP function and parsing
-	*/
+	 */
 	private function explodingString($ctry) {
 		global $count, $gen, $leftRnd;
 
@@ -269,7 +269,7 @@ 
 	 * @param string $country International country code
 	 * @param string $code Type for number code generate (country, distributors...)
 	 * @return string Number code generate
-	*/
+	 */
 	private function ean13($country, $code, $ref) {
 		global $count, $gen, $leftRnd;
 
@@ -466,7 +466,7 @@ 
 	/**
 	 * Generate bincode
 	 * @param string $code Number code generated by normalization function
-	*/
+	 */
 	public function bin($code) {
 		if ($this->binCode === '') {
 			$binCode = '';
@@ -495,7 +495,7 @@ 
 	/**
 	 * Calcul motif for generate barcode
 	 * @param string $code Number code generate
-	*/
+	 */
 	private function motifCalc($code) {
 		$start = substr($code, 0, 1);
 		switch ($start) {

Spacing +83 added lines, -83 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Generate barcodes with informations
@@ -30,17 +30,17 @@ 
 	private $config = array();
 
 	public function __construct() {
-	$this->setA = array( 0 => '0001101',	1 => '0011001',	2 => '0010011',
-		3 => '0111101',	4 => '0100011',	5 => '0110001',	6 => '0101111',
-		7 => '0111011',	8 => '0110111',	9 => '0001011'	);
+	$this->setA = array(0 => '0001101', 1 => '0011001', 2 => '0010011',
+		3 => '0111101', 4 => '0100011', 5 => '0110001', 6 => '0101111',
+		7 => '0111011', 8 => '0110111', 9 => '0001011');
 
-	$this->setB = array( 0 => '0100111', 1 => '0110011', 2 => '0011011',
+	$this->setB = array(0 => '0100111', 1 => '0110011', 2 => '0011011',
 		3 => '0100001', 4 => '0011101', 5 => '0111001', 6 => '0000101',
-		7 => '0010001', 8 => '0001001', 9 => '0010111' );
+		7 => '0010001', 8 => '0001001', 9 => '0010111');
 
-	$this->setC = array( 0 => '1110010', 1 => '1100110', 2 => '1101100',
+	$this->setC = array(0 => '1110010', 1 => '1100110', 2 => '1101100',
 		3 => '1000010', 4 => '1011100', 5 => '1001110', 6 => '1010000',
-		7 => '1000100', 8 => '1001000', 9 => '1110100' );
+		7 => '1000100', 8 => '1001000', 9 => '1110100');
 
 	//$this->file = fopen(/logs/ean13.log', 'a');
 	}
@@ -70,7 +70,7 @@ 
 	 * @param string $code Number code of barcode
 	*/
 	public function setGenerateCode($code) {
-		$code = $this->checksum( substr($code, 0, 12) );
+		$code = $this->checksum(substr($code, 0, 12));
 		$this->originalCode = $code;
 		$this->motifCalc($code);
 		$this->bin(substr($code, 1));
@@ -82,15 +82,15 @@ 
 	 * @return string Number code with checksum
 	 */
 	public static function checksum($code) {
-		$leftRnd = str_split( substr($code, 0, 7) );
-		$rightRnd = str_split( substr($code, 7) );
+		$leftRnd = str_split(substr($code, 0, 7));
+		$rightRnd = str_split(substr($code, 7));
 
 		/*Generate checksum*/
-		$leftSum = ($leftRnd[1]+$leftRnd[3]+$leftRnd[5]+$rightRnd[0]+$rightRnd[2]+$rightRnd[4])*3;
-		$rightSum = $leftRnd[0]+$leftRnd[2]+$leftRnd[4]+$leftRnd[6]+$rightRnd[1]+$rightRnd[3];
-		$sum = $leftSum+$rightSum;
+		$leftSum = ($leftRnd[1] + $leftRnd[3] + $leftRnd[5] + $rightRnd[0] + $rightRnd[2] + $rightRnd[4]) * 3;
+		$rightSum = $leftRnd[0] + $leftRnd[2] + $leftRnd[4] + $leftRnd[6] + $rightRnd[1] + $rightRnd[3];
+		$sum = $leftSum + $rightSum;
 
-		$checksum = (ceil($sum/10)*10)-$sum;
+		$checksum = (ceil($sum / 10) * 10) - $sum;
 		$rightRnd[5] = strval($checksum);
 		$gencode = implode($leftRnd);
 		$gencode .= implode($rightRnd);
@@ -114,7 +114,7 @@ 
 	public function setCountry($code) {
 		$this->country = $code;
 
-		if ( $this->fixed !== '' ) {
+		if ($this->fixed !== '') {
 				$this->fixed .= ';country';
 		}
 		else {
@@ -129,7 +129,7 @@ 
 	public function setEnterpriseCode($code) {
 		$this->enterprise = $code;
 
-		if ( $this->fixed !== '' ) {
+		if ($this->fixed !== '') {
 			$this->fixed .= ';enterprise';
 		}
 		else {
@@ -159,13 +159,13 @@ 
 	private function readGencodeIni() {
 		$ini = parse_ini_file('assets/config/gencode.ini', true);
 
-		if ( array_key_exists("EAN13", $ini) ) {
-			$pos = array_search( "EAN13", array_keys($ini) );
+		if (array_key_exists("EAN13", $ini)) {
+			$pos = array_search("EAN13", array_keys($ini));
 			$this->ean13 = array_slice($ini["EAN13"], 0);
 		}
 
-		if ( array_key_exists("OTHEREAN13", $ini) ) {
-			$pos = array_search( "OTHEREAN13" , array_keys($ini) );
+		if (array_key_exists("OTHEREAN13", $ini)) {
+			$pos = array_search("OTHEREAN13", array_keys($ini));
 			$this->other_ean13 = array_slice($ini["OTHEREAN13"], 0);
 		}
 	}
@@ -176,8 +176,8 @@ 
 	private function readConfigIni() {
 		$ini = parse_ini_file('assets/config/config.ini', true);
 
-		if ( array_key_exists("general", $ini) ) {
-			$pos = array_search( "general", array_keys($ini) );
+		if (array_key_exists("general", $ini)) {
+			$pos = array_search("general", array_keys($ini));
 
 			$this->enterprise = $ini["general"]["enteprise"];
 			$this->country = $ini["general"]["country"];
@@ -199,12 +199,12 @@ 
 
 		/*If minimum two informations*/
 		if ($count > 1) {
-			for ($i=0; $i<$count ; $i++) {
+			for ($i = 0; $i < $count; $i++) {
 				$pos = strpos($exploding[$i], ":");
 				$gen[$i]["start"] = substr($exploding[$i], 0, $pos);
 
-				if ( intval( substr($exploding[$i], $pos) ) < 1 ) {
-					$gen[$i]["end"] = substr($exploding[$i], $pos+1);
+				if (intval(substr($exploding[$i], $pos)) < 1) {
+					$gen[$i]["end"] = substr($exploding[$i], $pos + 1);
 				}
 				else {
 					$gen[$i]["end"] = substr($exploding[$i], $pos);
@@ -215,17 +215,17 @@ 
 				}
 			}
 
-			$select = mt_rand( 0, count($gen)-1 );
+			$select = mt_rand(0, count($gen) - 1);
 			$g1 = strval($gen[$select]["start"]);
 			$g2 = strval($gen[$select]["end"]);
 
-			$rand = mt_rand( $g1, $g2 );
+			$rand = mt_rand($g1, $g2);
 
-				if ( $rand >= 10 and $rand < 100 ) {
-					$strNum = '0'.intval($rand);
+				if ($rand >= 10 and $rand < 100) {
+					$strNum = '0' . intval($rand);
 				}
-				else if ( $rand < 10 ) {
-					$strNum = '00'.intval($rand);
+				else if ($rand < 10) {
+					$strNum = '00' . intval($rand);
 				}
 				else {
 					$strNum = intval($rand);
@@ -235,21 +235,21 @@ 
 			$pos = strpos($exploding[0], ":");
 			if ($pos > 0) {
 				$gen[0]["start"] = substr($exploding[0], 0, $pos);
-				$gen[0]["end"] = substr($exploding[0], $pos+1);
+				$gen[0]["end"] = substr($exploding[0], $pos + 1);
 
-				$select = mt_rand( intval($gen[0]["start"]),
-				intval($gen[0]["end"]) );
+				$select = mt_rand(intval($gen[0]["start"]),
+				intval($gen[0]["end"]));
 
 				$strNum = strval($select);
 				$len = strlen($strNum);
-				if ( $len < 3 ) {
+				if ($len < 3) {
 					switch ($len) {
 						case 1:
-							$strNum = '00'.$strNum;
+							$strNum = '00' . $strNum;
 							break;
 
 						case 2:
-							$strNum = '0'.$strNum;
+							$strNum = '0' . $strNum;
 							break;
 					}
 				}
@@ -258,9 +258,9 @@ 
 				$strNum = strval($exploding[0]);
 			}
 		}
-				$leftRnd[0] = substr( $strNum, 0, 1);
-				$leftRnd[1] = substr( $strNum, 1, 1);
-				$leftRnd[2] = substr( $strNum, 2, 1);
+				$leftRnd[0] = substr($strNum, 0, 1);
+				$leftRnd[1] = substr($strNum, 1, 1);
+				$leftRnd[2] = substr($strNum, 2, 1);
 		return $gen;
 	}
 
@@ -279,7 +279,7 @@ 
 
 		$this->readGencodeIni();
 
-		if ( $this->fixed === '' ) {
+		if ($this->fixed === '') {
 			$this->readConfigIni();
 		}
 
@@ -287,28 +287,28 @@ 
 			$explodingConf = explode(";", $this->fixed);
 
 			foreach ($explodingConf as $key => $value) {
-				if ( strtolower($value) === "country" ) {
+				if (strtolower($value) === "country") {
 					$country = $this->country;
 					$code = "country";
 					$countryViaConf = true;
 				}
-				elseif ( strtolower($value) === "enterprise" ) {
+				elseif (strtolower($value) === "enterprise") {
 					$enterpriseViaConf = true;
 				}
 			}
 		}
 
-		if ( $countryViaConf === true ) {
-			if ( $this->countryCode !== '' )
+		if ($countryViaConf === true) {
+			if ($this->countryCode !== '')
 			{
 				$strNum = strval($this->countryCode);
-				$leftRnd[0] = substr( $strNum, 0, 1);
-				$leftRnd[1] = substr( $strNum, 1, 1);
-				$leftRnd[2] = substr( $strNum, 2, 1);
+				$leftRnd[0] = substr($strNum, 0, 1);
+				$leftRnd[1] = substr($strNum, 1, 1);
+				$leftRnd[2] = substr($strNum, 2, 1);
 			}
 			else {
 
-				if ( array_key_exists(strtoupper($country), $this->ean13) ) {
+				if (array_key_exists(strtoupper($country), $this->ean13)) {
 					$ctry = $this->ean13[strtoupper($country)];
 				}
 
@@ -339,17 +339,17 @@ 
 			$this->countryGen($country, $code);
 
 			/*Generate left section of gencode*/
-			if ( !isset($leftRnd[2]) ) {
+			if (!isset($leftRnd[2])) {
 				$leftRnd[2] = mt_rand(0, 9);
 			}
 		}
 
-		if ( $enterpriseViaConf === true ) {
+		if ($enterpriseViaConf === true) {
 			$strNum2 = strval($this->enterprise);
-			$leftRnd[3] = substr( $strNum2, 0, 1);
-			$leftRnd[4] = substr( $strNum2, 1, 1);
-			$leftRnd[5] = substr( $strNum2, 2, 1);
-			$leftRnd[6] = substr( $strNum2, 3, 1);
+			$leftRnd[3] = substr($strNum2, 0, 1);
+			$leftRnd[4] = substr($strNum2, 1, 1);
+			$leftRnd[5] = substr($strNum2, 2, 1);
+			$leftRnd[6] = substr($strNum2, 3, 1);
 		}
 		else {
 			$leftRnd[3] = mt_rand(0, 9);
@@ -359,7 +359,7 @@ 
 		}
 
 		/*Generate right section of gencode*/
-		switch ( strlen($ref) ) {
+		switch (strlen($ref)) {
 			case 0:
 				$rightRnd[0] = mt_rand(0, 9);
 				$rightRnd[1] = mt_rand(0, 9);
@@ -380,32 +380,32 @@ 
 				$rightRnd[0] = 0;
 				$rightRnd[1] = 0;
 				$rightRnd[2] = 0;
-				$rightRnd[3] = substr( $ref, 0, 1);
-				$rightRnd[4] = substr( $ref, 1, 1);
+				$rightRnd[3] = substr($ref, 0, 1);
+				$rightRnd[4] = substr($ref, 1, 1);
 				break;
 
 			case 3:
 				$rightRnd[0] = 0;
 				$rightRnd[1] = 0;
-				$rightRnd[2] = substr( $ref, 0, 1);
-				$rightRnd[3] = substr( $ref, 1, 1);
-				$rightRnd[4] = substr( $ref, 2, 1);
+				$rightRnd[2] = substr($ref, 0, 1);
+				$rightRnd[3] = substr($ref, 1, 1);
+				$rightRnd[4] = substr($ref, 2, 1);
 				break;
 
 			case 4:
 				$rightRnd[0] = 0;
-				$rightRnd[1] = substr( $ref, 0, 1);
-				$rightRnd[2] = substr( $ref, 1, 1);
-				$rightRnd[3] = substr( $ref, 2, 1);
-				$rightRnd[4] = substr( $ref, 3, 1);
+				$rightRnd[1] = substr($ref, 0, 1);
+				$rightRnd[2] = substr($ref, 1, 1);
+				$rightRnd[3] = substr($ref, 2, 1);
+				$rightRnd[4] = substr($ref, 3, 1);
 				break;
 
 			case 5:
-				$rightRnd[0] = substr( $ref, 0, 1);
-				$rightRnd[1] = substr( $ref, 1, 1);
-				$rightRnd[2] = substr( $ref, 2, 1);
-				$rightRnd[3] = substr( $ref, 3, 1);
-				$rightRnd[4] = substr( $ref, 4, 1);
+				$rightRnd[0] = substr($ref, 0, 1);
+				$rightRnd[1] = substr($ref, 1, 1);
+				$rightRnd[2] = substr($ref, 2, 1);
+				$rightRnd[3] = substr($ref, 3, 1);
+				$rightRnd[4] = substr($ref, 4, 1);
 				break;
 
 			default:
@@ -443,8 +443,8 @@ 
 	 */
 	public function countryGen($country, $code) {
 		/*Generation for country selection*/
-		if ( !empty($country) && $code == 'country' ) {
-			if ( array_key_exists(strtoupper($country), $this->ean13) ) {
+		if (!empty($country) && $code == 'country') {
+			if (array_key_exists(strtoupper($country), $this->ean13)) {
 				$ctry = $this->ean13[strtoupper($country)];
 				$gen = $this->explodingString($ctry);
 			}
@@ -453,8 +453,8 @@ 
 			if ($code == 'distrib' or $code == 'weight' or
 					$code == 'interne' or $code == 'coupons' or
 					$code == 'issn' or $code == 'isbn') {
-				if ( !empty($this->other_ean13) ) {
-					if ( array_key_exists($code, $this->other_ean13) ) {
+				if (!empty($this->other_ean13)) {
+					if (array_key_exists($code, $this->other_ean13)) {
 
 						$gen = $this->explodingString($this->other_ean13[$code]);
 					}
@@ -471,23 +471,23 @@ 
 		if ($this->binCode === '') {
 			$binCode = '';
 			/*Generate left bincode*/
-			for ($i=0; $i<6 ; $i++) {
-				if( substr($this->motif, $i, 1) === 'A' ) {
+			for ($i = 0; $i < 6; $i++) {
+				if (substr($this->motif, $i, 1) === 'A') {
 					$binCode .= $this->setA[substr($code, $i, 1)];
 				}
-				else if ( substr($this->motif, $i, 1) === 'B' ) {
+				else if (substr($this->motif, $i, 1) === 'B') {
 					$binCode .= $this->setB[substr($code, $i, 1)];
 				}
 			}
 
 			/*Generate right bincode*/
-			for ($i=6; $i<12 ; $i++) {
+			for ($i = 6; $i < 12; $i++) {
 				$binCode .= $this->setC[substr($code, $i, 1)];
 			}
 		}
 
-		$this->writeLog( sprintf( __("Bincode generate: %s <br />", 'wps_barcode'),
-				'<b>'.$binCode.'</b>') );
+		$this->writeLog(sprintf(__("Bincode generate: %s <br />", 'wps_barcode'),
+				'<b>' . $binCode . '</b>'));
 
 		$this->binCode = $binCode;
 	}
@@ -540,8 +540,8 @@ 
 				break;
 		}
 
-		$this->writeLog( sprintf( __("Motif: %s<br />", 'wps_barcode'),
-				$this->motif) );
+		$this->writeLog(sprintf(__("Motif: %s<br />", 'wps_barcode'),
+				$this->motif));
 	}
 }
 

Braces +17 added lines, -29 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Generate barcodes with informations
@@ -116,8 +118,7 @@ 
 
 		if ( $this->fixed !== '' ) {
 				$this->fixed .= ';country';
-		}
-		else {
+		} else {
 			$this->fixed .= 'country';
 		}
 	}
@@ -131,8 +132,7 @@ 
 
 		if ( $this->fixed !== '' ) {
 			$this->fixed .= ';enterprise';
-		}
-		else {
+		} else {
 			$this->fixed .= 'enterprise';
 		}
 	}
@@ -205,8 +205,7 @@ 
 
 				if ( intval( substr($exploding[$i], $pos) ) < 1 ) {
 					$gen[$i]["end"] = substr($exploding[$i], $pos+1);
-				}
-				else {
+				} else {
 					$gen[$i]["end"] = substr($exploding[$i], $pos);
 				}
 
@@ -223,15 +222,12 @@ 
 
 				if ( $rand >= 10 and $rand < 100 ) {
 					$strNum = '0'.intval($rand);
-				}
-				else if ( $rand < 10 ) {
+				} else if ( $rand < 10 ) {
 					$strNum = '00'.intval($rand);
-				}
-				else {
+				} else {
 					$strNum = intval($rand);
 				}
-		}
-		else {
+		} else {
 			$pos = strpos($exploding[0], ":");
 			if ($pos > 0) {
 				$gen[0]["start"] = substr($exploding[0], 0, $pos);
@@ -253,8 +249,7 @@ 
 							break;
 					}
 				}
-			}
-			else {
+			} else {
 				$strNum = strval($exploding[0]);
 			}
 		}
@@ -291,8 +286,7 @@ 
 					$country = $this->country;
 					$code = "country";
 					$countryViaConf = true;
-				}
-				elseif ( strtolower($value) === "enterprise" ) {
+				} elseif ( strtolower($value) === "enterprise" ) {
 					$enterpriseViaConf = true;
 				}
 			}
@@ -305,8 +299,7 @@ 
 				$leftRnd[0] = substr( $strNum, 0, 1);
 				$leftRnd[1] = substr( $strNum, 1, 1);
 				$leftRnd[2] = substr( $strNum, 2, 1);
-			}
-			else {
+			} else {
 
 				if ( array_key_exists(strtoupper($country), $this->ean13) ) {
 					$ctry = $this->ean13[strtoupper($country)];
@@ -314,8 +307,7 @@ 
 
 				$gen = $this->explodingString($ctry);
 			}
-		}
-		else {
+		} else {
 			/*Generation for country selection*/
 			/*if ( !empty($country) && $code == 'country' ) {
 				if ( array_key_exists(strtoupper($country), $this->ean13) ) {
@@ -350,8 +342,7 @@ 
 			$leftRnd[4] = substr( $strNum2, 1, 1);
 			$leftRnd[5] = substr( $strNum2, 2, 1);
 			$leftRnd[6] = substr( $strNum2, 3, 1);
-		}
-		else {
+		} else {
 			$leftRnd[3] = mt_rand(0, 9);
 			$leftRnd[4] = mt_rand(0, 9);
 			$leftRnd[5] = mt_rand(0, 9);
@@ -426,8 +417,7 @@ 
 			foreach ($rightRnd as $key => $value) {
 				$codeForChecksum .= $value;
 			}
-		}
-		else {
+		} else {
 			$codeForChecksum = $this->originalCode;
 		}
 
@@ -448,8 +438,7 @@ 
 				$ctry = $this->ean13[strtoupper($country)];
 				$gen = $this->explodingString($ctry);
 			}
-		}
-		else {
+		} else {
 			if ($code == 'distrib' or $code == 'weight' or
 					$code == 'interne' or $code == 'coupons' or
 					$code == 'issn' or $code == 'isbn') {
@@ -474,8 +463,7 @@ 
 			for ($i=0; $i<6 ; $i++) {
 				if( substr($this->motif, $i, 1) === 'A' ) {
 					$binCode .= $this->setA[substr($code, $i, 1)];
-				}
-				else if ( substr($this->motif, $i, 1) === 'B' ) {
+				} else if ( substr($this->motif, $i, 1) === 'B' ) {
 					$binCode .= $this->setB[substr($code, $i, 1)];
 				}
 			}

includes/modules/wps_barcode/librairies/odtphp/zip/pclzip/pclzip.lib.php

Doc Comments +34 added lines

@@ -212,6 +212,10 @@ 
   //   Note that no real action is taken, if the archive does not exist it is not
   //   created. Use create() for that.
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_zipname
+   */
   function PclZip($p_zipname)
   {
 
@@ -220,6 +224,10 @@ 
     {
       if (!function_exists('gzopen')
         && function_exists('gzopen64')) {
+
+        /**
+         * @param string $filename
+         */
         function gzopen($filename , $mode = 'r', $use_include_path = 0 )
         {
             return gzopen64($filename , $mode, $use_include_path);
@@ -457,6 +465,10 @@ 
   //   The list of the added files, with a status of the add action.
   //   (see PclZip::listContent() for list entry format)
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_filelist
+   */
   function add($p_filelist)
   {
     $v_result=1;
@@ -2341,6 +2353,10 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_mode
+   */
   function privOpenFd($p_mode)
   {
     $v_result=1;
@@ -4157,6 +4173,10 @@ 
   // Parameters :
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_string
+   */
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
     $v_result=1;
@@ -5050,6 +5070,10 @@ 
   // Parameters :
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param PclZip $p_archive_to_add
+   */
   function privMerge(&$p_archive_to_add)
   {
     $v_result=1;
@@ -5557,6 +5581,11 @@ 
   //             3 : src & dest gzip
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param integer $p_src
+   * @param integer $p_dest
+   */
   function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
     $v_result = 1;
@@ -5619,6 +5648,11 @@ 
   // Return Values :
   //   1 on success, 0 on failure.
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_src
+   * @param string $p_dest
+   */
   function PclZipUtilRename($p_src, $p_dest)
   {
     $v_result = 1;

Indentation +3762 added lines, -3762 removed lines

@@ -27,7 +27,7 @@ 
 
   // ----- Constants
   if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+	define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
   }
   
   // ----- File list separator
@@ -41,7 +41,7 @@ 
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
   if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+	define( 'PCLZIP_SEPARATOR', ',' );
   }
 
   // ----- Error configuration
@@ -50,7 +50,7 @@ 
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
   if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+	define( 'PCLZIP_ERROR_EXTERNAL', 0 );
   }
 
   // ----- Optional static temporary directory
@@ -63,7 +63,7 @@ 
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
   if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
+	define( 'PCLZIP_TEMPORARY_DIR', '' );
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -75,7 +75,7 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
   if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+	define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
   }
 
 // --------------------------------------------------------------------------------
@@ -189,20 +189,20 @@ 
   // --------------------------------------------------------------------------------
   class PclZip
   {
-    // ----- Filename of the zip file
-    var $zipname = '';
+	// ----- Filename of the zip file
+	var $zipname = '';
 
-    // ----- File descriptor of the zip file
-    var $zip_fd = 0;
+	// ----- File descriptor of the zip file
+	var $zip_fd = 0;
 
-    // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
+	// ----- Internal error handling
+	var $error_code = 1;
+	var $error_string = '';
     
-    // ----- Current status of the magic_quotes_runtime
-    // This value store the php configuration for magic_quotes
-    // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
+	// ----- Current status of the magic_quotes_runtime
+	// This value store the php configuration for magic_quotes
+	// The class can then disable the magic_quotes and reset it after
+	var $magic_quotes_status;
 
   // --------------------------------------------------------------------------------
   // Function : PclZip()
@@ -215,25 +215,25 @@ 
   function PclZip($p_zipname)
   {
 
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
-    {
-      if (!function_exists('gzopen')
-        && function_exists('gzopen64')) {
-        function gzopen($filename , $mode = 'r', $use_include_path = 0 )
-        {
-            return gzopen64($filename , $mode, $use_include_path);
-        }
-      }
-    }
+	// ----- Tests the zlib
+	if (!function_exists('gzopen'))
+	{
+	  if (!function_exists('gzopen')
+		&& function_exists('gzopen64')) {
+		function gzopen($filename , $mode = 'r', $use_include_path = 0 )
+		{
+			return gzopen64($filename , $mode, $use_include_path);
+		}
+	  }
+	}
 
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
+	// ----- Set the attributes
+	$this->zipname = $p_zipname;
+	$this->zip_fd = 0;
+	$this->magic_quotes_status = -1;
 
-    // ----- Return
-    return;
+	// ----- Return
+	return;
   }
   // --------------------------------------------------------------------------------
 
@@ -276,149 +276,149 @@ 
   // --------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
+	$v_result=1;
+
+	// ----- Reset the error handler
+	$this->privErrorReset();
+
+	// ----- Set default values
+	$v_options = array();
+	$v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove from the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_ADD => 'optional',
+												   PCLZIP_CB_POST_ADD => 'optional',
+												   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+												   PCLZIP_OPT_COMMENT => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+												   //, PCLZIP_OPT_CRYPT => 'optional'
+											 ));
+		if ($v_result != 1) {
+		  return 0;
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+							   "Invalid number / type of arguments");
+		  return 0;
+		}
+	  }
+	}
     
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
+
+	// ----- Init
+	$v_string_list = array();
+	$v_att_list = array();
+	$v_filedescr_list = array();
+	$p_result_list = array();
     
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
+	// ----- Look if the $p_filelist is really an array
+	if (is_array($p_filelist)) {
     
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
+	  // ----- Look if the first element is also an array
+	  //       This will mean that this is a file description entry
+	  if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+		$v_att_list = $p_filelist;
+	  }
       
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
+	  // ----- The list is a list of string names
+	  else {
+		$v_string_list = $p_filelist;
+	  }
+	}
 
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
+	// ----- Look if the $p_filelist is a string
+	else if (is_string($p_filelist)) {
+	  // ----- Create a list from the string
+	  $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+	}
 
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
+	// ----- Invalid variable type for $p_filelist
+	else {
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+	  return 0;
+	}
     
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
+	// ----- Reformat the string list
+	if (sizeof($v_string_list) != 0) {
+	  foreach ($v_string_list as $v_string) {
+		if ($v_string != '') {
+		  $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+		}
+		else {
+		}
+	  }
+	}
     
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+	// ----- For each file in the list check the attributes
+	$v_supported_attributes
+	= array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+			 ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_MTIME => 'optional'
+			 ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+			 ,PCLZIP_ATT_FILE_COMMENT => 'optional'
 						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
+	foreach ($v_att_list as $v_entry) {
+	  $v_result = $this->privFileDescrParseAtt($v_entry,
+											   $v_filedescr_list[],
+											   $v_options,
+											   $v_supported_attributes);
+	  if ($v_result != 1) {
+		return 0;
+	  }
+	}
 
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Expand the filelist (expand directories)
+	$v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Call the create fct
+	$v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Return
-    return $p_result_list;
+	// ----- Return
+	return $p_result_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -459,149 +459,149 @@ 
   // --------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
+	$v_result=1;
+
+	// ----- Reset the error handler
+	$this->privErrorReset();
+
+	// ----- Set default values
+	$v_options = array();
+	$v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove form the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_ADD => 'optional',
+												   PCLZIP_CB_POST_ADD => 'optional',
+												   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+												   PCLZIP_OPT_COMMENT => 'optional',
+												   PCLZIP_OPT_ADD_COMMENT => 'optional',
+												   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+												   //, PCLZIP_OPT_CRYPT => 'optional'
 												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
+		if ($v_result != 1) {
+		  return 0;
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
+	// ----- Init
+	$v_string_list = array();
+	$v_att_list = array();
+	$v_filedescr_list = array();
+	$p_result_list = array();
     
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
+	// ----- Look if the $p_filelist is really an array
+	if (is_array($p_filelist)) {
     
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
+	  // ----- Look if the first element is also an array
+	  //       This will mean that this is a file description entry
+	  if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+		$v_att_list = $p_filelist;
+	  }
       
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
+	  // ----- The list is a list of string names
+	  else {
+		$v_string_list = $p_filelist;
+	  }
+	}
 
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
+	// ----- Look if the $p_filelist is a string
+	else if (is_string($p_filelist)) {
+	  // ----- Create a list from the string
+	  $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+	}
 
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
+	// ----- Invalid variable type for $p_filelist
+	else {
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+	  return 0;
+	}
     
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
+	// ----- Reformat the string list
+	if (sizeof($v_string_list) != 0) {
+	  foreach ($v_string_list as $v_string) {
+		$v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+	  }
+	}
     
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+	// ----- For each file in the list check the attributes
+	$v_supported_attributes
+	= array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+			 ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_MTIME => 'optional'
+			 ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+			 ,PCLZIP_ATT_FILE_COMMENT => 'optional'
 						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
+	foreach ($v_att_list as $v_entry) {
+	  $v_result = $this->privFileDescrParseAtt($v_entry,
+											   $v_filedescr_list[],
+											   $v_options,
+											   $v_supported_attributes);
+	  if ($v_result != 1) {
+		return 0;
+	  }
+	}
 
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Expand the filelist (expand directories)
+	$v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Call the create fct
+	$v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Return
-    return $p_result_list;
+	// ----- Return
+	return $p_result_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -648,26 +648,26 @@ 
   // --------------------------------------------------------------------------------
   function listContent()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
+	// ----- Call the extracting fct
+	$p_list = array();
+	if (($v_result = $this->privList($p_list)) != 1)
+	{
+	  unset($p_list);
+	  return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -705,120 +705,120 @@ 
   // --------------------------------------------------------------------------------
   function extract()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
+	// ----- Set default values
+	$v_options = array();
 //    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												    ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
+	$v_path = '';
+	$v_remove_path = "";
+	$v_remove_all_path = false;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Default values for option
+	$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+	// ----- Look for arguments
+	if ($v_size > 0) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_EXTRACT => 'optional',
+												   PCLZIP_CB_POST_EXTRACT => 'optional',
+												   PCLZIP_OPT_SET_CHMOD => 'optional',
+												   PCLZIP_OPT_BY_NAME => 'optional',
+												   PCLZIP_OPT_BY_EREG => 'optional',
+												   PCLZIP_OPT_BY_PREG => 'optional',
+												   PCLZIP_OPT_BY_INDEX => 'optional',
+												   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+												   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+												   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+												   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+												   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+													));
+		if ($v_result != 1) {
+		  return 0;
+		}
+
+		// ----- Set the arguments
+		if (isset($v_options[PCLZIP_OPT_PATH])) {
+		  $v_path = $v_options[PCLZIP_OPT_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+		  $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+		  $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+		  // ----- Check for '/' in last path char
+		  if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+			$v_path .= '/';
+		  }
+		  $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_path = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_remove_path = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Trace
+	// ----- Trace
 
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
+	// ----- Call the extracting fct
+	$p_list = array();
+	$v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
+										 $v_remove_all_path, $v_options);
+	if ($v_result < 1) {
+	  unset($p_list);
+	  return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -862,132 +862,132 @@ 
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
+	// ----- Set default values
+	$v_options = array();
 //    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+	$v_path = '';
+	$v_remove_path = "";
+	$v_remove_all_path = false;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Default values for option
+	$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove form the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_EXTRACT => 'optional',
+												   PCLZIP_CB_POST_EXTRACT => 'optional',
+												   PCLZIP_OPT_SET_CHMOD => 'optional',
+												   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+												   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+												   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
 												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
+		if ($v_result != 1) {
+		  return 0;
+		}
+
+		// ----- Set the arguments
+		if (isset($v_options[PCLZIP_OPT_PATH])) {
+		  $v_path = $v_options[PCLZIP_OPT_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+		  $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+		  $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+		  // ----- Check for '/' in last path char
+		  if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+			$v_path .= '/';
+		  }
+		  $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+		}
+		if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+		  $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+		}
+		else {
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_path = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_remove_path = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+	// ----- Trace
+
+	// ----- Trick
+	// Here I want to reuse extractByRule(), so I need to parse the $p_index
+	// with privParseOptions()
+	$v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+	$v_options_trick = array();
+	$v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
+										array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+	if ($v_result != 1) {
+		return 0;
+	}
+	$v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
+	// ----- Call the extracting fct
+	if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+		return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1011,54 +1011,54 @@ 
   // --------------------------------------------------------------------------------
   function delete()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
+	// ----- Set default values
+	$v_options = array();
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 0) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Parse the options
+	  $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+										array (PCLZIP_OPT_BY_NAME => 'optional',
+											   PCLZIP_OPT_BY_EREG => 'optional',
+											   PCLZIP_OPT_BY_PREG => 'optional',
+											   PCLZIP_OPT_BY_INDEX => 'optional' ));
+	  if ($v_result != 1) {
+		  return 0;
+	  }
+	}
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
+	// ----- Call the delete fct
+	$v_list = array();
+	if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+	  $this->privSwapBackMagicQuotes();
+	  unset($v_list);
+	  return(0);
+	}
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_list;
+	// ----- Return
+	return $v_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1071,10 +1071,10 @@ 
   function deleteByIndex($p_index)
   {
     
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+	$p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1095,61 +1095,61 @@ 
   function properties()
   {
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  $this->privSwapBackMagicQuotes();
+	  return(0);
+	}
 
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
+	// ----- Default properties
+	$v_prop = array();
+	$v_prop['comment'] = '';
+	$v_prop['nb'] = 0;
+	$v_prop['status'] = 'not_exist';
+
+	// ----- Look if file exists
+	if (@is_file($this->zipname))
+	{
+	  // ----- Open the zip file
+	  if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+	  {
+		$this->privSwapBackMagicQuotes();
         
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
 
-        // ----- Return
-        return 0;
-      }
+		// ----- Return
+		return 0;
+	  }
 
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
+	  // ----- Read the central directory informations
+	  $v_central_dir = array();
+	  if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	  {
+		$this->privSwapBackMagicQuotes();
+		return 0;
+	  }
 
-      // ----- Close the zip file
-      $this->privCloseFd();
+	  // ----- Close the zip file
+	  $this->privCloseFd();
 
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
-    }
+	  // ----- Set the user attributes
+	  $v_prop['comment'] = $v_central_dir['comment'];
+	  $v_prop['nb'] = $v_central_dir['entries'];
+	  $v_prop['status'] = 'ok';
+	}
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_prop;
+	// ----- Return
+	return $v_prop;
   }
   // --------------------------------------------------------------------------------
 
@@ -1167,46 +1167,46 @@ 
   // --------------------------------------------------------------------------------
   function duplicate($p_archive)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
-    {
+	// ----- Look if the $p_archive is a PclZip object
+	if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+	{
 
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
+	  // ----- Duplicate the archive
+	  $v_result = $this->privDuplicate($p_archive->zipname);
+	}
 
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
+	// ----- Look if the $p_archive is a string (so a filename)
+	else if (is_string($p_archive))
+	{
 
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
+	  // ----- Check that $p_archive is a valid zip file
+	  // TBC : Should also check the archive format
+	  if (!is_file($p_archive)) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+		$v_result = PCLZIP_ERR_MISSING_FILE;
+	  }
+	  else {
+		// ----- Duplicate the archive
+		$v_result = $this->privDuplicate($p_archive);
+	  }
+	}
 
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
+	// ----- Invalid variable
+	else
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+	  $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1226,45 +1226,45 @@ 
   // --------------------------------------------------------------------------------
   function merge($p_archive_to_add)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
+	// ----- Look if the $p_archive_to_add is a PclZip object
+	if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
+	{
 
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
+	  // ----- Merge the archive
+	  $v_result = $this->privMerge($p_archive_to_add);
+	}
 
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
+	// ----- Look if the $p_archive_to_add is a string (so a filename)
+	else if (is_string($p_archive_to_add))
+	{
 
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
+	  // ----- Create a temporary archive
+	  $v_object_archive = new PclZip($p_archive_to_add);
 
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
+	  // ----- Merge the archive
+	  $v_result = $this->privMerge($v_object_archive);
+	}
 
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
+	// ----- Invalid variable
+	else
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+	  $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1277,12 +1277,12 @@ 
   // --------------------------------------------------------------------------------
   function errorCode()
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  return(PclErrorCode());
+	}
+	else {
+	  return($this->error_code);
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1293,42 +1293,42 @@ 
   // --------------------------------------------------------------------------------
   function errorName($p_with_code=false)
   {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
+	$v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+					  PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+					  PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+					  PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+					  PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+					  PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+					  PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+					  PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+					  PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+					  PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+					  PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+					  PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+					  PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+					  PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+					  PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+					  PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+					  PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+					  PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+					  PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
+					  ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
+					  ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+					);
+
+	if (isset($v_name[$this->error_code])) {
+	  $v_value = $v_name[$this->error_code];
+	}
+	else {
+	  $v_value = 'NoName';
+	}
 
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
+	if ($p_with_code) {
+	  return($v_value.' ('.$this->error_code.')');
+	}
+	else {
+	  return($v_value);
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1339,17 +1339,17 @@ 
   // --------------------------------------------------------------------------------
   function errorInfo($p_full=false)
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  return(PclErrorString());
+	}
+	else {
+	  if ($p_full) {
+		return($this->errorName(true)." : ".$this->error_string);
+	  }
+	  else {
+		return($this->error_string." [code ".$this->error_code."]");
+	  }
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1378,39 +1378,39 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFormat($p_level=0)
   {
-    $v_result = true;
+	$v_result = true;
 
 	// ----- Reset the file system cache
-    clearstatcache();
+	clearstatcache();
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
+	// ----- Look if the file exits
+	if (!is_file($this->zipname)) {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+	  return(false);
+	}
 
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
+	// ----- Check that the file is readeable
+	if (!is_readable($this->zipname)) {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+	  return(false);
+	}
 
-    // ----- Check the magic code
-    // TBC
+	// ----- Check the magic code
+	// TBC
 
-    // ----- Check the central header
-    // TBC
+	// ----- Check the central header
+	// TBC
 
-    // ----- Check each file header
-    // TBC
+	// ----- Check each file header
+	// TBC
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1431,395 +1431,395 @@ 
   // --------------------------------------------------------------------------------
   function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
   {
-    $v_result=1;
+	$v_result=1;
     
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
+	// ----- Read the options
+	$i=0;
+	while ($i<$p_size) {
 
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+	  // ----- Check if the option is supported
+	  if (!isset($v_requested_options[$p_options_list[$i]])) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+	  // ----- Look for next option
+	  switch ($p_options_list[$i]) {
+		// ----- Look for options that request a path value
+		case PCLZIP_OPT_PATH :
+		case PCLZIP_OPT_REMOVE_PATH :
+		case PCLZIP_OPT_ADD_PATH :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
+		  // ----- Get the value
+		  $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+		  $i++;
+		break;
 
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			return PclZip::errorCode();
+		  }
           
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+			return PclZip::errorCode();
+		  }
           
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
+		  // ----- Check the value
+		  $v_value = $p_options_list[$i+1];
+		  if ((!is_integer($v_value)) || ($v_value<0)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
+		  // ----- Get the value (and convert it in bytes)
+		  $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+		  $i++;
+		break;
 
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_OPT_TEMP_FILE_ON :
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+			return PclZip::errorCode();
+		  }
           
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
+
+		case PCLZIP_OPT_TEMP_FILE_OFF :
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+			return PclZip::errorCode();
+		  }
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+			return PclZip::errorCode();
+		  }
           
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
 
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
+		  // ----- Get the value
+		  if (   is_string($p_options_list[$i+1])
+			  && ($p_options_list[$i+1] != '')) {
+			$v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+			$i++;
+		  }
+		  else {
+		  }
+		break;
 
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		// ----- Look for options that request an array of string for value
+		case PCLZIP_OPT_BY_NAME :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Get the value
+		  if (is_string($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+		  }
+		  else if (is_array($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that request an EREG or PREG expression
+		case PCLZIP_OPT_BY_EREG :
+		  // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+		  // to PCLZIP_OPT_BY_PREG
+		  $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+		case PCLZIP_OPT_BY_PREG :
+		//case PCLZIP_OPT_CRYPT :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Get the value
+		  if (is_string($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that takes a string
+		case PCLZIP_OPT_COMMENT :
+		case PCLZIP_OPT_ADD_COMMENT :
+		case PCLZIP_OPT_PREPEND_COMMENT :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
+								 "Missing parameter value for option '"
 								 .PclZipUtilOptionText($p_options_list[$i])
 								 ."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
+		  // ----- Get the value
+		  if (is_string($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
+								 "Wrong parameter value for option '"
 								 .PclZipUtilOptionText($p_options_list[$i])
 								 ."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that request an array of index
+		case PCLZIP_OPT_BY_INDEX :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
+		  // ----- Get the value
+		  $v_work_list = array();
+		  if (is_string($p_options_list[$i+1])) {
 
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+			  // ----- Remove spaces
+			  $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
 
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			  // ----- Parse items
+			  $v_work_list = explode(",", $p_options_list[$i+1]);
+		  }
+		  else if (is_integer($p_options_list[$i+1])) {
+			  $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
+		  }
+		  else if (is_array($p_options_list[$i+1])) {
+			  $v_work_list = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
           
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
+		  // ----- Reduce the index list
+		  // each index item in the list must be a couple with a start and
+		  // an end value : [0,3], [5-5], [8-10], ...
+		  // ----- Check the format of each item
+		  $v_sort_flag=false;
+		  $v_sort_value=0;
+		  for ($j=0; $j<sizeof($v_work_list); $j++) {
+			  // ----- Explode the item
+			  $v_item_list = explode("-", $v_work_list[$j]);
+			  $v_size_item_list = sizeof($v_item_list);
               
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
+			  // ----- TBC : Here we might check that each item is a
+			  // real integer ...
               
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
+			  // ----- Look for single value
+			  if ($v_size_item_list == 1) {
+				  // ----- Set the option value
+				  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+				  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
+			  }
+			  elseif ($v_size_item_list == 2) {
+				  // ----- Set the option value
+				  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+				  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
+			  }
+			  else {
+				  // ----- Error log
+				  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+				  // ----- Return
+				  return PclZip::errorCode();
+			  }
+
+
+			  // ----- Look for list sort
+			  if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+				  $v_sort_flag=true;
+
+				  // ----- TBC : An automatic sort should be writen ...
+				  // ----- Error log
+				  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+				  // ----- Return
+				  return PclZip::errorCode();
+			  }
+			  $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+		  }
           
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
+		  // ----- Sort the items
+		  if ($v_sort_flag) {
+			  // TBC : To Be Completed
+		  }
 
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+		  // ----- Next option
+		  $i++;
+		break;
+
+		// ----- Look for options that request no value
+		case PCLZIP_OPT_REMOVE_ALL_PATH :
+		case PCLZIP_OPT_EXTRACT_AS_STRING :
+		case PCLZIP_OPT_NO_COMPRESSION :
+		case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
+		case PCLZIP_OPT_REPLACE_NEWER :
+		case PCLZIP_OPT_STOP_ON_ERROR :
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
+
+		// ----- Look for options that request an octal value
+		case PCLZIP_OPT_SET_CHMOD :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
+		  // ----- Get the value
+		  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  $i++;
+		break;
+
+		// ----- Look for options that request a call-back
+		case PCLZIP_CB_PRE_EXTRACT :
+		case PCLZIP_CB_POST_EXTRACT :
+		case PCLZIP_CB_PRE_ADD :
+		case PCLZIP_CB_POST_ADD :
+		/* for futur use
         case PCLZIP_CB_PRE_DELETE :
         case PCLZIP_CB_POST_DELETE :
         case PCLZIP_CB_PRE_LIST :
         case PCLZIP_CB_POST_LIST :
         */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
+		  // ----- Get the value
+		  $v_function_name = $p_options_list[$i+1];
 
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Check that the value is a valid existing function
+		  if (!function_exists($v_function_name)) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
+		  // ----- Set the attribute
+		  $v_result_list[$p_options_list[$i]] = $v_function_name;
+		  $i++;
+		break;
 
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
+		default :
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+							   "Unknown parameter '"
 							   .$p_options_list[$i]."'");
 
-          // ----- Return
-          return PclZip::errorCode();
-      }
+		  // ----- Return
+		  return PclZip::errorCode();
+	  }
 
-      // ----- Next options
-      $i++;
-    }
+	  // ----- Next options
+	  $i++;
+	}
 
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
+	// ----- Look for mandatory options
+	if ($v_requested_options !== false) {
+	  for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+		// ----- Look for mandatory option
+		if ($v_requested_options[$key] == 'mandatory') {
+		  // ----- Look if present
+		  if (!isset($v_result_list[$key])) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		}
+	  }
+	}
     
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+	// ----- Look for default values
+	if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
       
-    }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1831,37 +1831,37 @@ 
   // --------------------------------------------------------------------------------
   function privOptionDefaultThreshold(&$p_options)
   {
-    $v_result=1;
+	$v_result=1;
     
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
+	if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+		|| isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+	  return $v_result;
+	}
     
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
+	// ----- Get 'memory_limit' configuration value
+	$v_memory_limit = ini_get('memory_limit');
+	$v_memory_limit = trim($v_memory_limit);
+	$last = strtolower(substr($v_memory_limit, -1));
  
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+	if($last == 'g')
+		//$v_memory_limit = $v_memory_limit*1024*1024*1024;
+		$v_memory_limit = $v_memory_limit*1073741824;
+	if($last == 'm')
+		//$v_memory_limit = $v_memory_limit*1024*1024;
+		$v_memory_limit = $v_memory_limit*1048576;
+	if($last == 'k')
+		$v_memory_limit = $v_memory_limit*1024;
             
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+	$p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
     
 
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
+	// ----- Sanity check : No threshold if value lower than 1M
+	if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+	  unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+	}
           
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1875,116 +1875,116 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
   {
-    $v_result=1;
+	$v_result=1;
     
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
+	// ----- For each file in the list check the attributes
+	foreach ($p_file_list as $v_key => $v_value) {
     
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+	  // ----- Check if the option is supported
+	  if (!isset($v_requested_options[$v_key])) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+	  // ----- Look for attribute
+	  switch ($v_key) {
+		case PCLZIP_ATT_FILE_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
           
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		  if ($p_filedescr['filename'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-        break;
+		break;
 
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
 
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
+		  if ($p_filedescr['new_short_name'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
+		break;
 
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_NEW_FULL_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
 
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
+		  if ($p_filedescr['new_full_name'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
+		break;
 
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		// ----- Look for options that takes a string
+		case PCLZIP_ATT_FILE_COMMENT :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['comment'] = $v_value;
-        break;
+		  $p_filedescr['comment'] = $v_value;
+		break;
 
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_MTIME :
+		  if (!is_integer($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['mtime'] = $v_value;
-        break;
+		  $p_filedescr['mtime'] = $v_value;
+		break;
 
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
+		case PCLZIP_ATT_FILE_CONTENT :
+		  $p_filedescr['content'] = $v_value;
+		break;
 
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
+		default :
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+								   "Unknown parameter '".$v_key."'");
 
-          // ----- Return
-          return PclZip::errorCode();
-      }
+		  // ----- Return
+		  return PclZip::errorCode();
+	  }
 
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
+	  // ----- Look for mandatory options
+	  if ($v_requested_options !== false) {
+		for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+		  // ----- Look for mandatory option
+		  if ($v_requested_options[$key] == 'mandatory') {
+			// ----- Look if present
+			if (!isset($p_file_list[$key])) {
+			  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+			  return PclZip::errorCode();
+			}
+		  }
+		}
+	  }
     
-    // end foreach
-    }
+	// end foreach
+	}
     
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2004,120 +2004,120 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
     
-    // ----- Create a result list
-    $v_result_list = array();
+	// ----- Create a result list
+	$v_result_list = array();
     
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+	// ----- Look each entry
+	for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
       
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
+	  // ----- Get filedescr
+	  $v_descr = $p_filedescr_list[$i];
       
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+	  // ----- Reduce the filename
+	  $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+	  $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
       
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
+	  // ----- Look for real file or folder
+	  if (file_exists($v_descr['filename'])) {
+		if (@is_file($v_descr['filename'])) {
+		  $v_descr['type'] = 'file';
+		}
+		else if (@is_dir($v_descr['filename'])) {
+		  $v_descr['type'] = 'folder';
+		}
+		else if (@is_link($v_descr['filename'])) {
+		  // skip
+		  continue;
+		}
+		else {
+		  // skip
+		  continue;
+		}
+	  }
       
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
+	  // ----- Look for string added as file
+	  else if (isset($v_descr['content'])) {
+		$v_descr['type'] = 'virtual_file';
+	  }
       
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
+	  // ----- Missing file
+	  else {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
       
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
+	  // ----- Calculate the stored filename
+	  $this->privCalculateStoredFilename($v_descr, $p_options);
       
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
+	  // ----- Add the descriptor in result list
+	  $v_result_list[sizeof($v_result_list)] = $v_descr;
       
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
+	  // ----- Look for folder
+	  if ($v_descr['type'] == 'folder') {
+		// ----- List of items in folder
+		$v_dirlist_descr = array();
+		$v_dirlist_nb = 0;
+		if ($v_folder_handler = @opendir($v_descr['filename'])) {
+		  while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+			// ----- Skip '.' and '..'
+			if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+				continue;
+			}
             
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
+			// ----- Compose the full filename
+			$v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
             
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
+			// ----- Look for different stored filename
+			// Because the name of the folder was changed, the name of the
+			// files/sub-folders also change
+			if (($v_descr['stored_filename'] != $v_descr['filename'])
+				 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+			  if ($v_descr['stored_filename'] != '') {
+				$v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
+			  }
+			  else {
+				$v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+			  }
+			}
       
-            $v_dirlist_nb++;
-          }
+			$v_dirlist_nb++;
+		  }
           
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
+		  @closedir($v_folder_handler);
+		}
+		else {
+		  // TBC : unable to open folder in read mode
+		}
         
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
+		// ----- Expand each element of the list
+		if ($v_dirlist_nb != 0) {
+		  // ----- Expand
+		  if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+			return $v_result;
+		  }
           
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
+		  // ----- Concat the resulting list
+		  $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+		}
+		else {
+		}
           
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
+		// ----- Free local array
+		unset($v_dirlist_descr);
+	  }
+	}
     
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
+	// ----- Get the result list
+	$p_filedescr_list = $v_result_list;
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2129,30 +2129,30 @@ 
   // --------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
+	$v_result=1;
+	$v_list_detail = array();
     
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
+
+	// ----- Open the file in write mode
+	if (($v_result = $this->privOpenFd('wb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+	// ----- Add the list of files
+	$v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2164,175 +2164,175 @@ 
   // --------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
+	$v_result=1;
+	$v_list_detail = array();
 
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
+	// ----- Look if the archive exists or is empty
+	if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
+	{
 
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+	  // ----- Do a create
+	  $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
 
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	  // ----- Return
+	  return $v_result;
+	}
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Magic quotes trick
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+	// ----- Creates a temporay file
+	$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+	{
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = $v_central_dir['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Swap the file descriptor
+	// Here is a trick : I swap the temporary fd with the zip fd, in order to use
+	// the following methods on the temporary fil and not the real archive
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
+
+	// ----- Add the files
+	$v_header_list = array();
+	if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+	{
+	  fclose($v_zip_temp_fd);
+	  $this->privCloseFd();
+	  @unlink($v_zip_temp_name);
+	  $this->privSwapBackMagicQuotes();
+
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($this->zip_fd);
+
+	// ----- Copy the block of file headers from the old archive
+	$v_size = $v_central_dir['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
+	// ----- Create the Central Dir files header
+	for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+	{
+	  // ----- Create the file header
+	  if ($v_header_list[$i]['status'] == 'ok') {
+		if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+		  fclose($v_zip_temp_fd);
+		  $this->privCloseFd();
+		  @unlink($v_zip_temp_name);
+		  $this->privSwapBackMagicQuotes();
+
+		  // ----- Return
+		  return $v_result;
+		}
+		$v_count++;
+	  }
 
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
+	  // ----- Transform the header to a 'usable' info
+	  $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+	}
 
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
+	// ----- Zip file comment
+	$v_comment = $v_central_dir['comment'];
+	if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+	}
+	if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+	  $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
+	}
+	if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
+	}
 
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+	// ----- Calculate the size of the central header
+	$v_size = @ftell($this->zip_fd)-$v_offset;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  // ----- Reset the file list
+	  unset($v_header_list);
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap back the file descriptor
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
+	// ----- Delete the zip file
+	// TBC : I should test the result ...
+	@unlink($this->zipname);
 
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+	// ----- Rename the temporary file
+	// TBC : I should test the result ...
+	//@rename($v_zip_temp_name, $this->zipname);
+	PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2343,30 +2343,30 @@ 
   // --------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+	// ----- Look if already open
+	if ($this->zip_fd != 0)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+	// ----- Open the zip file
+	if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2377,14 +2377,14 @@ 
   // --------------------------------------------------------------------------------
   function privCloseFd()
   {
-    $v_result=1;
+	$v_result=1;
 
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
+	if ($this->zip_fd != 0)
+	  @fclose($this->zip_fd);
+	$this->zip_fd = 0;
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2404,56 +2404,56 @@ 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
   function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+
+	// ----- Add the files
+	$v_header_list = array();
+	if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($this->zip_fd);
+
+	// ----- Create the Central Dir files header
+	for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+	{
+	  // ----- Create the file header
+	  if ($v_header_list[$i]['status'] == 'ok') {
+		if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+		  // ----- Return
+		  return $v_result;
+		}
+		$v_count++;
+	  }
 
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
+	  // ----- Transform the header to a 'usable' info
+	  $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+	}
 
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
+	// ----- Zip file comment
+	$v_comment = '';
+	if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+	}
 
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+	// ----- Calculate the size of the central header
+	$v_size = @ftell($this->zip_fd)-$v_offset;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  // ----- Reset the file list
+	  unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2468,57 +2468,57 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_header = array();
+	$v_result=1;
+	$v_header = array();
 
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
+	// ----- Recuperate the current number of elt in list
+	$v_nb = sizeof($p_result_list);
 
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+	// ----- Loop on the files
+	for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+	  // ----- Format the filename
+	  $p_filedescr_list[$j]['filename']
+	  = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
       
 
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
+	  // ----- Skip empty file names
+	  // TBC : Can this be possible ? not checked in DescrParseAtt ?
+	  if ($p_filedescr_list[$j]['filename'] == "") {
+		continue;
+	  }
 
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
+	  // ----- Check the filename
+	  if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
+		  && (!file_exists($p_filedescr_list[$j]['filename']))) {
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
+	  // ----- Look if it is a file or a dir with no all path remove option
+	  // or a dir with all its path removed
 //      if (   (is_file($p_filedescr_list[$j]['filename']))
 //          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
+	  if (   ($p_filedescr_list[$j]['type'] == 'file')
+		  || ($p_filedescr_list[$j]['type'] == 'virtual_file')
+		  || (   ($p_filedescr_list[$j]['type'] == 'folder')
+			  && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+				  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
+		  ) {
+
+		// ----- Add the file
+		$v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
+									   $p_options);
+		if ($v_result != 1) {
+		  return $v_result;
+		}
+
+		// ----- Store the file infos
+		$p_result_list[$v_nb++] = $v_header;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2530,22 +2530,22 @@ 
   // --------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
     
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
+	// ----- Working variable
+	$p_filename = $p_filedescr['filename'];
 
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+	// TBC : Already done in the fileAtt check ... ?
+	if ($p_filename == "") {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
   
-    // ----- Look for a stored different filename 
-    /* TBC : Removed
+	// ----- Look for a stored different filename 
+	/* TBC : Removed
     if (isset($p_filedescr['stored_filename'])) {
       $v_stored_filename = $p_filedescr['stored_filename'];
     }
@@ -2554,244 +2554,244 @@ 
     }
     */
 
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
+	// ----- Set the file properties
+	clearstatcache();
+	$p_header['version'] = 20;
+	$p_header['version_extracted'] = 10;
+	$p_header['flag'] = 0;
+	$p_header['compression'] = 0;
+	$p_header['crc'] = 0;
+	$p_header['compressed_size'] = 0;
+	$p_header['filename_len'] = strlen($p_filename);
+	$p_header['extra_len'] = 0;
+	$p_header['disk'] = 0;
+	$p_header['internal'] = 0;
+	$p_header['offset'] = 0;
+	$p_header['filename'] = $p_filename;
 // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
+	$p_header['stored_filename'] = $p_filedescr['stored_filename'];
+	$p_header['extra'] = '';
+	$p_header['status'] = 'ok';
+	$p_header['index'] = -1;
+
+	// ----- Look for regular file
+	if ($p_filedescr['type']=='file') {
+	  $p_header['external'] = 0x00000000;
+	  $p_header['size'] = filesize($p_filename);
+	}
     
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
+	// ----- Look for regular folder
+	else if ($p_filedescr['type']=='folder') {
+	  $p_header['external'] = 0x00000010;
+	  $p_header['mtime'] = filemtime($p_filename);
+	  $p_header['size'] = filesize($p_filename);
+	}
     
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
+	// ----- Look for virtual file
+	else if ($p_filedescr['type'] == 'virtual_file') {
+	  $p_header['external'] = 0x00000000;
+	  $p_header['size'] = strlen($p_filedescr['content']);
+	}
     
 
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
+	// ----- Look for filetime
+	if (isset($p_filedescr['mtime'])) {
+	  $p_header['mtime'] = $p_filedescr['mtime'];
+	}
+	else if ($p_filedescr['type'] == 'virtual_file') {
+	  $p_header['mtime'] = time();
+	}
+	else {
+	  $p_header['mtime'] = filemtime($p_filename);
+	}
 
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
+	// ------ Look for file comment
+	if (isset($p_filedescr['comment'])) {
+	  $p_header['comment_len'] = strlen($p_filedescr['comment']);
+	  $p_header['comment'] = $p_filedescr['comment'];
+	}
+	else {
+	  $p_header['comment_len'] = 0;
+	  $p_header['comment'] = '';
+	}
 
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+	// ----- Look for pre-add callback
+	if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_header, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
-        $v_result = 1;
-      }
+	  $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_header['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+		$p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+	  }
+	}
 
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
+	// ----- Look for empty stored filename
+	if ($p_header['stored_filename'] == "") {
+	  $p_header['status'] = "filtered";
+	}
     
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
+	// ----- Check the path length
+	if (strlen($p_header['stored_filename']) > 0xFF) {
+	  $p_header['status'] = 'filename_too_long';
+	}
 
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
-
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
-        }
+	// ----- Look if no error, or file not skipped
+	if ($p_header['status'] == 'ok') {
+
+	  // ----- Look for a file
+	  if ($p_filedescr['type'] == 'file') {
+		// ----- Look for using temporary file to zip
+		if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+			&& (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
+				|| (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+					&& ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
+		  $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+		  if ($v_result < PCLZIP_ERR_NO_ERROR) {
+			return $v_result;
+		  }
+		}
         
-        // ----- Use "in memory" zip algo
-        else {
+		// ----- Use "in memory" zip algo
+		else {
 
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
-        }
+		// ----- Open the source file
+		if (($v_file = @fopen($p_filename, "rb")) == 0) {
+		  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+		  return PclZip::errorCode();
+		}
 
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
+		// ----- Read the file content
+		$v_content = @fread($v_file, $p_header['size']);
 
-        // ----- Close the file
-        @fclose($v_file);
+		// ----- Close the file
+		@fclose($v_file);
 
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
+		// ----- Calculate the CRC
+		$p_header['crc'] = @crc32($v_content);
         
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
+		// ----- Look for no compression
+		if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = $p_header['size'];
+		  $p_header['compression'] = 0;
+		}
         
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
+		// ----- Look for normal compression
+		else {
+		  // ----- Compress the content
+		  $v_content = @gzdeflate($v_content);
+
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = strlen($v_content);
+		  $p_header['compression'] = 8;
+		}
         
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+		  @fclose($v_file);
+		  return $v_result;
+		}
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+		// ----- Write the compressed (or not) content
+		@fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
 
-        }
+		}
 
-      }
+	  }
 
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
+	  // ----- Look for a virtual file (a file from string)
+	  else if ($p_filedescr['type'] == 'virtual_file') {
           
-        $v_content = $p_filedescr['content'];
+		$v_content = $p_filedescr['content'];
 
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
+		// ----- Calculate the CRC
+		$p_header['crc'] = @crc32($v_content);
         
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
+		// ----- Look for no compression
+		if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = $p_header['size'];
+		  $p_header['compression'] = 0;
+		}
         
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
+		// ----- Look for normal compression
+		else {
+		  // ----- Compress the content
+		  $v_content = @gzdeflate($v_content);
+
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = strlen($v_content);
+		  $p_header['compression'] = 8;
+		}
         
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+		  @fclose($v_file);
+		  return $v_result;
+		}
+
+		// ----- Write the compressed (or not) content
+		@fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+	  }
 
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
+	  // ----- Look for a directory
+	  else if ($p_filedescr['type'] == 'folder') {
+		// ----- Look for directory last '/'
+		if (@substr($p_header['stored_filename'], -1) != '/') {
+		  $p_header['stored_filename'] .= '/';
+		}
+
+		// ----- Set the file properties
+		$p_header['size'] = 0;
+		//$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+		$p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
+		{
+		  return $v_result;
+		}
+	  }
+	}
 
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+	// ----- Look for post-add callback
+	if (isset($p_options[PCLZIP_CB_POST_ADD])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_header, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
+	  $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Ignored
+		$v_result = 1;
+	  }
 
-      // ----- Update the informations
-      // Nothing can be modified
-    }
+	  // ----- Update the informations
+	  // Nothing can be modified
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2803,105 +2803,105 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=PCLZIP_ERR_NO_ERROR;
+	$v_result=PCLZIP_ERR_NO_ERROR;
     
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
+	// ----- Working variable
+	$p_filename = $p_filedescr['filename'];
 
 
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
+	// ----- Open the source file
+	if (($v_file = @fopen($p_filename, "rb")) == 0) {
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+	  return PclZip::errorCode();
+	}
 
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
+	// ----- Creates a compressed temporary file
+	$v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+	if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+	  fclose($v_file);
+	  PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = filesize($p_filename);
+	while ($v_size != 0) {
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_file, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file);
+	@gzclose($v_file_compressed);
 
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
+	// ----- Check the minimum file size
+	if (filesize($v_gzip_temp_name) < 18) {
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Extract the compressed attributes
+	if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+	// ----- Read the gzip file header
+	$v_binary_data = @fread($v_file_compressed, 10);
+	$v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
 
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
+	// ----- Check some parameters
+	$v_data_header['os'] = bin2hex($v_data_header['os']);
 
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+	// ----- Read the gzip file footer
+	@fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+	$v_binary_data = @fread($v_file_compressed, 8);
+	$v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+	// ----- Set the attributes
+	$p_header['compression'] = ord($v_data_header['cm']);
+	//$p_header['mtime'] = $v_data_header['mtime'];
+	$p_header['crc'] = $v_data_footer['crc'];
+	$p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
 
-    // ----- Close the file
-    @fclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file_compressed);
 
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
+	// ----- Call the header generation
+	if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+	  return $v_result;
+	}
 
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Add the compressed data
+	if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
+	{
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	fseek($v_file_compressed, 10);
+	$v_size = $p_header['compressed_size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_file_compressed, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close the file
-    @fclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file_compressed);
 
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
+	// ----- Unlink the temporary file
+	@unlink($v_gzip_temp_name);
     
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2915,107 +2915,107 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
     
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
+	// ----- Working variables
+	$p_filename = $p_filedescr['filename'];
+	if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+	  $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+	}
+	else {
+	  $p_add_dir = '';
+	}
+	if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+	  $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+	}
+	else {
+	  $p_remove_dir = '';
+	}
+	if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+	  $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+	}
+	else {
+	  $p_remove_all_dir = 0;
+	}
 
 
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
+	// ----- Look for full name change
+	if (isset($p_filedescr['new_full_name'])) {
+	  // ----- Remove drive letter if any
+	  $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+	}
     
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
+	// ----- Look for path and/or short name change
+	else {
+
+	  // ----- Look for short name change
+	  // Its when we cahnge just the filename but not the path
+	  if (isset($p_filedescr['new_short_name'])) {
+		$v_path_info = pathinfo($p_filename);
+		$v_dir = '';
+		if ($v_path_info['dirname'] != '') {
+		  $v_dir = $v_path_info['dirname'].'/';
+		}
+		$v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
+	  }
+	  else {
+		// ----- Calculate the stored filename
+		$v_stored_filename = $p_filename;
+	  }
 
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
+	  // ----- Look for all path to remove
+	  if ($p_remove_all_dir) {
+		$v_stored_filename = basename($p_filename);
+	  }
+	  // ----- Look for partial path remove
+	  else if ($p_remove_dir != "") {
+		if (substr($p_remove_dir, -1) != '/')
+		  $p_remove_dir .= "/";
 
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
+		if (   (substr($p_filename, 0, 2) == "./")
+			|| (substr($p_remove_dir, 0, 2) == "./")) {
             
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
+		  if (   (substr($p_filename, 0, 2) == "./")
+			  && (substr($p_remove_dir, 0, 2) != "./")) {
+			$p_remove_dir = "./".$p_remove_dir;
+		  }
+		  if (   (substr($p_filename, 0, 2) != "./")
+			  && (substr($p_remove_dir, 0, 2) == "./")) {
+			$p_remove_dir = substr($p_remove_dir, 2);
+		  }
+		}
 
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
+		$v_compare = PclZipUtilPathInclusion($p_remove_dir,
+											 $v_stored_filename);
+		if ($v_compare > 0) {
+		  if ($v_compare == 2) {
+			$v_stored_filename = "";
+		  }
+		  else {
+			$v_stored_filename = substr($v_stored_filename,
+										strlen($p_remove_dir));
+		  }
+		}
+	  }
       
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+	  // ----- Remove drive letter if any
+	  $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
       
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
+	  // ----- Look for path to add
+	  if ($p_add_dir != "") {
+		if (substr($p_add_dir, -1) == "/")
+		  $v_stored_filename = $p_add_dir.$v_stored_filename;
+		else
+		  $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+	  }
+	}
 
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
+	// ----- Filename (reduce the path of stored name)
+	$v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
+	$p_filedescr['stored_filename'] = $v_stored_filename;
     
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3027,40 +3027,40 @@ 
   // --------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
+	// ----- Store the offset position of the file
+	$p_header['offset'] = ftell($this->zip_fd);
 
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+	// ----- Transform UNIX mtime to DOS format mdate/mtime
+	$v_date = getdate($p_header['mtime']);
+	$v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+	$v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
+						  $p_header['version_extracted'], $p_header['flag'],
+						  $p_header['compression'], $v_mtime, $v_mdate,
+						  $p_header['crc'], $p_header['compressed_size'],
 						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
+						  strlen($p_header['stored_filename']),
 						  $p_header['extra_len']);
 
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
+	// ----- Write the first 148 bytes of the header in the archive
+	fputs($this->zip_fd, $v_binary_data, 30);
 
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
+	// ----- Write the variable fields
+	if (strlen($p_header['stored_filename']) != 0)
+	{
+	  fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+	}
+	if ($p_header['extra_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3072,48 +3072,48 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
+	// TBC
+	//for(reset($p_header); $key = key($p_header); next($p_header)) {
+	//}
 
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+	// ----- Transform UNIX mtime to DOS format mdate/mtime
+	$v_date = getdate($p_header['mtime']);
+	$v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+	$v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
 
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
+						  $p_header['version'], $p_header['version_extracted'],
+						  $p_header['flag'], $p_header['compression'],
 						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
+						  $p_header['compressed_size'], $p_header['size'],
+						  strlen($p_header['stored_filename']),
 						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
+						  $p_header['disk'], $p_header['internal'],
 						  $p_header['external'], $p_header['offset']);
 
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
+	// ----- Write the 42 bytes of the header in the zip file
+	fputs($this->zip_fd, $v_binary_data, 46);
 
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
+	// ----- Write the variable fields
+	if (strlen($p_header['stored_filename']) != 0)
+	{
+	  fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+	}
+	if ($p_header['extra_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+	}
+	if ($p_header['comment_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3125,24 +3125,24 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
+						  $p_nb_entries, $p_size,
 						  $p_offset, strlen($p_comment));
 
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
+	// ----- Write the 22 bytes of the header in the zip file
+	fputs($this->zip_fd, $v_binary_data, 22);
 
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
+	// ----- Write the variable fields
+	if (strlen($p_comment) != 0)
+	{
+	  fputs($this->zip_fd, $p_comment, strlen($p_comment));
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3154,69 +3154,69 @@ 
   // --------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the zip file
+	if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+	{
+	  // ----- Magic quotes trick
+	  $this->privSwapBackMagicQuotes();
       
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
+	// ----- Go to beginning of Central Dir
+	@rewind($this->zip_fd);
+	if (@fseek($this->zip_fd, $v_central_dir['offset']))
+	{
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
+	// ----- Read each entry
+	for ($i=0; $i<$v_central_dir['entries']; $i++)
+	{
+	  // ----- Read the file header
+	  if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+	  {
+		$this->privSwapBackMagicQuotes();
+		return $v_result;
+	  }
+	  $v_header['index'] = $i;
 
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
+	  // ----- Get the only interesting attributes
+	  $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+	  unset($v_header);
+	}
 
-    // ----- Close the zip file
-    $this->privCloseFd();
+	// ----- Close the zip file
+	$this->privCloseFd();
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3241,24 +3241,24 @@ 
   // --------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
+	$v_result=1;
+
+	// ----- Get the interesting attributes
+	$v_temp_path = PclZipUtilPathReduction($p_header['filename']);
+	$p_info['filename'] = $v_temp_path;
+	$v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
+	$p_info['stored_filename'] = $v_temp_path;
+	$p_info['size'] = $p_header['size'];
+	$p_info['compressed_size'] = $p_header['compressed_size'];
+	$p_info['mtime'] = $p_header['mtime'];
+	$p_info['comment'] = $p_header['comment'];
+	$p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+	$p_info['index'] = $p_header['index'];
+	$p_info['status'] = $p_header['status'];
+	$p_info['crc'] = $p_header['crc'];
+
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3280,122 +3280,122 @@ 
   // --------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
+	// ----- Check the path
+	if (   ($p_path == "")
+		|| (   (substr($p_path, 0, 1) != "/")
+			&& (substr($p_path, 0, 3) != "../")
 			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
+	  $p_path = "./".$p_path;
+
+	// ----- Reduce the path last (and duplicated) '/'
+	if (($p_path != "./") && ($p_path != "/"))
+	{
+	  // ----- Look for the path end '/'
+	  while (substr($p_path, -1) == "/")
+	  {
+		$p_path = substr($p_path, 0, strlen($p_path)-1);
+	  }
+	}
 
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
+	// ----- Look for path to remove format (should end by /)
+	if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
+	{
+	  $p_remove_path .= '/';
+	}
+	$p_remove_path_size = strlen($p_remove_path);
 
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result = $this->privOpenFd('rb')) != 1)
+	{
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  // ----- Close the zip file
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
 
-      return $v_result;
-    }
+	  return $v_result;
+	}
 
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
+	// ----- Start at beginning of Central Dir
+	$v_pos_entry = $v_central_dir['offset'];
 
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
+	// ----- Read each entry
+	$j_start = 0;
+	for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+	{
 
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
+	  // ----- Read next Central dir entry
+	  @rewind($this->zip_fd);
+	  if (@fseek($this->zip_fd, $v_pos_entry))
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
+		$this->privSwapBackMagicQuotes();
 
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
+	  // ----- Read the file header
+	  $v_header = array();
+	  if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
+		$this->privSwapBackMagicQuotes();
 
-        return $v_result;
-      }
+		return $v_result;
+	  }
 
-      // ----- Store the index
-      $v_header['index'] = $i;
+	  // ----- Store the index
+	  $v_header['index'] = $i;
 
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
+	  // ----- Store the file position
+	  $v_pos_entry = ftell($this->zip_fd);
 
-      // ----- Look for the specific extract rules
-      $v_extract = false;
+	  // ----- Look for the specific extract rules
+	  $v_extract = false;
 
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+	  // ----- Look for extract by name rule
+	  if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+		  && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+		  // ----- Look if the filename is in the list
+		  for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
 
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+			  // ----- Look for a directory
+			  if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
+				  // ----- Look if the directory is in the filename path
+				  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+					  && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+					  $v_extract = true;
+				  }
+			  }
+			  // ----- Look for a filename
+			  elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+				  $v_extract = true;
+			  }
+		  }
+	  }
 
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /* 
+	  // ----- Look for extract by ereg rule
+	  // ereg() is deprecated with PHP 5.3
+	  /* 
       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
 
@@ -3405,207 +3405,207 @@ 
       }
       */
 
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+	  // ----- Look for extract by preg rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+			   && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
+		  if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+			  $v_extract = true;
+		  }
+	  }
 
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+	  // ----- Look for extract by index rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+			   && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
           
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
+		  // ----- Look if the index is in the list
+		  for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+
+			  if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+				  $v_extract = true;
+			  }
+			  if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+				  $j_start = $j+1;
+			  }
+
+			  if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+				  break;
+			  }
+		  }
+	  }
 
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
+	  // ----- Look for no rule, which means extract all the archive
+	  else {
+		  $v_extract = true;
+	  }
 
 	  // ----- Check compression method
 	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
+		  && (   ($v_header['compression'] != 8)
+			  && ($v_header['compression'] != 0))) {
+		  $v_header['status'] = 'unsupported_compression';
 
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		  // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		  if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			  && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-              $this->privSwapBackMagicQuotes();
+			  $this->privSwapBackMagicQuotes();
               
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
+			  PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
+								   "Filename '".$v_header['stored_filename']."' is "
+				  			  	   ."compressed by an unsupported compression "
+				  			  	   ."method (".$v_header['compression'].") ");
 
-              return PclZip::errorCode();
+			  return PclZip::errorCode();
 		  }
 	  }
 	  
 	  // ----- Check encrypted files
 	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
+		  $v_header['status'] = 'unsupported_encryption';
 
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		  // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		  if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			  && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-              $this->privSwapBackMagicQuotes();
+			  $this->privSwapBackMagicQuotes();
 
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
+			  PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
+								   "Unsupported encryption for "
+				  			  	   ." filename '".$v_header['stored_filename']
 								   ."'");
 
-              return PclZip::errorCode();
+			  return PclZip::errorCode();
 		  }
-    }
+	}
 
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
+	  // ----- Look for real extraction
+	  if (($v_extract) && ($v_header['status'] != 'ok')) {
+		  $v_result = $this->privConvertHeader2FileInfo($v_header,
+												$p_file_list[$v_nb_extracted++]);
+		  if ($v_result != 1) {
+			  $this->privCloseFd();
+			  $this->privSwapBackMagicQuotes();
+			  return $v_result;
+		  }
 
-          $v_extract = false;
-      }
+		  $v_extract = false;
+	  }
       
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
+	  // ----- Look for real extraction
+	  if ($v_extract)
+	  {
 
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
+		// ----- Go to the file position
+		@rewind($this->zip_fd);
+		if (@fseek($this->zip_fd, $v_header['offset']))
+		{
+		  // ----- Close the zip file
+		  $this->privCloseFd();
 
-          $this->privSwapBackMagicQuotes();
+		  $this->privSwapBackMagicQuotes();
 
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-          // ----- Return
-          return PclZip::errorCode();
-        }
+		  // ----- Return
+		  return PclZip::errorCode();
+		}
 
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+		// ----- Look for extraction as string
+		if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
 
-          $v_string = '';
+		  $v_string = '';
 
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  // ----- Extracting the file
+		  $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
+		  {
+			// ----- Close the zip file
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
 
-            return $v_result;
-          }
+			return $v_result;
+		  }
 
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
+		  // ----- Set the file content
+		  $p_file_list[$v_nb_extracted]['content'] = $v_string;
 
-          // ----- Next extracted file
-          $v_nb_extracted++;
+		  // ----- Next extracted file
+		  $v_nb_extracted++;
           
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+		// ----- Look for extraction in standard output
+		elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+				&& ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+		  // ----- Extracting the file in standard output
+		  $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result;
+		  }
 
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+		// ----- Look for normal extraction
+		else {
+		  // ----- Extracting the file
+		  $v_result1 = $this->privExtractFile($v_header,
+											  $p_path, $p_remove_path,
 											  $p_remove_all_path,
 											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
+		  {
+			// ----- Close the zip file
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
 
-            return $v_result;
-          }
+			return $v_result;
+		  }
 
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+	  }
+	}
 
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
+	// ----- Close the zip file
+	$this->privCloseFd();
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3620,346 +3620,346 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Read the file header
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+	// ----- Look for all path to remove
+	if ($p_remove_all_path == true) {
+		// ----- Look for folder entry that not need to be extracted
+		if (($p_entry['external']&0x00000010)==0x00000010) {
 
-            $p_entry['status'] = "filtered";
+			$p_entry['status'] = "filtered";
 
-            return $v_result;
-        }
+			return $v_result;
+		}
 
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
+		// ----- Get the basename of the path
+		$p_entry['filename'] = basename($p_entry['filename']);
+	}
 
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
+	// ----- Look for path to remove
+	else if ($p_remove_path != "")
+	{
+	  if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
+		// ----- Change the file status
+		$p_entry['status'] = "filtered";
 
-        // ----- Return
-        return $v_result;
-      }
+		// ----- Return
+		return $v_result;
+	  }
 
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
+	  $p_remove_path_size = strlen($p_remove_path);
+	  if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
+	  {
 
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+		// ----- Remove the path
+		$p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
 
-      }
-    }
+	  }
+	}
 
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
+	// ----- Add the path
+	if ($p_path != '') {
+	  $p_entry['filename'] = $p_path."/".$p_entry['filename'];
+	}
     
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']); 
-      if ($v_inclusion == 0) {
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
+	// ----- Check a base_dir_restriction
+	if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+	  $v_inclusion
+	  = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
+								$p_entry['filename']); 
+	  if ($v_inclusion == 0) {
+
+		PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
+								 "Filename '".$p_entry['filename']."' is "
 								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
 
-        return PclZip::errorCode();
-      }
-    }
+		return PclZip::errorCode();
+	  }
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
       
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
-    {
+	// ----- Look for specific actions while the file exist
+	if (file_exists($p_entry['filename']))
+	{
 
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
+	  // ----- Look if file is a directory
+	  if (is_dir($p_entry['filename']))
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
+		// ----- Change the file status
+		$p_entry['status'] = "already_a_directory";
         
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
+		// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		// For historical reason first PclZip implementation does not stop
+		// when this kind of error occurs.
+		if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+			PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
+								 "Filename '".$p_entry['filename']."' is "
 								 ."already used by an existing directory");
 
-            return PclZip::errorCode();
-		    }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
+			return PclZip::errorCode();
+			}
+	  }
+	  // ----- Look if file is write protected
+	  else if (!is_writeable($p_entry['filename']))
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
+		// ----- Change the file status
+		$p_entry['status'] = "write_protected";
 
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		// For historical reason first PclZip implementation does not stop
+		// when this kind of error occurs.
+		if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
+			PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+								 "Filename '".$p_entry['filename']."' exists "
 								 ."and is write protected");
 
-            return PclZip::errorCode();
-		    }
-      }
+			return PclZip::errorCode();
+			}
+	  }
 
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+	  // ----- Look if the extracted file is older
+	  else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
+	  {
+		// ----- Change the file status
+		if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+			&& ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
 	  	  }
-		    else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-		      }
-		    }
-      }
-      else {
-      }
-    }
+			else {
+			$p_entry['status'] = "newer_exist";
+
+			// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+			// For historical reason first PclZip implementation does not stop
+			// when this kind of error occurs.
+			if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+				&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+				PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+						 "Newer version of '".$p_entry['filename']."' exists "
+						."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+				return PclZip::errorCode();
+			  }
+			}
+	  }
+	  else {
+	  }
+	}
 
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-  
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
+	// ----- Check the directory availability and create it if necessary
+	else {
+	  if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
+		$v_dir_to_check = $p_entry['filename'];
+	  else if (!strstr($p_entry['filename'], "/"))
+		$v_dir_to_check = "";
+	  else
+		$v_dir_to_check = dirname($p_entry['filename']);
+
+		if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
   
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
+		  // ----- Change the file status
+		  $p_entry['status'] = "path_creation_fail";
+  
+		  // ----- Return
+		  //return $v_result;
+		  $v_result = 1;
+		}
+	  }
+	}
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010))
+	  {
+		// ----- Look for not compressed file
+		if ($p_entry['compression'] == 0) {
 
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
+			  // ----- Opening destination file
+		  if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
+		  {
 
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
+			// ----- Change the file status
+			$p_entry['status'] = "write_error";
 
-            // ----- Return
-            return $v_result;
-          }
+			// ----- Return
+			return $v_result;
+		  }
 
 
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
+		  // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+		  $v_size = $p_entry['compressed_size'];
+		  while ($v_size != 0)
+		  {
+			$v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+			$v_buffer = @fread($this->zip_fd, $v_read_size);
+			/* Try to speed up the code
             $v_binary_data = pack('a'.$v_read_size, $v_buffer);
             @fwrite($v_dest_file, $v_binary_data, $v_read_size);
             */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);            
-            $v_size -= $v_read_size;
-          }
+			@fwrite($v_dest_file, $v_buffer, $v_read_size);            
+			$v_size -= $v_read_size;
+		  }
 
-          // ----- Closing the destination file
-          fclose($v_dest_file);
+		  // ----- Closing the destination file
+		  fclose($v_dest_file);
 
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
+		  // ----- Change the file mtime
+		  touch($p_entry['filename'], $p_entry['mtime']);
           
 
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
+		}
+		else {
+		  // ----- TBC
+		  // Need to be finished
+		  if (($p_entry['flag'] & 1) == 1) {
+			PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
+			return PclZip::errorCode();
+		  }
 
 
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
+		  // ----- Look for using temporary file to unzip
+		  if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+			  && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
+				  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+					  && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
+			$v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+			if ($v_result < PCLZIP_ERR_NO_ERROR) {
+			  return $v_result;
+			}
+		  }
           
-          // ----- Look for extract in memory
-          else {
+		  // ----- Look for extract in memory
+		  else {
 
           
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+			// ----- Read the compressed file in a buffer (one shot)
+			$v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
             
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
+			// ----- Decompress the file
+			$v_file_content = @gzinflate($v_buffer);
+			unset($v_buffer);
+			if ($v_file_content === FALSE) {
   
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
+			  // ----- Change the file status
+			  // TBC
+			  $p_entry['status'] = "error";
               
-              return $v_result;
-            }
+			  return $v_result;
+			}
             
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+			// ----- Opening destination file
+			if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
   
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
+			  // ----- Change the file status
+			  $p_entry['status'] = "write_error";
   
-              return $v_result;
-            }
+			  return $v_result;
+			}
   
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
+			// ----- Write the uncompressed data
+			@fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+			unset($v_file_content);
   
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
+			// ----- Closing the destination file
+			@fclose($v_dest_file);
             
-          }
+		  }
 
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
+		  // ----- Change the file mtime
+		  @touch($p_entry['filename'], $p_entry['mtime']);
+		}
 
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+		// ----- Look for chmod option
+		if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
 
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
+		  // ----- Change the mode of the file
+		  @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+		}
 
-      }
-    }
+	  }
+	}
 
   	// ----- Change abort status
   	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
+		$p_entry['status'] = "skipped";
   	}
 	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3971,71 +3971,71 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
         
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
+	// ----- Creates a temporary file
+	$v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+	if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+	  fclose($v_file);
+	  PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+	  return PclZip::errorCode();
+	}
 
 
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
+	// ----- Write gz file format header
+	$v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+	@fwrite($v_dest_file, $v_binary_data, 10);
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = $p_entry['compressed_size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($this->zip_fd, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($v_dest_file, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
+	// ----- Write gz file format footer
+	$v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+	@fwrite($v_dest_file, $v_binary_data, 8);
 
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
+	// ----- Close the temporary file
+	@fclose($v_dest_file);
 
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
+	// ----- Opening destination file
+	if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+	  $p_entry['status'] = "write_error";
+	  return $v_result;
+	}
 
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Open the temporary gz file
+	if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+	  @fclose($v_dest_file);
+	  $p_entry['status'] = "read_error";
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = $p_entry['size'];
+	while ($v_size != 0) {
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @gzread($v_src_file, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($v_dest_file, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
+	@fclose($v_dest_file);
+	@gzclose($v_src_file);
 
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
+	// ----- Delete the temporary file
+	@unlink($v_gzip_temp_name);
     
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4047,107 +4047,107 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
+	// ----- Read the file header
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
-    // ----- Trace
+	// ----- Trace
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+		// ----- Look for not compressed file
+		if ($p_entry['compressed_size'] == $p_entry['size']) {
 
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Read the file in a buffer (one shot)
+		  $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
-        }
-        else {
+		  // ----- Send the file to the output
+		  echo $v_buffer;
+		  unset($v_buffer);
+		}
+		else {
 
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Read the compressed file in a buffer (one shot)
+		  $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
           
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
-
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
-        }
-      }
-    }
+		  // ----- Decompress the file
+		  $v_file_content = gzinflate($v_buffer);
+		  unset($v_buffer);
+
+		  // ----- Send the file to the output
+		  echo $v_file_content;
+		  unset($v_file_content);
+		}
+	  }
+	}
 
 	// ----- Change abort status
 	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
+	  $p_entry['status'] = "skipped";
 	}
 
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    return $v_result;
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4159,118 +4159,118 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+
+	// ----- Read the file header
+	$v_header = array();
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
       
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+		// ----- Look for not compressed file
   //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
+		if ($p_entry['compression'] == 0) {
   
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
+		  // ----- Reading the file
+		  $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+		}
+		else {
   
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Reading the file
+		  $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
           
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
-        }
+		  // ----- Decompress the file
+		  if (($p_string = @gzinflate($v_data)) === FALSE) {
+			  // TBC
+		  }
+		}
   
-        // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
+		// ----- Trace
+	  }
+	  else {
+		  // TBC : error : can not extract a folder in a string
+	  }
       
-    }
+	}
 
   	// ----- Change abort status
   	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
+		$p_entry['status'] = "skipped";
   	}
 	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
       
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
+	  // ----- Swap the content to header
+	  $v_local_header['content'] = $p_string;
+	  $p_string = '';
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
+	  // ----- Swap back the content to header
+	  $p_string = $v_local_header['content'];
+	  unset($v_local_header['content']);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4282,98 +4282,98 @@ 
   // --------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
+	// ----- Read the 4 bytes signature
+	$v_binary_data = @fread($this->zip_fd, 4);
+	$v_data = unpack('Vid', $v_binary_data);
 
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
+	// ----- Check signature
+	if ($v_data['id'] != 0x04034b50)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
+	// ----- Read the first 42 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 26);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 26)
+	{
+	  $p_header['filename'] = "";
+	  $p_header['status'] = "invalid_header";
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+	// ----- Extract the values
+	$v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
 
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+	// ----- Get filename
+	$p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
 
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
+	// ----- Get extra_fields
+	if ($v_data['extra_len'] != 0) {
+	  $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+	}
+	else {
+	  $p_header['extra'] = '';
+	}
 
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+	// ----- Extract properties
+	$p_header['version_extracted'] = $v_data['version'];
+	$p_header['compression'] = $v_data['compression'];
+	$p_header['size'] = $v_data['size'];
+	$p_header['compressed_size'] = $v_data['compressed_size'];
+	$p_header['crc'] = $v_data['crc'];
+	$p_header['flag'] = $v_data['flag'];
+	$p_header['filename_len'] = $v_data['filename_len'];
+
+	// ----- Recuperate date in UNIX format
+	$p_header['mdate'] = $v_data['mdate'];
+	$p_header['mtime'] = $v_data['mtime'];
+	if ($p_header['mdate'] && $p_header['mtime'])
+	{
+	  // ----- Extract time
+	  $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+	  $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+	  $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+	  // ----- Extract date
+	  $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+	  $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+	  $v_day = $p_header['mdate'] & 0x001F;
+
+	  // ----- Get UNIX date format
+	  $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
+	}
+	else
+	{
+	  $p_header['mtime'] = time();
+	}
 
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
+	// TBC
+	//for(reset($v_data); $key = key($v_data); next($v_data)) {
+	//}
 
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
+	// ----- Set the stored filename
+	$p_header['stored_filename'] = $p_header['filename'];
 
-    // ----- Set the status field
-    $p_header['status'] = "ok";
+	// ----- Set the status field
+	$p_header['status'] = "ok";
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4385,101 +4385,101 @@ 
   // --------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
+	// ----- Read the 4 bytes signature
+	$v_binary_data = @fread($this->zip_fd, 4);
+	$v_data = unpack('Vid', $v_binary_data);
 
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
+	// ----- Check signature
+	if ($v_data['id'] != 0x02014b50)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
+	// ----- Read the first 42 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 42);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 42)
+	{
+	  $p_header['filename'] = "";
+	  $p_header['status'] = "invalid_header";
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+	// ----- Extract the values
+	$p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+	// ----- Get filename
+	if ($p_header['filename_len'] != 0)
+	  $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+	else
+	  $p_header['filename'] = '';
+
+	// ----- Get extra
+	if ($p_header['extra_len'] != 0)
+	  $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+	else
+	  $p_header['extra'] = '';
+
+	// ----- Get comment
+	if ($p_header['comment_len'] != 0)
+	  $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+	else
+	  $p_header['comment'] = '';
+
+	// ----- Extract properties
+
+	// ----- Recuperate date in UNIX format
+	//if ($p_header['mdate'] && $p_header['mtime'])
+	// TBC : bug : this was ignoring time with 0/0/0
+	if (1)
+	{
+	  // ----- Extract time
+	  $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+	  $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+	  $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+	  // ----- Extract date
+	  $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+	  $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+	  $v_day = $p_header['mdate'] & 0x001F;
+
+	  // ----- Get UNIX date format
+	  $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
+	}
+	else
+	{
+	  $p_header['mtime'] = time();
+	}
 
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
+	// ----- Set the stored filename
+	$p_header['stored_filename'] = $p_header['filename'];
 
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
+	// ----- Set default status to ok
+	$p_header['status'] = 'ok';
 
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
+	// ----- Look if it is a directory
+	if (substr($p_header['filename'], -1) == '/') {
+	  //$p_header['external'] = 0x41FF0010;
+	  $p_header['external'] = 0x00000010;
+	}
 
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4493,7 +4493,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+	$v_result=1;
 
   	// ----- Check the static values
   	// TBC
@@ -4512,13 +4512,13 @@ 
   
   	// ----- Look for flag bit 3
   	if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
+		  $p_local_header['size'] = $p_central_header['size'];
+		  $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+		  $p_local_header['crc'] = $p_central_header['crc'];
   	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4530,152 +4530,152 @@ 
   // --------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	$v_result=1;
+
+	// ----- Go to the end of the zip file
+	$v_size = filesize($this->zipname);
+	@fseek($this->zip_fd, $v_size);
+	if (@ftell($this->zip_fd) != $v_size)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
+	// ----- First try : look if this is an archive with no commentaries (most of the time)
+	// in this case the end of central dir is at 22 bytes of the file end
+	$v_found = 0;
+	if ($v_size > 26) {
+	  @fseek($this->zip_fd, $v_size-22);
+	  if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+	  {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
+	  // ----- Read for bytes
+	  $v_binary_data = @fread($this->zip_fd, 4);
+	  $v_data = @unpack('Vid', $v_binary_data);
 
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
+	  // ----- Check signature
+	  if ($v_data['id'] == 0x06054b50) {
+		$v_found = 1;
+	  }
 
-      $v_pos = ftell($this->zip_fd);
-    }
+	  $v_pos = ftell($this->zip_fd);
+	}
 
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
+	// ----- Go back to the maximum possible size of the Central Dir End Record
+	if (!$v_found) {
+	  $v_maximum_size = 65557; // 0xFFFF + 22;
+	  if ($v_maximum_size > $v_size)
+		$v_maximum_size = $v_size;
+	  @fseek($this->zip_fd, $v_size-$v_maximum_size);
+	  if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
+	  {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
-        }
-
-        $v_pos++;
-      }
+	  // ----- Read byte per byte in order to find the signature
+	  $v_pos = ftell($this->zip_fd);
+	  $v_bytes = 0x00000000;
+	  while ($v_pos < $v_size)
+	  {
+		// ----- Read a byte
+		$v_byte = @fread($this->zip_fd, 1);
+
+		// -----  Add the byte
+		//$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+		// Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
+		// Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
+		$v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
+
+		// ----- Compare the bytes
+		if ($v_bytes == 0x504b0506)
+		{
+		  $v_pos++;
+		  break;
+		}
+
+		$v_pos++;
+	  }
 
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
+	  // ----- Look if not found end of central dir
+	  if ($v_pos == $v_size)
+	  {
 
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
-    }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
+	}
 
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
+	// ----- Read the first 18 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 18);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
-    {
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 18)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+	// ----- Extract the values
+	$v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
 
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+	// ----- Check the global size
+	if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
 
 	  // ----- Removed in release 2.2 see readme file
 	  // The check of the file size is a little too strict.
 	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
 	  // While decrypted, zip has training 0 bytes
 	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
+						   'The central dir is not at the end of the archive.'
 						   .' Some trailing bytes exists after the archive.');
 
-      // ----- Return
-      return PclZip::errorCode();
+	  // ----- Return
+	  return PclZip::errorCode();
 	  }
-    }
+	}
 
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
+	// ----- Get comment
+	if ($v_data['comment_size'] != 0) {
+	  $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+	}
+	else
+	  $p_central_dir['comment'] = '';
+
+	$p_central_dir['entries'] = $v_data['entries'];
+	$p_central_dir['disk_entries'] = $v_data['disk_entries'];
+	$p_central_dir['offset'] = $v_data['offset'];
+	$p_central_dir['size'] = $v_data['size'];
+	$p_central_dir['disk'] = $v_data['disk'];
+	$p_central_dir['disk_start'] = $v_data['disk_start'];
+
+	// TBC
+	//for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+	//}
+
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4687,96 +4687,96 @@ 
   // --------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+	$v_list_detail = array();
+
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
+	// ----- Scan all the files
+	// ----- Start at beginning of Central Dir
+	$v_pos_entry = $v_central_dir['offset'];
+	@rewind($this->zip_fd);
+	if (@fseek($this->zip_fd, $v_pos_entry))
+	{
+	  // ----- Close the zip file
+	  $this->privCloseFd();
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
+	// ----- Read each entry
+	$v_header_list = array();
+	$j_start = 0;
+	for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+	{
 
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
+	  // ----- Read the file header
+	  $v_header_list[$v_nb_extracted] = array();
+	  if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
 
-        return $v_result;
-      }
+		return $v_result;
+	  }
 
 
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
+	  // ----- Store the index
+	  $v_header_list[$v_nb_extracted]['index'] = $i;
+
+	  // ----- Look for the specific extract rules
+	  $v_found = false;
+
+	  // ----- Look for extract by name rule
+	  if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+		  && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+		  // ----- Look if the filename is in the list
+		  for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+			  // ----- Look for a directory
+			  if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+				  // ----- Look if the directory is in the filename path
+				  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+					  && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+					  $v_found = true;
+				  }
+				  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+						  && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+					  $v_found = true;
+				  }
+			  }
+			  // ----- Look for a filename
+			  elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+				  $v_found = true;
+			  }
+		  }
+	  }
 
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
+	  // ----- Look for extract by ereg rule
+	  // ereg() is deprecated with PHP 5.3
+	  /*
       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
 
@@ -4786,201 +4786,201 @@ 
       }
       */
 
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+	  // ----- Look for extract by preg rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+			   && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
+		  if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+			  $v_found = true;
+		  }
+	  }
 
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+	  // ----- Look for extract by index rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+			   && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+		  // ----- Look if the index is in the list
+		  for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
+			  if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+				  $v_found = true;
+			  }
+			  if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+				  $j_start = $j+1;
+			  }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-      	$v_found = true;
-      }
+			  if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+				  break;
+			  }
+		  }
+	  }
+	  else {
+	  	$v_found = true;
+	  }
 
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
+	  // ----- Look for deletion
+	  if ($v_found)
+	  {
+		unset($v_header_list[$v_nb_extracted]);
+	  }
+	  else
+	  {
+		$v_nb_extracted++;
+	  }
+	}
 
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
+	// ----- Look if something need to be deleted
+	if ($v_nb_extracted > 0) {
 
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+		// ----- Creates a temporay file
+		$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
+		// ----- Creates a temporary zip archive
+		$v_temp_zip = new PclZip($v_zip_temp_name);
 
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
+		// ----- Open the temporary zip file in write mode
+		if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+			$this->privCloseFd();
 
-            // ----- Return
-            return $v_result;
-        }
+			// ----- Return
+			return $v_result;
+		}
 
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+		// ----- Look which file need to be kept
+		for ($i=0; $i<sizeof($v_header_list); $i++) {
 
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+			// ----- Calculate the position of the header
+			@rewind($this->zip_fd);
+			if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
 
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+				// ----- Error log
+				PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-                // ----- Return
-                return PclZip::errorCode();
-            }
+				// ----- Return
+				return PclZip::errorCode();
+			}
 
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+			// ----- Read the file header
+			$v_local_header = array();
+			if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
 
-                // ----- Return
-                return $v_result;
-            }
+				// ----- Return
+				return $v_result;
+			}
             
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
-
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
-
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Close
-        $v_temp_zip->privCloseFd();
-        $this->privCloseFd();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
+			// ----- Check that local file header is same as central file header
+			if ($this->privCheckFileHeaders($v_local_header,
+											$v_header_list[$i]) != 1) {
+				// TBC
+			}
+			unset($v_local_header);
+
+			// ----- Write the file header
+			if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+
+			// ----- Read/write the data block
+			if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+		}
+
+		// ----- Store the offset of the central dir
+		$v_offset = @ftell($v_temp_zip->zip_fd);
+
+		// ----- Re-Create the Central Dir files header
+		for ($i=0; $i<sizeof($v_header_list); $i++) {
+			// ----- Create the file header
+			if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+				$v_temp_zip->privCloseFd();
+				$this->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+
+			// ----- Transform the header to a 'usable' info
+			$v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+		}
+
+
+		// ----- Zip file comment
+		$v_comment = '';
+		if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+		  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+		}
+
+		// ----- Calculate the size of the central header
+		$v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+
+		// ----- Create the central dir footer
+		if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+			// ----- Reset the file list
+			unset($v_header_list);
+			$v_temp_zip->privCloseFd();
+			$this->privCloseFd();
+			@unlink($v_zip_temp_name);
+
+			// ----- Return
+			return $v_result;
+		}
+
+		// ----- Close
+		$v_temp_zip->privCloseFd();
+		$this->privCloseFd();
+
+		// ----- Delete the zip file
+		// TBC : I should test the result ...
+		@unlink($this->zipname);
+
+		// ----- Rename the temporary file
+		// TBC : I should test the result ...
+		//@rename($v_zip_temp_name, $this->zipname);
+		PclZipUtilRename($v_zip_temp_name, $this->zipname);
     
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
+		// ----- Destroy the temporary archive
+		unset($v_temp_zip);
+	}
     
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
-        $this->privCloseFd();
+	// ----- Remove every files : reset the file
+	else if ($v_central_dir['entries'] != 0) {
+		$this->privCloseFd();
 
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
-        }
+		if (($v_result = $this->privOpenFd('wb')) != 1) {
+		  return $v_result;
+		}
 
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
-        }
+		if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+		  return $v_result;
+		}
 
-        $this->privCloseFd();
-    }
+		$this->privCloseFd();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4997,49 +4997,49 @@ 
   // --------------------------------------------------------------------------------
   function privDirCheck($p_dir, $p_is_dir=false)
   {
-    $v_result = 1;
+	$v_result = 1;
 
 
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
-    {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
+	// ----- Remove the final '/'
+	if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+	{
+	  $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+	}
 
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
+	// ----- Check the directory availability
+	if ((is_dir($p_dir)) || ($p_dir == ""))
+	{
+	  return 1;
+	}
 
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
+	// ----- Extract parent directory
+	$p_parent_dir = dirname($p_dir);
+
+	// ----- Just a check
+	if ($p_parent_dir != $p_dir)
+	{
+	  // ----- Look for parent directory
+	  if ($p_parent_dir != "")
+	  {
+		if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
+		{
+		  return $v_result;
+		}
+	  }
+	}
 
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+	// ----- Create the directory
+	if (!@mkdir($p_dir, 0777))
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5052,180 +5052,180 @@ 
   // --------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
-    {
+	// ----- Look if the archive_to_add exists
+	if (!is_file($p_archive_to_add->zipname))
+	{
 
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
+	  // ----- Nothing to merge, so merge is a success
+	  $v_result = 1;
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
-    {
+	// ----- Look if the archive exists
+	if (!is_file($this->zipname))
+	{
 
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+	  // ----- Do a duplicate
+	  $v_result = $this->privDuplicate($p_archive_to_add->zipname);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
+	// ----- Open the archive_to_add file
+	if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+	{
+	  $this->privCloseFd();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
+	// ----- Read the central directory informations
+	$v_central_dir_to_add = array();
+	if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
 
-      return $v_result;
-    }
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($p_archive_to_add->zip_fd);
 
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+	// ----- Creates a temporay file
+	$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = $v_central_dir['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive_to_add into the temporary file
+	$v_size = $v_central_dir_to_add['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($v_zip_temp_fd);
+
+	// ----- Copy the block of file headers from the old archive
+	$v_size = $v_central_dir['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the block of file headers from the archive_to_add
+	$v_size = $v_central_dir_to_add['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
+	// ----- Merge the file comments
+	$v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
 
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+	// ----- Calculate the size of the (new) central header
+	$v_size = @ftell($v_zip_temp_fd)-$v_offset;
 
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap the file descriptor
+	// Here is a trick : I swap the temporary fd with the zip fd, in order to use
+	// the following methods on the temporary fil and not the real archive fd
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
+	  @fclose($v_zip_temp_fd);
+	  $this->zip_fd = null;
 
-      // ----- Reset the file list
-      unset($v_header_list);
+	  // ----- Reset the file list
+	  unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap back the file descriptor
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
+	$p_archive_to_add->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
+	// ----- Delete the zip file
+	// TBC : I should test the result ...
+	@unlink($this->zipname);
 
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+	// ----- Rename the temporary file
+	// TBC : I should test the result ...
+	//@rename($v_zip_temp_name, $this->zipname);
+	PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5237,56 +5237,56 @@ 
   // --------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
+	// ----- Look if the $p_archive_filename exists
+	if (!is_file($p_archive_filename))
+	{
 
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
+	  // ----- Nothing to duplicate, so duplicate is a success.
+	  $v_result = 1;
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('wb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
+	{
+	  $this->privCloseFd();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = filesize($p_archive_filename);
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($v_zip_temp_fd, $v_read_size);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5297,13 +5297,13 @@ 
   // --------------------------------------------------------------------------------
   function privErrorLog($p_error_code=0, $p_error_string='')
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  PclError($p_error_code, $p_error_string);
+	}
+	else {
+	  $this->error_code = $p_error_code;
+	  $this->error_string = $p_error_string;
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -5314,13 +5314,13 @@ 
   // --------------------------------------------------------------------------------
   function privErrorReset()
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  PclErrorReset();
+	}
+	else {
+	  $this->error_code = 0;
+	  $this->error_string = '';
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -5332,17 +5332,17 @@ 
   // --------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
+	// ----- Look if function exists
+	if (   (!function_exists("get_magic_quotes_runtime"))
+		|| (!function_exists("set_magic_quotes_runtime"))) {
+	  return $v_result;
 	}
 
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
+	// ----- Look if already done
+	if ($this->magic_quotes_status != -1) {
+	  return $v_result;
 	}
 
 	// ----- Get and memorize the magic_quote value
@@ -5353,8 +5353,8 @@ 
 	  @set_magic_quotes_runtime(0);
 	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5366,17 +5366,17 @@ 
   // --------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
+	// ----- Look if function exists
+	if (   (!function_exists("get_magic_quotes_runtime"))
+		|| (!function_exists("set_magic_quotes_runtime"))) {
+	  return $v_result;
 	}
 
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
+	// ----- Look if something to do
+	if ($this->magic_quotes_status != -1) {
+	  return $v_result;
 	}
 
 	// ----- Swap back magic_quotes
@@ -5384,8 +5384,8 @@ 
   	  @set_magic_quotes_runtime($this->magic_quotes_status);
 	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5401,67 +5401,67 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilPathReduction($p_dir)
   {
-    $v_result = "";
-
-    // ----- Look for not empty path
-    if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
-
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
+	$v_result = "";
+
+	// ----- Look for not empty path
+	if ($p_dir != "") {
+	  // ----- Explode path by directory names
+	  $v_list = explode("/", $p_dir);
+
+	  // ----- Study directories from last to first
+	  $v_skip = 0;
+	  for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+		// ----- Look for current path
+		if ($v_list[$i] == ".") {
+		  // ----- Ignore this directory
+		  // Should be the first $i=0, but no check is done
+		}
+		else if ($v_list[$i] == "..") {
 		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
+		}
+		else if ($v_list[$i] == "") {
 		  // ----- First '/' i.e. root slash
 		  if ($i == 0) {
-            $v_result = "/".$v_result;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                $v_skip = 0;
-		    }
+			$v_result = "/".$v_result;
+			if ($v_skip > 0) {
+				// ----- It is an invalid path, so the path is not modified
+				// TBC
+				$v_result = $p_dir;
+				$v_skip = 0;
+			}
 		  }
 		  // ----- Last '/' i.e. indicates a directory
 		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
+			$v_result = $v_list[$i];
 		  }
 		  // ----- Double '/' inside the path
 		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
+			// ----- Ignore only the double '//' in path,
+			// but not the first and last '/'
 		  }
-        }
-        else {
+		}
+		else {
 		  // ----- Look for item to skip
 		  if ($v_skip > 0) {
-		    $v_skip--;
+			$v_skip--;
 		  }
 		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+			$v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
 		  }
-        }
-      }
+		}
+	  }
       
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
-    }
+	  // ----- Look for skip
+	  if ($v_skip > 0) {
+		while ($v_skip > 0) {
+			$v_result = '../'.$v_result;
+			$v_skip--;
+		}
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5482,67 +5482,67 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilPathInclusion($p_dir, $p_path)
   {
-    $v_result = 1;
+	$v_result = 1;
     
-    // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
-    }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
-    }
+	// ----- Look for path beginning by ./
+	if (   ($p_dir == '.')
+		|| ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+	  $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+	}
+	if (   ($p_path == '.')
+		|| ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+	  $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+	}
 
-    // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-        $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
-        $j++;
-        continue;
-      }
+	// ----- Explode dir and path by directory separator
+	$v_list_dir = explode("/", $p_dir);
+	$v_list_dir_size = sizeof($v_list_dir);
+	$v_list_path = explode("/", $p_path);
+	$v_list_path_size = sizeof($v_list_path);
+
+	// ----- Study directories paths
+	$i = 0;
+	$j = 0;
+	while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
+
+	  // ----- Look for empty dir (path reduction)
+	  if ($v_list_dir[$i] == '') {
+		$i++;
+		continue;
+	  }
+	  if ($v_list_path[$j] == '') {
+		$j++;
+		continue;
+	  }
 
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
+	  // ----- Compare the items
+	  if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+		$v_result = 0;
+	  }
 
-      // ----- Next items
-      $i++;
-      $j++;
-    }
+	  // ----- Next items
+	  $i++;
+	  $j++;
+	}
 
-    // ----- Look if everything seems to be the same
-    if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+	// ----- Look if everything seems to be the same
+	if ($v_result) {
+	  // ----- Skip all the empty items
+	  while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
+	  while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
 
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
-    }
+	  if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+		// ----- There are exactly the same
+		$v_result = 2;
+	  }
+	  else if ($i < $v_list_dir_size) {
+		// ----- The path is shorter than the dir
+		$v_result = 0;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5559,51 +5559,51 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
-    $v_result = 1;
-
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
+	$v_result = 1;
+
+	if ($p_mode==0)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @fread($p_src, $v_read_size);
+		@fwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==1)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @gzread($p_src, $v_read_size);
+		@fwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==2)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @fread($p_src, $v_read_size);
+		@gzwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==3)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @gzread($p_src, $v_read_size);
+		@gzwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5621,22 +5621,22 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilRename($p_src, $p_dest)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
+	// ----- Try to rename the files
+	if (!@rename($p_src, $p_dest)) {
 
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
-    }
+	  // ----- Try to copy & unlink the src
+	  if (!@copy($p_src, $p_dest)) {
+		$v_result = 0;
+	  }
+	  else if (!@unlink($p_src)) {
+		$v_result = 0;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5652,20 +5652,20 @@ 
   function PclZipUtilOptionText($p_option)
   {
     
-    $v_list = get_defined_constants();
-    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-	        && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
-	    }
-    }
+	$v_list = get_defined_constants();
+	for (reset($v_list); $v_key = key($v_list); next($v_list)) {
+		$v_prefix = substr($v_key, 0, 10);
+		if ((   ($v_prefix == 'PCLZIP_OPT')
+		   || ($v_prefix == 'PCLZIP_CB_')
+		   || ($v_prefix == 'PCLZIP_ATT'))
+			&& ($v_list[$v_key] == $p_option)) {
+		return $v_key;
+		}
+	}
     
-    $v_result = 'Unknown';
+	$v_result = 'Unknown';
 
-    return $v_result;
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5682,17 +5682,17 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
   {
-    if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-    }
-    return $p_path;
+	if (stristr(php_uname(), 'windows')) {
+	  // ----- Look for potential disk letter
+	  if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+		  $p_path = substr($p_path, $v_position+1);
+	  }
+	  // ----- Change potential windows directory separator
+	  if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+		  $p_path = strtr($p_path, '\\', '/');
+	  }
+	}
+	return $p_path;
   }
   // --------------------------------------------------------------------------------
 

Spacing +376 added lines, -376 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 // --------------------------------------------------------------------------------
 // PhpConcept Library - Zip Module 2.8.2
 // --------------------------------------------------------------------------------
@@ -27,7 +27,7 @@ 
 
   // ----- Constants
   if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
   }
   
   // ----- File list separator
@@ -41,7 +41,7 @@ 
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
   if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+    define('PCLZIP_SEPARATOR', ',');
   }
 
   // ----- Error configuration
@@ -50,7 +50,7 @@ 
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
   if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+    define('PCLZIP_ERROR_EXTERNAL', 0);
   }
 
   // ----- Optional static temporary directory
@@ -63,7 +63,7 @@ 
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
   if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
+    define('PCLZIP_TEMPORARY_DIR', '');
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -75,7 +75,7 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
   if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
   }
 
 // --------------------------------------------------------------------------------
@@ -100,72 +100,72 @@ 
   //  -12 : Unable to rename file (rename)
   //  -13 : Invalid header checksum
   //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+  define('PCLZIP_ERR_USER_ABORTED', 2);
+  define('PCLZIP_ERR_NO_ERROR', 0);
+  define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+  define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+  define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+  define('PCLZIP_ERR_MISSING_FILE', -4);
+  define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+  define('PCLZIP_ERR_INVALID_ZIP', -6);
+  define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+  define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+  define('PCLZIP_ERR_BAD_EXTENSION', -9);
+  define('PCLZIP_ERR_BAD_FORMAT', -10);
+  define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+  define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+  define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+  define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+  define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+  define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+  define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+  define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+  define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+  define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+  define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
   // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
+  define('PCLZIP_OPT_PATH', 77001);
+  define('PCLZIP_OPT_ADD_PATH', 77002);
+  define('PCLZIP_OPT_REMOVE_PATH', 77003);
+  define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+  define('PCLZIP_OPT_SET_CHMOD', 77005);
+  define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+  define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+  define('PCLZIP_OPT_BY_NAME', 77008);
+  define('PCLZIP_OPT_BY_INDEX', 77009);
+  define('PCLZIP_OPT_BY_EREG', 77010);
+  define('PCLZIP_OPT_BY_PREG', 77011);
+  define('PCLZIP_OPT_COMMENT', 77012);
+  define('PCLZIP_OPT_ADD_COMMENT', 77013);
+  define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+  define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+  define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+  define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
   // Having big trouble with crypt. Need to multiply 2 long int
   // which is not correctly supported by PHP ...
   //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+  define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+  define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+  define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+  define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
   
   // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+  define('PCLZIP_ATT_FILE_NAME', 79001);
+  define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+  define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+  define('PCLZIP_ATT_FILE_MTIME', 79004);
+  define('PCLZIP_ATT_FILE_CONTENT', 79005);
+  define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
   // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
+  define('PCLZIP_CB_PRE_EXTRACT', 78001);
+  define('PCLZIP_CB_POST_EXTRACT', 78002);
+  define('PCLZIP_CB_PRE_ADD', 78003);
+  define('PCLZIP_CB_POST_ADD', 78004);
   /* For futur use
   define( 'PCLZIP_CB_PRE_LIST', 78005 );
   define( 'PCLZIP_CB_POST_LIST', 78006 );
@@ -220,9 +220,9 @@ 
     {
       if (!function_exists('gzopen')
         && function_exists('gzopen64')) {
-        function gzopen($filename , $mode = 'r', $use_include_path = 0 )
+        function gzopen($filename, $mode = 'r', $use_include_path = 0)
         {
-            return gzopen64($filename , $mode, $use_include_path);
+            return gzopen64($filename, $mode, $use_include_path);
         }
       }
     }
@@ -276,7 +276,7 @@ 
   // --------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -302,7 +302,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -388,7 +388,7 @@ 
     
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'
              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
              ,PCLZIP_ATT_FILE_MTIME => 'optional'
@@ -459,7 +459,7 @@ 
   // --------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -485,7 +485,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -558,7 +558,7 @@ 
 
     // ----- Invalid variable type for $p_filelist
     else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
       return 0;
     }
     
@@ -571,7 +571,7 @@ 
     
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'
              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
              ,PCLZIP_ATT_FILE_MTIME => 'optional'
@@ -648,7 +648,7 @@ 
   // --------------------------------------------------------------------------------
   function listContent()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -705,7 +705,7 @@ 
   // --------------------------------------------------------------------------------
   function extract()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -738,7 +738,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
@@ -862,7 +862,7 @@ 
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -899,7 +899,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
@@ -969,10 +969,10 @@ 
     // ----- Trick
     // Here I want to reuse extractByRule(), so I need to parse the $p_index
     // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+    $v_arg_trick = array(PCLZIP_OPT_BY_INDEX, $p_index);
     $v_options_trick = array();
     $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                        array(PCLZIP_OPT_BY_INDEX => 'optional'));
     if ($v_result != 1) {
         return 0;
     }
@@ -1011,7 +1011,7 @@ 
   // --------------------------------------------------------------------------------
   function delete()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -1034,10 +1034,10 @@ 
 
       // ----- Parse the options
       $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
+                                        array(PCLZIP_OPT_BY_NAME => 'optional',
                                                PCLZIP_OPT_BY_EREG => 'optional',
                                                PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                               PCLZIP_OPT_BY_INDEX => 'optional'));
       if ($v_result != 1) {
           return 0;
       }
@@ -1122,7 +1122,7 @@ 
         $this->privSwapBackMagicQuotes();
         
         // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
 
         // ----- Return
         return 0;
@@ -1188,7 +1188,7 @@ 
       // TBC : Should also check the archive format
       if (!is_file($p_archive)) {
         // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
         $v_result = PCLZIP_ERR_MISSING_FILE;
       }
       else {
@@ -1291,9 +1291,9 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
+  function errorName($p_with_code = false)
   {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+    $v_name = array(PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
                       PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
                       PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
                       PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
@@ -1324,7 +1324,7 @@ 
     }
 
     if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
+      return($v_value . ' (' . $this->error_code . ')');
     }
     else {
       return($v_value);
@@ -1337,17 +1337,17 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
+  function errorInfo($p_full = false)
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
     }
     else {
       if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
+        return($this->errorName(true) . " : " . $this->error_string);
       }
       else {
-        return($this->error_string." [code ".$this->error_code."]");
+        return($this->error_string . " [code " . $this->error_code . "]");
       }
     }
   }
@@ -1376,7 +1376,7 @@ 
   //   true on success,
   //   false on error, the error code is set.
   // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
+  function privCheckFormat($p_level = 0)
   {
     $v_result = true;
 
@@ -1389,14 +1389,14 @@ 
     // ----- Look if the file exits
     if (!is_file($this->zipname)) {
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
       return(false);
     }
 
     // ----- Check that the file is readeable
     if (!is_readable($this->zipname)) {
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
       return(false);
     }
 
@@ -1429,18 +1429,18 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
+  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
+    $i = 0;
+    while ($i < $p_size) {
 
       // ----- Check if the option is supported
       if (!isset($v_requested_options[$p_options_list[$i]])) {
         // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
 
         // ----- Return
         return PclZip::errorCode();
@@ -1453,48 +1453,48 @@ 
         case PCLZIP_OPT_REMOVE_PATH :
         case PCLZIP_OPT_ADD_PATH :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
           $i++;
         break;
 
         case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+          if (($i + 1) >= $p_size) {
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
             return PclZip::errorCode();
           }
           
           // ----- Check for incompatible options
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
             return PclZip::errorCode();
           }
           
           // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+          $v_value = $p_options_list[$i + 1];
+          if ((!is_integer($v_value)) || ($v_value < 0)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
             return PclZip::errorCode();
           }
 
           // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+          $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
           $i++;
         break;
 
         case PCLZIP_OPT_TEMP_FILE_ON :
           // ----- Check for incompatible options
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
             return PclZip::errorCode();
           }
           
@@ -1504,12 +1504,12 @@ 
         case PCLZIP_OPT_TEMP_FILE_OFF :
           // ----- Check for incompatible options
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
             return PclZip::errorCode();
           }
           // ----- Check for incompatible options
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
             return PclZip::errorCode();
           }
           
@@ -1518,18 +1518,18 @@ 
 
         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
           }
 
           // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          if (is_string($p_options_list[$i + 1])
+              && ($p_options_list[$i + 1] != '')) {
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
             $i++;
           }
           else {
@@ -1539,24 +1539,24 @@ 
         // ----- Look for options that request an array of string for value
         case PCLZIP_OPT_BY_NAME :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
           }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          else if (is_array($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
@@ -1572,21 +1572,21 @@ 
         case PCLZIP_OPT_BY_PREG :
         //case PCLZIP_OPT_CRYPT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
@@ -1599,7 +1599,7 @@ 
         case PCLZIP_OPT_ADD_COMMENT :
         case PCLZIP_OPT_PREPEND_COMMENT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
 			                     "Missing parameter value for option '"
@@ -1611,8 +1611,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1630,9 +1630,9 @@ 
         // ----- Look for options that request an array of index
         case PCLZIP_OPT_BY_INDEX :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
@@ -1640,23 +1640,23 @@ 
 
           // ----- Get the value
           $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
+          if (is_string($p_options_list[$i + 1])) {
 
               // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+              $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
 
               // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
+              $v_work_list = explode(",", $p_options_list[$i + 1]);
           }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
+          else if (is_integer($p_options_list[$i + 1])) {
+              $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1];
           }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
+          else if (is_array($p_options_list[$i + 1])) {
+              $v_work_list = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
@@ -1666,9 +1666,9 @@ 
           // each index item in the list must be a couple with a start and
           // an end value : [0,3], [5-5], [8-10], ...
           // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
+          $v_sort_flag = false;
+          $v_sort_value = 0;
+          for ($j = 0; $j < sizeof($v_work_list); $j++) {
               // ----- Explode the item
               $v_item_list = explode("-", $v_work_list[$j]);
               $v_size_item_list = sizeof($v_item_list);
@@ -1689,7 +1689,7 @@ 
               }
               else {
                   // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                   // ----- Return
                   return PclZip::errorCode();
@@ -1698,11 +1698,11 @@ 
 
               // ----- Look for list sort
               if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
+                  $v_sort_flag = true;
 
                   // ----- TBC : An automatic sort should be writen ...
                   // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
                   // ----- Return
                   return PclZip::errorCode();
@@ -1732,16 +1732,16 @@ 
         // ----- Look for options that request an octal value
         case PCLZIP_OPT_SET_CHMOD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           $i++;
         break;
 
@@ -1757,21 +1757,21 @@ 
         case PCLZIP_CB_POST_LIST :
         */
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
           }
 
           // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
+          $v_function_name = $p_options_list[$i + 1];
 
           // ----- Check that the value is a valid existing function
           if (!function_exists($v_function_name)) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
             // ----- Return
             return PclZip::errorCode();
@@ -1786,7 +1786,7 @@ 
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
 		                       "Unknown parameter '"
-							   .$p_options_list[$i]."'");
+							   .$p_options_list[$i] . "'");
 
           // ----- Return
           return PclZip::errorCode();
@@ -1798,13 +1798,13 @@ 
 
     // ----- Look for mandatory options
     if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+      for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
         // ----- Look for mandatory option
         if ($v_requested_options[$key] == 'mandatory') {
           // ----- Look if present
           if (!isset($v_result_list[$key])) {
             // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
 
             // ----- Return
             return PclZip::errorCode();
@@ -1831,7 +1831,7 @@ 
   // --------------------------------------------------------------------------------
   function privOptionDefaultThreshold(&$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
@@ -1843,16 +1843,16 @@ 
     $v_memory_limit = trim($v_memory_limit);
     $last = strtolower(substr($v_memory_limit, -1));
  
-    if($last == 'g')
+    if ($last == 'g')
         //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
+        $v_memory_limit = $v_memory_limit * 1073741824;
+    if ($last == 'm')
         //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+        $v_memory_limit = $v_memory_limit * 1048576;
+    if ($last == 'k')
+        $v_memory_limit = $v_memory_limit * 1024;
             
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
     
 
     // ----- Sanity check : No threshold if value lower than 1M
@@ -1873,9 +1873,9 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
+  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- For each file in the list check the attributes
     foreach ($p_file_list as $v_key => $v_value) {
@@ -1883,7 +1883,7 @@ 
       // ----- Check if the option is supported
       if (!isset($v_requested_options[$v_key])) {
         // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
 
         // ----- Return
         return PclZip::errorCode();
@@ -1893,14 +1893,14 @@ 
       switch ($v_key) {
         case PCLZIP_ATT_FILE_NAME :
           if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
             return PclZip::errorCode();
           }
 
           $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
           
           if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
             return PclZip::errorCode();
           }
 
@@ -1908,28 +1908,28 @@ 
 
         case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
           if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
             return PclZip::errorCode();
           }
 
           $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
 
           if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
             return PclZip::errorCode();
           }
         break;
 
         case PCLZIP_ATT_FILE_NEW_FULL_NAME :
           if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
             return PclZip::errorCode();
           }
 
           $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
 
           if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
             return PclZip::errorCode();
           }
         break;
@@ -1937,7 +1937,7 @@ 
         // ----- Look for options that takes a string
         case PCLZIP_ATT_FILE_COMMENT :
           if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
             return PclZip::errorCode();
           }
 
@@ -1946,7 +1946,7 @@ 
 
         case PCLZIP_ATT_FILE_MTIME :
           if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
             return PclZip::errorCode();
           }
 
@@ -1960,7 +1960,7 @@ 
         default :
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
+		                           "Unknown parameter '" . $v_key . "'");
 
           // ----- Return
           return PclZip::errorCode();
@@ -1968,12 +1968,12 @@ 
 
       // ----- Look for mandatory options
       if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+        for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
           // ----- Look for mandatory option
           if ($v_requested_options[$key] == 'mandatory') {
             // ----- Look if present
             if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
               return PclZip::errorCode();
             }
           }
@@ -2004,13 +2004,13 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Create a result list
     $v_result_list = array();
     
     // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+    for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
       
       // ----- Get filedescr
       $v_descr = $p_filedescr_list[$i];
@@ -2045,7 +2045,7 @@ 
       // ----- Missing file
       else {
         // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
 
         // ----- Return
         return PclZip::errorCode();
@@ -2071,7 +2071,7 @@ 
             }
             
             // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
+            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'] . '/' . $v_item_handler;
             
             // ----- Look for different stored filename
             // Because the name of the folder was changed, the name of the
@@ -2079,7 +2079,7 @@ 
             if (($v_descr['stored_filename'] != $v_descr['filename'])
                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
               if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
+                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'] . '/' . $v_item_handler;
               }
               else {
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
@@ -2129,7 +2129,7 @@ 
   // --------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
     
     // ----- Magic quotes trick
@@ -2164,7 +2164,7 @@ 
   // --------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Look if the archive exists or is empty
@@ -2181,7 +2181,7 @@ 
     $this->privDisableMagicQuotes();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Magic quotes trick
       $this->privSwapBackMagicQuotes();
@@ -2203,7 +2203,7 @@ 
     @rewind($this->zip_fd);
 
     // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
 
     // ----- Open the temporary file in write mode
     if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
@@ -2211,7 +2211,7 @@ 
       $this->privCloseFd();
       $this->privSwapBackMagicQuotes();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
 
       // ----- Return
       return PclZip::errorCode();
@@ -2262,7 +2262,7 @@ 
     }
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2288,17 +2288,17 @@ 
       $v_comment = $p_options[PCLZIP_OPT_COMMENT];
     }
     if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
+      $v_comment = $v_comment . $p_options[PCLZIP_OPT_ADD_COMMENT];
     }
     if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
+      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT] . $v_comment;
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
     {
       // ----- Reset the file list
       unset($v_header_list);
@@ -2343,13 +2343,13 @@ 
   // --------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if already open
     if ($this->zip_fd != 0)
     {
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
 
       // ----- Return
       return PclZip::errorCode();
@@ -2359,7 +2359,7 @@ 
     if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
     {
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
 
       // ----- Return
       return PclZip::errorCode();
@@ -2377,7 +2377,7 @@ 
   // --------------------------------------------------------------------------------
   function privCloseFd()
   {
-    $v_result=1;
+    $v_result = 1;
 
     if ($this->zip_fd != 0)
       @fclose($this->zip_fd);
@@ -2404,7 +2404,7 @@ 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
   function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Add the files
     $v_header_list = array();
@@ -2418,7 +2418,7 @@ 
     $v_offset = @ftell($this->zip_fd);
 
     // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2440,7 +2440,7 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
@@ -2468,14 +2468,14 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = sizeof($p_result_list);
 
     // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+    for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
       // ----- Format the filename
       $p_filedescr_list[$j]['filename']
       = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
@@ -2488,9 +2488,9 @@ 
       }
 
       // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
+      if (($p_filedescr_list[$j]['type'] != 'virtual_file')
           && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
         return PclZip::errorCode();
       }
 
@@ -2498,10 +2498,10 @@ 
       // or a dir with all its path removed
 //      if (   (is_file($p_filedescr_list[$j]['filename']))
 //          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
+      if (($p_filedescr_list[$j]['type'] == 'file')
           || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+          || (($p_filedescr_list[$j]['type'] == 'folder')
+              && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
                   || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
           ) {
 
@@ -2530,7 +2530,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2575,13 +2575,13 @@ 
     $p_header['index'] = -1;
 
     // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
+    if ($p_filedescr['type'] == 'file') {
       $p_header['external'] = 0x00000000;
       $p_header['size'] = filesize($p_filename);
     }
     
     // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
+    else if ($p_filedescr['type'] == 'folder') {
       $p_header['external'] = 0x00000010;
       $p_header['mtime'] = filemtime($p_filename);
       $p_header['size'] = filesize($p_filename);
@@ -2656,10 +2656,10 @@ 
       // ----- Look for a file
       if ($p_filedescr['type'] == 'file') {
         // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+        if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
             && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                 || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
+                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
           $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
           if ($v_result < PCLZIP_ERR_NO_ERROR) {
             return $v_result;
@@ -2759,7 +2759,7 @@ 
         // ----- Set the file properties
         $p_header['size'] = 0;
         //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+        $p_header['external'] = 0x00000010; // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
@@ -2803,7 +2803,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=PCLZIP_ERR_NO_ERROR;
+    $v_result = PCLZIP_ERR_NO_ERROR;
     
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2816,10 +2816,10 @@ 
     }
 
     // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
     if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
       fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
       return PclZip::errorCode();
     }
 
@@ -2839,13 +2839,13 @@ 
 
     // ----- Check the minimum file size
     if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \'' . $v_gzip_temp_name . '\' has invalid filesize - should be minimum 18 bytes');
       return PclZip::errorCode();
     }
 
     // ----- Extract the compressed attributes
     if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
       return PclZip::errorCode();
     }
 
@@ -2857,7 +2857,7 @@ 
     $v_data_header['os'] = bin2hex($v_data_header['os']);
 
     // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+    @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
     $v_binary_data = @fread($v_file_compressed, 8);
     $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
@@ -2865,7 +2865,7 @@ 
     $p_header['compression'] = ord($v_data_header['cm']);
     //$p_header['mtime'] = $v_data_header['mtime'];
     $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+    $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
 
     // ----- Close the file
     @fclose($v_file_compressed);
@@ -2878,7 +2878,7 @@ 
     // ----- Add the compressed data
     if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
     {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
       return PclZip::errorCode();
     }
 
@@ -2915,7 +2915,7 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Working variables
     $p_filename = $p_filedescr['filename'];
@@ -2954,9 +2954,9 @@ 
         $v_path_info = pathinfo($p_filename);
         $v_dir = '';
         if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
+          $v_dir = $v_path_info['dirname'] . '/';
         }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
+        $v_stored_filename = $v_dir . $p_filedescr['new_short_name'];
       }
       else {
         // ----- Calculate the stored filename
@@ -2972,14 +2972,14 @@ 
         if (substr($p_remove_dir, -1) != '/')
           $p_remove_dir .= "/";
 
-        if (   (substr($p_filename, 0, 2) == "./")
+        if ((substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
             
-          if (   (substr($p_filename, 0, 2) == "./")
+          if ((substr($p_filename, 0, 2) == "./")
               && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
+            $p_remove_dir = "./" . $p_remove_dir;
           }
-          if (   (substr($p_filename, 0, 2) != "./")
+          if ((substr($p_filename, 0, 2) != "./")
               && (substr($p_remove_dir, 0, 2) == "./")) {
             $p_remove_dir = substr($p_remove_dir, 2);
           }
@@ -3004,9 +3004,9 @@ 
       // ----- Look for path to add
       if ($p_add_dir != "") {
         if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
+          $v_stored_filename = $p_add_dir . $v_stored_filename;
         else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+          $v_stored_filename = $p_add_dir . "/" . $v_stored_filename;
       }
     }
 
@@ -3027,15 +3027,15 @@ 
   // --------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Store the offset position of the file
     $p_header['offset'] = ftell($this->zip_fd);
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
@@ -3072,7 +3072,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -3080,8 +3080,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
 
     // ----- Packed data
@@ -3125,7 +3125,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
@@ -3154,7 +3154,7 @@ 
   // --------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
@@ -3166,7 +3166,7 @@ 
       $this->privSwapBackMagicQuotes();
       
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
 
       // ----- Return
       return PclZip::errorCode();
@@ -3194,7 +3194,7 @@ 
     }
 
     // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0; $i < $v_central_dir['entries']; $i++)
     {
       // ----- Read the file header
       if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
@@ -3241,7 +3241,7 @@ 
   // --------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Get the interesting attributes
     $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
@@ -3252,7 +3252,7 @@ 
     $p_info['compressed_size'] = $p_header['compressed_size'];
     $p_info['mtime'] = $p_header['mtime'];
     $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+    $p_info['folder'] = (($p_header['external'] & 0x00000010) == 0x00000010);
     $p_info['index'] = $p_header['index'];
     $p_info['status'] = $p_header['status'];
     $p_info['crc'] = $p_header['crc'];
@@ -3280,17 +3280,17 @@ 
   // --------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
 
     // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
+    if (($p_path == "")
+	    || ((substr($p_path, 0, 1) != "/")
 		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
+			&& (substr($p_path, 1, 2) != ":/")))
+      $p_path = "./" . $p_path;
 
     // ----- Reduce the path last (and duplicated) '/'
     if (($p_path != "./") && ($p_path != "/"))
@@ -3298,7 +3298,7 @@ 
       // ----- Look for the path end '/'
       while (substr($p_path, -1) == "/")
       {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
+        $p_path = substr($p_path, 0, strlen($p_path) - 1);
       }
     }
 
@@ -3332,7 +3332,7 @@ 
 
     // ----- Read each entry
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read next Central dir entry
@@ -3371,17 +3371,17 @@ 
       $v_extract = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
                   // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_extract = true;
                   }
@@ -3406,7 +3406,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
@@ -3415,20 +3415,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
           
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                   $v_extract = true;
               }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -3440,21 +3440,21 @@ 
       }
 
 	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
+	  if (($v_extract)
+	      && (($v_header['compression'] != 8)
 		      && ($v_header['compression'] != 0))) {
           $v_header['status'] = 'unsupported_compression';
 
           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
               
               PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
+			                       "Filename '" . $v_header['stored_filename'] . "' is "
 				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
+				  	    	  	   ."method (" . $v_header['compression'] . ") ");
 
               return PclZip::errorCode();
 		  }
@@ -3465,14 +3465,14 @@ 
           $v_header['status'] = 'unsupported_encryption';
 
           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
 
               PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
 			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
+				  	    	  	   ." filename '" . $v_header['stored_filename']
 								   ."'");
 
               return PclZip::errorCode();
@@ -3547,7 +3547,7 @@ 
           }
         }
         // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+        elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
 		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
           // ----- Extracting the file in standard output
           $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
@@ -3620,7 +3620,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
@@ -3638,7 +3638,7 @@ 
     // ----- Look for all path to remove
     if ($p_remove_all_path == true) {
         // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        if (($p_entry['external'] & 0x00000010) == 0x00000010) {
 
             $p_entry['status'] = "filtered";
 
@@ -3674,7 +3674,7 @@ 
 
     // ----- Add the path
     if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
+      $p_entry['filename'] = $p_path . "/" . $p_entry['filename'];
     }
     
     // ----- Check a base_dir_restriction
@@ -3685,7 +3685,7 @@ 
       if ($v_inclusion == 0) {
 
         PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
+			                     "Filename '" . $p_entry['filename'] . "' is "
 								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
 
         return PclZip::errorCode();
@@ -3740,11 +3740,11 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
         // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
+			                     "Filename '" . $p_entry['filename'] . "' is "
 								 ."already used by an existing directory");
 
             return PclZip::errorCode();
@@ -3760,11 +3760,11 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
         // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
+			                     "Filename '" . $p_entry['filename'] . "' exists "
 								 ."and is write protected");
 
             return PclZip::errorCode();
@@ -3775,8 +3775,8 @@ 
       else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
       {
         // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
 	  	  }
 		    else {
             $p_entry['status'] = "newer_exist";
@@ -3784,11 +3784,11 @@ 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
             // For historical reason first PclZip implementation does not stop
             // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+            if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
+			             "Newer version of '" . $p_entry['filename'] . "' exists "
 					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
 
                 return PclZip::errorCode();
@@ -3801,14 +3801,14 @@ 
 
     // ----- Check the directory availability and create it if necessary
     else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
+      if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/'))
         $v_dir_to_check = $p_entry['filename'];
       else if (!strstr($p_entry['filename'], "/"))
         $v_dir_to_check = "";
       else
         $v_dir_to_check = dirname($p_entry['filename']);
 
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
   
           // ----- Change the file status
           $p_entry['status'] = "path_creation_fail";
@@ -3824,7 +3824,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010))
       {
         // ----- Look for not compressed file
         if ($p_entry['compression'] == 0) {
@@ -3867,16 +3867,16 @@ 
           // ----- TBC
           // Need to be finished
           if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
+            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
             return PclZip::errorCode();
           }
 
 
           // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+          if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
               && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                   || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
+                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
             $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
             if ($v_result < PCLZIP_ERR_NO_ERROR) {
               return $v_result;
@@ -3971,13 +3971,13 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
         
     // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
     if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
       fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
       return PclZip::errorCode();
     }
 
@@ -4014,7 +4014,7 @@ 
     if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
       @fclose($v_dest_file);
       $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
       return PclZip::errorCode();
     }
 
@@ -4047,7 +4047,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
@@ -4096,7 +4096,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
 
@@ -4159,7 +4159,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     $v_header = array();
@@ -4210,7 +4210,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
   //      if ($p_entry['compressed_size'] == $p_entry['size'])
         if ($p_entry['compression'] == 0) {
@@ -4282,7 +4282,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4309,7 +4309,7 @@ 
       $p_header['status'] = "invalid_header";
 
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
 
       // ----- Return
       return PclZip::errorCode();
@@ -4346,7 +4346,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4385,7 +4385,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4412,7 +4412,7 @@ 
       $p_header['status'] = "invalid_header";
 
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
 
       // ----- Return
       return PclZip::errorCode();
@@ -4449,7 +4449,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4493,7 +4493,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
   	// ----- Check the static values
   	// TBC
@@ -4530,7 +4530,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->zipname);
@@ -4538,7 +4538,7 @@ 
     if (@ftell($this->zip_fd) != $v_size)
     {
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
 
       // ----- Return
       return PclZip::errorCode();
@@ -4548,11 +4548,11 @@ 
     // in this case the end of central dir is at 22 bytes of the file end
     $v_found = 0;
     if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+      @fseek($this->zip_fd, $v_size - 22);
+      if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22))
       {
         // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
 
         // ----- Return
         return PclZip::errorCode();
@@ -4575,11 +4575,11 @@ 
       $v_maximum_size = 65557; // 0xFFFF + 22;
       if ($v_maximum_size > $v_size)
         $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
+      @fseek($this->zip_fd, $v_size - $v_maximum_size);
+      if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size))
       {
         // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
 
         // ----- Return
         return PclZip::errorCode();
@@ -4597,7 +4597,7 @@ 
         //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
         // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
         // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
+        $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
 
         // ----- Compare the bytes
         if ($v_bytes == 0x504b0506)
@@ -4629,7 +4629,7 @@ 
     {
 
       // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : " . strlen($v_binary_data));
 
       // ----- Return
       return PclZip::errorCode();
@@ -4687,11 +4687,11 @@ 
   // --------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -4727,7 +4727,7 @@ 
     // ----- Read each entry
     $v_header_list = array();
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read the file header
@@ -4748,22 +4748,22 @@ 
       $v_found = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
                   // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                  elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */
+                          && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
               }
@@ -4787,7 +4787,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
@@ -4796,20 +4796,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                   $v_found = true;
               }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -4833,7 +4833,7 @@ 
     if ($v_nb_extracted > 0) {
 
         // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
 
         // ----- Creates a temporary zip archive
         $v_temp_zip = new PclZip($v_zip_temp_name);
@@ -4847,11 +4847,11 @@ 
         }
 
         // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
 
             // ----- Calculate the position of the header
             @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+            if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
                 // ----- Close the zip file
                 $this->privCloseFd();
                 $v_temp_zip->privCloseFd();
@@ -4910,7 +4910,7 @@ 
         $v_offset = @ftell($v_temp_zip->zip_fd);
 
         // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
             if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
                 $v_temp_zip->privCloseFd();
@@ -4933,7 +4933,7 @@ 
         }
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
         if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
@@ -4995,15 +4995,15 @@ 
   //    1 : OK
   //   -1 : Unable to create directory
   // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
+  function privDirCheck($p_dir, $p_is_dir = false)
   {
     $v_result = 1;
 
 
     // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    if (($p_is_dir) && (substr($p_dir, -1) == '/'))
     {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+      $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
     }
 
     // ----- Check the directory availability
@@ -5052,7 +5052,7 @@ 
   // --------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the archive_to_add exists
     if (!is_file($p_archive_to_add->zipname))
@@ -5077,7 +5077,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5095,7 +5095,7 @@ 
     @rewind($this->zip_fd);
 
     // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+    if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1)
     {
       $this->privCloseFd();
 
@@ -5117,7 +5117,7 @@ 
     @rewind($p_archive_to_add->zip_fd);
 
     // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
 
     // ----- Open the temporary file in write mode
     if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
@@ -5125,7 +5125,7 @@ 
       $this->privCloseFd();
       $p_archive_to_add->privCloseFd();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
 
       // ----- Return
       return PclZip::errorCode();
@@ -5176,10 +5176,10 @@ 
     }
 
     // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
+    $v_comment = $v_central_dir['comment'] . ' ' . $v_central_dir_to_add['comment'];
 
     // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+    $v_size = @ftell($v_zip_temp_fd) - $v_offset;
 
     // ----- Swap the file descriptor
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
@@ -5189,7 +5189,7 @@ 
     $v_zip_temp_fd = $v_swap;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
     {
       $this->privCloseFd();
       $p_archive_to_add->privCloseFd();
@@ -5237,7 +5237,7 @@ 
   // --------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the $p_archive_filename exists
     if (!is_file($p_archive_filename))
@@ -5251,7 +5251,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
+    if (($v_result = $this->privOpenFd('wb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5262,7 +5262,7 @@ 
     {
       $this->privCloseFd();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
 
       // ----- Return
       return PclZip::errorCode();
@@ -5295,7 +5295,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
+  function privErrorLog($p_error_code = 0, $p_error_string = '')
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
@@ -5332,10 +5332,10 @@ 
   // --------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
+    if ((!function_exists("get_magic_quotes_runtime"))
 	    || (!function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
@@ -5366,10 +5366,10 @@ 
   // --------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
+    if ((!function_exists("get_magic_quotes_runtime"))
 	    || (!function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
@@ -5410,7 +5410,7 @@ 
 
       // ----- Study directories from last to first
       $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+      for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
         // ----- Look for current path
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
@@ -5422,7 +5422,7 @@ 
         else if ($v_list[$i] == "") {
 		  // ----- First '/' i.e. root slash
 		  if ($i == 0) {
-            $v_result = "/".$v_result;
+            $v_result = "/" . $v_result;
 		    if ($v_skip > 0) {
 		        // ----- It is an invalid path, so the path is not modified
 		        // TBC
@@ -5431,7 +5431,7 @@ 
 		    }
 		  }
 		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
+		  else if ($i == (sizeof($v_list) - 1)) {
             $v_result = $v_list[$i];
 		  }
 		  // ----- Double '/' inside the path
@@ -5446,7 +5446,7 @@ 
 		    $v_skip--;
 		  }
 		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+            $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? "/" . $v_result : "");
 		  }
         }
       }
@@ -5454,7 +5454,7 @@ 
       // ----- Look for skip
       if ($v_skip > 0) {
         while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
+            $v_result = '../' . $v_result;
             $v_skip--;
         }
       }
@@ -5485,13 +5485,13 @@ 
     $v_result = 1;
     
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+    if (($p_dir == '.')
+        || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
+      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE) . '/' . substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+    if (($p_path == '.')
+        || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
+      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE) . '/' . substr($p_path, 1);
     }
 
     // ----- Explode dir and path by directory separator
@@ -5516,7 +5516,7 @@ 
       }
 
       // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
         $v_result = 0;
       }
 
@@ -5557,11 +5557,11 @@ 
   //             3 : src & dest gzip
   // Return Values :
   // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
   {
     $v_result = 1;
 
-    if ($p_mode==0)
+    if ($p_mode == 0)
     {
       while ($p_size != 0)
       {
@@ -5571,7 +5571,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==1)
+    else if ($p_mode == 1)
     {
       while ($p_size != 0)
       {
@@ -5581,7 +5581,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==2)
+    else if ($p_mode == 2)
     {
       while ($p_size != 0)
       {
@@ -5591,7 +5591,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==3)
+    else if ($p_mode == 3)
     {
       while ($p_size != 0)
       {
@@ -5655,7 +5655,7 @@ 
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
 	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
+	    if ((($v_prefix == 'PCLZIP_OPT')
            || ($v_prefix == 'PCLZIP_CB_')
            || ($v_prefix == 'PCLZIP_ATT'))
 	        && ($v_list[$v_key] == $p_option)) {
@@ -5680,15 +5680,15 @@ 
   // Return Values :
   //   The path translated.
   // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
+  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
   {
     if (stristr(php_uname(), 'windows')) {
       // ----- Look for potential disk letter
       if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
+          $p_path = substr($p_path, $v_position + 1);
       }
       // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
           $p_path = strtr($p_path, '\\', '/');
       }
     }

Braces +118 added lines, -159 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 // --------------------------------------------------------------------------------
 // PhpConcept Library - Zip Module 2.8.2
 // --------------------------------------------------------------------------------
@@ -330,8 +332,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
 		                       "Invalid number / type of arguments");
           return 0;
@@ -380,8 +381,7 @@ 
       foreach ($v_string_list as $v_string) {
         if ($v_string != '') {
           $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
+        } else {
         }
       }
     }
@@ -515,8 +515,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -792,8 +791,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -937,8 +935,7 @@ 
         }
         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
           $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
+        } else {
         }
       }
 
@@ -953,8 +950,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -1190,8 +1186,7 @@ 
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
         $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
+      } else {
         // ----- Duplicate the archive
         $v_result = $this->privDuplicate($p_archive);
       }
@@ -1279,8 +1274,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorCode());
-    }
-    else {
+    } else {
       return($this->error_code);
     }
   }
@@ -1318,15 +1312,13 @@ 
 
     if (isset($v_name[$this->error_code])) {
       $v_value = $v_name[$this->error_code];
-    }
-    else {
+    } else {
       $v_value = 'NoName';
     }
 
     if ($p_with_code) {
       return($v_value.' ('.$this->error_code.')');
-    }
-    else {
+    } else {
       return($v_value);
     }
   }
@@ -1341,12 +1333,10 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
-    }
-    else {
+    } else {
       if ($p_full) {
         return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
+      } else {
         return($this->error_string." [code ".$this->error_code."]");
       }
     }
@@ -1531,8 +1521,7 @@ 
               && ($p_options_list[$i+1] != '')) {
             $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
             $i++;
-          }
-          else {
+          } else {
           }
         break;
 
@@ -1550,11 +1539,9 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
+          } else if (is_array($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1583,8 +1570,7 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1613,8 +1599,7 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
 			                     "Wrong parameter value for option '"
@@ -1647,14 +1632,11 @@ 
 
               // ----- Parse items
               $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
+          } else if (is_integer($p_options_list[$i+1])) {
               $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
+          } else if (is_array($p_options_list[$i+1])) {
               $v_work_list = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1681,13 +1663,11 @@ 
                   // ----- Set the option value
                   $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
                   $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
+              } elseif ($v_size_item_list == 2) {
                   // ----- Set the option value
                   $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
                   $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
+              } else {
                   // ----- Error log
                   PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1843,14 +1823,17 @@ 
     $v_memory_limit = trim($v_memory_limit);
     $last = strtolower(substr($v_memory_limit, -1));
  
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+    if($last == 'g') {
+            //$v_memory_limit = $v_memory_limit*1024*1024*1024;
         $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
+    }
+    if($last == 'm') {
+            //$v_memory_limit = $v_memory_limit*1024*1024;
         $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+    }
+    if($last == 'k') {
+            $v_memory_limit = $v_memory_limit*1024;
+    }
             
     $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
     
@@ -2023,15 +2006,12 @@ 
       if (file_exists($v_descr['filename'])) {
         if (@is_file($v_descr['filename'])) {
           $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
+        } else if (@is_dir($v_descr['filename'])) {
           $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
+        } else if (@is_link($v_descr['filename'])) {
           // skip
           continue;
-        }
-        else {
+        } else {
           // skip
           continue;
         }
@@ -2080,8 +2060,7 @@ 
                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
               if ($v_descr['stored_filename'] != '') {
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
+              } else {
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
               }
             }
@@ -2090,8 +2069,7 @@ 
           }
           
           @closedir($v_folder_handler);
-        }
-        else {
+        } else {
           // TBC : unable to open folder in read mode
         }
         
@@ -2104,8 +2082,7 @@ 
           
           // ----- Concat the resulting list
           $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
+        } else {
         }
           
         // ----- Free local array
@@ -2379,8 +2356,9 @@ 
   {
     $v_result=1;
 
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
+    if ($this->zip_fd != 0) {
+          @fclose($this->zip_fd);
+    }
     $this->zip_fd = 0;
 
     // ----- Return
@@ -2597,11 +2575,9 @@ 
     // ----- Look for filetime
     if (isset($p_filedescr['mtime'])) {
       $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
+    } else if ($p_filedescr['type'] == 'virtual_file') {
       $p_header['mtime'] = time();
-    }
-    else {
+    } else {
       $p_header['mtime'] = filemtime($p_filename);
     }
 
@@ -2609,8 +2585,7 @@ 
     if (isset($p_filedescr['comment'])) {
       $p_header['comment_len'] = strlen($p_filedescr['comment']);
       $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
+    } else {
       $p_header['comment_len'] = 0;
       $p_header['comment'] = '';
     }
@@ -2921,20 +2896,17 @@ 
     $p_filename = $p_filedescr['filename'];
     if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
       $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
+    } else {
       $p_add_dir = '';
     }
     if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
       $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
+    } else {
       $p_remove_dir = '';
     }
     if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
       $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
+    } else {
       $p_remove_all_dir = 0;
     }
 
@@ -2957,8 +2929,7 @@ 
           $v_dir = $v_path_info['dirname'].'/';
         }
         $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
+      } else {
         // ----- Calculate the stored filename
         $v_stored_filename = $p_filename;
       }
@@ -2969,8 +2940,9 @@ 
       }
       // ----- Look for partial path remove
       else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
+        if (substr($p_remove_dir, -1) != '/') {
+                  $p_remove_dir .= "/";
+        }
 
         if (   (substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
@@ -2990,8 +2962,7 @@ 
         if ($v_compare > 0) {
           if ($v_compare == 2) {
             $v_stored_filename = "";
-          }
-          else {
+          } else {
             $v_stored_filename = substr($v_stored_filename,
                                         strlen($p_remove_dir));
           }
@@ -3003,10 +2974,11 @@ 
       
       // ----- Look for path to add
       if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        if (substr($p_add_dir, -1) == "/") {
+                  $v_stored_filename = $p_add_dir.$v_stored_filename;
+        } else {
+                  $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        }
       }
     }
 
@@ -3289,8 +3261,9 @@ 
     if (   ($p_path == "")
 	    || (   (substr($p_path, 0, 1) != "/")
 		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
+			&& (substr($p_path,1,2)!=":/"))) {
+          $p_path = "./".$p_path;
+    }
 
     // ----- Reduce the path last (and duplicated) '/'
     if (($p_path != "./") && ($p_path != "/"))
@@ -3777,8 +3750,7 @@ 
         // ----- Change the file status
         if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
 		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
+	  	  } else {
             $p_entry['status'] = "newer_exist";
 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
@@ -3794,19 +3766,19 @@ 
                 return PclZip::errorCode();
 		      }
 		    }
-      }
-      else {
+      } else {
       }
     }
 
     // ----- Check the directory availability and create it if necessary
     else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
+      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+              $v_dir_to_check = $p_entry['filename'];
+      } else if (!strstr($p_entry['filename'], "/")) {
+              $v_dir_to_check = "";
+      } else {
+              $v_dir_to_check = dirname($p_entry['filename']);
+      }
 
         if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
   
@@ -3862,8 +3834,7 @@ 
           touch($p_entry['filename'], $p_entry['mtime']);
           
 
-        }
-        else {
+        } else {
           // ----- TBC
           // Need to be finished
           if (($p_entry['flag'] & 1) == 1) {
@@ -4106,8 +4077,7 @@ 
           // ----- Send the file to the output
           echo $v_buffer;
           unset($v_buffer);
-        }
-        else {
+        } else {
 
           // ----- Read the compressed file in a buffer (one shot)
           $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4217,8 +4187,7 @@ 
   
           // ----- Reading the file
           $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
+        } else {
   
           // ----- Reading the file
           $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4230,8 +4199,7 @@ 
         }
   
         // ----- Trace
-      }
-      else {
+      } else {
           // TBC : error : can not extract a folder in a string
       }
       
@@ -4324,8 +4292,7 @@ 
     // ----- Get extra_fields
     if ($v_data['extra_len'] != 0) {
       $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
+    } else {
       $p_header['extra'] = '';
     }
 
@@ -4356,8 +4323,7 @@ 
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
+    } else
     {
       $p_header['mtime'] = time();
     }
@@ -4422,22 +4388,25 @@ 
     $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
 
     // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
+    if ($p_header['filename_len'] != 0) {
+          $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+    } else {
+          $p_header['filename'] = '';
+    }
 
     // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
+    if ($p_header['extra_len'] != 0) {
+          $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+    } else {
+          $p_header['extra'] = '';
+    }
 
     // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
+    if ($p_header['comment_len'] != 0) {
+          $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+    } else {
+          $p_header['comment'] = '';
+    }
 
     // ----- Extract properties
 
@@ -4459,8 +4428,7 @@ 
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
+    } else
     {
       $p_header['mtime'] = time();
     }
@@ -4573,8 +4541,9 @@ 
     // ----- Go back to the maximum possible size of the Central Dir End Record
     if (!$v_found) {
       $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
+      if ($v_maximum_size > $v_size) {
+              $v_maximum_size = $v_size;
+      }
       @fseek($this->zip_fd, $v_size-$v_maximum_size);
       if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
       {
@@ -4659,9 +4628,9 @@ 
     // ----- Get comment
     if ($v_data['comment_size'] != 0) {
       $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+    } else {
+          $p_central_dir['comment'] = '';
     }
-    else
-      $p_central_dir['comment'] = '';
 
     $p_central_dir['entries'] = $v_data['entries'];
     $p_central_dir['disk_entries'] = $v_data['disk_entries'];
@@ -4761,8 +4730,7 @@ 
                   if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+                  } elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
@@ -4813,8 +4781,7 @@ 
                   break;
               }
           }
-      }
-      else {
+      } else {
       	$v_found = true;
       }
 
@@ -4822,8 +4789,7 @@ 
       if ($v_found)
       {
         unset($v_header_list[$v_nb_extracted]);
-      }
-      else
+      } else
       {
         $v_nb_extracted++;
       }
@@ -5299,8 +5265,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
-    }
-    else {
+    } else {
       $this->error_code = $p_error_code;
       $this->error_string = $p_error_string;
     }
@@ -5316,8 +5281,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclErrorReset();
-    }
-    else {
+    } else {
       $this->error_code = 0;
       $this->error_string = '';
     }
@@ -5415,11 +5379,9 @@ 
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
           // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
+        } else if ($v_list[$i] == "..") {
 		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
+        } else if ($v_list[$i] == "") {
 		  // ----- First '/' i.e. root slash
 		  if ($i == 0) {
             $v_result = "/".$v_result;
@@ -5439,13 +5401,11 @@ 
             // ----- Ignore only the double '//' in path,
             // but not the first and last '/'
 		  }
-        }
-        else {
+        } else {
 		  // ----- Look for item to skip
 		  if ($v_skip > 0) {
 		    $v_skip--;
-		  }
-		  else {
+		  } else {
             $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
 		  }
         }
@@ -5528,14 +5488,17 @@ 
     // ----- Look if everything seems to be the same
     if ($v_result) {
       // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+      	$j++;
+      }
+      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+      	$i++;
+      }
 
       if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
         // ----- There are exactly the same
         $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
+      } else if ($i < $v_list_dir_size) {
         // ----- The path is shorter than the dir
         $v_result = 0;
       }
@@ -5570,8 +5533,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==1)
+    } else if ($p_mode==1)
     {
       while ($p_size != 0)
       {
@@ -5580,8 +5542,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==2)
+    } else if ($p_mode==2)
     {
       while ($p_size != 0)
       {
@@ -5590,8 +5551,7 @@ 
         @gzwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==3)
+    } else if ($p_mode==3)
     {
       while ($p_size != 0)
       {
@@ -5629,8 +5589,7 @@ 
       // ----- Try to copy & unlink the src
       if (!@copy($p_src, $p_dest)) {
         $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
+      } else if (!@unlink($p_src)) {
         $v_result = 0;
       }
     }

includes/modules/wps_barcode/librairies/odtphp/zip/PclZipProxy.php

Doc Comments +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
 	 * Open a Zip archive
 	 * 
 	 * @param string $filename the name of the archive to open
-	 * @return true if openning has succeeded
+	 * @return boolean if openning has succeeded
 	 */	
 	public function open($filename)
 	{
@@ -78,7 +78,7 @@ 
 	 * 
 	 * @param string $localname the local path to the file in the archive
 	 * @param string $contents the content of the file
-	 * @return true if the file has been successful added
+	 * @return boolean if the file has been successful added
 	 */	
 	public function addFromString($localname, $contents)
 	{
@@ -108,7 +108,7 @@ 
 	 * 
 	 * @param string $filename the path to the file we want to add
 	 * @param string $localname the local path to the file in the archive
-	 * @return true if the file has been successful added
+	 * @return boolean if the file has been successful added
 	 */	
 	public function addFile($filename, $localname = null)
 	{
@@ -141,7 +141,7 @@ 
 	}
 	/**
 	 * Close the Zip archive
-	 * @return true
+	 * @return boolean
 	 */	
 	public function close()
 	{
@@ -158,7 +158,7 @@ 
 	}
 	/**
 	 * Empty the temporary working directory recursively
-	 * @param $dir the temporary working directory
+	 * @param string $dir the temporary working directory
 	 * @return void
 	 */
 	private function _rrmdir($dir)

Indentation +5 added lines, -5 removed lines

@@ -23,11 +23,11 @@
 	protected $openned = false;
 	protected $filename;
 	protected $pclzip;
-    /**
-     * Class constructor
-     *
-     * @throws PclZipProxyException
-     */
+	/**
+	 * Class constructor
+	 *
+	 * @throws PclZipProxyException
+	 */
 	public function __construct()
 	{
 		if (! class_exists('PclZip')) {

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 require_once 'pclzip/pclzip.lib.php';
 require_once 'ZipInterface.php';
 class PclZipProxyException extends Exception
@@ -30,7 +30,7 @@ 
      */
 	public function __construct()
 	{
-		if (! class_exists('PclZip')) {
+		if (!class_exists('PclZip')) {
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
 			 is required for using PclZipProxy'); ;
 		}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 require_once 'pclzip/pclzip.lib.php';
 require_once 'ZipInterface.php';
 class PclZipProxyException extends Exception

script/wp-emulator.script.php

Indentation +3 added lines, -3 removed lines

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

Spacing +35 added lines, -35 removed lines

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

Braces +15 added lines, -6 removed lines

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

script/unit.script.php

Spacing +2 added lines, -2 removed lines

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

includes/librairies/eav/wp_list_custom_attributes.class.php

Indentation +8 added lines, -8 removed lines

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

Braces +3 added lines, -1 removed lines

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

Spacing +49 added lines, -49 removed lines

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

includes/librairies/eav/wp_list_custom_attributes_set.class.php

Indentation +203 added lines, -203 removed lines

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

Spacing +42 added lines, -42 removed lines

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

Braces +6 added lines, -3 removed lines

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

includes/librairies/eav/attributes.class.php

Indentation +1 added lines, -1 removed lines

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

Doc Comments +10 added lines, -8 removed lines

@@ -46,6 +46,7 @@ 
 	/**
 	 *	Get the url listing slug of the current class
 	 *
+	 *	@param string $message
 	 *	@return string The table of the class
 	 */
 	function setMessage($message){
@@ -1244,7 +1245,7 @@ 
 	 *
 	 *	@param integer $element_id optionnal The attribute identifier we want to get. If not specify the entire list will be returned
 	 *	@param string $element_status optionnal The status of element to get into database. Default is set to valid element
-	 *	@param mixed $field_to_search optionnal The field we want to check the row identifier into. Default is to set id
+	 *	@param string $field_to_search optionnal The field we want to check the row identifier into. Default is to set id
 	 *
 	 *	@return object $element_list A wordpress database object containing the attribute list
 	 */
@@ -1484,9 +1485,6 @@ 
 	 *	Get the existing element list into database
 	 *
 	 *	@param integer $elementId optionnal The element identifier we want to get. If not specify the entire list will be returned
-	 *	@param string $elementStatus optionnal The status of element to get into database. Default is set to valid element
-	 *
-	 *	@return object $elements A wordpress database object containing the element list
 	 */
 	public static function getElementWithAttributeAndValue($entityId, $elementId, $language, $keyForArray = '', $outputType = '') {
 		global $wpdb;
@@ -1625,7 +1623,7 @@ 
 	/**
 	 * Traduit le shortcode et affiche la valeur d'un attribut donn�
 	 * @param array $atts : tableau de param�tre du shortcode
-	 * @return mixed
+	 * @return string|null
 	 **/
 	public static function wpshop_att_val_func($atts) {
 		global $wpdb;
@@ -1914,7 +1912,7 @@ 
 
 	/**
 	 *
-	 * @param array $attribute_list
+	 * @param array $attribute_code
 	 * @param string $output_from
 	 * @return string The output for
 	 */
@@ -2455,6 +2453,12 @@ 
 		return $affected_value;
 	}
 
+	/**
+	 * @param string $attr_code
+	 * @param string $attr_option
+	 *
+	 * @return string
+	 */
 	public static function get_attribute_option_output($item, $attr_code, $attr_option, $additionnal_params = '') {
 		switch($attr_code){
 			case 'is_downloadable_':
@@ -3187,7 +3191,6 @@ 
 	 * Define the different field available for bulk edition for entities. Attributes to display are defined by checking box in attribute option
 	 *
 	 * @param string $column_name The column name for output type definition
-	 * @param string $post_type The current
 	 *
 	 */
 	function quick_edit( $column_name, $entity ) {
@@ -3212,7 +3215,6 @@ 
 	 * Define the different field available for bulk edition for entities. Attributes to display are defined by checking box in attribute option
 	 *
 	 * @param string $column_name The column name for output type definition
-	 * @param string $post_type The current
 	 *
 	 */
 	public static function bulk_edit( $column_name, $entity ) {

Spacing +557 added lines, -557 removed lines

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

Braces +156 added lines, -171 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -92,12 +94,12 @@ 
 			if(($action == 'edit') || ($action == 'delete')){
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label));
+			} elseif($action == 'add') {
+							$title = __(self::pageAddingTitle, 'wpshop');
 			}
-			elseif($action == 'add')
-				$title = __(self::pageAddingTitle, 'wpshop');
+		} elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())) {
+					$title = __(self::pageAddingTitle, 'wpshop');
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug()))
-			$title = __(self::pageAddingTitle, 'wpshop');
 
 		return $title;
 	}
@@ -128,14 +130,15 @@ 
 		if(($action != '') && ($action == 'saveok') && ($saveditem > 0)){
 			$editedElement = self::getElement($saveditem);
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
-		}
-		elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0)){
+		} elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0)){
 			$editedElement = self::getElement($saveditem, "'deleted'");
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully deleted', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
 		}
 
 		$attribute_parameter = !empty( $_REQUEST[self::getDbTable()] ) ? (array)$_REQUEST[self::getDbTable()] : array();
-		 if ( !empty($set_section) ) unset($attribute_parameter['set_section']);
+		 if ( !empty($set_section) ) {
+		 	unset($attribute_parameter['set_section']);
+		 }
 
 		$wpshop_attribute_combo_values_list_order_def = !empty($attribute_parameter['wpshop_attribute_combo_values_list_order_def']) ? $attribute_parameter['wpshop_attribute_combo_values_list_order_def'] : array();
 		// @TODO $_REQUEST
@@ -195,66 +198,82 @@ 
 			switch ($attribute_parameter['frontend_input']) {
 				case 'short_text':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 				case 'date_field':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'datetime';
 					break;
 				case 'float_field':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'decimal';
 					break;
 				case 'hidden_field':
 						$attribute_parameter['frontend_input'] = 'hidden';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 				case 'pass_field':
 						$attribute_parameter['frontend_input'] = 'password';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if ( empty($attribute_parameter['backend_input']) ) {
+							$attribute_parameter['backend_input'] = 'text';
+						}
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 
 				case 'select':
 						$attribute_parameter['frontend_input'] = 'select';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'multiple-select';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'multiple-select';
+						}
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'multiple-select':
 						$attribute_parameter['frontend_input'] = 'multiple-select';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'multiple-select';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'multiple-select';
+						}
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'radio':
 						$attribute_parameter['frontend_input'] = 'radio';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'multiple-select';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'multiple-select';
+						}
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'checkbox':
 						$attribute_parameter['frontend_input'] = 'checkbox';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'multiple-select';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'multiple-select';
+						}
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 
 				case 'textarea':
 						$attribute_parameter['frontend_input'] = 'textarea';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
-							$attribute_parameter['backend_input'] = 'textarea';
+						if ( empty($attribute_parameter['backend_input']) || empty($id) ) {
+													$attribute_parameter['backend_input'] = 'textarea';
+						}
 						$attribute_parameter['data_type'] = 'text';
 					break;
 			}
-		}
-		else {
+		} else {
 			$attribute_parameter['frontend_input'] = 'text';
-			if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+			if ( empty($attribute_parameter['backend_input']) ) {
+				$attribute_parameter['backend_input'] = 'text';
+			}
 			$attribute_parameter['data_type'] = 'varchar';
 		}
 
@@ -289,22 +308,18 @@ 
 					if(!in_array($attribute_code, $attribute_undeletable)){
 						if(current_user_can('wpshop_delete_attributes')){
 							$attribute_parameter['status'] = 'deleted';
-						}
-						else{
+						} else{
 							$actionResult = 'userNotAllowedForActionDelete';
 						}
-					}
-					else{
+					} else{
 						$actionResult = 'unDeletableAtribute';
 					}
 				}
 				$actionResult = wpshop_database::update($attribute_parameter, $id, self::getDbTable());
-			}
-			else{
+			} else{
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
-		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
+		} elseif(($pageAction != '') && (($pageAction == 'delete'))){
 			$attribute_code = '';
 			if (empty(	$attribute_parameter['code'])) {
 				$attribute = self::getElement($id, "'valid', 'moderated', 'notused', 'deleted'", 'id');
@@ -315,14 +330,13 @@ 
 					$attribute_parameter['last_update_date'] = current_time('mysql', 0);
 					$attribute_parameter['status'] = 'deleted';
 					$actionResult = wpshop_database::update($attribute_parameter, $id, self::getDbTable());
+				} else {
+									$actionResult = 'userNotAllowedForActionDelete';
 				}
-				else
-					$actionResult = 'userNotAllowedForActionDelete';
+			} else {
+							$actionResult = 'unDeletableAtribute';
 			}
-			else
-				$actionResult = 'unDeletableAtribute';
-		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
+		} elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
 			if(current_user_can('wpshop_add_attributes')){
 				$attribute_parameter['creation_date'] = current_time('mysql', 0);
 				if(trim($attribute_parameter['code']) == ''){
@@ -335,8 +349,7 @@ 
 				}
 				$actionResult = wpshop_database::save($attribute_parameter, self::getDbTable());
 				$id = $wpdb->insert_id;
-			}
-			else{
+			} else{
 				$actionResult = 'userNotAllowedForActionAdd';
 			}
 		}
@@ -347,11 +360,12 @@ 
 		/****************************************************************************/
 		if($actionResult != ''){
 			$elementIdentifierForMessage = __('the attribute', 'wpshop');
-			if(!empty($attribute_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_parameter['frontend_label'] . '</span>';
+			if(!empty($attribute_parameter['name'])) {
+				$elementIdentifierForMessage = '<span class="bold" >' . $attribute_parameter['frontend_label'] . '</span>';
+			}
 			if ($actionResult == 'error') {/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . sprintf(__('An error occured while saving %s', 'wpshop'), $elementIdentifierForMessage, ' -> ' . $wpdb->last_error);
-			}
-			else if (($actionResult == 'done') || ($actionResult == 'nothingToUpdate')) {/*	CHANGE HERE FOR SPECIFIC CASE	*/
+			} else if (($actionResult == 'done') || ($actionResult == 'nothingToUpdate')) {/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				/*****************************************************************************************************************/
 				/*************************			CHANGE FOR SPECIFIC ACTION FOR CURRENT ELEMENT				****************************/
 				/*****************************************************************************************************************/
@@ -370,8 +384,7 @@ 
 					if (empty($attribute_parameter['code'])) {
 						$attribute = self::getElement($id, "'valid', 'moderated', 'notused'", 'id');
 						$attribute_code = $attribute->code;
-					}
-					else {
+					} else {
 						$attribute_code = $attribute_parameter['code'];
 					}
 					foreach ($optionsUpdate as $option_key => $option_label) {
@@ -462,8 +475,7 @@ 
 						$choosen_set_section = explode('_', $set_section);
 						$set_id = $choosen_set_section[0];
 						$group_id = $choosen_set_section[1];
-					}
-					else{
+					} else{
 						$attribute_current_attribute_set = 0;
 						$query = $wpdb->prepare("
 								SELECT id
@@ -511,7 +523,9 @@ 
 								$attribute_parameter['entity_id']
 						);
 						$wpshopAttributePosition = $wpdb->get_var($query);
-						if($wpshopAttributePosition == 0)$wpshopAttributePosition = 1;
+						if($wpshopAttributePosition == 0) {
+							$wpshopAttributePosition = 1;
+						}
 						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attribute_parameter['entity_id'], 'attribute_set_id' => $set_id, 'attribute_group_id' => $group_id, 'attribute_id' => $id, 'position' => $wpshopAttributePosition));
 					}
 				}
@@ -532,15 +546,14 @@ 
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=saveok&saveditem=" . $id));
 				}
 				else */
-				if ( $pageAction == 'add' )
-					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
-				elseif ( $pageAction == 'delete' )
-					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=deleteok&saveditem=" . $id));
-			}
-			elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete')){
+				if ( $pageAction == 'add' ) {
+									wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
+				} elseif ( $pageAction == 'delete' ) {
+									wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=deleteok&saveditem=" . $id));
+				}
+			} elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete')){
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('You are not allowed to do this action', 'wpshop');
-			}
-			elseif(($actionResult == 'unDeletableAtribute')){
+			} elseif(($actionResult == 'unDeletableAtribute')){
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('This attribute could not be deleted due to configuration', 'wpshop');
 			}
 
@@ -585,8 +598,7 @@ 
 		if ( !empty($s) ) {
 			$query = $wpdb->prepare("SELECT * FROM " . self::dbTable . ' WHERE frontend_label LIKE "%%%1$s%%" OR frontend_label LIKE "%%%2$s%%" AND backend_label LIKE "%%%1$s%%" OR backend_label LIKE "%%%2$s%%" AND code LIKE "%%%1$s%%" OR code LIKE "%%%2$s%%"', $s, __($s, 'wpshop') );
 			$attr_set_list = $wpdb->get_results( $query );
-		}
-		else {
+		} else {
 			$attr_set_list = self::getElement( '', $status );
 		}
 		$i=0;
@@ -640,8 +652,9 @@ 
 		global $attribute_displayed_field, $attribute_options_group;
 		$dbFieldList = wpshop_database::fields_to_input(self::getDbTable());
 		$editedItem = '';
-		if($itemToEdit != '')
-			$editedItem = self::getElement($itemToEdit);
+		if($itemToEdit != '') {
+					$editedItem = self::getElement($itemToEdit);
+		}
 
 		$the_form_content_hidden = $the_form_general_content = '';
 		$the_form_option_content_list = array();
@@ -654,10 +667,11 @@ 
 				$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : '';
 				$requestFormValue = isset($_REQUEST[self::currentPageCode][$input_def['label']]) ? sanitize_text_field($_REQUEST[self::currentPageCode][$input_def['label']]) : '';
 				$currentFieldValue = $input_def['value'];
-				if(is_object($editedItem))
-					$currentFieldValue = $editedItem->{$input_def['label']};
-				elseif(($pageAction != '') && ($requestFormValue != ''))
-					$currentFieldValue = $requestFormValue;
+				if(is_object($editedItem)) {
+									$currentFieldValue = $editedItem->{$input_def['label']};
+				} elseif(($pageAction != '') && ($requestFormValue != '')) {
+									$currentFieldValue = $requestFormValue;
+				}
 
 				if($input_def['label'] == 'status'){
 					if(in_array('notused', $input_def['possible_value'])){
@@ -729,9 +743,9 @@ 
 				}
 
 				$input_def['value'] = $currentFieldValue;
-				if($input_def['label'] == 'code')
-					$input_def['type'] = 'hidden';
-				elseif($input_def['label'] == 'entity_id'){
+				if($input_def['label'] == 'code') {
+									$input_def['type'] = 'hidden';
+				} elseif($input_def['label'] == 'entity_id'){
 					$input_def['possible_value'] = wpshop_entities::get_entities_list();
 					$input_def['valueToPut'] = 'index';
 					$input_def['type'] = 'select';
@@ -743,21 +757,17 @@ 
 						}
 						$i++;
 					}
-				}
-				elseif($input_def['label'] == '_unit_group_id'){
+				} elseif($input_def['label'] == '_unit_group_id'){
 					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_group();
 					$input_def['type'] = 'select';
-				}
-				elseif($input_def['label'] == '_default_unit'){
+				} elseif($input_def['label'] == '_default_unit'){
 					$unit_group_list = wpshop_attributes_unit::get_unit_group();
 					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group(!empty($editedItem->_unit_group_id)?$editedItem->_unit_group_id:(!empty($unit_group_list)?$unit_group_list[0]->id:''));
 					$input_def['type'] = 'select';
-				}
-				elseif ($input_def['label'] == 'backend_input') {
+				} elseif ($input_def['label'] == 'backend_input') {
 					if ( !is_object($editedItem) ) {
 						$input_def['type'] = 'hidden';
-					}
-					else {
+					} else {
 						$new_possible_value = array();
 						switch ( $editedItem->data_type) {
 							case 'integer':
@@ -791,8 +801,7 @@ 
 						}
 						$input_def['possible_value'] = $new_possible_value;
 					}
-				}
-				elseif ($input_def['label'] == 'frontend_input') {
+				} elseif ($input_def['label'] == 'frontend_input') {
 					$new_possible_value = array();
 
 					if ( is_object($editedItem) ) {
@@ -826,8 +835,7 @@ 
 									$new_possible_value[__('Date field', 'wpshop')] = 'date_field';
 								break;
 						}
-					}
-					else {
+					} else {
 						$new_possible_value[__('Text field', 'wpshop')] = 'short_text';
 						$new_possible_value[__('Number field', 'wpshop')] = 'float_field';
 						$new_possible_value[__('Date field', 'wpshop')] = 'date_field';
@@ -919,8 +927,7 @@ 
 								$the_input = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
 							break;
 						}
-					}
-					else {
+					} else {
 						$input_def['type']='text';
 						$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
 					}
@@ -947,9 +954,9 @@ 
 			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_'.$input_def['name'].'" ><label for="'.$input_def_id.'" >' . __($input_def['label'], 'wpshop') . '</label></td>
 			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_input wpshop_' . self::currentPageCode . '_edition_table_field_input_'.$input_def['name'].'" >' . $the_input . '</td>
 		</tr>';
-					if ( (substr($input_def['label'], 0, 3) == 'is_') || (substr($input_def['label'], 0, 1) == '_') || in_array($input_def['label'], unserialize( WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS )) )
-						$the_form_option_content_list[$input_def['label']] = $input;
-					else {
+					if ( (substr($input_def['label'], 0, 3) == 'is_') || (substr($input_def['label'], 0, 1) == '_') || in_array($input_def['label'], unserialize( WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS )) ) {
+											$the_form_option_content_list[$input_def['label']] = $input;
+					} else {
 						$the_form_general_content .= $input;
 						if ( ($input_def['label'] == 'frontend_input') && !is_object($editedItem) ) {
 
@@ -963,8 +970,7 @@ 
 							$the_form_general_content .= $input;
 						}
 					}
-				}
-				else{
+				} else{
 					$the_form_content_hidden .= '
 				' . $the_input;
 				}
@@ -1249,17 +1255,18 @@ 
 
 		 //$currentPageButton .= '<h2 class="cancelButton alignleft" ><a href="' . admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . self::getListingSlug()) . '" class="button add-new-h2" >' . __('Back', 'wpshop') . '</a></h2>';
 
-		if(($action == 'add') && (current_user_can('wpshop_add_attributes')))
-			$currentPageButton .= '<input type="button" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
-
-		elseif(current_user_can('wpshop_edit_attributes'))
-		$currentPageButton .= '<input type="button" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
+		if(($action == 'add') && (current_user_can('wpshop_add_attributes'))) {
+					$currentPageButton .= '<input type="button" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
+		} elseif(current_user_can('wpshop_edit_attributes')) {
+				$currentPageButton .= '<input type="button" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
+		}
 
 		$attribute_undeletable = unserialize(WPSHOP_ATTRIBUTE_UNDELETABLE);
 		$attribute = self::getElement($element_id, "'valid', 'moderated', 'notused'", 'id');
 		$attribute_code = !empty($attribute->code)?$attribute->code:'';
-		if(current_user_can('wpshop_delete_attributes') && ($action != 'add') && !in_array($attribute_code, $attribute_undeletable))
-			$currentPageButton .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_'.self::currentPageCode.'" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
+		if(current_user_can('wpshop_delete_attributes') && ($action != 'add') && !in_array($attribute_code, $attribute_undeletable)) {
+					$currentPageButton .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_'.self::currentPageCode.'" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
+		}
 
 		return $currentPageButton;
 	}
@@ -1304,8 +1311,7 @@ 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
 		if(($element_id == '') || $list){
 			$element_list = $wpdb->get_results($query);
-		}
-		else{
+		} else{
 			$element_list = $wpdb->get_row($query);
 		}
 
@@ -1406,8 +1412,7 @@ 
 										foreach($attributeValue as $a){
 											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($query_params, array('value' => $a)));
 										}
-									}
-									else{
+									} else{
 										$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($query_params, array('value' => $attributeValue)));
 										\eoxia\log_class::exec( 'wpshop_attributes', 'wpshop_attributes', __( 'Add the attribute : ' . $currentAttribute->code . ' with value : ' . $attributeValue , 'wpshop' ), array( 'object_id' 	=> $entityId ), 0 );
 									}
@@ -1423,8 +1428,10 @@ 
 										$value = self::get_attribute_type_select_option_info($attributeTypeDetails[$attribute_code], 'value');
 										if (strtolower($value) == 'yes') :
 											update_post_meta($entityId, 'attribute_option_'.$attribute_code, $attribute_option);
-										else :
+										else {
+											:
 											delete_post_meta($entityId, 'attribute_option_'.$attribute_code);
+										}
 										endif;
 									}
 								}
@@ -1493,8 +1500,7 @@ 
 
 		if ( ( (count($attributeValue) <= 1 ) && !empty($attributeValue[0]) ) && ( empty($atribute_params['frontend_input']) || ($atribute_params['frontend_input'] != 'multiple-select') )) {
 			$attributeValue = $attributeValue[0];
-		}
-		else{
+		} else{
 			$entity_meta = get_post_meta($entityId, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
 			if ( !empty($entity_meta) ) {
 				$query = $wpdb->prepare("SELECT code FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE id = %d AND entity_id = %d ", $attributeId, $entityTypeId);
@@ -1560,12 +1566,10 @@ 
 			if ( !empty($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value']) ) {
 				if (is_array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'])) {
 					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'][] = $elementDefinition->$attributeValueField;
-				}
-				else {
+				} else {
 					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'],$elementDefinition->$attributeValueField);
 				}
-			}
-			else {
+			} else {
 				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = $elementDefinition->$attributeValueField;
 			}
 
@@ -1646,17 +1650,14 @@ 
 			if ( ( is_array($attribute_custom_config) && in_array($attribute_or_set, array('attribute', 'attribute_set_section', 'product_action_button')) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes' )
 				 || empty($attribute_custom_config) ) {
 				$attribute_output = true;
-			}
-			else if ( empty($attribute_custom_config[$attribute_or_set][$attribute_code]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) || (!empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'no')) )  {
+			} else if ( empty($attribute_custom_config[$attribute_or_set][$attribute_code]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) || (!empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'no')) )  {
 				$attribute_output = false;
 			}
-		}
-		elseif ( $attribute_main_config === 'no' ) {
+		} elseif ( $attribute_main_config === 'no' ) {
 			$attribute_output = false;
 			if ( empty($attribute_custom_config[$attribute_or_set]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code]) ) {
 				$attribute_output = false;
-			}
-			else if ( !empty($attribute_custom_config) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes') )  {
+			} else if ( !empty($attribute_custom_config) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes') )  {
 				$attribute_output = true;
 			}
 		}
@@ -1674,7 +1675,9 @@ 
 		global $wp_query;
 
 		$attribute = self::getElement( $atts['attid'] );
-		if(empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
+		if(empty($atts['pid'])) {
+			$atts['pid'] = $wp_query->posts[0]->ID;
+		}
 		$attribute_main_config = ( empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet') ) ? $attribute->is_visible_in_front : $attribute->is_visible_in_front_listing;
 		$output_type = ( empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet') ) ? 'complete_sheet' : 'mini_output';
 		$product_attribute_custom_config = get_post_meta($atts['pid'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
@@ -1693,13 +1696,11 @@ 
 					}
 					$has_value = true;
 				}
-			}
-			else {
+			} else {
 				$data = $wpdb->get_var($query);
 				if ( !empty($data) ) {
 					$has_value = true;
-				}
-				elseif( !empty($attribute->default_value) ) {
+				} elseif( !empty($attribute->default_value) ) {
 					$has_value = true;
 					$data = $attribute->default_value;
 				}
@@ -1759,11 +1760,9 @@ 
 
 		if ( !empty($attribute_value) && !is_object($attribute_value) ) {
 			$input_def['value'] = $attribute_value;
-		}
-		else if ( !empty($attribute_value->value) ) {
+		} else if ( !empty($attribute_value->value) ) {
 			$input_def['value'] = stripslashes($attribute_value->value);
-		}
-		else if ( !empty($specific_argument['element_identifier']) && empty($attribute_value) && (get_post_status($specific_argument['element_identifier']) != 'auto-draft') ) {
+		} else if ( !empty($specific_argument['element_identifier']) && empty($attribute_value) && (get_post_status($specific_argument['element_identifier']) != 'auto-draft') ) {
 			$input_def['value'] = '';
 		}
 
@@ -1773,8 +1772,7 @@ 
 			$date_config = unserialize( $attribute->default_value );
 			if ((($date_config['default_value'] == '') || ($date_config['default_value'] == 'date_of_current_day')) && ($date_config['default_value'] == 'date_of_current_day')) {
 				$input_def['value'] = date('Y-m-d');
-			}
-			else {
+			} else {
 				/**	Modification due to a message on eoxia forum: http://www.eoxia.com/forums/topic/bug-attribut-de-type-date-dans-fiche-produit-admin/	*/
 				$input_def['value'] = !empty($attribute_value->value) && is_string($attribute_value->value) ? str_replace( " 00:00:00", "", $attribute_value->value ) : ( !empty($attribute_value) && is_string($attribute_value) ? str_replace( " 00:00:00", "", $attribute_value ) : '' );
 			}
@@ -1879,8 +1877,7 @@ 
 		if((WPSHOP_PRODUCT_PRICE_PILOT == 'HT') && ($attribute->code == WPSHOP_PRODUCT_PRICE_TTC) ){
 			$input_def['option'] .= ' readonly="readonly" ';
 			$input_more_class .= ' wpshop_prices_readonly';
-		}
-		elseif((WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') && ($attribute->code == WPSHOP_PRODUCT_PRICE_HT) ){
+		} elseif((WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') && ($attribute->code == WPSHOP_PRODUCT_PRICE_HT) ){
 			$input_def['option'] .= ' readonly="readonly" ';
 			$input_more_class .= ' wpshop_prices_readonly';
 		}
@@ -1904,14 +1901,12 @@ 
 		if ($attribute->is_requiring_unit == 'yes') {
 			if ( in_array($attribute->code, $wpshop_price_attributes) || ( WPSHOP_COST_OF_POSTAGE == $attribute->code) ) {
 				$input_def['options'] .= '&nbsp;<span class="attribute_currency" id="attribute_currency_' . $attribute->id . '" >' . wpshop_tools::wpshop_get_currency() . '</span>';
-			}
-			elseif ( in_array($attribute->code, $wpshop_weight_attributes) ) {
+			} elseif ( in_array($attribute->code, $wpshop_weight_attributes) ) {
 				$weight_defaut_unity_option = get_option('wpshop_shop_default_weight_unity');
 				$query = $wpdb->prepare('SELECT name FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
 				$unity = $wpdb->get_var( $query );
 				$input_def['options'] .= '&nbsp;<span class="attribute_weight" id="attribute_weight_' . $attribute->id . '" >' . __($unity, 'wpshop') . '</span>';
-			}
-			else {
+			} else {
 				unset($unit_input_def);
 				$unit_input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group($attribute->_unit_group_id);
 				$unit_input_def['type'] = 'select';
@@ -1922,8 +1917,7 @@ 
 				if($unit_input_def['value'] == ''){
 					if ( $attribute->_default_unit > 0 ) {
 						$unit_input_def['value'] = $attribute->_default_unit;
-					}
-					else {
+					} else {
 						$unit_input_def['value'] = wpshop_attributes_unit::get_default_unit_for_group($attribute->_unit_group_id);
 					}
 				}
@@ -1947,8 +1941,7 @@ 
 			$input_def['label_pointer'] = '';
 			$input_def['option'] = substr( $input_def['option'], 0 , -2 ) . ' wpshop_attributes_is_user_defined_admin_field "';
 			$input_def['field_container_class'] .= 'wpshop_attributes_is_user_defined_admin_container';
-		}
-		else {
+		} else {
 			$input_def['output'] = wpshop_form::check_input_type($input_def, $attributeInputDomain);
 		}
 		return $input_def;
@@ -2045,8 +2038,7 @@ 
 					/**	Check the value type to check if empty or not	*/
 					if ( $attributeDefinition['data_type'] == 'int' ) {
 						$attributeDefinition['value'] = (int)$attributeDefinition['value'];
-					}
-					else if ( $attributeDefinition['data_type'] == 'decimal' ) {
+					} else if ( $attributeDefinition['data_type'] == 'decimal' ) {
 						$attributeDefinition['value'] = (float)$attributeDefinition['value'];
 					}
 
@@ -2108,8 +2100,7 @@ 
 						require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 						$tab_list .= ob_get_contents();
 						ob_end_clean();
-					}
-					else {
+					} else {
 						$tab_list .= wpshop_display::display_template_element($template_part, $tpl_component);
 					}
 					unset($tpl_component);
@@ -2128,8 +2119,7 @@ 
 						require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 						$content_list .= ob_get_contents();
 						ob_end_clean();
-					}
-					else {
+					} else {
 						$content_list .= wpshop_display::display_template_element($template_part, $tpl_component);
 					}
 					unset($tpl_component);
@@ -2151,8 +2141,7 @@ 
 					require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 					$attributeContentOutput = ob_get_contents();
 					ob_end_clean();
-				}
-				else {
+				} else {
 					$attributeContentOutput = wpshop_display::display_template_element($template_part, $tpl_component);
 				}
 				unset($tpl_component);
@@ -2204,8 +2193,9 @@ 
 				foreach ($attributeDefinition['value'] as $v) {
 					$attribute_value .= ' / '.wpshop_attributes::get_attribute_type_select_option_info($v, 'label', $attributeDefinition['data_type_to_use']);
 				}
+			} else {
+				$attribute_value = ' / '.wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
 			}
-			else $attribute_value = ' / '.wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
 			$attribute_value = substr($attribute_value,3);
 		}
 
@@ -2287,8 +2277,7 @@ 
 								wps_shortcodes_ctr::output_shortcode('attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])), $shortcode_code_def, 'wpshop_product_shortcode_display wpshop_product_attribute_shortcode_display wpshop_product_attribute_shortcode_display_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])).' wpshop_cls');
 								$shortcodes .= '<li class="wpshop_cls" >'.sprintf(__('Insertion code for the attribute %s for this product', 'wpshop'), '<span>'.__($attribute_output_def['field_definition']['label'], 'wpshop').'</span>').ob_get_contents().'</li>';
 								ob_end_clean();
-							}
-							else {
+							} else {
 								if ( $attribute->code == 'product_attribute_set_id' ) {
 									$attribute_output_def['field_definition']['type'] = 'hidden';
 								}
@@ -2308,10 +2297,11 @@ 
 					$attribute_group_display = sprintf(__('Insertion code for attribute group %s for this product', 'wpshop'), '<span>'.$productAttributeSetDetail['name'].'</span>').ob_get_contents().'<ul class="" >'.$shortcodes.'</ul>';
 					ob_end_clean();
 
-					if( WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE == 'each-box' )
-						$currentTabContent .= '<div class="wpshop_cls" ><strong>'.__('Shortcodes','wpshop').'</strong> - <a href="#" class="show-hide-shortcodes">' . __('Display', 'wpshop') . '</a><div class="wpshop_product_shortcode_display wpshop_product_shortcode_display_container wpshopHide" >' . $attribute_group_display . '</div></div>';
-					else
-						$shortcodes_attr .= $attribute_group_display;
+					if( WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE == 'each-box' ) {
+											$currentTabContent .= '<div class="wpshop_cls" ><strong>'.__('Shortcodes','wpshop').'</strong> - <a href="#" class="show-hide-shortcodes">' . __('Display', 'wpshop') . '</a><div class="wpshop_product_shortcode_display wpshop_product_shortcode_display_container wpshopHide" >' . $attribute_group_display . '</div></div>';
+					} else {
+											$shortcodes_attr .= $attribute_group_display;
+					}
 
 					if ( $output_nb <= 0 ) {
 						$currentTabContent = __('Nothing avaiblable here. You can go in attribute management interface in order to add content here.', 'wpshop');
@@ -2326,8 +2316,7 @@ 
 						$box['boxContent'][$productAttributeSetDetail['code']] = '
 			<div id="wpshop_' . $currentPageCode . '_' . wpshop_tools::slugify($productAttributeSetDetail['code'], array('noAccent')) . '_form" >' . $currentTabContent . '
 							</div><div class="wpshop_cls" ></div>';
-					}
-					else if ( $outputType == 'column' ) {
+					} else if ( $outputType == 'column' ) {
 						$currentTabContent = str_replace('wpshop_form_input_element', 'wpshop_form_input_column', $currentTabContent);
 						$currentTabContent = str_replace('wpshop_form_label', 'wpshop_form_label_column', $currentTabContent);
 
@@ -2365,8 +2354,7 @@ 
 							$box['box']['shortcode'] = __('Product Shortcodes', 'wpshop');
 							$box['boxContent']['shortcode'] = $shortcodes_attr;
 							$box['box']['shortcode_backend_display_type'] = WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE;
-						}
-						else{
+						} else{
 							$box['columnTitle']['shortcode'] = __('Product Shortcodes', 'wpshop');
 							$box['columnContent']['shortcode'] = $shortcodes_attr;
 						}
@@ -2406,8 +2394,7 @@ 
 //					$ouput['more_input'] .= '<input type="hidden" value="' . (WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT ? str_replace("\\", "", $option->value) : str_replace("\\", "", $option->label)) . '" name="wpshop_product_attribute_' . $attribute->code . '_value_' . $option->id . '" id="wpshop_product_attribute_' . $attribute->code . '_value_' . $option->id . '" />';
 // 				}
 			endforeach;
-		}
-		elseif ( $attribute->data_type_to_use == 'internal')  {
+		} elseif ( $attribute->data_type_to_use == 'internal')  {
 			switch ($attribute_default_value) {
 				case 'users':
 					$users = get_users('orderby=nicename');
@@ -2436,9 +2423,11 @@ 
 		/*	There is no value existing for this value	*/
 		if (empty($attribute_select_options_list)) :
 			$ouput['more_input'].=__('Nothing found for this field', 'wpshop');
-		else:
+		else {
+			:
 			/*	Add a default value to the combobox list	*/
 			$default_value_is_serial = false;
+		}
 			$attribute_list_first_element = $attribute->default_value;
 			if ( !empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized( $attribute->default_value ) ) ) {
 				$default_value_is_serial = true;
@@ -2454,8 +2443,7 @@ 
 		/*	Add a extra element to create a new element into list	*/
 		if ( is_admin()  && ( empty($provenance['from']) || ($provenance['from'] != 'frontend')) ) {
 			/**	$ouput['more_input'] .= '<img src="'.WPSHOP_MEDIAS_ICON_URL.'add.png" id="new_value_pict_' . $attribute->code . '" alt="'.__('Add a new value for this attribute', 'wpshop').'" title="'.__('Add a new value for this attribute', 'wpshop').'" class="wpshop_icons wpshop_icons_add_new_value_to_option_list wpshop_icons_add_new_value_to_option_list_'.$attribute->code.'" />';	*/
-		}
-		else if ( 'yes' == $attribute->is_used_in_quick_add_form ) {
+		} else if ( 'yes' == $attribute->is_used_in_quick_add_form ) {
 			$tpl_component = array();
 			$tpl_component['NEW_ELEMENT_CREATION_FIELD'] = 'attribute[new_value_creation][' . $attribute->code . ']';
 			$ouput['more_input'] .= wpshop_display::display_template_element('quick_entity_specific_field_new_element', $tpl_component);
@@ -2477,8 +2465,7 @@ 
 WHERE ATT.code = %s
 	AND ATT_SELECT_OPTIONS_VALUE.status = 'valid'
 GROUP BY ATT.id, chosen_val", $element_id, $attribute_code);
-		}
-		else {
+		} else {
 			$query = $wpdb->prepare("
 SELECT P.ID AS chosen_val, P.post_title
 FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATT
@@ -2653,14 +2640,17 @@ 
 		$attribute_final = array();
 		$entity_type = get_post_type($entityId);
 		$data = self::get_attribute_list_for_item( wpshop_entities::get_entity_identifier_from_code($entity_type), $entityId, WPSHOP_CURRENT_LOCALE);
-		foreach($data as $d) $attribute_available[$d->attribute_code] = array('attribute_id' => $d->attribute_id, 'data_type' => $d->data_type);
+		foreach($data as $d) {
+			$attribute_available[$d->attribute_code] = array('attribute_id' => $d->attribute_id, 'data_type' => $d->data_type);
+		}
 
 		// Creation d'un array "propre" et valide pour la fonction self::saveAttributeForEntity
 		foreach ( $values as $key => $value ) {
 			if ( in_array( $key, array_keys( $attribute_available ) ) ) {
 				$attribute_final[$attribute_available[$key]['data_type']][$key] = $value;
+			} else {
+				$message .= sprintf(__('Impossible to set "%s" attribute', 'wpshop'), $key)."\n";
 			}
-			else $message .= sprintf(__('Impossible to set "%s" attribute', 'wpshop'), $key)."\n";
 		}
 
 		// Pour les autres attributs non donné on leur affecte leur valeur par défaut
@@ -2733,8 +2723,7 @@ 
 						/** Build template	*/
 						$info = wpshop_display::display_template_element($template_part, $tpl_component);
 						unset($tpl_component);
-					}
-					else {
+					} else {
 						$info = $entity_infos->post_title;
 					}
 				}
@@ -2925,8 +2914,7 @@ 
 
 		});
 	</script>';
-			}
-			elseif((($data_type == 'internal') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'internal'))){
+			} elseif((($data_type == 'internal') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'internal'))){
 				$sub_output='';
 				$wp_types = unserialize(WPSHOP_INTERNAL_TYPES);
 				unset($input_def);$input_def=array();
@@ -3027,8 +3015,7 @@ 
 									<option value="' . $value->value . '" >' . $value->label . '</option>';
 										}
 									}
-								}
-								else {
+								} else {
 									foreach ($attribute_values as $attribute_value) {
 										if ( !empty($attribute_value->value) ) {
 											$attribute_possible_values .= '
@@ -3111,8 +3098,7 @@ 
 					$final_list['unavailable'][$attribute->code]['label'] = $attribute->frontend_label;
 					$final_list['unavailable'][$attribute->code]['values'] = array();
 					$final_list['unavailable'][$attribute->code]['attribute_complete_def'] = $attribute;
-				}
-				else {
+				} else {
 					$final_list['available'][$attribute->code]['label'] = $attribute->frontend_label;
 					$final_list['available'][$attribute->code]['values'] = $attribute_values_for_variations;
 					$final_list['available'][$attribute->code]['attribute_complete_def'] = $attribute;
@@ -3140,8 +3126,7 @@ 
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_LABEL_STATE'] = '';
 						$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = '';
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL_EXPLAINATION'] = '';
-					}
-					else {
+					} else {
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_LABEL_STATE'] = ' class="wpshop_unavailable_label_variation_definition" ';
 						$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = ' disabled="disabled"';
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL_EXPLAINATION'] = '';