Eoxia / wpshop

includes/modules/wps-pos-addon/controller/wps-pos-bank-deposit-histo.php

Doc Comments +4 added lines

@@ -25,6 +25,10 @@
 	public function get_historic() {
 		return array_reverse( get_option( $this->name_option ) );
 	}
+
+	/**
+	 * @param integer $id
+	 */
 	public function row_model( $id, $date, $amount, $payments ) {
 		return array( 'id' => $id, 'date' => $date, 'amount' => $amount, 'payments' => $payments );
 	}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_pos_addon_bank_deposit_histo {
 	public $name_option = 'bank_deposit_historic';
 	public function __construct() {

Spacing +22 added lines, -22 removed lines

@@ -1,47 +1,47 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_pos_addon_bank_deposit_histo {
 	public $name_option = 'bank_deposit_historic';
 	public function __construct() {
 		/**	Call metaboxes	*/
-		add_action( 'admin_init', array( $this, 'metaboxes' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'vars_js' ), 11 );
-		add_option( $this->name_option, array(), '', 'yes' );
+		add_action('admin_init', array($this, 'metaboxes'));
+		add_action('admin_enqueue_scripts', array($this, 'vars_js'), 11);
+		add_option($this->name_option, array(), '', 'yes');
 	}
 	public function metaboxes() {
-		add_meta_box( 'wpspos-bank-deposit-histo-metabox', __( 'Historic bank deposit', 'wps-pos-i18n' ), array( $this, 'metabox' ), 'wpspos-bank-deposit', 'wpspos-bank-deposit-right' );
+		add_meta_box('wpspos-bank-deposit-histo-metabox', __('Historic bank deposit', 'wps-pos-i18n'), array($this, 'metabox'), 'wpspos-bank-deposit', 'wpspos-bank-deposit-right');
 	}
 	public function metabox() {
-		require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/bank_deposit', 'metabox', 'bank_deposit_histo' ) );
+		require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/bank_deposit', 'metabox', 'bank_deposit_histo'));
 	}
-	public function add_historic( $new_value ) {
-		$histo = get_option( $this->name_option );
+	public function add_historic($new_value) {
+		$histo = get_option($this->name_option);
 		$histo[] = '';
-		end( $histo );
-		$id = key( $histo );
+		end($histo);
+		$id = key($histo);
 		$new_value['id'] = $id;
 		$histo[$id] = $new_value;
-		update_option( $this->name_option, $histo );
+		update_option($this->name_option, $histo);
 	}
 	public function get_historic() {
-		return array_reverse( get_option( $this->name_option ) );
+		return array_reverse(get_option($this->name_option));
 	}
-	public function row_model( $id, $date, $amount, $payments ) {
-		return array( 'id' => $id, 'date' => $date, 'amount' => $amount, 'payments' => $payments );
+	public function row_model($id, $date, $amount, $payments) {
+		return array('id' => $id, 'date' => $date, 'amount' => $amount, 'payments' => $payments);
 	}
 	public function vars_js() {
-		wp_localize_script( 'wpspos-backend-bank-deposit-js', 'historics', $this->get_historic() );
-		wp_localize_script( 'wpspos-backend-bank-deposit-js', 'templates_url', admin_url( 'admin-post.php' ) );
+		wp_localize_script('wpspos-backend-bank-deposit-js', 'historics', $this->get_historic());
+		wp_localize_script('wpspos-backend-bank-deposit-js', 'templates_url', admin_url('admin-post.php'));
 	}
 	public function save_historic_ajax() {
-		$list_payments = !empty( $_POST['payments'] ) ? (array) $_POST['payments'] : array();
+		$list_payments = !empty($_POST['payments']) ? (array)$_POST['payments'] : array();
 		$payments = array();
-		foreach( $list_payments as $payment ) {
-			if( is_float( $payment ) ) {
-				$payments[] = (float) $payment;
+		foreach ($list_payments as $payment) {
+			if (is_float($payment)) {
+				$payments[] = (float)$payment;
 			}
 		}
-		$this->add_historic( $this->row_model( 0, sanitize_text_field( $_POST['date'] ), sanitize_text_field( $_POST['amount'] ), $payments ) );
-		echo json_encode( $this->get_historic() );
+		$this->add_historic($this->row_model(0, sanitize_text_field($_POST['date']), sanitize_text_field($_POST['amount']), $payments));
+		echo json_encode($this->get_historic());
 		wp_die();
 	}
 }

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

includes/modules/wps_customer/controller/wps_account_ctr.php

Doc Comments +1 added lines, -1 removed lines

@@ -481,7 +481,7 @@
 	}
 
 	/** SIGN UP - Display the commercial & newsletter form
-	 * @return void
+	 * @return string
 	 */
 	function display_commercial_newsletter_form() {
 		$output = '';

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php if ( !defined( 'ABSPATH' ) ) exit;
 class wps_account_ctr {
 	/** Define the main directory containing the template for the current plugin
-	* @var string
-	*/
+	 * @var string
+	 */
 	private $template_dir;
 	/**
 	 * Define the directory name for the module in order to check into frontend

Spacing +312 added lines, -312 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_account_ctr {
 	/** Define the main directory containing the template for the current plugin
 	* @var string
@@ -19,50 +19,50 @@ 
 		$this->template_dir = WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . "/templates/";
 		/** Shortcodes **/
 		// Sign up Display Shortcode
-		add_shortcode( 'wps_signup', array( &$this, 'display_signup' ) );
+		add_shortcode('wps_signup', array(&$this, 'display_signup'));
 		// Log in Form Display Shortcode
-		add_shortcode( 'wpshop_login', array( &$this, 'get_login_form'));
+		add_shortcode('wpshop_login', array(&$this, 'get_login_form'));
 		//Log in first step
-		add_shortcode( 'wps_first_login', array( &$this, 'get_login_first_step'));
+		add_shortcode('wps_first_login', array(&$this, 'get_login_first_step'));
 		// Forgot password Form
-		add_shortcode( 'wps_forgot_password', array( &$this, 'get_forgot_password_form'));
+		add_shortcode('wps_forgot_password', array(&$this, 'get_forgot_password_form'));
 		// Renew password form
-		add_shortcode( 'wps_renew_password', array( &$this, 'get_renew_password_form'));
+		add_shortcode('wps_renew_password', array(&$this, 'get_renew_password_form'));
 		//Account informations
-		add_shortcode( 'wps_account_informations', array($this, 'display_account_informations') );
+		add_shortcode('wps_account_informations', array($this, 'display_account_informations'));
 		//Account form
-		add_shortcode( 'wps_account_informations_form', array($this, 'account_informations_form') );
+		add_shortcode('wps_account_informations_form', array($this, 'account_informations_form'));
 
 		/** Ajax Actions **/
 		// add_action('wap_ajax_wps_display_connexion_form', array(&$this, 'wps_ajax_get_login_form_interface') );
 		// add_action('wap_ajax_nopriv_wps_display_connexion_form', array(&$this, 'wps_ajax_get_login_form_interface') );
 
-		add_action('wp_ajax_wps_login_request', array(&$this, 'control_login_form_request') );
-		add_action('wp_ajax_nopriv_wps_login_request', array(&$this, 'control_login_form_request') );
+		add_action('wp_ajax_wps_login_request', array(&$this, 'control_login_form_request'));
+		add_action('wp_ajax_nopriv_wps_login_request', array(&$this, 'control_login_form_request'));
 
-		add_action('wp_ajax_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request') );
-		add_action('wp_ajax_nopriv_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request') );
+		add_action('wp_ajax_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request'));
+		add_action('wp_ajax_nopriv_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request'));
 
-		add_action('wp_ajax_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew') );
-		add_action('wp_ajax_nopriv_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew') );
+		add_action('wp_ajax_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew'));
+		add_action('wp_ajax_nopriv_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew'));
 
-		add_action('wp_ajax_wps_signup_request', array(&$this, 'wps_save_signup_form') );
-		add_action('wp_ajax_nopriv_wps_signup_request', array(&$this, 'wps_save_signup_form_nopriv') );
+		add_action('wp_ajax_wps_signup_request', array(&$this, 'wps_save_signup_form'));
+		add_action('wp_ajax_nopriv_wps_signup_request', array(&$this, 'wps_save_signup_form_nopriv'));
 
-		add_action('wp_ajax_wps_login_first_request', array(&$this, 'wps_login_first_request') );
-		add_action('wp_ajax_nopriv_wps_login_first_request', array(&$this, 'wps_login_first_request') );
+		add_action('wp_ajax_wps_login_first_request', array(&$this, 'wps_login_first_request'));
+		add_action('wp_ajax_nopriv_wps_login_first_request', array(&$this, 'wps_login_first_request'));
 
-		add_action( 'wp_ajax_wps_save_account_informations', array($this, 'wps_save_account_informations') );
+		add_action('wp_ajax_wps_save_account_informations', array($this, 'wps_save_account_informations'));
 
-		add_action( 'wp_ajax_wps_account_reload_informations', array($this, 'wps_account_reload_informations') );
+		add_action('wp_ajax_wps_account_reload_informations', array($this, 'wps_account_reload_informations'));
 
-		add_action( 'wp_ajax_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal') );
-		add_action( 'wp_ajax_nopriv_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal') );
+		add_action('wp_ajax_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal'));
+		add_action('wp_ajax_nopriv_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal'));
 
-		add_action( 'wp_ajax_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal') );
-		add_action( 'wp_ajax_nopriv_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal') );
+		add_action('wp_ajax_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal'));
+		add_action('wp_ajax_nopriv_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal'));
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts') );
+		add_action('wp_enqueue_scripts', array($this, 'add_scripts'));
 	}
 
 	/**
@@ -70,32 +70,32 @@ 
 	 */
 	function add_scripts() {
 		wp_enqueue_script('jquery');
-		wp_enqueue_script( 'wps_forgot_password_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_forgot_password.js' );
-		wp_enqueue_script( 'wps_login_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_login.js' );
-		wp_enqueue_script( 'wps_signup_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_signup.js' );
-		wp_enqueue_script( 'wps_account_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_account.js' );
+		wp_enqueue_script('wps_forgot_password_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_forgot_password.js');
+		wp_enqueue_script('wps_login_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_login.js');
+		wp_enqueue_script('wps_signup_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_signup.js');
+		wp_enqueue_script('wps_account_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_account.js');
 	}
 
 	/** LOG IN - Display log in Form **/
-	function get_login_form( $force_login = false ) {
+	function get_login_form($force_login = false) {
 		$args = array();
-		if ( get_current_user_id() != 0 ) {
-			return __( 'You are already logged', 'wpshop');
+		if (get_current_user_id() != 0) {
+			return __('You are already logged', 'wpshop');
 		}
 		else {
-			$action = !empty( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : '';
-			$key = !empty( $_GET['key'] ) ? sanitize_text_field( $_GET['key'] ) : '';
-			$login = !empty( $_GET['login'] ) ? sanitize_text_field( $_GET['login'] ) : 0;
-			if ( !empty($action) && $action == 'retrieve_password' && !empty($key) && !empty($login) && !$force_login ) {
+			$action = !empty($_GET['action']) ? sanitize_text_field($_GET['action']) : '';
+			$key = !empty($_GET['key']) ? sanitize_text_field($_GET['key']) : '';
+			$login = !empty($_GET['login']) ? sanitize_text_field($_GET['login']) : 0;
+			if (!empty($action) && $action == 'retrieve_password' && !empty($key) && !empty($login) && !$force_login) {
 				$output = self::get_renew_password_form();
 			}
 			else {
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form") );
+				require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form"));
 				$output = ob_get_contents();
 				ob_end_clean();
-				if ( !$force_login ) {
-					$output .= do_shortcode( '[wps_signup]' );
+				if (!$force_login) {
+					$output .= do_shortcode('[wps_signup]');
 				}
 			}
 			return $output;
@@ -105,53 +105,53 @@ 
 	/** LOG IN - AJAX - Action to connect **/
 	function control_login_form_request() {
 
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'control_login_form_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'control_login_form_request'))
 			wp_die();
 
 		$result = '';
 		$status = false;
-		$origin = sanitize_text_field( $_POST['wps-checking-origin'] );
-		$wps_login_user_login = !empty( $_POST['wps_login_user_login'] ) ? sanitize_text_field( $_POST['wps_login_user_login' ] ) : '';
-		$wps_login_password = !empty( $_POST['wps_login_password'] ) ? sanitize_text_field( $_POST['wps_login_password' ] ) : '';
-		$page_account_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id') );
-		if ( !empty($wps_login_user_login) && !empty($wps_login_password) ) {
+		$origin = sanitize_text_field($_POST['wps-checking-origin']);
+		$wps_login_user_login = !empty($_POST['wps_login_user_login']) ? sanitize_text_field($_POST['wps_login_user_login']) : '';
+		$wps_login_password = !empty($_POST['wps_login_password']) ? sanitize_text_field($_POST['wps_login_password']) : '';
+		$page_account_id = wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'));
+		if (!empty($wps_login_user_login) && !empty($wps_login_password)) {
 			$creds = array();
 			// Test if an user exist with this login
-			$user_checking = get_user_by( 'login', $wps_login_user_login );
-			if( !empty($user_checking) ) {
+			$user_checking = get_user_by('login', $wps_login_user_login);
+			if (!empty($user_checking)) {
 				$creds['user_login'] = $wps_login_user_login;
 			}
 			else {
-				if ( is_email($wps_login_user_login) ) {
-					$user_checking = get_user_by( 'email', $wps_login_user_login );
+				if (is_email($wps_login_user_login)) {
+					$user_checking = get_user_by('email', $wps_login_user_login);
 					$creds['user_login'] = $user_checking->user_login;
 				}
 			}
-			$creds['user_password'] = wpshop_tools::varSanitizer( $_POST['wps_login_password'] );
-			$creds['remember'] =  !empty( $_POST['wps_login_remember_me'] ) ? (int) $_POST['wps_login_remember_me'] : false;
-			$user = wp_signon( $creds, false );
-			if ( is_wp_error($user) ) {
-				$result = '<div class="wps-alert-error">' .__('Connexion error', 'wpshop'). '</div>';
+			$creds['user_password'] = wpshop_tools::varSanitizer($_POST['wps_login_password']);
+			$creds['remember'] = !empty($_POST['wps_login_remember_me']) ? (int)$_POST['wps_login_remember_me'] : false;
+			$user = wp_signon($creds, false);
+			if (is_wp_error($user)) {
+				$result = '<div class="wps-alert-error">' . __('Connexion error', 'wpshop') . '</div>';
 			}
 			else {
-				$permalink_option = get_option( 'permalink_structure' );
-				$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-				if( $origin == $page_account_id ) {
-					$result = get_permalink( $page_account_id );
+				$permalink_option = get_option('permalink_structure');
+				$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+				if ($origin == $page_account_id) {
+					$result = get_permalink($page_account_id);
 				}
 				else {
-					$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
+					$result = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=3';
 				}
 				$status = true;
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('E-Mail and Password are required', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('E-Mail and Password are required', 'wpshop') . '</div>';
 		}
 
-		echo json_encode( array( $status, $result) );
+		echo json_encode(array($status, $result));
 		die();
 	}
 
@@ -159,13 +159,13 @@ 
 	 * LOG IN - AJAX - Display log in Form in Ajax
 	 */
 	function wps_ajax_get_login_form_interface() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_get_login_form_interface' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_ajax_get_login_form_interface'))
 			wp_die();
 
-		$response = array( 'status' => true, 'response' => self::get_login_form() );
-		echo json_encode( $response );
+		$response = array('status' => true, 'response' => self::get_login_form());
+		echo json_encode($response);
 		die();
 	}
 
@@ -173,7 +173,7 @@ 
 	function get_login_first_step() {
 		$output = '';
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "login/login-form", "first") );
+		require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form", "first"));
 		$output .= ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -183,39 +183,39 @@ 
 	 * LOG IN - First Step log in request
 	 */
 	function wps_login_first_request() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_login_first_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_login_first_request'))
 			wp_die();
 
 		$status = false; $login_action = false; $response = '';
-		$user_email = ( !empty($_POST['email_address']) ) ? wpshop_tools::varSanitizer( $_POST['email_address'] ) : null;
-		if ( !empty($user_email) ) {
+		$user_email = (!empty($_POST['email_address'])) ? wpshop_tools::varSanitizer($_POST['email_address']) : null;
+		if (!empty($user_email)) {
 			$status = true;
 			/** Check if a user exist with it's email **/
-			$checking_user = get_user_by( 'login', $user_email);
-			if ( !empty($checking_user) ) {
+			$checking_user = get_user_by('login', $user_email);
+			if (!empty($checking_user)) {
 				$login_action = true;
-				$user_firstname = get_user_meta( $checking_user->ID, 'first_name', true );
+				$user_firstname = get_user_meta($checking_user->ID, 'first_name', true);
 				$response = $user_firstname;
 			}
 			else {
-				$checking_user = get_user_by( 'email', $user_email);
-				if ( !empty( $checking_user ) ) {
+				$checking_user = get_user_by('email', $user_email);
+				if (!empty($checking_user)) {
 					$login_action = true;
-					$user_firstname = get_user_meta( $checking_user->ID, 'first_name', true );
+					$user_firstname = get_user_meta($checking_user->ID, 'first_name', true);
 					$response = $user_firstname;
 				}
 			}
 
-			if( !$login_action && is_email($user_email)  ) {
+			if (!$login_action && is_email($user_email)) {
 				$response = $user_email;
 			}
 		}
 		else {
-			$response = '<div class="wps-alert-error">' .__( 'An e-mail address is required', 'wpshop' ). '</div>';
+			$response = '<div class="wps-alert-error">' . __('An e-mail address is required', 'wpshop') . '</div>';
 		}
-		echo json_encode( array( 'status'=> $status, 'response' => $response, 'login_action' => $login_action) );
+		echo json_encode(array('status'=> $status, 'response' => $response, 'login_action' => $login_action));
 		die();
 	}
 
@@ -224,9 +224,9 @@ 
 	 */
 	function get_forgot_password_form() {
 		$output = '';
-		if ( get_current_user_id() == 0 ) {
+		if (get_current_user_id() == 0) {
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/forgot-password") );
+			require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/forgot-password"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -237,16 +237,16 @@ 
 	 * FORGOT PASSWORD - AJAX - Fill the forgot password modal
 	 */
 	function wps_fill_forgot_password_modal() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_fill_forgot_password_modal' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_fill_forgot_password_modal'))
 			wp_die();
 
 		$status = false; $title = $content = '';
-		$title = __( 'Forgot password', 'wpshop' );
+		$title = __('Forgot password', 'wpshop');
 		$content = do_shortcode('[wps_forgot_password]');
 		$status = true;
-		echo json_encode( array('status' => $status, 'title' => $title, 'content' => $content) );
+		echo json_encode(array('status' => $status, 'title' => $title, 'content' => $content));
 		wp_die();
 	}
 
@@ -254,48 +254,48 @@ 
 	 * FORGOT PASSWORD- AJAX - Forgot Password Request
 	 */
 	function wps_forgot_password_request() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_forgot_password_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_forgot_password_request'))
 			wp_die();
 
 		global $wpdb;
 		$status = false; $result = '';
-		$user_login = ( !empty( $_POST['wps_user_login']) ) ? wpshop_tools::varSanitizer($_POST['wps_user_login']) : null;
-		if ( !empty($user_login) ) {
+		$user_login = (!empty($_POST['wps_user_login'])) ? wpshop_tools::varSanitizer($_POST['wps_user_login']) : null;
+		if (!empty($user_login)) {
 			$existing_user = false;
 			$key_for_update = 'user_login';
 			$exist_user = get_user_by('login', $user_login);
-			if( !empty($exist_user) ) {
+			if (!empty($exist_user)) {
 				$existing_user = true;
 			}
 			else {
 				$exist_user = get_user_by('email', $user_login);
 				$key_for_update = 'user_email';
-				if ( !empty($exist_user) ) {
+				if (!empty($exist_user)) {
 					$existing_user = true;
 				}
 			}
 
-			if ( $existing_user ) {
+			if ($existing_user) {
 				$key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE $key_for_update = %s", $user_login));
-				if ( empty($key) ) {
+				if (empty($key)) {
 					$key = wp_generate_password(20, false);
 					$wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
 				}
 				$this->send_forgot_password_email($key, $user_login, $exist_user);
-				$result = '<div class="wps-alert-info">' .__('An e-mail with an password renew link has been sent to you', 'wpshop'). '</div>';
+				$result = '<div class="wps-alert-info">' . __('An e-mail with an password renew link has been sent to you', 'wpshop') . '</div>';
 				$status = true;
 			}
 			else {
-				$result = '<div class="wps-alert-error">' .__('No customer account corresponds to this email', 'wpshop'). '</div>';
+				$result = '<div class="wps-alert-error">' . __('No customer account corresponds to this email', 'wpshop') . '</div>';
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('Please fill the required field', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('Please fill the required field', 'wpshop') . '</div>';
 		}
-		$response = array( $status, $result );
-		echo json_encode( $response );
+		$response = array($status, $result);
+		echo json_encode($response);
 		die();
 	}
 
@@ -304,67 +304,67 @@ 
 	 * @param string $key
 	 * @param string $user_login
 	 */
-	function send_forgot_password_email($key, $user_login, $exist_user){
+	function send_forgot_password_email($key, $user_login, $exist_user) {
 		$user_data = $exist_user->data;
 		$email = $user_data->user_email;
 		$wps_message = new wps_message_ctr();
-		$first_name = get_user_meta( $user_data->ID, 'first_name', true );
-		$last_name = get_user_meta( $user_data->ID, 'last_name', true );
-		$permalink_option = get_option( 'permalink_structure' );
-		$link = '<a href="' .get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ).( (!empty($permalink_option)) ? '?' : '&').'order_step=2&action=retrieve_password&key=' .$key. '&login=' .rawurlencode($user_login). '">' .get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ). '&action=retrieve_password&key=' .$key. '&login=' .rawurlencode($user_login). '</a>';
-		if( !empty($key) && !empty( $user_login ) ) {
+		$first_name = get_user_meta($user_data->ID, 'first_name', true);
+		$last_name = get_user_meta($user_data->ID, 'last_name', true);
+		$permalink_option = get_option('permalink_structure');
+		$link = '<a href="' . get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2&action=retrieve_password&key=' . $key . '&login=' . rawurlencode($user_login) . '">' . get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . '&action=retrieve_password&key=' . $key . '&login=' . rawurlencode($user_login) . '</a>';
+		if (!empty($key) && !empty($user_login)) {
 			$wps_message->wpshop_prepared_email($email,
 			'WPSHOP_FORGOT_PASSWORD_MESSAGE',
-			array( 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'forgot_password_link' => $link)
+			array('customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'forgot_password_link' => $link)
 			);
 		}
 	}
 
 	/** FORGOT PASSWORD - AJAX - Make renew password action **/
 	function wps_forgot_password_renew() {
-		check_ajax_referer( 'wps_forgot_password_renew' );
+		check_ajax_referer('wps_forgot_password_renew');
 
 		global $wpdb;
 		$status = false; $result = $form = '';
-		$password = ( !empty( $_POST['pass1']) ) ? wpshop_tools::varSanitizer( $_POST['pass1'] ) : null;
-		$confirm_password = ( !empty( $_POST['pass2']) ) ? wpshop_tools::varSanitizer( $_POST['pass2'] ) : null;
-		$activation_key = ( !empty( $_POST['activation_key']) ) ?  wpshop_tools::varSanitizer( $_POST['activation_key'] ) : null;
-		$login = ( !empty( $_POST['user_login']) ) ?  wpshop_tools::varSanitizer( $_POST['user_login'] ) : null;
-		if ( !empty($password) && !empty($confirm_password) && $confirm_password == $password ) {
-			if ( !empty($activation_key) && !empty($login) ) {
+		$password = (!empty($_POST['pass1'])) ? wpshop_tools::varSanitizer($_POST['pass1']) : null;
+		$confirm_password = (!empty($_POST['pass2'])) ? wpshop_tools::varSanitizer($_POST['pass2']) : null;
+		$activation_key = (!empty($_POST['activation_key'])) ? wpshop_tools::varSanitizer($_POST['activation_key']) : null;
+		$login = (!empty($_POST['user_login'])) ? wpshop_tools::varSanitizer($_POST['user_login']) : null;
+		if (!empty($password) && !empty($confirm_password) && $confirm_password == $password) {
+			if (!empty($activation_key) && !empty($login)) {
 				$existing_user = false;
-				$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $activation_key, $login ) );
-				if( !empty($user) ) {
+				$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $activation_key, $login));
+				if (!empty($user)) {
 					$existing_user = true;
 				}
 				else {
-					$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_email = %s", $activation_key, $login ) );
-					if( !empty($user) ) {
+					$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_email = %s", $activation_key, $login));
+					if (!empty($user)) {
 						$existing_user = true;
 					}
 				}
 
-				if ( $existing_user ){
+				if ($existing_user) {
 					wp_set_password($password, $user->ID);
 					wp_password_change_notification($user);
 					$status = true;
-					$result = '<div class="wps-alert-success">' .__('Your password has been updated', 'wpshop'). '. <a href="#" id="display_connexion_form"> ' .__('Connect you', 'wpshop').' !</a></div>';
-					$form = self::get_login_form( true );
+					$result = '<div class="wps-alert-success">' . __('Your password has been updated', 'wpshop') . '. <a href="#" id="display_connexion_form"> ' . __('Connect you', 'wpshop') . ' !</a></div>';
+					$form = self::get_login_form(true);
 				}
 				else {
-					$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
+					$result = '<div class=" wps-alert-error">' . __('Invalid activation key', 'wpshop') . '</div>';
 				}
 			}
 			else {
-				$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
+				$result = '<div class=" wps-alert-error">' . __('Invalid activation key', 'wpshop') . '</div>';
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('Password and confirmation password are differents', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('Password and confirmation password are differents', 'wpshop') . '</div>';
 		}
 
-		$response = array( $status, $result, $form );
-		echo json_encode( $response);
+		$response = array($status, $result, $form);
+		echo json_encode($response);
 		die();
 	}
 
@@ -373,9 +373,9 @@ 
 	 * @return string
 	 */
 	function get_renew_password_form() {
-		if ( get_current_user_id() == 0 ) {
+		if (get_current_user_id() == 0) {
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "forgot-password/password-renew") );
+			require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/password-renew"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -384,7 +384,7 @@ 
 
 	/** FORGOT PASSWORD - AJAX - Get Forgot Password form **/
 	function wps_ajax_get_forgot_password_form() {
-		echo json_encode( array(self::get_forgot_password_form() ) );
+		echo json_encode(array(self::get_forgot_password_form()));
 		die();
 	}
 
@@ -392,29 +392,29 @@ 
 	 * SIGN UP - Display Sign up form
 	 * @return string
 	 */
-	function display_signup( $args = array() ) {
+	function display_signup($args = array()) {
 		global $wpdb;
 		$output = '';
-		if ( get_current_user_id() == 0 || !empty($args) ) {
+		if (get_current_user_id() == 0 || !empty($args)) {
 			$fields_to_output = $signup_fields = array();
 
-			$password_attribute = $signup_form_attributes =  array();
+			$password_attribute = $signup_form_attributes = array();
 
-			$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+			$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-			$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-			$customer_entity_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+			$customer_entity_id = $wpdb->get_var($query);
 			$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-			$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-			$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid' );
-			$customer_attributes_sections = $wpdb->get_results( $query );
-			foreach( $customer_attributes_sections as $k => $customer_attributes_section ) {
-				foreach( $account_attributes[$customer_attributes_section->id]['attribut'] as $attribute ) {
+			$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
+			$customer_attributes_sections = $wpdb->get_results($query);
+			foreach ($customer_attributes_sections as $k => $customer_attributes_section) {
+				foreach ($account_attributes[$customer_attributes_section->id]['attribut'] as $attribute) {
 					$signup_fields[] = $attribute;
 				}
 			}
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "signup/signup") );
+			require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -422,119 +422,119 @@ 
 	}
 
 	function wps_save_signup_form_nopriv() {
-		$this->wps_save_signup_form( true );
+		$this->wps_save_signup_form(true);
 	}
 
 	/**
 	 * SIGN UP - Save sign up form
 	 */
-	function wps_save_signup_form( $connect = false ) {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+	function wps_save_signup_form($connect = false) {
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_signup_form' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_save_signup_form'))
 			wp_die();
 
 		global $wpdb, $wpshop;
-		$user_id = ( !empty( $_POST['wps_sign_up_request_from_admin'] ) ) ? (int) $_POST['wps_sign_up_request_from_admin'] : get_current_user_id();
+		$user_id = (!empty($_POST['wps_sign_up_request_from_admin'])) ? (int)$_POST['wps_sign_up_request_from_admin'] : get_current_user_id();
 		$wps_message = new wps_message_ctr();
 		$status = $account_creation = false; $result = '';
-		$exclude_user_meta = array( 'user_email', 'user_pass' );
-		$attribute = !empty( $_POST['attribute'] ) ? (array) $_POST['attribute'] : array();
-		$element_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		if ( !empty( $element_id) ){
-			$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $element_id );
-			$attribute_set_id = $wpdb->get_var( $query );
-			if ( !empty($attribute_set_id) ){
-				$group = wps_address::get_addresss_form_fields_by_type( $attribute_set_id );
-				foreach ( $group as $attribute_sets ) {
-					foreach ( $attribute_sets as $attribute_set_field ) {
-						if( !empty($user_id) ) {
-							foreach( $attribute_set_field['content'] as $attribute_code => $att_def ) {
-								if( $attribute_code != 'account_user_email' ) {
+		$exclude_user_meta = array('user_email', 'user_pass');
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
+		$element_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		if (!empty($element_id)) {
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id);
+			$attribute_set_id = $wpdb->get_var($query);
+			if (!empty($attribute_set_id)) {
+				$group = wps_address::get_addresss_form_fields_by_type($attribute_set_id);
+				foreach ($group as $attribute_sets) {
+					foreach ($attribute_sets as $attribute_set_field) {
+						if (!empty($user_id)) {
+							foreach ($attribute_set_field['content'] as $attribute_code => $att_def) {
+								if ($attribute_code != 'account_user_email') {
 									$attribute_set_field['content'][$attribute_code]['required'] = 'no';
 								}
 							}
 						}
-						$validate = $wpshop->validateForm($attribute_set_field['content'], $attribute );
+						$validate = $wpshop->validateForm($attribute_set_field['content'], $attribute);
 					}
-					if ( empty($wpshop->errors) ) {
-						$user_name = !empty($attribute['varchar']['user_login']) ? sanitize_text_field( $attribute['varchar']['user_login'] ) : sanitize_email( $attribute['varchar']['user_email'] );
-						$user_pass = ( !empty($attribute['varchar']['user_pass']) && !empty($_POST['wps_signup_account_creation']) ) ? sanitize_text_field( $attribute['varchar']['user_pass'] ) : wp_generate_password( 12, false );
+					if (empty($wpshop->errors)) {
+						$user_name = !empty($attribute['varchar']['user_login']) ? sanitize_text_field($attribute['varchar']['user_login']) : sanitize_email($attribute['varchar']['user_email']);
+						$user_pass = (!empty($attribute['varchar']['user_pass']) && !empty($_POST['wps_signup_account_creation'])) ? sanitize_text_field($attribute['varchar']['user_pass']) : wp_generate_password(12, false);
 
-						if ( $user_id == 0  ) {
-							$user_id = wp_create_user($user_name, $user_pass, sanitize_email( $attribute['varchar']['user_email'] ) );
-							if ( !is_object( $user_id) ) {
+						if ($user_id == 0) {
+							$user_id = wp_create_user($user_name, $user_pass, sanitize_email($attribute['varchar']['user_email']));
+							if (!is_object($user_id)) {
 								$account_creation = true;
 								/** Update newsletter user preferences **/
 								$newsletter_preferences = array();
-								$newsletters_site = !empty( $_POST['newsletters_site'] ) ? (bool) $_POST['newsletters_site'] : false;
-								if( $newsletters_site ) {
+								$newsletters_site = !empty($_POST['newsletters_site']) ? (bool)$_POST['newsletters_site'] : false;
+								if ($newsletters_site) {
 									$newsletter_preferences['newsletters_site'] = 1;
 								}
-								$newsletters_site_partners = !empty( $_POST['newsletters_site_partners'] ) ? (bool) $_POST['newsletters_site_partners'] : false;
-								if( $newsletters_site_partners ) {
+								$newsletters_site_partners = !empty($_POST['newsletters_site_partners']) ? (bool)$_POST['newsletters_site_partners'] : false;
+								if ($newsletters_site_partners) {
 									$newsletter_preferences['newsletters_site_partners'] = 1;
 								}
 
-								update_user_meta( $user_id, 'user_preferences', $newsletter_preferences);
+								update_user_meta($user_id, 'user_preferences', $newsletter_preferences);
 							}
 						}
 
-						$customer_entity_request = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
-						$customer_post_ID = $wpdb->get_var( $customer_entity_request );
+						$customer_entity_request = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
+						$customer_post_ID = $wpdb->get_var($customer_entity_request);
 
-						if( !empty( $attribute ) ) {
+						if (!empty($attribute)) {
 							$user_info = $address_forms = $all_addresses_form = array();
-							$billing_option = get_option( 'wpshop_billing_address' );
-							foreach( $attribute as $type => $attributes ) {
-								if( !empty( $billing_option['integrate_into_register_form'] ) && $billing_option['integrate_into_register_form'] == 'yes' && ctype_digit( (string) $type ) ) {
+							$billing_option = get_option('wpshop_billing_address');
+							foreach ($attribute as $type => $attributes) {
+								if (!empty($billing_option['integrate_into_register_form']) && $billing_option['integrate_into_register_form'] == 'yes' && ctype_digit((string)$type)) {
 									//wps_address::save_address_infos( (int) $type );
-									foreach( $attributes as $sub_type => $sub_attributes ) {
-										if( !is_array( $sub_attributes ) ) {
-											$address_forms[$type][$sub_type] = sanitize_text_field( $sub_attributes );
+									foreach ($attributes as $sub_type => $sub_attributes) {
+										if (!is_array($sub_attributes)) {
+											$address_forms[$type][$sub_type] = sanitize_text_field($sub_attributes);
 											continue;
 										}
-										foreach( $sub_attributes as $sub_meta => $sub_attribute_value ) {
-											$address_forms[$type][$sub_type][$sub_meta] = sanitize_text_field( $sub_attribute_value );
+										foreach ($sub_attributes as $sub_meta => $sub_attribute_value) {
+											$address_forms[$type][$sub_type][$sub_meta] = sanitize_text_field($sub_attribute_value);
 										}
 									}
 								} else {
-									foreach( $attributes as $meta => $attribute_value ) {
-										$user_info[$meta] = sanitize_text_field( $attribute_value );
-										if( !empty( $billing_option['integrate_into_register_form'] ) && $billing_option['integrate_into_register_form'] == 'yes' && isset( $billing_option['integrate_into_register_form_matching_field'], $billing_option['integrate_into_register_form_matching_field'][$meta] ) ) {
+									foreach ($attributes as $meta => $attribute_value) {
+										$user_info[$meta] = sanitize_text_field($attribute_value);
+										if (!empty($billing_option['integrate_into_register_form']) && $billing_option['integrate_into_register_form'] == 'yes' && isset($billing_option['integrate_into_register_form_matching_field'], $billing_option['integrate_into_register_form_matching_field'][$meta])) {
 											$all_addresses_form[$type][$meta] = $user_info[$meta];
 										}
 									}
 								}
 							}
-							wps_customer_ctr::save_customer_synchronize( $customer_post_ID, $user_id, $user_info );
-							foreach( $address_forms as $type_of_form => $address_form ) {
-								$address_form = array_merge_recursive( $all_addresses_form, $address_form );
-								wps_address::save_address_infos( (int) $type_of_form, 0, array( 'type_of_form' => (int) $type_of_form, 'attribute' => array( $type_of_form => $address_form ) ), $customer_post_ID );
+							wps_customer_ctr::save_customer_synchronize($customer_post_ID, $user_id, $user_info);
+							foreach ($address_forms as $type_of_form => $address_form) {
+								$address_form = array_merge_recursive($all_addresses_form, $address_form);
+								wps_address::save_address_infos((int)$type_of_form, 0, array('type_of_form' => (int)$type_of_form, 'attribute' => array($type_of_form => $address_form)), $customer_post_ID);
 							}
 						}
 
-						if ( !empty( $_SESSION ) && !empty( $_SESSION[ 'cart' ] ) ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ));
-							$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
+						if (!empty($_SESSION) && !empty($_SESSION['cart'])) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$result = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=3';
 						}
 						else {
-							$account_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ));
-							$result = get_permalink( $account_page_id  );
+							$account_page_id = wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'));
+							$result = get_permalink($account_page_id);
 						}
 						$status = true;
 
-						if ( $account_creation && !empty( $user_id ) && $connect ) {
+						if ($account_creation && !empty($user_id) && $connect) {
 							$secure_cookie = is_ssl() ? true : false;
-							wp_set_auth_cookie( $user_id, true, $secure_cookie );
+							wp_set_auth_cookie($user_id, true, $secure_cookie);
 						}
-						$wps_message->wpshop_prepared_email( sanitize_email($attribute['varchar']['user_email']), 'WPSHOP_SIGNUP_MESSAGE', array('customer_first_name' => ( !empty($attribute['varchar']['first_name']) ) ? sanitize_text_field( $attribute['varchar']['first_name'] ) : '', 'customer_last_name' => ( !empty($attribute['varchar']['last_name']) ) ? sanitize_text_field( $attribute['varchar']['last_name'] ) : '', 'customer_user_email' => ( !empty($attribute['varchar']['user_email']) ) ? sanitize_email( $attribute['varchar']['user_email'] ) : '') );
+						$wps_message->wpshop_prepared_email(sanitize_email($attribute['varchar']['user_email']), 'WPSHOP_SIGNUP_MESSAGE', array('customer_first_name' => (!empty($attribute['varchar']['first_name'])) ? sanitize_text_field($attribute['varchar']['first_name']) : '', 'customer_last_name' => (!empty($attribute['varchar']['last_name'])) ? sanitize_text_field($attribute['varchar']['last_name']) : '', 'customer_user_email' => (!empty($attribute['varchar']['user_email'])) ? sanitize_email($attribute['varchar']['user_email']) : ''));
 
 					} else {
-						$result = '<div class="wps-alert-error">' .__('Some errors have been detected', 'wpshop') . ' : <ul>';
-						foreach(  $wpshop->errors as $error ){
-							$result .= '<li>' .$error. '</li>';
+						$result = '<div class="wps-alert-error">' . __('Some errors have been detected', 'wpshop') . ' : <ul>';
+						foreach ($wpshop->errors as $error) {
+							$result .= '<li>' . $error . '</li>';
 						}
 						$result .= '</div>';
 					}
@@ -543,7 +543,7 @@ 
 			}
 		}
 
-		wp_die( json_encode( array( $status, $result, $user_id ) ) );
+		wp_die(json_encode(array($status, $result, $user_id)));
 	}
 
 	/** SIGN UP - Display the commercial & newsletter form
@@ -551,10 +551,10 @@ 
 	 */
 	function display_commercial_newsletter_form() {
 		$output = '';
-		$user_preferences = get_user_meta( get_current_user_id(), 'user_preferences', true );
-		$wpshop_cart_option = get_option( 'wpshop_cart_option' );
+		$user_preferences = get_user_meta(get_current_user_id(), 'user_preferences', true);
+		$wpshop_cart_option = get_option('wpshop_cart_option');
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup", "newsletter") );
+		require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup", "newsletter"));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -565,88 +565,88 @@ 
 	 * ACCOUNT - Display Account informations
 	 * @return string
 	 */
-	function display_account_informations( $customer_id = '', $force_edition_form = false, $customer_link = false ) {
+	function display_account_informations($customer_id = '', $force_edition_form = false, $customer_link = false) {
 		global $wpdb;
 		$output = $attributes_sections_tpl = $attribute_details = '';
-		$is_from_admin = ( !empty($customer_id) ) ? true : false;
-		$customer_id = ( !empty($customer_id) ) ? $customer_id : get_current_user_id();
-		if( $customer_id != 0 ) {
+		$is_from_admin = (!empty($customer_id)) ? true : false;
+		$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+		if ($customer_id != 0) {
 			$screen = get_current_screen();
-			if( ( is_admin() && isset( $screen ) && is_object( $screen ) && $screen->post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) || $force_edition_form ) {
-				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id );
-				$cid = $wpdb->get_var( $query );
+			if ((is_admin() && isset($screen) && is_object($screen) && $screen->post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) || $force_edition_form) {
+				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id);
+				$cid = $wpdb->get_var($query);
 
 				$fields_to_output = $signup_fields = array();
 
-				$password_attribute = $signup_form_attributes =  array();
+				$password_attribute = $signup_form_attributes = array();
 
-				$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-				$customer_entity_id = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+				$customer_entity_id = $wpdb->get_var($query);
 				$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-				$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-				$query = $wpdb->prepare('SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d', $attributes_set->id );
-				$customer_attributes_sections = $wpdb->get_results( $query );
-				foreach( $customer_attributes_sections as $k => $attributes_section ) {
+				$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d', $attributes_set->id);
+				$customer_attributes_sections = $wpdb->get_results($query);
+				foreach ($customer_attributes_sections as $k => $attributes_section) {
 					$signup_fields[$attributes_section->name] = array();
-					if ( !empty( $account_attributes[$attributes_section->id] ) ) {
-						foreach( $account_attributes[$attributes_section->id]['attribut'] as $attribute ) {
+					if (!empty($account_attributes[$attributes_section->id])) {
+						foreach ($account_attributes[$attributes_section->id]['attribut'] as $attribute) {
 							$signup_fields[$attributes_section->name][] = $attribute;
 						}
 					}
 				}
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"backend", "customer-informations/customer_informations_form") );
+				require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "backend", "customer-informations/customer_informations_form"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			} else {
-				$customer_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id );
-				$cid = $wpdb->get_var( $query );
-
-				if( !empty($customer_entity_id) ) {
-					$query = $wpdb->prepare( 'SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d AND status = %s AND default_set = %s', $customer_entity_id, 'valid', 'yes' );
-					$attributes_sets = $wpdb->get_results( $query );
-					foreach( $attributes_sets as $attributes_set ) {
-						if( !empty($attributes_set->id) ) {
-							$query = $wpdb->prepare( 'SELECT * FROM '. WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
-							$attributes_sections = $wpdb->get_results( $query );
-
-							if( !empty($attributes_sections) ) {
-								foreach( $attributes_sections as $attributes_section ) {
-									$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE status = %s AND entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', 'valid', $customer_entity_id, $attributes_set->id, $attributes_section->id);
-									$attributes_details = $wpdb->get_results( $query );
-
-									foreach( $attributes_details as $attributes_detail ) {
-										$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE id = %d AND status = %s', $attributes_detail->attribute_id, 'valid' );
-										$attribute_def = $wpdb->get_row( $query );
-
-										$query = $wpdb->prepare( 'SELECT value  FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.strtolower($attribute_def->data_type). ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_id, $attribute_def->id, $cid );
-										$attribute_value = $wpdb->get_var( $query );
+				$customer_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id);
+				$cid = $wpdb->get_var($query);
+
+				if (!empty($customer_entity_id)) {
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s AND default_set = %s', $customer_entity_id, 'valid', 'yes');
+					$attributes_sets = $wpdb->get_results($query);
+					foreach ($attributes_sets as $attributes_set) {
+						if (!empty($attributes_set->id)) {
+							$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
+							$attributes_sections = $wpdb->get_results($query);
+
+							if (!empty($attributes_sections)) {
+								foreach ($attributes_sections as $attributes_section) {
+									$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE status = %s AND entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', 'valid', $customer_entity_id, $attributes_set->id, $attributes_section->id);
+									$attributes_details = $wpdb->get_results($query);
+
+									foreach ($attributes_details as $attributes_detail) {
+										$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d AND status = %s', $attributes_detail->attribute_id, 'valid');
+										$attribute_def = $wpdb->get_row($query);
+
+										$query = $wpdb->prepare('SELECT value  FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($attribute_def->data_type) . ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_id, $attribute_def->id, $cid);
+										$attribute_value = $wpdb->get_var($query);
 
 										/**	Check attribute type for specific type display	*/
-										if ( "datetime" == $attribute_def->data_type ) {
-											$attribute_value = mysql2date( get_option( 'date_format' ) . ( ( substr( $attribute_value, -9 ) != ' 00:00:00' ) ? ' ' . get_option( 'time_format' ) : '' ), $attribute_value, true);
+										if ("datetime" == $attribute_def->data_type) {
+											$attribute_value = mysql2date(get_option('date_format') . ((substr($attribute_value, -9) != ' 00:00:00') ? ' ' . get_option('time_format') : ''), $attribute_value, true);
 										}
 
 										/**	Check attribute input type in order to get specific value	*/
-										if ( in_array( $attribute_def->backend_input, array( 'multiple-select', 'select', 'radio', 'checkbox' ) ) ) {
-											if ( $attribute_def->data_type_to_use == 'custom' ) {
-												$query = $wpdb->prepare("SELECT label FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' AND id = %d", $attribute_def->id, $attribute_value );
-												$attribute_value = $wpdb->get_var( $query );
+										if (in_array($attribute_def->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'))) {
+											if ($attribute_def->data_type_to_use == 'custom') {
+												$query = $wpdb->prepare("SELECT label FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' AND id = %d", $attribute_def->id, $attribute_value);
+												$attribute_value = $wpdb->get_var($query);
 											}
-											else if ( $attribute_def->data_type_to_use == 'internal')  {
-												$associated_post = get_post( $atribute_value );
+											else if ($attribute_def->data_type_to_use == 'internal') {
+												$associated_post = get_post($atribute_value);
 												$attribute_value = $associated_post->post_title;
 											}
 										}
 
-										if( !empty( $attribute_def ) ) {
-											if( $attribute_def->frontend_input != 'password' ) {
+										if (!empty($attribute_def)) {
+											if ($attribute_def->frontend_input != 'password') {
 												ob_start();
-												require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_informations_element") );
+												require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations_element"));
 												$attribute_details .= ob_get_contents();
 												ob_end_clean();
 											}
@@ -654,7 +654,7 @@ 
 									}
 
 									ob_start();
-									require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_informations_group_element") );
+									require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations_group_element"));
 									$attributes_sections_tpl .= ob_get_contents();
 									ob_end_clean();
 
@@ -665,7 +665,7 @@ 
 					}
 				}
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations") );
+				require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -679,85 +679,85 @@ 
 	function account_informations_form() {
 		global $wpdb;
 		$output = '';
-		if ( get_current_user_id() != 0 ) {
+		if (get_current_user_id() != 0) {
 			// Customer ID data
-				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id() );
-				$cid = $wpdb->get_var( $query );
+				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id());
+				$cid = $wpdb->get_var($query);
 
 				$fields_to_output = $signup_fields = array();
 
-				$password_attribute = $signup_form_attributes =  array();
+				$password_attribute = $signup_form_attributes = array();
 
-				$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-				$customer_entity_id = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+				$customer_entity_id = $wpdb->get_var($query);
 				$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-				$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d', $attributes_set->id );
-				$customer_attributes_sections = $wpdb->get_results( $query );
-				foreach( $customer_attributes_sections as $k => $customer_attributes_section ) {
-					if ( !empty( $account_attributes[$customer_attributes_section->id] ) ) {
-						foreach( $account_attributes[$customer_attributes_section->id]['attribut'] as $attribute ) {
+				$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d', $attributes_set->id);
+				$customer_attributes_sections = $wpdb->get_results($query);
+				foreach ($customer_attributes_sections as $k => $customer_attributes_section) {
+					if (!empty($account_attributes[$customer_attributes_section->id])) {
+						foreach ($account_attributes[$customer_attributes_section->id]['attribut'] as $attribute) {
 							$signup_fields[] = $attribute;
 						}
 					}
 				}
 
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_form") );
+			require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_form"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
 		return $output;
 	}
 
-	function save_account_informations( $cid, $args, $admin = true ) {
+	function save_account_informations($cid, $args, $admin = true) {
 		global $wpdb, $wpshop;
 
-		$exclude_user_meta = array( 'user_email', 'user_pass' );
+		$exclude_user_meta = array('user_email', 'user_pass');
 		$wps_entities = new wpshop_entities();
-		$element_id = $wps_entities->get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+		$element_id = $wps_entities->get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-		$query = $wpdb->prepare( 'SELECT post_author FROM ' .$wpdb->posts. ' WHERE post_type = %s AND ID = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $cid );
-		$user_id = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT post_author FROM ' . $wpdb->posts . ' WHERE post_type = %s AND ID = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $cid);
+		$user_id = $wpdb->get_var($query);
 
 		$user_name = !empty($args['attribute']['varchar']['user_login']) ? $args['attribute']['varchar']['user_login'] : $args['attribute']['varchar']['user_email'];
 		$user_pass = !empty($args['attribute']['varchar']['user_pass']) ? $args['attribute']['varchar']['user_pass'] : '';
 
-		$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $element_id );
-		$attribute_set_id = $wpdb->get_var( $query );
-		if ( !empty($attribute_set_id) ) {
-			$group  = wps_address::get_addresss_form_fields_by_type( $attribute_set_id );
+		$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id);
+		$attribute_set_id = $wpdb->get_var($query);
+		if (!empty($attribute_set_id)) {
+			$group = wps_address::get_addresss_form_fields_by_type($attribute_set_id);
 			//Save data in attribute tables, ckeck first if exist to know if Insert or Update
-			wpshop_attributes::saveAttributeForEntity( $args['attribute'], $element_id, $cid );
-			foreach ( $group as $attribute_sets ) {
-				foreach ( $attribute_sets as $attribute_set_field ) {
-					if( $admin ) {
-						$validate = $wpshop->validateForm($attribute_set_field['content'], $args['attribute'] );
+			wpshop_attributes::saveAttributeForEntity($args['attribute'], $element_id, $cid);
+			foreach ($group as $attribute_sets) {
+				foreach ($attribute_sets as $attribute_set_field) {
+					if ($admin) {
+						$validate = $wpshop->validateForm($attribute_set_field['content'], $args['attribute']);
 					}
-					if ( empty($wpshop->errors) || !$admin ) {
+					if (empty($wpshop->errors) || !$admin) {
 						$wpshop_attributes = new wpshop_attributes();
-						foreach( $attribute_set_field['content'] as $attribute ) {
-							$attribute_def = wpshop_attributes::getElement( $attribute['name'], "'valid'", 'code');
-							if ( !in_array( $attribute['name'], $exclude_user_meta ) ) {
-								update_user_meta( $user_id, $attribute['name'], wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']])  );
+						foreach ($attribute_set_field['content'] as $attribute) {
+							$attribute_def = wpshop_attributes::getElement($attribute['name'], "'valid'", 'code');
+							if (!in_array($attribute['name'], $exclude_user_meta)) {
+								update_user_meta($user_id, $attribute['name'], wpshop_tools::varSanitizer($args['attribute'][$attribute['data_type']][$attribute['name']]));
 							}
 							else {
-								wp_update_user( array('ID' => $user_id, $attribute['name'] => wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']]) ) );
+								wp_update_user(array('ID' => $user_id, $attribute['name'] => wpshop_tools::varSanitizer($args['attribute'][$attribute['data_type']][$attribute['name']])));
 							}
 						}
 
 						/** Update newsletter user preferences **/
 						$newsletter_preferences = array();
-						if( !empty($args['newsletters_site']) ) {
+						if (!empty($args['newsletters_site'])) {
 							$newsletter_preferences['newsletters_site'] = 1;
 						}
-						if( !empty($args['newsletters_site_partners']) ) {
+						if (!empty($args['newsletters_site_partners'])) {
 							$newsletter_preferences['newsletters_site_partners'] = 1;
 						}
-						update_user_meta( $user_id, 'user_preferences', $newsletter_preferences);
+						update_user_meta($user_id, 'user_preferences', $newsletter_preferences);
 					} else {
 						return $wpshop->errors;
 					}
@@ -769,22 +769,22 @@ 
 	/**
 	 * ACCOUNT - Save account informations
 	 */
-	function wps_save_account_informations () {
-		check_ajax_referer( 'wps_save_account_informations' );
+	function wps_save_account_informations() {
+		check_ajax_referer('wps_save_account_informations');
 
 		global $wpdb;
 		$status = false; $response = '';
 
 		$user_id = get_current_user_id();
-		if ( !empty($user_id) ) {
-			$query = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id );
-			$cid = $wpdb->get_var( $query );
+		if (!empty($user_id)) {
+			$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
+			$cid = $wpdb->get_var($query);
 		}
 
-		$errors = $this->save_account_informations( $cid, $_POST );
-		if( !empty( $errors ) ) {
-			$response = '<div class="wps-alert-error">' .__('Some errors have been detected', 'wpshop') . ' : <ul>';
-			foreach( $errors as $error ){
+		$errors = $this->save_account_informations($cid, $_POST);
+		if (!empty($errors)) {
+			$response = '<div class="wps-alert-error">' . __('Some errors have been detected', 'wpshop') . ' : <ul>';
+			foreach ($errors as $error) {
 				$response .= '<li>' . $error . '</li>';
 			}
 			$response .= '</div>';
@@ -793,7 +793,7 @@ 
 			$status = true;
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'response' => $response) ) );
+		wp_die(json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 	/**
@@ -804,23 +804,23 @@ 
 
 		$status = false;
 		$response = do_shortcode('[wps_account_informations]');
-		if( !empty($response) ) {
+		if (!empty($response)) {
 			$status = true;
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'response' => $response ) ) );
+		wp_die(json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 	/**
 	 * ACCOUNT - AJAX - Fill account informations modal
 	 */
 	function wps_fill_account_informations_modal() {
-		check_ajax_referer( 'wps_fill_account_informations_modal' );
+		check_ajax_referer('wps_fill_account_informations_modal');
 
 		$title = $content = '';
 		$title = __('Edit your account informations', 'wpshop');
-		$content = do_shortcode( '[wps_account_informations_form]' );
-		echo json_encode( array( 'status' => true, 'title' => $title, 'content' => $content) );
+		$content = do_shortcode('[wps_account_informations_form]');
+		echo json_encode(array('status' => true, 'title' => $title, 'content' => $content));
 		wp_die();
 	}
 

Braces +40 added lines, -51 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_account_ctr {
 	/** Define the main directory containing the template for the current plugin
 	* @var string
@@ -81,15 +83,13 @@ 
 		$args = array();
 		if ( get_current_user_id() != 0 ) {
 			return __( 'You are already logged', 'wpshop');
-		}
-		else {
+		} else {
 			$action = !empty( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : '';
 			$key = !empty( $_GET['key'] ) ? sanitize_text_field( $_GET['key'] ) : '';
 			$login = !empty( $_GET['login'] ) ? sanitize_text_field( $_GET['login'] ) : 0;
 			if ( !empty($action) && $action == 'retrieve_password' && !empty($key) && !empty($login) && !$force_login ) {
 				$output = self::get_renew_password_form();
-			}
-			else {
+			} else {
 				ob_start();
 				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form") );
 				$output = ob_get_contents();
@@ -107,8 +107,9 @@ 
 
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'control_login_form_request' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'control_login_form_request' ) ) {
+					wp_die();
+		}
 
 		$result = '';
 		$status = false;
@@ -122,8 +123,7 @@ 
 			$user_checking = get_user_by( 'login', $wps_login_user_login );
 			if( !empty($user_checking) ) {
 				$creds['user_login'] = $wps_login_user_login;
-			}
-			else {
+			} else {
 				if ( is_email($wps_login_user_login) ) {
 					$user_checking = get_user_by( 'email', $wps_login_user_login );
 					$creds['user_login'] = $user_checking->user_login;
@@ -134,20 +134,17 @@ 
 			$user = wp_signon( $creds, false );
 			if ( is_wp_error($user) ) {
 				$result = '<div class="wps-alert-error">' .__('Connexion error', 'wpshop'). '</div>';
-			}
-			else {
+			} else {
 				$permalink_option = get_option( 'permalink_structure' );
 				$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 				if( $origin == $page_account_id ) {
 					$result = get_permalink( $page_account_id );
-				}
-				else {
+				} else {
 					$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
 				}
 				$status = true;
 			}
-		}
-		else {
+		} else {
 			$result = '<div class="wps-alert-error">' .__('E-Mail and Password are required', 'wpshop'). '</div>';
 		}
 
@@ -161,8 +158,9 @@ 
 	function wps_ajax_get_login_form_interface() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_get_login_form_interface' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_get_login_form_interface' ) ) {
+					wp_die();
+		}
 
 		$response = array( 'status' => true, 'response' => self::get_login_form() );
 		echo json_encode( $response );
@@ -185,8 +183,9 @@ 
 	function wps_login_first_request() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_login_first_request' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_login_first_request' ) ) {
+					wp_die();
+		}
 
 		$status = false; $login_action = false; $response = '';
 		$user_email = ( !empty($_POST['email_address']) ) ? wpshop_tools::varSanitizer( $_POST['email_address'] ) : null;
@@ -198,8 +197,7 @@ 
 				$login_action = true;
 				$user_firstname = get_user_meta( $checking_user->ID, 'first_name', true );
 				$response = $user_firstname;
-			}
-			else {
+			} else {
 				$checking_user = get_user_by( 'email', $user_email);
 				if ( !empty( $checking_user ) ) {
 					$login_action = true;
@@ -211,8 +209,7 @@ 
 			if( !$login_action && is_email($user_email)  ) {
 				$response = $user_email;
 			}
-		}
-		else {
+		} else {
 			$response = '<div class="wps-alert-error">' .__( 'An e-mail address is required', 'wpshop' ). '</div>';
 		}
 		echo json_encode( array( 'status'=> $status, 'response' => $response, 'login_action' => $login_action) );
@@ -239,8 +236,9 @@ 
 	function wps_fill_forgot_password_modal() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_fill_forgot_password_modal' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_fill_forgot_password_modal' ) ) {
+					wp_die();
+		}
 
 		$status = false; $title = $content = '';
 		$title = __( 'Forgot password', 'wpshop' );
@@ -256,8 +254,9 @@ 
 	function wps_forgot_password_request() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_forgot_password_request' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_forgot_password_request' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$status = false; $result = '';
@@ -268,8 +267,7 @@ 
 			$exist_user = get_user_by('login', $user_login);
 			if( !empty($exist_user) ) {
 				$existing_user = true;
-			}
-			else {
+			} else {
 				$exist_user = get_user_by('email', $user_login);
 				$key_for_update = 'user_email';
 				if ( !empty($exist_user) ) {
@@ -286,12 +284,10 @@ 
 				$this->send_forgot_password_email($key, $user_login, $exist_user);
 				$result = '<div class="wps-alert-info">' .__('An e-mail with an password renew link has been sent to you', 'wpshop'). '</div>';
 				$status = true;
-			}
-			else {
+			} else {
 				$result = '<div class="wps-alert-error">' .__('No customer account corresponds to this email', 'wpshop'). '</div>';
 			}
-		}
-		else {
+		} else {
 			$result = '<div class="wps-alert-error">' .__('Please fill the required field', 'wpshop'). '</div>';
 		}
 		$response = array( $status, $result );
@@ -336,8 +332,7 @@ 
 				$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $activation_key, $login ) );
 				if( !empty($user) ) {
 					$existing_user = true;
-				}
-				else {
+				} else {
 					$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_email = %s", $activation_key, $login ) );
 					if( !empty($user) ) {
 						$existing_user = true;
@@ -350,16 +345,13 @@ 
 					$status = true;
 					$result = '<div class="wps-alert-success">' .__('Your password has been updated', 'wpshop'). '. <a href="#" id="display_connexion_form"> ' .__('Connect you', 'wpshop').' !</a></div>';
 					$form = self::get_login_form( true );
-				}
-				else {
+				} else {
 					$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
 				}
-			}
-			else {
+			} else {
 				$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
 			}
-		}
-		else {
+		} else {
 			$result = '<div class="wps-alert-error">' .__('Password and confirmation password are differents', 'wpshop'). '</div>';
 		}
 
@@ -431,8 +423,9 @@ 
 	function wps_save_signup_form( $connect = false ) {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_signup_form' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_signup_form' ) ) {
+					wp_die();
+		}
 
 		global $wpdb, $wpshop;
 		$user_id = ( !empty( $_POST['wps_sign_up_request_from_admin'] ) ) ? (int) $_POST['wps_sign_up_request_from_admin'] : get_current_user_id();
@@ -518,8 +511,7 @@ 
 							$permalink_option = get_option( 'permalink_structure' );
 							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ));
 							$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
-						}
-						else {
+						} else {
 							$account_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ));
 							$result = get_permalink( $account_page_id  );
 						}
@@ -636,8 +628,7 @@ 
 											if ( $attribute_def->data_type_to_use == 'custom' ) {
 												$query = $wpdb->prepare("SELECT label FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' AND id = %d", $attribute_def->id, $attribute_value );
 												$attribute_value = $wpdb->get_var( $query );
-											}
-											else if ( $attribute_def->data_type_to_use == 'internal')  {
+											} else if ( $attribute_def->data_type_to_use == 'internal')  {
 												$associated_post = get_post( $atribute_value );
 												$attribute_value = $associated_post->post_title;
 											}
@@ -743,8 +734,7 @@ 
 							$attribute_def = wpshop_attributes::getElement( $attribute['name'], "'valid'", 'code');
 							if ( !in_array( $attribute['name'], $exclude_user_meta ) ) {
 								update_user_meta( $user_id, $attribute['name'], wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']])  );
-							}
-							else {
+							} else {
 								wp_update_user( array('ID' => $user_id, $attribute['name'] => wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']]) ) );
 							}
 						}
@@ -788,8 +778,7 @@ 
 				$response .= '<li>' . $error . '</li>';
 			}
 			$response .= '</div>';
-		}
-		else {
+		} else {
 			$status = true;
 		}
 

includes/modules/wps_help/controller/wps_help_menus_ctr.php

Doc Comments +6 added lines

@@ -77,6 +77,12 @@
 		}
 	}
 
+	/**
+	 * @param string $page_title
+	 * @param string $menu_title
+	 * @param string $menu_slug
+	 * @param string[] $callback
+	 */
 	public function set_submenu_page_help( $page_title, $menu_title, $menu_slug, $callback ) {
 		$this->sub_menus[$menu_slug] = array(
 			'page_title'	=> $page_title

Indentation +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
 	}
 
 	/**
-	* Appelle le template dans wps_installer backend about / Call the template in wps_installer backend about
-	*/
+	 * Appelle le template dans wps_installer backend about / Call the template in wps_installer backend about
+	 */
 	public function render_menu() {
 		require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "about" ) );
 	}

Spacing +16 added lines, -16 removed lines

@@ -1,20 +1,20 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_help_menus_ctr {
 	public $sub_menus;
 
 	public function __construct() {
-		$this->set_submenu_page_help( __( 'Shortcodes', 'wpshop' ), __( 'Shortcodes', 'wpshop' ), WPSHOP_URL_SLUG_SHORTCODES, array( 'wpshop_display', 'display_page' ) );
+		$this->set_submenu_page_help(__('Shortcodes', 'wpshop'), __('Shortcodes', 'wpshop'), WPSHOP_URL_SLUG_SHORTCODES, array('wpshop_display', 'display_page'));
 
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-		add_action( 'menu_order', array( $this, 'admin_menu_order' ), 12 );
-		add_action( 'custom_menu_order', array( $this, 'admin_custom_menu_order' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
+		add_action('menu_order', array($this, 'admin_menu_order'), 12);
+		add_action('custom_menu_order', array($this, 'admin_custom_menu_order'));
 	}
 
 	/**
 	 * Ajout du menu pour le logiciel de caisse dans le backend / Create a new administration menu into backend
 	 */
 	public function admin_menu() {
-		add_menu_page( __( 'Help', 'wpshop' ), __( 'Help', 'wpshop' ), 'wpshop_view_dashboard', WPSHOP_URL_SLUG_ABOUT, array($this, 'render_menu'), 'dashicons-editor-help' );
+		add_menu_page(__('Help', 'wpshop'), __('Help', 'wpshop'), 'wpshop_view_dashboard', WPSHOP_URL_SLUG_ABOUT, array($this, 'render_menu'), 'dashicons-editor-help');
 
 		$this->create_submenu_page_help();
 	}
@@ -23,7 +23,7 @@ 
 	* Appelle le template dans wps_installer backend about / Call the template in wps_installer backend about
 	*/
 	public function render_menu() {
-		require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "about" ) );
+		require_once(wpshop_tools::get_template_part(WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "about"));
 	}
 
 	/**
@@ -33,19 +33,19 @@ 
 	 *
 	 * @return array The new admin menu order with the POS addon placed
 	 */
-	public function admin_menu_order( $current_menu_order ) {
+	public function admin_menu_order($current_menu_order) {
 		/**	Create a new menu order	*/
 		$wps_pos_menu_ordered = array();
 
 		/**	Read the current existing menu order for rearrange it	*/
-		foreach ( $current_menu_order as $menu_item ) {
-			if ( 'edit.php?post_type=wps_highlighting' == $menu_item ) {
+		foreach ($current_menu_order as $menu_item) {
+			if ('edit.php?post_type=wps_highlighting' == $menu_item) {
 				$wps_pos_menu_ordered[] = 'edit.php?post_type=wps_highlighting';
 				$wps_pos_menu_ordered[] = WPSHOP_URL_SLUG_ABOUT;
 
-				unset( $current_menu_order[ array_search( WPSHOP_URL_SLUG_ABOUT, $current_menu_order ) ] );
+				unset($current_menu_order[array_search(WPSHOP_URL_SLUG_ABOUT, $current_menu_order)]);
 			}
-			else if ( WPSHOP_URL_SLUG_ABOUT != $menu_item ) {
+			else if (WPSHOP_URL_SLUG_ABOUT != $menu_item) {
 				$wps_pos_menu_ordered[] = $menu_item;
 			}
 		}
@@ -59,12 +59,12 @@ 
 	 * @return boolean A boolean var defining if we apply admin menu reorder for current user
 	 */
 	public function admin_custom_menu_order() {
-		return current_user_can( 'manage_options' );
+		return current_user_can('manage_options');
 	}
 
 	public function create_submenu_page_help() {
-		if( is_array( $this->sub_menus ) ) {
-		foreach ( $this->sub_menus as $slug => $data )
+		if (is_array($this->sub_menus)) {
+		foreach ($this->sub_menus as $slug => $data)
 			{
 				add_submenu_page(
 				WPSHOP_URL_SLUG_ABOUT
@@ -77,7 +77,7 @@ 
 		}
 	}
 
-	public function set_submenu_page_help( $page_title, $menu_title, $menu_slug, $callback ) {
+	public function set_submenu_page_help($page_title, $menu_title, $menu_slug, $callback) {
 		$this->sub_menus[$menu_slug] = array(
 			'page_title'	=> $page_title
 			,'menu_title'	=> $menu_title

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_help_menus_ctr {
 	public $sub_menus;
 
@@ -44,8 +46,7 @@ 
 				$wps_pos_menu_ordered[] = WPSHOP_URL_SLUG_ABOUT;
 
 				unset( $current_menu_order[ array_search( WPSHOP_URL_SLUG_ABOUT, $current_menu_order ) ] );
-			}
-			else if ( WPSHOP_URL_SLUG_ABOUT != $menu_item ) {
+			} else if ( WPSHOP_URL_SLUG_ABOUT != $menu_item ) {
 				$wps_pos_menu_ordered[] = $menu_item;
 			}
 		}

includes/modules/wps_installer/model/wps_installer_model.php

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 	 * Save the current state of installation process
 	 *
 	 * @param string $setted_state A parameter setted for saving the state of installation ( in progress, completed, ignored )
-	 * @param array $current_db_version The current value for database version option
+	 * @param string $current_db_version The current value for database version option
 	 */
 	function installer_state_saver( $setted_state, $current_db_version ) {
 		$current_db_version['installation_state'] = $setted_state;

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Module controller class definition file
  *

Spacing +31 added lines, -31 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Module controller class definition file
  *
@@ -28,34 +28,34 @@ 
 	 *
 	 * @param integer $the_step_to_save The current step to save
 	 */
-	function save_step( $the_step_to_save ) {
+	function save_step($the_step_to_save) {
 
-		switch ( $the_step_to_save ) {
+		switch ($the_step_to_save) {
 			case 1:
 				/**	Save company informations	*/
-				$wpshop_company_info = !empty( $_POST['wpshop_company_info'] ) ? sanitize_text_field( $_POST['wpshop_company_info'] ) : '';
-				if ( !empty( $wpshop_company_info ) ) {
-					update_option( 'wpshop_company_info', $wpshop_company_info );
+				$wpshop_company_info = !empty($_POST['wpshop_company_info']) ? sanitize_text_field($_POST['wpshop_company_info']) : '';
+				if (!empty($wpshop_company_info)) {
+					update_option('wpshop_company_info', $wpshop_company_info);
 				}
 
 				/**	Save the company logo in case a file is sended	*/
-				$shop_logo = !empty( $_POST['wpshop_logo'] ) ? sanitize_text_field( $_POST['wpshop_logo'] ) : '';
-				if ( !empty( $shop_logo ) ) {
-					update_option( 'wpshop_logo', $shop_logo );
+				$shop_logo = !empty($_POST['wpshop_logo']) ? sanitize_text_field($_POST['wpshop_logo']) : '';
+				if (!empty($shop_logo)) {
+					update_option('wpshop_logo', $shop_logo);
 				}
 				break;
 
 			case 2:
 				/**	Save shop type	*/
-				$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST[ 'wpshop_shop_type' ] ) : '';
-				if ( !empty( $wpshop_shop_type ) ) {
-					update_option( 'wpshop_shop_type', $wpshop_shop_type );
+				$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+				if (!empty($wpshop_shop_type)) {
+					update_option('wpshop_shop_type', $wpshop_shop_type);
 				}
 
 				/**	Save shop price piloting	*/
-				$wpshop_shop_price_piloting = !empty( $_POST[ 'wpshop_shop_price_piloting' ] ) ? sanitize_text_field( $_POST[ 'wpshop_shop_price_piloting' ] ) : '';
-				if ( !empty( $wpshop_shop_price_piloting ) ) {
-					update_option( 'wpshop_shop_price_piloting', $wpshop_shop_price_piloting );
+				$wpshop_shop_price_piloting = !empty($_POST['wpshop_shop_price_piloting']) ? sanitize_text_field($_POST['wpshop_shop_price_piloting']) : '';
+				if (!empty($wpshop_shop_price_piloting)) {
+					update_option('wpshop_shop_price_piloting', $wpshop_shop_price_piloting);
 				}
 
 				/**	Insert default pages	*/
@@ -63,21 +63,21 @@ 
 				//add_action( 'init', array( 'wps_message_ctr', 'create_default_message' ) );
 
 				/**	In case the user want to insert default datas	*/
-				$wps_installer_data_insertion = !empty( $_POST[ 'wps-installer-data-insertion' ] ) ? sanitize_text_field( $_POST[ 'wps-installer-data-insertion' ] ) : '';
-				if ( !empty( $wps_installer_data_insertion ) && ( 'yes' == $wps_installer_data_insertion ) ) {
+				$wps_installer_data_insertion = !empty($_POST['wps-installer-data-insertion']) ? sanitize_text_field($_POST['wps-installer-data-insertion']) : '';
+				if (!empty($wps_installer_data_insertion) && ('yes' == $wps_installer_data_insertion)) {
 					/**	Insert sample datas */
-					add_action( 'init', array( 'wpshop_install', 'import_sample_datas' ) );
+					add_action('init', array('wpshop_install', 'import_sample_datas'));
 				}
 
-				$wps_current_db_version = get_option( 'wpshop_db_options', 0 );
-				$wps_current_db_version[ 'installation_state' ] = 'completed';
-				$wps_current_db_version[ 'installation_date' ] = current_time( 'mysql', 0 );
-				update_option( 'wpshop_db_options', $wps_current_db_version );
+				$wps_current_db_version = get_option('wpshop_db_options', 0);
+				$wps_current_db_version['installation_state'] = 'completed';
+				$wps_current_db_version['installation_date'] = current_time('mysql', 0);
+				update_option('wpshop_db_options', $wps_current_db_version);
 				break;
 		}
 
-		if ( !empty( $the_step_to_save ) ) {
-			update_option( 'wps-installation-current-step', ( WPSINSTALLER_STEPS_COUNT != $the_step_to_save ? $the_step_to_save + 1 : WPSINSTALLER_STEPS_COUNT ) );
+		if (!empty($the_step_to_save)) {
+			update_option('wps-installation-current-step', (WPSINSTALLER_STEPS_COUNT != $the_step_to_save ? $the_step_to_save + 1 : WPSINSTALLER_STEPS_COUNT));
 		}
 	}
 
@@ -87,16 +87,16 @@ 
 	 * @param string $setted_state A parameter setted for saving the state of installation ( in progress, completed, ignored )
 	 * @param array $current_db_version The current value for database version option
 	 */
-	function installer_state_saver( $setted_state, $current_db_version ) {
+	function installer_state_saver($setted_state, $current_db_version) {
 		$current_db_version['installation_state'] = $setted_state;
-		$current_db_version[ 'installation_date' ] = current_time( 'mysql', 0 );
+		$current_db_version['installation_date'] = current_time('mysql', 0);
 		update_option('wpshop_db_options', $current_db_version);
 
-		if ( "ignored" == $current_db_version['installation_state'] ) {
+		if ("ignored" == $current_db_version['installation_state']) {
 			/**	Create the different pages	*/
-			if ( 2 >= get_option( 'wps-installation-current-step' ) ) {
-				update_option( 'wpshop_shop_price_piloting', 'TTC' );
-				update_option( 'wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE );
+			if (2 >= get_option('wps-installation-current-step')) {
+				update_option('wpshop_shop_price_piloting', 'TTC');
+				update_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
 
 				/**	Insert default pages	*/
 				//add_action( 'init', array( 'wpshop_install', 'wpshop_insert_default_pages' ) );
@@ -105,7 +105,7 @@ 
 			}
 
 			/**	Save the crrent step to 4 in order to consider that installation is done	*/
-			update_option( 'wps-installation-current-step', WPSINSTALLER_STEPS_COUNT );
+			update_option('wps-installation-current-step', WPSINSTALLER_STEPS_COUNT);
 		}
 
 		return $current_db_version;

includes/modules/wps_media_manager/controller/wps_media_manager_frontend_ctr.php

Doc Comments +4 added lines, -1 removed lines

@@ -70,7 +70,7 @@ 
 	/**
 	 * Get product Complete Sheet
 	 * @param integer $pid
-	 * @return Ambigous <string, string>
+	 * @return string <string, string>
 	 */
 	public static function get_product_complete_sheet_galery( $pid ) {
 		$output = '';
@@ -157,6 +157,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param integer $product_id
+	 */
 	public static function get_product_complete_sheet_attachments( $product_id ) {
 		$output = '';
 

Spacing +60 added lines, -60 removed lines

@@ -1,15 +1,15 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_media_manager_frontend_ctr {
 
-	public static function get_attachments( $pid, $type = 'gallery' ) {
+	public static function get_attachments($pid, $type = 'gallery') {
 		$attachments = array();
-		$media_id_data = get_post_meta( $pid, '_wps_product_media', true );
-		if( !empty($media_id_data) ) {
-			$media_id = explode( ',', $media_id_data );
-			foreach($media_id as $id) {
-				if( ( ( wp_attachment_is_image( $id ) && $type == 'gallery' ) || ( !empty( $id ) && !wp_attachment_is_image( $id ) && $type == 'attachments' ) ) ) {
-					$attachment_data = get_post( $id );
-					if( !empty( $attachment_data ) && !empty($attachment_data->ID) ) {
+		$media_id_data = get_post_meta($pid, '_wps_product_media', true);
+		if (!empty($media_id_data)) {
+			$media_id = explode(',', $media_id_data);
+			foreach ($media_id as $id) {
+				if (((wp_attachment_is_image($id) && $type == 'gallery') || (!empty($id) && !wp_attachment_is_image($id) && $type == 'attachments'))) {
+					$attachment_data = get_post($id);
+					if (!empty($attachment_data) && !empty($attachment_data->ID)) {
 						$attachments[] = $attachment_data;
 					}
 				}
@@ -26,13 +26,13 @@ 
 	 *
 	 * @return string The attachement gallery output
 	 */
-	public static function display_attachment_gallery( $attachement_type, $content ) {
+	public static function display_attachment_gallery($attachement_type, $content) {
 		$galery_output = '';
 
 		/*
 		 * Get the template part for given galery type
 		 */
-		switch ( $attachement_type ) {
+		switch ($attachement_type) {
 			case 'picture':
 					$template_part = 'product_attachment_picture_galery';
 				break;
@@ -52,7 +52,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]));
@@ -72,81 +72,81 @@ 
 	 * @param integer $pid
 	 * @return Ambigous <string, string>
 	 */
-	public static function get_product_complete_sheet_galery( $pid ) {
+	public static function get_product_complete_sheet_galery($pid) {
 		$output = '';
-		if( !empty($pid) ) {
+		if (!empty($pid)) {
 			$tpl_component = $sub_tpl_component = array();
 			$attachments = array();
 			$tpl_component['THUMBNAILS'] = '';
 			$tpl_component['SLIDER_CONTENT'] = '';
 
 			/**	Check and get the product thumbnail	*/
-			$principal_thumbnail_id = get_post_meta( $pid, '_thumbnail_id', true);
-			if( !empty($principal_thumbnail_id) ) {
-				$attachments[0] = get_post( $principal_thumbnail_id );
+			$principal_thumbnail_id = get_post_meta($pid, '_thumbnail_id', true);
+			if (!empty($principal_thumbnail_id)) {
+				$attachments[0] = get_post($principal_thumbnail_id);
 			}
 			else {
 				$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL'] = '';
-				$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
-				$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
+				$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
+				$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
 				$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL_ID'] = '';
 
-				$tpl_component[ 'SLIDER_CONTENT' ] .= wpshop_display::display_template_element( 'wps_product_complete_sheet_gallery_slider_element', $sub_tpl_component );
-				$tpl_component[ 'THUMBNAILS' ] = '';
+				$tpl_component['SLIDER_CONTENT'] .= wpshop_display::display_template_element('wps_product_complete_sheet_gallery_slider_element', $sub_tpl_component);
+				$tpl_component['THUMBNAILS'] = '';
 			}
 
 			/**	Get product associated pictures	*/
 			$allowed_mime_type = get_allowed_mime_types();
 
-			$attachments = array_merge( $attachments, (array)self::get_attachments( $pid ) );
+			$attachments = array_merge($attachments, (array)self::get_attachments($pid));
 
 			/**	In case there are picture read and display them into product sheet	*/
-			if ( !empty($attachments) ) {
-				foreach( $attachments as $attachment) {
-					if( !empty($attachment) && !empty($attachment->post_mime_type) && in_array( $attachment->post_mime_type, $allowed_mime_type ) ) {
+			if (!empty($attachments)) {
+				foreach ($attachments as $attachment) {
+					if (!empty($attachment) && !empty($attachment->post_mime_type) && in_array($attachment->post_mime_type, $allowed_mime_type)) {
 						//IMAGE SLIDER
-						$image_attributes = wp_get_attachment_metadata( $attachment->ID );
+						$image_attributes = wp_get_attachment_metadata($attachment->ID);
 						$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL'] = '';
 						$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL_ID'] = $attachment->ID;
-						if ( !empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes']) ) {
-							foreach ( $image_attributes['sizes'] as $size_name => $size_def) {
-								$p = wp_get_attachment_image( $attachment->ID, $size_name);
-								$src = wp_get_attachment_image_src( $attachment->ID, $size_name );
+						if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
+							foreach ($image_attributes['sizes'] as $size_name => $size_def) {
+								$p = wp_get_attachment_image($attachment->ID, $size_name);
+								$src = wp_get_attachment_image_src($attachment->ID, $size_name);
 								$sub_tpl_component['THUMBNAIL_GALLERY_' . strtoupper($size_name)] = '';
 								$sub_tpl_component['IMAGE_SLIDER_' . strtoupper($size_name)] = '';
-								if( !empty($p) ) {
-									$sub_tpl_component['SRC_IMAGE_SLIDER_' . strtoupper($size_name)] = ( !empty($src) ) ? $src[0] : '';
-									$sub_tpl_component['IMAGE_SLIDER_' . strtoupper($size_name)] = ( !empty( $p ) ) ? $p : '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
-									$sub_tpl_component['THUMBNAIL_GALLERY_' . strtoupper($size_name)] = ( !empty( $p ) ) ? $p : '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
+								if (!empty($p)) {
+									$sub_tpl_component['SRC_IMAGE_SLIDER_' . strtoupper($size_name)] = (!empty($src)) ? $src[0] : '';
+									$sub_tpl_component['IMAGE_SLIDER_' . strtoupper($size_name)] = (!empty($p)) ? $p : '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
+									$sub_tpl_component['THUMBNAIL_GALLERY_' . strtoupper($size_name)] = (!empty($p)) ? $p : '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
 								}
 							}
-							$p = wp_get_attachment_image( $attachment->ID, 'full');
-							$src = wp_get_attachment_image_src( $attachment->ID, 'full' );
-							if( !empty($p) ) {
-								$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = ( !empty($src) ) ? $src[0] : '';
-								$sub_tpl_component['IMAGE_SLIDER_FULL'] = ( !empty($p) ) ? $p : '';
-								$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = ( !empty($p) ) ? $p : '';
+							$p = wp_get_attachment_image($attachment->ID, 'full');
+							$src = wp_get_attachment_image_src($attachment->ID, 'full');
+							if (!empty($p)) {
+								$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = (!empty($src)) ? $src[0] : '';
+								$sub_tpl_component['IMAGE_SLIDER_FULL'] = (!empty($p)) ? $p : '';
+								$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = (!empty($p)) ? $p : '';
 							}
 						}
 						else {
-							$p = wp_get_attachment_image( $attachment->ID, 'full' );
-							$src = wp_get_attachment_image_src( $attachment->ID, 'full' );
-							$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = ( !empty($src) ) ? $src[0] : '';
-							$sub_tpl_component['IMAGE_SLIDER_FULL'] = ( !empty( $p ) ) ? $p : '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
-							$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = ( !empty( $p ) ) ? $p : '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
+							$p = wp_get_attachment_image($attachment->ID, 'full');
+							$src = wp_get_attachment_image_src($attachment->ID, 'full');
+							$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = (!empty($src)) ? $src[0] : '';
+							$sub_tpl_component['IMAGE_SLIDER_FULL'] = (!empty($p)) ? $p : '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
+							$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = (!empty($p)) ? $p : '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
 						}
-						if ( !empty( $sub_tpl_component['IMAGE_SLIDER_FULL'] ) ) {
-							$tpl_component[ 'SLIDER_CONTENT' ] .= wpshop_display::display_template_element( 'wps_product_complete_sheet_gallery_slider_element', $sub_tpl_component );
-							if ( ( 1 < count( $attachments ) ) || ( ( 1 == count( $attachments ) ) && empty( $principal_thumbnail_id ) ) ) {
-								$tpl_component[ 'THUMBNAILS' ] .= wpshop_display::display_template_element( 'wps_product_complete_sheet_gallery_thumbnail_element', $sub_tpl_component );
+						if (!empty($sub_tpl_component['IMAGE_SLIDER_FULL'])) {
+							$tpl_component['SLIDER_CONTENT'] .= wpshop_display::display_template_element('wps_product_complete_sheet_gallery_slider_element', $sub_tpl_component);
+							if ((1 < count($attachments)) || ((1 == count($attachments)) && empty($principal_thumbnail_id))) {
+								$tpl_component['THUMBNAILS'] .= wpshop_display::display_template_element('wps_product_complete_sheet_gallery_thumbnail_element', $sub_tpl_component);
 							}
 						}
-						unset( $sub_tpl_component );
+						unset($sub_tpl_component);
 					}
 					else {
 						$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = '';
-						$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
-						$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
+						$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
+						$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
 					}
 				}
 			}
@@ -157,35 +157,35 @@ 
 		return $output;
 	}
 
-	public static function get_product_complete_sheet_attachments( $product_id ) {
+	public static function get_product_complete_sheet_attachments($product_id) {
 		$output = '';
 
 		/**	Get attachement file for the current product	*/
 		$product_picture_galery_content = $product_document_galery_content = '';
 		$picture_number = $document_number = $index_li = 0;
 
-		$attachments = self::get_attachments( $product_id, 'attachments' );
+		$attachments = self::get_attachments($product_id, 'attachments');
 
-		if ( is_array($attachments) && (count($attachments) > 0) ) {
+		if (is_array($attachments) && (count($attachments) > 0)) {
 			$picture_increment = $document_increment = 1;
 			foreach ($attachments as $attachment) {
 				$tpl_component = array();
-				$attachment_url = wp_get_attachment_url( $attachment->ID );
+				$attachment_url = wp_get_attachment_url($attachment->ID);
 				$attachment_extension = explode('.', $attachment_url);
 				$attachment_extension = $attachment_extension[1];
 				$tpl_component['ATTACHMENT_ITEM_GUID'] = $attachment_url;
 				$tpl_component['ATTACHMENT_ITEM_TITLE'] = $attachment->post_title;
 				$tpl_component['ATTACHMENT_ITEM_EXTENSION'] = $attachment_extension;
-				if(is_int(strpos($attachment->post_mime_type, 'application/')) || is_int(strpos($attachment->post_mime_type, 'text/'))) {
+				if (is_int(strpos($attachment->post_mime_type, 'application/')) || is_int(strpos($attachment->post_mime_type, 'text/'))) {
 					$tpl_component['ATTACHMENT_ITEM_TYPE'] = 'document';
-					$tpl_component['ATTACHMENT_ITEM_SPECIFIC_CLASS'] = (!($document_increment%WPSHOP_DISPLAY_GALLERY_ELEMENT_NUMBER_PER_LINE)) ? 'wpshop_gallery_document_last' : '';
+					$tpl_component['ATTACHMENT_ITEM_SPECIFIC_CLASS'] = (!($document_increment % WPSHOP_DISPLAY_GALLERY_ELEMENT_NUMBER_PER_LINE)) ? 'wpshop_gallery_document_last' : '';
 					/** Template parameters	*/
 					$template_part = 'product_attachment_item_document';
 					$tpl_component['PRODUCT_ID'] = $product_id;
 
 					/** 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();
@@ -204,7 +204,7 @@ 
 			}
 
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MEDIA_MANAGER_DIR, WPS_MEDIA_MANAGER_TEMPLATE_DIR, 'frontend', 'associated', 'document' ) );
+			require(wpshop_tools::get_template_part(WPS_MEDIA_MANAGER_DIR, WPS_MEDIA_MANAGER_TEMPLATE_DIR, 'frontend', 'associated', 'document'));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}

Braces +8 added lines, -11 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_media_manager_frontend_ctr {
 
 	public static function get_attachments( $pid, $type = 'gallery' ) {
@@ -58,8 +60,7 @@ 
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 			$galery_output = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			$galery_output = wpshop_display::display_template_element($template_part, $tpl_component);
 		}
 		unset($tpl_component);
@@ -84,8 +85,7 @@ 
 			$principal_thumbnail_id = get_post_meta( $pid, '_thumbnail_id', true);
 			if( !empty($principal_thumbnail_id) ) {
 				$attachments[0] = get_post( $principal_thumbnail_id );
-			}
-			else {
+			} else {
 				$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL'] = '';
 				$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
 				$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
@@ -127,8 +127,7 @@ 
 								$sub_tpl_component['IMAGE_SLIDER_FULL'] = ( !empty($p) ) ? $p : '';
 								$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = ( !empty($p) ) ? $p : '';
 							}
-						}
-						else {
+						} else {
 							$p = wp_get_attachment_image( $attachment->ID, 'full' );
 							$src = wp_get_attachment_image_src( $attachment->ID, 'full' );
 							$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = ( !empty($src) ) ? $src[0] : '';
@@ -142,8 +141,7 @@ 
 							}
 						}
 						unset( $sub_tpl_component );
-					}
-					else {
+					} else {
 						$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = '';
 						$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
 						$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
@@ -192,8 +190,7 @@ 
 						require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 						$product_document_galery_content .= ob_get_contents();
 						ob_end_clean();
-					}
-					else {
+					} else {
 						$product_document_galery_content .= wpshop_display::display_template_element($template_part, $tpl_component);
 					}