Use flysystem-ziparchive instead of pclzip

20 files changed, 847 insertions, 6570 deletions

diff --git a/admin_site_upgrade.php b/admin_site_upgrade.php
index b15cdb539a..5391dba552 100644
--- a/admin_site_upgrade.php
+++ b/admin_site_upgrade.php
@@ -20,17 +20,19 @@ use Fisharebest\Webtrees\Controller\PageController;
 use Fisharebest\Webtrees\Functions\Functions;
 use Fisharebest\Webtrees\Functions\FunctionsDate;
 use GuzzleHttp\Client;
-use PclZip;
+use League\Flysystem\Adapter\Local;
+use League\Flysystem\Filesystem;
+use League\Flysystem\ZipArchive\ZipArchiveAdapter;
 
 require 'includes/session.php';
 
 // Check for updates
 $latest_version_txt = Functions::fetchLatestVersion();
 if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-	list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
+	list($latest_version, , $download_url) = explode('|', $latest_version_txt);
 } else {
 	// Cannot determine the latest version
-	list($latest_version, $earliest_version, $download_url) = explode('|', '||');
+	list($latest_version, , $download_url) = explode('|', '||');
 }
 
 $latest_version_html = '<span dir="ltr">' . $latest_version . '</span>';
@@ -166,8 +168,8 @@ foreach (Theme::themeNames() as $theme_id => $theme_name) {
 	default:
 		$theme_used = Database::prepare(
 			"SELECT EXISTS (SELECT 1 FROM `##site_setting`   WHERE setting_name='THEME_DIR' AND setting_value=?)" .
-			" OR    EXISTS (SELECT 1 FROM `##gedcom_setting` WHERE setting_name='THEME_DIR' AND setting_value=?)" .
-			" OR    EXISTS (SELECT 1 FROM `##user_setting`   WHERE setting_name='theme'     AND setting_value=?)"
+			" OR EXISTS (SELECT 1 FROM `##gedcom_setting` WHERE setting_name='THEME_DIR' AND setting_value=?)" .
+			" OR EXISTS (SELECT 1 FROM `##user_setting`   WHERE setting_name='theme'     AND setting_value=?)"
 		)->execute([$theme_id, $theme_id, $theme_id])->fetchOne();
 		if ($theme_used) {
 			switch ($themes_action) {
@@ -218,7 +220,6 @@ echo '</li>';
 echo '<li>', /* I18N: The system is about to… */ I18N::translate('Export all the family trees to GEDCOM files…');
 
 foreach (Tree::getAll() as $tree) {
-	reset_timeout();
 	$filename = WT_DATA_DIR . $tree->getName() . date('-Y-m-d') . '.ged';
 
 	try {
@@ -235,16 +236,25 @@ foreach (Tree::getAll() as $tree) {
 
 echo '</li>';
 
+// The wiki tells people how to customize webtrees by modifying various files.
+// Create a backup of these, just in case the user forgot!
+try {
+	copy('app/GedcomCode/GedcomCode/Rela.php', WT_DATA_DIR . 'GedcomCodeRela' . date('-Y-m-d') . '.php');
+	copy('app/GedcomTag.php', WT_DATA_DIR . 'GedcomTag' . date('-Y-m-d') . '.php');
+} catch (\ErrorException $ex) {
+	// No problem if we cannot do this.
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Download a .ZIP file containing the new code
 ////////////////////////////////////////////////////////////////////////////////
 
 echo '<li>', /* I18N: The system is about to…; %s is a URL. */ I18N::translate('Download %s…', Html::filename($download_url));
 
-$zip_file   = WT_DATA_DIR . basename($download_url);
-$zip_dir    = WT_DATA_DIR . basename($download_url, '.zip');
-$zip_stream = fopen($zip_file, 'w');
-reset_timeout();
+$zip_file   = basename($download_url);
+$zip_dir    = basename($download_url, '.zip');
+$zip_stream = fopen(WT_DATA_DIR . $zip_file, 'w');
+
 $start_time = microtime(true);
 
 $client   = new Client();
@@ -255,7 +265,8 @@ while (!$stream->eof()) {
 }
 $stream->close();
 fclose($zip_stream);
-$zip_size = filesize($zip_file);
+$zip_size = filesize(WT_DATA_DIR . $zip_file);
+
 $end_time = microtime(true);
 
 echo '<br>', /* I18N: %1$s is a number of KB, %2$s is a (fractional) number of seconds */ I18N::translate('%1$s KB were downloaded in %2$s seconds.', I18N::number($zip_size / 1024), I18N::number($end_time - $start_time, 2));
@@ -268,9 +279,13 @@ if ($zip_size) {
 		echo '<br>', /* I18N: http://en.wikipedia.org/wiki/Https */ I18N::translate('This server does not support secure downloads using HTTPS.');
 	}
 }
-
 echo '</li>';
 
+// Mount the various filesystems
+$zip_filesystem  = new Filesystem(new ZipArchiveAdapter(WT_DATA_DIR . $zip_file, null, 'webtrees'));
+$data_filesystem = new Filesystem(new Local(WT_DATA_DIR));
+$app_filesystem  = new Filesystem(new Local(__DIR__));
+
 ////////////////////////////////////////////////////////////////////////////////
 // Unzip the file - this checks we have enough free disk space, that the .zip
 // file is valid, etc.
@@ -278,89 +293,38 @@ echo '</li>';
 
 echo '<li>', /* I18N: The system is about to…; %s is a .ZIP file. */ I18N::translate('Unzip %s to a temporary folder…', Html::filename(basename($download_url)));
 
-File::delete($zip_dir);
-File::mkdir($zip_dir);
-
-$archive = new PclZip($zip_file);
-
-$res = $archive->properties();
-if (!is_array($res) || $res['status'] != 'ok') {
-	echo '<br>', I18N::translate('An error occurred when unzipping the file.'), $icon_failure;
-	echo '<br>', $archive->errorInfo(true);
-	echo '</li></ul></form>';
-
-	return;
-}
+try {
+	$count      = 0;
+	$start_time = microtime(true);
 
-$num_files = $res['nb'];
+	foreach ($zip_filesystem->listContents('/', true) as $file) {
+		if ($file['type'] === 'file') {
+			$data_filesystem->put($zip_dir . '/' . $file['path'], $zip_filesystem->get($file['path']));
+			$count++;
+		}
+	}
 
-reset_timeout();
-$start_time = microtime(true);
-$res        = $archive->extract(
-	\PCLZIP_OPT_PATH, $zip_dir,
-	\PCLZIP_OPT_REMOVE_PATH, 'webtrees',
-	\PCLZIP_OPT_REPLACE_NEWER
-);
-$end_time = microtime(true);
+	$end_time = microtime(true);
 
-if (is_array($res)) {
-	foreach ($res as $result) {
-		// Note that we're stripping the initial "webtrees/", so the top folder will fail.
-		if ($result['status'] != 'ok' && $result['filename'] != 'webtrees/') {
-			echo '<br>', I18N::translate('An error occurred when unzipping the file.'), $icon_failure;
-			echo '<pre>', $result['status'], '</pre>';
-			echo '<pre>', $result['filename'], '</pre>';
-			echo '</li></ul></form>';
+	echo '<br>', /* I18N: …from the .ZIP file, %2$s is a (fractional) number of seconds */ I18N::plural('%1$s file was extracted in %2$s seconds.', '%1$s files were extracted in %2$s seconds.', $count, $count, I18N::number($end_time - $start_time, 2)), $icon_success;
 
-			return;
-		}
-	}
-	echo '<br>', /* I18N: …from the .ZIP file, %2$s is a (fractional) number of seconds */ I18N::plural('%1$s file was extracted in %2$s seconds.', '%1$s files were extracted in %2$s seconds.', count($res), count($res), I18N::number($end_time - $start_time, 2)), $icon_success;
-} else {
+	echo '</li>';
+} catch (Exception $ex) {
 	echo '<br>', I18N::translate('An error occurred when unzipping the file.'), $icon_failure;
-	echo '<pre>', $archive->errorInfo(true), '</pre>';
+	echo '<br>', $ex->getMessage();
 	echo '</li></ul></form>';
 
 	return;
 }
 
-echo '</li>';
-
-////////////////////////////////////////////////////////////////////////////////
-// This is it - take the site offline first
-////////////////////////////////////////////////////////////////////////////////
-
-echo '<li>', /* I18N: The system is about to… */ I18N::translate('Check file permissions…');
-
-reset_timeout();
-$iterator = new \RecursiveDirectoryIterator($zip_dir);
-$iterator->setFlags(\RecursiveDirectoryIterator::SKIP_DOTS);
-foreach (new \RecursiveIteratorIterator($iterator) as $file) {
-	$file = WT_ROOT . substr($file, strlen($zip_dir) + 1);
-	if (file_exists($file) && (!is_readable($file) || !is_writable($file))) {
-		echo '<br>', I18N::translate('The file %s could not be updated.', Html::filename($file)), $icon_failure;
-		echo '</li></ul>';
-		echo '<p class="error">', I18N::translate('To complete the upgrade, you should install the files manually.'), '</p>';
-		echo '<p>', I18N::translate('The new files are currently located in the folder %s.', Html::filename($zip_dir)), '</p>';
-		echo '<p>', I18N::translate('Copy these files to the folder %s, replacing any that have the same name.', Html::filename(WT_ROOT)), '</p>';
-		echo '<p>', I18N::translate('To prevent visitors from accessing the website while you are in the middle of copying files, you can temporarily create a file %s on the server. If it contains a message, it will be displayed to visitors.', Html::filename($lock_file)), '</p>';
-
-		return;
-	}
-}
-
-echo '<br>', I18N::translate('All files have read and write permission.'), $icon_success;
-
-echo '</li>';
-
 ////////////////////////////////////////////////////////////////////////////////
-// This is it - take the site offline first
+// Take the site offline first
 ////////////////////////////////////////////////////////////////////////////////
 
 echo '<li>', I18N::translate('Place the website offline, by creating the file %s…', $lock_file);
 
 try {
-	file_put_contents($lock_file, $lock_file_text);
+	$data_filesystem->put($lock_file, $lock_file_text);
 	echo '<br>', I18N::translate('The file %s has been created.', Html::filename($lock_file)), $icon_success;
 } catch (\ErrorException $ex) {
 	echo '<br>', I18N::translate('The file %s could not be created.', Html::filename($lock_file)), $icon_failure;
@@ -374,35 +338,28 @@ echo '</li>';
 
 echo '<li>', /* I18N: The system is about to… */ I18N::translate('Copy files…');
 
-// The wiki tells people how to customize webtrees by modifying various files.
-// Create a backup of these, just in case the user forgot!
 try {
-	copy('app/GedcomCode/GedcomCode/Rela.php', WT_DATA_DIR . 'GedcomCodeRela' . date('-Y-m-d') . '.php');
-	copy('app/GedcomTag.php', WT_DATA_DIR . 'GedcomTag' . date('-Y-m-d') . '.php');
-} catch (\ErrorException $ex) {
-	// No problem if we cannot do this.
-}
+	$count      = 0;
+	$start_time = microtime(true);
 
-reset_timeout();
-$start_time = microtime(true);
-$res        = $archive->extract(
-	\PCLZIP_OPT_PATH, WT_ROOT,
-	\PCLZIP_OPT_REMOVE_PATH, 'webtrees',
-	\PCLZIP_OPT_REPLACE_NEWER
-);
-$end_time = microtime(true);
-
-if (is_array($res)) {
-	foreach ($res as $result) {
-		// Note that most of the folders will already exist, so it is not an error if we cannot create them
-		if ($result['status'] != 'ok' && !substr($result['filename'], -1) == '/') {
-			echo '<br>', I18N::translate('The file %s could not be created.', Html::filename($result['filename'])), $icon_failure;
+	foreach ($zip_filesystem->listContents('/', true) as $file) {
+		if ($file['type'] === 'file') {
+			$app_filesystem->put($file['path'], $data_filesystem->get($zip_dir . '/' . $file['path']));
+			$data_filesystem->delete($zip_dir . '/' . $file['path']);
+			$count++;
 		}
 	}
-	echo '<br>', /* I18N: …from the .ZIP file, %2$s is a (fractional) number of seconds */ I18N::plural('%1$s file was extracted in %2$s seconds.', '%1$s files were extracted in %2$s seconds.', count($res), count($res), I18N::number($end_time - $start_time, 2)), $icon_success;
-} else {
-	echo '<br>', I18N::translate('An error occurred when unzipping the file.'), $icon_failure;
+
+	$end_time = microtime(true);
+
+	echo '<br>', /* I18N: …from the .ZIP file, %2$s is a (fractional) number of seconds */ I18N::plural('%1$s file was extracted in %2$s seconds.', '%1$s files were extracted in %2$s seconds.', $count, $count, I18N::number($end_time - $start_time, 2)), $icon_success;
+} Catch (Exception $ex) {
+	echo '<br>', I18N::translate('The file %s could not be updated.', Html::filename($file['path'])), $icon_failure;
 	echo '</li></ul></form>';
+	echo '<p class="error">', I18N::translate('To complete the upgrade, you should install the files manually.'), '</p>';
+	echo '<p>', I18N::translate('The new files are currently located in the folder %s.', Html::filename(WT_DATA_DIR . $zip_dir)), '</p>';
+	echo '<p>', I18N::translate('Copy these files to the folder %s, replacing any that have the same name.', Html::filename(WT_ROOT)), '</p>';
+	echo '<p>', I18N::translate('To prevent visitors from accessing the website while you are in the middle of copying files, you can temporarily create a file %s on the server. If it contains a message, it will be displayed to visitors.', Html::filename($lock_file)), '</p>';
 
 	return;
 }
@@ -415,7 +372,7 @@ echo '</li>';
 
 echo '<li>', I18N::translate('Place the website online, by deleting the file %s…', Html::filename($lock_file));
 
-if (File::delete($lock_file)) {
+if ($data_filesystem->delete($lock_file)) {
 	echo '<br>', I18N::translate('The file %s has been deleted.', Html::filename($lock_file)), $icon_success;
 } else {
 	echo '<br>', I18N::translate('The file %s could not be deleted.', Html::filename($lock_file)), $icon_failure;
@@ -429,38 +386,26 @@ echo '</li>';
 
 echo '<li>', /* I18N: The system is about to… */ I18N::translate('Delete temporary files…');
 
-reset_timeout();
-if (File::delete($zip_dir)) {
-	echo '<br>', I18N::translate('The folder %s has been deleted.', Html::filename($zip_dir)), $icon_success;
+if ($data_filesystem->deleteDir($zip_dir)) {
+	echo '<br>', I18N::translate('The folder %s has been deleted.', Html::filename(WT_DATA_DIR . $zip_dir)), $icon_success;
+} else {
+	echo '<br>', I18N::translate('The folder %s could not be deleted.', Html::filename(WT_DATA_DIR . $zip_dir)), $icon_failure;
+}
+
+if ($data_filesystem->deleteDir('cache')) {
+	echo '<br>', I18N::translate('The folder %s has been deleted.', Html::filename(WT_DATA_DIR . 'cache')), $icon_success;
 } else {
-	echo '<br>', I18N::translate('The folder %s could not be deleted.', Html::filename($zip_dir)), $icon_failure;
+	echo '<br>', I18N::translate('The folder %s could not be deleted.', Html::filename(WT_DATA_DIR . 'cache')), $icon_failure;
 }
 
-if (File::delete($zip_file)) {
-	echo '<br>', I18N::translate('The file %s has been deleted.', Html::filename($zip_file)), $icon_success;
+if ($data_filesystem->delete($zip_file)) {
+	echo '<br>', I18N::translate('The file %s has been deleted.', Html::filename(WT_DATA_DIR . $zip_file)), $icon_success;
 } else {
-	echo '<br>', I18N::translate('The file %s could not be deleted.', Html::filename($zip_file)), $icon_failure;
+	echo '<br>', I18N::translate('The file %s could not be deleted.', Html::filename(WT_DATA_DIR . $zip_file)), $icon_failure;
 }
 
 echo '</li>';
 echo '</ul>';
-
-// We have updated the language files.
-foreach (glob(WT_DATA_DIR . 'cache/language-*') as $file) {
-	File::delete($file);
-}
+echo '</form>';
 
 echo '<p>', I18N::translate('The upgrade is complete.'), '</p>';
-
-/**
- * Reset the time limit, as timeouts in this script could leave the upgrade incomplete.
- */
-function reset_timeout() {
-	if (!ini_get('safe_mode') && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
-		try {
-			set_time_limit(ini_get('max_execution_time'));
-		} catch (Exception $ex) {
-			// "set_time_limt(): Cannot set max execution time limit due to system policy"
-		}
-	}
-}
diff --git a/composer.json b/composer.json
index 535c4969c0..250397f777 100644
--- a/composer.json
+++ b/composer.json
@@ -23,23 +23,24 @@
 		"ext-session": "*",
 		"ext-simplexml": "*",
 		"ext-xml": "*",
-		"ezyang/htmlpurifier": "4.*",
-		"fisharebest/algorithm": "1.*",
-		"fisharebest/ext-calendar": "2.*",
-		"fisharebest/localization": "1.*",
+		"ezyang/htmlpurifier": "~4.9",
+		"fisharebest/algorithm": "~1.3",
+		"fisharebest/ext-calendar": "~2.3",
+		"fisharebest/localization": "~1.10",
 		"guzzlehttp/guzzle": "~6.0",
+		"league/flysystem": "~1.0",
+		"league/flysystem-ziparchive": "~1.0",
 		"league/glide": "^1.2",
 		"michelf/php-markdown": "1.*",
-		"pclzip/pclzip": "2.*",
 		"ramsey/uuid": "~3.6",
 		"swiftmailer/swiftmailer": "~5.0",
-		"tecnickcom/tcpdf": "6.*"
+		"tecnickcom/tcpdf": "~6.2"
 	},
 	"require-dev": {
 		"friendsofphp/php-cs-fixer": "*",
 		"mockery/mockery": "*",
 		"phpunit/phpunit": "*",
-		"satooshi/php-coveralls": "~1.0"
+		"satooshi/php-coveralls": "*"
 	},
 	"extra": {
 		"branch-alias": {
diff --git a/composer.lock b/composer.lock
index f4f2b683b5..a79a3d8e7c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "c0050a604d6efcdaf38b69e1963c0cda",
+    "content-hash": "ffc0266e51f111ed644387fb2bcadfc0",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -551,6 +551,53 @@
             "time": "2017-04-28T10:15:08+00:00"
         },
         {
+            "name": "league/flysystem-ziparchive",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem-ziparchive.git",
+                "reference": "c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-ziparchive/zipball/c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45",
+                "reference": "c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45",
+                "shasum": ""
+            },
+            "require": {
+                "ext-zip": "*",
+                "league/flysystem": "~1.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "0.9.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\ZipArchive\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frenky.net"
+                }
+            ],
+            "description": "Flysystem adapter for ZipArchive's",
+            "time": "2016-12-20T08:36:16+00:00"
+        },
+        {
             "name": "league/glide",
             "version": "1.2.2",
             "source": {
@@ -711,43 +758,6 @@
             "time": "2017-03-13T16:27:32+00:00"
         },
         {
-            "name": "pclzip/pclzip",
-            "version": "2.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ivanlanin/pclzip.git",
-                "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ivanlanin/pclzip/zipball/19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
-                "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "pclzip.lib.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1"
-            ],
-            "authors": [
-                {
-                    "name": "Vincent Blavet"
-                }
-            ],
-            "description": "A PHP library that offers compression and extraction functions for Zip formatted archives",
-            "homepage": "http://www.phpconcept.net/pclzip",
-            "keywords": [
-                "php",
-                "zip"
-            ],
-            "time": "2014-06-05T11:42:24+00:00"
-        },
-        {
             "name": "psr/http-message",
             "version": "1.0.1",
             "source": {
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index e62131def7..2b89e59e2e 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -8,7 +8,6 @@ $baseDir = dirname($vendorDir);
 return array(
     'Datamatrix' => $vendorDir . '/tecnickcom/tcpdf/include/barcodes/datamatrix.php',
     'PDF417' => $vendorDir . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
-    'PclZip' => $vendorDir . '/pclzip/pclzip/pclzip.lib.php',
     'QRcode' => $vendorDir . '/tecnickcom/tcpdf/include/barcodes/qrcode.php',
     'TCPDF' => $vendorDir . '/tecnickcom/tcpdf/tcpdf.php',
     'TCPDF2DBarcode' => $vendorDir . '/tecnickcom/tcpdf/tcpdf_barcodes_2d.php',
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index fa15c1d5e2..5e2b8415f1 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -9,6 +9,7 @@ return array(
     'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
     'League\\Glide\\' => array($vendorDir . '/league/glide/src'),
+    'League\\Flysystem\\ZipArchive\\' => array($vendorDir . '/league/flysystem-ziparchive/src'),
     'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
     'Intervention\\Image\\' => array($vendorDir . '/intervention/image/src/Intervention/Image'),
     'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 38efb81c05..53349b57d2 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -28,6 +28,7 @@ class ComposerStaticInit88915787c0ca8762c9a45e08fa8b3022
         'L' => 
         array (
             'League\\Glide\\' => 13,
+            'League\\Flysystem\\ZipArchive\\' => 28,
             'League\\Flysystem\\' => 17,
         ),
         'I' => 
@@ -62,6 +63,10 @@ class ComposerStaticInit88915787c0ca8762c9a45e08fa8b3022
         array (
             0 => __DIR__ . '/..' . '/league/glide/src',
         ),
+        'League\\Flysystem\\ZipArchive\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/league/flysystem-ziparchive/src',
+        ),
         'League\\Flysystem\\' => 
         array (
             0 => __DIR__ . '/..' . '/league/flysystem/src',
@@ -120,7 +125,6 @@ class ComposerStaticInit88915787c0ca8762c9a45e08fa8b3022
     public static $classMap = array (
         'Datamatrix' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/datamatrix.php',
         'PDF417' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
-        'PclZip' => __DIR__ . '/..' . '/pclzip/pclzip/pclzip.lib.php',
         'QRcode' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/qrcode.php',
         'TCPDF' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf.php',
         'TCPDF2DBarcode' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_barcodes_2d.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c9a877d981..f1cc291347 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,44 +1,5 @@
 [
     {
-        "name": "pclzip/pclzip",
-        "version": "2.8.2",
-        "version_normalized": "2.8.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/ivanlanin/pclzip.git",
-            "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/ivanlanin/pclzip/zipball/19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
-            "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
-            "shasum": ""
-        },
-        "time": "2014-06-05T11:42:24+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "pclzip.lib.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "LGPL-2.1"
-        ],
-        "authors": [
-            {
-                "name": "Vincent Blavet"
-            }
-        ],
-        "description": "A PHP library that offers compression and extraction functions for Zip formatted archives",
-        "homepage": "http://www.phpconcept.net/pclzip",
-        "keywords": [
-            "php",
-            "zip"
-        ]
-    },
-    {
         "name": "fisharebest/localization",
         "version": "1.10.0",
         "version_normalized": "1.10.0.0",
@@ -1021,5 +982,54 @@
             "rest",
             "web service"
         ]
+    },
+    {
+        "name": "league/flysystem-ziparchive",
+        "version": "1.0.3",
+        "version_normalized": "1.0.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/thephpleague/flysystem-ziparchive.git",
+            "reference": "c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/thephpleague/flysystem-ziparchive/zipball/c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45",
+            "reference": "c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45",
+            "shasum": ""
+        },
+        "require": {
+            "ext-zip": "*",
+            "league/flysystem": "~1.0",
+            "php": ">=5.4.0"
+        },
+        "require-dev": {
+            "mockery/mockery": "0.9.*",
+            "phpunit/phpunit": "~4.0"
+        },
+        "time": "2016-12-20T08:36:16+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "League\\Flysystem\\ZipArchive\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Frank de Jonge",
+                "email": "info@frenky.net"
+            }
+        ],
+        "description": "Flysystem adapter for ZipArchive's"
     }
 ]
diff --git a/vendor/league/flysystem-ziparchive/.gitignore b/vendor/league/flysystem-ziparchive/.gitignore
new file mode 100644
index 0000000000..0fbb3fb8e4
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/.gitignore
@@ -0,0 +1,6 @@
+vendor
+bin
+composer.lock
+coverage
+coverage.xml
+tests/files
\ No newline at end of file
diff --git a/vendor/league/flysystem-ziparchive/.scrutinizer.yml b/vendor/league/flysystem-ziparchive/.scrutinizer.yml
new file mode 100644
index 0000000000..5501dba8da
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/.scrutinizer.yml
@@ -0,0 +1,34 @@
+filter:
+    paths: [src/*]
+checks:
+    php:
+        code_rating: true
+        remove_extra_empty_lines: true
+        remove_php_closing_tag: true
+        remove_trailing_whitespace: true
+        fix_use_statements:
+            remove_unused: true
+            preserve_multiple: false
+            preserve_blanklines: true
+            order_alphabetically: true
+        fix_php_opening_tag: true
+        fix_linefeed: true
+        fix_line_ending: true
+        fix_identation_4spaces: true
+        fix_doc_comments: true
+tools:
+    external_code_coverage:
+        timeout: 600
+        runs: 3
+    php_code_coverage: false
+    php_code_sniffer:
+        config:
+            standard: PSR2
+        filter:
+            paths: ['src']
+    php_loc:
+        enabled: true
+        excluded_dirs: [vendor, spec, stubs]
+    php_cpd:
+        enabled: true
+        excluded_dirs: [vendor, spec, stubs]
\ No newline at end of file
diff --git a/vendor/league/flysystem-ziparchive/.travis.yml b/vendor/league/flysystem-ziparchive/.travis.yml
new file mode 100644
index 0000000000..5c080d0328
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/.travis.yml
@@ -0,0 +1,21 @@
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+before_install:
+  - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then rm phpunit.xml; fi;'
+  - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then mv phpunit.hhvm.xml phpunit.xml; fi;'
+
+install:
+  - travis_retry composer install --no-interaction --prefer-source
+
+script:
+  - bin/phpunit
+
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi;'
diff --git a/vendor/league/flysystem-ziparchive/composer.json b/vendor/league/flysystem-ziparchive/composer.json
new file mode 100644
index 0000000000..690f6fc3a9
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "league/flysystem-ziparchive",
+    "description": "Flysystem adapter for ZipArchive's",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Frank de Jonge",
+            "email": "info@frenky.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0",
+        "ext-zip": "*",
+        "league/flysystem": "~1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0",
+        "mockery/mockery": "0.9.*"
+    },
+    "autoload": {
+        "psr-4": {
+            "League\\Flysystem\\ZipArchive\\": "src/"
+        }
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
+    "min-stability": "dev",
+    "prefer-stable": true,
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
+    }
+}
diff --git a/vendor/league/flysystem-ziparchive/phpunit.hhvm.xml b/vendor/league/flysystem-ziparchive/phpunit.hhvm.xml
new file mode 100644
index 0000000000..73e5a6d3c1
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/phpunit.hhvm.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="./phpunit.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         verbose="true"
+>
+    <testsuites>
+        <testsuite name="flysystem/tests">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
+    <listeners>
+        <listener class="Mockery\Adapter\Phpunit\TestListener" file="./vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php"></listener>
+    </listeners>
+</phpunit>
diff --git a/vendor/league/flysystem-ziparchive/phpunit.php b/vendor/league/flysystem-ziparchive/phpunit.php
new file mode 100644
index 0000000000..d109587967
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/phpunit.php
@@ -0,0 +1,3 @@
+<?php
+
+include __DIR__.'/vendor/autoload.php';
diff --git a/vendor/league/flysystem-ziparchive/readme.md b/vendor/league/flysystem-ziparchive/readme.md
new file mode 100644
index 0000000000..ff3717bb60
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/readme.md
@@ -0,0 +1,25 @@
+# Flysystem Adapter for ZipArchive
+
+[![Author](http://img.shields.io/badge/author-@frankdejonge-blue.svg?style=flat-square)](https://twitter.com/frankdejonge)
+[![Build Status](https://img.shields.io/travis/thephpleague/flysystem-ziparchive/master.svg?style=flat-square)](https://travis-ci.org/thephpleague/flysystem-ziparchive)
+[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/thephpleague/flysystem-ziparchive.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/flysystem-ziparchive/code-structure)
+[![Quality Score](https://img.shields.io/scrutinizer/g/thephpleague/flysystem-ziparchive.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/flysystem-ziparchive)
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
+[![Packagist Version](https://img.shields.io/packagist/v/league/flysystem-ziparchive.svg?style=flat-square)](https://packagist.org/packages/league/flysystem-ziparchive)
+[![Total Downloads](https://img.shields.io/packagist/dt/league/flysystem-ziparchive.svg?style=flat-square)](https://packagist.org/packages/league/flysystem-ziparchive)
+
+
+## Installation
+
+```bash
+composer require league/flysystem-ziparchive
+```
+
+## Usage
+
+```php
+use League\Flysystem\Filesystem;
+use League\Flysystem\ZipArchive\ZipArchiveAdapter as Adapter;
+
+$filesystem = new Filesystem(new Adapter(__DIR__.'/path/to/archive.zip'));
+```
diff --git a/vendor/league/flysystem-ziparchive/src/ZipArchiveAdapter.php b/vendor/league/flysystem-ziparchive/src/ZipArchiveAdapter.php
new file mode 100644
index 0000000000..e084f62178
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/src/ZipArchiveAdapter.php
@@ -0,0 +1,320 @@
+<?php
+
+namespace League\Flysystem\ZipArchive;
+
+use League\Flysystem\Adapter\AbstractAdapter;
+use League\Flysystem\Adapter\Polyfill\NotSupportingVisibilityTrait;
+use League\Flysystem\Adapter\Polyfill\StreamedCopyTrait;
+use League\Flysystem\Adapter\Polyfill\StreamedWritingTrait;
+use League\Flysystem\Config;
+use League\Flysystem\Util;
+use LogicException;
+use ZipArchive;
+
+class ZipArchiveAdapter extends AbstractAdapter
+{
+    use StreamedWritingTrait;
+    use StreamedCopyTrait;
+    use NotSupportingVisibilityTrait;
+
+    /**
+     * @var array
+     */
+    protected static $resultMap = [
+        'size'  => 'size',
+        'mtime' => 'timestamp',
+        'name'  => 'path',
+    ];
+
+    /**
+     * @var ZipArchive
+     */
+    protected $archive;
+
+    /**
+     * @param             $location
+     * @param ZipArchive  $archive
+     * @param string|null $prefix
+     */
+    public function __construct($location, ZipArchive $archive = null, $prefix = null)
+    {
+        $this->setArchive($archive ?: new ZipArchive());
+        $this->openArchive($location);
+        $this->setPathPrefix($prefix);
+    }
+
+    /**
+     * Re-open an archive to ensure persistence.
+     */
+    protected function reopenArchive()
+    {
+        $path = $this->archive->filename;
+        $this->archive->close();
+        $this->openArchive($path);
+    }
+
+    /**
+     * ZipArchive setter.
+     *
+     * @param ZipArchive $archive
+     */
+    public function setArchive(ZipArchive $archive)
+    {
+        $this->archive = $archive;
+    }
+
+    /**
+     * Get the used ZipArchive.
+     *
+     * @return ZipArchive
+     */
+    public function getArchive()
+    {
+        return $this->archive;
+    }
+
+    /**
+     * Open a zip file.
+     *
+     * @param $location
+     */
+    public function openArchive($location)
+    {
+        $location = str_replace('/', DIRECTORY_SEPARATOR, $location);
+
+        if (($response = $this->archive->open($location, ZipArchive::CREATE)) !== true) {
+            throw new LogicException('Could not open zip archive at:'.$location.', error: '.$response);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($path, $contents, Config $config)
+    {
+        $location = $this->applyPathPrefix($path);
+        $dirname = Util::dirname($path);
+
+        if (! empty($dirname) && ! $this->has($dirname)) {
+            $this->createDir($dirname, $config);
+        }
+
+        if (! $this->archive->addFromString($location, $contents)) {
+            return false;
+        }
+
+        $result = compact('path', 'contents');
+
+        if ($config && $config->get('visibility')) {
+            throw new LogicException(get_class($this).' does not support visibility settings.');
+        }
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function update($path, $contents, Config $config)
+    {
+        $this->delete($path);
+
+        return $this->write($path, $contents, $config);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rename($path, $newpath)
+    {
+        $source = $this->applyPathPrefix($path);
+        $destination = $this->applyPathPrefix($newpath);
+
+        return $this->archive->renameName($source, $destination);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete($path)
+    {
+        $location = $this->applyPathPrefix($path);
+
+        return $this->archive->deleteName($location);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function deleteDir($dirname)
+    {
+        // This is needed to ensure the right number of
+        // files are set to the $numFiles property.
+        $this->reopenArchive();
+
+        $location = $this->applyPathPrefix($dirname);
+        $path = Util::normalizePrefix($location, '/');
+        $length = strlen($path);
+
+        for ($i = 0; $i < $this->archive->numFiles; $i++) {
+            $info = $this->archive->statIndex($i);
+
+            if (substr($info['name'], 0, $length) === $path) {
+                $this->archive->deleteIndex($i);
+            }
+        }
+
+        return $this->archive->deleteName($dirname);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createDir($dirname, Config $config)
+    {
+        if (! $this->has($dirname)) {
+            $location = $this->applyPathPrefix($dirname);
+            $this->archive->addEmptyDir($location);
+        }
+
+        return ['path' => $dirname];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function has($path)
+    {
+        return $this->getMetadata($path);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($path)
+    {
+        $this->reopenArchive();
+        $location = $this->applyPathPrefix($path);
+
+        if (! $contents = $this->archive->getFromName($location)) {
+            return false;
+        }
+
+        return compact('contents');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function readStream($path)
+    {
+        $this->reopenArchive();
+        $location = $this->applyPathPrefix($path);
+
+        if (! $stream = $this->archive->getStream($location)) {
+            return false;
+        }
+
+        return compact('stream');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function listContents($dirname = '', $recursive = false)
+    {
+        $result = [];
+
+        // This is needed to ensure the right number of
+        // files are set to the $numFiles property.
+        $this->reopenArchive();
+
+        for ($i = 0; $i < $this->archive->numFiles; $i++) {
+            if ($info = $this->archive->statIndex($i)) {
+                $result[] = $info;
+            }
+        }
+
+        $pathPrefix = $this->getPathPrefix();
+        $prefixLength = strlen($pathPrefix);
+
+        return array_filter(array_map(function ($item) use ($pathPrefix, $prefixLength) {
+            if ($pathPrefix && (substr($item['name'], 0, $prefixLength) !== $pathPrefix || $item['name'] === $pathPrefix)) {
+                return false;
+            }
+
+            return $this->normalizeObject($item);
+        }, $result));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata($path)
+    {
+        $location = $this->applyPathPrefix($path);
+
+        if (! $info = $this->archive->statName($location)) {
+
+            // Check if $location is a directory.
+            if (! $info = $this->archive->statName($location . '/')) {
+                return false;
+            }
+        }
+
+        return $this->normalizeObject($info);
+    }
+
+    /**
+     * Normalize a zip response array.
+     *
+     * @param array $object
+     *
+     * @return array
+     */
+    protected function normalizeObject(array $object)
+    {
+        if (substr($object['name'], -1) === '/') {
+            return [
+                'path' => $this->removePathPrefix(trim($object['name'], '/')),
+                'type' => 'dir',
+            ];
+        }
+
+        $result = ['type' => 'file'];
+        $normalised = Util::map($object, static::$resultMap);
+        $normalised['path'] = $this->removePathPrefix($normalised['path']);
+
+        return array_merge($result, $normalised);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSize($path)
+    {
+        return $this->getMetadata($path);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMimetype($path)
+    {
+        if (! $data = $this->read($path)) {
+            return false;
+        }
+
+        $data['mimetype'] = Util::guessMimeType($path, $data['contents']);
+
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTimestamp($path)
+    {
+        return $this->getMetadata($path);
+    }
+}
diff --git a/vendor/league/flysystem-ziparchive/tests/ZipArchiveTests.php b/vendor/league/flysystem-ziparchive/tests/ZipArchiveTests.php
new file mode 100644
index 0000000000..634871c7d8
--- /dev/null
+++ b/vendor/league/flysystem-ziparchive/tests/ZipArchiveTests.php
@@ -0,0 +1,191 @@
+<?php
+
+use League\Flysystem\Config;
+use League\Flysystem\ZipArchive\ZipArchiveAdapter as Zip;
+
+class ZipArchiveTests extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @return Zip[]
+     */
+    public function zipProvider()
+    {
+        if (! is_dir($folder = __DIR__.'/files')) {
+            mkdir($folder, 0777);
+        }
+
+        if (is_file($location = __DIR__.'/files/tester.zip')) {
+            unlink($location);
+        }
+
+        return [
+            [new Zip($location, new ZipArchive())],
+        ];
+    }
+
+    public function testInstance()
+    {
+        $adapter = new Zip(__DIR__.'/files/tester.zip', new ZipArchive());
+        $this->assertInstanceOf('League\Flysystem\AdapterInterface', $adapter);
+    }
+
+    /**
+     * @dataProvider zipProvider
+     */
+    public function testGetArchive(Zip $zip)
+    {
+        $this->assertInstanceOf('ZipArchive', $zip->getArchive());
+    }
+
+    /**
+     * @dataProvider zipProvider
+     */
+    public function testZip(Zip $zip)
+    {
+        $this->assertCount(0, $zip->listContents());
+        $this->assertInternalType('array', $zip->write('file.txt', 'contents', new Config()));
+        $this->assertCount(1, $zip->listContents());
+        $this->assertInternalType('array', $zip->write('nested/file.txt', 'contents', new Config()));
+        $this->assertCount(3, $zip->listContents());
+        $zip->setPathPrefix('nested/');
+        $this->assertCount(1, $zip->listContents());
+        $zip->setPathPrefix('');
+        $result = $zip->read('nested/file.txt');
+        $this->assertEquals('contents', $result['contents']);
+        $zip->update('nested/file.txt', 'new contents', new Config());
+        $result = $zip->read('nested/file.txt');
+        $this->assertEquals('new contents', $result['contents']);
+        $result = $zip->readStream('nested/file.txt');
+        $this->assertArrayHasKey('stream', $result);
+        $result = $zip->getSize('nested/file.txt');
+        $this->assertEquals(12, $result['size']);
+        $result = $zip->getTimestamp('nested/file.txt');
+        $this->assertInternalType('integer', $result['timestamp']);
+        $result = $zip->getMimetype('nested/file.txt');
+        $this->assertEquals('text/plain', $result['mimetype']);
+        $zip->deleteDir('nested');
+        $this->assertCount(1, $zip->listContents());
+        $zip->rename('file.txt', 'renamed.txt');
+        $this->assertFalse($zip->has('file.txt'));
+
+        $zip->createDir('empty_dir', new Config());
+        $this->assertInternalType('array', $zip->getMetadata('empty_dir'));
+
+        $stream = tmpfile();
+        fwrite($stream, 'something');
+        rewind($stream);
+        $zip->writeStream('streamed.txt', $stream, new Config());
+        fclose($stream);
+        $this->assertInternalType('array', $zip->has('streamed.txt'));
+
+        $stream = tmpfile();
+        fwrite($stream, 'something');
+        rewind($stream);
+        $zip->updateStream('streamed-other.txt', $stream, new Config());
+        fclose($stream);
+        $this->assertInternalType('array', $zip->has('streamed-other.txt'));
+    }
+
+    /**
+     * @dataProvider zipProvider
+     * @expectedException  LogicException
+     */
+    public function testWriteStreamFail(Zip $zip)
+    {
+        $zip->writeStream('file.txt', tmpfile(), new Config(['visibility' => 'private']));
+    }
+
+    /**
+     * @expectedException LogicException
+     * @dataProvider zipProvider
+     */
+    public function testGetVisibility($zip)
+    {
+        $zip->getVisibility('path');
+    }
+
+    /**
+     * @expectedException LogicException
+     * @dataProvider zipProvider
+     */
+    public function testSetVisibility($zip)
+    {
+        $zip->setVisibility('path', 'public');
+    }
+
+    /**
+     * @expectedException LogicException
+     * @dataProvider zipProvider
+     */
+    public function testSetVisibilityWrite($zip)
+    {
+        $zip->write('path', 'contents', new Config(['visibility' => 'private']));
+    }
+
+    /**
+     * @expectedException  LogicException
+     */
+    public function testZipOpenFails()
+    {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('This test results in a fatal error on HHVM');
+        }
+
+        $mock = Mockery::mock('ZipArchive');
+        $mock->shouldReceive('open')->andReturn(false);
+        $zip = new Zip('location', $mock);
+    }
+
+    public function testZipReadWriteFails()
+    {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM does not support mocking of ZipArchive');
+        }
+
+        $mock = Mockery::mock('ZipArchive');
+        $mock->shouldReceive('open')->andReturn(true);
+        $mock->shouldReceive('close')->andReturn(true);
+        $mock->shouldReceive('addFromString')->andReturn(false);
+        $mock->shouldReceive('getFromName')->andReturn(false);
+        $mock->shouldReceive('getStream')->andReturn(false);
+        $zip = new Zip('location', $mock);
+
+        $this->assertFalse($zip->write('file', 'contents', new Config()));
+        $this->assertFalse($zip->read('file'));
+        $this->assertFalse($zip->getMimetype('file'));
+        $this->assertFalse($zip->readStream('file'));
+    }
+
+    public function testCopy()
+    {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('This test results in a fatal error on HHVM');
+        }
+
+        $resource = fopen(__DIR__.'/../readme.md', 'r+');
+        $mock = Mockery::mock('ZipArchive');
+        $mock->shouldReceive('open')->andReturn(true);
+        $mock->shouldReceive('close')->andReturn(true);
+        $mock->shouldReceive('addFromString')->andReturn(true);
+        $mock->shouldReceive('getStream')->andReturn($resource);
+        $zip = new Zip('location', $mock);
+        $this->assertTrue($zip->copy('old', 'new'));
+
+        // Ensure the resource is closed internally
+        $this->assertFalse(is_resource($resource));
+    }
+
+    public function testCopyFailed()
+    {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('This test results in a fatal error on HHVM');
+        }
+
+        $mock = Mockery::mock('ZipArchive');
+        $mock->shouldReceive('open')->andReturn(true);
+        $mock->shouldReceive('close')->andReturn(true);
+        $mock->shouldReceive('getStream')->andReturn(false);
+        $zip = new Zip('location', $mock);
+        $this->assertFalse($zip->copy('old', 'new'));
+    }
+}
diff --git a/vendor/pclzip/pclzip/composer.json b/vendor/pclzip/pclzip/composer.json
deleted file mode 100644
index a4df7fb6e3..0000000000
--- a/vendor/pclzip/pclzip/composer.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "name": "pclzip/pclzip",
-    "type": "library",
-    "description": "A PHP library that offers compression and extraction functions for Zip formatted archives",
-    "keywords": ["php", "zip"],
-    "homepage": "http://www.phpconcept.net/pclzip",
-    "license": ["LGPL-2.1"],
-    "authors": [
-        {
-            "name": "Vincent Blavet"
-        }
-    ],
-    "autoload": {
-        "classmap": ["pclzip.lib.php"]
-    }
-}
diff --git a/vendor/pclzip/pclzip/gnu-lgpl.txt b/vendor/pclzip/pclzip/gnu-lgpl.txt
deleted file mode 100644
index 583509c7ef..0000000000
--- a/vendor/pclzip/pclzip/gnu-lgpl.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-          GNU LESSER GENERAL PUBLIC LICENSE
-               Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-          GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-             END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/vendor/pclzip/pclzip/pclzip.lib.php b/vendor/pclzip/pclzip/pclzip.lib.php
deleted file mode 100644
index 33be0d7869..0000000000
--- a/vendor/pclzip/pclzip/pclzip.lib.php
+++ /dev/null
@@ -1,5414 +0,0 @@
-<?php
-// --------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.8.2
-// --------------------------------------------------------------------------------
-// License GNU/LGPL - Vincent Blavet - August 2009
-// http://www.phpconcept.net
-// --------------------------------------------------------------------------------
-//
-// Presentation :
-//   PclZip is a PHP library that manage ZIP archives.
-//   So far tests show that archives generated by PclZip are readable by
-//   WinZip application and other tools.
-//
-// Description :
-//   See readme.txt and http://www.phpconcept.net
-//
-// Warning :
-//   This library and the associated files are non commercial, non professional
-//   work.
-//   It should not have unexpected results. However if any damage is caused by
-//   this software the author can not be responsible.
-//   The use of this software is at the risk of the user.
-//
-// --------------------------------------------------------------------------------
-// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
-// --------------------------------------------------------------------------------
-
-// ----- Constants
-if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define('PCLZIP_READ_BLOCK_SIZE', 2048);
-}
-
-// ----- File list separator
-// In version 1.x of PclZip, the separator for file list is a space
-// (which is not a very smart choice, specifically for windows paths !).
-// A better separator should be a comma (,). This constant gives you the
-// abilty to change that.
-// However notice that changing this value, may have impact on existing
-// scripts, using space separated filenames.
-// Recommanded values for compatibility with older versions :
-//define( 'PCLZIP_SEPARATOR', ' ' );
-// Recommanded values for smart separation of filenames.
-if (!defined('PCLZIP_SEPARATOR')) {
-    define('PCLZIP_SEPARATOR', ',');
-}
-
-// ----- Error configuration
-// 0 : PclZip Class integrated error handling
-// 1 : PclError external library error handling. By enabling this
-//     you must ensure that you have included PclError library.
-// [2,...] : reserved for futur use
-if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define('PCLZIP_ERROR_EXTERNAL', 0);
-}
-
-// ----- Optional static temporary directory
-//       By default temporary files are generated in the script current
-//       path.
-//       If defined :
-//       - MUST BE terminated by a '/'.
-//       - MUST be a valid, already created directory
-//       Samples :
-// define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-// define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    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.8.2";
-
-// ----- Error codes
-//   -1 : Unable to open file in binary write mode
-//   -2 : Unable to open file in binary read mode
-//   -3 : Invalid parameters
-//   -4 : File does not exist
-//   -5 : Filename is too long (max. 255)
-//   -6 : Not a valid zip file
-//   -7 : Invalid extracted file size
-//   -8 : Unable to create directory
-//   -9 : Invalid archive extension
-//  -10 : Invalid archive format
-//  -11 : Unable to delete file (unlink)
-//  -12 : Unable to rename file (rename)
-//  -13 : Invalid header checksum
-//  -14 : Invalid archive size
-define('PCLZIP_ERR_USER_ABORTED', 2);
-define('PCLZIP_ERR_NO_ERROR', 0);
-define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
-define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
-define('PCLZIP_ERR_INVALID_PARAMETER', -3);
-define('PCLZIP_ERR_MISSING_FILE', -4);
-define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
-define('PCLZIP_ERR_INVALID_ZIP', -6);
-define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
-define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
-define('PCLZIP_ERR_BAD_EXTENSION', -9);
-define('PCLZIP_ERR_BAD_FORMAT', -10);
-define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
-define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
-define('PCLZIP_ERR_BAD_CHECKSUM', -13);
-define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
-define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
-define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
-define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
-define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
-define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
-define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
-define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
-
-// ----- Options values
-define('PCLZIP_OPT_PATH', 77001);
-define('PCLZIP_OPT_ADD_PATH', 77002);
-define('PCLZIP_OPT_REMOVE_PATH', 77003);
-define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
-define('PCLZIP_OPT_SET_CHMOD', 77005);
-define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
-define('PCLZIP_OPT_NO_COMPRESSION', 77007);
-define('PCLZIP_OPT_BY_NAME', 77008);
-define('PCLZIP_OPT_BY_INDEX', 77009);
-define('PCLZIP_OPT_BY_EREG', 77010);
-define('PCLZIP_OPT_BY_PREG', 77011);
-define('PCLZIP_OPT_COMMENT', 77012);
-define('PCLZIP_OPT_ADD_COMMENT', 77013);
-define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
-define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
-define('PCLZIP_OPT_REPLACE_NEWER', 77016);
-define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
-// Having big trouble with crypt. Need to multiply 2 long int
-// which is not correctly supported by PHP ...
-//define( 'PCLZIP_OPT_CRYPT', 77018 );
-define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
-define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
-define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
-define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
-define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
-define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
-define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
-
-// ----- File description attributes
-define('PCLZIP_ATT_FILE_NAME', 79001);
-define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
-define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
-define('PCLZIP_ATT_FILE_MTIME', 79004);
-define('PCLZIP_ATT_FILE_CONTENT', 79005);
-define('PCLZIP_ATT_FILE_COMMENT', 79006);
-
-// ----- Call backs values
-define('PCLZIP_CB_PRE_EXTRACT', 78001);
-define('PCLZIP_CB_POST_EXTRACT', 78002);
-define('PCLZIP_CB_PRE_ADD', 78003);
-define('PCLZIP_CB_POST_ADD', 78004);
-/* For futur use
-define( 'PCLZIP_CB_PRE_LIST', 78005 );
-define( 'PCLZIP_CB_POST_LIST', 78006 );
-define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-define( 'PCLZIP_CB_POST_DELETE', 78008 );
-*/
-
-// --------------------------------------------------------------------------------
-// Class : PclZip
-// Description :
-//   PclZip is the class that represent a Zip archive.
-//   The public methods allow the manipulation of the archive.
-// Attributes :
-//   Attributes must not be accessed directly.
-// Methods :
-//   PclZip() : Object creator
-//   create() : Creates the Zip archive
-//   listContent() : List the content of the Zip archive
-//   extract() : Extract the content of the archive
-//   properties() : List the properties of the archive
-// --------------------------------------------------------------------------------
-class PclZip
-{
-    // ----- Filename of the zip file
-    public $zipname = '';
-
-    // ----- File descriptor of the zip file
-    public $zip_fd = 0;
-
-    // ----- Internal error handling
-    public $error_code = 1;
-    public $error_string = '';
-
-    // ----- Current status of the magic_quotes_runtime
-    // This value store the php configuration for magic_quotes
-    // The class can then disable the magic_quotes and reset it after
-    public $magic_quotes_status;
-
-    // --------------------------------------------------------------------------------
-    // Function : PclZip()
-    // Description :
-    //   Creates a PclZip object and set the name of the associated Zip archive
-    //   filename.
-    //   Note that no real action is taken, if the archive does not exist it is not
-    //   created. Use create() for that.
-    // --------------------------------------------------------------------------------
-    public function __construct($p_zipname)
-    {
-
-        // ----- Tests the zlib
-        if (!function_exists('gzopen')) {
-            die('Abort ' . basename(__FILE__) . ' : Missing zlib extensions');
-        }
-
-        // ----- Set the attributes
-        $this->zipname             = $p_zipname;
-        $this->zip_fd              = 0;
-        $this->magic_quotes_status = -1;
-
-        // ----- Return
-        return;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function :
-    //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-    //   create($p_filelist, $p_option, $p_option_value, ...)
-    // Description :
-    //   This method supports two different synopsis. The first one is historical.
-    //   This method creates a Zip Archive. The Zip file is created in the
-    //   filesystem. The files and directories indicated in $p_filelist
-    //   are added in the archive. See the parameters description for the
-    //   supported format of $p_filelist.
-    //   When a directory is in the list, the directory and its content is added
-    //   in the archive.
-    //   In this synopsis, the function takes an optional variable list of
-    //   options. See bellow the supported options.
-    // Parameters :
-    //   $p_filelist : An array containing file or directory names, or
-    //                 a string containing one filename or one directory name, or
-    //                 a string containing a list of filenames and/or directory
-    //                 names separated by spaces.
-    //   $p_add_dir : A path to add before the real path of the archived file,
-    //                in order to have it memorized in the archive.
-    //   $p_remove_dir : A path to remove from the real path of the file to archive,
-    //                   in order to have a shorter path memorized in the archive.
-    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-    //                   is removed first, before $p_add_dir is added.
-    // Options :
-    //   PCLZIP_OPT_ADD_PATH :
-    //   PCLZIP_OPT_REMOVE_PATH :
-    //   PCLZIP_OPT_REMOVE_ALL_PATH :
-    //   PCLZIP_OPT_COMMENT :
-    //   PCLZIP_CB_PRE_ADD :
-    //   PCLZIP_CB_POST_ADD :
-    // Return Values :
-    //   0 on failure,
-    //   The list of the added files, with a status of the add action.
-    //   (see PclZip::listContent() for list entry format)
-    // --------------------------------------------------------------------------------
-    public function create($p_filelist)
-    {
-        $v_result = 1;
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Set default values
-        $v_options                            = array();
-        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
-
-        // ----- Look for variable options arguments
-        $v_size = func_num_args();
-
-        // ----- Look for arguments
-        if ($v_size > 1) {
-            // ----- Get the arguments
-            $v_arg_list = func_get_args();
-
-            // ----- Remove from the options list the first argument
-            array_shift($v_arg_list);
-            $v_size--;
-
-            // ----- Look for first arg
-            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-                // ----- Parse the options
-                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
-                    PCLZIP_OPT_REMOVE_PATH => 'optional',
-                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                    PCLZIP_OPT_ADD_PATH => 'optional',
-                    PCLZIP_CB_PRE_ADD => 'optional',
-                    PCLZIP_CB_POST_ADD => 'optional',
-                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                    PCLZIP_OPT_COMMENT => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                    //, PCLZIP_OPT_CRYPT => 'optional'
-                ));
-                if ($v_result != 1) {
-                    return 0;
-                }
-
-            // ----- Look for 2 args
-            // Here we need to support the first historic synopsis of the
-            // method.
-            } else {
-
-                // ----- Get the first argument
-                $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-                // ----- Look for the optional second argument
-                if ($v_size == 2) {
-                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-                } elseif ($v_size > 2) {
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-                    return 0;
-                }
-            }
-        }
-
-        // ----- Look for default option values
-        $this->privOptionDefaultThreshold($v_options);
-
-        // ----- Init
-        $v_string_list    = array();
-        $v_att_list       = array();
-        $v_filedescr_list = array();
-        $p_result_list    = array();
-
-        // ----- Look if the $p_filelist is really an array
-        if (is_array($p_filelist)) {
-
-            // ----- Look if the first element is also an array
-            //       This will mean that this is a file description entry
-            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-                $v_att_list = $p_filelist;
-
-            // ----- The list is a list of string names
-            } else {
-                $v_string_list = $p_filelist;
-            }
-
-        // ----- Look if the $p_filelist is a string
-        } elseif (is_string($p_filelist)) {
-            // ----- Create a list from the string
-            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-
-        // ----- Invalid variable type for $p_filelist
-        } else {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-
-            return 0;
-        }
-
-        // ----- Reformat the string list
-        if (sizeof($v_string_list) != 0) {
-            foreach ($v_string_list as $v_string) {
-                if ($v_string != '') {
-                    $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-                } else {
-                }
-            }
-        }
-
-        // ----- For each file in the list check the attributes
-        $v_supported_attributes = array(
-            PCLZIP_ATT_FILE_NAME => 'mandatory',
-            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
-            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
-            PCLZIP_ATT_FILE_MTIME => 'optional',
-            PCLZIP_ATT_FILE_CONTENT => 'optional',
-            PCLZIP_ATT_FILE_COMMENT => 'optional'
-        );
-        foreach ($v_att_list as $v_entry) {
-            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
-            if ($v_result != 1) {
-                return 0;
-            }
-        }
-
-        // ----- Expand the filelist (expand directories)
-        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-        if ($v_result != 1) {
-            return 0;
-        }
-
-        // ----- Call the create fct
-        $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-        if ($v_result != 1) {
-            return 0;
-        }
-
-        // ----- Return
-        return $p_result_list;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function :
-    //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-    //   add($p_filelist, $p_option, $p_option_value, ...)
-    // Description :
-    //   This method supports two synopsis. The first one is historical.
-    //   This methods add the list of files in an existing archive.
-    //   If a file with the same name already exists, it is added at the end of the
-    //   archive, the first one is still present.
-    //   If the archive does not exist, it is created.
-    // Parameters :
-    //   $p_filelist : An array containing file or directory names, or
-    //                 a string containing one filename or one directory name, or
-    //                 a string containing a list of filenames and/or directory
-    //                 names separated by spaces.
-    //   $p_add_dir : A path to add before the real path of the archived file,
-    //                in order to have it memorized in the archive.
-    //   $p_remove_dir : A path to remove from the real path of the file to archive,
-    //                   in order to have a shorter path memorized in the archive.
-    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-    //                   is removed first, before $p_add_dir is added.
-    // Options :
-    //   PCLZIP_OPT_ADD_PATH :
-    //   PCLZIP_OPT_REMOVE_PATH :
-    //   PCLZIP_OPT_REMOVE_ALL_PATH :
-    //   PCLZIP_OPT_COMMENT :
-    //   PCLZIP_OPT_ADD_COMMENT :
-    //   PCLZIP_OPT_PREPEND_COMMENT :
-    //   PCLZIP_CB_PRE_ADD :
-    //   PCLZIP_CB_POST_ADD :
-    // Return Values :
-    //   0 on failure,
-    //   The list of the added files, with a status of the add action.
-    //   (see PclZip::listContent() for list entry format)
-    // --------------------------------------------------------------------------------
-    public function add($p_filelist)
-    {
-        $v_result = 1;
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Set default values
-        $v_options                            = array();
-        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
-
-        // ----- Look for variable options arguments
-        $v_size = func_num_args();
-
-        // ----- Look for arguments
-        if ($v_size > 1) {
-            // ----- Get the arguments
-            $v_arg_list = func_get_args();
-
-            // ----- Remove form the options list the first argument
-            array_shift($v_arg_list);
-            $v_size--;
-
-            // ----- Look for first arg
-            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-                // ----- Parse the options
-                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
-                    PCLZIP_OPT_REMOVE_PATH => 'optional',
-                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                    PCLZIP_OPT_ADD_PATH => 'optional',
-                    PCLZIP_CB_PRE_ADD => 'optional',
-                    PCLZIP_CB_POST_ADD => 'optional',
-                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                    PCLZIP_OPT_COMMENT => 'optional',
-                    PCLZIP_OPT_ADD_COMMENT => 'optional',
-                    PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                    //, PCLZIP_OPT_CRYPT => 'optional'
-                ));
-                if ($v_result != 1) {
-                    return 0;
-                }
-
-            // ----- Look for 2 args
-            // Here we need to support the first historic synopsis of the
-            // method.
-            } else {
-
-                // ----- Get the first argument
-                $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-                // ----- Look for the optional second argument
-                if ($v_size == 2) {
-                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-                } elseif ($v_size > 2) {
-                    // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-                    // ----- Return
-                    return 0;
-                }
-            }
-        }
-
-        // ----- Look for default option values
-        $this->privOptionDefaultThreshold($v_options);
-
-        // ----- Init
-        $v_string_list    = array();
-        $v_att_list       = array();
-        $v_filedescr_list = array();
-        $p_result_list    = array();
-
-        // ----- Look if the $p_filelist is really an array
-        if (is_array($p_filelist)) {
-
-            // ----- Look if the first element is also an array
-            //       This will mean that this is a file description entry
-            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-                $v_att_list = $p_filelist;
-
-            // ----- The list is a list of string names
-            } else {
-                $v_string_list = $p_filelist;
-            }
-
-        // ----- Look if the $p_filelist is a string
-        } elseif (is_string($p_filelist)) {
-            // ----- Create a list from the string
-            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-
-        // ----- Invalid variable type for $p_filelist
-        } else {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
-
-            return 0;
-        }
-
-        // ----- Reformat the string list
-        if (sizeof($v_string_list) != 0) {
-            foreach ($v_string_list as $v_string) {
-                $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-            }
-        }
-
-        // ----- For each file in the list check the attributes
-        $v_supported_attributes = array(
-            PCLZIP_ATT_FILE_NAME => 'mandatory',
-            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
-            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
-            PCLZIP_ATT_FILE_MTIME => 'optional',
-            PCLZIP_ATT_FILE_CONTENT => 'optional',
-            PCLZIP_ATT_FILE_COMMENT => 'optional'
-        );
-        foreach ($v_att_list as $v_entry) {
-            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
-            if ($v_result != 1) {
-                return 0;
-            }
-        }
-
-        // ----- Expand the filelist (expand directories)
-        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-        if ($v_result != 1) {
-            return 0;
-        }
-
-        // ----- Call the create fct
-        $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-        if ($v_result != 1) {
-            return 0;
-        }
-
-        // ----- Return
-        return $p_result_list;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : listContent()
-    // Description :
-    //   This public method, gives the list of the files and directories, with their
-    //   properties.
-    //   The properties of each entries in the list are (used also in other functions) :
-    //     filename : Name of the file. For a create or add action it is the filename
-    //                given by the user. For an extract function it is the filename
-    //                of the extracted file.
-    //     stored_filename : Name of the file / directory stored in the archive.
-    //     size : Size of the stored file.
-    //     compressed_size : Size of the file's data compressed in the archive
-    //                       (without the headers overhead)
-    //     mtime : Last known modification date of the file (UNIX timestamp)
-    //     comment : Comment associated with the file
-    //     folder : true | false
-    //     index : index of the file in the archive
-    //     status : status of the action (depending of the action) :
-    //              Values are :
-    //                ok : OK !
-    //                filtered : the file / dir is not extracted (filtered by user)
-    //                already_a_directory : the file can not be extracted because a
-    //                                      directory with the same name already exists
-    //                write_protected : the file can not be extracted because a file
-    //                                  with the same name already exists and is
-    //                                  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 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
-    //                             while reading the file
-    //                invalid_header : the file was not extracted because of an archive
-    //                                 format error (bad file header)
-    //   Note that each time a method can continue operating when there
-    //   is an action error on a file, the error is only logged in the file status.
-    // Return Values :
-    //   0 on an unrecoverable failure,
-    //   The list of the files in the archive.
-    // --------------------------------------------------------------------------------
-    public function listContent()
-    {
-        $v_result = 1;
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Check archive
-        if (!$this->privCheckFormat()) {
-            return (0);
-        }
-
-        // ----- Call the extracting fct
-        $p_list = array();
-        if (($v_result = $this->privList($p_list)) != 1) {
-            unset($p_list);
-
-            return (0);
-        }
-
-        // ----- Return
-        return $p_list;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function :
-    //   extract($p_path="./", $p_remove_path="")
-    //   extract([$p_option, $p_option_value, ...])
-    // Description :
-    //   This method supports two synopsis. The first one is historical.
-    //   This method extract all the files / directories from the archive to the
-    //   folder indicated in $p_path.
-    //   If you want to ignore the 'root' part of path of the memorized files
-    //   you can indicate this in the optional $p_remove_path parameter.
-    //   By default, if a newer file with the same name already exists, the
-    //   file is not extracted.
-    //
-    //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-    //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-    //   at the end of the path value of PCLZIP_OPT_PATH.
-    // Parameters :
-    //   $p_path : Path where the files and directories are to be extracted
-    //   $p_remove_path : First part ('root' part) of the memorized path
-    //                    (if any similar) to remove while extracting.
-    // Options :
-    //   PCLZIP_OPT_PATH :
-    //   PCLZIP_OPT_ADD_PATH :
-    //   PCLZIP_OPT_REMOVE_PATH :
-    //   PCLZIP_OPT_REMOVE_ALL_PATH :
-    //   PCLZIP_CB_PRE_EXTRACT :
-    //   PCLZIP_CB_POST_EXTRACT :
-    // Return Values :
-    //   0 or a negative value on failure,
-    //   The list of the extracted files, with a status of the action.
-    //   (see PclZip::listContent() for list entry format)
-    // --------------------------------------------------------------------------------
-    public function extract()
-    {
-        $v_result = 1;
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Check archive
-        if (!$this->privCheckFormat()) {
-            return (0);
-        }
-
-        // ----- Set default values
-        $v_options         = array();
-        //    $v_path = "./";
-        $v_path            = '';
-        $v_remove_path     = "";
-        $v_remove_all_path = false;
-
-        // ----- Look for variable options arguments
-        $v_size = func_num_args();
-
-        // ----- Default values for option
-        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
-
-        // ----- Look for arguments
-        if ($v_size > 0) {
-            // ----- Get the arguments
-            $v_arg_list = func_get_args();
-
-            // ----- Look for first arg
-            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-                // ----- Parse the options
-                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
-                    PCLZIP_OPT_PATH => 'optional',
-                    PCLZIP_OPT_REMOVE_PATH => 'optional',
-                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                    PCLZIP_OPT_ADD_PATH => 'optional',
-                    PCLZIP_CB_PRE_EXTRACT => 'optional',
-                    PCLZIP_CB_POST_EXTRACT => 'optional',
-                    PCLZIP_OPT_SET_CHMOD => 'optional',
-                    PCLZIP_OPT_BY_NAME => 'optional',
-                    PCLZIP_OPT_BY_EREG => 'optional',
-                    PCLZIP_OPT_BY_PREG => 'optional',
-                    PCLZIP_OPT_BY_INDEX => 'optional',
-                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
-                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
-                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                ));
-                if ($v_result != 1) {
-                    return 0;
-                }
-
-                // ----- Set the arguments
-                if (isset($v_options[PCLZIP_OPT_PATH])) {
-                    $v_path = $v_options[PCLZIP_OPT_PATH];
-                }
-                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-                }
-                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-                }
-                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-                    // ----- Check for '/' in last path char
-                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-                        $v_path .= '/';
-                    }
-                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-                }
-
-            // ----- Look for 2 args
-            // Here we need to support the first historic synopsis of the
-            // method.
-            } else {
-
-                // ----- Get the first argument
-                $v_path = $v_arg_list[0];
-
-                // ----- Look for the optional second argument
-                if ($v_size == 2) {
-                    $v_remove_path = $v_arg_list[1];
-                } elseif ($v_size > 2) {
-                    // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-                    // ----- Return
-                    return 0;
-                }
-            }
-        }
-
-        // ----- Look for default option values
-        $this->privOptionDefaultThreshold($v_options);
-
-        // ----- Trace
-
-        // ----- Call the extracting fct
-        $p_list   = array();
-        $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options);
-        if ($v_result < 1) {
-            unset($p_list);
-
-            return (0);
-        }
-
-        // ----- Return
-        return $p_list;
-    }
-    // --------------------------------------------------------------------------------
-
-
-    // --------------------------------------------------------------------------------
-    // Function :
-    //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-    //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-    // Description :
-    //   This method supports two synopsis. The first one is historical.
-    //   This method is doing a partial extract of the archive.
-    //   The extracted files or folders are identified by their index in the
-    //   archive (from 0 to n).
-    //   Note that if the index identify a folder, only the folder entry is
-    //   extracted, not all the files included in the archive.
-    // Parameters :
-    //   $p_index : A single index (integer) or a string of indexes of files to
-    //              extract. The form of the string is "0,4-6,8-12" with only numbers
-    //              and '-' for range or ',' to separate ranges. No spaces or ';'
-    //              are allowed.
-    //   $p_path : Path where the files and directories are to be extracted
-    //   $p_remove_path : First part ('root' part) of the memorized path
-    //                    (if any similar) to remove while extracting.
-    // Options :
-    //   PCLZIP_OPT_PATH :
-    //   PCLZIP_OPT_ADD_PATH :
-    //   PCLZIP_OPT_REMOVE_PATH :
-    //   PCLZIP_OPT_REMOVE_ALL_PATH :
-    //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-    //     not as files.
-    //     The resulting content is in a new field 'content' in the file
-    //     structure.
-    //     This option must be used alone (any other options are ignored).
-    //   PCLZIP_CB_PRE_EXTRACT :
-    //   PCLZIP_CB_POST_EXTRACT :
-    // Return Values :
-    //   0 on failure,
-    //   The list of the extracted files, with a status of the action.
-    //   (see PclZip::listContent() for list entry format)
-    // --------------------------------------------------------------------------------
-    //function extractByIndex($p_index, options...)
-    public function extractByIndex($p_index)
-    {
-        $v_result = 1;
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Check archive
-        if (!$this->privCheckFormat()) {
-            return (0);
-        }
-
-        // ----- Set default values
-        $v_options         = array();
-        //    $v_path = "./";
-        $v_path            = '';
-        $v_remove_path     = "";
-        $v_remove_all_path = false;
-
-        // ----- Look for variable options arguments
-        $v_size = func_num_args();
-
-        // ----- Default values for option
-        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
-
-        // ----- Look for arguments
-        if ($v_size > 1) {
-            // ----- Get the arguments
-            $v_arg_list = func_get_args();
-
-            // ----- Remove form the options list the first argument
-            array_shift($v_arg_list);
-            $v_size--;
-
-            // ----- Look for first arg
-            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-                // ----- Parse the options
-                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
-                    PCLZIP_OPT_PATH => 'optional',
-                    PCLZIP_OPT_REMOVE_PATH => 'optional',
-                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                    PCLZIP_OPT_ADD_PATH => 'optional',
-                    PCLZIP_CB_PRE_EXTRACT => 'optional',
-                    PCLZIP_CB_POST_EXTRACT => 'optional',
-                    PCLZIP_OPT_SET_CHMOD => 'optional',
-                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
-                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
-                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                ));
-                if ($v_result != 1) {
-                    return 0;
-                }
-
-                // ----- Set the arguments
-                if (isset($v_options[PCLZIP_OPT_PATH])) {
-                    $v_path = $v_options[PCLZIP_OPT_PATH];
-                }
-                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-                }
-                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-                }
-                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-                    // ----- Check for '/' in last path char
-                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-                        $v_path .= '/';
-                    }
-                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-                }
-                if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-                    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
-                } else {
-                }
-
-            // ----- Look for 2 args
-            // Here we need to support the first historic synopsis of the
-            // method.
-            } else {
-
-                // ----- Get the first argument
-                $v_path = $v_arg_list[0];
-
-                // ----- Look for the optional second argument
-                if ($v_size == 2) {
-                    $v_remove_path = $v_arg_list[1];
-                } elseif ($v_size > 2) {
-                    // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-                    // ----- Return
-                    return 0;
-                }
-            }
-        }
-
-        // ----- Trace
-
-        // ----- Trick
-        // Here I want to reuse extractByRule(), so I need to parse the $p_index
-        // with privParseOptions()
-        $v_arg_trick     = array(
-            PCLZIP_OPT_BY_INDEX,
-            $p_index
-        );
-        $v_options_trick = array();
-        $v_result        = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array(
-            PCLZIP_OPT_BY_INDEX => 'optional'
-        ));
-        if ($v_result != 1) {
-            return 0;
-        }
-        $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-        // ----- Look for default option values
-        $this->privOptionDefaultThreshold($v_options);
-
-        // ----- Call the extracting fct
-        if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-            return (0);
-        }
-
-        // ----- Return
-        return $p_list;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function :
-    //   delete([$p_option, $p_option_value, ...])
-    // Description :
-    //   This method removes files from the archive.
-    //   If no parameters are given, then all the archive is emptied.
-    // Parameters :
-    //   None or optional arguments.
-    // Options :
-    //   PCLZIP_OPT_BY_INDEX :
-    //   PCLZIP_OPT_BY_NAME :
-    //   PCLZIP_OPT_BY_EREG :
-    //   PCLZIP_OPT_BY_PREG :
-    // Return Values :
-    //   0 on failure,
-    //   The list of the files which are still present in the archive.
-    //   (see PclZip::listContent() for list entry format)
-    // --------------------------------------------------------------------------------
-    public function delete()
-    {
-        $v_result = 1;
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Check archive
-        if (!$this->privCheckFormat()) {
-            return (0);
-        }
-
-        // ----- Set default values
-        $v_options = array();
-
-        // ----- Look for variable options arguments
-        $v_size = func_num_args();
-
-        // ----- Look for arguments
-        if ($v_size > 0) {
-            // ----- Get the arguments
-            $v_arg_list = func_get_args();
-
-            // ----- Parse the options
-            $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
-                PCLZIP_OPT_BY_NAME => 'optional',
-                PCLZIP_OPT_BY_EREG => 'optional',
-                PCLZIP_OPT_BY_PREG => 'optional',
-                PCLZIP_OPT_BY_INDEX => 'optional'
-            ));
-            if ($v_result != 1) {
-                return 0;
-            }
-        }
-
-        // ----- Magic quotes trick
-        $this->privDisableMagicQuotes();
-
-        // ----- Call the delete fct
-        $v_list = array();
-        if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-            $this->privSwapBackMagicQuotes();
-            unset($v_list);
-
-            return (0);
-        }
-
-        // ----- Magic quotes trick
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Return
-        return $v_list;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : deleteByIndex()
-    // Description :
-    //   ***** Deprecated *****
-    //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-    // --------------------------------------------------------------------------------
-    public function deleteByIndex($p_index)
-    {
-
-        $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-        // ----- Return
-        return $p_list;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : properties()
-    // Description :
-    //   This method gives the properties of the archive.
-    //   The properties are :
-    //     nb : Number of files in the archive
-    //     comment : Comment associated with the archive file
-    //     status : not_exist, ok
-    // Parameters :
-    //   None
-    // Return Values :
-    //   0 on failure,
-    //   An array with the archive properties.
-    // --------------------------------------------------------------------------------
-    public function properties()
-    {
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Magic quotes trick
-        $this->privDisableMagicQuotes();
-
-        // ----- Check archive
-        if (!$this->privCheckFormat()) {
-            $this->privSwapBackMagicQuotes();
-
-            return (0);
-        }
-
-        // ----- Default properties
-        $v_prop            = array();
-        $v_prop['comment'] = '';
-        $v_prop['nb']      = 0;
-        $v_prop['status']  = 'not_exist';
-
-        // ----- Look if file exists
-        if (@is_file($this->zipname)) {
-            // ----- Open the zip file
-            if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
-                $this->privSwapBackMagicQuotes();
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
-
-                // ----- Return
-                return 0;
-            }
-
-            // ----- Read the central directory informations
-            $v_central_dir = array();
-            if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
-                $this->privSwapBackMagicQuotes();
-
-                return 0;
-            }
-
-            // ----- Close the zip file
-            $this->privCloseFd();
-
-            // ----- Set the user attributes
-            $v_prop['comment'] = $v_central_dir['comment'];
-            $v_prop['nb']      = $v_central_dir['entries'];
-            $v_prop['status']  = 'ok';
-        }
-
-        // ----- Magic quotes trick
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Return
-        return $v_prop;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : duplicate()
-    // Description :
-    //   This method creates an archive by copying the content of an other one. If
-    //   the archive already exist, it is replaced by the new one without any warning.
-    // Parameters :
-    //   $p_archive : The filename of a valid archive, or
-    //                a valid PclZip object.
-    // Return Values :
-    //   1 on success.
-    //   0 or a negative value on error (error code).
-    // --------------------------------------------------------------------------------
-    public function duplicate($p_archive)
-    {
-        $v_result = 1;
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Look if the $p_archive is a PclZip object
-        if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) {
-
-            // ----- Duplicate the archive
-            $v_result = $this->privDuplicate($p_archive->zipname);
-
-        // ----- Look if the $p_archive is a string (so a filename)
-        } elseif (is_string($p_archive)) {
-
-            // ----- Check that $p_archive is a valid zip file
-            // TBC : Should also check the archive format
-            if (!is_file($p_archive)) {
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
-                $v_result = PCLZIP_ERR_MISSING_FILE;
-            } else {
-                // ----- Duplicate the archive
-                $v_result = $this->privDuplicate($p_archive);
-            }
-
-        // ----- Invalid variable
-        } else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : merge()
-    // Description :
-    //   This method merge the $p_archive_to_add archive at the end of the current
-    //   one ($this).
-    //   If the archive ($this) does not exist, the merge becomes a duplicate.
-    //   If the $p_archive_to_add archive does not exist, the merge is a success.
-    // Parameters :
-    //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-    //                       or a PclZip object archive.
-    // Return Values :
-    //   1 on success,
-    //   0 or negative values on error (see below).
-    // --------------------------------------------------------------------------------
-    public function merge($p_archive_to_add)
-    {
-        $v_result = 1;
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Check archive
-        if (!$this->privCheckFormat()) {
-            return (0);
-        }
-
-        // ----- Look if the $p_archive_to_add is a PclZip object
-        if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) {
-
-            // ----- Merge the archive
-            $v_result = $this->privMerge($p_archive_to_add);
-
-        // ----- Look if the $p_archive_to_add is a string (so a filename)
-        } elseif (is_string($p_archive_to_add)) {
-
-            // ----- Create a temporary archive
-            $v_object_archive = new PclZip($p_archive_to_add);
-
-            // ----- Merge the archive
-            $v_result = $this->privMerge($v_object_archive);
-
-        // ----- Invalid variable
-        } else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : errorCode()
-    // Description :
-    // Parameters :
-    // --------------------------------------------------------------------------------
-    public function errorCode()
-    {
-        if (PCLZIP_ERROR_EXTERNAL == 1) {
-            return (PclErrorCode());
-        } else {
-            return ($this->error_code);
-        }
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : errorName()
-    // Description :
-    // Parameters :
-    // --------------------------------------------------------------------------------
-    public function errorName($p_with_code = false)
-    {
-        $v_name = array(
-            PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-            PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-            PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-            PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-            PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-            PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-            PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-            PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-            PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-            PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-            PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-            PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-            PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-            PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-            PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-            PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-            PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-            PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-            PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION',
-            PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE',
-            PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-        );
-
-        if (isset($v_name[$this->error_code])) {
-            $v_value = $v_name[$this->error_code];
-        } else {
-            $v_value = 'NoName';
-        }
-
-        if ($p_with_code) {
-            return ($v_value . ' (' . $this->error_code . ')');
-        } else {
-            return ($v_value);
-        }
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : errorInfo()
-    // Description :
-    // Parameters :
-    // --------------------------------------------------------------------------------
-    public function errorInfo($p_full = false)
-    {
-        if (PCLZIP_ERROR_EXTERNAL == 1) {
-            return (PclErrorString());
-        } else {
-            if ($p_full) {
-                return ($this->errorName(true) . " : " . $this->error_string);
-            } else {
-                return ($this->error_string . " [code " . $this->error_code . "]");
-            }
-        }
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-    // *****                                                        *****
-    // *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privCheckFormat()
-    // Description :
-    //   This method check that the archive exists and is a valid zip archive.
-    //   Several level of check exists. (futur)
-    // Parameters :
-    //   $p_level : Level of check. Default 0.
-    //              0 : Check the first bytes (magic codes) (default value))
-    //              1 : 0 + Check the central directory (futur)
-    //              2 : 1 + Check each file header (futur)
-    // Return Values :
-    //   true on success,
-    //   false on error, the error code is set.
-    // --------------------------------------------------------------------------------
-    public function privCheckFormat($p_level = 0)
-    {
-        $v_result = true;
-
-        // ----- Reset the file system cache
-        clearstatcache();
-
-        // ----- Reset the error handler
-        $this->privErrorReset();
-
-        // ----- Look if the file exits
-        if (!is_file($this->zipname)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
-
-            return (false);
-        }
-
-        // ----- Check that the file is readeable
-        if (!is_readable($this->zipname)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
-
-            return (false);
-        }
-
-        // ----- Check the magic code
-        // TBC
-
-        // ----- Check the central header
-        // TBC
-
-        // ----- Check each file header
-        // TBC
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privParseOptions()
-    // Description :
-    //   This internal methods reads the variable list of arguments ($p_options_list,
-    //   $p_size) and generate an array with the options and values ($v_result_list).
-    //   $v_requested_options contains the options that can be present and those that
-    //   must be present.
-    //   $v_requested_options is an array, with the option value as key, and 'optional',
-    //   or 'mandatory' as value.
-    // Parameters :
-    //   See above.
-    // Return Values :
-    //   1 on success.
-    //   0 on failure.
-    // --------------------------------------------------------------------------------
-    public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
-    {
-        $v_result = 1;
-
-        // ----- Read the options
-        $i = 0;
-        while ($i < $p_size) {
-
-            // ----- Check if the option is supported
-            if (!isset($v_requested_options[$p_options_list[$i]])) {
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Look for next option
-            switch ($p_options_list[$i]) {
-                // ----- Look for options that request a path value
-                case PCLZIP_OPT_PATH:
-                case PCLZIP_OPT_REMOVE_PATH:
-                case PCLZIP_OPT_ADD_PATH:
-                    // ----- Check the number of parameters
-                    if (($i + 1) >= $p_size) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Get the value
-                    $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
-                    $i++;
-                    break;
-
-                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) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Get the value
-                    if (is_string($p_options_list[$i + 1]) && ($p_options_list[$i + 1] != '')) {
-                        $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
-                        $i++;
-                    } else {
-                    }
-                    break;
-
-                // ----- Look for options that request an array of string for value
-                case PCLZIP_OPT_BY_NAME:
-                    // ----- Check the number of parameters
-                    if (($i + 1) >= $p_size) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Get the value
-                    if (is_string($p_options_list[$i + 1])) {
-                        $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
-                    } elseif (is_array($p_options_list[$i + 1])) {
-                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
-                    } else {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-                    $i++;
-                    break;
-
-                // ----- Look for options that request an EREG or PREG expression
-                case PCLZIP_OPT_BY_EREG:
-                    $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-                    // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-                    // to PCLZIP_OPT_BY_PREG
-                case PCLZIP_OPT_BY_PREG:
-                    //case PCLZIP_OPT_CRYPT :
-                    // ----- Check the number of parameters
-                    if (($i + 1) >= $p_size) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Get the value
-                    if (is_string($p_options_list[$i + 1])) {
-                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
-                    } else {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-                    $i++;
-                    break;
-
-                // ----- Look for options that takes a string
-                case PCLZIP_OPT_COMMENT:
-                case PCLZIP_OPT_ADD_COMMENT:
-                case PCLZIP_OPT_PREPEND_COMMENT:
-                    // ----- Check the number of parameters
-                    if (($i + 1) >= $p_size) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Get the value
-                    if (is_string($p_options_list[$i + 1])) {
-                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
-                    } else {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-                    $i++;
-                    break;
-
-                // ----- Look for options that request an array of index
-                case PCLZIP_OPT_BY_INDEX:
-                    // ----- Check the number of parameters
-                    if (($i + 1) >= $p_size) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Get the value
-                    $v_work_list = array();
-                    if (is_string($p_options_list[$i + 1])) {
-
-                        // ----- Remove spaces
-                        $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
-
-                        // ----- Parse items
-                        $v_work_list = explode(",", $p_options_list[$i + 1]);
-                    } elseif (is_integer($p_options_list[$i + 1])) {
-                        $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1];
-                    } elseif (is_array($p_options_list[$i + 1])) {
-                        $v_work_list = $p_options_list[$i + 1];
-                    } else {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Reduce the index list
-                    // each index item in the list must be a couple with a start and
-                    // an end value : [0,3], [5-5], [8-10], ...
-                    // ----- Check the format of each item
-                    $v_sort_flag  = false;
-                    $v_sort_value = 0;
-                    for ($j = 0; $j < sizeof($v_work_list); $j++) {
-                        // ----- Explode the item
-                        $v_item_list      = explode("-", $v_work_list[$j]);
-                        $v_size_item_list = sizeof($v_item_list);
-
-                        // ----- TBC : Here we might check that each item is a
-                        // real integer ...
-
-                        // ----- Look for single value
-                        if ($v_size_item_list == 1) {
-                            // ----- Set the option value
-                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[0];
-                        } elseif ($v_size_item_list == 2) {
-                            // ----- Set the option value
-                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[1];
-                        } else {
-                            // ----- Error log
-                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                            // ----- Return
-                            return PclZip::errorCode();
-                        }
-
-                        // ----- Look for list sort
-                        if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                            $v_sort_flag = true;
-
-                            // ----- TBC : An automatic sort should be writen ...
-                            // ----- Error log
-                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                            // ----- Return
-                            return PclZip::errorCode();
-                        }
-                        $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-                    }
-
-                    // ----- Sort the items
-                    if ($v_sort_flag) {
-                        // TBC : To Be Completed
-                    }
-
-                    // ----- Next option
-                    $i++;
-                    break;
-
-                // ----- Look for options that request no value
-                case PCLZIP_OPT_REMOVE_ALL_PATH:
-                case PCLZIP_OPT_EXTRACT_AS_STRING:
-                case PCLZIP_OPT_NO_COMPRESSION:
-                case PCLZIP_OPT_EXTRACT_IN_OUTPUT:
-                case PCLZIP_OPT_REPLACE_NEWER:
-                case PCLZIP_OPT_STOP_ON_ERROR:
-                    $v_result_list[$p_options_list[$i]] = true;
-                    break;
-
-                // ----- Look for options that request an octal value
-                case PCLZIP_OPT_SET_CHMOD:
-                    // ----- Check the number of parameters
-                    if (($i + 1) >= $p_size) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Get the value
-                    $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
-                    $i++;
-                    break;
-
-                // ----- Look for options that request a call-back
-                case PCLZIP_CB_PRE_EXTRACT:
-                case PCLZIP_CB_POST_EXTRACT:
-                case PCLZIP_CB_PRE_ADD:
-                case PCLZIP_CB_POST_ADD:
-                    /* for futur use
-                    case PCLZIP_CB_PRE_DELETE :
-                    case PCLZIP_CB_POST_DELETE :
-                    case PCLZIP_CB_PRE_LIST :
-                    case PCLZIP_CB_POST_LIST :
-                    */
-                    // ----- Check the number of parameters
-                    if (($i + 1) >= $p_size) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Get the value
-                    $v_function_name = $p_options_list[$i + 1];
-
-                    // ----- Check that the value is a valid existing function
-                    if (!function_exists($v_function_name)) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Set the attribute
-                    $v_result_list[$p_options_list[$i]] = $v_function_name;
-                    $i++;
-                    break;
-
-                default:
-                    // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $p_options_list[$i] . "'");
-
-                    // ----- Return
-                    return PclZip::errorCode();
-            }
-
-            // ----- Next options
-            $i++;
-        }
-
-        // ----- Look for mandatory options
-        if ($v_requested_options !== false) {
-            for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
-                // ----- Look for mandatory option
-                if ($v_requested_options[$key] == 'mandatory') {
-                    // ----- Look if present
-                    if (!isset($v_result_list[$key])) {
-                        // ----- Error log
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
-
-                        // ----- Return
-                        return PclZip::errorCode();
-                    }
-                }
-            }
-        }
-
-        // ----- Look for default values
-        if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privOptionDefaultThreshold()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public 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
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privFileDescrParseAtt()
-    // Description :
-    // Parameters :
-    // Return Values :
-    //   1 on success.
-    //   0 on failure.
-    // --------------------------------------------------------------------------------
-    public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
-    {
-        $v_result = 1;
-
-        // ----- For each file in the list check the attributes
-        foreach ($p_file_list as $v_key => $v_value) {
-
-            // ----- Check if the option is supported
-            if (!isset($v_requested_options[$v_key])) {
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Look for attribute
-            switch ($v_key) {
-                case PCLZIP_ATT_FILE_NAME:
-                    if (!is_string($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
-
-                        return PclZip::errorCode();
-                    }
-
-                    $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-
-                    if ($p_filedescr['filename'] == '') {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
-
-                        return PclZip::errorCode();
-                    }
-
-                    break;
-
-                case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
-                    if (!is_string($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
-
-                        return PclZip::errorCode();
-                    }
-
-                    $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-
-                    if ($p_filedescr['new_short_name'] == '') {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
-
-                        return PclZip::errorCode();
-                    }
-                    break;
-
-                case PCLZIP_ATT_FILE_NEW_FULL_NAME:
-                    if (!is_string($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
-
-                        return PclZip::errorCode();
-                    }
-
-                    $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-
-                    if ($p_filedescr['new_full_name'] == '') {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
-
-                        return PclZip::errorCode();
-                    }
-                    break;
-
-                // ----- Look for options that takes a string
-                case PCLZIP_ATT_FILE_COMMENT:
-                    if (!is_string($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
-
-                        return PclZip::errorCode();
-                    }
-
-                    $p_filedescr['comment'] = $v_value;
-                    break;
-
-                case PCLZIP_ATT_FILE_MTIME:
-                    if (!is_integer($v_value)) {
-                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
-
-                        return PclZip::errorCode();
-                    }
-
-                    $p_filedescr['mtime'] = $v_value;
-                    break;
-
-                case PCLZIP_ATT_FILE_CONTENT:
-                    $p_filedescr['content'] = $v_value;
-                    break;
-
-                default:
-                    // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $v_key . "'");
-
-                    // ----- Return
-                    return PclZip::errorCode();
-            }
-
-            // ----- Look for mandatory options
-            if ($v_requested_options !== false) {
-                for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
-                    // ----- Look for mandatory option
-                    if ($v_requested_options[$key] == 'mandatory') {
-                        // ----- Look if present
-                        if (!isset($p_file_list[$key])) {
-                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
-
-                            return PclZip::errorCode();
-                        }
-                    }
-                }
-            }
-
-            // end foreach
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // 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.
-    //   0 on failure.
-    // --------------------------------------------------------------------------------
-    public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-    {
-        $v_result = 1;
-
-        // ----- Create a result list
-        $v_result_list = array();
-
-        // ----- Look each entry
-        for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
-
-            // ----- Get filedescr
-            $v_descr = $p_filedescr_list[$i];
-
-            // ----- Reduce the filename
-            $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-            $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-
-            // ----- Look for real file or folder
-            if (file_exists($v_descr['filename'])) {
-                if (@is_file($v_descr['filename'])) {
-                    $v_descr['type'] = 'file';
-                } elseif (@is_dir($v_descr['filename'])) {
-                    $v_descr['type'] = 'folder';
-                } elseif (@is_link($v_descr['filename'])) {
-                    // skip
-                    continue;
-                } else {
-                    // skip
-                    continue;
-                }
-
-            // ----- Look for string added as file
-            } elseif (isset($v_descr['content'])) {
-                $v_descr['type'] = 'virtual_file';
-
-            // ----- Missing file
-            } else {
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Calculate the stored filename
-            $this->privCalculateStoredFilename($v_descr, $p_options);
-
-            // ----- Add the descriptor in result list
-            $v_result_list[sizeof($v_result_list)] = $v_descr;
-
-            // ----- Look for folder
-            if ($v_descr['type'] == 'folder') {
-                // ----- List of items in folder
-                $v_dirlist_descr = array();
-                $v_dirlist_nb    = 0;
-                if ($v_folder_handler = @opendir($v_descr['filename'])) {
-                    while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-                        // ----- Skip '.' and '..'
-                        if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                            continue;
-                        }
-
-                        // ----- Compose the full filename
-                        $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'] . '/' . $v_item_handler;
-
-                        // ----- Look for different stored filename
-                        // Because the name of the folder was changed, the name of the
-                        // files/sub-folders also change
-                        if (($v_descr['stored_filename'] != $v_descr['filename']) && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-                            if ($v_descr['stored_filename'] != '') {
-                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'] . '/' . $v_item_handler;
-                            } else {
-                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-                            }
-                        }
-
-                        $v_dirlist_nb++;
-                    }
-
-                    @closedir($v_folder_handler);
-                } else {
-                    // TBC : unable to open folder in read mode
-                }
-
-                // ----- Expand each element of the list
-                if ($v_dirlist_nb != 0) {
-                    // ----- Expand
-                    if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-                        return $v_result;
-                    }
-
-                    // ----- Concat the resulting list
-                    $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-                } else {
-                }
-
-                // ----- Free local array
-                unset($v_dirlist_descr);
-            }
-        }
-
-        // ----- Get the result list
-        $p_filedescr_list = $v_result_list;
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privCreate()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-    {
-        $v_result      = 1;
-        $v_list_detail = array();
-
-        // ----- Magic quotes trick
-        $this->privDisableMagicQuotes();
-
-        // ----- Open the file in write mode
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Add the list of files
-        $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-        // ----- Close
-        $this->privCloseFd();
-
-        // ----- Magic quotes trick
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privAdd()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-    {
-        $v_result      = 1;
-        $v_list_detail = array();
-
-        // ----- Look if the archive exists or is empty
-        if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0)) {
-
-            // ----- Do a create
-            $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-            // ----- Return
-            return $v_result;
-        }
-        // ----- Magic quotes trick
-        $this->privDisableMagicQuotes();
-
-        // ----- Open the zip file
-        if (($v_result = $this->privOpenFd('rb')) != 1) {
-            // ----- Magic quotes trick
-            $this->privSwapBackMagicQuotes();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Read the central directory informations
-        $v_central_dir = array();
-        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-        }
-
-        // ----- Go to beginning of File
-        @rewind($this->zip_fd);
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
-
-        // ----- Open the temporary file in write mode
-        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Copy the files from the archive to the temporary file
-        // TBC : Here I should better append the file and go back to erase the central dir
-        $v_size = $v_central_dir['offset'];
-        while ($v_size != 0) {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = fread($this->zip_fd, $v_read_size);
-            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-        }
-
-        // ----- Swap the file descriptor
-        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-        // the following methods on the temporary fil and not the real archive
-        $v_swap        = $this->zip_fd;
-        $this->zip_fd  = $v_zip_temp_fd;
-        $v_zip_temp_fd = $v_swap;
-
-        // ----- Add the files
-        $v_header_list = array();
-        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
-            fclose($v_zip_temp_fd);
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
-            $this->privSwapBackMagicQuotes();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($this->zip_fd);
-
-        // ----- Copy the block of file headers from the old archive
-        $v_size = $v_central_dir['size'];
-        while ($v_size != 0) {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = @fread($v_zip_temp_fd, $v_read_size);
-            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-        }
-
-        // ----- Create the Central Dir files header
-        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if ($v_header_list[$i]['status'] == 'ok') {
-                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                    fclose($v_zip_temp_fd);
-                    $this->privCloseFd();
-                    @unlink($v_zip_temp_name);
-                    $this->privSwapBackMagicQuotes();
-
-                    // ----- Return
-                    return $v_result;
-                }
-                $v_count++;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-        // ----- Zip file comment
-        $v_comment = $v_central_dir['comment'];
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-        if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-            $v_comment = $v_comment . $p_options[PCLZIP_OPT_ADD_COMMENT];
-        }
-        if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-            $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT] . $v_comment;
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($this->zip_fd) - $v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $this->privSwapBackMagicQuotes();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Swap back the file descriptor
-        $v_swap        = $this->zip_fd;
-        $this->zip_fd  = $v_zip_temp_fd;
-        $v_zip_temp_fd = $v_swap;
-
-        // ----- Close
-        $this->privCloseFd();
-
-        // ----- Close the temporary file
-        @fclose($v_zip_temp_fd);
-
-        // ----- Magic quotes trick
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privOpenFd()
-    // Description :
-    // Parameters :
-    // --------------------------------------------------------------------------------
-    public function privOpenFd($p_mode)
-    {
-        $v_result = 1;
-
-        // ----- Look if already open
-        if ($this->zip_fd != 0) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Open the zip file
-        if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privCloseFd()
-    // Description :
-    // Parameters :
-    // --------------------------------------------------------------------------------
-    public function privCloseFd()
-    {
-        $v_result = 1;
-
-        if ($this->zip_fd != 0) {
-            @fclose($this->zip_fd);
-        }
-        $this->zip_fd = 0;
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privAddList()
-    // Description :
-    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-    //   different from the real path of the file. This is usefull if you want to have PclTar
-    //   running in any directory, and memorize relative path from an other directory.
-    // Parameters :
-    //   $p_list : An array containing the file or directory names to add in the tar
-    //   $p_result_list : list of added files with their properties (specially the status field)
-    //   $p_add_dir : Path to add in the filename path archived
-    //   $p_remove_dir : Path to remove in the filename path archived
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-    public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-    {
-        $v_result = 1;
-
-        // ----- Add the files
-        $v_header_list = array();
-        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($this->zip_fd);
-
-        // ----- Create the Central Dir files header
-        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if ($v_header_list[$i]['status'] == 'ok') {
-                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                    // ----- Return
-                    return $v_result;
-                }
-                $v_count++;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($this->zip_fd) - $v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privAddFileList()
-    // Description :
-    // Parameters :
-    //   $p_filedescr_list : An array containing the file description
-    //                      or directory names to add in the zip
-    //   $p_result_list : list of added files with their properties (specially the status field)
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-    {
-        $v_result = 1;
-        $v_header = array();
-
-        // ----- Recuperate the current number of elt in list
-        $v_nb = sizeof($p_result_list);
-
-        // ----- Loop on the files
-        for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
-            // ----- Format the filename
-            $p_filedescr_list[$j]['filename'] = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-
-            // ----- Skip empty file names
-            // TBC : Can this be possible ? not checked in DescrParseAtt ?
-            if ($p_filedescr_list[$j]['filename'] == "") {
-                continue;
-            }
-
-            // ----- Check the filename
-            if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
-                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
-
-                return PclZip::errorCode();
-            }
-
-            // ----- Look if it is a file or a dir with no all path remove option
-            // or a dir with all its path removed
-            //      if (   (is_file($p_filedescr_list[$j]['filename']))
-            //          || (   is_dir($p_filedescr_list[$j]['filename'])
-            if (($p_filedescr_list[$j]['type'] == 'file') || ($p_filedescr_list[$j]['type'] == 'virtual_file') || (($p_filedescr_list[$j]['type'] == 'folder') && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]) || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-
-                // ----- Add the file
-                $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header, $p_options);
-                if ($v_result != 1) {
-                    return $v_result;
-                }
-
-                // ----- Store the file infos
-                $p_result_list[$v_nb++] = $v_header;
-            }
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privAddFile()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privAddFile($p_filedescr, &$p_header, &$p_options)
-    {
-        $v_result = 1;
-
-        // ----- Working variable
-        $p_filename = $p_filedescr['filename'];
-
-        // TBC : Already done in the fileAtt check ... ?
-        if ($p_filename == "") {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Look for a stored different filename
-        /* TBC : Removed
-        if (isset($p_filedescr['stored_filename'])) {
-        $v_stored_filename = $p_filedescr['stored_filename'];
-        } else {
-        $v_stored_filename = $p_filedescr['stored_filename'];
-        }
-        */
-
-        // ----- Set the file properties
-        clearstatcache();
-        $p_header['version']           = 20;
-        $p_header['version_extracted'] = 10;
-        $p_header['flag']              = 0;
-        $p_header['compression']       = 0;
-        $p_header['crc']               = 0;
-        $p_header['compressed_size']   = 0;
-        $p_header['filename_len']      = strlen($p_filename);
-        $p_header['extra_len']         = 0;
-        $p_header['disk']              = 0;
-        $p_header['internal']          = 0;
-        $p_header['offset']            = 0;
-        $p_header['filename']          = $p_filename;
-        // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-        $p_header['stored_filename']   = $p_filedescr['stored_filename'];
-        $p_header['extra']             = '';
-        $p_header['status']            = 'ok';
-        $p_header['index']             = -1;
-
-        // ----- Look for regular file
-        if ($p_filedescr['type'] == 'file') {
-            $p_header['external'] = 0x00000000;
-            $p_header['size']     = filesize($p_filename);
-
-        // ----- Look for regular folder
-        } elseif ($p_filedescr['type'] == 'folder') {
-            $p_header['external'] = 0x00000010;
-            $p_header['mtime']    = filemtime($p_filename);
-            $p_header['size']     = filesize($p_filename);
-
-        // ----- Look for virtual file
-        } elseif ($p_filedescr['type'] == 'virtual_file') {
-            $p_header['external'] = 0x00000000;
-            $p_header['size']     = strlen($p_filedescr['content']);
-        }
-
-        // ----- Look for filetime
-        if (isset($p_filedescr['mtime'])) {
-            $p_header['mtime'] = $p_filedescr['mtime'];
-        } elseif ($p_filedescr['type'] == 'virtual_file') {
-            $p_header['mtime'] = time();
-        } else {
-            $p_header['mtime'] = filemtime($p_filename);
-        }
-
-        // ------ Look for file comment
-        if (isset($p_filedescr['comment'])) {
-            $p_header['comment_len'] = strlen($p_filedescr['comment']);
-            $p_header['comment']     = $p_filedescr['comment'];
-        } else {
-            $p_header['comment_len'] = 0;
-            $p_header['comment']     = '';
-        }
-
-        // ----- Look for pre-add callback
-        if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-            // ----- Generate a local information
-            $v_local_header = array();
-            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-            // ----- Call the callback
-            // Here I do not use call_user_func() because I need to send a reference to the
-            // header.
-            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-            $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-            if ($v_result == 0) {
-                // ----- Change the file status
-                $p_header['status'] = "skipped";
-                $v_result           = 1;
-            }
-
-            // ----- Update the informations
-            // Only some fields can be modified
-            if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-                $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-            }
-        }
-
-        // ----- Look for empty stored filename
-        if ($p_header['stored_filename'] == "") {
-            $p_header['status'] = "filtered";
-        }
-
-        // ----- Check the path length
-        if (strlen($p_header['stored_filename']) > 0xFF) {
-            $p_header['status'] = 'filename_too_long';
-        }
-
-        // ----- Look if no error, or file not skipped
-        if ($p_header['status'] == 'ok') {
-
-            // ----- Look for a file
-            if ($p_filedescr['type'] == 'file') {
-                // ----- Look for using temporary file to zip
-                if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
-                    $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-                    if ($v_result < PCLZIP_ERR_NO_ERROR) {
-                        return $v_result;
-                    }
-
-                // ----- Use "in memory" zip algo
-                } else {
-
-                    // ----- Open the source file
-                    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-                        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- Read the file content
-                    $v_content = @fread($v_file, $p_header['size']);
-
-                    // ----- 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)
-            } elseif ($p_filedescr['type'] == 'virtual_file') {
-
-                $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]) {
-                    // ----- 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 directory
-            } elseif ($p_filedescr['type'] == 'folder') {
-                // ----- Look for directory last '/'
-                if (@substr($p_header['stored_filename'], -1) != '/') {
-                    $p_header['stored_filename'] .= '/';
-                }
-
-                // ----- Set the file properties
-                $p_header['size']     = 0;
-                //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-                $p_header['external'] = 0x00000010; // Value for a folder : to be checked
-
-                // ----- Call the header generation
-                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-                    return $v_result;
-                }
-            }
-        }
-
-        // ----- Look for post-add callback
-        if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-
-            // ----- Generate a local information
-            $v_local_header = array();
-            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-            // ----- Call the callback
-            // Here I do not use call_user_func() because I need to send a reference to the
-            // header.
-            //      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;
-            }
-
-            // ----- Update the informations
-            // Nothing can be modified
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privAddFileUsingTempFile()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public 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;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privCalculateStoredFilename()
-    // Description :
-    //   Based on file descriptor properties and global options, this method
-    //   calculate the filename that will be stored in the archive.
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-    {
-        $v_result = 1;
-
-        // ----- Working variables
-        $p_filename = $p_filedescr['filename'];
-        if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-            $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-        } else {
-            $p_add_dir = '';
-        }
-        if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-            $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-        } else {
-            $p_remove_dir = '';
-        }
-        if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-            $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        } else {
-            $p_remove_all_dir = 0;
-        }
-
-        // ----- Look for full name change
-        if (isset($p_filedescr['new_full_name'])) {
-            // ----- Remove drive letter if any
-            $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-
-        // ----- Look for path and/or short name change
-        } else {
-
-            // ----- Look for short name change
-            // Its when we cahnge just the filename but not the path
-            if (isset($p_filedescr['new_short_name'])) {
-                $v_path_info = pathinfo($p_filename);
-                $v_dir       = '';
-                if ($v_path_info['dirname'] != '') {
-                    $v_dir = $v_path_info['dirname'] . '/';
-                }
-                $v_stored_filename = $v_dir . $p_filedescr['new_short_name'];
-            } else {
-                // ----- Calculate the stored filename
-                $v_stored_filename = $p_filename;
-            }
-
-            // ----- Look for all path to remove
-            if ($p_remove_all_dir) {
-                $v_stored_filename = basename($p_filename);
-
-            // ----- Look for partial path remove
-            } elseif ($p_remove_dir != "") {
-                if (substr($p_remove_dir, -1) != '/') {
-                    $p_remove_dir .= "/";
-                }
-
-                if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) {
-
-                    if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) {
-                        $p_remove_dir = "./" . $p_remove_dir;
-                    }
-                    if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) {
-                        $p_remove_dir = substr($p_remove_dir, 2);
-                    }
-                }
-
-                $v_compare = PclZipUtilPathInclusion($p_remove_dir, $v_stored_filename);
-                if ($v_compare > 0) {
-                    if ($v_compare == 2) {
-                        $v_stored_filename = "";
-                    } else {
-                        $v_stored_filename = substr($v_stored_filename, strlen($p_remove_dir));
-                    }
-                }
-            }
-
-            // ----- 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;
-                }
-            }
-        }
-
-        // ----- Filename (reduce the path of stored name)
-        $v_stored_filename              = PclZipUtilPathReduction($v_stored_filename);
-        $p_filedescr['stored_filename'] = $v_stored_filename;
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privWriteFileHeader()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privWriteFileHeader(&$p_header)
-    {
-        $v_result = 1;
-
-        // ----- Store the offset position of the file
-        $p_header['offset'] = ftell($this->zip_fd);
-
-        // ----- Transform UNIX mtime to DOS format mdate/mtime
-        $v_date  = getdate($p_header['mtime']);
-        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
-        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
-
-        // ----- Packed data
-        $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len']);
-
-        // ----- Write the first 148 bytes of the header in the archive
-        fputs($this->zip_fd, $v_binary_data, 30);
-
-        // ----- Write the variable fields
-        if (strlen($p_header['stored_filename']) != 0) {
-            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-        }
-        if ($p_header['extra_len'] != 0) {
-            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privWriteCentralFileHeader()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privWriteCentralFileHeader(&$p_header)
-    {
-        $v_result = 1;
-
-        // TBC
-        //for (reset($p_header); $key = key($p_header); next($p_header)) {
-        //}
-
-        // ----- Transform UNIX mtime to DOS format mdate/mtime
-        $v_date  = getdate($p_header['mtime']);
-        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
-        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
-
-        // ----- Packed data
-        $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'], $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
-
-        // ----- Write the 42 bytes of the header in the zip file
-        fputs($this->zip_fd, $v_binary_data, 46);
-
-        // ----- Write the variable fields
-        if (strlen($p_header['stored_filename']) != 0) {
-            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-        }
-        if ($p_header['extra_len'] != 0) {
-            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-        }
-        if ($p_header['comment_len'] != 0) {
-            fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privWriteCentralHeader()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-    {
-        $v_result = 1;
-
-        // ----- Packed data
-        $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
-
-        // ----- Write the 22 bytes of the header in the zip file
-        fputs($this->zip_fd, $v_binary_data, 22);
-
-        // ----- Write the variable fields
-        if (strlen($p_comment) != 0) {
-            fputs($this->zip_fd, $p_comment, strlen($p_comment));
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privList()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privList(&$p_list)
-    {
-        $v_result = 1;
-
-        // ----- Magic quotes trick
-        $this->privDisableMagicQuotes();
-
-        // ----- Open the zip file
-        if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
-            // ----- Magic quotes trick
-            $this->privSwapBackMagicQuotes();
-
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Read the central directory informations
-        $v_central_dir = array();
-        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-        }
-
-        // ----- Go to beginning of Central Dir
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_central_dir['offset'])) {
-            $this->privSwapBackMagicQuotes();
-
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Read each entry
-        for ($i = 0; $i < $v_central_dir['entries']; $i++) {
-            // ----- Read the file header
-            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
-                $this->privSwapBackMagicQuotes();
-
-                return $v_result;
-            }
-            $v_header['index'] = $i;
-
-            // ----- Get the only interesting attributes
-            $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-            unset($v_header);
-        }
-
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        // ----- Magic quotes trick
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privConvertHeader2FileInfo()
-    // Description :
-    //   This function takes the file informations from the central directory
-    //   entries and extract the interesting parameters that will be given back.
-    //   The resulting file infos are set in the array $p_info
-    //     $p_info['filename'] : Filename with full path. Given by user (add),
-    //                           extracted in the filesystem (extract).
-    //     $p_info['stored_filename'] : Stored filename in the archive.
-    //     $p_info['size'] = Size of the file.
-    //     $p_info['compressed_size'] = Compressed size of the file.
-    //     $p_info['mtime'] = Last modification date of the file.
-    //     $p_info['comment'] = Comment associated with the file.
-    //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-    //     $p_info['status'] = status of the action on the file.
-    //     $p_info['crc'] = CRC of the file content.
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privConvertHeader2FileInfo($p_header, &$p_info)
-    {
-        $v_result = 1;
-
-        // ----- Get the interesting attributes
-        $v_temp_path               = PclZipUtilPathReduction($p_header['filename']);
-        $p_info['filename']        = $v_temp_path;
-        $v_temp_path               = PclZipUtilPathReduction($p_header['stored_filename']);
-        $p_info['stored_filename'] = $v_temp_path;
-        $p_info['size']            = $p_header['size'];
-        $p_info['compressed_size'] = $p_header['compressed_size'];
-        $p_info['mtime']           = $p_header['mtime'];
-        $p_info['comment']         = $p_header['comment'];
-        $p_info['folder']          = (($p_header['external'] & 0x00000010) == 0x00000010);
-        $p_info['index']           = $p_header['index'];
-        $p_info['status']          = $p_header['status'];
-        $p_info['crc']             = $p_header['crc'];
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privExtractByRule()
-    // Description :
-    //   Extract a file or directory depending of rules (by index, by name, ...)
-    // Parameters :
-    //   $p_file_list : An array where will be placed the properties of each
-    //                  extracted file
-    //   $p_path : Path to add while writing the extracted files
-    //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-    //                    extracted files. If the path does not match the file path,
-    //                    the file is extracted with its memorized path.
-    //                    $p_remove_path does not apply to 'list' mode.
-    //                    $p_path and $p_remove_path are commulative.
-    // Return Values :
-    //   1 on success,0 or less on error (see error code list)
-    // --------------------------------------------------------------------------------
-    public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-    {
-        $v_result = 1;
-
-        // ----- Magic quotes trick
-        $this->privDisableMagicQuotes();
-
-        // ----- Check the path
-        if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path, 1, 2) != ":/"))) {
-            $p_path = "./" . $p_path;
-        }
-
-        // ----- Reduce the path last (and duplicated) '/'
-        if (($p_path != "./") && ($p_path != "/")) {
-            // ----- Look for the path end '/'
-            while (substr($p_path, -1) == "/") {
-                $p_path = substr($p_path, 0, strlen($p_path) - 1);
-            }
-        }
-
-        // ----- Look for path to remove format (should end by /)
-        if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) {
-            $p_remove_path .= '/';
-        }
-        $p_remove_path_size = strlen($p_remove_path);
-
-        // ----- Open the zip file
-        if (($v_result = $this->privOpenFd('rb')) != 1) {
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-        }
-
-        // ----- Read the central directory informations
-        $v_central_dir = array();
-        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-        }
-
-        // ----- Start at beginning of Central Dir
-        $v_pos_entry = $v_central_dir['offset'];
-
-        // ----- Read each entry
-        $j_start = 0;
-        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
-
-            // ----- Read next Central dir entry
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd, $v_pos_entry)) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $this->privSwapBackMagicQuotes();
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Read the file header
-            $v_header = array();
-            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $this->privSwapBackMagicQuotes();
-
-                return $v_result;
-            }
-
-            // ----- Store the index
-            $v_header['index'] = $i;
-
-            // ----- Store the file position
-            $v_pos_entry = ftell($this->zip_fd);
-
-            // ----- Look for the specific extract rules
-            $v_extract = false;
-
-            // ----- Look for extract by name rule
-            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-                // ----- Look if the filename is in the list
-                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-
-                    // ----- Look for a directory
-                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                        // ----- Look if the directory is in the filename path
-                        if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                            $v_extract = true;
-                        }
-
-                    // ----- Look for a filename
-                    } elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                        $v_extract = true;
-                    }
-                }
-            // ----- Look for extract by ereg rule
-            // ereg() is deprecated with PHP 5.3
-            /*
-            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-            $v_extract = true;
-            }
-            }
-            */
-
-            // ----- Look for extract by preg rule
-            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-                    $v_extract = true;
-                }
-
-            // ----- Look for extract by index rule
-            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-                // ----- Look if the index is in the list
-                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                        $v_extract = true;
-                    }
-                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                        $j_start = $j + 1;
-                    }
-
-                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
-                        break;
-                    }
-                }
-
-            // ----- Look for no rule, which means extract all the archive
-            } else {
-                $v_extract = true;
-            }
-
-            // ----- Check compression method
-            if (($v_extract) && (($v_header['compression'] != 8) && ($v_header['compression'] != 0))) {
-                $v_header['status'] = 'unsupported_compression';
-
-                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
-
-                    $this->privSwapBackMagicQuotes();
-
-                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '" . $v_header['stored_filename'] . "' is " . "compressed by an unsupported compression " . "method (" . $v_header['compression'] . ") ");
-
-                    return PclZip::errorCode();
-                }
-            }
-
-            // ----- Check encrypted files
-            if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-                $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)) {
-
-                    $this->privSwapBackMagicQuotes();
-
-                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for " . " filename '" . $v_header['stored_filename'] . "'");
-
-                    return PclZip::errorCode();
-                }
-            }
-
-            // ----- Look for real extraction
-            if (($v_extract) && ($v_header['status'] != 'ok')) {
-                $v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++]);
-                if ($v_result != 1) {
-                    $this->privCloseFd();
-                    $this->privSwapBackMagicQuotes();
-
-                    return $v_result;
-                }
-
-                $v_extract = false;
-            }
-
-            // ----- Look for real extraction
-            if ($v_extract) {
-
-                // ----- Go to the file position
-                @rewind($this->zip_fd);
-                if (@fseek($this->zip_fd, $v_header['offset'])) {
-                    // ----- Close the zip file
-                    $this->privCloseFd();
-
-                    $this->privSwapBackMagicQuotes();
-
-                    // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                    // ----- Return
-                    return PclZip::errorCode();
-                }
-
-                // ----- 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, $p_options);
-                    if ($v_result1 < 1) {
-                        $this->privCloseFd();
-                        $this->privSwapBackMagicQuotes();
-
-                        return $v_result1;
-                    }
-
-                    // ----- Get the only interesting attributes
-                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
-                        // ----- Close the zip file
-                        $this->privCloseFd();
-                        $this->privSwapBackMagicQuotes();
-
-                        return $v_result;
-                    }
-
-                    // ----- Set the file content
-                    $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-                    // ----- Next extracted file
-                    $v_nb_extracted++;
-
-                    // ----- Look for user callback abort
-                    if ($v_result1 == 2) {
-                        break;
-                    }
-
-                // ----- Look for extraction in standard output
-                } elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-                    // ----- Extracting the file in standard output
-                    $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-                    if ($v_result1 < 1) {
-                        $this->privCloseFd();
-                        $this->privSwapBackMagicQuotes();
-
-                        return $v_result1;
-                    }
-
-                    // ----- Get the only interesting attributes
-                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-                        $this->privCloseFd();
-                        $this->privSwapBackMagicQuotes();
-
-                        return $v_result;
-                    }
-
-                    // ----- Look for user callback abort
-                    if ($v_result1 == 2) {
-                        break;
-                    }
-
-                // ----- Look for normal extraction
-                } else {
-                    // ----- Extracting the file
-                    $v_result1 = $this->privExtractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_options);
-                    if ($v_result1 < 1) {
-                        $this->privCloseFd();
-                        $this->privSwapBackMagicQuotes();
-
-                        return $v_result1;
-                    }
-
-                    // ----- Get the only interesting attributes
-                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-                        // ----- Close the zip file
-                        $this->privCloseFd();
-                        $this->privSwapBackMagicQuotes();
-
-                        return $v_result;
-                    }
-
-                    // ----- Look for user callback abort
-                    if ($v_result1 == 2) {
-                        break;
-                    }
-                }
-            }
-        }
-
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privExtractFile()
-    // Description :
-    // Parameters :
-    // Return Values :
-    //
-    // 1 : ... ?
-    // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-    // --------------------------------------------------------------------------------
-    public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-    {
-        $v_result = 1;
-
-        // ----- Read the file header
-        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Check that the file header is coherent with $p_entry info
-        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-            // TBC
-        }
-
-        // ----- Look for all path to remove
-        if ($p_remove_all_path == true) {
-            // ----- Look for folder entry that not need to be extracted
-            if (($p_entry['external'] & 0x00000010) == 0x00000010) {
-
-                $p_entry['status'] = "filtered";
-
-                return $v_result;
-            }
-
-            // ----- Get the basename of the path
-            $p_entry['filename'] = basename($p_entry['filename']);
-
-        // ----- Look for path to remove
-        } elseif ($p_remove_path != "") {
-            if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2) {
-
-                // ----- Change the file status
-                $p_entry['status'] = "filtered";
-
-                // ----- Return
-                return $v_result;
-            }
-
-            $p_remove_path_size = strlen($p_remove_path);
-            if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) {
-
-                // ----- Remove the path
-                $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-            }
-        }
-
-        // ----- Add the path
-        if ($p_path != '') {
-            $p_entry['filename'] = $p_path . "/" . $p_entry['filename'];
-        }
-
-        // ----- Check a base_dir_restriction
-        if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-            $v_inclusion = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], $p_entry['filename']);
-            if ($v_inclusion == 0) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '" . $p_entry['filename'] . "' is " . "outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-                return PclZip::errorCode();
-            }
-        }
-
-        // ----- 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') {
-
-            // ----- Look for specific actions while the file exist
-            if (file_exists($p_entry['filename'])) {
-
-                // ----- Look if file is a directory
-                if (is_dir($p_entry['filename'])) {
-
-                    // ----- Change the file status
-                    $p_entry['status'] = "already_a_directory";
-
-                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-                    // For historical reason first PclZip implementation does not stop
-                    // when this kind of error occurs.
-                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
-
-                        PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '" . $p_entry['filename'] . "' is " . "already used by an existing directory");
-
-                        return PclZip::errorCode();
-                    }
-
-                // ----- Look if file is write protected
-                } elseif (!is_writeable($p_entry['filename'])) {
-
-                    // ----- Change the file status
-                    $p_entry['status'] = "write_protected";
-
-                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-                    // For historical reason first PclZip implementation does not stop
-                    // when this kind of error occurs.
-                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
-
-                        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '" . $p_entry['filename'] . "' exists " . "and is write protected");
-
-                        return PclZip::errorCode();
-                    }
-
-                // ----- Look if the extracted file is older
-                } elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
-                    // ----- Change the file status
-                    if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER])) && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
-                    } else {
-                        $p_entry['status'] = "newer_exist";
-
-                        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-                        // For historical reason first PclZip implementation does not stop
-                        // when this kind of error occurs.
-                        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
-
-                            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '" . $p_entry['filename'] . "' exists " . "and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                            return PclZip::errorCode();
-                        }
-                    }
-                } else {
-                }
-
-            // ----- Check the directory availability and create it if necessary
-            } else {
-                if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
-                    $v_dir_to_check = $p_entry['filename'];
-                } elseif (!strstr($p_entry['filename'], "/")) {
-                    $v_dir_to_check = "";
-                } else {
-                    $v_dir_to_check = dirname($p_entry['filename']);
-                }
-
-                if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
-
-                    // ----- Change the file status
-                    $p_entry['status'] = "path_creation_fail";
-
-                    // ----- Return
-                    //return $v_result;
-                    $v_result = 1;
-                }
-            }
-        }
-
-        // ----- Look if extraction should be done
-        if ($p_entry['status'] == 'ok') {
-
-            // ----- Do the extraction (if not a folder)
-            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
-                // ----- Look for not compressed file
-                if ($p_entry['compression'] == 0) {
-
-                    // ----- Opening destination file
-                    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-
-                        // ----- Change the file status
-                        $p_entry['status'] = "write_error";
-
-                        // ----- Return
-                        return $v_result;
-                    }
-
-                    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-                    $v_size = $p_entry['compressed_size'];
-                    while ($v_size != 0) {
-                        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-                        $v_buffer    = @fread($this->zip_fd, $v_read_size);
-                        /* Try to speed up the code
-                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-                        @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-                        */
-                        @fwrite($v_dest_file, $v_buffer, $v_read_size);
-                        $v_size -= $v_read_size;
-                    }
-
-                    // ----- Closing the destination file
-                    fclose($v_dest_file);
-
-                    // ----- Change the file mtime
-                    touch($p_entry['filename'], $p_entry['mtime']);
-
-                } else {
-                    // ----- TBC
-                    // Need to be finished
-                    if (($p_entry['flag'] & 1) == 1) {
-                        PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
-
-                        return PclZip::errorCode();
-                    }
-
-                    // ----- 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 {
-
-                        // ----- 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) {
-
-                            // ----- Change the file status
-                            // TBC
-                            $p_entry['status'] = "error";
-
-                            return $v_result;
-                        }
-
-                        // ----- Opening destination file
-                        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-
-                            // ----- Change the file status
-                            $p_entry['status'] = "write_error";
-
-                            return $v_result;
-                        }
-
-                        // ----- Write the uncompressed data
-                        @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-                        unset($v_file_content);
-
-                        // ----- Closing the destination file
-                        @fclose($v_dest_file);
-
-                    }
-
-                    // ----- Change the file mtime
-                    @touch($p_entry['filename'], $p_entry['mtime']);
-                }
-
-                // ----- Look for chmod option
-                if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-
-                    // ----- Change the mode of the file
-                    @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-                }
-
-            }
-        }
-
-        // ----- Change 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);
-
-            // ----- 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);
-
-            // ----- Look for abort result
-            if ($v_result == 2) {
-                $v_result = PCLZIP_ERR_USER_ABORTED;
-            }
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privExtractFileUsingTempFile()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public 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;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privExtractFileInOutput()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privExtractFileInOutput(&$p_entry, &$p_options)
-    {
-        $v_result = 1;
-
-        // ----- Read the file header
-        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-            return $v_result;
-        }
-
-        // ----- Check that the file header is coherent with $p_entry info
-        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-            // TBC
-        }
-
-        // ----- 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'];
-        }
-
-        // ----- Trace
-
-        // ----- Look if extraction should be done
-        if ($p_entry['status'] == 'ok') {
-
-            // ----- Do the extraction (if not a folder)
-            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
-                // ----- Look for not compressed file
-                if ($p_entry['compressed_size'] == $p_entry['size']) {
-
-                    // ----- Read the file in a buffer (one shot)
-                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-                    // ----- Send the file to the output
-                    echo $v_buffer;
-                    unset($v_buffer);
-                } else {
-
-                    // ----- Read the compressed file in a buffer (one shot)
-                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-                    // ----- Decompress the file
-                    $v_file_content = gzinflate($v_buffer);
-                    unset($v_buffer);
-
-                    // ----- Send the file to the output
-                    echo $v_file_content;
-                    unset($v_file_content);
-                }
-            }
-        }
-
-        // ----- 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);
-
-            // ----- 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);
-
-            // ----- Look for abort result
-            if ($v_result == 2) {
-                $v_result = PCLZIP_ERR_USER_ABORTED;
-            }
-        }
-
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privExtractFileAsString()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
-    {
-        $v_result = 1;
-
-        // ----- Read the file header
-        $v_header = array();
-        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Check that the file header is coherent with $p_entry info
-        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-            // TBC
-        }
-
-        // ----- Look for pre-extract callback
-        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-            // ----- Generate a local information
-            $v_local_header = array();
-            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-            // ----- Call the callback
-            // Here I do not use call_user_func() because I need to send a reference to the
-            // header.
-            //      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)) {
-                // ----- Look for not compressed file
-                //      if ($p_entry['compressed_size'] == $p_entry['size'])
-                if ($p_entry['compression'] == 0) {
-
-                    // ----- Reading the file
-                    $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-                } else {
-
-                    // ----- Reading the file
-                    $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-                    // ----- Decompress the file
-                    if (($p_string = @gzinflate($v_data)) === false) {
-                        // TBC
-                    }
-                }
-
-                // ----- Trace
-            } 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
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privReadFileHeader()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privReadFileHeader(&$p_header)
-    {
-        $v_result = 1;
-
-        // ----- Read the 4 bytes signature
-        $v_binary_data = @fread($this->zip_fd, 4);
-        $v_data        = unpack('Vid', $v_binary_data);
-
-        // ----- Check signature
-        if ($v_data['id'] != 0x04034b50) {
-
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Read the first 42 bytes of the header
-        $v_binary_data = fread($this->zip_fd, 26);
-
-        // ----- Look for invalid block size
-        if (strlen($v_binary_data) != 26) {
-            $p_header['filename'] = "";
-            $p_header['status']   = "invalid_header";
-
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Extract the values
-        $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-        // ----- Get filename
-        $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-
-        // ----- Get extra_fields
-        if ($v_data['extra_len'] != 0) {
-            $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-        } else {
-            $p_header['extra'] = '';
-        }
-
-        // ----- Extract properties
-        $p_header['version_extracted'] = $v_data['version'];
-        $p_header['compression']       = $v_data['compression'];
-        $p_header['size']              = $v_data['size'];
-        $p_header['compressed_size']   = $v_data['compressed_size'];
-        $p_header['crc']               = $v_data['crc'];
-        $p_header['flag']              = $v_data['flag'];
-        $p_header['filename_len']      = $v_data['filename_len'];
-
-        // ----- Recuperate date in UNIX format
-        $p_header['mdate'] = $v_data['mdate'];
-        $p_header['mtime'] = $v_data['mtime'];
-        if ($p_header['mdate'] && $p_header['mtime']) {
-            // ----- Extract time
-            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
-            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
-            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
-
-            // ----- Extract date
-            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-            $v_day   = $p_header['mdate'] & 0x001F;
-
-            // ----- Get UNIX date format
-            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-        } else {
-            $p_header['mtime'] = time();
-        }
-
-        // TBC
-        //for (reset($v_data); $key = key($v_data); next($v_data)) {
-        //}
-
-        // ----- Set the stored filename
-        $p_header['stored_filename'] = $p_header['filename'];
-
-        // ----- Set the status field
-        $p_header['status'] = "ok";
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privReadCentralFileHeader()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privReadCentralFileHeader(&$p_header)
-    {
-        $v_result = 1;
-
-        // ----- Read the 4 bytes signature
-        $v_binary_data = @fread($this->zip_fd, 4);
-        $v_data        = unpack('Vid', $v_binary_data);
-
-        // ----- Check signature
-        if ($v_data['id'] != 0x02014b50) {
-
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Read the first 42 bytes of the header
-        $v_binary_data = fread($this->zip_fd, 42);
-
-        // ----- Look for invalid block size
-        if (strlen($v_binary_data) != 42) {
-            $p_header['filename'] = "";
-            $p_header['status']   = "invalid_header";
-
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Extract the values
-        $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-        // ----- Get filename
-        if ($p_header['filename_len'] != 0) {
-            $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-        } else {
-            $p_header['filename'] = '';
-        }
-
-        // ----- Get extra
-        if ($p_header['extra_len'] != 0) {
-            $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-        } else {
-            $p_header['extra'] = '';
-        }
-
-        // ----- Get comment
-        if ($p_header['comment_len'] != 0) {
-            $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-        } else {
-            $p_header['comment'] = '';
-        }
-
-        // ----- Extract properties
-
-        // ----- Recuperate date in UNIX format
-        //if ($p_header['mdate'] && $p_header['mtime'])
-        // TBC : bug : this was ignoring time with 0/0/0
-        if (1) {
-            // ----- Extract time
-            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
-            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
-            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
-
-            // ----- Extract date
-            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-            $v_day   = $p_header['mdate'] & 0x001F;
-
-            // ----- Get UNIX date format
-            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-        } else {
-            $p_header['mtime'] = time();
-        }
-
-        // ----- Set the stored filename
-        $p_header['stored_filename'] = $p_header['filename'];
-
-        // ----- Set default status to ok
-        $p_header['status'] = 'ok';
-
-        // ----- Look if it is a directory
-        if (substr($p_header['filename'], -1) == '/') {
-            //$p_header['external'] = 0x41FF0010;
-            $p_header['external'] = 0x00000010;
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privCheckFileHeaders()
-    // Description :
-    // Parameters :
-    // Return Values :
-    //   1 on success,
-    //   0 on error;
-    // --------------------------------------------------------------------------------
-    public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-    {
-        $v_result = 1;
-
-        // ----- Check the static values
-        // TBC
-        if ($p_local_header['filename'] != $p_central_header['filename']) {
-        }
-        if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-        }
-        if ($p_local_header['flag'] != $p_central_header['flag']) {
-        }
-        if ($p_local_header['compression'] != $p_central_header['compression']) {
-        }
-        if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-        }
-        if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-        }
-
-        // ----- Look for flag bit 3
-        if (($p_local_header['flag'] & 8) == 8) {
-            $p_local_header['size']            = $p_central_header['size'];
-            $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-            $p_local_header['crc']             = $p_central_header['crc'];
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privReadEndCentralDir()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privReadEndCentralDir(&$p_central_dir)
-    {
-        $v_result = 1;
-
-        // ----- Go to the end of the zip file
-        $v_size = filesize($this->zipname);
-        @fseek($this->zip_fd, $v_size);
-        if (@ftell($this->zip_fd) != $v_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- First try : look if this is an archive with no commentaries (most of the time)
-        // in this case the end of central dir is at 22 bytes of the file end
-        $v_found = 0;
-        if ($v_size > 26) {
-            @fseek($this->zip_fd, $v_size - 22);
-            if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22)) {
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Read for bytes
-            $v_binary_data = @fread($this->zip_fd, 4);
-            $v_data        = @unpack('Vid', $v_binary_data);
-
-            // ----- Check signature
-            if ($v_data['id'] == 0x06054b50) {
-                $v_found = 1;
-            }
-
-            $v_pos = ftell($this->zip_fd);
-        }
-
-        // ----- Go back to the maximum possible size of the Central Dir End Record
-        if (!$v_found) {
-            $v_maximum_size = 65557; // 0xFFFF + 22;
-            if ($v_maximum_size > $v_size) {
-                $v_maximum_size = $v_size;
-            }
-            @fseek($this->zip_fd, $v_size - $v_maximum_size);
-            if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size)) {
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Read byte per byte in order to find the signature
-            $v_pos   = ftell($this->zip_fd);
-            $v_bytes = 0x00000000;
-            while ($v_pos < $v_size) {
-                // ----- Read a byte
-                $v_byte = @fread($this->zip_fd, 1);
-
-                // -----  Add the byte
-                //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-                // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
-                // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-                $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
-
-                // ----- Compare the bytes
-                if ($v_bytes == 0x504b0506) {
-                    $v_pos++;
-                    break;
-                }
-
-                $v_pos++;
-            }
-
-            // ----- Look if not found end of central dir
-            if ($v_pos == $v_size) {
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-        }
-
-        // ----- Read the first 18 bytes of the header
-        $v_binary_data = fread($this->zip_fd, 18);
-
-        // ----- Look for invalid block size
-        if (strlen($v_binary_data) != 18) {
-
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : " . strlen($v_binary_data));
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Extract the values
-        $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-        // ----- Check the global size
-        if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-
-            // ----- Removed in release 2.2 see readme file
-            // The check of the file size is a little too strict.
-            // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-            // While decrypted, zip has training 0 bytes
-            if (0) {
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'The central dir is not at the end of the archive.' . ' Some trailing bytes exists after the archive.');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-        }
-
-        // ----- Get comment
-        if ($v_data['comment_size'] != 0) {
-            $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-        } else {
-            $p_central_dir['comment'] = '';
-        }
-
-        $p_central_dir['entries']      = $v_data['entries'];
-        $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-        $p_central_dir['offset']       = $v_data['offset'];
-        $p_central_dir['size']         = $v_data['size'];
-        $p_central_dir['disk']         = $v_data['disk'];
-        $p_central_dir['disk_start']   = $v_data['disk_start'];
-
-        // TBC
-        //for (reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-        //}
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privDeleteByRule()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privDeleteByRule(&$p_result_list, &$p_options)
-    {
-        $v_result      = 1;
-        $v_list_detail = array();
-
-        // ----- Open the zip file
-        if (($v_result = $this->privOpenFd('rb')) != 1) {
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Read the central directory informations
-        $v_central_dir = array();
-        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
-            $this->privCloseFd();
-
-            return $v_result;
-        }
-
-        // ----- Go to beginning of File
-        @rewind($this->zip_fd);
-
-        // ----- Scan all the files
-        // ----- Start at beginning of Central Dir
-        $v_pos_entry = $v_central_dir['offset'];
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_pos_entry)) {
-            // ----- Close the zip file
-            $this->privCloseFd();
-
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Read each entry
-        $v_header_list = array();
-        $j_start       = 0;
-        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
-
-            // ----- Read the file header
-            $v_header_list[$v_nb_extracted] = array();
-            if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-
-                return $v_result;
-            }
-
-            // ----- Store the index
-            $v_header_list[$v_nb_extracted]['index'] = $i;
-
-            // ----- Look for the specific extract rules
-            $v_found = false;
-
-            // ----- Look for extract by name rule
-            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-                // ----- Look if the filename is in the list
-                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-                    // ----- Look for a directory
-                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                        // ----- Look if the directory is in the filename path
-                        if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                            $v_found = true;
-                        } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                            $v_found = true;
-                        }
-
-                    // ----- Look for a filename
-                    } elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                        $v_found = true;
-                    }
-                }
-
-            // ----- Look for extract by ereg rule
-            // ereg() is deprecated with PHP 5.3
-            /*
-            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-            $v_found = true;
-            }
-            }
-            */
-
-            // ----- Look for extract by preg rule
-            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-                    $v_found = true;
-                }
-
-            // ----- Look for extract by index rule
-            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-                // ----- Look if the index is in the list
-                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-
-                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                        $v_found = true;
-                    }
-                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                        $j_start = $j + 1;
-                    }
-
-                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
-                        break;
-                    }
-                }
-            } else {
-                $v_found = true;
-            }
-
-            // ----- Look for deletion
-            if ($v_found) {
-                unset($v_header_list[$v_nb_extracted]);
-            } else {
-                $v_nb_extracted++;
-            }
-        }
-
-        // ----- Look if something need to be deleted
-        if ($v_nb_extracted > 0) {
-
-            // ----- Creates a temporay file
-            $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
-
-            // ----- Creates a temporary zip archive
-            $v_temp_zip = new PclZip($v_zip_temp_name);
-
-            // ----- Open the temporary zip file in write mode
-            if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-                $this->privCloseFd();
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Look which file need to be kept
-            for ($i = 0; $i < sizeof($v_header_list); $i++) {
-
-                // ----- Calculate the position of the header
-                @rewind($this->zip_fd);
-                if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
-                    // ----- Close the zip file
-                    $this->privCloseFd();
-                    $v_temp_zip->privCloseFd();
-                    @unlink($v_zip_temp_name);
-
-                    // ----- Error log
-                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                    // ----- Return
-                    return PclZip::errorCode();
-                }
-
-                // ----- Read the file header
-                $v_local_header = array();
-                if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                    // ----- Close the zip file
-                    $this->privCloseFd();
-                    $v_temp_zip->privCloseFd();
-                    @unlink($v_zip_temp_name);
-
-                    // ----- Return
-                    return $v_result;
-                }
-
-                // ----- Check that local file header is same as central file header
-                if ($this->privCheckFileHeaders($v_local_header, $v_header_list[$i]) != 1) {
-                    // TBC
-                }
-                unset($v_local_header);
-
-                // ----- Write the file header
-                if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                    // ----- Close the zip file
-                    $this->privCloseFd();
-                    $v_temp_zip->privCloseFd();
-                    @unlink($v_zip_temp_name);
-
-                    // ----- Return
-                    return $v_result;
-                }
-
-                // ----- Read/write the data block
-                if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                    // ----- Close the zip file
-                    $this->privCloseFd();
-                    $v_temp_zip->privCloseFd();
-                    @unlink($v_zip_temp_name);
-
-                    // ----- Return
-                    return $v_result;
-                }
-            }
-
-            // ----- Store the offset of the central dir
-            $v_offset = @ftell($v_temp_zip->zip_fd);
-
-            // ----- Re-Create the Central Dir files header
-            for ($i = 0; $i < sizeof($v_header_list); $i++) {
-                // ----- Create the file header
-                if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                    $v_temp_zip->privCloseFd();
-                    $this->privCloseFd();
-                    @unlink($v_zip_temp_name);
-
-                    // ----- Return
-                    return $v_result;
-                }
-
-                // ----- Transform the header to a 'usable' info
-                $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-            }
-
-            // ----- Zip file comment
-            $v_comment = '';
-            if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-                $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-            }
-
-            // ----- Calculate the size of the central header
-            $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
-
-            // ----- Create the central dir footer
-            if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-                // ----- Reset the file list
-                unset($v_header_list);
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Close
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-
-            // ----- Delete the zip file
-            // TBC : I should test the result ...
-            @unlink($this->zipname);
-
-            // ----- Rename the temporary file
-            // TBC : I should test the result ...
-            //@rename($v_zip_temp_name, $this->zipname);
-            PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-            // ----- Destroy the temporary archive
-            unset($v_temp_zip);
-
-        // ----- Remove every files : reset the file
-        } elseif ($v_central_dir['entries'] != 0) {
-            $this->privCloseFd();
-
-            if (($v_result = $this->privOpenFd('wb')) != 1) {
-                return $v_result;
-            }
-
-            if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-                return $v_result;
-            }
-
-            $this->privCloseFd();
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privDirCheck()
-    // Description :
-    //   Check if a directory exists, if not it creates it and all the parents directory
-    //   which may be useful.
-    // Parameters :
-    //   $p_dir : Directory path to check.
-    // Return Values :
-    //    1 : OK
-    //   -1 : Unable to create directory
-    // --------------------------------------------------------------------------------
-    public function privDirCheck($p_dir, $p_is_dir = false)
-    {
-        $v_result = 1;
-
-        // ----- Remove the final '/'
-        if (($p_is_dir) && (substr($p_dir, -1) == '/')) {
-            $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
-        }
-
-        // ----- Check the directory availability
-        if ((is_dir($p_dir)) || ($p_dir == "")) {
-            return 1;
-        }
-
-        // ----- Extract parent directory
-        $p_parent_dir = dirname($p_dir);
-
-        // ----- Just a check
-        if ($p_parent_dir != $p_dir) {
-            // ----- Look for parent directory
-            if ($p_parent_dir != "") {
-                if (($v_result = $this->privDirCheck($p_parent_dir)) != 1) {
-                    return $v_result;
-                }
-            }
-        }
-
-        // ----- Create the directory
-        if (!@mkdir($p_dir, 0777)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privMerge()
-    // Description :
-    //   If $p_archive_to_add does not exist, the function exit with a success result.
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privMerge(&$p_archive_to_add)
-    {
-        $v_result = 1;
-
-        // ----- Look if the archive_to_add exists
-        if (!is_file($p_archive_to_add->zipname)) {
-
-            // ----- Nothing to merge, so merge is a success
-            $v_result = 1;
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Look if the archive exists
-        if (!is_file($this->zipname)) {
-
-            // ----- Do a duplicate
-            $v_result = $this->privDuplicate($p_archive_to_add->zipname);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Open the zip file
-        if (($v_result = $this->privOpenFd('rb')) != 1) {
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Read the central directory informations
-        $v_central_dir = array();
-        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
-            $this->privCloseFd();
-
-            return $v_result;
-        }
-
-        // ----- Go to beginning of File
-        @rewind($this->zip_fd);
-
-        // ----- Open the archive_to_add file
-        if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Read the central directory informations
-        $v_central_dir_to_add = array();
-        if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1) {
-            $this->privCloseFd();
-            $p_archive_to_add->privCloseFd();
-
-            return $v_result;
-        }
-
-        // ----- Go to beginning of File
-        @rewind($p_archive_to_add->zip_fd);
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
-
-        // ----- Open the temporary file in write mode
-        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
-            $this->privCloseFd();
-            $p_archive_to_add->privCloseFd();
-
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Copy the files from the archive to the temporary file
-        // TBC : Here I should better append the file and go back to erase the central dir
-        $v_size = $v_central_dir['offset'];
-        while ($v_size != 0) {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = fread($this->zip_fd, $v_read_size);
-            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-        }
-
-        // ----- Copy the files from the archive_to_add into the temporary file
-        $v_size = $v_central_dir_to_add['offset'];
-        while ($v_size != 0) {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = fread($p_archive_to_add->zip_fd, $v_read_size);
-            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_zip_temp_fd);
-
-        // ----- Copy the block of file headers from the old archive
-        $v_size = $v_central_dir['size'];
-        while ($v_size != 0) {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = @fread($this->zip_fd, $v_read_size);
-            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-        }
-
-        // ----- Copy the block of file headers from the archive_to_add
-        $v_size = $v_central_dir_to_add['size'];
-        while ($v_size != 0) {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = @fread($p_archive_to_add->zip_fd, $v_read_size);
-            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-        }
-
-        // ----- Merge the file comments
-        $v_comment = $v_central_dir['comment'] . ' ' . $v_central_dir_to_add['comment'];
-
-        // ----- Calculate the size of the (new) central header
-        $v_size = @ftell($v_zip_temp_fd) - $v_offset;
-
-        // ----- Swap the file descriptor
-        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-        // the following methods on the temporary fil and not the real archive fd
-        $v_swap        = $this->zip_fd;
-        $this->zip_fd  = $v_zip_temp_fd;
-        $v_zip_temp_fd = $v_swap;
-
-        // ----- Create the central dir footer
-        if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
-            $this->privCloseFd();
-            $p_archive_to_add->privCloseFd();
-            @fclose($v_zip_temp_fd);
-            $this->zip_fd = null;
-
-            // ----- Reset the file list
-            unset($v_header_list);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Swap back the file descriptor
-        $v_swap        = $this->zip_fd;
-        $this->zip_fd  = $v_zip_temp_fd;
-        $v_zip_temp_fd = $v_swap;
-
-        // ----- Close
-        $this->privCloseFd();
-        $p_archive_to_add->privCloseFd();
-
-        // ----- Close the temporary file
-        @fclose($v_zip_temp_fd);
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privDuplicate()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privDuplicate($p_archive_filename)
-    {
-        $v_result = 1;
-
-        // ----- Look if the $p_archive_filename exists
-        if (!is_file($p_archive_filename)) {
-
-            // ----- Nothing to duplicate, so duplicate is a success.
-            $v_result = 1;
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Open the zip file
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Open the temporary file in write mode
-        if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
-            $this->privCloseFd();
-
-            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
-
-            // ----- Return
-            return PclZip::errorCode();
-        }
-
-        // ----- Copy the files from the archive to the temporary file
-        // TBC : Here I should better append the file and go back to erase the central dir
-        $v_size = filesize($p_archive_filename);
-        while ($v_size != 0) {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = fread($v_zip_temp_fd, $v_read_size);
-            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-        }
-
-        // ----- Close
-        $this->privCloseFd();
-
-        // ----- Close the temporary file
-        @fclose($v_zip_temp_fd);
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privErrorLog()
-    // Description :
-    // Parameters :
-    // --------------------------------------------------------------------------------
-    public function privErrorLog($p_error_code = 0, $p_error_string = '')
-    {
-        if (PCLZIP_ERROR_EXTERNAL == 1) {
-            PclError($p_error_code, $p_error_string);
-        } else {
-            $this->error_code   = $p_error_code;
-            $this->error_string = $p_error_string;
-        }
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privErrorReset()
-    // Description :
-    // Parameters :
-    // --------------------------------------------------------------------------------
-    public function privErrorReset()
-    {
-        if (PCLZIP_ERROR_EXTERNAL == 1) {
-            PclErrorReset();
-        } else {
-            $this->error_code   = 0;
-            $this->error_string = '';
-        }
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privDisableMagicQuotes()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privDisableMagicQuotes()
-    {
-        $v_result = 1;
-
-        // ----- Look if function exists
-        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
-            return $v_result;
-        }
-
-        // ----- Look if already done
-        if ($this->magic_quotes_status != -1) {
-            return $v_result;
-        }
-
-        // ----- Get and memorize the magic_quote value
-        $this->magic_quotes_status = @get_magic_quotes_runtime();
-
-        // ----- Disable magic_quotes
-        if ($this->magic_quotes_status == 1) {
-            @set_magic_quotes_runtime(0);
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-
-    // --------------------------------------------------------------------------------
-    // Function : privSwapBackMagicQuotes()
-    // Description :
-    // Parameters :
-    // Return Values :
-    // --------------------------------------------------------------------------------
-    public function privSwapBackMagicQuotes()
-    {
-        $v_result = 1;
-
-        // ----- Look if function exists
-        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
-            return $v_result;
-        }
-
-        // ----- Look if something to do
-        if ($this->magic_quotes_status != -1) {
-            return $v_result;
-        }
-
-        // ----- Swap back magic_quotes
-        if ($this->magic_quotes_status == 1) {
-            @set_magic_quotes_runtime($this->magic_quotes_status);
-        }
-
-        // ----- Return
-        return $v_result;
-    }
-    // --------------------------------------------------------------------------------
-}
-
-// End of class
-// --------------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------------
-// Function : PclZipUtilPathReduction()
-// Description :
-// Parameters :
-// Return Values :
-// --------------------------------------------------------------------------------
-function PclZipUtilPathReduction($p_dir)
-{
-    $v_result = "";
-
-    // ----- Look for not empty path
-    if ($p_dir != "") {
-        // ----- Explode path by directory names
-        $v_list = explode("/", $p_dir);
-
-        // ----- Study directories from last to first
-        $v_skip = 0;
-        for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
-            // ----- Look for current path
-            if ($v_list[$i] == ".") {
-                // ----- Ignore this directory
-                // Should be the first $i=0, but no check is done
-            } elseif ($v_list[$i] == "..") {
-                $v_skip++;
-            } elseif ($v_list[$i] == "") {
-                // ----- First '/' i.e. root slash
-                if ($i == 0) {
-                    $v_result = "/" . $v_result;
-                    if ($v_skip > 0) {
-                        // ----- It is an invalid path, so the path is not modified
-                        // TBC
-                        $v_result = $p_dir;
-                        $v_skip   = 0;
-                    }
-
-                // ----- Last '/' i.e. indicates a directory
-                } elseif ($i == (sizeof($v_list) - 1)) {
-                    $v_result = $v_list[$i];
-
-                // ----- Double '/' inside the path
-                } else {
-                    // ----- Ignore only the double '//' in path,
-                    // but not the first and last '/'
-                }
-            } else {
-                // ----- Look for item to skip
-                if ($v_skip > 0) {
-                    $v_skip--;
-                } else {
-                    $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? "/" . $v_result : "");
-                }
-            }
-        }
-
-        // ----- Look for skip
-        if ($v_skip > 0) {
-            while ($v_skip > 0) {
-                $v_result = '../' . $v_result;
-                $v_skip--;
-            }
-        }
-    }
-
-    // ----- Return
-    return $v_result;
-}
-// --------------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------------
-// Function : PclZipUtilPathInclusion()
-// Description :
-//   This function indicates if the path $p_path is under the $p_dir tree. Or,
-//   said in an other way, if the file or sub-dir $p_path is inside the dir
-//   $p_dir.
-//   The function indicates also if the path is exactly the same as the dir.
-//   This function supports path with duplicated '/' like '//', but does not
-//   support '.' or '..' statements.
-// Parameters :
-// Return Values :
-//   0 if $p_path is not inside directory $p_dir
-//   1 if $p_path is inside directory $p_dir
-//   2 if $p_path is exactly the same as $p_dir
-// --------------------------------------------------------------------------------
-function PclZipUtilPathInclusion($p_dir, $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);
-    }
-    if (($p_path == '.') || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
-        $p_path = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_path, 1);
-    }
-
-    // ----- Explode dir and path by directory separator
-    $v_list_dir       = explode("/", $p_dir);
-    $v_list_dir_size  = sizeof($v_list_dir);
-    $v_list_path      = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-
-        // ----- Look for empty dir (path reduction)
-        if ($v_list_dir[$i] == '') {
-            $i++;
-            continue;
-        }
-        if ($v_list_path[$j] == '') {
-            $j++;
-            continue;
-        }
-
-        // ----- Compare the items
-        if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
-            $v_result = 0;
-        }
-
-        // ----- Next items
-        $i++;
-        $j++;
-    }
-
-    // ----- Look if everything seems to be the same
-    if ($v_result) {
-        // ----- Skip all the empty items
-        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
-            $j++;
-        }
-        while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
-            $i++;
-        }
-
-        if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-            // ----- There are exactly the same
-            $v_result = 2;
-        } elseif ($i < $v_list_dir_size) {
-            // ----- The path is shorter than the dir
-            $v_result = 0;
-        }
-    }
-
-    // ----- Return
-    return $v_result;
-}
-// --------------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------------
-// Function : PclZipUtilCopyBlock()
-// Description :
-// Parameters :
-//   $p_mode : read/write compression mode
-//             0 : src & dest normal
-//             1 : src gzip, dest normal
-//             2 : src normal, dest gzip
-//             3 : src & dest gzip
-// Return Values :
-// --------------------------------------------------------------------------------
-function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
-{
-    $v_result = 1;
-
-    if ($p_mode == 0) {
-        while ($p_size != 0) {
-            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = @fread($p_src, $v_read_size);
-            @fwrite($p_dest, $v_buffer, $v_read_size);
-            $p_size -= $v_read_size;
-        }
-    } elseif ($p_mode == 1) {
-        while ($p_size != 0) {
-            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = @gzread($p_src, $v_read_size);
-            @fwrite($p_dest, $v_buffer, $v_read_size);
-            $p_size -= $v_read_size;
-        }
-    } elseif ($p_mode == 2) {
-        while ($p_size != 0) {
-            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = @fread($p_src, $v_read_size);
-            @gzwrite($p_dest, $v_buffer, $v_read_size);
-            $p_size -= $v_read_size;
-        }
-    } elseif ($p_mode == 3) {
-        while ($p_size != 0) {
-            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer    = @gzread($p_src, $v_read_size);
-            @gzwrite($p_dest, $v_buffer, $v_read_size);
-            $p_size -= $v_read_size;
-        }
-    }
-
-    // ----- Return
-    return $v_result;
-}
-// --------------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------------
-// Function : PclZipUtilRename()
-// Description :
-//   This function tries to do a simple rename() function. If it fails, it
-//   tries to copy the $p_src file in a new $p_dest file and then unlink the
-//   first one.
-// Parameters :
-//   $p_src : Old filename
-//   $p_dest : New filename
-// Return Values :
-//   1 on success, 0 on failure.
-// --------------------------------------------------------------------------------
-function PclZipUtilRename($p_src, $p_dest)
-{
-    $v_result = 1;
-
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
-
-        // ----- Try to copy & unlink the src
-        if (!@copy($p_src, $p_dest)) {
-            $v_result = 0;
-        } elseif (!@unlink($p_src)) {
-            $v_result = 0;
-        }
-    }
-
-    // ----- Return
-    return $v_result;
-}
-// --------------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------------
-// Function : PclZipUtilOptionText()
-// Description :
-//   Translate option value in text. Mainly for debug purpose.
-// Parameters :
-//   $p_option : the option value.
-// Return Values :
-//   The option text value.
-// --------------------------------------------------------------------------------
-function PclZipUtilOptionText($p_option)
-{
-
-    $v_list = get_defined_constants();
-    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-        $v_prefix = substr($v_key, 0, 10);
-        if ((($v_prefix == 'PCLZIP_OPT') || ($v_prefix == 'PCLZIP_CB_') || ($v_prefix == 'PCLZIP_ATT')) && ($v_list[$v_key] == $p_option)) {
-            return $v_key;
-        }
-    }
-
-    $v_result = 'Unknown';
-
-    return $v_result;
-}
-// --------------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------------
-// Function : PclZipUtilTranslateWinPath()
-// Description :
-//   Translate windows path by replacing '\' by '/' and optionally removing
-//   drive letter.
-// Parameters :
-//   $p_path : path to translate.
-//   $p_remove_disk_letter : true | false
-// Return Values :
-//   The path translated.
-// --------------------------------------------------------------------------------
-function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
-{
-    if (stristr(php_uname(), 'windows')) {
-        // ----- Look for potential disk letter
-        if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-            $p_path = substr($p_path, $v_position + 1);
-        }
-        // ----- Change potential windows directory separator
-        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
-            $p_path = strtr($p_path, '\\', '/');
-        }
-    }
-
-    return $p_path;
-}
-// --------------------------------------------------------------------------------
diff --git a/vendor/pclzip/pclzip/readme.txt b/vendor/pclzip/pclzip/readme.txt
deleted file mode 100644
index 115c22edf1..0000000000
--- a/vendor/pclzip/pclzip/readme.txt
+++ /dev/null
@@ -1,421 +0,0 @@
-// --------------------------------------------------------------------------------
-// PclZip 2.8.2 - readme.txt
-// --------------------------------------------------------------------------------
-// License GNU/LGPL - August 2009
-// Vincent Blavet - vincent@phpconcept.net
-// http://www.phpconcept.net
-// --------------------------------------------------------------------------------
-// $Id: readme.txt,v 1.60 2009/09/30 20:35:21 vblavet Exp $
-// --------------------------------------------------------------------------------
-
-
-
-0 - Sommaire
-============
-    1 - Introduction
-    2 - What's new
-    3 - Corrected bugs
-    4 - Known bugs or limitations
-    5 - License
-    6 - Warning
-    7 - Documentation
-    8 - Author
-    9 - Contribute
-
-1 - Introduction
-================
-
-  PclZip is a library that allow you to manage a Zip archive.
-
-  Full documentation about PclZip can be found here : http://www.phpconcept.net/pclzip
-
-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
-      add a comment for a specific file. (Don't really know if this is usefull)
-    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string
-      as a file.
-    - New attribute PCLZIP_ATT_FILE_MTIME modify the timestamp associated with
-      a file.
-    - Correct a bug. Files archived with a timestamp with 0h0m0s were extracted
-      with current time
-    - Add CRC value in the informations returned back for each file after an
-      action.
-    - Add missing closedir() statement.
-    - When adding a folder, and removing the path of this folder, files were
-      incorrectly added with a '/' at the beginning. Which means files are
-      related to root in unix systems. Corrected.
-    - Add conditional if before constant definition. This will allow users
-      to redefine constants without changing the file, and then improve
-      upgrade of pclzip code for new versions.
-
-  Version 2.5 :
-    - Introduce the ability to add file/folder with individual properties (file descriptor).
-      This gives for example the ability to change the filename of a zipped file.
-      . Able to add files individually
-      . Able to change full name
-      . Able to change short name
-      . Compatible with global options
-    - New attributes : PCLZIP_ATT_FILE_NAME, PCLZIP_ATT_FILE_NEW_SHORT_NAME, PCLZIP_ATT_FILE_NEW_FULL_NAME
-    - New error code : PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE
-    - Add a security control feature. PclZip can extract any file in any folder
-      of a system. People may use this to upload a zip file and try to override
-      a system file. The PCLZIP_OPT_EXTRACT_DIR_RESTRICTION will give the
-      ability to forgive any directory transversal behavior.
-    - New PCLZIP_OPT_EXTRACT_DIR_RESTRICTION : check extraction path
-    - New error code : PCLZIP_ERR_DIRECTORY_RESTRICTION
-    - Modification in PclZipUtilPathInclusion() : dir and path beginning with ./ will be prepend
-      by current path (getcwd())
-
-  Version 2.4 :
-    - Code improvment : try to speed up the code by removing unusefull call to pack()
-    - Correct bug in delete() : delete() should be called with no argument. This was not
-      the case in 2.3. This is corrected in 2.4.
-    - Correct a bug in path_inclusion function. When the path has several '../../', the
-      result was bad.
-    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will
-      disable it while working and det it back to its original value.
-      This resolve a lots of bad formated archive errors.
-    - Bug correction : PclZip now correctly unzip file in some specific situation,
-      when compressed content has same size as uncompressed content.
-    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH',
-      directories are not any more created.
-    - Code improvment : correct unclosed opendir(), better handling of . and .. in
-      loops.
-
-
-  Version 2.3 :
-    - Correct a bug with PHP5 : affecting the value 0xFE49FFE0 to a variable does not
-      give the same result in PHP4 and PHP5 ....
-
-  Version 2.2 :
-    - Try development of PCLZIP_OPT_CRYPT .....
-      However this becomes to a stop. To crypt/decrypt I need to multiply 2 long integers,
-      the result (greater than a long) is not supported by PHP. Even the use of bcmath
-      functions does not help. I did not find yet a solution ...;
-    - Add missing '/' at end of directory entries
-    - Check is a file is encrypted or not. Returns status 'unsupported_encryption' and/or
-      error code PCLZIP_ERR_UNSUPPORTED_ENCRYPTION.
-    - Corrected : Bad "version need to extract" field in local file header
-    - Add private method privCheckFileHeaders() in order to check local and central
-      file headers. PclZip is now supporting purpose bit flag bit 3. Purpose bit flag bit 3 gives
-      the ability to have a local file header without size, compressed size and crc filled.
-    - Add a generic status 'error' for file status
-    - Add control of compression type. PclZip only support deflate compression method.
-      Before v2.2, PclZip does not check the compression method used in an archive while
-      extracting. With v2.2 PclZip returns a new error status for a file using an unsupported
-      compression method. New status is "unsupported_compression". New error code is
-      PCLZIP_ERR_UNSUPPORTED_COMPRESSION.
-    - Add optional attribute PCLZIP_OPT_STOP_ON_ERROR. This will stop the extract of files
-      when errors like 'a folder with same name exists' or 'a newer file exists' or
-      'a write protected file' exists, rather than set a status for the concerning file
-      and resume the extract of the zip.
-    - Add optional attribute PCLZIP_OPT_REPLACE_NEWER. This will force, during an extract' the
-      replacement of the file, even if a  newer version of the file exists.
-      Note that today if a file with the same name already exists but is older it will be
-      replaced by the extracted one.
-    - Improve PclZipUtilOption()
-    - Support of zip archive with trailing bytes. Before 2.2, PclZip checks that the central
-      directory structure is the last data in the archive. Crypt encryption/decryption of
-      zip archive put trailing 0 bytes after decryption. PclZip is now supporting this.
-
-  Version 2.1 :
-    - Add the ability to abort the extraction by using a user callback function.
-      The user can now return the value '2' in its callback which indicates to stop the
-      extraction. For a pre call-back extract is stopped before the extration of the current
-      file. For a post call back, the extraction is stopped after.
-    - Add the ability to extract a file (or several files) directly in the standard output.
-      This is done by the new parameter PCLZIP_OPT_EXTRACT_IN_OUTPUT with method extract().
-    - Add support for parameters PCLZIP_OPT_COMMENT, PCLZIP_OPT_ADD_COMMENT,
-      PCLZIP_OPT_PREPEND_COMMENT. This will create, replace, add, or prepend comments
-      in the zip archive.
-    - When merging two archives, the comments are not any more lost, but merged, with a
-      blank space separator.
-    - Corrected bug : Files are not deleted when all files are asked to be deleted.
-    - Corrected bug : Folders with name '0' made PclZip to abort the create or add feature.
-
-
-  Version 2.0 :
-    ***** Warning : Some new features may break the backward compatibility for your scripts.
-                    Please carefully read the readme file.
-    - Add the ability to delete by Index, name and regular expression. This feature is
-      performed by the method delete(), which uses the optional parameters
-      PCLZIP_OPT_BY_INDEX, PCLZIP_OPT_BY_NAME, PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG.
-    - Add the ability to extract by regular expression. To extract by regexp you must use the method
-      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG
-      (depending if you want to use ereg() or preg_match() syntax) followed by the
-      regular expression pattern.
-    - Add the ability to extract by index, directly with the extract() method. This is a
-      code improvment of the extractByIndex() method.
-    - Add the ability to extract by name. To extract by name you must use the method
-      extract(), with the option PCLZIP_OPT_BY_NAME followed by the filename to
-      extract or an array of filenames to extract. To extract all a folder, use the folder
-      name rather than the filename with a '/' at the end.
-    - Add the ability to add files without compression. This is done with a new attribute
-      which is PCLZIP_OPT_NO_COMPRESSION.
-    - Add the attribute PCLZIP_OPT_EXTRACT_AS_STRING, which allow to extract a file directly
-      in a string without using any file (or temporary file).
-    - Add constant PCLZIP_SEPARATOR for static configuration of filename separators in a single string.
-      The default separator is now a comma (,) and not any more a blank space.
-      THIS BREAK THE BACKWARD COMPATIBILITY : Please check if this may have an impact with
-      your script.
-    - Improve algorythm performance by removing the use of temporary files when adding or
-      extracting files in an archive.
-    - Add (correct) detection of empty filename zipping. This can occurs when the removed
-      path is the same
-      as a zipped dir. The dir is not zipped (['status'] = filtered), only its content.
-    - Add better support for windows paths (thanks for help from manus@manusfreedom.com).
-    - Corrected bug : When the archive file already exists with size=0, the add() method
-      fails. Corrected in 2.0.
-    - Remove the use of OS_WINDOWS constant. Use php_uname() function rather.
-    - Control the order of index ranges in extract by index feature.
-    - Change the internal management of folders (better handling of internal flag).
-
-
-  Version 1.3 :
-    - Removing the double include check. This is now done by include_once() and require_once()
-      PHP directives.
-    - Changing the error handling mecanism : Remove the use of an external error library.
-      The former PclError...() functions are replaced by internal equivalent methods.
-      By changing the environment variable PCLZIP_ERROR_EXTERNAL you can still use the former library.
-      Introducing the use of constants for error codes rather than integer values. This will help
-      in futur improvment.
-      Introduction of error handling functions like errorCode(), errorName() and errorInfo().
-    - Remove the deprecated use of calling function with arguments passed by reference.
-    - Add the calling of extract(), extractByIndex(), create() and add() functions
-      with variable options rather than fixed arguments.
-    - Add the ability to remove all the file path while extracting or adding,
-      without any need to specify the path to remove.
-      This is available for extract(), extractByIndex(), create() and add() functionS by using
-      the new variable options parameters :
-      - PCLZIP_OPT_REMOVE_ALL_PATH : by indicating this option while calling the fct.
-    - Ability to change the mode of a file after the extraction (chmod()).
-      This is available for extract() and extractByIndex() functionS by using
-      the new variable options parameters.
-      - PCLZIP_OPT_SET_CHMOD : by setting the value of this option.
-    - Ability to definition call-back options. These call-back will be called during the adding,
-      or the extracting of file (extract(), extractByIndex(), create() and add() functions) :
-      - PCLZIP_CB_PRE_EXTRACT : will be called before each extraction of a file. The user
-        can trigerred the change the filename of the extracted file. The user can triggered the
-        skip of the extraction. This is adding a 'skipped' status in the file list result value.
-      - PCLZIP_CB_POST_EXTRACT : will be called after each extraction of a file.
-        Nothing can be triggered from that point.
-      - PCLZIP_CB_PRE_ADD : will be called before each add of a file. The user
-        can trigerred the change the stored filename of the added file. The user can triggered the
-        skip of the add. This is adding a 'skipped' status in the file list result value.
-      - PCLZIP_CB_POST_ADD : will be called after each add of a file.
-        Nothing can be triggered from that point.
-    - Two status are added in the file list returned as function result : skipped & filename_too_long
-      'skipped' is used when a call-back function ask for skipping the file.
-      'filename_too_long' is used while adding a file with a too long filename to archive (the file is
-      not added)
-    - Adding the function PclZipUtilPathInclusion(), that check the inclusion of a path into
-      a directory.
-    - Add a check of the presence of the archive file before some actions (like list, ...)
-    - Add the initialisation of field "index" in header array. This means that by
-      default index will be -1 when not explicitly set by the methods.
-
-  Version 1.2 :
-    - Adding a duplicate function.
-    - Adding a merge function. The merge function is a "quick merge" function,
-      it just append the content of an archive at the end of the first one. There
-      is no check for duplicate files or more recent files.
-    - Improve the search of the central directory end.
-
-  Version 1.1.2 :
-
-    - Changing the license of PclZip. PclZip is now released under the GNU / LGPL license
-      (see License section).
-    - Adding the optional support of a static temporary directory. You will need to configure
-      the constant PCLZIP_TEMPORARY_DIR if you want to use this feature.
-    - Improving the rename() function. In some cases rename() does not work (different
-      Filesystems), so it will be replaced by a copy() + unlink() functions.
-
-  Version 1.1.1 :
-
-    - Maintenance release, no new feature.
-
-  Version 1.1 :
-
-    - New method Add() : adding files in the archive
-    - New method ExtractByIndex() : partial extract of the archive, files are identified by
-      their index in the archive
-    - New method DeleteByIndex() : delete some files/folder entries from the archive,
-      files are identified by their index in the archive.
-    - Adding a test of the zlib extension presence. If not present abort the script.
-
-  Version 1.0.1 :
-
-    - No new feature
-
-
-3 - Corrected bugs
-==================
-
-  Corrected in Version 2.0 :
-    - Corrected : During an extraction, if a call-back fucntion is used and try to skip
-                  a file, all the extraction process is stopped.
-
-  Corrected in Version 1.3 :
-    - Corrected : Support of static synopsis for method extract() is broken.
-    - Corrected : invalid size of archive content field (0xFF) should be (0xFFFF).
-    - Corrected : When an extract is done with a remove_path parameter, the entry for
-      the directory with exactly the same path is not skipped/filtered.
-    - Corrected : extractByIndex() and deleteByIndex() were not managing index in the
-      right way. For example indexes '1,3-5,11' will only extract files 1 and 11. This
-      is due to a sort of the index resulting table that puts 11 before 3-5 (sort on
-      string and not interger). The sort is temporarilly removed, this means that
-      you must provide a sorted list of index ranges.
-
-  Corrected in Version 1.2 :
-
-    - Nothing.
-
-  Corrected in Version 1.1.2 :
-
-    - Corrected : Winzip is unable to delete or add new files in a PclZip created archives.
-
-  Corrected in Version 1.1.1 :
-
-    - Corrected : When archived file is not compressed (0% compression), the
-      extract method fails.
-
-  Corrected in Version 1.1 :
-
-    - Corrected : Adding a complete tree of folder may result in a bad archive
-      creation.
-
-  Corrected in Version 1.0.1 :
-
-    - Corrected : Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
-
-
-4 - Known bugs or limitations
-=============================
-
-  Please publish bugs reports in SourceForge :
-    http://sourceforge.net/tracker/?group_id=40254&atid=427564
-
-  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 :
-
-    - merge() methods does not check for duplicate files or last date of modifications.
-
-  In Version 1.1 :
-
-    - Limitation : Using 'extract' fields in the file header in the zip archive is not supported.
-    - WinZip is unable to delete a single file in a PclZip created archive. It is also unable to
-      add a file in a PclZip created archive. (Corrected in v.1.2)
-
-  In Version 1.0.1 :
-
-    - Adding a complete tree of folder may result in a bad archive
-      creation. (Corrected in V.1.1).
-    - Path given to methods must be in the unix format (/) and not the Windows format (\).
-      Workaround : Use only / directory separators.
-    - PclZip is using temporary files that are sometime the name of the file with a .tmp or .gz
-      added suffix. Files with these names may already exist and may be overwritten.
-      Workaround : none.
-    - PclZip does not check if the zlib extension is present. If it is absent, the zip
-      file is not created and the lib abort without warning.
-      Workaround : enable the zlib extension on the php install
-
-  In Version 1.0 :
-
-    - Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
-      (Corrected in v.1.0.1)
-    - Limitation : Multi-disk zip archive are not supported.
-
-
-5 - License
-===========
-
-  Since version 1.1.2, PclZip Library is released under GNU/LGPL license.
-  This library is free, so you can use it at no cost.
-
-  HOWEVER, if you release a script, an application, a library or any kind of
-  code using PclZip library (or a part of it), YOU MUST :
-  - Indicate in the documentation (or a readme file), that your work
-    uses PclZip Library, and make a reference to the author and the web site
-    http://www.phpconcept.net
-  - Gives the ability to the final user to update the PclZip libary.
-
-  I will also appreciate that you send me a mail (vincent@phpconcept.net), just to
-  be aware that someone is using PclZip.
-
-  For more information about GNU/LGPL license : http://www.gnu.org
-
-6 - Warning
-=================
-
-  This library and the associated files are non commercial, non professional work.
-  It should not have unexpected results. However if any damage is caused by this software
-  the author can not be responsible.
-  The use of this software is at the risk of the user.
-
-7 - Documentation
-=================
-  PclZip User Manuel is available in English on PhpConcept : http://www.phpconcept.net/pclzip/man/en/index.php
-  A Russian translation was done by Feskov Kuzma : http://php.russofile.ru/ru/authors/unsort/zip/
-
-8 - Author
-==========
-
-  This software was written by Vincent Blavet (vincent@phpconcept.net) on its leasure time.
-
-9 - Contribute
-==============
-  If you want to contribute to the development of PclZip, please contact vincent@phpconcept.net.
-  If you can help in financing PhpConcept hosting service, please go to
-  http://www.phpconcept.net/soutien.php