ntwb / wordpress

src/wp-admin/includes/class-pclzip.php

Indentation +3782 added lines, -3782 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,23 +215,23 @@ 
   function __construct($p_zipname)
   {
 
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
-    {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
+	// ----- Tests the zlib
+	if (!function_exists('gzopen'))
+	{
+	  die('Abort '.basename(__FILE__).' : Missing zlib extensions');
+	}
 
-    // ----- 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;
   }
 
   public function PclZip($p_zipname) {
-    self::__construct($p_zipname);
+	self::__construct($p_zipname);
   }
   // --------------------------------------------------------------------------------
 
@@ -274,149 +274,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);
+	// ----- 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 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -457,149 +457,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -646,26 +646,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -703,120 +703,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -860,132 +860,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1009,54 +1009,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1069,10 +1069,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1093,61 +1093,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();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-        // ----- Return
-        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();
+
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+		// ----- 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1165,46 +1165,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1224,45 +1224,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1275,12 +1275,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);
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1291,42 +1291,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);
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1337,17 +1337,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."]");
+	  }
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1376,39 +1376,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1429,395 +1429,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;
+		  $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();
-          }
+		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);
-
-              // ----- 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'];
-          }
+		  // ----- 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 ...
+
+			  // ----- 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1829,38 +1829,38 @@ 
   // --------------------------------------------------------------------------------
   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);
-    $v_memory_limit_int = (int) $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);
+	$v_memory_limit_int = (int) $v_memory_limit;
+	$last = strtolower(substr($v_memory_limit, -1));
 
-    if($last == 'g')
-        //$v_memory_limit_int = $v_memory_limit_int*1024*1024*1024;
-        $v_memory_limit_int = $v_memory_limit_int*1073741824;
-    if($last == 'm')
-        //$v_memory_limit_int = $v_memory_limit_int*1024*1024;
-        $v_memory_limit_int = $v_memory_limit_int*1048576;
-    if($last == 'k')
-        $v_memory_limit_int = $v_memory_limit_int*1024;
+	if($last == 'g')
+		//$v_memory_limit_int = $v_memory_limit_int*1024*1024*1024;
+		$v_memory_limit_int = $v_memory_limit_int*1073741824;
+	if($last == 'm')
+		//$v_memory_limit_int = $v_memory_limit_int*1024*1024;
+		$v_memory_limit_int = $v_memory_limit_int*1048576;
+	if($last == 'k')
+		$v_memory_limit_int = $v_memory_limit_int*1024;
 
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit_int*PCLZIP_TEMPORARY_FILE_RATIO);
+	$p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit_int*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;
   }
   // --------------------------------------------------------------------------------
 
@@ -1874,116 +1874,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2003,120 +2003,120 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Create a result list
-    $v_result_list = array();
-
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($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']);
-
-      // ----- 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;
-        }
-      }
+	$v_result=1;
+
+	// ----- Create a result list
+	$v_result_list = array();
+
+	// ----- Look each entry
+	for ($i=0; $i<sizeof($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']);
+
+	  // ----- 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);
-
-      // ----- 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;
-            }
-
-            // ----- 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;
-              }
-            }
-
-            $v_dirlist_nb++;
-          }
+	  // ----- 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;
+
+	  // ----- 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;
+
+			// ----- 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++;
+		  }
 
-          @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;
-          }
+		  @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;
+		  }
 
-          // ----- 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2128,30 +2128,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();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2163,175 +2163,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2342,30 +2342,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2376,14 +2376,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2403,56 +2403,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2467,57 +2467,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2529,22 +2529,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'];
     }
@@ -2553,242 +2553,242 @@ 
     }
     */
 
-    // ----- 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])) {
-
-      // ----- 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.
-      $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;
-      }
+	// ----- 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);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // 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;
+	  }
 
-      // ----- 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);
+		// ----- 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;
-        }
+		  // ----- 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);
+		// ----- 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;
-        }
+		  // ----- 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 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.
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2800,105 +2800,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -2912,107 +2912,107 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $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;
-    }
+	$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;
+	}
 
-    // ----- 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 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 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -3024,40 +3024,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -3069,48 +3069,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -3122,24 +3122,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -3151,69 +3151,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -3238,24 +3238,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -3277,122 +3277,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] != "")) {
 
@@ -3402,207 +3402,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++) {
+		  // ----- 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 (($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;
-              }
-          }
-      }
+			  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;
   }
   // --------------------------------------------------------------------------------
 
@@ -3617,344 +3617,344 @@ 
   // --------------------------------------------------------------------------------
   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) {
+	// ----- 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 "
+		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])) {
-
-      // ----- 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.
-      $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 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);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // 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;
+	  }
 
-      // ----- 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)) {
+		// ----- 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 "
+			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";
-
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
+	// ----- 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";
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+		  // ----- Return
+		  //return $v_result;
+		  $v_result = 1;
+		}
+	  }
+	}
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010))
+	  {
+		// ----- Look for not compressed file
+		if ($p_entry['compression'] == 0) {
 
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
+			  // ----- Opening destination file
+		  if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
+		  {
 
-            // ----- Return
-            return $v_result;
-          }
+			// ----- Change the file status
+			$p_entry['status'] = "write_error";
+
+			// ----- 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.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -3966,71 +3966,71 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $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();
-    }
+	$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();
+	}
 
 
-    // ----- 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -4042,106 +4042,106 @@ 
   // --------------------------------------------------------------------------------
   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);
+		  // ----- 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);
-        }
-      }
-    }
+		  // ----- 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.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -4153,116 +4153,116 @@ 
   // --------------------------------------------------------------------------------
   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])) {
-
-      // ----- 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.
-      $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 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);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // 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;
+	  }
 
-      // ----- 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.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -4274,98 +4274,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -4377,101 +4377,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -4485,7 +4485,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+	$v_result=1;
 
   	// ----- Check the static values
   	// TBC
@@ -4504,13 +4504,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -4522,152 +4522,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -4679,96 +4679,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] != "")) {
 
@@ -4778,201 +4778,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) {
-
-        // ----- 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);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- 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);
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                // ----- 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);
-
-                // ----- 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);
-
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
+	// ----- 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 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();
+
+			// ----- Return
+			return $v_result;
+		}
+
+		// ----- 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);
+
+				// ----- Error log
+				PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+				// ----- 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);
+
+				// ----- 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);
+
+		// ----- 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;
   }
   // --------------------------------------------------------------------------------
 
@@ -4989,49 +4989,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -5044,180 +5044,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -5229,56 +5229,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -5289,13 +5289,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;
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -5306,13 +5306,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 = '';
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -5324,17 +5324,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
@@ -5345,8 +5345,8 @@ 
 	  @set_magic_quotes_runtime(0);
 	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5358,17 +5358,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
@@ -5376,8 +5376,8 @@ 
   	  @set_magic_quotes_runtime($this->magic_quotes_status);
 	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5393,67 +5393,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -5474,67 +5474,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -5551,51 +5551,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -5613,22 +5613,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -5644,20 +5644,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;
   }
   // --------------------------------------------------------------------------------
 
@@ -5674,17 +5674,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;
   }
   // --------------------------------------------------------------------------------
 

src/wp-includes/class-wp-network-query.php

Indentation +21 added lines, -21 removed lines

@@ -99,27 +99,27 @@
 	 *
 	 *     @type array        $network__in          Array of network IDs to include. Default empty.
 	 *     @type array        $network__not_in      Array of network IDs to exclude. Default empty.
- 	 *     @type bool         $count                Whether to return a network count (true) or array of network objects.
- 	 *                                              Default false.
- 	 *     @type string       $fields               Network fields to return. Accepts 'ids' (returns an array of network IDs)
- 	 *                                              or empty (returns an array of complete network objects). Default empty.
- 	 *     @type int          $number               Maximum number of networks to retrieve. Default null (no limit).
- 	 *     @type int          $offset               Number of networks to offset the query. Used to build LIMIT clause.
- 	 *                                              Default 0.
- 	 *     @type bool         $no_found_rows        Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true.
- 	 *     @type string|array $orderby              Network status or array of statuses. Accepts 'id', 'domain', 'path',
- 	 *                                              'domain_length', 'path_length' and 'network__in'. Also accepts false,
- 	 *                                              an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'.
- 	 *     @type string       $order                How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'.
- 	 *     @type string       $domain               Limit results to those affiliated with a given network ID.
- 	 *                                              Default current network ID.
- 	 *     @type array        $domain__in           Array of domains to include affiliated networks for. Default empty.
- 	 *     @type array        $domain__not_in       Array of domains to exclude affiliated networks for. Default empty.
- 	 *     @type string       $path                 Limit results to those affiliated with a given network ID.
- 	 *                                              Default current network ID.
- 	 *     @type array        $path__in             Array of paths to include affiliated networks for. Default empty.
- 	 *     @type array        $path__not_in         Array of paths to exclude affiliated networks for. Default empty.
- 	 *     @type string       $search               Search term(s) to retrieve matching networks for. Default empty.
+	 *     @type bool         $count                Whether to return a network count (true) or array of network objects.
+	 *                                              Default false.
+	 *     @type string       $fields               Network fields to return. Accepts 'ids' (returns an array of network IDs)
+	 *                                              or empty (returns an array of complete network objects). Default empty.
+	 *     @type int          $number               Maximum number of networks to retrieve. Default null (no limit).
+	 *     @type int          $offset               Number of networks to offset the query. Used to build LIMIT clause.
+	 *                                              Default 0.
+	 *     @type bool         $no_found_rows        Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true.
+	 *     @type string|array $orderby              Network status or array of statuses. Accepts 'id', 'domain', 'path',
+	 *                                              'domain_length', 'path_length' and 'network__in'. Also accepts false,
+	 *                                              an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'.
+	 *     @type string       $order                How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'.
+	 *     @type string       $domain               Limit results to those affiliated with a given network ID.
+	 *                                              Default current network ID.
+	 *     @type array        $domain__in           Array of domains to include affiliated networks for. Default empty.
+	 *     @type array        $domain__not_in       Array of domains to exclude affiliated networks for. Default empty.
+	 *     @type string       $path                 Limit results to those affiliated with a given network ID.
+	 *                                              Default current network ID.
+	 *     @type array        $path__in             Array of paths to include affiliated networks for. Default empty.
+	 *     @type array        $path__not_in         Array of paths to exclude affiliated networks for. Default empty.
+	 *     @type string       $search               Search term(s) to retrieve matching networks for. Default empty.
 	 *     @type bool         $update_network_cache Whether to prime the cache for found networks. Default true.
 	 * }
 	 */

src/wp-includes/ms-deprecated.php

Indentation +4 added lines, -4 removed lines

@@ -24,11 +24,11 @@
  * @return int Current site ID.
  */
 function get_dashboard_blog() {
-    _deprecated_function( __FUNCTION__, '3.1.0' );
-    if ( $blog = get_site_option( 'dashboard_blog' ) )
-        return get_blog_details( $blog );
+	_deprecated_function( __FUNCTION__, '3.1.0' );
+	if ( $blog = get_site_option( 'dashboard_blog' ) )
+		return get_blog_details( $blog );
 
-    return get_blog_details( $GLOBALS['current_site']->blog_id );
+	return get_blog_details( $GLOBALS['current_site']->blog_id );
 }
 
 /**

src/wp-includes/class-wp-comment-query.php

Indentation +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 	 *                                                   The parameter is ignored (forced to `false`) when
 	 *                                                   `$fields` is 'ids' or 'counts'. Accepts 'threaded',
 	 *                                                   'flat', or false. Default: false.
- 	 *     @type string       $cache_domain              Unique cache key to be produced when this query is stored in
+	 *     @type string       $cache_domain              Unique cache key to be produced when this query is stored in
 	 *                                                   an object cache. Default is 'core'.
 	 *     @type bool         $update_comment_meta_cache Whether to prime the metadata cache for found comments.
 	 *                                                   Default true.