From 567f323f0fa41b941e7768f059dd582bdbd2d438 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Sat, 5 Sep 2009 11:22:14 +0000
Subject: merge r3822 from branch 2.0 to trunk Update pclzip to 2.8.1 (PHP 5.3
 compatibility)

git-svn-id: http://piwigo.org/svn/trunk@3823 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/pclzip.lib.php | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'admin/include/pclzip.lib.php')

diff --git a/admin/include/pclzip.lib.php b/admin/include/pclzip.lib.php
index 8ad270c5d..c7a7cbc1b 100644
--- a/admin/include/pclzip.lib.php
+++ b/admin/include/pclzip.lib.php
@@ -1,8 +1,8 @@
 <?php
 // --------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.8
+// PhpConcept Library - Zip Module 2.8.1
 // --------------------------------------------------------------------------------
-// License GNU/LGPL - Vincent Blavet - March 2006
+// License GNU/LGPL - Vincent Blavet - August 2009
 // http://www.phpconcept.net
 // --------------------------------------------------------------------------------
 //
@@ -44,7 +44,7 @@ if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
 }
 
 
-$g_pclzip_version = "2.8";
+$g_pclzip_version = "2.8.1";
 
 define( 'PCLZIP_ERR_USER_ABORTED', 2 );
 define( 'PCLZIP_ERR_NO_ERROR', 0 );
@@ -956,6 +956,7 @@ function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_request
       break;
 
       case PCLZIP_OPT_BY_EREG :
+        $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
       case PCLZIP_OPT_BY_PREG :
         if (($i+1) >= $p_size) {
           PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
@@ -2259,14 +2260,6 @@ function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all
         }
     }
 
-    else if (   (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;
-        }
-    }
-
     else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
              && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
@@ -3224,14 +3217,6 @@ function privDeleteByRule(&$p_result_list, &$p_options)
         }
     }
 
-    else if (   (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;
-        }
-    }
-
     else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
              && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
@@ -3868,4 +3853,4 @@ function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
   }
   return $p_path;
 }
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3