phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] [20917] improvement: Update pczlip to latest from ups


From: Sigurd Nes
Subject: [Phpgroupware-cvs] [20917] improvement: Update pczlip to latest from upstream
Date: Tue, 05 Jan 2010 21:02:02 +0000

Revision: 20917
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20917
Author:   sigurdne
Date:     2010-01-05 21:02:01 +0000 (Tue, 05 Jan 2010)
Log Message:
-----------
improvement: Update pczlip to latest from upstream

Modified Paths:
--------------
    people/sigurdne/modules/phpgwapi/trunk/inc/pclzip/pclzip.lib.php
    people/sigurdne/modules/phpgwapi/trunk/inc/pclzip/readme.txt

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/pclzip/pclzip.lib.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/pclzip/pclzip.lib.php    
2010-01-05 20:58:52 UTC (rev 20916)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/pclzip/pclzip.lib.php    
2010-01-05 21:02:01 UTC (rev 20917)
@@ -1,8 +1,8 @@
 <?php
 // 
--------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.6
+// PhpConcept Library - Zip Module 2.8.2
 // 
--------------------------------------------------------------------------------
-// License GNU/LGPL - Vincent Blavet - March 2006
+// License GNU/LGPL - Vincent Blavet - August 2009
 // http://www.phpconcept.net
 // 
--------------------------------------------------------------------------------
 //
@@ -22,7 +22,7 @@
 //   The use of this software is at the risk of the user.
 //
 // 
--------------------------------------------------------------------------------
-// $Id$
+// $Id$
 // 
--------------------------------------------------------------------------------
 
   // ----- Constants
@@ -66,12 +66,24 @@
     define( 'PCLZIP_TEMPORARY_DIR', '' );
   }
 
+  // ----- Optional threshold ratio for use of temporary files
+  //       Pclzip sense the size of the file to add/extract and decide to
+  //       use or not temporary file. The algorythm is looking for 
+  //       memory_limit of PHP and apply a ratio.
+  //       threshold = memory_limit * ratio.
+  //       Recommended values are under 0.5. Default 0.47.
+  //       Samples :
+  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
+  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+  }
+
 // 
--------------------------------------------------------------------------------
 // ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
 // 
--------------------------------------------------------------------------------
 
   // ----- Global variables
-  $g_pclzip_version = "2.6";
+  $g_pclzip_version = "2.8.2";
 
   // ----- Error codes
   //   -1 : Unable to open file in binary write mode
@@ -134,6 +146,12 @@
   // which is not correctly supported by PHP ...
   //define( 'PCLZIP_OPT_CRYPT', 77018 );
   define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
+  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
+  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
+  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
+  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
+  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
+  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
   
   // ----- File description attributes
   define( 'PCLZIP_ATT_FILE_NAME', 79001 );
@@ -196,12 +214,10 @@
   // 
--------------------------------------------------------------------------------
   function PclZip($p_zipname)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::PclZip', "zipname=$p_zipname");
 
     // ----- Tests the zlib
     if (!function_exists('gzopen'))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 1, "zlib 
extension seems to be missing");
       die('Abort '.basename(__FILE__).' : Missing zlib extensions');
     }
 
@@ -211,7 +227,6 @@
     $this->magic_quotes_status = -1;
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 1);
     return;
   }
   // 
--------------------------------------------------------------------------------
@@ -255,7 +270,6 @@
   // 
--------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::create', "filelist='$p_filelist', ...");
     $v_result=1;
 
     // ----- Reset the error handler
@@ -267,7 +281,6 @@
 
     // ----- Look for variable options arguments
     $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size 
arguments passed to the method");
 
     // ----- Look for arguments
     if ($v_size > 1) {
@@ -280,7 +293,6 @@
 
       // ----- Look for first arg
       if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Variable list of options detected");
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
@@ -290,11 +302,13 @@
                                                    PCLZIP_CB_PRE_ADD => 
'optional',
                                                    PCLZIP_CB_POST_ADD => 
'optional',
                                                    PCLZIP_OPT_NO_COMPRESSION 
=> 'optional',
-                                                   PCLZIP_OPT_COMMENT => 
'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) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
           return 0;
         }
       }
@@ -303,7 +317,6 @@
       // Here we need to support the first historic synopsis of the
       // method.
       else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Static synopsis");
 
         // ----- Get the first argument
         $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
@@ -315,12 +328,14 @@
         else if ($v_size > 2) {
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
                                       "Invalid number / type of arguments");
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
           return 0;
         }
       }
     }
 
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
     // ----- Init
     $v_string_list = array();
     $v_att_list = array();
@@ -351,7 +366,6 @@
     // ----- Invalid variable type for $p_filelist
     else {
       PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable 
type p_filelist");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return 0;
     }
     
@@ -362,7 +376,6 @@
           $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
         }
         else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Ignore an empty filename");
         }
       }
     }
@@ -382,7 +395,6 @@
                                                $v_options,
                                                $v_supported_attributes);
       if ($v_result != 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
         return 0;
       }
     }
@@ -390,19 +402,16 @@
     // ----- Expand the filelist (expand directories)
     $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
     if ($v_result != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return 0;
     }
 
     // ----- Call the create fct
     $v_result = $this->privCreate($v_filedescr_list, $p_result_list, 
$v_options);
     if ($v_result != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return 0;
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_result_list);
     return $p_result_list;
   }
   // 
--------------------------------------------------------------------------------
@@ -444,7 +453,6 @@
   // 
--------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::add', "filelist='$p_filelist', ...");
     $v_result=1;
 
     // ----- Reset the error handler
@@ -456,7 +464,6 @@
 
     // ----- Look for variable options arguments
     $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size 
arguments passed to the method");
 
     // ----- Look for arguments
     if ($v_size > 1) {
@@ -469,7 +476,6 @@
 
       // ----- Look for first arg
       if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Variable list of options detected");
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
@@ -481,11 +487,13 @@
                                                    PCLZIP_OPT_NO_COMPRESSION 
=> 'optional',
                                                    PCLZIP_OPT_COMMENT => 
'optional',
                                                    PCLZIP_OPT_ADD_COMMENT => 
'optional',
-                                                   PCLZIP_OPT_PREPEND_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) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
           return 0;
         }
       }
@@ -494,7 +502,6 @@
       // Here we need to support the first historic synopsis of the
       // method.
       else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Static synopsis");
 
         // ----- Get the first argument
         $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
@@ -508,12 +515,14 @@
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / 
type of arguments");
 
           // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
           return 0;
         }
       }
     }
 
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
     // ----- Init
     $v_string_list = array();
     $v_att_list = array();
@@ -544,7 +553,6 @@
     // ----- Invalid variable type for $p_filelist
     else {
       PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable 
type '".gettype($p_filelist)."' for p_filelist");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return 0;
     }
     
@@ -570,7 +578,6 @@
                                                $v_options,
                                                $v_supported_attributes);
       if ($v_result != 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
         return 0;
       }
     }
@@ -578,19 +585,16 @@
     // ----- Expand the filelist (expand directories)
     $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
     if ($v_result != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return 0;
     }
 
     // ----- Call the create fct
     $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
     if ($v_result != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return 0;
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_result_list);
     return $p_result_list;
   }
   // 
--------------------------------------------------------------------------------
@@ -623,7 +627,7 @@
   //                                  write protected
   //                newer_exist : the file was not extracted because a newer 
file exists
   //                path_creation_fail : the file is not extracted because the 
folder
-  //                                     does not exists and can not be created
+  //                                     does not exist and can not be created
   //                write_error : the file was not extracted because there was 
a
   //                              error while writing the file
   //                read_error : the file was not extracted because there was 
a error
@@ -638,7 +642,6 @@
   // 
--------------------------------------------------------------------------------
   function listContent()
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::listContent', "");
     $v_result=1;
 
     // ----- Reset the error handler
@@ -646,7 +649,6 @@
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return(0);
     }
 
@@ -655,12 +657,10 @@
     if (($v_result = $this->privList($p_list)) != 1)
     {
       unset($p_list);
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, 
PclZip::errorInfo());
       return(0);
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
     return $p_list;
   }
   // 
--------------------------------------------------------------------------------
@@ -699,7 +699,6 @@
   // 
--------------------------------------------------------------------------------
   function extract()
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::extract", "");
     $v_result=1;
 
     // ----- Reset the error handler
@@ -707,7 +706,6 @@
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return(0);
     }
 
@@ -720,7 +718,6 @@
 
     // ----- Look for variable options arguments
     $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size 
arguments passed to the method");
 
     // ----- Default values for option
     $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
@@ -732,7 +729,6 @@
 
       // ----- Look for first arg
       if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Variable list of options");
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
@@ -751,10 +747,12 @@
                                                    
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_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) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
           return 0;
         }
 
@@ -781,7 +779,6 @@
       // Here we need to support the first historic synopsis of the
       // method.
       else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Static synopsis");
 
         // ----- Get the first argument
         $v_path = $v_arg_list[0];
@@ -795,14 +792,15 @@
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / 
type of arguments");
 
           // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, 
PclZip::errorInfo());
           return 0;
         }
       }
     }
 
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
     // ----- Trace
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"path='$v_path', remove_path='$v_remove_path', 
remove_all_path='".($v_remove_path?'true':'false')."'");
 
     // ----- Call the extracting fct
     $p_list = array();
@@ -810,12 +808,10 @@
                                             $v_remove_all_path, $v_options);
     if ($v_result < 1) {
       unset($p_list);
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, 
PclZip::errorInfo());
       return(0);
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
     return $p_list;
   }
   // 
--------------------------------------------------------------------------------
@@ -860,7 +856,6 @@
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::extractByIndex", "index='$p_index', ...");
     $v_result=1;
 
     // ----- Reset the error handler
@@ -868,7 +863,6 @@
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return(0);
     }
 
@@ -881,7 +875,6 @@
 
     // ----- Look for variable options arguments
     $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size 
arguments passed to the method");
 
     // ----- Default values for option
     $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
@@ -897,7 +890,6 @@
 
       // ----- Look for first arg
       if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Variable list of options");
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
@@ -911,10 +903,12 @@
                                                    PCLZIP_OPT_SET_CHMOD => 
'optional',
                                                    PCLZIP_OPT_REPLACE_NEWER => 
'optional'
                                                    ,PCLZIP_OPT_STOP_ON_ERROR 
=> 'optional'
-                                                   
,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => '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) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
           return 0;
         }
 
@@ -937,10 +931,8 @@
         }
         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
           $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Option PCLZIP_OPT_EXTRACT_AS_STRING not set.");
         }
         else {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Option PCLZIP_OPT_EXTRACT_AS_STRING set.");
         }
       }
 
@@ -948,7 +940,6 @@
       // Here we need to support the first historic synopsis of the
       // method.
       else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Static synopsis");
 
         // ----- Get the first argument
         $v_path = $v_arg_list[0];
@@ -962,14 +953,12 @@
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / 
type of arguments");
 
           // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
           return 0;
         }
       }
     }
 
     // ----- Trace
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"index='$p_index', path='$v_path', remove_path='$v_remove_path', 
remove_all_path='".($v_remove_path?'true':'false')."'");
 
     // ----- Trick
     // Here I want to reuse extractByRule(), so I need to parse the $p_index
@@ -979,19 +968,19 @@
     $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), 
$v_options_trick,
                                         array (PCLZIP_OPT_BY_INDEX => 
'optional' ));
     if ($v_result != 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
         return 0;
     }
     $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
 
+    // ----- 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) {
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, 
PclZip::errorInfo());
         return(0);
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
     return $p_list;
   }
   // 
--------------------------------------------------------------------------------
@@ -1016,7 +1005,6 @@
   // 
--------------------------------------------------------------------------------
   function delete()
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::delete", "");
     $v_result=1;
 
     // ----- Reset the error handler
@@ -1024,7 +1012,6 @@
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return(0);
     }
 
@@ -1033,7 +1020,6 @@
 
     // ----- Look for variable options arguments
     $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size 
arguments passed to the method");
 
     // ----- Look for arguments
     if ($v_size > 0) {
@@ -1047,7 +1033,6 @@
                                                PCLZIP_OPT_BY_PREG => 
'optional',
                                                PCLZIP_OPT_BY_INDEX => 
'optional' ));
       if ($v_result != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
           return 0;
       }
     }
@@ -1060,7 +1045,6 @@
     if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
       $this->privSwapBackMagicQuotes();
       unset($v_list);
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, 
PclZip::errorInfo());
       return(0);
     }
 
@@ -1068,7 +1052,6 @@
     $this->privSwapBackMagicQuotes();
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_list);
     return $v_list;
   }
   // 
--------------------------------------------------------------------------------
@@ -1081,12 +1064,10 @@
   // 
--------------------------------------------------------------------------------
   function deleteByIndex($p_index)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::deleteByIndex", "index='$p_index'");
     
     $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
     return $p_list;
   }
   // 
--------------------------------------------------------------------------------
@@ -1107,7 +1088,6 @@
   // 
--------------------------------------------------------------------------------
   function properties()
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::properties", "");
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -1118,7 +1098,6 @@
     // ----- Check archive
     if (!$this->privCheckFormat()) {
       $this->privSwapBackMagicQuotes();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       return(0);
     }
 
@@ -1132,7 +1111,6 @@
     if (@is_file($this->zipname))
     {
       // ----- Open the zip file
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
       if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
       {
         $this->privSwapBackMagicQuotes();
@@ -1141,7 +1119,6 @@
         PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open 
archive \''.$this->zipname.'\' in binary read mode');
 
         // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), 0);
         return 0;
       }
 
@@ -1150,7 +1127,6 @@
       if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
       {
         $this->privSwapBackMagicQuotes();
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
         return 0;
       }
 
@@ -1167,7 +1143,6 @@
     $this->privSwapBackMagicQuotes();
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_prop);
     return $v_prop;
   }
   // 
--------------------------------------------------------------------------------
@@ -1186,7 +1161,6 @@
   // 
--------------------------------------------------------------------------------
   function duplicate($p_archive)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::duplicate", "");
     $v_result = 1;
 
     // ----- Reset the error handler
@@ -1195,7 +1169,6 @@
     // ----- Look if the $p_archive is a PclZip object
     if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The 
parameter is valid PclZip object '".$p_archive->zipname."'");
 
       // ----- Duplicate the archive
       $v_result = $this->privDuplicate($p_archive->zipname);
@@ -1204,7 +1177,6 @@
     // ----- Look if the $p_archive is a string (so a filename)
     else if (is_string($p_archive))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The 
parameter is a filename '$p_archive'");
 
       // ----- Check that $p_archive is a valid zip file
       // TBC : Should also check the archive format
@@ -1228,7 +1200,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -1249,7 +1220,6 @@
   // 
--------------------------------------------------------------------------------
   function merge($p_archive_to_add)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::merge", "");
     $v_result = 1;
 
     // ----- Reset the error handler
@@ -1257,14 +1227,12 @@
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
       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'))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The 
parameter is valid PclZip object");
 
       // ----- Merge the archive
       $v_result = $this->privMerge($p_archive_to_add);
@@ -1273,7 +1241,6 @@
     // ----- Look if the $p_archive_to_add is a string (so a filename)
     else if (is_string($p_archive_to_add))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The 
parameter is a filename");
 
       // ----- Create a temporary archive
       $v_object_archive = new PclZip($p_archive_to_add);
@@ -1291,7 +1258,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -1406,7 +1372,6 @@
   // 
--------------------------------------------------------------------------------
   function privCheckFormat($p_level=0)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privCheckFormat", "");
     $v_result = true;
 
        // ----- Reset the file system cache
@@ -1419,7 +1384,6 @@
     if (!is_file($this->zipname)) {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file 
'".$this->zipname."'");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, false, 
PclZip::errorInfo());
       return(false);
     }
 
@@ -1427,7 +1391,6 @@
     if (!is_readable($this->zipname)) {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive 
'".$this->zipname."'");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, false, 
PclZip::errorInfo());
       return(false);
     }
 
@@ -1441,7 +1404,6 @@
     // TBC
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -1463,13 +1425,11 @@
   // 
--------------------------------------------------------------------------------
   function privParseOptions(&$p_options_list, $p_size, &$v_result_list, 
$v_requested_options=false)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privParseOptions", "");
     $v_result=1;
     
     // ----- Read the options
     $i=0;
     while ($i<$p_size) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Looking for table index $i, option = 
'".PclZipUtilOptionText($p_options_list[$i])."(".$p_options_list[$i].")'");
 
       // ----- Check if the option is supported
       if (!isset($v_requested_options[$p_options_list[$i]])) {
@@ -1477,7 +1437,6 @@
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional 
parameter '".$p_options_list[$i]."' for this method");
 
         // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
         return PclZip::errorCode();
       }
 
@@ -1493,16 +1452,64 @@
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           // ----- Get the value
           $v_result_list[$p_options_list[$i]] = 
PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($p_options_list[$i])." = 
'".$v_result_list[$p_options_list[$i]]."'");
           $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();
+          }
+          
+          // ----- 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();
+          }
+
+          // ----- 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();
+          }
+          
+          $v_result_list[$p_options_list[$i]] = true;
+        break;
+
+        case PCLZIP_OPT_TEMP_FILE_OFF :
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option 
'".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 
'PCLZIP_OPT_TEMP_FILE_ON'");
+            return PclZip::errorCode();
+          }
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option 
'".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 
'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+            return PclZip::errorCode();
+          }
+          
+          $v_result_list[$p_options_list[$i]] = true;
+        break;
+
         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
           // ----- Check the number of parameters
           if (($i+1) >= $p_size) {
@@ -1510,7 +1517,6 @@
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
@@ -1518,11 +1524,9 @@
           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);
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($p_options_list[$i])." = 
'".$v_result_list[$p_options_list[$i]]."'");
             $i++;
           }
           else {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($p_options_list[$i])." set with an empty value is 
ignored.");
           }
         break;
 
@@ -1534,7 +1538,6 @@
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
@@ -1550,15 +1553,16 @@
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
-          ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($p_options_list[$i])." = 
'".$v_result_list[$p_options_list[$i]]."'");
           $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
@@ -1567,7 +1571,6 @@
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
@@ -1580,10 +1583,8 @@
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($p_options_list[$i])." = 
'".$v_result_list[$p_options_list[$i]]."'");
           $i++;
         break;
 
@@ -1600,7 +1601,6 @@
                                                                 ."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
@@ -1616,10 +1616,8 @@
                                                                 ."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($p_options_list[$i])." = 
'".$v_result_list[$p_options_list[$i]]."'");
           $i++;
         break;
 
@@ -1631,14 +1629,12 @@
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           // ----- Get the value
           $v_work_list = array();
           if (is_string($p_options_list[$i+1])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
4, "Index value is a string '".$p_options_list[$i+1]."'");
 
               // ----- Remove spaces
               $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
@@ -1647,11 +1643,9 @@
               $v_work_list = explode(",", $p_options_list[$i+1]);
           }
           else if (is_integer($p_options_list[$i+1])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
4, "Index value is an 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])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
4, "Index value is an array");
               $v_work_list = $p_options_list[$i+1];
           }
           else {
@@ -1659,7 +1653,6 @@
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must 
be integer, string or array for option 
'".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
           
@@ -1693,15 +1686,12 @@
                   PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too 
many values in index range for option 
'".PclZipUtilOptionText($p_options_list[$i])."'");
 
                   // ----- Return
-                  //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
                   return PclZip::errorCode();
               }
 
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Extracted index item = 
[".$v_result_list[$p_options_list[$i]][$j]['start'].",".$v_result_list[$p_options_list[$i]][$j]['end']."]");
 
               // ----- Look for list sort
               if ($v_result_list[$p_options_list[$i]][$j]['start'] < 
$v_sort_value) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "The list should be sorted ...");
                   $v_sort_flag=true;
 
                   // ----- TBC : An automatic sort should be writen ...
@@ -1709,7 +1699,6 @@
                   PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, 
"Invalid order of index range for option 
'".PclZipUtilOptionText($p_options_list[$i])."'");
 
                   // ----- Return
-                  //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
                   return PclZip::errorCode();
               }
               $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
@@ -1718,7 +1707,6 @@
           // ----- Sort the items
           if ($v_sort_flag) {
               // TBC : To Be Completed
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "List sorting is not yet write ...");
           }
 
           // ----- Next option
@@ -1733,7 +1721,6 @@
         case PCLZIP_OPT_REPLACE_NEWER :
         case PCLZIP_OPT_STOP_ON_ERROR :
           $v_result_list[$p_options_list[$i]] = true;
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($p_options_list[$i])." = 
'".$v_result_list[$p_options_list[$i]]."'");
         break;
 
         // ----- Look for options that request an octal value
@@ -1744,13 +1731,11 @@
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           // ----- Get the value
           $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($p_options_list[$i])." = 
'".$v_result_list[$p_options_list[$i]]."'");
           $i++;
         break;
 
@@ -1771,13 +1756,11 @@
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing 
parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           // ----- Get the value
           $v_function_name = $p_options_list[$i+1];
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"call-back ".PclZipUtilOptionText($p_options_list[$i])." = 
'".$v_function_name."'");
 
           // ----- Check that the value is a valid existing function
           if (!function_exists($v_function_name)) {
@@ -1785,7 +1768,6 @@
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function 
'".$v_function_name."()' is not an existing function for option 
'".PclZipUtilOptionText($p_options_list[$i])."'");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
@@ -1801,7 +1783,6 @@
                                                           
.$p_options_list[$i]."'");
 
           // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
           return PclZip::errorCode();
       }
 
@@ -1814,22 +1795,66 @@
       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') {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Detect a mandatory option : ".PclZipUtilOptionText($key)."(".$key.")");
           // ----- Look if present
           if (!isset($v_result_list[$key])) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing 
mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
         }
       }
     }
 
+    // ----- Look for default values
+    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+      
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // 
--------------------------------------------------------------------------------
+
+  // 
--------------------------------------------------------------------------------
+  // Function : privOptionDefaultThreshold()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // 
--------------------------------------------------------------------------------
+  function privOptionDefaultThreshold(&$p_options)
+  {
+    $v_result=1;
+    
+    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+      return $v_result;
+    }
+    
+    // ----- Get 'memory_limit' configuration value
+    $v_memory_limit = ini_get('memory_limit');
+    $v_memory_limit = trim($v_memory_limit);
+    $last = strtolower(substr($v_memory_limit, -1));
+ 
+    if($last == 'g')
+        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+        $v_memory_limit = $v_memory_limit*1073741824;
+    if($last == 'm')
+        //$v_memory_limit = $v_memory_limit*1024*1024;
+        $v_memory_limit = $v_memory_limit*1048576;
+    if($last == 'k')
+        $v_memory_limit = $v_memory_limit*1024;
+            
+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = 
floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+    
+
+    // ----- 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
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -1844,7 +1869,6 @@
   // 
--------------------------------------------------------------------------------
   function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, 
$v_requested_options=false)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privFileDescrParseAtt", "");
     $v_result=1;
     
     // ----- For each file in the list check the attributes
@@ -1856,7 +1880,6 @@
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file 
attribute '".$v_key."' for this file");
 
         // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
         return PclZip::errorCode();
       }
 
@@ -1865,16 +1888,13 @@
         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)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($v_key)." = '".$v_value."'");
           
           if ($p_filedescr['filename'] == '') {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid 
empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
@@ -1883,16 +1903,13 @@
         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)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($v_key)." = '".$v_value."'");
 
           if ($p_filedescr['new_short_name'] == '') {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid 
empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
         break;
@@ -1900,16 +1917,13 @@
         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)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($v_key)." = '".$v_value."'");
 
           if ($p_filedescr['new_full_name'] == '') {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid 
empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
         break;
@@ -1918,28 +1932,23 @@
         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)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           $p_filedescr['comment'] = $v_value;
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($v_key)." = '".$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)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
           $p_filedescr['mtime'] = $v_value;
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($v_key)." = '".$v_value."'");
         break;
 
         case PCLZIP_ATT_FILE_CONTENT :
           $p_filedescr['content'] = $v_value;
-          ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"".PclZipUtilOptionText($v_key)." = '".$v_value."'");
         break;
 
         default :
@@ -1948,7 +1957,6 @@
                                           "Unknown parameter '".$v_key."'");
 
           // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
           return PclZip::errorCode();
       }
 
@@ -1957,11 +1965,9 @@
         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') {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Detect a mandatory option : ".PclZipUtilOptionText($key)."(".$key.")");
             // ----- Look if present
             if (!isset($p_file_list[$key])) {
               PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing 
mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
               return PclZip::errorCode();
             }
           }
@@ -1972,7 +1978,6 @@
     }
     
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -1980,6 +1985,12 @@
   // 
--------------------------------------------------------------------------------
   // Function : privFileDescrExpand()
   // Description :
+  //   This method look for each item of the list to see if its a file, a 
folder
+  //   or a string to be added as file. For any other type of files (link, 
other)
+  //   just ignore the item.
+  //   Then prepare the information that will be stored for that file.
+  //   When its a folder, expand the folder with all the files that are in 
that 
+  //   folder (recursively).
   // Parameters :
   // Return Values :
   //   1 on success.
@@ -1987,7 +1998,6 @@
   // 
--------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privFileDescrExpand", "");
     $v_result=1;
     
     // ----- Create a result list
@@ -1995,34 +2005,27 @@
     
     // ----- Look each entry
     for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Looking for file ".$i.".");
       
       // ----- Get filedescr
       $v_descr = $p_filedescr_list[$i];
       
       // ----- Reduce the filename
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Filedescr before reduction :'".$v_descr['filename']."'");
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename']);
+      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], 
false);
       $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Filedescr after reduction :'".$v_descr['filename']."'");
       
       // ----- Look for real file or folder
       if (file_exists($v_descr['filename'])) {
         if (@is_file($v_descr['filename'])) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"This is a file");
           $v_descr['type'] = 'file';
         }
         else if (@is_dir($v_descr['filename'])) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"This is a folder");
           $v_descr['type'] = 'folder';
         }
         else if (@is_link($v_descr['filename'])) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Unsupported file type : link");
           // skip
           continue;
         }
         else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Unsupported file type : unknown type");
           // skip
           continue;
         }
@@ -2030,18 +2033,15 @@
       
       // ----- Look for string added as file
       else if (isset($v_descr['content'])) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"This is a string added as a file");
         $v_descr['type'] = 'virtual_file';
       }
       
       // ----- Missing file
       else {
         // ----- Error log
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"File '".$v_descr['filename']."' does not exists");
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File 
'".$v_descr['filename']."' does not exists");
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File 
'".$v_descr['filename']."' does not exist");
 
         // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
         return PclZip::errorCode();
       }
       
@@ -2058,7 +2058,6 @@
         $v_dirlist_nb = 0;
         if ($v_folder_handler = @opendir($v_descr['filename'])) {
           while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Looking for '".$v_item_handler."' in the directory");
 
             // ----- Skip '.' and '..'
             if (($v_item_handler == '.') || ($v_item_handler == '..')) {
@@ -2071,7 +2070,8 @@
             // ----- 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']) {
+            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;
               }
@@ -2086,7 +2086,6 @@
           @closedir($v_folder_handler);
         }
         else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Unable to open dir '".$v_descr['filename']."' in read mode. Skipped.");
           // TBC : unable to open folder in read mode
         }
         
@@ -2094,17 +2093,13 @@
         if ($v_dirlist_nb != 0) {
           // ----- Expand
           if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, 
$p_options)) != 1) {
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
           }
           
           // ----- Concat the resulting list
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Merging result list (size '".sizeof($v_result_list)."') with dirlist (size 
'".sizeof($v_dirlist_descr)."')");
           $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"merged result list is size '".sizeof($v_result_list)."'");
         }
         else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Nothing in this folder to expand.");
         }
           
         // ----- Free local array
@@ -2116,7 +2111,6 @@
     $p_filedescr_list = $v_result_list;
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2129,7 +2123,6 @@
   // 
--------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privCreate", "list");
     $v_result=1;
     $v_list_detail = array();
     
@@ -2140,7 +2133,6 @@
     if (($v_result = $this->privOpenFd('wb')) != 1)
     {
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -2154,7 +2146,6 @@
     $this->privSwapBackMagicQuotes();
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2167,34 +2158,29 @@
   // 
--------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privAdd", "list");
     $v_result=1;
     $v_list_detail = array();
 
     // ----- Look if the archive exists or is empty
     if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Archive does not exist, or is empty, create it.");
 
       // ----- Do a create
       $v_result = $this->privCreate($p_filedescr_list, $p_result_list, 
$p_options);
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
 
     // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($v_result=$this->privOpenFd('rb')) != 1)
     {
       // ----- Magic quotes trick
       $this->privSwapBackMagicQuotes();
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -2204,20 +2190,16 @@
     {
       $this->privCloseFd();
       $this->privSwapBackMagicQuotes();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Go to beginning of File
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position in file : ".ftell($this->zip_fd)."'");
     @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position in file : ".ftell($this->zip_fd)."'");
 
     // ----- Creates a temporay file
     $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
     // ----- Open the temporary file in write mode
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
     {
       $this->privCloseFd();
@@ -2226,7 +2208,6 @@
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open 
temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
@@ -2236,7 +2217,6 @@
     while ($v_size != 0)
     {
       $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : 
PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read 
$v_read_size bytes");
       $v_buffer = fread($this->zip_fd, $v_read_size);
       @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
       $v_size -= $v_read_size;
@@ -2259,20 +2239,17 @@
       $this->privSwapBackMagicQuotes();
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Store the offset of the central dir
     $v_offset = @ftell($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "New 
offset of central dir : $v_offset");
 
     // ----- 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);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read 
$v_read_size bytes");
       $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
       @fwrite($this->zip_fd, $v_buffer, $v_read_size);
       $v_size -= $v_read_size;
@@ -2290,7 +2267,6 @@
           $this->privSwapBackMagicQuotes();
 
           // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
           return $v_result;
         }
         $v_count++;
@@ -2323,7 +2299,6 @@
       $this->privSwapBackMagicQuotes();
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -2351,7 +2326,6 @@
     PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2363,7 +2337,6 @@
   // 
--------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privOpenFd", 'mode='.$p_mode);
     $v_result=1;
 
     // ----- Look if already open
@@ -2373,24 +2346,20 @@
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file 
\''.$this->zipname.'\' already open');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
     // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Open 
file in '.$p_mode.' mode');
     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
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2402,7 +2371,6 @@
   // 
--------------------------------------------------------------------------------
   function privCloseFd()
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privCloseFd", "");
     $v_result=1;
 
     if ($this->zip_fd != 0)
@@ -2410,7 +2378,6 @@
     $this->zip_fd = 0;
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2431,7 +2398,6 @@
 //  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)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privAddList", "list");
     $v_result=1;
 
     // ----- Add the files
@@ -2439,7 +2405,6 @@
     if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, 
$p_options)) != 1)
     {
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -2453,7 +2418,6 @@
       if ($v_header_list[$i]['status'] == 'ok') {
         if (($v_result = 
$this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
           // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
           return $v_result;
         }
         $v_count++;
@@ -2479,12 +2443,10 @@
       unset($v_header_list);
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2500,13 +2462,11 @@
   // 
--------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privAddFileList", "filedescr_list");
     $v_result=1;
     $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = sizeof($p_result_list);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Before 
add, list have ".$v_nb." elements");
 
     // ----- Loop on the files
     for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
@@ -2514,21 +2474,17 @@
       $p_filedescr_list[$j]['filename']
       = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
       
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Looking for file '".$p_filedescr_list[$j]['filename']."'");
 
       // ----- Skip empty file names
       // TBC : Can this be possible ? not checked in DescrParseAtt ?
       if ($p_filedescr_list[$j]['filename'] == "") {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Skip empty filename");
         continue;
       }
 
       // ----- Check the filename
       if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
           && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"File '".$p_filedescr_list[$j]['filename']."' does not exists");
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File 
'".$p_filedescr_list[$j]['filename']."' does not exists");
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File 
'".$p_filedescr_list[$j]['filename']."' does not exist");
         return PclZip::errorCode();
       }
 
@@ -2547,7 +2503,6 @@
         $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
                                        $p_options);
         if ($v_result != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
           return $v_result;
         }
 
@@ -2555,10 +2510,8 @@
         $p_result_list[$v_nb++] = $v_header;
       }
     }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "After 
add, list have ".$v_nb." elements");
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2571,7 +2524,6 @@
   // 
--------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privAddFile", "filename='".$p_filedescr['filename']."'");
     $v_result=1;
     
     // ----- Working variable
@@ -2583,7 +2535,6 @@
       PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list 
parameter (invalid or empty list)");
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
   
@@ -2591,11 +2542,9 @@
     /* TBC : Removed
     if (isset($p_filedescr['stored_filename'])) {
       $v_stored_filename = $p_filedescr['stored_filename'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
'Stored filename is NOT the same "'.$v_stored_filename.'"');
     }
     else {
       $v_stored_filename = $p_filedescr['stored_filename'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
'Stored filename is the same');
     }
     */
 
@@ -2638,14 +2587,13 @@
       $p_header['size'] = strlen($p_filedescr['content']);
     }
     
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header 
external extension '".sprintf("0x%X",$p_header['external'])."'");
 
     // ----- Look for filetime
     if (isset($p_filedescr['mtime'])) {
       $p_header['mtime'] = $p_filedescr['mtime'];
     }
     else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = mktime();
+      $p_header['mtime'] = time();
     }
     else {
       $p_header['mtime'] = filemtime($p_filename);
@@ -2663,7 +2611,6 @@
 
     // ----- Look for pre-add callback
     if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A 
pre-callback '".$p_options[PCLZIP_CB_PRE_ADD]."()') is defined for the 
extraction");
 
       // ----- Generate a local information
       $v_local_header = array();
@@ -2672,7 +2619,8 @@
       // ----- Call the callback
       // Here I do not use call_user_func() because I need to send a reference 
to the
       // header.
-      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, 
$v_local_header);');
+//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, 
$v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, 
$v_local_header);
       if ($v_result == 0) {
         // ----- Change the file status
         $p_header['status'] = "skipped";
@@ -2683,7 +2631,6 @@
       // 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']);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New 
stored filename is '".$p_header['stored_filename']."'");
       }
     }
 
@@ -2701,18 +2648,24 @@
     if ($p_header['status'] == 'ok') {
 
       // ----- Look for a file
-//      if (is_file($p_filename))
-      if (   ($p_filedescr['type'] == 'file')
-          || ($p_filedescr['type'] == 'virtual_file')) {
-          
-        // ----- Get content from real file
         if ($p_filedescr['type'] == 'file') {        
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"'".$p_filename."' is a 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 {
 
           // ----- 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");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
           }
 
@@ -2721,18 +2674,50 @@
 
           // ----- Close the file
           @fclose($v_file);
+
+        // ----- 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 normal compression
+        else {
+          // ----- Compress the content
+          $v_content = @gzdeflate($v_content);
+
+          // ----- Set header parameters
+          $p_header['compressed_size'] = strlen($v_content);
+          $p_header['compression'] = 8;
+        }
+        
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+          @fclose($v_file);
+          return $v_result;
+        }
+
+        // ----- Write the compressed (or not) content
+        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
         }
+
+      }
+
+      // ----- Look for a virtual file (a file from string)
         else if ($p_filedescr['type'] == 'virtual_file') {        
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Add by string");
+          
           $v_content = $p_filedescr['content'];
-        }
 
         // ----- Calculate the CRC
         $p_header['crc'] = @crc32($v_content);
         
         // ----- Look for no compression
         if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"File will not be compressed");
           // ----- Set header parameters
           $p_header['compressed_size'] = $p_header['size'];
           $p_header['compression'] = 0;
@@ -2740,7 +2725,6 @@
         
         // ----- Look for normal compression
         else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"File will be compressed");
           // ----- Compress the content
           $v_content = @gzdeflate($v_content);
 
@@ -2749,33 +2733,9 @@
           $p_header['compression'] = 8;
         }
         
-        // ----- Look for encryption
-        /*
-        if ((isset($p_options[PCLZIP_OPT_CRYPT]))
-                   && ($p_options[PCLZIP_OPT_CRYPT] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"File need to be crypted ....");
-          
-          // Should be a random header
-          $v_header = 'xxxxxxxxxxxx';
-             $v_content_compressed = 
PclZipUtilZipEncrypt($v_content_compressed,
-                                                          
$p_header['compressed_size'],
-                                                      $v_header,
-                                                                               
                   $p_header['crc'],
-                                                                               
                   "test");
-                                                                               
                   
-          $p_header['compressed_size'] += 12;
-          $p_header['flag'] = 1;
-          
-          // ----- Add the header to the data
-          $v_content_compressed = $v_header.$v_content_compressed;
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Size after header : ".strlen($v_content_compressed)."");
-        }
-        */
-
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
           @fclose($v_file);
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
           return $v_result;
         }
 
@@ -2785,7 +2745,6 @@
 
       // ----- Look for a directory
       else if ($p_filedescr['type'] == 'folder') {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"'".$p_filename."' is a folder");
         // ----- Look for directory last '/'
         if (@substr($p_header['stored_filename'], -1) != '/') {
           $p_header['stored_filename'] .= '/';
@@ -2799,7 +2758,6 @@
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
         {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
           return $v_result;
         }
       }
@@ -2807,7 +2765,6 @@
 
     // ----- Look for post-add callback
     if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A 
post-callback '".$p_options[PCLZIP_CB_POST_ADD]."()') is defined for the 
extraction");
 
       // ----- Generate a local information
       $v_local_header = array();
@@ -2816,7 +2773,8 @@
       // ----- Call the callback
       // Here I do not use call_user_func() because I need to send a reference 
to the
       // header.
-      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, 
$v_local_header);');
+//      eval('$v_result = 
'.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, 
$v_local_header);
       if ($v_result == 0) {
         // ----- Ignored
         $v_result = 1;
@@ -2827,7 +2785,116 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // 
--------------------------------------------------------------------------------
+
+  // 
--------------------------------------------------------------------------------
+  // Function : privAddFileUsingTempFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // 
--------------------------------------------------------------------------------
+  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
+  {
+    $v_result=PCLZIP_ERR_NO_ERROR;
+    
+    // ----- 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();
+    }
+
+    // ----- 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;
+    }
+
+    // ----- 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();
+    }
+
+    // ----- 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);
+
+    // ----- 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);
+
+    // ----- 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);
+
+    // ----- 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();
+    }
+
+    // ----- 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);
+
+    // ----- Unlink the temporary file
+    @unlink($v_gzip_temp_name);
+    
+    // ----- Return
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2842,7 +2909,6 @@
   // 
--------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privCalculateStoredFilename", 
"filename='".$p_filedescr['filename']."'");
     $v_result=1;
     
     // ----- Working variables
@@ -2859,7 +2925,6 @@
     else {
       $p_remove_dir = '';
     }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Remove 
path ='".$p_remove_dir."'");
     if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
       $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
     }
@@ -2867,16 +2932,18 @@
       $p_remove_all_dir = 0;
     }
 
+
     // ----- Look for full name change
     if (isset($p_filedescr['new_full_name'])) {
-      $v_stored_filename = $p_filedescr['new_full_name'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Changing full name of '".$p_filename."' for '".$v_stored_filename."'");
+      // ----- Remove drive letter if any
+      $v_stored_filename = 
PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
     }
     
     // ----- Look for path and/or short name change
     else {
 
       // ----- Look for short name change
+      // Its when we cahnge just the filename but not the path
       if (isset($p_filedescr['new_short_name'])) {
         $v_path_info = pathinfo($p_filename);
         $v_dir = '';
@@ -2884,7 +2951,6 @@
           $v_dir = $v_path_info['dirname'].'/';
         }
         $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Changing short name of '".$p_filename."' for '".$v_stored_filename."'");
       }
       else {
         // ----- Calculate the stored filename
@@ -2894,11 +2960,9 @@
       // ----- Look for all path to remove
       if ($p_remove_all_dir) {
         $v_stored_filename = basename($p_filename);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Remove all path selected change '".$p_filename."' for 
'".$v_stored_filename."'");
       }
       // ----- Look for partial path remove
       else if ($p_remove_dir != "") {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Partial path to remove");
         if (substr($p_remove_dir, -1) != '/')
           $p_remove_dir .= "/";
 
@@ -2920,33 +2984,31 @@
         if ($v_compare > 0) {
           if ($v_compare == 2) {
             $v_stored_filename = "";
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Path to remove is the current folder");
           }
           else {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Remove path '$p_remove_dir' in file '$v_stored_filename'");
             $v_stored_filename = substr($v_stored_filename,
                                         strlen($p_remove_dir));
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Result is '$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;
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Add 
path '$p_add_dir' in file '$p_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;
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Stored 
filename will be '".$p_filedescr['stored_filename']."', strlen 
".strlen($p_filedescr['stored_filename']));
     
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -2959,15 +3021,12 @@
   // 
--------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privWriteFileHeader", 'file="'.$p_header['filename'].'", stored as 
"'.$p_header['stored_filename'].'"');
     $v_result=1;
 
     // ----- Store the offset position of the file
     $p_header['offset'] = ftell($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 'File 
offset of the header :'.$p_header['offset']);
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : 
\''.date("d/m/y H:i:s", $p_header['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'];
@@ -2995,7 +3054,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -3008,21 +3066,17 @@
   // 
--------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privWriteCentralFileHeader", 'file="'.$p_header['filename'].'", stored 
as "'.$p_header['stored_filename'].'"');
     $v_result=1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"header[$key] = ".$p_header[$key]);
     //}
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : 
\''.date("d/m/y H:i:s", $p_header['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'];
 
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Comment 
size : \''.$p_header['comment_len'].'\'');
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
@@ -3053,7 +3107,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -3066,7 +3119,6 @@
   // 
--------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, 
$p_comment)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privWriteCentralHeader", 'nb_entries='.$p_nb_entries.', 
size='.$p_size.', offset='.$p_offset.', comment="'.$p_comment.'"');
     $v_result=1;
 
     // ----- Packed data
@@ -3084,7 +3136,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -3097,14 +3148,12 @@
   // 
--------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privList", "list");
     $v_result=1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
 
     // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
     {
       // ----- Magic quotes trick
@@ -3114,7 +3163,6 @@
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive 
\''.$this->zipname.'\' in binary read mode');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
@@ -3123,15 +3171,11 @@
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
     {
       $this->privSwapBackMagicQuotes();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Go to beginning of Central Dir
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Offset 
: ".$v_central_dir['offset']."'");
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Position in file : ".ftell($this->zip_fd)."'");
     @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Position in file : ".ftell($this->zip_fd)."'");
     if (@fseek($this->zip_fd, $v_central_dir['offset']))
     {
       $this->privSwapBackMagicQuotes();
@@ -3140,10 +3184,8 @@
       PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive 
size');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Position in file : ".ftell($this->zip_fd)."'");
 
     // ----- Read each entry
     for ($i=0; $i<$v_central_dir['entries']; $i++)
@@ -3152,7 +3194,6 @@
       if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
       {
         $this->privSwapBackMagicQuotes();
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
         return $v_result;
       }
       $v_header['index'] = $i;
@@ -3169,7 +3210,6 @@
     $this->privSwapBackMagicQuotes();
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -3195,12 +3235,13 @@
   // 
--------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privConvertHeader2FileInfo", "Filename='".$p_header['filename']."'");
     $v_result=1;
 
     // ----- Get the interesting attributes
-    $p_info['filename'] = $p_header['filename'];
-    $p_info['stored_filename'] = $p_header['stored_filename'];
+    $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'];
@@ -3211,7 +3252,6 @@
     $p_info['crc'] = $p_header['crc'];
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -3234,7 +3274,6 @@
   // 
--------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, 
$p_remove_all_path, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privExtractByRule", "path='$p_path', remove_path='$p_remove_path', 
remove_all_path='".($p_remove_all_path?'true':'false')."'");
     $v_result=1;
 
     // ----- Magic quotes trick
@@ -3253,9 +3292,7 @@
       // ----- Look for the path end '/'
       while (substr($p_path, -1) == "/")
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Destination path [$p_path] ends by '/'");
         $p_path = substr($p_path, 0, strlen($p_path)-1);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Modified to [$p_path]");
       }
     }
 
@@ -3267,11 +3304,9 @@
     $p_remove_path_size = strlen($p_remove_path);
 
     // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       $this->privSwapBackMagicQuotes();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -3283,7 +3318,6 @@
       $this->privCloseFd();
       $this->privSwapBackMagicQuotes();
 
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -3294,12 +3328,9 @@
     $j_start = 0;
     for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Read 
next file header entry : '$i'");
 
       // ----- Read next Central dir entry
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Position before rewind : ".ftell($this->zip_fd)."'");
       @rewind($this->zip_fd);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Position after rewind : ".ftell($this->zip_fd)."'");
       if (@fseek($this->zip_fd, $v_pos_entry))
       {
         // ----- Close the zip file
@@ -3310,10 +3341,8 @@
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive 
size');
 
         // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
         return PclZip::errorCode();
       }
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Position after fseek : ".ftell($this->zip_fd)."'");
 
       // ----- Read the file header
       $v_header = array();
@@ -3323,7 +3352,6 @@
         $this->privCloseFd();
         $this->privSwapBackMagicQuotes();
 
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
         return $v_result;
       }
 
@@ -3339,49 +3367,43 @@
       // ----- Look for extract by name rule
       if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract with rule 'ByName'");
 
           // ----- Look if the filename is in the list
           for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && 
(!$v_extract); $j++) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Compare with file '".$p_options[PCLZIP_OPT_BY_NAME][$j]."'");
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "The searched item is a directory");
 
                   // ----- 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])) {
-                      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "The directory is in the file path");
                       $v_extract = true;
                   }
               }
               // ----- Look for a filename
               elseif ($v_header['stored_filename'] == 
$p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "The file is the right one.");
                   $v_extract = true;
               }
           }
       }
 
       // ----- 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] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'");
 
           if (ereg($p_options[PCLZIP_OPT_BY_EREG], 
$v_header['stored_filename'])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Filename match the regular expression");
               $v_extract = true;
           }
       }
+      */
 
       // ----- Look for extract by preg rule
       else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract with rule 'ByEreg'");
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], 
$v_header['stored_filename'])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Filename match the regular expression");
               $v_extract = true;
           }
       }
@@ -3389,23 +3411,18 @@
       // ----- Look for extract by index rule
       else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract with rule 'ByIndex'");
           
           // ----- Look if the index is in the list
           for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && 
(!$v_extract); $j++) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Look if index '$i' is in 
[".$p_options[PCLZIP_OPT_BY_INDEX][$j]['start'].",".$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']."]");
 
               if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && 
($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "Found as part of an index range");
                   $v_extract = true;
               }
               if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "Do not look this index range for next loop");
                   $j_start = $j+1;
               }
 
               if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "Index range is greater than index, stop loop");
                   break;
               }
           }
@@ -3413,7 +3430,6 @@
 
       // ----- Look for no rule, which means extract all the archive
       else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract with no rule (extract all)");
           $v_extract = true;
       }
 
@@ -3421,13 +3437,11 @@
          if (   ($v_extract)
              && (   ($v_header['compression'] != 8)
                      && ($v_header['compression'] != 0))) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Unsupported compression method (".$v_header['compression'].")");
           $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)) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
 
               $this->privSwapBackMagicQuotes();
               
@@ -3436,20 +3450,17 @@
                                                           ."compressed by an 
unsupported compression "
                                                           ."method 
(".$v_header['compression'].") ");
 
-              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
               return PclZip::errorCode();
                  }
          }
          
          // ----- Check encrypted files
          if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Unsupported file 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)) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
 
               $this->privSwapBackMagicQuotes();
 
@@ -3458,20 +3469,17 @@
                                                           ." filename 
'".$v_header['stored_filename']
                                                                   ."'");
 
-              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
               return PclZip::errorCode();
                  }
     }
 
       // ----- Look for real extraction
       if (($v_extract) && ($v_header['status'] != 'ok')) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"No need for extract");
           $v_result = $this->privConvertHeader2FileInfo($v_header,
                                                        
$p_file_list[$v_nb_extracted++]);
           if ($v_result != 1) {
               $this->privCloseFd();
               $this->privSwapBackMagicQuotes();
-              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
               return $v_result;
           }
 
@@ -3481,12 +3489,9 @@
       // ----- Look for real extraction
       if ($v_extract)
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting file '".$v_header['filename']."', index '$i'");
 
         // ----- Go to the file position
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position before rewind : ".ftell($this->zip_fd)."'");
         @rewind($this->zip_fd);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position after rewind : ".ftell($this->zip_fd)."'");
         if (@fseek($this->zip_fd, $v_header['offset']))
         {
           // ----- Close the zip file
@@ -3498,20 +3503,19 @@
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid 
archive size');
 
           // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
           return PclZip::errorCode();
         }
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position after fseek : ".ftell($this->zip_fd)."'");
 
         // ----- Look for extraction as string
         if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
 
+          $v_string = '';
+
           // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string);
+          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, 
$p_options);
           if ($v_result1 < 1) {
             $this->privCloseFd();
             $this->privSwapBackMagicQuotes();
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result1);
             return $v_result1;
           }
 
@@ -3522,7 +3526,6 @@
             $this->privCloseFd();
             $this->privSwapBackMagicQuotes();
 
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
           }
 
@@ -3545,7 +3548,6 @@
           if ($v_result1 < 1) {
             $this->privCloseFd();
             $this->privSwapBackMagicQuotes();
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result1);
             return $v_result1;
           }
 
@@ -3553,7 +3555,6 @@
           if (($v_result = $this->privConvertHeader2FileInfo($v_header, 
$p_file_list[$v_nb_extracted++])) != 1) {
             $this->privCloseFd();
             $this->privSwapBackMagicQuotes();
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
           }
 
@@ -3572,7 +3573,6 @@
           if ($v_result1 < 1) {
             $this->privCloseFd();
             $this->privSwapBackMagicQuotes();
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result1);
             return $v_result1;
           }
 
@@ -3583,7 +3583,6 @@
             $this->privCloseFd();
             $this->privSwapBackMagicQuotes();
 
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
           }
 
@@ -3600,7 +3599,6 @@
     $this->privSwapBackMagicQuotes();
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -3616,18 +3614,15 @@
   // 
--------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, 
$p_remove_all_path, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::privExtractFile', "path='$p_path', remove_path='$p_remove_path', 
remove_all_path='".($p_remove_all_path?'true':'false')."'");
     $v_result=1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
     {
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found 
file '".$v_header['filename']."', size '".$v_header['size']."'");
 
     // ----- Check that the file header is coherent with $p_entry info
     if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
@@ -3638,15 +3633,12 @@
     if ($p_remove_all_path == true) {
         // ----- Look for folder entry that not need to be extracted
         if (($p_entry['external']&0x00000010)==0x00000010) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"The entry is a folder : need to be filtered");
 
             $p_entry['status'] = "filtered";
 
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
         }
 
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "All 
path is removed");
         // ----- Get the basename of the path
         $p_entry['filename'] = basename($p_entry['filename']);
     }
@@ -3654,28 +3646,23 @@
     // ----- Look for path to remove
     else if ($p_remove_path != "")
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Look 
for some path to remove");
       if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The 
folder is the same as the removed path '".$p_entry['filename']."'");
 
         // ----- Change the file status
         $p_entry['status'] = "filtered";
 
         // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
         return $v_result;
       }
 
       $p_remove_path_size = strlen($p_remove_path);
       if (substr($p_entry['filename'], 0, $p_remove_path_size) == 
$p_remove_path)
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Found path '$p_remove_path' to remove in file '".$p_entry['filename']."'");
 
         // ----- Remove the path
         $p_entry['filename'] = substr($p_entry['filename'], 
$p_remove_path_size);
 
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Resulting file is '".$p_entry['filename']."'");
       }
     }
 
@@ -3686,25 +3673,21 @@
     
     // ----- Check a base_dir_restriction
     if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Check 
the extract directory restriction");
       $v_inclusion
       = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
                                 $p_entry['filename']); 
       if ($v_inclusion == 0) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"PCLZIP_OPT_EXTRACT_DIR_RESTRICTION is selected, file is outside restriction");
 
         PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
                                             "Filename 
'".$p_entry['filename']."' is "
                                                                 ."outside 
PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
 
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
         return PclZip::errorCode();
       }
     }
 
     // ----- Look for pre-extract callback
     if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A 
pre-callback '".$p_options[PCLZIP_CB_PRE_EXTRACT]."()') is defined for the 
extraction");
 
       // ----- Generate a local information
       $v_local_header = array();
@@ -3713,7 +3696,8 @@
       // ----- 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);');
+//      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";
@@ -3722,7 +3706,6 @@
       
       // ----- Look for abort result
       if ($v_result == 2) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"User callback abort the extraction");
         // ----- This status is internal and will be changed in 'skipped'
         $p_entry['status'] = "aborted";
        $v_result = PCLZIP_ERR_USER_ABORTED;
@@ -3731,10 +3714,8 @@
       // ----- Update the informations
       // Only some fields can be modified
       $p_entry['filename'] = $v_local_header['filename'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New 
filename is '".$p_entry['filename']."'");
     }
 
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting file (with path) '".$p_entry['filename']."', size 
'$v_header[size]'");
 
     // ----- Look if extraction should be done
     if ($p_entry['status'] == 'ok') {
@@ -3742,12 +3723,10 @@
     // ----- Look for specific actions while the file exist
     if (file_exists($p_entry['filename']))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File 
'".$p_entry['filename']."' already exists");
 
       // ----- Look if file is a directory
       if (is_dir($p_entry['filename']))
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Existing file '".$p_entry['filename']."' is a directory");
 
         // ----- Change the file status
         $p_entry['status'] = "already_a_directory";
@@ -3757,20 +3736,17 @@
         // when this kind of error occurs.
         if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
                    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
 
             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
                                             "Filename 
'".$p_entry['filename']."' is "
                                                                 ."already used 
by an existing directory");
 
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
                }
       }
       // ----- Look if file is write protected
       else if (!is_writeable($p_entry['filename']))
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Existing file '".$p_entry['filename']."' is write protected");
 
         // ----- Change the file status
         $p_entry['status'] = "write_protected";
@@ -3780,13 +3756,11 @@
         // when this kind of error occurs.
         if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
                    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
 
             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
                                             "Filename 
'".$p_entry['filename']."' exists "
                                                                 ."and is write 
protected");
 
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
             return PclZip::errorCode();
                }
       }
@@ -3794,14 +3768,11 @@
       // ----- Look if the extracted file is older
       else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Existing file '".$p_entry['filename']."' is newer (".date("l dS of F Y h:i:s 
A", filemtime($p_entry['filename'])).") than the extracted file (".date("l dS 
of F Y h:i:s A", $p_entry['mtime']).")");
         // ----- Change the file status
         if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
                    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"PCLZIP_OPT_REPLACE_NEWER is selected, file will be replaced");
                }
                else {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"File will not be replaced");
             $p_entry['status'] = "newer_exist";
 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
@@ -3809,19 +3780,16 @@
             // when this kind of error occurs.
             if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
                        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-                //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
 
                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
                                     "Newer version of 
'".$p_entry['filename']."' exists "
                                            ."and option 
PCLZIP_OPT_REPLACE_NEWER is not selected");
 
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
                 return PclZip::errorCode();
                    }
                }
       }
       else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Existing file '".$p_entry['filename']."' is older than the extrated one - will 
be replaced by the extracted one (".date("l dS of F Y h:i:s A", 
filemtime($p_entry['filename'])).") than the extracted file (".date("l dS of F 
Y h:i:s A", $p_entry['mtime']).")");
       }
     }
 
@@ -3835,13 +3803,11 @@
         $v_dir_to_check = dirname($p_entry['filename']);
 
       if (($v_result = $this->privDirCheck($v_dir_to_check, 
(($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Unable to create path for '".$p_entry['filename']."'");
 
         // ----- Change the file status
         $p_entry['status'] = "path_creation_fail";
 
         // ----- Return
-        ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
         //return $v_result;
         $v_result = 1;
       }
@@ -3856,29 +3822,24 @@
       {
         // ----- Look for not compressed file
         if ($p_entry['compression'] == 0) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting an un-compressed file");
 
                  // ----- Opening destination file
           if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
           {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Error while opening '".$p_entry['filename']."' in write binary mode");
 
             // ----- Change the file status
             $p_entry['status'] = "write_error";
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
           }
 
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Read '".$p_entry['size']."' bytes");
 
           // ----- 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);
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Read $v_read_size bytes");
             $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);
@@ -3897,54 +3858,50 @@
 
         }
         else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting a compressed file (Compression method 
".$p_entry['compression'].")");
           // ----- TBC
           // Need to be finished
           if (($p_entry['flag'] & 1) == 1) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
2, "File is encrypted");
-            /*
-              // ----- Read the encryption header
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
5, "Read 12 encryption header bytes");
-              $v_encryption_header = @fread($this->zip_fd, 12);
-              
-              // ----- Read the encrypted & compressed file in a buffer
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
5, "Read '".($p_entry['compressed_size']-12)."' compressed & encrypted bytes");
-              $v_buffer = @fread($this->zip_fd, 
$p_entry['compressed_size']-12);
-              
-              // ----- Decrypt the buffer
-              $this->privDecrypt($v_encryption_header, $v_buffer,
-                                            $p_entry['compressed_size']-12, 
$p_entry['crc']);
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
5, "Buffer is '".$v_buffer."'");
-              */
+            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 extract in memory
           else {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
5, "Read '".$p_entry['compressed_size']."' compressed bytes");
+
+          
               // ----- 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) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Unable to inflate compressed file");
 
             // ----- Change the file status
             // TBC
             $p_entry['status'] = "error";
             
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
           }
           
           // ----- Opening destination file
           if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Error while opening '".$p_entry['filename']."' in write binary mode");
 
             // ----- Change the file status
             $p_entry['status'] = "write_error";
 
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
           }
 
@@ -3955,19 +3912,19 @@
           // ----- Closing the destination file
           @fclose($v_dest_file);
 
+          }
+
           // ----- Change the file mtime
           @touch($p_entry['filename'], $p_entry['mtime']);
         }
 
         // ----- Look for chmod option
         if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"chmod option activated '".$p_options[PCLZIP_OPT_SET_CHMOD]."'");
 
           // ----- Change the mode of the file
           @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
         }
 
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extraction done");
       }
     }
 
@@ -3978,7 +3935,6 @@
        
     // ----- Look for post-extract callback
     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A 
post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the 
extraction");
 
       // ----- Generate a local information
       $v_local_header = array();
@@ -3987,17 +3943,92 @@
       // ----- Call the callback
       // Here I do not use call_user_func() because I need to send a reference 
to the
       // header.
-      eval('$v_result = 
'.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, 
$v_local_header);');
+//      eval('$v_result = 
'.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, 
$v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, 
$v_local_header);
 
       // ----- Look for abort result
       if ($v_result == 2) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"User callback abort the extraction");
        $v_result = PCLZIP_ERR_USER_ABORTED;
       }
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // 
--------------------------------------------------------------------------------
+
+  // 
--------------------------------------------------------------------------------
+  // Function : privExtractFileUsingTempFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // 
--------------------------------------------------------------------------------
+  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();
+    }
+
+
+    // ----- 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;
+    }
+
+    // ----- 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);
+
+    // ----- 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();
+    }
+
+
+    // ----- 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);
+    
+    // ----- Return
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -4010,16 +4041,13 @@
   // 
--------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::privExtractFileInOutput', "");
     $v_result=1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found 
file '".$v_header['filename']."', size '".$v_header['size']."'");
 
     // ----- Check that the file header is coherent with $p_entry info
     if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
@@ -4028,7 +4056,6 @@
 
     // ----- Look for pre-extract callback
     if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A 
pre-callback '".$p_options[PCLZIP_CB_PRE_EXTRACT]."()') is defined for the 
extraction");
 
       // ----- Generate a local information
       $v_local_header = array();
@@ -4037,7 +4064,8 @@
       // ----- 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);');
+//      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";
@@ -4046,7 +4074,6 @@
 
       // ----- Look for abort result
       if ($v_result == 2) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"User callback abort the extraction");
         // ----- This status is internal and will be changed in 'skipped'
         $p_entry['status'] = "aborted";
        $v_result = PCLZIP_ERR_USER_ABORTED;
@@ -4055,11 +4082,9 @@
       // ----- Update the informations
       // Only some fields can be modified
       $p_entry['filename'] = $v_local_header['filename'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New 
filename is '".$p_entry['filename']."'");
     }
 
     // ----- Trace
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting file (with path) '".$p_entry['filename']."', size 
'$v_header[size]'");
 
     // ----- Look if extraction should be done
     if ($p_entry['status'] == 'ok') {
@@ -4068,8 +4093,6 @@
       if (!(($p_entry['external']&0x00000010)==0x00000010)) {
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting an un-compressed file");
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Reading '".$p_entry['size']."' bytes");
 
           // ----- Read the file in a buffer (one shot)
           $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4079,8 +4102,6 @@
           unset($v_buffer);
         }
         else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting a compressed file");
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Reading '".$p_entry['size']."' bytes");
 
           // ----- Read the compressed file in a buffer (one shot)
           $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4093,7 +4114,6 @@
           echo $v_file_content;
           unset($v_file_content);
         }
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extraction done");
       }
     }
 
@@ -4104,7 +4124,6 @@
 
     // ----- Look for post-extract callback
     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A 
post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the 
extraction");
 
       // ----- Generate a local information
       $v_local_header = array();
@@ -4113,16 +4132,15 @@
       // ----- Call the callback
       // Here I do not use call_user_func() because I need to send a reference 
to the
       // header.
-      eval('$v_result = 
'.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, 
$v_local_header);');
+//      eval('$v_result = 
'.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, 
$v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, 
$v_local_header);
 
       // ----- Look for abort result
       if ($v_result == 2) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"User callback abort the extraction");
        $v_result = PCLZIP_ERR_USER_ABORTED;
       }
     }
 
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -4133,9 +4151,8 @@
   // Parameters :
   // Return Values :
   // 
--------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string)
+  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::privExtractFileAsString', 
"p_entry['filename']='".$p_entry['filename']."'");
     $v_result=1;
 
     // ----- Read the file header
@@ -4143,33 +4160,59 @@
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
     {
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found 
file '".$v_header['filename']."', size '".$v_header['size']."'");
 
     // ----- Check that the file header is coherent with $p_entry info
     if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
         // TBC
     }
 
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting file in string (with path) '".$p_entry['filename']."', size 
'$v_header[size]'");
+    // ----- 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.
+//      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;
+      }
+      
+      // ----- 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'];
+    }
+
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
 
     // ----- Do the extraction (if not a folder)
-    if (!(($p_entry['external']&0x00000010)==0x00000010))
-    {
+      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
       // ----- Look for not compressed file
-//      if ($p_entry['compressed_size'] == $p_entry['size'])
+  //      if ($p_entry['compressed_size'] == $p_entry['size'])
       if ($p_entry['compression'] == 0) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting an un-compressed file");
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Reading '".$p_entry['size']."' bytes");
 
         // ----- Reading the file
         $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
       }
       else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extracting a compressed file (compression method 
'".$p_entry['compression']."')");
 
         // ----- Reading the file
         $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4181,14 +4224,46 @@
       }
 
       // ----- Trace
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Extraction done");
     }
     else {
         // TBC : error : can not extract a folder in a string
     }
 
+    }
+
+       // ----- Change abort status
+       if ($p_entry['status'] == "aborted") {
+        $p_entry['status'] = "skipped";
+       }
+       
+    // ----- 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);
+      
+      // ----- 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.
+//      eval('$v_result = 
'.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, 
$v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, 
$v_local_header);
+
+      // ----- 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;
+      }
+    }
+
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -4201,25 +4276,20 @@
   // 
--------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privReadFileHeader", "");
     $v_result=1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary 
data is : '".sprintf("%08x", $v_binary_data)."'");
     $v_data = unpack('Vid', $v_binary_data);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary 
signature is : '".sprintf("0x%08x", $v_data['id'])."'");
 
     // ----- Check signature
     if ($v_data['id'] != 0x04034b50)
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Invalid File header");
 
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
@@ -4231,51 +4301,36 @@
     {
       $p_header['filename'] = "";
       $p_header['status'] = "invalid_header";
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Invalid block size : ".strlen($v_binary_data));
 
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : 
".strlen($v_binary_data));
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
     // ----- Extract the values
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Header 
: '".$v_binary_data."'");
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Header 
(Hex) : '".bin2hex($v_binary_data)."'");
     $v_data = 
unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len',
 $v_binary_data);
 
     // ----- Get filename
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "File 
name length : ".$v_data['filename_len']);
     $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
'Filename : \''.$p_header['filename'].'\'');
 
     // ----- Get extra_fields
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extra 
field length : ".$v_data['extra_len']);
     if ($v_data['extra_len'] != 0) {
       $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
     }
     else {
       $p_header['extra'] = '';
     }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Extra 
field : \''.bin2hex($p_header['extra']).'\'');
 
     // ----- Extract properties
     $p_header['version_extracted'] = $v_data['version'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version 
need to extract : ('.$p_header['version_extracted'].') 
\''.($p_header['version_extracted']/10).'.'.($p_header['version_extracted']%10).'\'');
     $p_header['compression'] = $v_data['compression'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
'Compression method : \''.$p_header['compression'].'\'');
     $p_header['size'] = $v_data['size'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size : 
\''.$p_header['size'].'\'');
     $p_header['compressed_size'] = $v_data['compressed_size'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
'Compressed Size : \''.$p_header['compressed_size'].'\'');
     $p_header['crc'] = $v_data['crc'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'CRC : 
\''.sprintf("0x%X", $p_header['crc']).'\'');
     $p_header['flag'] = $v_data['flag'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Flag : 
\''.$p_header['flag'].'\'');
     $p_header['filename_len'] = $v_data['filename_len'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
'Filename_len : \''.$p_header['filename_len'].'\'');
 
     // ----- Recuperate date in UNIX format
     $p_header['mdate'] = $v_data['mdate'];
@@ -4293,19 +4348,16 @@
       $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);
+      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, 
$v_day, $v_year);
 
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date 
: \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
     }
     else
     {
       $p_header['mtime'] = time();
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date 
is actual : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
     }
 
     // TBC
     //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Attribut[$key] = ".$v_data[$key]);
     //}
 
     // ----- Set the stored filename
@@ -4315,7 +4367,6 @@
     $p_header['status'] = "ok";
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -4328,25 +4379,20 @@
   // 
--------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privReadCentralFileHeader", "");
     $v_result=1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary 
data is : '".sprintf("%08x", $v_binary_data)."'");
     $v_data = unpack('Vid', $v_binary_data);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary 
signature is : '".sprintf("0x%08x", $v_data['id'])."'");
 
     // ----- Check signature
     if ($v_data['id'] != 0x02014b50)
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Invalid Central Dir File signature");
 
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
@@ -4358,53 +4404,36 @@
     {
       $p_header['filename'] = "";
       $p_header['status'] = "invalid_header";
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Invalid block size : ".strlen($v_binary_data));
 
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : 
".strlen($v_binary_data));
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
     // ----- Extract the values
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header 
: '".$v_binary_data."'");
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header 
(Hex) : '".bin2hex($v_binary_data)."'");
     $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
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "File 
name length : ".$p_header['filename_len']);
     if ($p_header['filename_len'] != 0)
       $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
     else
       $p_header['filename'] = '';
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
'Filename : \''.$p_header['filename'].'\'');
 
     // ----- Get extra
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Extra 
length : ".$p_header['extra_len']);
     if ($p_header['extra_len'] != 0)
       $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
     else
       $p_header['extra'] = '';
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Extra : 
\''.$p_header['extra'].'\'');
 
     // ----- Get comment
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Comment 
length : ".$p_header['comment_len']);
     if ($p_header['comment_len'] != 0)
       $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
     else
       $p_header['comment'] = '';
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Comment 
: \''.$p_header['comment'].'\'');
 
     // ----- Extract properties
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version 
: \''.($p_header['version']/10).'.'.($p_header['version']%10).'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version 
need to extract : 
\''.($p_header['version_extracted']/10).'.'.($p_header['version_extracted']%10).'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Size : 
\''.$p_header['size'].'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
'Compressed Size : \''.$p_header['compressed_size'].'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'CRC : 
\''.sprintf("0x%X", $p_header['crc']).'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Flag : 
\''.$p_header['flag'].'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Offset 
: \''.$p_header['offset'].'\'');
 
     // ----- Recuperate date in UNIX format
     //if ($p_header['mdate'] && $p_header['mtime'])
@@ -4424,12 +4453,10 @@
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, 
$v_day, $v_year);
 
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Date 
: \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
     }
     else
     {
       $p_header['mtime'] = time();
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Date 
is actual : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
     }
 
     // ----- Set the stored filename
@@ -4439,18 +4466,13 @@
     $p_header['status'] = 'ok';
 
     // ----- Look if it is a directory
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Internal (Hex) : '".sprintf("Ox%04X", $p_header['internal'])."'");
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"External (Hex) : '".sprintf("Ox%04X", $p_header['external'])."' 
(".(($p_header['external']&0x00000010)==0x00000010?'is a folder':'is a 
file').')');
     if (substr($p_header['filename'], -1) == '/') {
       //$p_header['external'] = 0x41FF0010;
       $p_header['external'] = 0x00000010;
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Force 
folder external : \''.sprintf("Ox%04X", $p_header['external']).'\'');
     }
 
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Header 
of filename : \''.$p_header['filename'].'\'');
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -4465,44 +4487,31 @@
   // 
--------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privCheckFileHeaders", "");
     $v_result=1;
 
        // ----- Check the static values
        // TBC
        if ($p_local_header['filename'] != $p_central_header['filename']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad 
check "filename" : TBC To Be Completed');
        }
        if ($p_local_header['version_extracted'] != 
$p_central_header['version_extracted']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad 
check "version_extracted" : TBC To Be Completed');
        }
        if ($p_local_header['flag'] != $p_central_header['flag']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad 
check "flag" : TBC To Be Completed');
        }
        if ($p_local_header['compression'] != $p_central_header['compression']) 
{
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad 
check "compression" : TBC To Be Completed');
        }
        if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad 
check "mtime" : TBC To Be Completed');
        }
        if ($p_local_header['filename_len'] != 
$p_central_header['filename_len']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad 
check "filename_len" : TBC To Be Completed');
        }
 
        // ----- Look for flag bit 3
        if (($p_local_header['flag'] & 8) == 8) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
'Purpose bit flag bit 3 set !');
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
'File size, compression size and crc found in central header');
         $p_local_header['size'] = $p_central_header['size'];
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
'Size : \''.$p_local_header['size'].'\'');
         $p_local_header['compressed_size'] = 
$p_central_header['compressed_size'];
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
'Compressed Size : \''.$p_local_header['compressed_size'].'\'');
         $p_local_header['crc'] = $p_central_header['crc'];
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'CRC 
: \''.sprintf("0x%X", $p_local_header['crc']).'\'');
        }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -4515,21 +4524,17 @@
   // 
--------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privReadEndCentralDir", "");
     $v_result=1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->zipname);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Size of 
the file :$v_size");
     @fseek($this->zip_fd, $v_size);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
'Position at end of zip file : \''.ftell($this->zip_fd).'\'');
     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
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
@@ -4537,28 +4542,22 @@
     // in this case the end of central dir is at 22 bytes of the file end
     $v_found = 0;
     if ($v_size > 26) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Look 
for central dir with no comment');
       @fseek($this->zip_fd, $v_size-22);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
'Position after min central position : \''.ftell($this->zip_fd).'\'');
       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
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
         return PclZip::errorCode();
       }
 
       // ----- Read for bytes
       $v_binary_data = @fread($this->zip_fd, 4);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Binary data is : '".sprintf("%08x", $v_binary_data)."'");
       $v_data = @unpack('Vid', $v_binary_data);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'");
 
       // ----- Check signature
       if ($v_data['id'] == 0x06054b50) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"Found central dir at the default position.");
         $v_found = 1;
       }
 
@@ -4567,7 +4566,6 @@
 
     // ----- Go back to the maximum possible size of the Central Dir End Record
     if (!$v_found) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Start 
extended search of end central dir');
       $v_maximum_size = 65557; // 0xFFFF + 22;
       if ($v_maximum_size > $v_size)
         $v_maximum_size = $v_size;
@@ -4578,10 +4576,8 @@
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to 
the middle of the archive \''.$this->zipname.'\'');
 
         // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
         return PclZip::errorCode();
       }
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
'Position after max central position : \''.ftell($this->zip_fd).'\'');
 
       // ----- Read byte per byte in order to find the signature
       $v_pos = ftell($this->zip_fd);
@@ -4592,12 +4588,14 @@
         $v_byte = @fread($this->zip_fd, 1);
 
         // -----  Add the byte
-        $v_bytes = ($v_bytes << 8) | Ord($v_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)
         {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
'Found End Central Dir signature at position : \''.ftell($this->zip_fd).'\'');
           $v_pos++;
           break;
         }
@@ -4608,13 +4606,11 @@
       // ----- Look if not found end of central dir
       if ($v_pos == $v_size)
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"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
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
         return PclZip::errorCode();
       }
     }
@@ -4625,25 +4621,19 @@
     // ----- Look for invalid block size
     if (strlen($v_binary_data) != 18)
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"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
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
     // ----- Extract the values
-    ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Central Dir Record : '".$v_binary_data."'");
-    ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Central Dir Record (Hex) : '".bin2hex($v_binary_data)."'");
     $v_data = 
unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', 
$v_binary_data);
 
     // ----- Check the global size
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Comment 
length : ".$v_data['comment_size']);
     if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The 
central dir is not at the end of the archive. Some trailing bytes exists after 
the archive.");
 
          // ----- Removed in release 2.2 see readme file
          // The check of the file size is a little too strict.
@@ -4656,40 +4646,29 @@
                                                   .' Some trailing bytes 
exists after the archive.');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
          }
     }
 
     // ----- Get comment
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Comment 
size : \''.$v_data['comment_size'].'\'');
     if ($v_data['comment_size'] != 0) {
       $p_central_dir['comment'] = fread($this->zip_fd, 
$v_data['comment_size']);
     }
     else
       $p_central_dir['comment'] = '';
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Comment 
: \''.$p_central_dir['comment'].'\'');
 
     $p_central_dir['entries'] = $v_data['entries'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Nb of 
entries : \''.$p_central_dir['entries'].'\'');
     $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Nb of 
entries for this disk : \''.$p_central_dir['disk_entries'].'\'');
     $p_central_dir['offset'] = $v_data['offset'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Offset 
of Central Dir : \''.$p_central_dir['offset'].'\'');
     $p_central_dir['size'] = $v_data['size'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size of 
Central Dir : \''.$p_central_dir['size'].'\'');
     $p_central_dir['disk'] = $v_data['disk'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Disk 
number : \''.$p_central_dir['disk'].'\'');
     $p_central_dir['disk_start'] = $v_data['disk_start'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Start 
disk number : \''.$p_central_dir['disk_start'].'\'');
 
     // TBC
     //for(reset($p_central_dir); $key = key($p_central_dir); 
next($p_central_dir)) {
-    //  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"central_dir[$key] = ".$p_central_dir[$key]);
     //}
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -4702,16 +4681,13 @@
   // 
--------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privDeleteByRule", "");
     $v_result=1;
     $v_list_detail = array();
 
     // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($v_result=$this->privOpenFd('rb')) != 1)
     {
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -4720,21 +4696,16 @@
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
     {
       $this->privCloseFd();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Go to beginning of File
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position in file : ".ftell($this->zip_fd)."'");
     @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position in file : ".ftell($this->zip_fd)."'");
 
     // ----- Scan all the files
     // ----- Start at beginning of Central Dir
     $v_pos_entry = $v_central_dir['offset'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position before rewind : ".ftell($this->zip_fd)."'");
     @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position after rewind : ".ftell($this->zip_fd)."'");
     if (@fseek($this->zip_fd, $v_pos_entry))
     {
       // ----- Close the zip file
@@ -4744,17 +4715,14 @@
       PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive 
size');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position after fseek : ".ftell($this->zip_fd)."'");
 
     // ----- Read each entry
     $v_header_list = array();
     $j_start = 0;
     for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Read 
next file header entry (index '$i')");
 
       // ----- Read the file header
       $v_header_list[$v_nb_extracted] = array();
@@ -4763,11 +4731,9 @@
         // ----- Close the zip file
         $this->privCloseFd();
 
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
         return $v_result;
       }
 
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Filename (index '$i') : 
'".$v_header_list[$v_nb_extracted]['stored_filename']."'");
 
       // ----- Store the index
       $v_header_list[$v_nb_extracted]['index'] = $i;
@@ -4778,54 +4744,47 @@
       // ----- Look for extract by name rule
       if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract with rule 'ByName'");
 
           // ----- Look if the filename is in the list
           for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && 
(!$v_found); $j++) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Compare with file '".$p_options[PCLZIP_OPT_BY_NAME][$j]."'");
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "The searched item is a directory");
 
                   // ----- 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])) {
-                      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "The directory is in the file path");
                       $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])) {
-                      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "The entry is the searched directory");
                       $v_found = true;
                   }
               }
               // ----- Look for a filename
               elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == 
$p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "The file is the right one.");
                   $v_found = true;
               }
           }
       }
 
       // ----- 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] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'");
 
           if (ereg($p_options[PCLZIP_OPT_BY_EREG], 
$v_header_list[$v_nb_extracted]['stored_filename'])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Filename match the regular expression");
               $v_found = true;
           }
       }
+      */
 
       // ----- Look for extract by preg rule
       else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract with rule 'ByEreg'");
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], 
$v_header_list[$v_nb_extracted]['stored_filename'])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Filename match the regular expression");
               $v_found = true;
           }
       }
@@ -4833,41 +4792,33 @@
       // ----- Look for extract by index rule
       else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Extract with rule 'ByIndex'");
 
           // ----- Look if the index is in the list
           for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && 
(!$v_found); $j++) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Look if index '$i' is in 
[".$p_options[PCLZIP_OPT_BY_INDEX][$j]['start'].",".$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']."]");
 
               if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && 
($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "Found as part of an index range");
                   $v_found = true;
               }
               if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "Do not look this index range for next loop");
                   $j_start = $j+1;
               }
 
               if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, 
__LINE__, 3, "Index range is greater than index, stop loop");
                   break;
               }
           }
       }
       else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "No 
argument mean remove all file");
        $v_found = true;
       }
 
       // ----- Look for deletion
       if ($v_found)
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"File '".$v_header_list[$v_nb_extracted]['stored_filename']."', index '$i' need 
to be deleted");
         unset($v_header_list[$v_nb_extracted]);
       }
       else
       {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 
"File '".$v_header_list[$v_nb_extracted]['stored_filename']."', index '$i' will 
not be deleted");
         $v_nb_extracted++;
       }
     }
@@ -4882,24 +4833,18 @@
         $v_temp_zip = new PclZip($v_zip_temp_name);
 
         // ----- Open the temporary zip file in write mode
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Open file in binary write mode");
         if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
             $this->privCloseFd();
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
         }
 
         // ----- Look which file need to be kept
         for ($i=0; $i<sizeof($v_header_list); $i++) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Keep entry index '$i' : '".$v_header_list[$i]['filename']."'");
 
             // ----- Calculate the position of the header
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Offset='". $v_header_list[$i]['offset']."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position before rewind : ".ftell($this->zip_fd)."'");
             @rewind($this->zip_fd);
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position after rewind : ".ftell($this->zip_fd)."'");
             if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
                 // ----- Close the zip file
                 $this->privCloseFd();
@@ -4910,10 +4855,8 @@
                 PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid 
archive size');
 
                 // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
                 return PclZip::errorCode();
             }
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position after fseek : ".ftell($this->zip_fd)."'");
 
             // ----- Read the file header
             $v_local_header = array();
@@ -4924,7 +4867,6 @@
                 @unlink($v_zip_temp_name);
 
                 // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
                 return $v_result;
             }
             
@@ -4943,10 +4885,8 @@
                 @unlink($v_zip_temp_name);
 
                 // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
                 return $v_result;
             }
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Offset for this file is '".$v_header_list[$i]['offset']."'");
 
             // ----- Read/write the data block
             if (($v_result = PclZipUtilCopyBlock($this->zip_fd, 
$v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
@@ -4956,27 +4896,22 @@
                 @unlink($v_zip_temp_name);
 
                 // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
                 return $v_result;
             }
         }
 
         // ----- Store the offset of the central dir
         $v_offset = @ftell($v_temp_zip->zip_fd);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "New 
offset of central dir : $v_offset");
 
         // ----- Re-Create the Central Dir files header
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Creates the new central directory");
         for ($i=0; $i<sizeof($v_header_list); $i++) {
             // ----- Create the file header
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Offset of file : ".$v_header_list[$i]['offset']);
             if (($v_result = 
$v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
                 $v_temp_zip->privCloseFd();
                 $this->privCloseFd();
                 @unlink($v_zip_temp_name);
 
                 // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
                 return $v_result;
             }
 
@@ -4984,7 +4919,6 @@
             $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], 
$p_result_list[$i]);
         }
 
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Creates the central directory footer");
 
         // ----- Zip file comment
         $v_comment = '';
@@ -5004,7 +4938,6 @@
             @unlink($v_zip_temp_name);
 
             // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
             return $v_result;
         }
 
@@ -5030,12 +4963,10 @@
         $this->privCloseFd();
 
         if (($v_result = $this->privOpenFd('wb')) != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
           return $v_result;
         }
 
         if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
           return $v_result;
         }
 
@@ -5043,7 +4974,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5063,25 +4993,21 @@
   {
     $v_result = 1;
 
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privDirCheck", "entry='$p_dir', 
is_dir='".($p_is_dir?"true":"false")."'");
 
     // ----- Remove the final '/'
     if (($p_is_dir) && (substr($p_dir, -1)=='/'))
     {
       $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
     }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Looking 
for entry '$p_dir'");
 
     // ----- Check the directory availability
     if ((is_dir($p_dir)) || ($p_dir == ""))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, "'$p_dir' is 
a directory");
       return 1;
     }
 
     // ----- Extract parent directory
     $p_parent_dir = dirname($p_dir);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Parent 
directory is '$p_parent_dir'");
 
     // ----- Just a check
     if ($p_parent_dir != $p_dir)
@@ -5091,26 +5017,22 @@
       {
         if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
         {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
$v_result);
           return $v_result;
         }
       }
     }
 
     // ----- Create the directory
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Create 
directory '$p_dir'");
     if (address@hidden($p_dir, 0777))
     {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create 
directory '$p_dir'");
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result, 
"Directory '$p_dir' created");
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5124,41 +5046,34 @@
   // 
--------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privMerge", "archive='".$p_archive_to_add->zipname."'");
     $v_result=1;
 
     // ----- Look if the archive_to_add exists
     if (!is_file($p_archive_to_add->zipname))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Archive to add does not exist. End of merge.");
 
       // ----- Nothing to merge, so merge is a success
       $v_result = 1;
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Look if the archive exists
     if (!is_file($this->zipname))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Archive does not exist, duplicate the archive_to_add.");
 
       // ----- Do a duplicate
       $v_result = $this->privDuplicate($p_archive_to_add->zipname);
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($v_result=$this->privOpenFd('rb')) != 1)
     {
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -5167,23 +5082,18 @@
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
     {
       $this->privCloseFd();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Go to beginning of File
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position in zip : ".ftell($this->zip_fd)."'");
     @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position in zip : ".ftell($this->zip_fd)."'");
 
     // ----- Open the archive_to_add file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
archive_to_add in binary read mode");
     if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
     {
       $this->privCloseFd();
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -5194,20 +5104,16 @@
       $this->privCloseFd();
       $p_archive_to_add->privCloseFd();
 
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Go to beginning of File
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position in archive_to_add : ".ftell($p_archive_to_add->zip_fd)."'");
     @rewind($p_archive_to_add->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Position in archive_to_add : ".ftell($p_archive_to_add->zip_fd)."'");
 
     // ----- Creates a temporay file
     $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
     // ----- Open the temporary file in write mode
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
     {
       $this->privCloseFd();
@@ -5216,7 +5122,6 @@
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open 
temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
@@ -5226,7 +5131,6 @@
     while ($v_size != 0)
     {
       $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : 
PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read 
$v_read_size bytes");
       $v_buffer = fread($this->zip_fd, $v_read_size);
       @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
       $v_size -= $v_read_size;
@@ -5237,7 +5141,6 @@
     while ($v_size != 0)
     {
       $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : 
PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read 
$v_read_size bytes");
       $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;
@@ -5245,14 +5148,12 @@
 
     // ----- Store the offset of the central dir
     $v_offset = @ftell($v_zip_temp_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "New 
offset of central dir : $v_offset");
 
     // ----- 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);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read 
$v_read_size bytes");
       $v_buffer = @fread($this->zip_fd, $v_read_size);
       @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
       $v_size -= $v_read_size;
@@ -5263,7 +5164,6 @@
     while ($v_size != 0)
     {
       $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : 
PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read 
$v_read_size bytes");
       $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;
@@ -5294,7 +5194,6 @@
       unset($v_header_list);
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
@@ -5320,7 +5219,6 @@
     PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5333,33 +5231,27 @@
   // 
--------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZip::privDuplicate", "archive_filename='$p_archive_filename'");
     $v_result=1;
 
     // ----- Look if the $p_archive_filename exists
     if (!is_file($p_archive_filename))
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Archive to duplicate does not exist. End of duplicate.");
 
       // ----- Nothing to duplicate, so duplicate is a success.
       $v_result = 1;
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($v_result=$this->privOpenFd('wb')) != 1)
     {
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
     }
 
     // ----- Open the temporary file in write mode
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open 
file in binary read mode");
     if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
     {
       $this->privCloseFd();
@@ -5367,7 +5259,6 @@
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive 
file \''.$p_archive_filename.'\' in binary write mode');
 
       // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 
PclZip::errorCode(), PclZip::errorInfo());
       return PclZip::errorCode();
     }
 
@@ -5377,7 +5268,6 @@
     while ($v_size != 0)
     {
       $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : 
PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read 
$v_read_size bytes");
       $v_buffer = fread($v_zip_temp_fd, $v_read_size);
       @fwrite($this->zip_fd, $v_buffer, $v_read_size);
       $v_size -= $v_read_size;
@@ -5390,7 +5280,6 @@
     @fclose($v_zip_temp_fd);
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5430,29 +5319,6 @@
   // 
--------------------------------------------------------------------------------
 
   // 
--------------------------------------------------------------------------------
-  // Function : privDecrypt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // 
--------------------------------------------------------------------------------
-  function privDecrypt($p_encryption_header, &$p_buffer, $p_size, $p_crc)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::privDecrypt', "size=".$p_size."");
-    $v_result=1;
-    
-    // ----- To Be Modified ;-)
-    $v_pwd = "test";
-    
-    $p_buffer = PclZipUtilZipDecrypt($p_buffer, $p_size, $p_encryption_header,
-                                        $p_crc, $v_pwd);
-    
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // 
--------------------------------------------------------------------------------
-
-  // 
--------------------------------------------------------------------------------
   // Function : privDisableMagicQuotes()
   // Description :
   // Parameters :
@@ -5460,36 +5326,28 @@
   // 
--------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::privDisableMagicQuotes', "");
     $v_result=1;
 
     // ----- Look if function exists
     if (   (!function_exists("get_magic_quotes_runtime"))
            || (!function_exists("set_magic_quotes_runtime"))) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Functions *et_magic_quotes_runtime are not supported");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
        }
 
     // ----- Look if already done
     if ($this->magic_quotes_status != -1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"magic_quote already disabled");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
        }
 
        // ----- Get and memorize the magic_quote value
        $this->magic_quotes_status = @get_magic_quotes_runtime();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Current 
magic_quotes_runtime status is 
'".($this->magic_quotes_status==0?'disable':'enable')."'");
 
        // ----- Disable magic_quotes
        if ($this->magic_quotes_status == 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Disable magic_quotes");
          @set_magic_quotes_runtime(0);
        }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5502,32 +5360,25 @@
   // 
--------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
'PclZip::privSwapBackMagicQuotes', "");
     $v_result=1;
 
     // ----- Look if function exists
     if (   (!function_exists("get_magic_quotes_runtime"))
            || (!function_exists("set_magic_quotes_runtime"))) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Functions *et_magic_quotes_runtime are not supported");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
        }
 
     // ----- Look if something to do
     if ($this->magic_quotes_status != -1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"magic_quote not modified");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
       return $v_result;
        }
 
        // ----- Swap back magic_quotes
        if ($this->magic_quotes_status == 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 
"Enable back magic_quotes");
          @set_magic_quotes_runtime($this->magic_quotes_status);
        }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5544,7 +5395,6 @@
   // 
--------------------------------------------------------------------------------
   function PclZipUtilPathReduction($p_dir)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZipUtilPathReduction", "dir='$p_dir'");
     $v_result = "";
 
     // ----- Look for not empty path
@@ -5571,7 +5421,6 @@
                        // ----- It is an invalid path, so the path is not 
modified
                        // TBC
                        $v_result = $p_dir;
-                //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 
3, "Invalid path is unchanged");
                 $v_skip = 0;
                    }
                  }
@@ -5606,7 +5455,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5628,19 +5476,16 @@
   // 
--------------------------------------------------------------------------------
   function PclZipUtilPathInclusion($p_dir, $p_path)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZipUtilPathInclusion", "dir='$p_dir', path='$p_path'");
     $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);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Replacing ./ by full path in p_dir '".$p_dir."'");
     }
     if (   ($p_path == '.')
         || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
       $p_path = PclZipUtilTranslateWinPath(getcwd(), 
FALSE).'/'.substr($p_path, 1);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Replacing ./ by full path in p_path '".$p_path."'");
     }
 
     // ----- Explode dir and path by directory separator
@@ -5653,7 +5498,6 @@
     $i = 0;
     $j = 0;
     while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) 
{
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Working on dir($i)='".$v_list_dir[$i]."' and path($j)='".$v_list_path[$j]."'");
 
       // ----- Look for empty dir (path reduction)
       if ($v_list_dir[$i] == '') {
@@ -5667,7 +5511,6 @@
 
       // ----- Compare the items
       if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && 
( $v_list_path[$j] != ''))  {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Items ($i,$j) are different");
         $v_result = 0;
       }
 
@@ -5678,11 +5521,9 @@
 
     // ----- Look if everything seems to be the same
     if ($v_result) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Look 
for tie break");
       // ----- 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++;
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Looking on dir($i)='".($i < $v_list_dir_size?$v_list_dir[$i]:'')."' and 
path($j)='".($j < $v_list_path_size?$v_list_path[$j]:'')."'");
 
       if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
         // ----- There are exactly the same
@@ -5695,7 +5536,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5713,30 +5553,23 @@
   // 
--------------------------------------------------------------------------------
   function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZipUtilCopyBlock", "size=$p_size, mode=$p_mode");
     $v_result = 1;
 
     if ($p_mode==0)
     {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Src 
offset before read :".(@ftell($p_src)));
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Dest 
offset before write :".(@ftell($p_dest)));
       while ($p_size != 0)
       {
         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : 
PCLZIP_READ_BLOCK_SIZE);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Read $v_read_size bytes");
         $v_buffer = @fread($p_src, $v_read_size);
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Src 
offset after read :".(@ftell($p_src)));
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Dest 
offset after write :".(@ftell($p_dest)));
     }
     else if ($p_mode==1)
     {
       while ($p_size != 0)
       {
         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : 
PCLZIP_READ_BLOCK_SIZE);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Read $v_read_size bytes");
         $v_buffer = @gzread($p_src, $v_read_size);
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
@@ -5747,7 +5580,6 @@
       while ($p_size != 0)
       {
         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : 
PCLZIP_READ_BLOCK_SIZE);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Read $v_read_size bytes");
         $v_buffer = @fread($p_src, $v_read_size);
         @gzwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
@@ -5758,7 +5590,6 @@
       while ($p_size != 0)
       {
         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : 
PCLZIP_READ_BLOCK_SIZE);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 
"Read $v_read_size bytes");
         $v_buffer = @gzread($p_src, $v_read_size);
         @gzwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
@@ -5766,7 +5597,6 @@
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5785,26 +5615,21 @@
   // 
--------------------------------------------------------------------------------
   function PclZipUtilRename($p_src, $p_dest)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZipUtilRename", "source=$p_src, destination=$p_dest");
     $v_result = 1;
 
     // ----- Try to rename the files
     if (address@hidden($p_src, $p_dest)) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Fail 
to rename file, try copy+unlink");
 
       // ----- Try to copy & unlink the src
       if (address@hidden($p_src, $p_dest)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Fail to copy file");
         $v_result = 0;
       }
       else if (address@hidden($p_src)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, 
"Fail to unlink old filename");
         $v_result = 0;
       }
     }
 
     // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------
@@ -5820,7 +5645,6 @@
   // 
--------------------------------------------------------------------------------
   function PclZipUtilOptionText($p_option)
   {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 
"PclZipUtilOptionText", "option='".$p_option."'");
     
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
@@ -5829,14 +5653,12 @@
          || ($v_prefix == 'PCLZIP_CB_')
          || ($v_prefix == 'PCLZIP_ATT'))
              && ($v_list[$v_key] == $p_option)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_key);
           return $v_key;
            }
     }
     
     $v_result = 'Unknown';
 
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
     return $v_result;
   }
   // 
--------------------------------------------------------------------------------

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/pclzip/readme.txt
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/pclzip/readme.txt        
2010-01-05 20:58:52 UTC (rev 20916)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/pclzip/readme.txt        
2010-01-05 21:02:01 UTC (rev 20917)
@@ -1,11 +1,11 @@
 // 
--------------------------------------------------------------------------------
-// PclZip 2.6 - readme.txt
+// PclZip 2.8.2 - readme.txt
 // 
--------------------------------------------------------------------------------
-// License GNU/LGPL - March 2006
+// License GNU/LGPL - August 2009
 // Vincent Blavet - address@hidden
 // http://www.phpconcept.net
 // 
--------------------------------------------------------------------------------
-// $Id$
+// $Id$
 // 
--------------------------------------------------------------------------------
 
 
@@ -32,6 +32,49 @@
 2 - What's new
 ==============
 
+  Version 2.8.2 :
+    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with 
+      extraction as a string (PCLZIP_OPT_EXTRACT_AS_STRING). The string
+      can also be modified in the post-extract call back.
+    **Bugs correction :
+    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly    
+    - Remove use of eval() and do direct call to callback functions
+    - Correct support of 64bits systems (Thanks to WordPress team)
+
+  Version 2.8.1 :
+    - Move option PCLZIP_OPT_BY_EREG to PCLZIP_OPT_BY_PREG because ereg() is
+      deprecated in PHP 5.3. When using option PCLZIP_OPT_BY_EREG, PclZip will
+      automatically replace it by PCLZIP_OPT_BY_PREG.
+  
+  Version 2.8 :
+    - Improve extraction of zip archive for large files by using temporary 
files
+      This feature is working like the one defined in r2.7.
+      Options are renamed : PCLZIP_OPT_TEMP_FILE_ON, PCLZIP_OPT_TEMP_FILE_OFF,
+      PCLZIP_OPT_TEMP_FILE_THRESHOLD
+    - Add a ratio constant PCLZIP_TEMPORARY_FILE_RATIO to configure the auto
+      sense of temporary file use.
+    - Bug correction : Reduce filepath in returned file list to remove ennoying
+      './/' preambule in file path.
+
+  Version 2.7 :
+    - Improve creation of zip archive for large files :
+      PclZip will now autosense the configured memory and use temporary files
+      when large file is suspected.
+      This feature can also ne triggered by manual options in create() and 
add()
+      methods. 'PCLZIP_OPT_ADD_TEMP_FILE_ON' force the use of temporary files,
+      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic, 
+      'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD' allow for configuration of a size
+      threshold to use temporary files.
+      Using "temporary files" rather than "memory" might take more time, but
+      might give the ability to zip very large files :
+      Tested on my win laptop with a 88Mo file :
+        Zip "in-memory" : 18sec (max_execution_time=30, memory_limit=180Mo)
+        Zip "tmporary-files" : 23sec (max_execution_time=30, memory_limit=30Mo)
+    - Replace use of mktime() by time() to limit the E_STRICT error messages.
+    - Bug correction : When adding files with full windows path (drive letter)
+      PclZip is now working. Before, if the drive letter is not the default
+      path, PclZip was not able to add the file.
+
   Version 2.6 :
     - Code optimisation
     - New attributes PCLZIP_ATT_FILE_COMMENT gives the ability to
@@ -302,6 +345,8 @@
   In Version 2.x :
     - PclZip does only support file uncompressed or compressed with deflate 
(compression method 8)
     - PclZip does not support password protected zip archive
+    - Some concern were seen when changing mtime of a file while archiving. 
+      Seems to be linked to Daylight Saving Time (PclTest_changing_mtime).
 
   In Version 1.2 :
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]