View GitHub Repository chamilo-lms

Schedule Inspection
Subscribe
Passed
Push — 1.10.x ( 5654d2...115d5a )
by Yannick
263:14 queued 212:07
created
Status
Category
Toggle Patches
main/inc/lib/baker.lib.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -150,7 +150,7 @@
 
 block discarded – undo
150 150 
                 $data = substr($png,$ipos,$chunk['size']);
151 151 
                 $sections = explode("\0", $data);
152 152 
                 if ($sections[0] == $key) {
153 
-                   return $sections;
153 
+                    return $sections;
154 154 
                 }
155 155 
             }
156 156 
             // Extract the data and the CRC
Please login to merge, or discard this patch.
main/inc/lib/pclzip/pclzip.lib.php 1 patch
Indentation   +2654 added lines, -2654 removed lines patch added patch discarded remove patch 
@@ -1,10 +1,10 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 /**
3 
- * @package chamilo.include
4 
- */
3 
+     * @package chamilo.include
4 
+     */
5 5 
 /**
6 
- * Code
7 
- */
6 
+     * Code
7 
+     */
8 8 
 // --------------------------------------------------------------------------------
9 9 
 // PhpConcept Library - Zip Module 2.8.2
10 10 
 // --------------------------------------------------------------------------------

@@ -39,154 +39,154 @@  discard block
 
 block discarded – undo
39 39 
 // http://php.net/manual/en/function.gzopen.php
40 40 
 // --------------------------------------------------------------------------------
41 41 
 if (!function_exists('gzopen') && function_exists('gzopen64')) {
42 
-	function gzopen($filename, $mode, $use_include_path = 0) {
43 
-		return gzopen64($filename, $mode, $use_include_path);
44 
-	}
42 
+    function gzopen($filename, $mode, $use_include_path = 0) {
43 
+        return gzopen64($filename, $mode, $use_include_path);
44 
+    }
45 45 
 }
46 46 
 // --------------------------------------------------------------------------------
47 47
48 
-  // ----- Constants
49 
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
48 
+    // ----- Constants
49 
+    if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
50 50 
     define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
51 
-  }
52 
-
53 
-  // ----- File list separator
54 
-  // In version 1.x of PclZip, the separator for file list is a space
55 
-  // (which is not a very smart choice, specifically for windows paths !).
56 
-  // A better separator should be a comma (,). This constant gives you the
57 
-  // abilty to change that.
58 
-  // However notice that changing this value, may have impact on existing
59 
-  // scripts, using space separated filenames.
60 
-  // Recommanded values for compatibility with older versions :
61 
-  //define( 'PCLZIP_SEPARATOR', ' ' );
62 
-  // Recommanded values for smart separation of filenames.
63 
-  if (!defined('PCLZIP_SEPARATOR')) {
51 
+    }
52 
+
53 
+    // ----- File list separator
54 
+    // In version 1.x of PclZip, the separator for file list is a space
55 
+    // (which is not a very smart choice, specifically for windows paths !).
56 
+    // A better separator should be a comma (,). This constant gives you the
57 
+    // abilty to change that.
58 
+    // However notice that changing this value, may have impact on existing
59 
+    // scripts, using space separated filenames.
60 
+    // Recommanded values for compatibility with older versions :
61 
+    //define( 'PCLZIP_SEPARATOR', ' ' );
62 
+    // Recommanded values for smart separation of filenames.
63 
+    if (!defined('PCLZIP_SEPARATOR')) {
64 64 
     define( 'PCLZIP_SEPARATOR', '|' );
65 
-  }
66 
-
67 
-  // ----- Error configuration
68 
-  // 0 : PclZip Class integrated error handling
69 
-  // 1 : PclError external library error handling. By enabling this
70 
-  //     you must ensure that you have included PclError library.
71 
-  // [2,...] : reserved for futur use
72 
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
65 
+    }
66 
+
67 
+    // ----- Error configuration
68 
+    // 0 : PclZip Class integrated error handling
69 
+    // 1 : PclError external library error handling. By enabling this
70 
+    //     you must ensure that you have included PclError library.
71 
+    // [2,...] : reserved for futur use
72 
+    if (!defined('PCLZIP_ERROR_EXTERNAL')) {
73 73 
     define( 'PCLZIP_ERROR_EXTERNAL', 0 );
74 
-  }
75 
-
76 
-  // ----- Optional static temporary directory
77 
-  //       By default temporary files are generated in the script current
78 
-  //       path.
79 
-  //       If defined :
80 
-  //       - MUST BE terminated by a '/'.
81 
-  //       - MUST be a valid, already created directory
82 
-  //       Samples :
83 
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
84 
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
85 
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
74 
+    }
75 
+
76 
+    // ----- Optional static temporary directory
77 
+    //       By default temporary files are generated in the script current
78 
+    //       path.
79 
+    //       If defined :
80 
+    //       - MUST BE terminated by a '/'.
81 
+    //       - MUST be a valid, already created directory
82 
+    //       Samples :
83 
+    // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
84 
+    // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
85 
+    if (!defined('PCLZIP_TEMPORARY_DIR')) {
86 86 
     define( 'PCLZIP_TEMPORARY_DIR', '' );
87 
-  }
88 
-
89 
-  // ----- Optional threshold ratio for use of temporary files
90 
-  //       Pclzip sense the size of the file to add/extract and decide to
91 
-  //       use or not temporary file. The algorythm is looking for
92 
-  //       memory_limit of PHP and apply a ratio.
93 
-  //       threshold = memory_limit * ratio.
94 
-  //       Recommended values are under 0.5. Default 0.47.
95 
-  //       Samples :
96 
-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
97 
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
87 
+    }
88 
+
89 
+    // ----- Optional threshold ratio for use of temporary files
90 
+    //       Pclzip sense the size of the file to add/extract and decide to
91 
+    //       use or not temporary file. The algorythm is looking for
92 
+    //       memory_limit of PHP and apply a ratio.
93 
+    //       threshold = memory_limit * ratio.
94 
+    //       Recommended values are under 0.5. Default 0.47.
95 
+    //       Samples :
96 
+    // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
97 
+    if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
98 98 
     define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
99 
-  }
99 
+    }
100 100
101 101 
 // --------------------------------------------------------------------------------
102 102 
 // ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
103 103 
 // --------------------------------------------------------------------------------
104 104
105 
-  // ----- Global variables
106 
-  $g_pclzip_version = "2.8.2";
107 
-
108 
-  // ----- Error codes
109 
-  //   -1 : Unable to open file in binary write mode
110 
-  //   -2 : Unable to open file in binary read mode
111 
-  //   -3 : Invalid parameters
112 
-  //   -4 : File does not exist
113 
-  //   -5 : Filename is too long (max. 255)
114 
-  //   -6 : Not a valid zip file
115 
-  //   -7 : Invalid extracted file size
116 
-  //   -8 : Unable to create directory
117 
-  //   -9 : Invalid archive extension
118 
-  //  -10 : Invalid archive format
119 
-  //  -11 : Unable to delete file (unlink)
120 
-  //  -12 : Unable to rename file (rename)
121 
-  //  -13 : Invalid header checksum
122 
-  //  -14 : Invalid archive size
123 
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
124 
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
125 
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
126 
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
127 
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
128 
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
129 
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
130 
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
131 
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
132 
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
133 
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
134 
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
135 
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
136 
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
137 
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
138 
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
139 
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
140 
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
141 
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
142 
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
143 
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
144 
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
145 
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
146 
-
147 
-  // ----- Options values
148 
-  define( 'PCLZIP_OPT_PATH', 77001 );
149 
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
150 
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
151 
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
152 
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
153 
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
154 
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
155 
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
156 
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
157 
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
158 
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
159 
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
160 
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
161 
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
162 
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
163 
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
164 
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
165 
-  // Having big trouble with crypt. Need to multiply 2 long int
166 
-  // which is not correctly supported by PHP ...
167 
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
168 
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
169 
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
170 
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
171 
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
172 
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
173 
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
174 
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
175 
-
176 
-  // ----- File description attributes
177 
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
178 
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
179 
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
180 
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
181 
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
182 
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
183 
-
184 
-  // ----- Call backs values
185 
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
186 
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
187 
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
188 
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
189 
-  /* For futur use
105 
+    // ----- Global variables
106 
+    $g_pclzip_version = "2.8.2";
107 
+
108 
+    // ----- Error codes
109 
+    //   -1 : Unable to open file in binary write mode
110 
+    //   -2 : Unable to open file in binary read mode
111 
+    //   -3 : Invalid parameters
112 
+    //   -4 : File does not exist
113 
+    //   -5 : Filename is too long (max. 255)
114 
+    //   -6 : Not a valid zip file
115 
+    //   -7 : Invalid extracted file size
116 
+    //   -8 : Unable to create directory
117 
+    //   -9 : Invalid archive extension
118 
+    //  -10 : Invalid archive format
119 
+    //  -11 : Unable to delete file (unlink)
120 
+    //  -12 : Unable to rename file (rename)
121 
+    //  -13 : Invalid header checksum
122 
+    //  -14 : Invalid archive size
123 
+    define( 'PCLZIP_ERR_USER_ABORTED', 2 );
124 
+    define( 'PCLZIP_ERR_NO_ERROR', 0 );
125 
+    define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
126 
+    define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
127 
+    define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
128 
+    define( 'PCLZIP_ERR_MISSING_FILE', -4 );
129 
+    define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
130 
+    define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
131 
+    define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
132 
+    define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
133 
+    define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
134 
+    define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
135 
+    define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
136 
+    define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
137 
+    define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
138 
+    define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
139 
+    define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
140 
+    define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
141 
+    define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
142 
+    define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
143 
+    define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
144 
+    define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
145 
+    define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
146 
+
147 
+    // ----- Options values
148 
+    define( 'PCLZIP_OPT_PATH', 77001 );
149 
+    define( 'PCLZIP_OPT_ADD_PATH', 77002 );
150 
+    define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
151 
+    define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
152 
+    define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
153 
+    define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
154 
+    define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
155 
+    define( 'PCLZIP_OPT_BY_NAME', 77008 );
156 
+    define( 'PCLZIP_OPT_BY_INDEX', 77009 );
157 
+    define( 'PCLZIP_OPT_BY_EREG', 77010 );
158 
+    define( 'PCLZIP_OPT_BY_PREG', 77011 );
159 
+    define( 'PCLZIP_OPT_COMMENT', 77012 );
160 
+    define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
161 
+    define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
162 
+    define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
163 
+    define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
164 
+    define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
165 
+    // Having big trouble with crypt. Need to multiply 2 long int
166 
+    // which is not correctly supported by PHP ...
167 
+    //define( 'PCLZIP_OPT_CRYPT', 77018 );
168 
+    define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
169 
+    define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
170 
+    define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
171 
+    define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
172 
+    define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
173 
+    define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
174 
+    define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
175 
+
176 
+    // ----- File description attributes
177 
+    define( 'PCLZIP_ATT_FILE_NAME', 79001 );
178 
+    define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
179 
+    define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
180 
+    define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
181 
+    define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
182 
+    define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
183 
+
184 
+    // ----- Call backs values
185 
+    define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
186 
+    define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
187 
+    define( 'PCLZIP_CB_PRE_ADD', 78003 );
188 
+    define( 'PCLZIP_CB_POST_ADD', 78004 );
189 
+    /* For futur use
190 190 
   define( 'PCLZIP_CB_PRE_LIST', 78005 );
191 191 
   define( 'PCLZIP_CB_POST_LIST', 78006 );
192 192 
   define( 'PCLZIP_CB_PRE_DELETE', 78007 );

@@ -224,21 +224,21 @@  discard block
 
 block discarded – undo
224 224 
     // The class can then disable the magic_quotes and reset it after
225 225 
     var $magic_quotes_status;
226 226
227 
-  // --------------------------------------------------------------------------------
228 
-  // Function : PclZip()
229 
-  // Description :
230 
-  //   Creates a PclZip object and set the name of the associated Zip archive
231 
-  //   filename.
232 
-  //   Note that no real action is taken, if the archive does not exist it is not
233 
-  //   created. Use create() for that.
234 
-  // --------------------------------------------------------------------------------
235 
-  function PclZip($p_zipname)
236 
-  {
227 
+    // --------------------------------------------------------------------------------
228 
+    // Function : PclZip()
229 
+    // Description :
230 
+    //   Creates a PclZip object and set the name of the associated Zip archive
231 
+    //   filename.
232 
+    //   Note that no real action is taken, if the archive does not exist it is not
233 
+    //   created. Use create() for that.
234 
+    // --------------------------------------------------------------------------------
235 
+    function PclZip($p_zipname)
236 
+    {
237 237
238 238 
     // ----- Tests the zlib
239 239 
     if (!function_exists('gzopen'))
240 240 
     {
241 
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
241 
+        die('Abort '.basename(__FILE__).' : Missing zlib extensions');
242 242 
     }
243 243
244 244 
     // ----- Set the attributes

@@ -248,48 +248,48 @@  discard block
 
 block discarded – undo
248 248
249 249 
     // ----- Return
250 250 
     return;
251 
-  }
252 
-  // --------------------------------------------------------------------------------
253 
-
254 
-  // --------------------------------------------------------------------------------
255 
-  // Function :
256 
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
257 
-  //   create($p_filelist, $p_option, $p_option_value, ...)
258 
-  // Description :
259 
-  //   This method supports two different synopsis. The first one is historical.
260 
-  //   This method creates a Zip Archive. The Zip file is created in the
261 
-  //   filesystem. The files and directories indicated in $p_filelist
262 
-  //   are added in the archive. See the parameters description for the
263 
-  //   supported format of $p_filelist.
264 
-  //   When a directory is in the list, the directory and its content is added
265 
-  //   in the archive.
266 
-  //   In this synopsis, the function takes an optional variable list of
267 
-  //   options. See bellow the supported options.
268 
-  // Parameters :
269 
-  //   $p_filelist : An array containing file or directory names, or
270 
-  //                 a string containing one filename or one directory name, or
271 
-  //                 a string containing a list of filenames and/or directory
272 
-  //                 names separated by spaces.
273 
-  //   $p_add_dir : A path to add before the real path of the archived file,
274 
-  //                in order to have it memorized in the archive.
275 
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
276 
-  //                   in order to have a shorter path memorized in the archive.
277 
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
278 
-  //                   is removed first, before $p_add_dir is added.
279 
-  // Options :
280 
-  //   PCLZIP_OPT_ADD_PATH :
281 
-  //   PCLZIP_OPT_REMOVE_PATH :
282 
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
283 
-  //   PCLZIP_OPT_COMMENT :
284 
-  //   PCLZIP_CB_PRE_ADD :
285 
-  //   PCLZIP_CB_POST_ADD :
286 
-  // Return Values :
287 
-  //   0 on failure,
288 
-  //   The list of the added files, with a status of the add action.
289 
-  //   (see PclZip::listContent() for list entry format)
290 
-  // --------------------------------------------------------------------------------
291 
-  function create($p_filelist)
292 
-  {
251 
+    }
252 
+    // --------------------------------------------------------------------------------
253 
+
254 
+    // --------------------------------------------------------------------------------
255 
+    // Function :
256 
+    //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
257 
+    //   create($p_filelist, $p_option, $p_option_value, ...)
258 
+    // Description :
259 
+    //   This method supports two different synopsis. The first one is historical.
260 
+    //   This method creates a Zip Archive. The Zip file is created in the
261 
+    //   filesystem. The files and directories indicated in $p_filelist
262 
+    //   are added in the archive. See the parameters description for the
263 
+    //   supported format of $p_filelist.
264 
+    //   When a directory is in the list, the directory and its content is added
265 
+    //   in the archive.
266 
+    //   In this synopsis, the function takes an optional variable list of
267 
+    //   options. See bellow the supported options.
268 
+    // Parameters :
269 
+    //   $p_filelist : An array containing file or directory names, or
270 
+    //                 a string containing one filename or one directory name, or
271 
+    //                 a string containing a list of filenames and/or directory
272 
+    //                 names separated by spaces.
273 
+    //   $p_add_dir : A path to add before the real path of the archived file,
274 
+    //                in order to have it memorized in the archive.
275 
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
276 
+    //                   in order to have a shorter path memorized in the archive.
277 
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
278 
+    //                   is removed first, before $p_add_dir is added.
279 
+    // Options :
280 
+    //   PCLZIP_OPT_ADD_PATH :
281 
+    //   PCLZIP_OPT_REMOVE_PATH :
282 
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
283 
+    //   PCLZIP_OPT_COMMENT :
284 
+    //   PCLZIP_CB_PRE_ADD :
285 
+    //   PCLZIP_CB_POST_ADD :
286 
+    // Return Values :
287 
+    //   0 on failure,
288 
+    //   The list of the added files, with a status of the add action.
289 
+    //   (see PclZip::listContent() for list entry format)
290 
+    // --------------------------------------------------------------------------------
291 
+    function create($p_filelist)
292 
+    {
293 293 
     $v_result=1;
294 294
295 295 
     // ----- Reset the error handler

@@ -304,53 +304,53 @@  discard block
 
 block discarded – undo
304 304
305 305 
     // ----- Look for arguments
306 306 
     if ($v_size > 1) {
307 
-      // ----- Get the arguments
308 
-      $v_arg_list = func_get_args();
307 
+        // ----- Get the arguments
308 
+        $v_arg_list = func_get_args();
309 309
310 
-      // ----- Remove from the options list the first argument
311 
-      array_shift($v_arg_list);
312 
-      $v_size--;
310 
+        // ----- Remove from the options list the first argument
311 
+        array_shift($v_arg_list);
312 
+        $v_size--;
313 313
314 
-      // ----- Look for first arg
315 
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
314 
+        // ----- Look for first arg
315 
+        if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
316 316
317 317 
         // ----- Parse the options
318 318 
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
319 319 
                                             array (PCLZIP_OPT_REMOVE_PATH => 'optional',
320 
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
321 
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
322 
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
323 
-                                                   PCLZIP_CB_POST_ADD => 'optional',
324 
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
325 
-                                                   PCLZIP_OPT_COMMENT => 'optional',
326 
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
327 
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
328 
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
329 
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
330 
-                                             ));
320 
+                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
321 
+                                                    PCLZIP_OPT_ADD_PATH => 'optional',
322 
+                                                    PCLZIP_CB_PRE_ADD => 'optional',
323 
+                                                    PCLZIP_CB_POST_ADD => 'optional',
324 
+                                                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
325 
+                                                    PCLZIP_OPT_COMMENT => 'optional',
326 
+                                                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
327 
+                                                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
328 
+                                                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
329 
+                                                    //, PCLZIP_OPT_CRYPT => 'optional'
330 
+                                                ));
331 331 
         if ($v_result != 1) {
332 
-          return 0;
332 
+            return 0;
333 
+        }
333 334 
         }
334 
-      }
335 335
336 
-      // ----- Look for 2 args
337 
-      // Here we need to support the first historic synopsis of the
338 
-      // method.
339 
-      else {
336 
+        // ----- Look for 2 args
337 
+        // Here we need to support the first historic synopsis of the
338 
+        // method.
339 
+        else {
340 340
341 341 
         // ----- Get the first argument
342 342 
         $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
343 343
344 344 
         // ----- Look for the optional second argument
345 345 
         if ($v_size == 2) {
346 
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
346 
+            $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
347 347 
         }
348 348 
         else if ($v_size > 2) {
349 
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
350 
-		                       "Invalid number / type of arguments");
351 
-          return 0;
349 
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
350 
+                                "Invalid number / type of arguments");
351 
+            return 0;
352 
+        }
352 353 
         }
353 
-      }
354 354 
     }
355 355
356 356 
     // ----- Look for default option values

@@ -365,114 +365,114 @@  discard block
 
 block discarded – undo
365 365 
     // ----- Look if the $p_filelist is really an array
366 366 
     if (is_array($p_filelist)) {
367 367
368 
-      // ----- Look if the first element is also an array
369 
-      //       This will mean that this is a file description entry
370 
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
368 
+        // ----- Look if the first element is also an array
369 
+        //       This will mean that this is a file description entry
370 
+        if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
371 371 
         $v_att_list = $p_filelist;
372 
-      }
372 
+        }
373 373
374 
-      // ----- The list is a list of string names
375 
-      else {
374 
+        // ----- The list is a list of string names
375 
+        else {
376 376 
         $v_string_list = $p_filelist;
377 
-      }
377 
+        }
378 378 
     }
379 379
380 380 
     // ----- Look if the $p_filelist is a string
381 381 
     else if (is_string($p_filelist)) {
382 
-      // ----- Create a list from the string
383 
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
382 
+        // ----- Create a list from the string
383 
+        $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
384 384 
     }
385 385
386 386 
     // ----- Invalid variable type for $p_filelist
387 387 
     else {
388 
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
389 
-      return 0;
388 
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
389 
+        return 0;
390 390 
     }
391 391
392 392 
     // ----- Reformat the string list
393 393 
     if (sizeof($v_string_list) != 0) {
394 
-      foreach ($v_string_list as $v_string) {
394 
+        foreach ($v_string_list as $v_string) {
395 395 
         if ($v_string != '') {
396 
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
396 
+            $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
397 397 
         }
398 398 
         else {
399 399 
         }
400 
-      }
400 
+        }
401 401 
     }
402 402
403 403 
     // ----- For each file in the list check the attributes
404 404 
     $v_supported_attributes
405 405 
     = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
406 
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
407 
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
408 
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
409 
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
410 
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
411 
-						);
406 
+                ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
407 
+                ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
408 
+                ,PCLZIP_ATT_FILE_MTIME => 'optional'
409 
+                ,PCLZIP_ATT_FILE_CONTENT => 'optional'
410 
+                ,PCLZIP_ATT_FILE_COMMENT => 'optional'
411 
+                        );
412 412 
     foreach ($v_att_list as $v_entry) {
413 
-      $v_result = $this->privFileDescrParseAtt($v_entry,
414 
-                                               $v_filedescr_list[],
415 
-                                               $v_options,
416 
-                                               $v_supported_attributes);
417 
-      if ($v_result != 1) {
413 
+        $v_result = $this->privFileDescrParseAtt($v_entry,
414 
+                                                $v_filedescr_list[],
415 
+                                                $v_options,
416 
+                                                $v_supported_attributes);
417 
+        if ($v_result != 1) {
418 418 
         return 0;
419 
-      }
419 
+        }
420 420 
     }
421 421
422 422 
     // ----- Expand the filelist (expand directories)
423 423 
     $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
424 424 
     if ($v_result != 1) {
425 
-      return 0;
425 
+        return 0;
426 426 
     }
427 427
428 428 
     // ----- Call the create fct
429 429 
     $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
430 430 
     if ($v_result != 1) {
431 
-      return 0;
431 
+        return 0;
432 432 
     }
433 433
434 434 
     // ----- Return
435 435 
     return $p_result_list;
436 
-  }
437 
-  // --------------------------------------------------------------------------------
438 
-
439 
-  // --------------------------------------------------------------------------------
440 
-  // Function :
441 
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
442 
-  //   add($p_filelist, $p_option, $p_option_value, ...)
443 
-  // Description :
444 
-  //   This method supports two synopsis. The first one is historical.
445 
-  //   This methods add the list of files in an existing archive.
446 
-  //   If a file with the same name already exists, it is added at the end of the
447 
-  //   archive, the first one is still present.
448 
-  //   If the archive does not exist, it is created.
449 
-  // Parameters :
450 
-  //   $p_filelist : An array containing file or directory names, or
451 
-  //                 a string containing one filename or one directory name, or
452 
-  //                 a string containing a list of filenames and/or directory
453 
-  //                 names separated by spaces.
454 
-  //   $p_add_dir : A path to add before the real path of the archived file,
455 
-  //                in order to have it memorized in the archive.
456 
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
457 
-  //                   in order to have a shorter path memorized in the archive.
458 
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
459 
-  //                   is removed first, before $p_add_dir is added.
460 
-  // Options :
461 
-  //   PCLZIP_OPT_ADD_PATH :
462 
-  //   PCLZIP_OPT_REMOVE_PATH :
463 
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
464 
-  //   PCLZIP_OPT_COMMENT :
465 
-  //   PCLZIP_OPT_ADD_COMMENT :
466 
-  //   PCLZIP_OPT_PREPEND_COMMENT :
467 
-  //   PCLZIP_CB_PRE_ADD :
468 
-  //   PCLZIP_CB_POST_ADD :
469 
-  // Return Values :
470 
-  //   0 on failure,
471 
-  //   The list of the added files, with a status of the add action.
472 
-  //   (see PclZip::listContent() for list entry format)
473 
-  // --------------------------------------------------------------------------------
474 
-  function add($p_filelist)
475 
-  {
436 
+    }
437 
+    // --------------------------------------------------------------------------------
438 
+
439 
+    // --------------------------------------------------------------------------------
440 
+    // Function :
441 
+    //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
442 
+    //   add($p_filelist, $p_option, $p_option_value, ...)
443 
+    // Description :
444 
+    //   This method supports two synopsis. The first one is historical.
445 
+    //   This methods add the list of files in an existing archive.
446 
+    //   If a file with the same name already exists, it is added at the end of the
447 
+    //   archive, the first one is still present.
448 
+    //   If the archive does not exist, it is created.
449 
+    // Parameters :
450 
+    //   $p_filelist : An array containing file or directory names, or
451 
+    //                 a string containing one filename or one directory name, or
452 
+    //                 a string containing a list of filenames and/or directory
453 
+    //                 names separated by spaces.
454 
+    //   $p_add_dir : A path to add before the real path of the archived file,
455 
+    //                in order to have it memorized in the archive.
456 
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
457 
+    //                   in order to have a shorter path memorized in the archive.
458 
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
459 
+    //                   is removed first, before $p_add_dir is added.
460 
+    // Options :
461 
+    //   PCLZIP_OPT_ADD_PATH :
462 
+    //   PCLZIP_OPT_REMOVE_PATH :
463 
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
464 
+    //   PCLZIP_OPT_COMMENT :
465 
+    //   PCLZIP_OPT_ADD_COMMENT :
466 
+    //   PCLZIP_OPT_PREPEND_COMMENT :
467 
+    //   PCLZIP_CB_PRE_ADD :
468 
+    //   PCLZIP_CB_POST_ADD :
469 
+    // Return Values :
470 
+    //   0 on failure,
471 
+    //   The list of the added files, with a status of the add action.
472 
+    //   (see PclZip::listContent() for list entry format)
473 
+    // --------------------------------------------------------------------------------
474 
+    function add($p_filelist)
475 
+    {
476 476 
     $v_result=1;
477 477
478 478 
     // ----- Reset the error handler

@@ -487,57 +487,57 @@  discard block
 
 block discarded – undo
487 487
488 488 
     // ----- Look for arguments
489 489 
     if ($v_size > 1) {
490 
-      // ----- Get the arguments
491 
-      $v_arg_list = func_get_args();
490 
+        // ----- Get the arguments
491 
+        $v_arg_list = func_get_args();
492 492
493 
-      // ----- Remove form the options list the first argument
494 
-      array_shift($v_arg_list);
495 
-      $v_size--;
493 
+        // ----- Remove form the options list the first argument
494 
+        array_shift($v_arg_list);
495 
+        $v_size--;
496 496
497 
-      // ----- Look for first arg
498 
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
497 
+        // ----- Look for first arg
498 
+        if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
499 499
500 500 
         // ----- Parse the options
501 501 
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
502 502 
                                             array (PCLZIP_OPT_REMOVE_PATH => 'optional',
503 
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
504 
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
505 
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
506 
-                                                   PCLZIP_CB_POST_ADD => 'optional',
507 
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
508 
-                                                   PCLZIP_OPT_COMMENT => 'optional',
509 
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
510 
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
511 
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
512 
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
513 
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
514 
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
515 
-												   ));
503 
+                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
504 
+                                                    PCLZIP_OPT_ADD_PATH => 'optional',
505 
+                                                    PCLZIP_CB_PRE_ADD => 'optional',
506 
+                                                    PCLZIP_CB_POST_ADD => 'optional',
507 
+                                                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
508 
+                                                    PCLZIP_OPT_COMMENT => 'optional',
509 
+                                                    PCLZIP_OPT_ADD_COMMENT => 'optional',
510 
+                                                    PCLZIP_OPT_PREPEND_COMMENT => 'optional',
511 
+                                                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
512 
+                                                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
513 
+                                                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
514 
+                                                    //, PCLZIP_OPT_CRYPT => 'optional'
515 
+                                                    ));
516 516 
         if ($v_result != 1) {
517 
-          return 0;
517 
+            return 0;
518 
+        }
518 519 
         }
519 
-      }
520 520
521 
-      // ----- Look for 2 args
522 
-      // Here we need to support the first historic synopsis of the
523 
-      // method.
524 
-      else {
521 
+        // ----- Look for 2 args
522 
+        // Here we need to support the first historic synopsis of the
523 
+        // method.
524 
+        else {
525 525
526 526 
         // ----- Get the first argument
527 527 
         $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
528 528
529 529 
         // ----- Look for the optional second argument
530 530 
         if ($v_size == 2) {
531 
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
531 
+            $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
532 532 
         }
533 533 
         else if ($v_size > 2) {
534 
-          // ----- Error log
535 
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
534 
+            // ----- Error log
535 
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
536 536
537 
-          // ----- Return
538 
-          return 0;
537 
+            // ----- Return
538 
+            return 0;
539 
+        }
539 540 
         }
540 
-      }
541 541 
     }
542 542
543 543 
     // ----- Look for default option values

@@ -552,116 +552,116 @@  discard block
 
 block discarded – undo
552 552 
     // ----- Look if the $p_filelist is really an array
553 553 
     if (is_array($p_filelist)) {
554 554
555 
-      // ----- Look if the first element is also an array
556 
-      //       This will mean that this is a file description entry
557 
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
555 
+        // ----- Look if the first element is also an array
556 
+        //       This will mean that this is a file description entry
557 
+        if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
558 558 
         $v_att_list = $p_filelist;
559 
-      }
559 
+        }
560 560
561 
-      // ----- The list is a list of string names
562 
-      else {
561 
+        // ----- The list is a list of string names
562 
+        else {
563 563 
         $v_string_list = $p_filelist;
564 
-      }
564 
+        }
565 565 
     }
566 566
567 567 
     // ----- Look if the $p_filelist is a string
568 568 
     else if (is_string($p_filelist)) {
569 
-      // ----- Create a list from the string
570 
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
569 
+        // ----- Create a list from the string
570 
+        $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
571 571 
     }
572 572
573 573 
     // ----- Invalid variable type for $p_filelist
574 574 
     else {
575 
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
576 
-      return 0;
575 
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
576 
+        return 0;
577 577 
     }
578 578
579 579 
     // ----- Reformat the string list
580 580 
     if (sizeof($v_string_list) != 0) {
581 
-      foreach ($v_string_list as $v_string) {
581 
+        foreach ($v_string_list as $v_string) {
582 582 
         $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
583 
-      }
583 
+        }
584 584 
     }
585 585
586 586 
     // ----- For each file in the list check the attributes
587 587 
     $v_supported_attributes
588 588 
     = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
589 
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
590 
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
591 
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
592 
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
593 
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
594 
-						);
589 
+                ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
590 
+                ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
591 
+                ,PCLZIP_ATT_FILE_MTIME => 'optional'
592 
+                ,PCLZIP_ATT_FILE_CONTENT => 'optional'
593 
+                ,PCLZIP_ATT_FILE_COMMENT => 'optional'
594 
+                        );
595 595 
     foreach ($v_att_list as $v_entry) {
596 
-      $v_result = $this->privFileDescrParseAtt($v_entry,
597 
-                                               $v_filedescr_list[],
598 
-                                               $v_options,
599 
-                                               $v_supported_attributes);
600 
-      if ($v_result != 1) {
596 
+        $v_result = $this->privFileDescrParseAtt($v_entry,
597 
+                                                $v_filedescr_list[],
598 
+                                                $v_options,
599 
+                                                $v_supported_attributes);
600 
+        if ($v_result != 1) {
601 601 
         return 0;
602 
-      }
602 
+        }
603 603 
     }
604 604
605 605 
     // ----- Expand the filelist (expand directories)
606 606 
     $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
607 607 
     if ($v_result != 1) {
608 
-      return 0;
608 
+        return 0;
609 609 
     }
610 610
611 611 
     // ----- Call the create fct
612 612 
     $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
613 613 
     if ($v_result != 1) {
614 
-      return 0;
614 
+        return 0;
615 615 
     }
616 616
617 617 
     // ----- Return
618 618 
     return $p_result_list;
619 
-  }
620 
-  // --------------------------------------------------------------------------------
621 
-
622 
-  // --------------------------------------------------------------------------------
623 
-  // Function : listContent()
624 
-  // Description :
625 
-  //   This public method, gives the list of the files and directories, with their
626 
-  //   properties.
627 
-  //   The properties of each entries in the list are (used also in other functions) :
628 
-  //     filename : Name of the file. For a create or add action it is the filename
629 
-  //                given by the user. For an extract function it is the filename
630 
-  //                of the extracted file.
631 
-  //     stored_filename : Name of the file / directory stored in the archive.
632 
-  //     size : Size of the stored file.
633 
-  //     compressed_size : Size of the file's data compressed in the archive
634 
-  //                       (without the headers overhead)
635 
-  //     mtime : Last known modification date of the file (UNIX timestamp)
636 
-  //     comment : Comment associated with the file
637 
-  //     folder : true | false
638 
-  //     index : index of the file in the archive
639 
-  //     status : status of the action (depending of the action) :
640 
-  //              Values are :
641 
-  //                ok : OK !
642 
-  //                filtered : the file / dir is not extracted (filtered by user)
643 
-  //                already_a_directory : the file can not be extracted because a
644 
-  //                                      directory with the same name already exists
645 
-  //                write_protected : the file can not be extracted because a file
646 
-  //                                  with the same name already exists and is
647 
-  //                                  write protected
648 
-  //                newer_exist : the file was not extracted because a newer file exists
649 
-  //                path_creation_fail : the file is not extracted because the folder
650 
-  //                                     does not exist and can not be created
651 
-  //                write_error : the file was not extracted because there was a
652 
-  //                              error while writing the file
653 
-  //                read_error : the file was not extracted because there was a error
654 
-  //                             while reading the file
655 
-  //                invalid_header : the file was not extracted because of an archive
656 
-  //                                 format error (bad file header)
657 
-  //   Note that each time a method can continue operating when there
658 
-  //   is an action error on a file, the error is only logged in the file status.
659 
-  // Return Values :
660 
-  //   0 on an unrecoverable failure,
661 
-  //   The list of the files in the archive.
662 
-  // --------------------------------------------------------------------------------
663 
-  function listContent()
664 
-  {
619 
+    }
620 
+    // --------------------------------------------------------------------------------
621 
+
622 
+    // --------------------------------------------------------------------------------
623 
+    // Function : listContent()
624 
+    // Description :
625 
+    //   This public method, gives the list of the files and directories, with their
626 
+    //   properties.
627 
+    //   The properties of each entries in the list are (used also in other functions) :
628 
+    //     filename : Name of the file. For a create or add action it is the filename
629 
+    //                given by the user. For an extract function it is the filename
630 
+    //                of the extracted file.
631 
+    //     stored_filename : Name of the file / directory stored in the archive.
632 
+    //     size : Size of the stored file.
633 
+    //     compressed_size : Size of the file's data compressed in the archive
634 
+    //                       (without the headers overhead)
635 
+    //     mtime : Last known modification date of the file (UNIX timestamp)
636 
+    //     comment : Comment associated with the file
637 
+    //     folder : true | false
638 
+    //     index : index of the file in the archive
639 
+    //     status : status of the action (depending of the action) :
640 
+    //              Values are :
641 
+    //                ok : OK !
642 
+    //                filtered : the file / dir is not extracted (filtered by user)
643 
+    //                already_a_directory : the file can not be extracted because a
644 
+    //                                      directory with the same name already exists
645 
+    //                write_protected : the file can not be extracted because a file
646 
+    //                                  with the same name already exists and is
647 
+    //                                  write protected
648 
+    //                newer_exist : the file was not extracted because a newer file exists
649 
+    //                path_creation_fail : the file is not extracted because the folder
650 
+    //                                     does not exist and can not be created
651 
+    //                write_error : the file was not extracted because there was a
652 
+    //                              error while writing the file
653 
+    //                read_error : the file was not extracted because there was a error
654 
+    //                             while reading the file
655 
+    //                invalid_header : the file was not extracted because of an archive
656 
+    //                                 format error (bad file header)
657 
+    //   Note that each time a method can continue operating when there
658 
+    //   is an action error on a file, the error is only logged in the file status.
659 
+    // Return Values :
660 
+    //   0 on an unrecoverable failure,
661 
+    //   The list of the files in the archive.
662 
+    // --------------------------------------------------------------------------------
663 
+    function listContent()
664 
+    {
665 665 
     $v_result=1;
666 666
667 667 
     // ----- Reset the error handler

@@ -669,56 +669,56 @@  discard block
 
 block discarded – undo
669 669
670 670 
     // ----- Check archive
671 671 
     if (!$this->privCheckFormat()) {
672 
-      return(0);
672 
+        return(0);
673 673 
     }
674 674
675 675 
     // ----- Call the extracting fct
676 676 
     $p_list = array();
677 677 
     if (($v_result = $this->privList($p_list)) != 1)
678 678 
     {
679 
-      unset($p_list);
680 
-      return(0);
679 
+        unset($p_list);
680 
+        return(0);
681 681 
     }
682 682
683 683 
     // ----- Return
684 684 
     return $p_list;
685 
-  }
686 
-  // --------------------------------------------------------------------------------
687 
-
688 
-  // --------------------------------------------------------------------------------
689 
-  // Function :
690 
-  //   extract($p_path="./", $p_remove_path="")
691 
-  //   extract([$p_option, $p_option_value, ...])
692 
-  // Description :
693 
-  //   This method supports two synopsis. The first one is historical.
694 
-  //   This method extract all the files / directories from the archive to the
695 
-  //   folder indicated in $p_path.
696 
-  //   If you want to ignore the 'root' part of path of the memorized files
697 
-  //   you can indicate this in the optional $p_remove_path parameter.
698 
-  //   By default, if a newer file with the same name already exists, the
699 
-  //   file is not extracted.
700 
-  //
701 
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
702 
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
703 
-  //   at the end of the path value of PCLZIP_OPT_PATH.
704 
-  // Parameters :
705 
-  //   $p_path : Path where the files and directories are to be extracted
706 
-  //   $p_remove_path : First part ('root' part) of the memorized path
707 
-  //                    (if any similar) to remove while extracting.
708 
-  // Options :
709 
-  //   PCLZIP_OPT_PATH :
710 
-  //   PCLZIP_OPT_ADD_PATH :
711 
-  //   PCLZIP_OPT_REMOVE_PATH :
712 
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
713 
-  //   PCLZIP_CB_PRE_EXTRACT :
714 
-  //   PCLZIP_CB_POST_EXTRACT :
715 
-  // Return Values :
716 
-  //   0 or a negative value on failure,
717 
-  //   The list of the extracted files, with a status of the action.
718 
-  //   (see PclZip::listContent() for list entry format)
719 
-  // --------------------------------------------------------------------------------
720 
-  function extract()
721 
-  {
685 
+    }
686 
+    // --------------------------------------------------------------------------------
687 
+
688 
+    // --------------------------------------------------------------------------------
689 
+    // Function :
690 
+    //   extract($p_path="./", $p_remove_path="")
691 
+    //   extract([$p_option, $p_option_value, ...])
692 
+    // Description :
693 
+    //   This method supports two synopsis. The first one is historical.
694 
+    //   This method extract all the files / directories from the archive to the
695 
+    //   folder indicated in $p_path.
696 
+    //   If you want to ignore the 'root' part of path of the memorized files
697 
+    //   you can indicate this in the optional $p_remove_path parameter.
698 
+    //   By default, if a newer file with the same name already exists, the
699 
+    //   file is not extracted.
700 
+    //
701 
+    //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
702 
+    //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
703 
+    //   at the end of the path value of PCLZIP_OPT_PATH.
704 
+    // Parameters :
705 
+    //   $p_path : Path where the files and directories are to be extracted
706 
+    //   $p_remove_path : First part ('root' part) of the memorized path
707 
+    //                    (if any similar) to remove while extracting.
708 
+    // Options :
709 
+    //   PCLZIP_OPT_PATH :
710 
+    //   PCLZIP_OPT_ADD_PATH :
711 
+    //   PCLZIP_OPT_REMOVE_PATH :
712 
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
713 
+    //   PCLZIP_CB_PRE_EXTRACT :
714 
+    //   PCLZIP_CB_POST_EXTRACT :
715 
+    // Return Values :
716 
+    //   0 or a negative value on failure,
717 
+    //   The list of the extracted files, with a status of the action.
718 
+    //   (see PclZip::listContent() for list entry format)
719 
+    // --------------------------------------------------------------------------------
720 
+    function extract()
721 
+    {
722 722 
     $v_result=1;
723 723
724 724 
     // ----- Reset the error handler

@@ -726,7 +726,7 @@  discard block
 
 block discarded – undo
726 726
727 727 
     // ----- Check archive
728 728 
     if (!$this->privCheckFormat()) {
729 
-      return(0);
729 
+        return(0);
730 730 
     }
731 731
732 732 
     // ----- Set default values

@@ -744,77 +744,77 @@  discard block
 
 block discarded – undo
744 744
745 745 
     // ----- Look for arguments
746 746 
     if ($v_size > 0) {
747 
-      // ----- Get the arguments
748 
-      $v_arg_list = func_get_args();
747 
+        // ----- Get the arguments
748 
+        $v_arg_list = func_get_args();
749 749
750 
-      // ----- Look for first arg
751 
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
750 
+        // ----- Look for first arg
751 
+        if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
752 752
753 753 
         // ----- Parse the options
754 754 
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
755 755 
                                             array (PCLZIP_OPT_PATH => 'optional',
756 
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
757 
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
758 
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
759 
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
760 
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
761 
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
762 
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
763 
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
764 
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
765 
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
766 
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
767 
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
768 
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
769 
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
770 
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
771 
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
772 
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
773 
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
774 
-												    ));
756 
+                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
757 
+                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
758 
+                                                    PCLZIP_OPT_ADD_PATH => 'optional',
759 
+                                                    PCLZIP_CB_PRE_EXTRACT => 'optional',
760 
+                                                    PCLZIP_CB_POST_EXTRACT => 'optional',
761 
+                                                    PCLZIP_OPT_SET_CHMOD => 'optional',
762 
+                                                    PCLZIP_OPT_BY_NAME => 'optional',
763 
+                                                    PCLZIP_OPT_BY_EREG => 'optional',
764 
+                                                    PCLZIP_OPT_BY_PREG => 'optional',
765 
+                                                    PCLZIP_OPT_BY_INDEX => 'optional',
766 
+                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
767 
+                                                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
768 
+                                                    PCLZIP_OPT_REPLACE_NEWER => 'optional'
769 
+                                                    ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
770 
+                                                    ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
771 
+                                                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
772 
+                                                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
773 
+                                                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
774 
+                                                    ));
775 775 
         if ($v_result != 1) {
776 
-          return 0;
776 
+            return 0;
777 777 
         }
778 778
779 779 
         // ----- Set the arguments
780 780 
         if (isset($v_options[PCLZIP_OPT_PATH])) {
781 
-          $v_path = $v_options[PCLZIP_OPT_PATH];
781 
+            $v_path = $v_options[PCLZIP_OPT_PATH];
782 782 
         }
783 783 
         if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
784 
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
784 
+            $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
785 785 
         }
786 786 
         if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
787 
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
787 
+            $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
788 788 
         }
789 789 
         if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
790 
-          // ----- Check for '/' in last path char
791 
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
790 
+            // ----- Check for '/' in last path char
791 
+            if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
792 792 
             $v_path .= '/';
793 
-          }
794 
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
793 
+            }
794 
+            $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
795 
+        }
795 796 
         }
796 
-      }
797 797
798 
-      // ----- Look for 2 args
799 
-      // Here we need to support the first historic synopsis of the
800 
-      // method.
801 
-      else {
798 
+        // ----- Look for 2 args
799 
+        // Here we need to support the first historic synopsis of the
800 
+        // method.
801 
+        else {
802 802
803 803 
         // ----- Get the first argument
804 804 
         $v_path = $v_arg_list[0];
805 805
806 806 
         // ----- Look for the optional second argument
807 807 
         if ($v_size == 2) {
808 
-          $v_remove_path = $v_arg_list[1];
808 
+            $v_remove_path = $v_arg_list[1];
809 809 
         }
810 810 
         else if ($v_size > 2) {
811 
-          // ----- Error log
812 
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
811 
+            // ----- Error log
812 
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
813 813
814 
-          // ----- Return
815 
-          return 0;
814 
+            // ----- Return
815 
+            return 0;
816 
+        }
816 817 
         }
817 
-      }
818 818 
     }
819 819
820 820 
     // ----- Look for default option values

@@ -825,57 +825,57 @@  discard block
 
 block discarded – undo
825 825 
     // ----- Call the extracting fct
826 826 
     $p_list = array();
827 827 
     $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
828 
-	                                     $v_remove_all_path, $v_options);
828 
+                                            $v_remove_all_path, $v_options);
829 829 
     if ($v_result < 1) {
830 
-      unset($p_list);
831 
-      return(0);
830 
+        unset($p_list);
831 
+        return(0);
832 832 
     }
833 833
834 834 
     // ----- Return
835 835 
     return $p_list;
836 
-  }
837 
-  // --------------------------------------------------------------------------------
838 
-
839 
-
840 
-  // --------------------------------------------------------------------------------
841 
-  // Function :
842 
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
843 
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
844 
-  // Description :
845 
-  //   This method supports two synopsis. The first one is historical.
846 
-  //   This method is doing a partial extract of the archive.
847 
-  //   The extracted files or folders are identified by their index in the
848 
-  //   archive (from 0 to n).
849 
-  //   Note that if the index identify a folder, only the folder entry is
850 
-  //   extracted, not all the files included in the archive.
851 
-  // Parameters :
852 
-  //   $p_index : A single index (integer) or a string of indexes of files to
853 
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
854 
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
855 
-  //              are allowed.
856 
-  //   $p_path : Path where the files and directories are to be extracted
857 
-  //   $p_remove_path : First part ('root' part) of the memorized path
858 
-  //                    (if any similar) to remove while extracting.
859 
-  // Options :
860 
-  //   PCLZIP_OPT_PATH :
861 
-  //   PCLZIP_OPT_ADD_PATH :
862 
-  //   PCLZIP_OPT_REMOVE_PATH :
863 
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
864 
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
865 
-  //     not as files.
866 
-  //     The resulting content is in a new field 'content' in the file
867 
-  //     structure.
868 
-  //     This option must be used alone (any other options are ignored).
869 
-  //   PCLZIP_CB_PRE_EXTRACT :
870 
-  //   PCLZIP_CB_POST_EXTRACT :
871 
-  // Return Values :
872 
-  //   0 on failure,
873 
-  //   The list of the extracted files, with a status of the action.
874 
-  //   (see PclZip::listContent() for list entry format)
875 
-  // --------------------------------------------------------------------------------
876 
-  //function extractByIndex($p_index, options...)
877 
-  function extractByIndex($p_index)
878 
-  {
836 
+    }
837 
+    // --------------------------------------------------------------------------------
838 
+
839 
+
840 
+    // --------------------------------------------------------------------------------
841 
+    // Function :
842 
+    //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
843 
+    //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
844 
+    // Description :
845 
+    //   This method supports two synopsis. The first one is historical.
846 
+    //   This method is doing a partial extract of the archive.
847 
+    //   The extracted files or folders are identified by their index in the
848 
+    //   archive (from 0 to n).
849 
+    //   Note that if the index identify a folder, only the folder entry is
850 
+    //   extracted, not all the files included in the archive.
851 
+    // Parameters :
852 
+    //   $p_index : A single index (integer) or a string of indexes of files to
853 
+    //              extract. The form of the string is "0,4-6,8-12" with only numbers
854 
+    //              and '-' for range or ',' to separate ranges. No spaces or ';'
855 
+    //              are allowed.
856 
+    //   $p_path : Path where the files and directories are to be extracted
857 
+    //   $p_remove_path : First part ('root' part) of the memorized path
858 
+    //                    (if any similar) to remove while extracting.
859 
+    // Options :
860 
+    //   PCLZIP_OPT_PATH :
861 
+    //   PCLZIP_OPT_ADD_PATH :
862 
+    //   PCLZIP_OPT_REMOVE_PATH :
863 
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
864 
+    //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
865 
+    //     not as files.
866 
+    //     The resulting content is in a new field 'content' in the file
867 
+    //     structure.
868 
+    //     This option must be used alone (any other options are ignored).
869 
+    //   PCLZIP_CB_PRE_EXTRACT :
870 
+    //   PCLZIP_CB_POST_EXTRACT :
871 
+    // Return Values :
872 
+    //   0 on failure,
873 
+    //   The list of the extracted files, with a status of the action.
874 
+    //   (see PclZip::listContent() for list entry format)
875 
+    // --------------------------------------------------------------------------------
876 
+    //function extractByIndex($p_index, options...)
877 
+    function extractByIndex($p_index)
878 
+    {
879 879 
     $v_result=1;
880 880
881 881 
     // ----- Reset the error handler

@@ -883,7 +883,7 @@  discard block
 
 block discarded – undo
883 883
884 884 
     // ----- Check archive
885 885 
     if (!$this->privCheckFormat()) {
886 
-      return(0);
886 
+        return(0);
887 887 
     }
888 888
889 889 
     // ----- Set default values

@@ -901,81 +901,81 @@  discard block
 
 block discarded – undo
901 901
902 902 
     // ----- Look for arguments
903 903 
     if ($v_size > 1) {
904 
-      // ----- Get the arguments
905 
-      $v_arg_list = func_get_args();
904 
+        // ----- Get the arguments
905 
+        $v_arg_list = func_get_args();
906 906
907 
-      // ----- Remove form the options list the first argument
908 
-      array_shift($v_arg_list);
909 
-      $v_size--;
907 
+        // ----- Remove form the options list the first argument
908 
+        array_shift($v_arg_list);
909 
+        $v_size--;
910 910
911 
-      // ----- Look for first arg
912 
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
911 
+        // ----- Look for first arg
912 
+        if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
913 913
914 914 
         // ----- Parse the options
915 915 
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
916 916 
                                             array (PCLZIP_OPT_PATH => 'optional',
917 
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
918 
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
919 
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
920 
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
921 
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
922 
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
923 
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
924 
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
925 
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
926 
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
927 
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
928 
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
929 
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
930 
-												   ));
917 
+                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
918 
+                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
919 
+                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
920 
+                                                    PCLZIP_OPT_ADD_PATH => 'optional',
921 
+                                                    PCLZIP_CB_PRE_EXTRACT => 'optional',
922 
+                                                    PCLZIP_CB_POST_EXTRACT => 'optional',
923 
+                                                    PCLZIP_OPT_SET_CHMOD => 'optional',
924 
+                                                    PCLZIP_OPT_REPLACE_NEWER => 'optional'
925 
+                                                    ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
926 
+                                                    ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
927 
+                                                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
928 
+                                                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
929 
+                                                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
930 
+                                                    ));
931 931 
         if ($v_result != 1) {
932 
-          return 0;
932 
+            return 0;
933 933 
         }
934 934
935 935 
         // ----- Set the arguments
936 936 
         if (isset($v_options[PCLZIP_OPT_PATH])) {
937 
-          $v_path = $v_options[PCLZIP_OPT_PATH];
937 
+            $v_path = $v_options[PCLZIP_OPT_PATH];
938 938 
         }
939 939 
         if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
940 
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
940 
+            $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
941 941 
         }
942 942 
         if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
943 
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
943 
+            $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
944 944 
         }
945 945 
         if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
946 
-          // ----- Check for '/' in last path char
947 
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
946 
+            // ----- Check for '/' in last path char
947 
+            if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
948 948 
             $v_path .= '/';
949 
-          }
950 
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
949 
+            }
950 
+            $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
951 951 
         }
952 952 
         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
953 
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
953 
+            $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
954 954 
         }
955 955 
         else {
956 956 
         }
957 
-      }
957 
+        }
958 958
959 
-      // ----- Look for 2 args
960 
-      // Here we need to support the first historic synopsis of the
961 
-      // method.
962 
-      else {
959 
+        // ----- Look for 2 args
960 
+        // Here we need to support the first historic synopsis of the
961 
+        // method.
962 
+        else {
963 963
964 964 
         // ----- Get the first argument
965 965 
         $v_path = $v_arg_list[0];
966 966
967 967 
         // ----- Look for the optional second argument
968 968 
         if ($v_size == 2) {
969 
-          $v_remove_path = $v_arg_list[1];
969 
+            $v_remove_path = $v_arg_list[1];
970 970 
         }
971 971 
         else if ($v_size > 2) {
972 
-          // ----- Error log
973 
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
972 
+            // ----- Error log
973 
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
974 974
975 
-          // ----- Return
976 
-          return 0;
975 
+            // ----- Return
976 
+            return 0;
977 
+        }
977 978 
         }
978 
-      }
979 979 
     }
980 980
981 981 
     // ----- Trace

@@ -1002,29 +1002,29 @@  discard block
 
 block discarded – undo
1002 1002
1003 1003 
     // ----- Return
1004 1004 
     return $p_list;
1005 
-  }
1006 
-  // --------------------------------------------------------------------------------
1007 
-
1008 
-  // --------------------------------------------------------------------------------
1009 
-  // Function :
1010 
-  //   delete([$p_option, $p_option_value, ...])
1011 
-  // Description :
1012 
-  //   This method removes files from the archive.
1013 
-  //   If no parameters are given, then all the archive is emptied.
1014 
-  // Parameters :
1015 
-  //   None or optional arguments.
1016 
-  // Options :
1017 
-  //   PCLZIP_OPT_BY_INDEX :
1018 
-  //   PCLZIP_OPT_BY_NAME :
1019 
-  //   PCLZIP_OPT_BY_EREG :
1020 
-  //   PCLZIP_OPT_BY_PREG :
1021 
-  // Return Values :
1022 
-  //   0 on failure,
1023 
-  //   The list of the files which are still present in the archive.
1024 
-  //   (see PclZip::listContent() for list entry format)
1025 
-  // --------------------------------------------------------------------------------
1026 
-  function delete()
1027 
-  {
1005 
+    }
1006 
+    // --------------------------------------------------------------------------------
1007 
+
1008 
+    // --------------------------------------------------------------------------------
1009 
+    // Function :
1010 
+    //   delete([$p_option, $p_option_value, ...])
1011 
+    // Description :
1012 
+    //   This method removes files from the archive.
1013 
+    //   If no parameters are given, then all the archive is emptied.
1014 
+    // Parameters :
1015 
+    //   None or optional arguments.
1016 
+    // Options :
1017 
+    //   PCLZIP_OPT_BY_INDEX :
1018 
+    //   PCLZIP_OPT_BY_NAME :
1019 
+    //   PCLZIP_OPT_BY_EREG :
1020 
+    //   PCLZIP_OPT_BY_PREG :
1021 
+    // Return Values :
1022 
+    //   0 on failure,
1023 
+    //   The list of the files which are still present in the archive.
1024 
+    //   (see PclZip::listContent() for list entry format)
1025 
+    // --------------------------------------------------------------------------------
1026 
+    function delete()
1027 
+    {
1028 1028 
     $v_result=1;
1029 1029
1030 1030 
     // ----- Reset the error handler

@@ -1032,7 +1032,7 @@  discard block
 
 block discarded – undo
1032 1032
1033 1033 
     // ----- Check archive
1034 1034 
     if (!$this->privCheckFormat()) {
1035 
-      return(0);
1035 
+        return(0);
1036 1036 
     }
1037 1037
1038 1038 
     // ----- Set default values

@@ -1043,18 +1043,18 @@  discard block
 
 block discarded – undo
1043 1043
1044 1044 
     // ----- Look for arguments
1045 1045 
     if ($v_size > 0) {
1046 
-      // ----- Get the arguments
1047 
-      $v_arg_list = func_get_args();
1046 
+        // ----- Get the arguments
1047 
+        $v_arg_list = func_get_args();
1048 1048
1049 
-      // ----- Parse the options
1050 
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
1049 
+        // ----- Parse the options
1050 
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
1051 1051 
                                         array (PCLZIP_OPT_BY_NAME => 'optional',
1052 
-                                               PCLZIP_OPT_BY_EREG => 'optional',
1053 
-                                               PCLZIP_OPT_BY_PREG => 'optional',
1054 
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
1055 
-      if ($v_result != 1) {
1056 
-          return 0;
1057 
-      }
1052 
+                                                PCLZIP_OPT_BY_EREG => 'optional',
1053 
+                                                PCLZIP_OPT_BY_PREG => 'optional',
1054 
+                                                PCLZIP_OPT_BY_INDEX => 'optional' ));
1055 
+        if ($v_result != 1) {
1056 
+            return 0;
1057 
+        }
1058 1058 
     }
1059 1059
1060 1060 
     // ----- Magic quotes trick

@@ -1063,9 +1063,9 @@  discard block
 
 block discarded – undo
1063 1063 
     // ----- Call the delete fct
1064 1064 
     $v_list = array();
1065 1065 
     if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
1066 
-      $this->privSwapBackMagicQuotes();
1067 
-      unset($v_list);
1068 
-      return(0);
1066 
+        $this->privSwapBackMagicQuotes();
1067 
+        unset($v_list);
1068 
+        return(0);
1069 1069 
     }
1070 1070
1071 1071 
     // ----- Magic quotes trick

@@ -1073,41 +1073,41 @@  discard block
 
 block discarded – undo
1073 1073
1074 1074 
     // ----- Return
1075 1075 
     return $v_list;
1076 
-  }
1077 
-  // --------------------------------------------------------------------------------
1078 
-
1079 
-  // --------------------------------------------------------------------------------
1080 
-  // Function : deleteByIndex()
1081 
-  // Description :
1082 
-  //   ***** Deprecated *****
1083 
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
1084 
-  // --------------------------------------------------------------------------------
1085 
-  function deleteByIndex($p_index)
1086 
-  {
1076 
+    }
1077 
+    // --------------------------------------------------------------------------------
1078 
+
1079 
+    // --------------------------------------------------------------------------------
1080 
+    // Function : deleteByIndex()
1081 
+    // Description :
1082 
+    //   ***** Deprecated *****
1083 
+    //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
1084 
+    // --------------------------------------------------------------------------------
1085 
+    function deleteByIndex($p_index)
1086 
+    {
1087 1087
1088 1088 
     $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
1089 1089
1090 1090 
     // ----- Return
1091 1091 
     return $p_list;
1092 
-  }
1093 
-  // --------------------------------------------------------------------------------
1094 
-
1095 
-  // --------------------------------------------------------------------------------
1096 
-  // Function : properties()
1097 
-  // Description :
1098 
-  //   This method gives the properties of the archive.
1099 
-  //   The properties are :
1100 
-  //     nb : Number of files in the archive
1101 
-  //     comment : Comment associated with the archive file
1102 
-  //     status : not_exist, ok
1103 
-  // Parameters :
1104 
-  //   None
1105 
-  // Return Values :
1106 
-  //   0 on failure,
1107 
-  //   An array with the archive properties.
1108 
-  // --------------------------------------------------------------------------------
1109 
-  function properties()
1110 
-  {
1092 
+    }
1093 
+    // --------------------------------------------------------------------------------
1094 
+
1095 
+    // --------------------------------------------------------------------------------
1096 
+    // Function : properties()
1097 
+    // Description :
1098 
+    //   This method gives the properties of the archive.
1099 
+    //   The properties are :
1100 
+    //     nb : Number of files in the archive
1101 
+    //     comment : Comment associated with the archive file
1102 
+    //     status : not_exist, ok
1103 
+    // Parameters :
1104 
+    //   None
1105 
+    // Return Values :
1106 
+    //   0 on failure,
1107 
+    //   An array with the archive properties.
1108 
+    // --------------------------------------------------------------------------------
1109 
+    function properties()
1110 
+    {
1111 1111
1112 1112 
     // ----- Reset the error handler
1113 1113 
     $this->privErrorReset();

@@ -1117,8 +1117,8 @@  discard block
 
 block discarded – undo
1117 1117
1118 1118 
     // ----- Check archive
1119 1119 
     if (!$this->privCheckFormat()) {
1120 
-      $this->privSwapBackMagicQuotes();
1121 
-      return(0);
1120 
+        $this->privSwapBackMagicQuotes();
1121 
+        return(0);
1122 1122 
     }
1123 1123
1124 1124 
     // ----- Default properties

@@ -1130,9 +1130,9 @@  discard block
 
 block discarded – undo
1130 1130 
     // ----- Look if file exists
1131 1131 
     if (@is_file($this->zipname))
1132 1132 
     {
1133 
-      // ----- Open the zip file
1134 
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
1135 
-      {
1133 
+        // ----- Open the zip file
1134 
+        if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
1135 
+        {
1136 1136 
         $this->privSwapBackMagicQuotes();
1137 1137
1138 1138 
         // ----- Error log

@@ -1140,23 +1140,23 @@  discard block
 
 block discarded – undo
1140 1140
1141 1141 
         // ----- Return
1142 1142 
         return 0;
1143 
-      }
1143 
+        }
1144 1144
1145 
-      // ----- Read the central directory informations
1146 
-      $v_central_dir = array();
1147 
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
1148 
-      {
1145 
+        // ----- Read the central directory informations
1146 
+        $v_central_dir = array();
1147 
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
1148 
+        {
1149 1149 
         $this->privSwapBackMagicQuotes();
1150 1150 
         return 0;
1151 
-      }
1151 
+        }
1152 1152
1153 
-      // ----- Close the zip file
1154 
-      $this->privCloseFd();
1153 
+        // ----- Close the zip file
1154 
+        $this->privCloseFd();
1155 1155
1156 
-      // ----- Set the user attributes
1157 
-      $v_prop['comment'] = $v_central_dir['comment'];
1158 
-      $v_prop['nb'] = $v_central_dir['entries'];
1159 
-      $v_prop['status'] = 'ok';
1156 
+        // ----- Set the user attributes
1157 
+        $v_prop['comment'] = $v_central_dir['comment'];
1158 
+        $v_prop['nb'] = $v_central_dir['entries'];
1159 
+        $v_prop['status'] = 'ok';
1160 1160 
     }
1161 1161
1162 1162 
     // ----- Magic quotes trick

@@ -1164,23 +1164,23 @@  discard block
 
 block discarded – undo
1164 1164
1165 1165 
     // ----- Return
1166 1166 
     return $v_prop;
1167 
-  }
1168 
-  // --------------------------------------------------------------------------------
1169 
-
1170 
-  // --------------------------------------------------------------------------------
1171 
-  // Function : duplicate()
1172 
-  // Description :
1173 
-  //   This method creates an archive by copying the content of an other one. If
1174 
-  //   the archive already exist, it is replaced by the new one without any warning.
1175 
-  // Parameters :
1176 
-  //   $p_archive : The filename of a valid archive, or
1177 
-  //                a valid PclZip object.
1178 
-  // Return Values :
1179 
-  //   1 on success.
1180 
-  //   0 or a negative value on error (error code).
1181 
-  // --------------------------------------------------------------------------------
1182 
-  function duplicate($p_archive)
1183 
-  {
1167 
+    }
1168 
+    // --------------------------------------------------------------------------------
1169 
+
1170 
+    // --------------------------------------------------------------------------------
1171 
+    // Function : duplicate()
1172 
+    // Description :
1173 
+    //   This method creates an archive by copying the content of an other one. If
1174 
+    //   the archive already exist, it is replaced by the new one without any warning.
1175 
+    // Parameters :
1176 
+    //   $p_archive : The filename of a valid archive, or
1177 
+    //                a valid PclZip object.
1178 
+    // Return Values :
1179 
+    //   1 on success.
1180 
+    //   0 or a negative value on error (error code).
1181 
+    // --------------------------------------------------------------------------------
1182 
+    function duplicate($p_archive)
1183 
+    {
1184 1184 
     $v_result = 1;
1185 1185
1186 1186 
     // ----- Reset the error handler

@@ -1190,56 +1190,56 @@  discard block
 
 block discarded – undo
1190 1190 
     if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
1191 1191 
     {
1192 1192
1193 
-      // ----- Duplicate the archive
1194 
-      $v_result = $this->privDuplicate($p_archive->zipname);
1193 
+        // ----- Duplicate the archive
1194 
+        $v_result = $this->privDuplicate($p_archive->zipname);
1195 1195 
     }
1196 1196
1197 1197 
     // ----- Look if the $p_archive is a string (so a filename)
1198 1198 
     else if (is_string($p_archive))
1199 1199 
     {
1200 1200
1201 
-      // ----- Check that $p_archive is a valid zip file
1202 
-      // TBC : Should also check the archive format
1203 
-      if (!is_file($p_archive)) {
1201 
+        // ----- Check that $p_archive is a valid zip file
1202 
+        // TBC : Should also check the archive format
1203 
+        if (!is_file($p_archive)) {
1204 1204 
         // ----- Error log
1205 1205 
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
1206 1206 
         $v_result = PCLZIP_ERR_MISSING_FILE;
1207 
-      }
1208 
-      else {
1207 
+        }
1208 
+        else {
1209 1209 
         // ----- Duplicate the archive
1210 1210 
         $v_result = $this->privDuplicate($p_archive);
1211 
-      }
1211 
+        }
1212 1212 
     }
1213 1213
1214 1214 
     // ----- Invalid variable
1215 1215 
     else
1216 1216 
     {
1217 
-      // ----- Error log
1218 
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
1219 
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
1217 
+        // ----- Error log
1218 
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
1219 
+        $v_result = PCLZIP_ERR_INVALID_PARAMETER;
1220 1220 
     }
1221 1221
1222 1222 
     // ----- Return
1223 1223 
     return $v_result;
1224 
-  }
1225 
-  // --------------------------------------------------------------------------------
1226 
-
1227 
-  // --------------------------------------------------------------------------------
1228 
-  // Function : merge()
1229 
-  // Description :
1230 
-  //   This method merge the $p_archive_to_add archive at the end of the current
1231 
-  //   one ($this).
1232 
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
1233 
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
1234 
-  // Parameters :
1235 
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
1236 
-  //                       or a PclZip object archive.
1237 
-  // Return Values :
1238 
-  //   1 on success,
1239 
-  //   0 or negative values on error (see below).
1240 
-  // --------------------------------------------------------------------------------
1241 
-  function merge($p_archive_to_add)
1242 
-  {
1224 
+    }
1225 
+    // --------------------------------------------------------------------------------
1226 
+
1227 
+    // --------------------------------------------------------------------------------
1228 
+    // Function : merge()
1229 
+    // Description :
1230 
+    //   This method merge the $p_archive_to_add archive at the end of the current
1231 
+    //   one ($this).
1232 
+    //   If the archive ($this) does not exist, the merge becomes a duplicate.
1233 
+    //   If the $p_archive_to_add archive does not exist, the merge is a success.
1234 
+    // Parameters :
1235 
+    //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
1236 
+    //                       or a PclZip object archive.
1237 
+    // Return Values :
1238 
+    //   1 on success,
1239 
+    //   0 or negative values on error (see below).
1240 
+    // --------------------------------------------------------------------------------
1241 
+    function merge($p_archive_to_add)
1242 
+    {
1243 1243 
     $v_result = 1;
1244 1244
1245 1245 
     // ----- Reset the error handler

@@ -1247,125 +1247,125 @@  discard block
 
 block discarded – undo
1247 1247
1248 1248 
     // ----- Check archive
1249 1249 
     if (!$this->privCheckFormat()) {
1250 
-      return(0);
1250 
+        return(0);
1251 1251 
     }
1252 1252
1253 1253 
     // ----- Look if the $p_archive_to_add is a PclZip object
1254 1254 
     if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
1255 1255 
     {
1256 1256
1257 
-      // ----- Merge the archive
1258 
-      $v_result = $this->privMerge($p_archive_to_add);
1257 
+        // ----- Merge the archive
1258 
+        $v_result = $this->privMerge($p_archive_to_add);
1259 1259 
     }
1260 1260
1261 1261 
     // ----- Look if the $p_archive_to_add is a string (so a filename)
1262 1262 
     else if (is_string($p_archive_to_add))
1263 1263 
     {
1264 1264
1265 
-      // ----- Create a temporary archive
1266 
-      $v_object_archive = new PclZip($p_archive_to_add);
1265 
+        // ----- Create a temporary archive
1266 
+        $v_object_archive = new PclZip($p_archive_to_add);
1267 1267
1268 
-      // ----- Merge the archive
1269 
-      $v_result = $this->privMerge($v_object_archive);
1268 
+        // ----- Merge the archive
1269 
+        $v_result = $this->privMerge($v_object_archive);
1270 1270 
     }
1271 1271
1272 1272 
     // ----- Invalid variable
1273 1273 
     else
1274 1274 
     {
1275 
-      // ----- Error log
1276 
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
1277 
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
1275 
+        // ----- Error log
1276 
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
1277 
+        $v_result = PCLZIP_ERR_INVALID_PARAMETER;
1278 1278 
     }
1279 1279
1280 1280 
     // ----- Return
1281 1281 
     return $v_result;
1282 
-  }
1283 
-  // --------------------------------------------------------------------------------
1282 
+    }
1283 
+    // --------------------------------------------------------------------------------
1284 1284
1285 1285
1286 1286
1287 
-  // --------------------------------------------------------------------------------
1288 
-  // Function : errorCode()
1289 
-  // Description :
1290 
-  // Parameters :
1291 
-  // --------------------------------------------------------------------------------
1292 
-  function errorCode()
1293 
-  {
1287 
+    // --------------------------------------------------------------------------------
1288 
+    // Function : errorCode()
1289 
+    // Description :
1290 
+    // Parameters :
1291 
+    // --------------------------------------------------------------------------------
1292 
+    function errorCode()
1293 
+    {
1294 1294 
     if (PCLZIP_ERROR_EXTERNAL == 1) {
1295 
-      return(PclErrorCode());
1295 
+        return(PclErrorCode());
1296 1296 
     }
1297 1297 
     else {
1298 
-      return($this->error_code);
1299 
-    }
1300 
-  }
1301 
-  // --------------------------------------------------------------------------------
1302 
-
1303 
-  // --------------------------------------------------------------------------------
1304 
-  // Function : errorName()
1305 
-  // Description :
1306 
-  // Parameters :
1307 
-  // --------------------------------------------------------------------------------
1308 
-  function errorName($p_with_code=false)
1309 
-  {
1298 
+        return($this->error_code);
1299 
+    }
1300 
+    }
1301 
+    // --------------------------------------------------------------------------------
1302 
+
1303 
+    // --------------------------------------------------------------------------------
1304 
+    // Function : errorName()
1305 
+    // Description :
1306 
+    // Parameters :
1307 
+    // --------------------------------------------------------------------------------
1308 
+    function errorName($p_with_code=false)
1309 
+    {
1310 1310 
     $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
1311 
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
1312 
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
1313 
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
1314 
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
1315 
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
1316 
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
1317 
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
1318 
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
1319 
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
1320 
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
1321 
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
1322 
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
1323 
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
1324 
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
1325 
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
1326 
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
1327 
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
1328 
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
1329 
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
1330 
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
1311 
+                        PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
1312 
+                        PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
1313 
+                        PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
1314 
+                        PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
1315 
+                        PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
1316 
+                        PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
1317 
+                        PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
1318 
+                        PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
1319 
+                        PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
1320 
+                        PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
1321 
+                        PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
1322 
+                        PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
1323 
+                        PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
1324 
+                        PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
1325 
+                        PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
1326 
+                        PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
1327 
+                        PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
1328 
+                        PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
1329 
+                        ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
1330 
+                        ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
1331 1331 
                     );
1332 1332
1333 1333 
     if (isset($v_name[$this->error_code])) {
1334 
-      $v_value = $v_name[$this->error_code];
1334 
+        $v_value = $v_name[$this->error_code];
1335 1335 
     }
1336 1336 
     else {
1337 
-      $v_value = 'NoName';
1337 
+        $v_value = 'NoName';
1338 1338 
     }
1339 1339
1340 1340 
     if ($p_with_code) {
1341 
-      return($v_value.' ('.$this->error_code.')');
1341 
+        return($v_value.' ('.$this->error_code.')');
1342 1342 
     }
1343 1343 
     else {
1344 
-      return($v_value);
1345 
-    }
1346 
-  }
1347 
-  // --------------------------------------------------------------------------------
1348 
-
1349 
-  // --------------------------------------------------------------------------------
1350 
-  // Function : errorInfo()
1351 
-  // Description :
1352 
-  // Parameters :
1353 
-  // --------------------------------------------------------------------------------
1354 
-  function errorInfo($p_full=false)
1355 
-  {
1344 
+        return($v_value);
1345 
+    }
1346 
+    }
1347 
+    // --------------------------------------------------------------------------------
1348 
+
1349 
+    // --------------------------------------------------------------------------------
1350 
+    // Function : errorInfo()
1351 
+    // Description :
1352 
+    // Parameters :
1353 
+    // --------------------------------------------------------------------------------
1354 
+    function errorInfo($p_full=false)
1355 
+    {
1356 1356 
     if (PCLZIP_ERROR_EXTERNAL == 1) {
1357 
-      return(PclErrorString());
1357 
+        return(PclErrorString());
1358 1358 
     }
1359 1359 
     else {
1360 
-      if ($p_full) {
1360 
+        if ($p_full) {
1361 1361 
         return($this->errorName(true)." : ".$this->error_string);
1362 
-      }
1363 
-      else {
1362 
+        }
1363 
+        else {
1364 1364 
         return($this->error_string." [code ".$this->error_code."]");
1365 
-      }
1365 
+        }
1366 
+    }
1366 1367 
     }
1367 
-  }
1368 
-  // --------------------------------------------------------------------------------
1368 
+    // --------------------------------------------------------------------------------
1369 1369
1370 1370
1371 1371 
 // --------------------------------------------------------------------------------

@@ -1376,25 +1376,25 @@  discard block
 
 block discarded – undo
1376 1376
1377 1377
1378 1378
1379 
-  // --------------------------------------------------------------------------------
1380 
-  // Function : privCheckFormat()
1381 
-  // Description :
1382 
-  //   This method check that the archive exists and is a valid zip archive.
1383 
-  //   Several level of check exists. (futur)
1384 
-  // Parameters :
1385 
-  //   $p_level : Level of check. Default 0.
1386 
-  //              0 : Check the first bytes (magic codes) (default value))
1387 
-  //              1 : 0 + Check the central directory (futur)
1388 
-  //              2 : 1 + Check each file header (futur)
1389 
-  // Return Values :
1390 
-  //   true on success,
1391 
-  //   false on error, the error code is set.
1392 
-  // --------------------------------------------------------------------------------
1393 
-  function privCheckFormat($p_level=0)
1394 
-  {
1379 
+    // --------------------------------------------------------------------------------
1380 
+    // Function : privCheckFormat()
1381 
+    // Description :
1382 
+    //   This method check that the archive exists and is a valid zip archive.
1383 
+    //   Several level of check exists. (futur)
1384 
+    // Parameters :
1385 
+    //   $p_level : Level of check. Default 0.
1386 
+    //              0 : Check the first bytes (magic codes) (default value))
1387 
+    //              1 : 0 + Check the central directory (futur)
1388 
+    //              2 : 1 + Check each file header (futur)
1389 
+    // Return Values :
1390 
+    //   true on success,
1391 
+    //   false on error, the error code is set.
1392 
+    // --------------------------------------------------------------------------------
1393 
+    function privCheckFormat($p_level=0)
1394 
+    {
1395 1395 
     $v_result = true;
1396 1396
1397 
-	// ----- Reset the file system cache
1397 
+    // ----- Reset the file system cache
1398 1398 
     clearstatcache();
1399 1399
1400 1400 
     // ----- Reset the error handler

@@ -1402,16 +1402,16 @@  discard block
 
 block discarded – undo
1402 1402
1403 1403 
     // ----- Look if the file exits
1404 1404 
     if (!is_file($this->zipname)) {
1405 
-      // ----- Error log
1406 
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
1407 
-      return(false);
1405 
+        // ----- Error log
1406 
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
1407 
+        return(false);
1408 1408 
     }
1409 1409
1410 1410 
     // ----- Check that the file is readeable
1411 1411 
     if (!is_readable($this->zipname)) {
1412 
-      // ----- Error log
1413 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
1414 
-      return(false);
1412 
+        // ----- Error log
1413 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
1414 
+        return(false);
1415 1415 
     }
1416 1416
1417 1417 
     // ----- Check the magic code

@@ -1425,43 +1425,43 @@  discard block
 
 block discarded – undo
1425 1425
1426 1426 
     // ----- Return
1427 1427 
     return $v_result;
1428 
-  }
1429 
-  // --------------------------------------------------------------------------------
1430 
-
1431 
-  // --------------------------------------------------------------------------------
1432 
-  // Function : privParseOptions()
1433 
-  // Description :
1434 
-  //   This internal methods reads the variable list of arguments ($p_options_list,
1435 
-  //   $p_size) and generate an array with the options and values ($v_result_list).
1436 
-  //   $v_requested_options contains the options that can be present and those that
1437 
-  //   must be present.
1438 
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
1439 
-  //   or 'mandatory' as value.
1440 
-  // Parameters :
1441 
-  //   See above.
1442 
-  // Return Values :
1443 
-  //   1 on success.
1444 
-  //   0 on failure.
1445 
-  // --------------------------------------------------------------------------------
1446 
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
1447 
-  {
1428 
+    }
1429 
+    // --------------------------------------------------------------------------------
1430 
+
1431 
+    // --------------------------------------------------------------------------------
1432 
+    // Function : privParseOptions()
1433 
+    // Description :
1434 
+    //   This internal methods reads the variable list of arguments ($p_options_list,
1435 
+    //   $p_size) and generate an array with the options and values ($v_result_list).
1436 
+    //   $v_requested_options contains the options that can be present and those that
1437 
+    //   must be present.
1438 
+    //   $v_requested_options is an array, with the option value as key, and 'optional',
1439 
+    //   or 'mandatory' as value.
1440 
+    // Parameters :
1441 
+    //   See above.
1442 
+    // Return Values :
1443 
+    //   1 on success.
1444 
+    //   0 on failure.
1445 
+    // --------------------------------------------------------------------------------
1446 
+    function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
1447 
+    {
1448 1448 
     $v_result=1;
1449 1449
1450 1450 
     // ----- Read the options
1451 1451 
     $i=0;
1452 1452 
     while ($i<$p_size) {
1453 1453
1454 
-      // ----- Check if the option is supported
1455 
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
1454 
+        // ----- Check if the option is supported
1455 
+        if (!isset($v_requested_options[$p_options_list[$i]])) {
1456 1456 
         // ----- Error log
1457 1457 
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
1458 1458
1459 1459 
         // ----- Return
1460 1460 
         return PclZip::errorCode();
1461 
-      }
1461 
+        }
1462 1462
1463 
-      // ----- Look for next option
1464 
-      switch ($p_options_list[$i]) {
1463 
+        // ----- Look for next option
1464 
+        switch ($p_options_list[$i]) {
1465 1465 
         // ----- Look for options that request a path value
1466 1466 
         case PCLZIP_OPT_PATH :
1467 1467 
         case PCLZIP_OPT_REMOVE_PATH :

@@ -1473,11 +1473,11 @@  discard block
 
 block discarded – undo
1473 1473
1474 1474 
             // ----- Return
1475 1475 
             return PclZip::errorCode();
1476 
-          }
1476 
+            }
1477 1477
1478 
-          // ----- Get the value
1479 
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
1480 
-          $i++;
1478 
+            // ----- Get the value
1479 
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
1480 
+            $i++;
1481 1481 
         break;
1482 1482
1483 1483 
         case PCLZIP_OPT_TEMP_FILE_THRESHOLD :

@@ -1485,24 +1485,24 @@  discard block
 
 block discarded – undo
1485 1485 
           if (($i+1) >= $p_size) {
1486 1486 
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1487 1487 
             return PclZip::errorCode();
1488 
-          }
1488 
+            }
1489 1489
1490 
-          // ----- Check for incompatible options
1491 
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
1490 
+            // ----- Check for incompatible options
1491 
+            if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
1492 1492 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
1493 1493 
             return PclZip::errorCode();
1494 
-          }
1494 
+            }
1495 1495
1496 
-          // ----- Check the value
1497 
-          $v_value = $p_options_list[$i+1];
1498 
-          if ((!is_integer($v_value)) || ($v_value<0)) {
1496 
+            // ----- Check the value
1497 
+            $v_value = $p_options_list[$i+1];
1498 
+            if ((!is_integer($v_value)) || ($v_value<0)) {
1499 1499 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1500 1500 
             return PclZip::errorCode();
1501 
-          }
1501 
+            }
1502 1502
1503 
-          // ----- Get the value (and convert it in bytes)
1504 
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
1505 
-          $i++;
1503 
+            // ----- Get the value (and convert it in bytes)
1504 
+            $v_result_list[$p_options_list[$i]] = $v_value*1048576;
1505 
+            $i++;
1506 1506 
         break;
1507 1507
1508 1508 
         case PCLZIP_OPT_TEMP_FILE_ON :

@@ -1510,9 +1510,9 @@  discard block
 
 block discarded – undo
1510 1510 
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
1511 1511 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
1512 1512 
             return PclZip::errorCode();
1513 
-          }
1513 
+            }
1514 1514
1515 
-          $v_result_list[$p_options_list[$i]] = true;
1515 
+            $v_result_list[$p_options_list[$i]] = true;
1516 1516 
         break;
1517 1517
1518 1518 
         case PCLZIP_OPT_TEMP_FILE_OFF :

@@ -1520,14 +1520,14 @@  discard block
 
 block discarded – undo
1520 1520 
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
1521 1521 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
1522 1522 
             return PclZip::errorCode();
1523 
-          }
1524 
-          // ----- Check for incompatible options
1525 
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
1523 
+            }
1524 
+            // ----- Check for incompatible options
1525 
+            if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
1526 1526 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
1527 1527 
             return PclZip::errorCode();
1528 
-          }
1528 
+            }
1529 1529
1530 
-          $v_result_list[$p_options_list[$i]] = true;
1530 
+            $v_result_list[$p_options_list[$i]] = true;
1531 1531 
         break;
1532 1532
1533 1533 
         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :

@@ -1538,16 +1538,16 @@  discard block
 
 block discarded – undo
1538 1538
1539 1539 
             // ----- Return
1540 1540 
             return PclZip::errorCode();
1541 
-          }
1541 
+            }
1542 1542
1543 
-          // ----- Get the value
1544 
-          if (   is_string($p_options_list[$i+1])
1543 
+            // ----- Get the value
1544 
+            if (   is_string($p_options_list[$i+1])
1545 1545 
               && ($p_options_list[$i+1] != '')) {
1546 1546 
             $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
1547 1547 
             $i++;
1548 
-          }
1549 
-          else {
1550 
-          }
1548 
+            }
1549 
+            else {
1550 
+            }
1551 1551 
         break;
1552 1552
1553 1553 
         // ----- Look for options that request an array of string for value

@@ -1559,23 +1559,23 @@  discard block
 
 block discarded – undo
1559 1559
1560 1560 
             // ----- Return
1561 1561 
             return PclZip::errorCode();
1562 
-          }
1562 
+            }
1563 1563
1564 
-          // ----- Get the value
1565 
-          if (is_string($p_options_list[$i+1])) {
1566 
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
1567 
-          }
1568 
-          else if (is_array($p_options_list[$i+1])) {
1569 
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
1570 
-          }
1571 
-          else {
1564 
+            // ----- Get the value
1565 
+            if (is_string($p_options_list[$i+1])) {
1566 
+                $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
1567 
+            }
1568 
+            else if (is_array($p_options_list[$i+1])) {
1569 
+                $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
1570 
+            }
1571 
+            else {
1572 1572 
             // ----- Error log
1573 1573 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1574 1574
1575 1575 
             // ----- Return
1576 1576 
             return PclZip::errorCode();
1577 
-          }
1578 
-          $i++;
1577 
+            }
1578 
+            $i++;
1579 1579 
         break;
1580 1580
1581 1581 
         // ----- Look for options that request an EREG or PREG expression

@@ -1592,20 +1592,20 @@  discard block
 
 block discarded – undo
1592 1592
1593 1593 
             // ----- Return
1594 1594 
             return PclZip::errorCode();
1595 
-          }
1595 
+            }
1596 1596
1597 
-          // ----- Get the value
1598 
-          if (is_string($p_options_list[$i+1])) {
1599 
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
1600 
-          }
1601 
-          else {
1597 
+            // ----- Get the value
1598 
+            if (is_string($p_options_list[$i+1])) {
1599 
+                $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
1600 
+            }
1601 
+            else {
1602 1602 
             // ----- Error log
1603 1603 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1604 1604
1605 1605 
             // ----- Return
1606 1606 
             return PclZip::errorCode();
1607 
-          }
1608 
-          $i++;
1607 
+            }
1608 
+            $i++;
1609 1609 
         break;
1610 1610
1611 1611 
         // ----- Look for options that takes a string

@@ -1616,29 +1616,29 @@  discard block
 
 block discarded – undo
1616 1616 
           if (($i+1) >= $p_size) {
1617 1617 
             // ----- Error log
1618 1618 
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
1619 
-			                     "Missing parameter value for option '"
1620 
-								 .PclZipUtilOptionText($p_options_list[$i])
1621 
-								 ."'");
1619 
+                                    "Missing parameter value for option '"
1620 
+                                    .PclZipUtilOptionText($p_options_list[$i])
1621 
+                                    ."'");
1622 1622
1623 1623 
             // ----- Return
1624 1624 
             return PclZip::errorCode();
1625 
-          }
1625 
+            }
1626 1626
1627 
-          // ----- Get the value
1628 
-          if (is_string($p_options_list[$i+1])) {
1629 
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
1630 
-          }
1631 
-          else {
1627 
+            // ----- Get the value
1628 
+            if (is_string($p_options_list[$i+1])) {
1629 
+                $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
1630 
+            }
1631 
+            else {
1632 1632 
             // ----- Error log
1633 1633 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
1634 
-			                     "Wrong parameter value for option '"
1635 
-								 .PclZipUtilOptionText($p_options_list[$i])
1636 
-								 ."'");
1634 
+                                    "Wrong parameter value for option '"
1635 
+                                    .PclZipUtilOptionText($p_options_list[$i])
1636 
+                                    ."'");
1637 1637
1638 1638 
             // ----- Return
1639 1639 
             return PclZip::errorCode();
1640 
-          }
1641 
-          $i++;
1640 
+            }
1641 
+            $i++;
1642 1642 
         break;
1643 1643
1644 1644 
         // ----- Look for options that request an array of index

@@ -1650,87 +1650,87 @@  discard block
 
 block discarded – undo
1650 1650
1651 1651 
             // ----- Return
1652 1652 
             return PclZip::errorCode();
1653 
-          }
1653 
+            }
1654 1654
1655 
-          // ----- Get the value
1656 
-          $v_work_list = array();
1657 
-          if (is_string($p_options_list[$i+1])) {
1655 
+            // ----- Get the value
1656 
+            $v_work_list = array();
1657 
+            if (is_string($p_options_list[$i+1])) {
1658 1658
1659 
-              // ----- Remove spaces
1660 
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
1659 
+                // ----- Remove spaces
1660 
+                $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
1661 1661
1662 
-              // ----- Parse items
1663 
-              $v_work_list = explode(",", $p_options_list[$i+1]);
1664 
-          }
1665 
-          else if (is_integer($p_options_list[$i+1])) {
1666 
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
1667 
-          }
1668 
-          else if (is_array($p_options_list[$i+1])) {
1669 
-              $v_work_list = $p_options_list[$i+1];
1670 
-          }
1671 
-          else {
1662 
+                // ----- Parse items
1663 
+                $v_work_list = explode(",", $p_options_list[$i+1]);
1664 
+            }
1665 
+            else if (is_integer($p_options_list[$i+1])) {
1666 
+                $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
1667 
+            }
1668 
+            else if (is_array($p_options_list[$i+1])) {
1669 
+                $v_work_list = $p_options_list[$i+1];
1670 
+            }
1671 
+            else {
1672 1672 
             // ----- Error log
1673 1673 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1674 1674
1675 1675 
             // ----- Return
1676 1676 
             return PclZip::errorCode();
1677 
-          }
1677 
+            }
1678 1678
1679 
-          // ----- Reduce the index list
1680 
-          // each index item in the list must be a couple with a start and
1681 
-          // an end value : [0,3], [5-5], [8-10], ...
1682 
-          // ----- Check the format of each item
1683 
-          $v_sort_flag=false;
1684 
-          $v_sort_value=0;
1685 
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
1686 
-              // ----- Explode the item
1687 
-              $v_item_list = explode("-", $v_work_list[$j]);
1688 
-              $v_size_item_list = sizeof($v_item_list);
1689 
-
1690 
-              // ----- TBC : Here we might check that each item is a
1691 
-              // real integer ...
1692 
-
1693 
-              // ----- Look for single value
1694 
-              if ($v_size_item_list == 1) {
1695 
-                  // ----- Set the option value
1696 
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
1697 
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
1698 
-              }
1699 
-              elseif ($v_size_item_list == 2) {
1700 
-                  // ----- Set the option value
1701 
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
1702 
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
1703 
-              }
1704 
-              else {
1705 
-                  // ----- Error log
1706 
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1707 
-
1708 
-                  // ----- Return
1709 
-                  return PclZip::errorCode();
1710 
-              }
1711 
-
1712 
-
1713 
-              // ----- Look for list sort
1714 
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
1715 
-                  $v_sort_flag=true;
1716 
-
1717 
-                  // ----- TBC : An automatic sort should be writen ...
1718 
-                  // ----- Error log
1719 
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1720 
-
1721 
-                  // ----- Return
1722 
-                  return PclZip::errorCode();
1723 
-              }
1724 
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
1725 
-          }
1679 
+            // ----- Reduce the index list
1680 
+            // each index item in the list must be a couple with a start and
1681 
+            // an end value : [0,3], [5-5], [8-10], ...
1682 
+            // ----- Check the format of each item
1683 
+            $v_sort_flag=false;
1684 
+            $v_sort_value=0;
1685 
+            for ($j=0; $j<sizeof($v_work_list); $j++) {
1686 
+                // ----- Explode the item
1687 
+                $v_item_list = explode("-", $v_work_list[$j]);
1688 
+                $v_size_item_list = sizeof($v_item_list);
1689 
+
1690 
+                // ----- TBC : Here we might check that each item is a
1691 
+                // real integer ...
1692 
+
1693 
+                // ----- Look for single value
1694 
+                if ($v_size_item_list == 1) {
1695 
+                    // ----- Set the option value
1696 
+                    $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
1697 
+                    $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
1698 
+                }
1699 
+                elseif ($v_size_item_list == 2) {
1700 
+                    // ----- Set the option value
1701 
+                    $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
1702 
+                    $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
1703 
+                }
1704 
+                else {
1705 
+                    // ----- Error log
1706 
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1707 
+
1708 
+                    // ----- Return
1709 
+                    return PclZip::errorCode();
1710 
+                }
1711 
+
1712 
+
1713 
+                // ----- Look for list sort
1714 
+                if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
1715 
+                    $v_sort_flag=true;
1716 
+
1717 
+                    // ----- TBC : An automatic sort should be writen ...
1718 
+                    // ----- Error log
1719 
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1720 
+
1721 
+                    // ----- Return
1722 
+                    return PclZip::errorCode();
1723 
+                }
1724 
+                $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
1725 
+            }
1726 1726
1727 
-          // ----- Sort the items
1728 
-          if ($v_sort_flag) {
1729 
-              // TBC : To Be Completed
1730 
-          }
1727 
+            // ----- Sort the items
1728 
+            if ($v_sort_flag) {
1729 
+                // TBC : To Be Completed
1730 
+            }
1731 1731
1732 
-          // ----- Next option
1733 
-          $i++;
1732 
+            // ----- Next option
1733 
+            $i++;
1734 1734 
         break;
1735 1735
1736 1736 
         // ----- Look for options that request no value

@@ -1752,11 +1752,11 @@  discard block
 
 block discarded – undo
1752 1752
1753 1753 
             // ----- Return
1754 1754 
             return PclZip::errorCode();
1755 
-          }
1755 
+            }
1756 1756
1757 
-          // ----- Get the value
1758 
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
1759 
-          $i++;
1757 
+            // ----- Get the value
1758 
+            $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
1759 
+            $i++;
1760 1760 
         break;
1761 1761
1762 1762 
         // ----- Look for options that request a call-back

@@ -1777,54 +1777,54 @@  discard block
 
 block discarded – undo
1777 1777
1778 1778 
             // ----- Return
1779 1779 
             return PclZip::errorCode();
1780 
-          }
1780 
+            }
1781 1781
1782 
-          // ----- Get the value
1783 
-          $v_function_name = $p_options_list[$i+1];
1782 
+            // ----- Get the value
1783 
+            $v_function_name = $p_options_list[$i+1];
1784 1784
1785 
-          // ----- Check that the value is a valid existing function
1786 
-          if (!function_exists($v_function_name)) {
1785 
+            // ----- Check that the value is a valid existing function
1786 
+            if (!function_exists($v_function_name)) {
1787 1787 
             // ----- Error log
1788 1788 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
1789 1789
1790 1790 
             // ----- Return
1791 1791 
             return PclZip::errorCode();
1792 
-          }
1792 
+            }
1793 1793
1794 
-          // ----- Set the attribute
1795 
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
1796 
-          $i++;
1794 
+            // ----- Set the attribute
1795 
+            $v_result_list[$p_options_list[$i]] = $v_function_name;
1796 
+            $i++;
1797 1797 
         break;
1798 1798
1799 1799 
         default :
1800 1800 
           // ----- Error log
1801 1801 
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
1802 
-		                       "Unknown parameter '"
1803 
-							   .$p_options_list[$i]."'");
1802 
+                                "Unknown parameter '"
1803 
+                                .$p_options_list[$i]."'");
1804 1804
1805 
-          // ----- Return
1806 
-          return PclZip::errorCode();
1807 
-      }
1805 
+            // ----- Return
1806 
+            return PclZip::errorCode();
1807 
+        }
1808 1808
1809 
-      // ----- Next options
1810 
-      $i++;
1809 
+        // ----- Next options
1810 
+        $i++;
1811 1811 
     }
1812 1812
1813 1813 
     // ----- Look for mandatory options
1814 1814 
     if ($v_requested_options !== false) {
1815 
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
1815 
+        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
1816 1816 
         // ----- Look for mandatory option
1817 1817 
         if ($v_requested_options[$key] == 'mandatory') {
1818 
-          // ----- Look if present
1819 
-          if (!isset($v_result_list[$key])) {
1818 
+            // ----- Look if present
1819 
+            if (!isset($v_result_list[$key])) {
1820 1820 
             // ----- Error log
1821 1821 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
1822 1822
1823 1823 
             // ----- Return
1824 1824 
             return PclZip::errorCode();
1825 
-          }
1825 
+            }
1826 
+        }
1826 1827 
         }
1827 
-      }
1828 1828 
     }
1829 1829
1830 1830 
     // ----- Look for default values

@@ -1834,22 +1834,22 @@  discard block
 
 block discarded – undo
1834 1834
1835 1835 
     // ----- Return
1836 1836 
     return $v_result;
1837 
-  }
1838 
-  // --------------------------------------------------------------------------------
1839 
-
1840 
-  // --------------------------------------------------------------------------------
1841 
-  // Function : privOptionDefaultThreshold()
1842 
-  // Description :
1843 
-  // Parameters :
1844 
-  // Return Values :
1845 
-  // --------------------------------------------------------------------------------
1846 
-  function privOptionDefaultThreshold(&$p_options)
1847 
-  {
1837 
+    }
1838 
+    // --------------------------------------------------------------------------------
1839 
+
1840 
+    // --------------------------------------------------------------------------------
1841 
+    // Function : privOptionDefaultThreshold()
1842 
+    // Description :
1843 
+    // Parameters :
1844 
+    // Return Values :
1845 
+    // --------------------------------------------------------------------------------
1846 
+    function privOptionDefaultThreshold(&$p_options)
1847 
+    {
1848 1848 
     $v_result=1;
1849 1849
1850 1850 
     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
1851 1851 
         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
1852 
-      return $v_result;
1852 
+        return $v_result;
1853 1853 
     }
1854 1854
1855 1855 
     // ----- Get 'memory_limit' configuration value

@@ -1871,52 +1871,52 @@  discard block
 
 block discarded – undo
1871 1871
1872 1872 
     // ----- Sanity check : No threshold if value lower than 1M
1873 1873 
     if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
1874 
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
1874 
+        unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
1875 1875 
     }
1876 1876
1877 1877 
     // ----- Return
1878 1878 
     return $v_result;
1879 
-  }
1880 
-  // --------------------------------------------------------------------------------
1881 
-
1882 
-  // --------------------------------------------------------------------------------
1883 
-  // Function : privFileDescrParseAtt()
1884 
-  // Description :
1885 
-  // Parameters :
1886 
-  // Return Values :
1887 
-  //   1 on success.
1888 
-  //   0 on failure.
1889 
-  // --------------------------------------------------------------------------------
1890 
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
1891 
-  {
1879 
+    }
1880 
+    // --------------------------------------------------------------------------------
1881 
+
1882 
+    // --------------------------------------------------------------------------------
1883 
+    // Function : privFileDescrParseAtt()
1884 
+    // Description :
1885 
+    // Parameters :
1886 
+    // Return Values :
1887 
+    //   1 on success.
1888 
+    //   0 on failure.
1889 
+    // --------------------------------------------------------------------------------
1890 
+    function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
1891 
+    {
1892 1892 
     $v_result=1;
1893 1893
1894 1894 
     // ----- For each file in the list check the attributes
1895 1895 
     foreach ($p_file_list as $v_key => $v_value) {
1896 1896
1897 
-      // ----- Check if the option is supported
1898 
-      if (!isset($v_requested_options[$v_key])) {
1897 
+        // ----- Check if the option is supported
1898 
+        if (!isset($v_requested_options[$v_key])) {
1899 1899 
         // ----- Error log
1900 1900 
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
1901 1901
1902 1902 
         // ----- Return
1903 1903 
         return PclZip::errorCode();
1904 
-      }
1904 
+        }
1905 1905
1906 
-      // ----- Look for attribute
1907 
-      switch ($v_key) {
1906 
+        // ----- Look for attribute
1907 
+        switch ($v_key) {
1908 1908 
         case PCLZIP_ATT_FILE_NAME :
1909 1909 
           if (!is_string($v_value)) {
1910 1910 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
1911 1911 
             return PclZip::errorCode();
1912 
-          }
1912 
+            }
1913 1913
1914 
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
1914 
+            $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
1915 1915
1916 
-          if ($p_filedescr['filename'] == '') {
1916 
+            if ($p_filedescr['filename'] == '') {
1917 1917 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
1918 1918 
             return PclZip::errorCode();
1919 
-          }
1919 
+            }
1920 1920
1921 1921 
         break;
1922 1922 
 

@@ -1924,28 +1924,28 @@  discard block
 
 block discarded – undo
1924 1924 
           if (!is_string($v_value)) {
1925 1925 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
1926 1926 
             return PclZip::errorCode();
1927 
-          }
1927 
+            }
1928 1928
1929 
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
1929 
+            $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
1930 1930
1931 
-          if ($p_filedescr['new_short_name'] == '') {
1931 
+            if ($p_filedescr['new_short_name'] == '') {
1932 1932 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
1933 1933 
             return PclZip::errorCode();
1934 
-          }
1934 
+            }
1935 1935 
         break;
1936 1936
1937 1937 
         case PCLZIP_ATT_FILE_NEW_FULL_NAME :
1938 1938 
           if (!is_string($v_value)) {
1939 1939 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
1940 1940 
             return PclZip::errorCode();
1941 
-          }
1941 
+            }
1942 1942
1943 
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
1943 
+            $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
1944 1944
1945 
-          if ($p_filedescr['new_full_name'] == '') {
1945 
+            if ($p_filedescr['new_full_name'] == '') {
1946 1946 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
1947 1947 
             return PclZip::errorCode();
1948 
-          }
1948 
+            }
1949 1949 
         break;
1950 1950
1951 1951 
         // ----- Look for options that takes a string

@@ -1953,18 +1953,18 @@  discard block
 
 block discarded – undo
1953 1953 
           if (!is_string($v_value)) {
1954 1954 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
1955 1955 
             return PclZip::errorCode();
1956 
-          }
1956 
+            }
1957 1957
1958 
-          $p_filedescr['comment'] = $v_value;
1958 
+            $p_filedescr['comment'] = $v_value;
1959 1959 
         break;
1960 1960
1961 1961 
         case PCLZIP_ATT_FILE_MTIME :
1962 1962 
           if (!is_integer($v_value)) {
1963 1963 
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
1964 1964 
             return PclZip::errorCode();
1965 
-          }
1965 
+            }
1966 1966
1967 
-          $p_filedescr['mtime'] = $v_value;
1967 
+            $p_filedescr['mtime'] = $v_value;
1968 1968 
         break;
1969 1969
1970 1970 
         case PCLZIP_ATT_FILE_CONTENT :

@@ -1974,50 +1974,50 @@  discard block
 
 block discarded – undo
1974 1974 
         default :
1975 1975 
           // ----- Error log
1976 1976 
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
1977 
-		                           "Unknown parameter '".$v_key."'");
1977 
+                                    "Unknown parameter '".$v_key."'");
1978 1978
1979 
-          // ----- Return
1980 
-          return PclZip::errorCode();
1981 
-      }
1979 
+            // ----- Return
1980 
+            return PclZip::errorCode();
1981 
+        }
1982 1982
1983 
-      // ----- Look for mandatory options
1984 
-      if ($v_requested_options !== false) {
1983 
+        // ----- Look for mandatory options
1984 
+        if ($v_requested_options !== false) {
1985 1985 
         for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
1986 
-          // ----- Look for mandatory option
1987 
-          if ($v_requested_options[$key] == 'mandatory') {
1986 
+            // ----- Look for mandatory option
1987 
+            if ($v_requested_options[$key] == 'mandatory') {
1988 1988 
             // ----- Look if present
1989 1989 
             if (!isset($p_file_list[$key])) {
1990 
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
1991 
-              return PclZip::errorCode();
1990 
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
1991 
+                return PclZip::errorCode();
1992 
+            }
1992 1993 
             }
1993 
-          }
1994 1994 
         }
1995 
-      }
1995 
+        }
1996 1996
1997 1997 
     // end foreach
1998 1998 
     }
1999 1999
2000 2000 
     // ----- Return
2001 2001 
     return $v_result;
2002 
-  }
2003 
-  // --------------------------------------------------------------------------------
2004 
-
2005 
-  // --------------------------------------------------------------------------------
2006 
-  // Function : privFileDescrExpand()
2007 
-  // Description :
2008 
-  //   This method look for each item of the list to see if its a file, a folder
2009 
-  //   or a string to be added as file. For any other type of files (link, other)
2010 
-  //   just ignore the item.
2011 
-  //   Then prepare the information that will be stored for that file.
2012 
-  //   When its a folder, expand the folder with all the files that are in that
2013 
-  //   folder (recursively).
2014 
-  // Parameters :
2015 
-  // Return Values :
2016 
-  //   1 on success.
2017 
-  //   0 on failure.
2018 
-  // --------------------------------------------------------------------------------
2019 
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
2020 
-  {
2002 
+    }
2003 
+    // --------------------------------------------------------------------------------
2004 
+
2005 
+    // --------------------------------------------------------------------------------
2006 
+    // Function : privFileDescrExpand()
2007 
+    // Description :
2008 
+    //   This method look for each item of the list to see if its a file, a folder
2009 
+    //   or a string to be added as file. For any other type of files (link, other)
2010 
+    //   just ignore the item.
2011 
+    //   Then prepare the information that will be stored for that file.
2012 
+    //   When its a folder, expand the folder with all the files that are in that
2013 
+    //   folder (recursively).
2014 
+    // Parameters :
2015 
+    // Return Values :
2016 
+    //   1 on success.
2017 
+    //   0 on failure.
2018 
+    // --------------------------------------------------------------------------------
2019 
+    function privFileDescrExpand(&$p_filedescr_list, &$p_options)
2020 
+    {
2021 2021 
     $v_result=1;
2022 2022
2023 2023 
     // ----- Create a result list

@@ -2026,58 +2026,58 @@  discard block
 
 block discarded – undo
2026 2026 
     // ----- Look each entry
2027 2027 
     for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
2028 2028
2029 
-      // ----- Get filedescr
2030 
-      $v_descr = $p_filedescr_list[$i];
2029 
+        // ----- Get filedescr
2030 
+        $v_descr = $p_filedescr_list[$i];
2031 2031
2032 
-      // ----- Reduce the filename
2033 
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
2034 
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
2032 
+        // ----- Reduce the filename
2033 
+        $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
2034 
+        $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
2035 2035
2036 
-      // ----- Look for real file or folder
2037 
-      if (file_exists($v_descr['filename'])) {
2036 
+        // ----- Look for real file or folder
2037 
+        if (file_exists($v_descr['filename'])) {
2038 2038 
         if (@is_file($v_descr['filename'])) {
2039 
-          $v_descr['type'] = 'file';
2039 
+            $v_descr['type'] = 'file';
2040 2040 
         }
2041 2041 
         else if (@is_dir($v_descr['filename'])) {
2042 
-          $v_descr['type'] = 'folder';
2042 
+            $v_descr['type'] = 'folder';
2043 2043 
         }
2044 2044 
         else if (@is_link($v_descr['filename'])) {
2045 
-          // skip
2046 
-          continue;
2045 
+            // skip
2046 
+            continue;
2047 2047 
         }
2048 2048 
         else {
2049 
-          // skip
2050 
-          continue;
2049 
+            // skip
2050 
+            continue;
2051 
+        }
2051 2052 
         }
2052 
-      }
2053 2053
2054 
-      // ----- Look for string added as file
2055 
-      else if (isset($v_descr['content'])) {
2054 
+        // ----- Look for string added as file
2055 
+        else if (isset($v_descr['content'])) {
2056 2056 
         $v_descr['type'] = 'virtual_file';
2057 
-      }
2057 
+        }
2058 2058
2059 
-      // ----- Missing file
2060 
-      else {
2059 
+        // ----- Missing file
2060 
+        else {
2061 2061 
         // ----- Error log
2062 2062 
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
2063 2063
2064 2064 
         // ----- Return
2065 2065 
         return PclZip::errorCode();
2066 
-      }
2066 
+        }
2067 2067
2068 
-      // ----- Calculate the stored filename
2069 
-      $this->privCalculateStoredFilename($v_descr, $p_options);
2068 
+        // ----- Calculate the stored filename
2069 
+        $this->privCalculateStoredFilename($v_descr, $p_options);
2070 2070
2071 
-      // ----- Add the descriptor in result list
2072 
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
2071 
+        // ----- Add the descriptor in result list
2072 
+        $v_result_list[sizeof($v_result_list)] = $v_descr;
2073 2073
2074 
-      // ----- Look for folder
2075 
-      if ($v_descr['type'] == 'folder') {
2074 
+        // ----- Look for folder
2075 
+        if ($v_descr['type'] == 'folder') {
2076 2076 
         // ----- List of items in folder
2077 2077 
         $v_dirlist_descr = array();
2078 2078 
         $v_dirlist_nb = 0;
2079 2079 
         if ($v_folder_handler = @opendir($v_descr['filename'])) {
2080 
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
2080 
+            while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
2081 2081
2082 2082 
             // ----- Skip '.' and '..'
2083 2083 
             if (($v_item_handler == '.') || ($v_item_handler == '..')) {

@@ -2092,39 +2092,39 @@  discard block
 
 block discarded – undo
2092 2092 
             // files/sub-folders also change
2093 2093 
             if (($v_descr['stored_filename'] != $v_descr['filename'])
2094 2094 
                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
2095 
-              if ($v_descr['stored_filename'] != '') {
2095 
+                if ($v_descr['stored_filename'] != '') {
2096 2096 
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
2097 
-              }
2098 
-              else {
2097 
+                }
2098 
+                else {
2099 2099 
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
2100 
-              }
2100 
+                }
2101 2101 
             }
2102 2102
2103 2103 
             $v_dirlist_nb++;
2104 
-          }
2104 
+            }
2105 2105
2106 
-          @closedir($v_folder_handler);
2106 
+            @closedir($v_folder_handler);
2107 2107 
         }
2108 2108 
         else {
2109 
-          // TBC : unable to open folder in read mode
2109 
+            // TBC : unable to open folder in read mode
2110 2110 
         }
2111 2111
2112 2112 
         // ----- Expand each element of the list
2113 2113 
         if ($v_dirlist_nb != 0) {
2114 
-          // ----- Expand
2115 
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
2114 
+            // ----- Expand
2115 
+            if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
2116 2116 
             return $v_result;
2117 
-          }
2117 
+            }
2118 2118
2119 
-          // ----- Concat the resulting list
2120 
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
2119 
+            // ----- Concat the resulting list
2120 
+            $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
2121 2121 
         }
2122 2122 
         else {
2123 2123 
         }
2124 2124
2125 2125 
         // ----- Free local array
2126 2126 
         unset($v_dirlist_descr);
2127 
-      }
2127 
+        }
2128 2128 
     }
2129 2129
2130 2130 
     // ----- Get the result list

@@ -2132,17 +2132,17 @@  discard block
 
 block discarded – undo
2132 2132
2133 2133 
     // ----- Return
2134 2134 
     return $v_result;
2135 
-  }
2136 
-  // --------------------------------------------------------------------------------
2137 
-
2138 
-  // --------------------------------------------------------------------------------
2139 
-  // Function : privCreate()
2140 
-  // Description :
2141 
-  // Parameters :
2142 
-  // Return Values :
2143 
-  // --------------------------------------------------------------------------------
2144 
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
2145 
-  {
2135 
+    }
2136 
+    // --------------------------------------------------------------------------------
2137 
+
2138 
+    // --------------------------------------------------------------------------------
2139 
+    // Function : privCreate()
2140 
+    // Description :
2141 
+    // Parameters :
2142 
+    // Return Values :
2143 
+    // --------------------------------------------------------------------------------
2144 
+    function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
2145 
+    {
2146 2146 
     $v_result=1;
2147 2147 
     $v_list_detail = array();
2148 2148 
 

@@ -2152,8 +2152,8 @@  discard block
 
 block discarded – undo
2152 2152 
     // ----- Open the file in write mode
2153 2153 
     if (($v_result = $this->privOpenFd('wb')) != 1)
2154 2154 
     {
2155 
-      // ----- Return
2156 
-      return $v_result;
2155 
+        // ----- Return
2156 
+        return $v_result;
2157 2157 
     }
2158 2158
2159 2159 
     // ----- Add the list of files

@@ -2167,17 +2167,17 @@  discard block
 
 block discarded – undo
2167 2167
2168 2168 
     // ----- Return
2169 2169 
     return $v_result;
2170 
-  }
2171 
-  // --------------------------------------------------------------------------------
2172 
-
2173 
-  // --------------------------------------------------------------------------------
2174 
-  // Function : privAdd()
2175 
-  // Description :
2176 
-  // Parameters :
2177 
-  // Return Values :
2178 
-  // --------------------------------------------------------------------------------
2179 
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
2180 
-  {
2170 
+    }
2171 
+    // --------------------------------------------------------------------------------
2172 
+
2173 
+    // --------------------------------------------------------------------------------
2174 
+    // Function : privAdd()
2175 
+    // Description :
2176 
+    // Parameters :
2177 
+    // Return Values :
2178 
+    // --------------------------------------------------------------------------------
2179 
+    function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
2180 
+    {
2181 2181 
     $v_result=1;
2182 2182 
     $v_list_detail = array();
2183 2183 
 

@@ -2185,11 +2185,11 @@  discard block
 
 block discarded – undo
2185 2185 
     if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
2186 2186 
     {
2187 2187
2188 
-      // ----- Do a create
2189 
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
2188 
+        // ----- Do a create
2189 
+        $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
2190 2190
2191 
-      // ----- Return
2192 
-      return $v_result;
2191 
+        // ----- Return
2192 
+        return $v_result;
2193 2193 
     }
2194 2194 
     // ----- Magic quotes trick
2195 2195 
     $this->privDisableMagicQuotes();

@@ -2197,20 +2197,20 @@  discard block
 
 block discarded – undo
2197 2197 
     // ----- Open the zip file
2198 2198 
     if (($v_result=$this->privOpenFd('rb')) != 1)
2199 2199 
     {
2200 
-      // ----- Magic quotes trick
2201 
-      $this->privSwapBackMagicQuotes();
2200 
+        // ----- Magic quotes trick
2201 
+        $this->privSwapBackMagicQuotes();
2202 2202
2203 
-      // ----- Return
2204 
-      return $v_result;
2203 
+        // ----- Return
2204 
+        return $v_result;
2205 2205 
     }
2206 2206
2207 2207 
     // ----- Read the central directory informations
2208 2208 
     $v_central_dir = array();
2209 2209 
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
2210 2210 
     {
2211 
-      $this->privCloseFd();
2212 
-      $this->privSwapBackMagicQuotes();
2213 
-      return $v_result;
2211 
+        $this->privCloseFd();
2212 
+        $this->privSwapBackMagicQuotes();
2213 
+        return $v_result;
2214 2214 
     }
2215 2215
2216 2216 
     // ----- Go to beginning of File

@@ -2222,13 +2222,13 @@  discard block
 
 block discarded – undo
2222 2222 
     // ----- Open the temporary file in write mode
2223 2223 
     if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
2224 2224 
     {
2225 
-      $this->privCloseFd();
2226 
-      $this->privSwapBackMagicQuotes();
2225 
+        $this->privCloseFd();
2226 
+        $this->privSwapBackMagicQuotes();
2227 2227
2228 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
2228 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
2229 2229
2230 
-      // ----- Return
2231 
-      return PclZip::errorCode();
2230 
+        // ----- Return
2231 
+        return PclZip::errorCode();
2232 2232 
     }
2233 2233
2234 2234 
     // ----- Copy the files from the archive to the temporary file

@@ -2236,10 +2236,10 @@  discard block
 
 block discarded – undo
2236 2236 
     $v_size = $v_central_dir['offset'];
2237 2237 
     while ($v_size != 0)
2238 2238 
     {
2239 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
2240 
-      $v_buffer = fread($this->zip_fd, $v_read_size);
2241 
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
2242 
-      $v_size -= $v_read_size;
2239 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
2240 
+        $v_buffer = fread($this->zip_fd, $v_read_size);
2241 
+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
2242 
+        $v_size -= $v_read_size;
2243 2243 
     }
2244 2244
2245 2245 
     // ----- Swap the file descriptor

@@ -2253,13 +2253,13 @@  discard block
 
 block discarded – undo
2253 2253 
     $v_header_list = array();
2254 2254 
     if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
2255 2255 
     {
2256 
-      fclose($v_zip_temp_fd);
2257 
-      $this->privCloseFd();
2258 
-      @unlink($v_zip_temp_name);
2259 
-      $this->privSwapBackMagicQuotes();
2256 
+        fclose($v_zip_temp_fd);
2257 
+        $this->privCloseFd();
2258 
+        @unlink($v_zip_temp_name);
2259 
+        $this->privSwapBackMagicQuotes();
2260 2260
2261 
-      // ----- Return
2262 
-      return $v_result;
2261 
+        // ----- Return
2262 
+        return $v_result;
2263 2263 
     }
2264 2264
2265 2265 
     // ----- Store the offset of the central dir

@@ -2269,43 +2269,43 @@  discard block
 
 block discarded – undo
2269 2269 
     $v_size = $v_central_dir['size'];
2270 2270 
     while ($v_size != 0)
2271 2271 
     {
2272 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
2273 
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
2274 
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
2275 
-      $v_size -= $v_read_size;
2272 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
2273 
+        $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
2274 
+        @fwrite($this->zip_fd, $v_buffer, $v_read_size);
2275 
+        $v_size -= $v_read_size;
2276 2276 
     }
2277 2277
2278 2278 
     // ----- Create the Central Dir files header
2279 2279 
     for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
2280 2280 
     {
2281 
-      // ----- Create the file header
2282 
-      if ($v_header_list[$i]['status'] == 'ok') {
2281 
+        // ----- Create the file header
2282 
+        if ($v_header_list[$i]['status'] == 'ok') {
2283 2283 
         if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
2284 
-          fclose($v_zip_temp_fd);
2285 
-          $this->privCloseFd();
2286 
-          @unlink($v_zip_temp_name);
2287 
-          $this->privSwapBackMagicQuotes();
2284 
+            fclose($v_zip_temp_fd);
2285 
+            $this->privCloseFd();
2286 
+            @unlink($v_zip_temp_name);
2287 
+            $this->privSwapBackMagicQuotes();
2288 2288
2289 
-          // ----- Return
2290 
-          return $v_result;
2289 
+            // ----- Return
2290 
+            return $v_result;
2291 2291 
         }
2292 2292 
         $v_count++;
2293 
-      }
2293 
+        }
2294 2294
2295 
-      // ----- Transform the header to a 'usable' info
2296 
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
2295 
+        // ----- Transform the header to a 'usable' info
2296 
+        $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
2297 2297 
     }
2298 2298
2299 2299 
     // ----- Zip file comment
2300 2300 
     $v_comment = $v_central_dir['comment'];
2301 2301 
     if (isset($p_options[PCLZIP_OPT_COMMENT])) {
2302 
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
2302 
+        $v_comment = $p_options[PCLZIP_OPT_COMMENT];
2303 2303 
     }
2304 2304 
     if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
2305 
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
2305 
+        $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
2306 2306 
     }
2307 2307 
     if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
2308 
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
2308 
+        $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
2309 2309 
     }
2310 2310
2311 2311 
     // ----- Calculate the size of the central header

@@ -2314,12 +2314,12 @@  discard block
 
 block discarded – undo
2314 2314 
     // ----- Create the central dir footer
2315 2315 
     if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
2316 2316 
     {
2317 
-      // ----- Reset the file list
2318 
-      unset($v_header_list);
2319 
-      $this->privSwapBackMagicQuotes();
2317 
+        // ----- Reset the file list
2318 
+        unset($v_header_list);
2319 
+        $this->privSwapBackMagicQuotes();
2320 2320
2321 
-      // ----- Return
2322 
-      return $v_result;
2321 
+        // ----- Return
2322 
+        return $v_result;
2323 2323 
     }
2324 2324
2325 2325 
     // ----- Swap back the file descriptor

@@ -2347,85 +2347,85 @@  discard block
 
 block discarded – undo
2347 2347
2348 2348 
     // ----- Return
2349 2349 
     return $v_result;
2350 
-  }
2351 
-  // --------------------------------------------------------------------------------
2352 
-
2353 
-  // --------------------------------------------------------------------------------
2354 
-  // Function : privOpenFd()
2355 
-  // Description :
2356 
-  // Parameters :
2357 
-  // --------------------------------------------------------------------------------
2358 
-  function privOpenFd($p_mode)
2359 
-  {
2350 
+    }
2351 
+    // --------------------------------------------------------------------------------
2352 
+
2353 
+    // --------------------------------------------------------------------------------
2354 
+    // Function : privOpenFd()
2355 
+    // Description :
2356 
+    // Parameters :
2357 
+    // --------------------------------------------------------------------------------
2358 
+    function privOpenFd($p_mode)
2359 
+    {
2360 2360 
     $v_result=1;
2361 2361
2362 2362 
     // ----- Look if already open
2363 2363 
     if ($this->zip_fd != 0)
2364 2364 
     {
2365 
-      // ----- Error log
2366 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
2365 
+        // ----- Error log
2366 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
2367 2367
2368 
-      // ----- Return
2369 
-      return PclZip::errorCode();
2368 
+        // ----- Return
2369 
+        return PclZip::errorCode();
2370 2370 
     }
2371 2371
2372 2372 
     // ----- Open the zip file
2373 2373 
     if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
2374 2374 
     {
2375 
-      // ----- Error log
2376 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
2375 
+        // ----- Error log
2376 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
2377 2377
2378 
-      // ----- Return
2379 
-      return PclZip::errorCode();
2378 
+        // ----- Return
2379 
+        return PclZip::errorCode();
2380 2380 
     }
2381 2381
2382 2382 
     // ----- Return
2383 2383 
     return $v_result;
2384 
-  }
2385 
-  // --------------------------------------------------------------------------------
2386 
-
2387 
-  // --------------------------------------------------------------------------------
2388 
-  // Function : privCloseFd()
2389 
-  // Description :
2390 
-  // Parameters :
2391 
-  // --------------------------------------------------------------------------------
2392 
-  function privCloseFd()
2393 
-  {
2384 
+    }
2385 
+    // --------------------------------------------------------------------------------
2386 
+
2387 
+    // --------------------------------------------------------------------------------
2388 
+    // Function : privCloseFd()
2389 
+    // Description :
2390 
+    // Parameters :
2391 
+    // --------------------------------------------------------------------------------
2392 
+    function privCloseFd()
2393 
+    {
2394 2394 
     $v_result=1;
2395 2395
2396 2396 
     if ($this->zip_fd != 0)
2397 
-      @fclose($this->zip_fd);
2397 
+        @fclose($this->zip_fd);
2398 2398 
     $this->zip_fd = 0;
2399 2399
2400 2400 
     // ----- Return
2401 2401 
     return $v_result;
2402 
-  }
2403 
-  // --------------------------------------------------------------------------------
2404 
-
2405 
-  // --------------------------------------------------------------------------------
2406 
-  // Function : privAddList()
2407 
-  // Description :
2408 
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
2409 
-  //   different from the real path of the file. This is usefull if you want to have PclTar
2410 
-  //   running in any directory, and memorize relative path from an other directory.
2411 
-  // Parameters :
2412 
-  //   $p_list : An array containing the file or directory names to add in the tar
2413 
-  //   $p_result_list : list of added files with their properties (specially the status field)
2414 
-  //   $p_add_dir : Path to add in the filename path archived
2415 
-  //   $p_remove_dir : Path to remove in the filename path archived
2416 
-  // Return Values :
2417 
-  // --------------------------------------------------------------------------------
2402 
+    }
2403 
+    // --------------------------------------------------------------------------------
2404 
+
2405 
+    // --------------------------------------------------------------------------------
2406 
+    // Function : privAddList()
2407 
+    // Description :
2408 
+    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
2409 
+    //   different from the real path of the file. This is usefull if you want to have PclTar
2410 
+    //   running in any directory, and memorize relative path from an other directory.
2411 
+    // Parameters :
2412 
+    //   $p_list : An array containing the file or directory names to add in the tar
2413 
+    //   $p_result_list : list of added files with their properties (specially the status field)
2414 
+    //   $p_add_dir : Path to add in the filename path archived
2415 
+    //   $p_remove_dir : Path to remove in the filename path archived
2416 
+    // Return Values :
2417 
+    // --------------------------------------------------------------------------------
2418 2418 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
2419 
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
2420 
-  {
2419 
+    function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
2420 
+    {
2421 2421 
     $v_result=1;
2422 2422
2423 2423 
     // ----- Add the files
2424 2424 
     $v_header_list = array();
2425 2425 
     if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
2426 2426 
     {
2427 
-      // ----- Return
2428 
-      return $v_result;
2427 
+        // ----- Return
2428 
+        return $v_result;
2429 2429 
     }
2430 2430
2431 2431 
     // ----- Store the offset of the central dir

@@ -2434,23 +2434,23 @@  discard block
 
 block discarded – undo
2434 2434 
     // ----- Create the Central Dir files header
2435 2435 
     for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
2436 2436 
     {
2437 
-      // ----- Create the file header
2438 
-      if ($v_header_list[$i]['status'] == 'ok') {
2437 
+        // ----- Create the file header
2438 
+        if ($v_header_list[$i]['status'] == 'ok') {
2439 2439 
         if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
2440 
-          // ----- Return
2441 
-          return $v_result;
2440 
+            // ----- Return
2441 
+            return $v_result;
2442 2442 
         }
2443 2443 
         $v_count++;
2444 
-      }
2444 
+        }
2445 2445
2446 
-      // ----- Transform the header to a 'usable' info
2447 
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
2446 
+        // ----- Transform the header to a 'usable' info
2447 
+        $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
2448 2448 
     }
2449 2449
2450 2450 
     // ----- Zip file comment
2451 2451 
     $v_comment = '';
2452 2452 
     if (isset($p_options[PCLZIP_OPT_COMMENT])) {
2453 
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
2453 
+        $v_comment = $p_options[PCLZIP_OPT_COMMENT];
2454 2454 
     }
2455 2455
2456 2456 
     // ----- Calculate the size of the central header

@@ -2459,29 +2459,29 @@  discard block
 
 block discarded – undo
2459 2459 
     // ----- Create the central dir footer
2460 2460 
     if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
2461 2461 
     {
2462 
-      // ----- Reset the file list
2463 
-      unset($v_header_list);
2462 
+        // ----- Reset the file list
2463 
+        unset($v_header_list);
2464 2464
2465 
-      // ----- Return
2466 
-      return $v_result;
2465 
+        // ----- Return
2466 
+        return $v_result;
2467 2467 
     }
2468 2468
2469 2469 
     // ----- Return
2470 2470 
     return $v_result;
2471 
-  }
2472 
-  // --------------------------------------------------------------------------------
2473 
-
2474 
-  // --------------------------------------------------------------------------------
2475 
-  // Function : privAddFileList()
2476 
-  // Description :
2477 
-  // Parameters :
2478 
-  //   $p_filedescr_list : An array containing the file description
2479 
-  //                      or directory names to add in the zip
2480 
-  //   $p_result_list : list of added files with their properties (specially the status field)
2481 
-  // Return Values :
2482 
-  // --------------------------------------------------------------------------------
2483 
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
2484 
-  {
2471 
+    }
2472 
+    // --------------------------------------------------------------------------------
2473 
+
2474 
+    // --------------------------------------------------------------------------------
2475 
+    // Function : privAddFileList()
2476 
+    // Description :
2477 
+    // Parameters :
2478 
+    //   $p_filedescr_list : An array containing the file description
2479 
+    //                      or directory names to add in the zip
2480 
+    //   $p_result_list : list of added files with their properties (specially the status field)
2481 
+    // Return Values :
2482 
+    // --------------------------------------------------------------------------------
2483 
+    function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
2484 
+    {
2485 2485 
     $v_result=1;
2486 2486 
     $v_header = array();
2487 2487 
 

@@ -2490,60 +2490,60 @@  discard block
 
 block discarded – undo
2490 2490
2491 2491 
     // ----- Loop on the files
2492 2492 
     for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
2493 
-      // ----- Format the filename
2494 
-      $p_filedescr_list[$j]['filename']
2495 
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
2493 
+        // ----- Format the filename
2494 
+        $p_filedescr_list[$j]['filename']
2495 
+        = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
2496 2496
2497 2497
2498 
-      // ----- Skip empty file names
2499 
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
2500 
-      if ($p_filedescr_list[$j]['filename'] == "") {
2498 
+        // ----- Skip empty file names
2499 
+        // TBC : Can this be possible ? not checked in DescrParseAtt ?
2500 
+        if ($p_filedescr_list[$j]['filename'] == "") {
2501 2501 
         continue;
2502 
-      }
2502 
+        }
2503 2503
2504 
-      // ----- Check the filename
2505 
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
2504 
+        // ----- Check the filename
2505 
+        if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
2506 2506 
           && (!file_exists($p_filedescr_list[$j]['filename']))) {
2507 2507 
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
2508 2508 
         return PclZip::errorCode();
2509 
-      }
2509 
+        }
2510 2510
2511 
-      // ----- Look if it is a file or a dir with no all path remove option
2512 
-      // or a dir with all its path removed
2511 
+        // ----- Look if it is a file or a dir with no all path remove option
2512 
+        // or a dir with all its path removed
2513 2513 
 //      if (   (is_file($p_filedescr_list[$j]['filename']))
2514 2514 
 //          || (   is_dir($p_filedescr_list[$j]['filename'])
2515 
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
2515 
+        if (   ($p_filedescr_list[$j]['type'] == 'file')
2516 2516 
           || ($p_filedescr_list[$j]['type'] == 'virtual_file')
2517 2517 
           || (   ($p_filedescr_list[$j]['type'] == 'folder')
2518 2518 
               && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
2519 2519 
                   || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
2520 
-          ) {
2520 
+            ) {
2521 2521
2522 2522 
         // ----- Add the file
2523 2523 
         $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
2524 
-                                       $p_options);
2524 
+                                        $p_options);
2525 2525 
         if ($v_result != 1) {
2526 
-          return $v_result;
2526 
+            return $v_result;
2527 2527 
         }
2528 2528
2529 2529 
         // ----- Store the file infos
2530 2530 
         $p_result_list[$v_nb++] = $v_header;
2531 
-      }
2531 
+        }
2532 2532 
     }
2533 2533
2534 2534 
     // ----- Return
2535 2535 
     return $v_result;
2536 
-  }
2537 
-  // --------------------------------------------------------------------------------
2538 
-
2539 
-  // --------------------------------------------------------------------------------
2540 
-  // Function : privAddFile()
2541 
-  // Description :
2542 
-  // Parameters :
2543 
-  // Return Values :
2544 
-  // --------------------------------------------------------------------------------
2545 
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
2546 
-  {
2536 
+    }
2537 
+    // --------------------------------------------------------------------------------
2538 
+
2539 
+    // --------------------------------------------------------------------------------
2540 
+    // Function : privAddFile()
2541 
+    // Description :
2542 
+    // Parameters :
2543 
+    // Return Values :
2544 
+    // --------------------------------------------------------------------------------
2545 
+    function privAddFile($p_filedescr, &$p_header, &$p_options)
2546 
+    {
2547 2547 
     $v_result=1;
2548 2548
2549 2549 
     // ----- Working variable

@@ -2551,11 +2551,11 @@  discard block
 
 block discarded – undo
2551 2551
2552 2552 
     // TBC : Already done in the fileAtt check ... ?
2553 2553 
     if ($p_filename == "") {
2554 
-      // ----- Error log
2555 
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
2554 
+        // ----- Error log
2555 
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
2556 2556
2557 
-      // ----- Return
2558 
-      return PclZip::errorCode();
2557 
+        // ----- Return
2558 
+        return PclZip::errorCode();
2559 2559 
     }
2560 2560
2561 2561 
     // ----- Look for a stored different filename

@@ -2590,94 +2590,94 @@  discard block
 
 block discarded – undo
2590 2590
2591 2591 
     // ----- Look for regular file
2592 2592 
     if ($p_filedescr['type']=='file') {
2593 
-      $p_header['external'] = 0x00000000;
2594 
-      $p_header['size'] = filesize($p_filename);
2593 
+        $p_header['external'] = 0x00000000;
2594 
+        $p_header['size'] = filesize($p_filename);
2595 2595 
     }
2596 2596
2597 2597 
     // ----- Look for regular folder
2598 2598 
     else if ($p_filedescr['type']=='folder') {
2599 
-      $p_header['external'] = 0x00000010;
2600 
-      $p_header['mtime'] = filemtime($p_filename);
2601 
-      $p_header['size'] = filesize($p_filename);
2599 
+        $p_header['external'] = 0x00000010;
2600 
+        $p_header['mtime'] = filemtime($p_filename);
2601 
+        $p_header['size'] = filesize($p_filename);
2602 2602 
     }
2603 2603
2604 2604 
     // ----- Look for virtual file
2605 2605 
     else if ($p_filedescr['type'] == 'virtual_file') {
2606 
-      $p_header['external'] = 0x00000000;
2607 
-      $p_header['size'] = strlen($p_filedescr['content']);
2606 
+        $p_header['external'] = 0x00000000;
2607 
+        $p_header['size'] = strlen($p_filedescr['content']);
2608 2608 
     }
2609 2609
2610 2610
2611 2611 
     // ----- Look for filetime
2612 2612 
     if (isset($p_filedescr['mtime'])) {
2613 
-      $p_header['mtime'] = $p_filedescr['mtime'];
2613 
+        $p_header['mtime'] = $p_filedescr['mtime'];
2614 2614 
     }
2615 2615 
     else if ($p_filedescr['type'] == 'virtual_file') {
2616 
-      $p_header['mtime'] = time();
2616 
+        $p_header['mtime'] = time();
2617 2617 
     }
2618 2618 
     else {
2619 
-      $p_header['mtime'] = filemtime($p_filename);
2619 
+        $p_header['mtime'] = filemtime($p_filename);
2620 2620 
     }
2621 2621
2622 2622 
     // ------ Look for file comment
2623 2623 
     if (isset($p_filedescr['comment'])) {
2624 
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
2625 
-      $p_header['comment'] = $p_filedescr['comment'];
2624 
+        $p_header['comment_len'] = strlen($p_filedescr['comment']);
2625 
+        $p_header['comment'] = $p_filedescr['comment'];
2626 2626 
     }
2627 2627 
     else {
2628 
-      $p_header['comment_len'] = 0;
2629 
-      $p_header['comment'] = '';
2628 
+        $p_header['comment_len'] = 0;
2629 
+        $p_header['comment'] = '';
2630 2630 
     }
2631 2631
2632 2632 
     // ----- Look for pre-add callback
2633 2633 
     if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
2634 2634
2635 
-      // ----- Generate a local information
2636 
-      $v_local_header = array();
2637 
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
2635 
+        // ----- Generate a local information
2636 
+        $v_local_header = array();
2637 
+        $this->privConvertHeader2FileInfo($p_header, $v_local_header);
2638 2638
2639 
-      // ----- Call the callback
2640 
-      // Here I do not use call_user_func() because I need to send a reference to the
2641 
-      // header.
2639 
+        // ----- Call the callback
2640 
+        // Here I do not use call_user_func() because I need to send a reference to the
2641 
+        // header.
2642 2642 
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
2643 
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
2644 
-      if ($v_result == 0) {
2643 
+        $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
2644 
+        if ($v_result == 0) {
2645 2645 
         // ----- Change the file status
2646 2646 
         $p_header['status'] = "skipped";
2647 2647 
         $v_result = 1;
2648 
-      }
2648 
+        }
2649 2649
2650 
-      // ----- Update the informations
2651 
-      // Only some fields can be modified
2652 
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
2650 
+        // ----- Update the informations
2651 
+        // Only some fields can be modified
2652 
+        if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
2653 2653 
         $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
2654 
-      }
2654 
+        }
2655 2655 
     }
2656 2656
2657 2657 
     // ----- Look for empty stored filename
2658 2658 
     if ($p_header['stored_filename'] == "") {
2659 
-      $p_header['status'] = "filtered";
2659 
+        $p_header['status'] = "filtered";
2660 2660 
     }
2661 2661
2662 2662 
     // ----- Check the path length
2663 2663 
     if (strlen($p_header['stored_filename']) > 0xFF) {
2664 
-      $p_header['status'] = 'filename_too_long';
2664 
+        $p_header['status'] = 'filename_too_long';
2665 2665 
     }
2666 2666
2667 2667 
     // ----- Look if no error, or file not skipped
2668 2668 
     if ($p_header['status'] == 'ok') {
2669 2669
2670 
-      // ----- Look for a file
2671 
-      if ($p_filedescr['type'] == 'file') {
2670 
+        // ----- Look for a file
2671 
+        if ($p_filedescr['type'] == 'file') {
2672 2672 
         // ----- Look for using temporary file to zip
2673 2673 
         if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
2674 2674 
             && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
2675 2675 
                 || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
2676 2676 
                     && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
2677 
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
2678 
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
2677 
+            $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
2678 
+            if ($v_result < PCLZIP_ERR_NO_ERROR) {
2679 2679 
             return $v_result;
2680 
-          }
2680 
+            }
2681 2681 
         }
2682 2682
2683 2683 
         // ----- Use "in memory" zip algo

@@ -2685,8 +2685,8 @@  discard block
 
 block discarded – undo
2685 2685
2686 2686 
         // ----- Open the source file
2687 2687 
         if (($v_file = @fopen($p_filename, "rb")) == 0) {
2688 
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
2689 
-          return PclZip::errorCode();
2688 
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
2689 
+            return PclZip::errorCode();
2690 2690 
         }
2691 2691
2692 2692 
         // ----- Read the file content

@@ -2700,25 +2700,25 @@  discard block
 
 block discarded – undo
2700 2700
2701 2701 
         // ----- Look for no compression
2702 2702 
         if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
2703 
-          // ----- Set header parameters
2704 
-          $p_header['compressed_size'] = $p_header['size'];
2705 
-          $p_header['compression'] = 0;
2703 
+            // ----- Set header parameters
2704 
+            $p_header['compressed_size'] = $p_header['size'];
2705 
+            $p_header['compression'] = 0;
2706 2706 
         }
2707 2707
2708 2708 
         // ----- Look for normal compression
2709 2709 
         else {
2710 
-          // ----- Compress the content
2711 
-          $v_content = @gzdeflate($v_content);
2710 
+            // ----- Compress the content
2711 
+            $v_content = @gzdeflate($v_content);
2712 2712
2713 
-          // ----- Set header parameters
2714 
-          $p_header['compressed_size'] = strlen($v_content);
2715 
-          $p_header['compression'] = 8;
2713 
+            // ----- Set header parameters
2714 
+            $p_header['compressed_size'] = strlen($v_content);
2715 
+            $p_header['compression'] = 8;
2716 2716 
         }
2717 2717
2718 2718 
         // ----- Call the header generation
2719 2719 
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
2720 
-          @fclose($v_file);
2721 
-          return $v_result;
2720 
+            @fclose($v_file);
2721 
+            return $v_result;
2722 2722 
         }
2723 2723
2724 2724 
         // ----- Write the compressed (or not) content

@@ -2726,10 +2726,10 @@  discard block
 
 block discarded – undo
2726 2726
2727 2727 
         }
2728 2728
2729 
-      }
2729 
+        }
2730 2730
2731 
-      // ----- Look for a virtual file (a file from string)
2732 
-      else if ($p_filedescr['type'] == 'virtual_file') {
2731 
+        // ----- Look for a virtual file (a file from string)
2732 
+        else if ($p_filedescr['type'] == 'virtual_file') {
2733 2733
2734 2734 
         $v_content = $p_filedescr['content'];
2735 2735 
 

@@ -2738,36 +2738,36 @@  discard block
 
 block discarded – undo
2738 2738
2739 2739 
         // ----- Look for no compression
2740 2740 
         if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
2741 
-          // ----- Set header parameters
2742 
-          $p_header['compressed_size'] = $p_header['size'];
2743 
-          $p_header['compression'] = 0;
2741 
+            // ----- Set header parameters
2742 
+            $p_header['compressed_size'] = $p_header['size'];
2743 
+            $p_header['compression'] = 0;
2744 2744 
         }
2745 2745
2746 2746 
         // ----- Look for normal compression
2747 2747 
         else {
2748 
-          // ----- Compress the content
2749 
-          $v_content = @gzdeflate($v_content);
2748 
+            // ----- Compress the content
2749 
+            $v_content = @gzdeflate($v_content);
2750 2750
2751 
-          // ----- Set header parameters
2752 
-          $p_header['compressed_size'] = strlen($v_content);
2753 
-          $p_header['compression'] = 8;
2751 
+            // ----- Set header parameters
2752 
+            $p_header['compressed_size'] = strlen($v_content);
2753 
+            $p_header['compression'] = 8;
2754 2754 
         }
2755 2755
2756 2756 
         // ----- Call the header generation
2757 2757 
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
2758 
-          @fclose($v_file);
2759 
-          return $v_result;
2758 
+            @fclose($v_file);
2759 
+            return $v_result;
2760 2760 
         }
2761 2761
2762 2762 
         // ----- Write the compressed (or not) content
2763 2763 
         @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
2764 
-      }
2764 
+        }
2765 2765
2766 
-      // ----- Look for a directory
2767 
-      else if ($p_filedescr['type'] == 'folder') {
2766 
+        // ----- Look for a directory
2767 
+        else if ($p_filedescr['type'] == 'folder') {
2768 2768 
         // ----- Look for directory last '/'
2769 2769 
         if (@substr($p_header['stored_filename'], -1) != '/') {
2770 
-          $p_header['stored_filename'] .= '/';
2770 
+            $p_header['stored_filename'] .= '/';
2771 2771 
         }
2772 2772
2773 2773 
         // ----- Set the file properties

@@ -2778,45 +2778,45 @@  discard block
 
 block discarded – undo
2778 2778 
         // ----- Call the header generation
2779 2779 
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
2780 2780 
         {
2781 
-          return $v_result;
2781 
+            return $v_result;
2782 
+        }
2782 2783 
         }
2783 
-      }
2784 2784 
     }
2785 2785
2786 2786 
     // ----- Look for post-add callback
2787 2787 
     if (isset($p_options[PCLZIP_CB_POST_ADD])) {
2788 2788
2789 
-      // ----- Generate a local information
2790 
-      $v_local_header = array();
2791 
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
2789 
+        // ----- Generate a local information
2790 
+        $v_local_header = array();
2791 
+        $this->privConvertHeader2FileInfo($p_header, $v_local_header);
2792 2792
2793 
-      // ----- Call the callback
2794 
-      // Here I do not use call_user_func() because I need to send a reference to the
2795 
-      // header.
2793 
+        // ----- Call the callback
2794 
+        // Here I do not use call_user_func() because I need to send a reference to the
2795 
+        // header.
2796 2796 
 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
2797 
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
2798 
-      if ($v_result == 0) {
2797 
+        $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
2798 
+        if ($v_result == 0) {
2799 2799 
         // ----- Ignored
2800 2800 
         $v_result = 1;
2801 
-      }
2801 
+        }
2802 2802
2803 
-      // ----- Update the informations
2804 
-      // Nothing can be modified
2803 
+        // ----- Update the informations
2804 
+        // Nothing can be modified
2805 2805 
     }
2806 2806
2807 2807 
     // ----- Return
2808 2808 
     return $v_result;
2809 
-  }
2810 
-  // --------------------------------------------------------------------------------
2811 
-
2812 
-  // --------------------------------------------------------------------------------
2813 
-  // Function : privAddFileUsingTempFile()
2814 
-  // Description :
2815 
-  // Parameters :
2816 
-  // Return Values :
2817 
-  // --------------------------------------------------------------------------------
2818 
-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
2819 
-  {
2809 
+    }
2810 
+    // --------------------------------------------------------------------------------
2811 
+
2812 
+    // --------------------------------------------------------------------------------
2813 
+    // Function : privAddFileUsingTempFile()
2814 
+    // Description :
2815 
+    // Parameters :
2816 
+    // Return Values :
2817 
+    // --------------------------------------------------------------------------------
2818 
+    function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
2819 
+    {
2820 2820 
     $v_result=PCLZIP_ERR_NO_ERROR;
2821 2821
2822 2822 
     // ----- Working variable

@@ -2825,26 +2825,26 @@  discard block
 
 block discarded – undo
2825 2825
2826 2826 
     // ----- Open the source file
2827 2827 
     if (($v_file = @fopen($p_filename, "rb")) == 0) {
2828 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
2829 
-      return PclZip::errorCode();
2828 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
2829 
+        return PclZip::errorCode();
2830 2830 
     }
2831 2831
2832 2832 
     // ----- Creates a compressed temporary file
2833 2833 
     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
2834 2834 
     if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
2835 
-      fclose($v_file);
2836 
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
2837 
-      return PclZip::errorCode();
2835 
+        fclose($v_file);
2836 
+        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
2837 
+        return PclZip::errorCode();
2838 2838 
     }
2839 2839
2840 2840 
     // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
2841 2841 
     $v_size = filesize($p_filename);
2842 2842 
     while ($v_size != 0) {
2843 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
2844 
-      $v_buffer = @fread($v_file, $v_read_size);
2845 
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
2846 
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
2847 
-      $v_size -= $v_read_size;
2843 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
2844 
+        $v_buffer = @fread($v_file, $v_read_size);
2845 
+        //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
2846 
+        @gzputs($v_file_compressed, $v_buffer, $v_read_size);
2847 
+        $v_size -= $v_read_size;
2848 2848 
     }
2849 2849
2850 2850 
     // ----- Close the file

@@ -2853,14 +2853,14 @@  discard block
 
 block discarded – undo
2853 2853
2854 2854 
     // ----- Check the minimum file size
2855 2855 
     if (filesize($v_gzip_temp_name) < 18) {
2856 
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
2857 
-      return PclZip::errorCode();
2856 
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
2857 
+        return PclZip::errorCode();
2858 2858 
     }
2859 2859
2860 2860 
     // ----- Extract the compressed attributes
2861 2861 
     if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
2862 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
2863 
-      return PclZip::errorCode();
2862 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
2863 
+        return PclZip::errorCode();
2864 2864 
     }
2865 2865
2866 2866 
     // ----- Read the gzip file header

@@ -2886,14 +2886,14 @@  discard block
 
 block discarded – undo
2886 2886
2887 2887 
     // ----- Call the header generation
2888 2888 
     if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
2889 
-      return $v_result;
2889 
+        return $v_result;
2890 2890 
     }
2891 2891
2892 2892 
     // ----- Add the compressed data
2893 2893 
     if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
2894 2894 
     {
2895 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
2896 
-      return PclZip::errorCode();
2895 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
2896 
+        return PclZip::errorCode();
2897 2897 
     }
2898 2898
2899 2899 
     // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks

@@ -2901,11 +2901,11 @@  discard block
 
 block discarded – undo
2901 2901 
     $v_size = $p_header['compressed_size'];
2902 2902 
     while ($v_size != 0)
2903 2903 
     {
2904 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
2905 
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
2906 
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
2907 
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
2908 
-      $v_size -= $v_read_size;
2904 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
2905 
+        $v_buffer = @fread($v_file_compressed, $v_read_size);
2906 
+        //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
2907 
+        @fwrite($this->zip_fd, $v_buffer, $v_read_size);
2908 
+        $v_size -= $v_read_size;
2909 2909 
     }
2910 2910
2911 2911 
     // ----- Close the file

@@ -2916,112 +2916,112 @@  discard block
 
 block discarded – undo
2916 2916
2917 2917 
     // ----- Return
2918 2918 
     return $v_result;
2919 
-  }
2920 
-  // --------------------------------------------------------------------------------
2921 
-
2922 
-  // --------------------------------------------------------------------------------
2923 
-  // Function : privCalculateStoredFilename()
2924 
-  // Description :
2925 
-  //   Based on file descriptor properties and global options, this method
2926 
-  //   calculate the filename that will be stored in the archive.
2927 
-  // Parameters :
2928 
-  // Return Values :
2929 
-  // --------------------------------------------------------------------------------
2930 
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
2931 
-  {
2919 
+    }
2920 
+    // --------------------------------------------------------------------------------
2921 
+
2922 
+    // --------------------------------------------------------------------------------
2923 
+    // Function : privCalculateStoredFilename()
2924 
+    // Description :
2925 
+    //   Based on file descriptor properties and global options, this method
2926 
+    //   calculate the filename that will be stored in the archive.
2927 
+    // Parameters :
2928 
+    // Return Values :
2929 
+    // --------------------------------------------------------------------------------
2930 
+    function privCalculateStoredFilename(&$p_filedescr, &$p_options)
2931 
+    {
2932 2932 
     $v_result=1;
2933 2933
2934 2934 
     // ----- Working variables
2935 2935 
     $p_filename = $p_filedescr['filename'];
2936 2936 
     if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
2937 
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
2937 
+        $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
2938 2938 
     }
2939 2939 
     else {
2940 
-      $p_add_dir = '';
2940 
+        $p_add_dir = '';
2941 2941 
     }
2942 2942 
     if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
2943 
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
2943 
+        $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
2944 2944 
     }
2945 2945 
     else {
2946 
-      $p_remove_dir = '';
2946 
+        $p_remove_dir = '';
2947 2947 
     }
2948 2948 
     if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
2949 
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
2949 
+        $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
2950 2950 
     }
2951 2951 
     else {
2952 
-      $p_remove_all_dir = 0;
2952 
+        $p_remove_all_dir = 0;
2953 2953 
     }
2954 2954
2955 2955
2956 2956 
     // ----- Look for full name change
2957 2957 
     if (isset($p_filedescr['new_full_name'])) {
2958 
-      // ----- Remove drive letter if any
2959 
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
2958 
+        // ----- Remove drive letter if any
2959 
+        $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
2960 2960 
     }
2961 2961
2962 2962 
     // ----- Look for path and/or short name change
2963 2963 
     else {
2964 2964
2965 
-      // ----- Look for short name change
2966 
-      // Its when we cahnge just the filename but not the path
2967 
-      if (isset($p_filedescr['new_short_name'])) {
2965 
+        // ----- Look for short name change
2966 
+        // Its when we cahnge just the filename but not the path
2967 
+        if (isset($p_filedescr['new_short_name'])) {
2968 2968 
         $v_path_info = pathinfo($p_filename);
2969 2969 
         $v_dir = '';
2970 2970 
         if ($v_path_info['dirname'] != '') {
2971 
-          $v_dir = $v_path_info['dirname'].'/';
2971 
+            $v_dir = $v_path_info['dirname'].'/';
2972 2972 
         }
2973 2973 
         $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
2974 
-      }
2975 
-      else {
2974 
+        }
2975 
+        else {
2976 2976 
         // ----- Calculate the stored filename
2977 2977 
         $v_stored_filename = $p_filename;
2978 
-      }
2978 
+        }
2979 2979
2980 
-      // ----- Look for all path to remove
2981 
-      if ($p_remove_all_dir) {
2980 
+        // ----- Look for all path to remove
2981 
+        if ($p_remove_all_dir) {
2982 2982 
         $v_stored_filename = basename($p_filename);
2983 
-      }
2984 
-      // ----- Look for partial path remove
2985 
-      else if ($p_remove_dir != "") {
2983 
+        }
2984 
+        // ----- Look for partial path remove
2985 
+        else if ($p_remove_dir != "") {
2986 2986 
         if (substr($p_remove_dir, -1) != '/')
2987 
-          $p_remove_dir .= "/";
2987 
+            $p_remove_dir .= "/";
2988 2988
2989 2989 
         if (   (substr($p_filename, 0, 2) == "./")
2990 2990 
             || (substr($p_remove_dir, 0, 2) == "./")) {
2991 2991
2992 
-          if (   (substr($p_filename, 0, 2) == "./")
2992 
+            if (   (substr($p_filename, 0, 2) == "./")
2993 2993 
               && (substr($p_remove_dir, 0, 2) != "./")) {
2994 2994 
             $p_remove_dir = "./".$p_remove_dir;
2995 
-          }
2996 
-          if (   (substr($p_filename, 0, 2) != "./")
2995 
+            }
2996 
+            if (   (substr($p_filename, 0, 2) != "./")
2997 2997 
               && (substr($p_remove_dir, 0, 2) == "./")) {
2998 2998 
             $p_remove_dir = substr($p_remove_dir, 2);
2999 
-          }
2999 
+            }
3000 3000 
         }
3001 3001
3002 3002 
         $v_compare = PclZipUtilPathInclusion($p_remove_dir,
3003 
-                                             $v_stored_filename);
3003 
+                                                $v_stored_filename);
3004 3004 
         if ($v_compare > 0) {
3005 
-          if ($v_compare == 2) {
3005 
+            if ($v_compare == 2) {
3006 3006 
             $v_stored_filename = "";
3007 
-          }
3008 
-          else {
3007 
+            }
3008 
+            else {
3009 3009 
             $v_stored_filename = substr($v_stored_filename,
3010 3010 
                                         strlen($p_remove_dir));
3011 
-          }
3011 
+            }
3012 
+        }
3012 3013 
         }
3013 
-      }
3014 3014
3015 
-      // ----- Remove drive letter if any
3016 
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
3015 
+        // ----- Remove drive letter if any
3016 
+        $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
3017 3017
3018 
-      // ----- Look for path to add
3019 
-      if ($p_add_dir != "") {
3018 
+        // ----- Look for path to add
3019 
+        if ($p_add_dir != "") {
3020 3020 
         if (substr($p_add_dir, -1) == "/")
3021 
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
3021 
+            $v_stored_filename = $p_add_dir.$v_stored_filename;
3022 3022 
         else
3023 
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
3024 
-      }
3023 
+            $v_stored_filename = $p_add_dir."/".$v_stored_filename;
3024 
+        }
3025 3025 
     }
3026 3026
3027 3027 
     // ----- Filename (reduce the path of stored name)

@@ -3030,17 +3030,17 @@  discard block
 
 block discarded – undo
3030 3030
3031 3031 
     // ----- Return
3032 3032 
     return $v_result;
3033 
-  }
3034 
-  // --------------------------------------------------------------------------------
3035 
-
3036 
-  // --------------------------------------------------------------------------------
3037 
-  // Function : privWriteFileHeader()
3038 
-  // Description :
3039 
-  // Parameters :
3040 
-  // Return Values :
3041 
-  // --------------------------------------------------------------------------------
3042 
-  function privWriteFileHeader(&$p_header)
3043 
-  {
3033 
+    }
3034 
+    // --------------------------------------------------------------------------------
3035 
+
3036 
+    // --------------------------------------------------------------------------------
3037 
+    // Function : privWriteFileHeader()
3038 
+    // Description :
3039 
+    // Parameters :
3040 
+    // Return Values :
3041 
+    // --------------------------------------------------------------------------------
3042 
+    function privWriteFileHeader(&$p_header)
3043 
+    {
3044 3044 
     $v_result=1;
3045 3045
3046 3046 
     // ----- Store the offset position of the file

@@ -3053,12 +3053,12 @@  discard block
 
 block discarded – undo
3053 3053
3054 3054 
     // ----- Packed data
3055 3055 
     $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
3056 
-	                      $p_header['version_extracted'], $p_header['flag'],
3057 
-                          $p_header['compression'], $v_mtime, $v_mdate,
3058 
-                          $p_header['crc'], $p_header['compressed_size'],
3059 
-						  $p_header['size'],
3060 
-                          strlen($p_header['stored_filename']),
3061 
-						  $p_header['extra_len']);
3056 
+                            $p_header['version_extracted'], $p_header['flag'],
3057 
+                            $p_header['compression'], $v_mtime, $v_mdate,
3058 
+                            $p_header['crc'], $p_header['compressed_size'],
3059 
+                            $p_header['size'],
3060 
+                            strlen($p_header['stored_filename']),
3061 
+                            $p_header['extra_len']);
3062 3062
3063 3063 
     // ----- Write the first 148 bytes of the header in the archive
3064 3064 
     fputs($this->zip_fd, $v_binary_data, 30);

@@ -3066,26 +3066,26 @@  discard block
 
 block discarded – undo
3066 3066 
     // ----- Write the variable fields
3067 3067 
     if (strlen($p_header['stored_filename']) != 0)
3068 3068 
     {
3069 
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
3069 
+        fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
3070 3070 
     }
3071 3071 
     if ($p_header['extra_len'] != 0)
3072 3072 
     {
3073 
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
3073 
+        fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
3074 3074 
     }
3075 3075
3076 3076 
     // ----- Return
3077 3077 
     return $v_result;
3078 
-  }
3079 
-  // --------------------------------------------------------------------------------
3080 
-
3081 
-  // --------------------------------------------------------------------------------
3082 
-  // Function : privWriteCentralFileHeader()
3083 
-  // Description :
3084 
-  // Parameters :
3085 
-  // Return Values :
3086 
-  // --------------------------------------------------------------------------------
3087 
-  function privWriteCentralFileHeader(&$p_header)
3088 
-  {
3078 
+    }
3079 
+    // --------------------------------------------------------------------------------
3080 
+
3081 
+    // --------------------------------------------------------------------------------
3082 
+    // Function : privWriteCentralFileHeader()
3083 
+    // Description :
3084 
+    // Parameters :
3085 
+    // Return Values :
3086 
+    // --------------------------------------------------------------------------------
3087 
+    function privWriteCentralFileHeader(&$p_header)
3088 
+    {
3089 3089 
     $v_result=1;
3090 3090
3091 3091 
     // TBC

@@ -3100,14 +3100,14 @@  discard block
 
 block discarded – undo
3100 3100
3101 3101 
     // ----- Packed data
3102 3102 
     $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
3103 
-	                      $p_header['version'], $p_header['version_extracted'],
3104 
-                          $p_header['flag'], $p_header['compression'],
3105 
-						  $v_mtime, $v_mdate, $p_header['crc'],
3106 
-                          $p_header['compressed_size'], $p_header['size'],
3107 
-                          strlen($p_header['stored_filename']),
3108 
-						  $p_header['extra_len'], $p_header['comment_len'],
3109 
-                          $p_header['disk'], $p_header['internal'],
3110 
-						  $p_header['external'], $p_header['offset']);
3103 
+                            $p_header['version'], $p_header['version_extracted'],
3104 
+                            $p_header['flag'], $p_header['compression'],
3105 
+                            $v_mtime, $v_mdate, $p_header['crc'],
3106 
+                            $p_header['compressed_size'], $p_header['size'],
3107 
+                            strlen($p_header['stored_filename']),
3108 
+                            $p_header['extra_len'], $p_header['comment_len'],
3109 
+                            $p_header['disk'], $p_header['internal'],
3110 
+                            $p_header['external'], $p_header['offset']);
3111 3111
3112 3112 
     // ----- Write the 42 bytes of the header in the zip file
3113 3113 
     fputs($this->zip_fd, $v_binary_data, 46);

@@ -3115,36 +3115,36 @@  discard block
 
 block discarded – undo
3115 3115 
     // ----- Write the variable fields
3116 3116 
     if (strlen($p_header['stored_filename']) != 0)
3117 3117 
     {
3118 
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
3118 
+        fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
3119 3119 
     }
3120 3120 
     if ($p_header['extra_len'] != 0)
3121 3121 
     {
3122 
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
3122 
+        fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
3123 3123 
     }
3124 3124 
     if ($p_header['comment_len'] != 0)
3125 3125 
     {
3126 
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
3126 
+        fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
3127 3127 
     }
3128 3128
3129 3129 
     // ----- Return
3130 3130 
     return $v_result;
3131 
-  }
3132 
-  // --------------------------------------------------------------------------------
3133 
-
3134 
-  // --------------------------------------------------------------------------------
3135 
-  // Function : privWriteCentralHeader()
3136 
-  // Description :
3137 
-  // Parameters :
3138 
-  // Return Values :
3139 
-  // --------------------------------------------------------------------------------
3140 
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
3141 
-  {
3131 
+    }
3132 
+    // --------------------------------------------------------------------------------
3133 
+
3134 
+    // --------------------------------------------------------------------------------
3135 
+    // Function : privWriteCentralHeader()
3136 
+    // Description :
3137 
+    // Parameters :
3138 
+    // Return Values :
3139 
+    // --------------------------------------------------------------------------------
3140 
+    function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
3141 
+    {
3142 3142 
     $v_result=1;
3143 3143
3144 3144 
     // ----- Packed data
3145 3145 
     $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
3146 
-	                      $p_nb_entries, $p_size,
3147 
-						  $p_offset, strlen($p_comment));
3146 
+                            $p_nb_entries, $p_size,
3147 
+                            $p_offset, strlen($p_comment));
3148 3148
3149 3149 
     // ----- Write the 22 bytes of the header in the zip file
3150 3150 
     fputs($this->zip_fd, $v_binary_data, 22);

@@ -3152,22 +3152,22 @@  discard block
 
 block discarded – undo
3152 3152 
     // ----- Write the variable fields
3153 3153 
     if (strlen($p_comment) != 0)
3154 3154 
     {
3155 
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
3155 
+        fputs($this->zip_fd, $p_comment, strlen($p_comment));
3156 3156 
     }
3157 3157
3158 3158 
     // ----- Return
3159 3159 
     return $v_result;
3160 
-  }
3161 
-  // --------------------------------------------------------------------------------
3162 
-
3163 
-  // --------------------------------------------------------------------------------
3164 
-  // Function : privList()
3165 
-  // Description :
3166 
-  // Parameters :
3167 
-  // Return Values :
3168 
-  // --------------------------------------------------------------------------------
3169 
-  function privList(&$p_list)
3170 
-  {
3160 
+    }
3161 
+    // --------------------------------------------------------------------------------
3162 
+
3163 
+    // --------------------------------------------------------------------------------
3164 
+    // Function : privList()
3165 
+    // Description :
3166 
+    // Parameters :
3167 
+    // Return Values :
3168 
+    // --------------------------------------------------------------------------------
3169 
+    function privList(&$p_list)
3170 
+    {
3171 3171 
     $v_result=1;
3172 3172
3173 3173 
     // ----- Magic quotes trick

@@ -3176,51 +3176,51 @@  discard block
 
 block discarded – undo
3176 3176 
     // ----- Open the zip file
3177 3177 
     if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
3178 3178 
     {
3179 
-      // ----- Magic quotes trick
3180 
-      $this->privSwapBackMagicQuotes();
3179 
+        // ----- Magic quotes trick
3180 
+        $this->privSwapBackMagicQuotes();
3181 3181
3182 
-      // ----- Error log
3183 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
3182 
+        // ----- Error log
3183 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
3184 3184
3185 
-      // ----- Return
3186 
-      return PclZip::errorCode();
3185 
+        // ----- Return
3186 
+        return PclZip::errorCode();
3187 3187 
     }
3188 3188
3189 3189 
     // ----- Read the central directory informations
3190 3190 
     $v_central_dir = array();
3191 3191 
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
3192 3192 
     {
3193 
-      $this->privSwapBackMagicQuotes();
3194 
-      return $v_result;
3193 
+        $this->privSwapBackMagicQuotes();
3194 
+        return $v_result;
3195 3195 
     }
3196 3196
3197 3197 
     // ----- Go to beginning of Central Dir
3198 3198 
     @rewind($this->zip_fd);
3199 3199 
     if (@fseek($this->zip_fd, $v_central_dir['offset']))
3200 3200 
     {
3201 
-      $this->privSwapBackMagicQuotes();
3201 
+        $this->privSwapBackMagicQuotes();
3202 3202
3203 
-      // ----- Error log
3204 
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
3203 
+        // ----- Error log
3204 
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
3205 3205
3206 
-      // ----- Return
3207 
-      return PclZip::errorCode();
3206 
+        // ----- Return
3207 
+        return PclZip::errorCode();
3208 3208 
     }
3209 3209
3210 3210 
     // ----- Read each entry
3211 3211 
     for ($i=0; $i<$v_central_dir['entries']; $i++)
3212 3212 
     {
3213 
-      // ----- Read the file header
3214 
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
3215 
-      {
3213 
+        // ----- Read the file header
3214 
+        if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
3215 
+        {
3216 3216 
         $this->privSwapBackMagicQuotes();
3217 3217 
         return $v_result;
3218 
-      }
3219 
-      $v_header['index'] = $i;
3218 
+        }
3219 
+        $v_header['index'] = $i;
3220 3220
3221 
-      // ----- Get the only interesting attributes
3222 
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
3223 
-      unset($v_header);
3221 
+        // ----- Get the only interesting attributes
3222 
+        $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
3223 
+        unset($v_header);
3224 3224 
     }
3225 3225
3226 3226 
     // ----- Close the zip file

@@ -3231,30 +3231,30 @@  discard block
 
 block discarded – undo
3231 3231
3232 3232 
     // ----- Return
3233 3233 
     return $v_result;
3234 
-  }
3235 
-  // --------------------------------------------------------------------------------
3236 
-
3237 
-  // --------------------------------------------------------------------------------
3238 
-  // Function : privConvertHeader2FileInfo()
3239 
-  // Description :
3240 
-  //   This function takes the file informations from the central directory
3241 
-  //   entries and extract the interesting parameters that will be given back.
3242 
-  //   The resulting file infos are set in the array $p_info
3243 
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
3244 
-  //                           extracted in the filesystem (extract).
3245 
-  //     $p_info['stored_filename'] : Stored filename in the archive.
3246 
-  //     $p_info['size'] = Size of the file.
3247 
-  //     $p_info['compressed_size'] = Compressed size of the file.
3248 
-  //     $p_info['mtime'] = Last modification date of the file.
3249 
-  //     $p_info['comment'] = Comment associated with the file.
3250 
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
3251 
-  //     $p_info['status'] = status of the action on the file.
3252 
-  //     $p_info['crc'] = CRC of the file content.
3253 
-  // Parameters :
3254 
-  // Return Values :
3255 
-  // --------------------------------------------------------------------------------
3256 
-  function privConvertHeader2FileInfo($p_header, &$p_info)
3257 
-  {
3234 
+    }
3235 
+    // --------------------------------------------------------------------------------
3236 
+
3237 
+    // --------------------------------------------------------------------------------
3238 
+    // Function : privConvertHeader2FileInfo()
3239 
+    // Description :
3240 
+    //   This function takes the file informations from the central directory
3241 
+    //   entries and extract the interesting parameters that will be given back.
3242 
+    //   The resulting file infos are set in the array $p_info
3243 
+    //     $p_info['filename'] : Filename with full path. Given by user (add),
3244 
+    //                           extracted in the filesystem (extract).
3245 
+    //     $p_info['stored_filename'] : Stored filename in the archive.
3246 
+    //     $p_info['size'] = Size of the file.
3247 
+    //     $p_info['compressed_size'] = Compressed size of the file.
3248 
+    //     $p_info['mtime'] = Last modification date of the file.
3249 
+    //     $p_info['comment'] = Comment associated with the file.
3250 
+    //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
3251 
+    //     $p_info['status'] = status of the action on the file.
3252 
+    //     $p_info['crc'] = CRC of the file content.
3253 
+    // Parameters :
3254 
+    // Return Values :
3255 
+    // --------------------------------------------------------------------------------
3256 
+    function privConvertHeader2FileInfo($p_header, &$p_info)
3257 
+    {
3258 3258 
     $v_result=1;
3259 3259
3260 3260 
     // ----- Get the interesting attributes

@@ -3273,27 +3273,27 @@  discard block
 
 block discarded – undo
3273 3273
3274 3274 
     // ----- Return
3275 3275 
     return $v_result;
3276 
-  }
3277 
-  // --------------------------------------------------------------------------------
3278 
-
3279 
-  // --------------------------------------------------------------------------------
3280 
-  // Function : privExtractByRule()
3281 
-  // Description :
3282 
-  //   Extract a file or directory depending of rules (by index, by name, ...)
3283 
-  // Parameters :
3284 
-  //   $p_file_list : An array where will be placed the properties of each
3285 
-  //                  extracted file
3286 
-  //   $p_path : Path to add while writing the extracted files
3287 
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
3288 
-  //                    extracted files. If the path does not match the file path,
3289 
-  //                    the file is extracted with its memorized path.
3290 
-  //                    $p_remove_path does not apply to 'list' mode.
3291 
-  //                    $p_path and $p_remove_path are commulative.
3292 
-  // Return Values :
3293 
-  //   1 on success,0 or less on error (see error code list)
3294 
-  // --------------------------------------------------------------------------------
3295 
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
3296 
-  {
3276 
+    }
3277 
+    // --------------------------------------------------------------------------------
3278 
+
3279 
+    // --------------------------------------------------------------------------------
3280 
+    // Function : privExtractByRule()
3281 
+    // Description :
3282 
+    //   Extract a file or directory depending of rules (by index, by name, ...)
3283 
+    // Parameters :
3284 
+    //   $p_file_list : An array where will be placed the properties of each
3285 
+    //                  extracted file
3286 
+    //   $p_path : Path to add while writing the extracted files
3287 
+    //   $p_remove_path : Path to remove (from the file memorized path) while writing the
3288 
+    //                    extracted files. If the path does not match the file path,
3289 
+    //                    the file is extracted with its memorized path.
3290 
+    //                    $p_remove_path does not apply to 'list' mode.
3291 
+    //                    $p_path and $p_remove_path are commulative.
3292 
+    // Return Values :
3293 
+    //   1 on success,0 or less on error (see error code list)
3294 
+    // --------------------------------------------------------------------------------
3295 
+    function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
3296 
+    {
3297 3297 
     $v_result=1;
3298 3298
3299 3299 
     // ----- Magic quotes trick

@@ -3301,44 +3301,44 @@  discard block
 
 block discarded – undo
3301 3301
3302 3302 
     // ----- Check the path
3303 3303 
     if (   ($p_path == "")
3304 
-	    || (   (substr($p_path, 0, 1) != "/")
3305 
-		    && (substr($p_path, 0, 3) != "../")
3306 
-			&& (substr($p_path,1,2)!=":/")))
3307 
-      $p_path = "./".$p_path;
3304 
+        || (   (substr($p_path, 0, 1) != "/")
3305 
+            && (substr($p_path, 0, 3) != "../")
3306 
+            && (substr($p_path,1,2)!=":/")))
3307 
+        $p_path = "./".$p_path;
3308 3308
3309 3309 
     // ----- Reduce the path last (and duplicated) '/'
3310 3310 
     if (($p_path != "./") && ($p_path != "/"))
3311 3311 
     {
3312 
-      // ----- Look for the path end '/'
3313 
-      while (substr($p_path, -1) == "/")
3314 
-      {
3312 
+        // ----- Look for the path end '/'
3313 
+        while (substr($p_path, -1) == "/")
3314 
+        {
3315 3315 
         $p_path = substr($p_path, 0, strlen($p_path)-1);
3316 
-      }
3316 
+        }
3317 3317 
     }
3318 3318
3319 3319 
     // ----- Look for path to remove format (should end by /)
3320 3320 
     if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
3321 3321 
     {
3322 
-      $p_remove_path .= '/';
3322 
+        $p_remove_path .= '/';
3323 3323 
     }
3324 3324 
     $p_remove_path_size = strlen($p_remove_path);
3325 3325
3326 3326 
     // ----- Open the zip file
3327 3327 
     if (($v_result = $this->privOpenFd('rb')) != 1)
3328 3328 
     {
3329 
-      $this->privSwapBackMagicQuotes();
3330 
-      return $v_result;
3329 
+        $this->privSwapBackMagicQuotes();
3330 
+        return $v_result;
3331 3331 
     }
3332 3332
3333 3333 
     // ----- Read the central directory informations
3334 3334 
     $v_central_dir = array();
3335 3335 
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
3336 3336 
     {
3337 
-      // ----- Close the zip file
3338 
-      $this->privCloseFd();
3339 
-      $this->privSwapBackMagicQuotes();
3337 
+        // ----- Close the zip file
3338 
+        $this->privCloseFd();
3339 
+        $this->privSwapBackMagicQuotes();
3340 3340
3341 
-      return $v_result;
3341 
+        return $v_result;
3342 3342 
     }
3343 3343
3344 3344 
     // ----- Start at beginning of Central Dir

@@ -3349,10 +3349,10 @@  discard block
 
 block discarded – undo
3349 3349 
     for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
3350 3350 
     {
3351 3351
3352 
-      // ----- Read next Central dir entry
3353 
-      @rewind($this->zip_fd);
3354 
-      if (@fseek($this->zip_fd, $v_pos_entry))
3355 
-      {
3352 
+        // ----- Read next Central dir entry
3353 
+        @rewind($this->zip_fd);
3354 
+        if (@fseek($this->zip_fd, $v_pos_entry))
3355 
+        {
3356 3356 
         // ----- Close the zip file
3357 3357 
         $this->privCloseFd();
3358 3358 
         $this->privSwapBackMagicQuotes();

@@ -3362,54 +3362,54 @@  discard block
 
 block discarded – undo
3362 3362
3363 3363 
         // ----- Return
3364 3364 
         return PclZip::errorCode();
3365 
-      }
3365 
+        }
3366 3366
3367 
-      // ----- Read the file header
3368 
-      $v_header = array();
3369 
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
3370 
-      {
3367 
+        // ----- Read the file header
3368 
+        $v_header = array();
3369 
+        if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
3370 
+        {
3371 3371 
         // ----- Close the zip file
3372 3372 
         $this->privCloseFd();
3373 3373 
         $this->privSwapBackMagicQuotes();
3374 3374
3375 3375 
         return $v_result;
3376 
-      }
3376 
+        }
3377 3377
3378 
-      // ----- Store the index
3379 
-      $v_header['index'] = $i;
3378 
+        // ----- Store the index
3379 
+        $v_header['index'] = $i;
3380 3380
3381 
-      // ----- Store the file position
3382 
-      $v_pos_entry = ftell($this->zip_fd);
3381 
+        // ----- Store the file position
3382 
+        $v_pos_entry = ftell($this->zip_fd);
3383 3383
3384 
-      // ----- Look for the specific extract rules
3385 
-      $v_extract = false;
3384 
+        // ----- Look for the specific extract rules
3385 
+        $v_extract = false;
3386 3386
3387 
-      // ----- Look for extract by name rule
3388 
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
3387 
+        // ----- Look for extract by name rule
3388 
+        if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
3389 3389 
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
3390 3390
3391 
-          // ----- Look if the filename is in the list
3392 
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
3391 
+            // ----- Look if the filename is in the list
3392 
+            for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
3393 3393
3394 
-              // ----- Look for a directory
3395 
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
3394 
+                // ----- Look for a directory
3395 
+                if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
3396 3396
3397 
-                  // ----- Look if the directory is in the filename path
3398 
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
3397 
+                    // ----- Look if the directory is in the filename path
3398 
+                    if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
3399 3399 
                       && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
3400 
-                      $v_extract = true;
3401 
-                  }
3402 
-              }
3403 
-              // ----- Look for a filename
3404 
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
3405 
-                  $v_extract = true;
3406 
-              }
3407 
-          }
3408 
-      }
3400 
+                        $v_extract = true;
3401 
+                    }
3402 
+                }
3403 
+                // ----- Look for a filename
3404 
+                elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
3405 
+                    $v_extract = true;
3406 
+                }
3407 
+            }
3408 
+        }
3409 3409
3410 
-      // ----- Look for extract by ereg rule
3411 
-      // ereg() is deprecated with PHP 5.3
3412 
-      /*
3410 
+        // ----- Look for extract by ereg rule
3411 
+        // ereg() is deprecated with PHP 5.3
3412 
+        /*
3413 3413 
       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
3414 3414 
                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
3415 3415 
 

@@ -3419,199 +3419,199 @@  discard block
 
 block discarded – undo
3419 3419 
       }
3420 3420 
       */
3421 3421
3422 
-      // ----- Look for extract by preg rule
3423 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
3422 
+        // ----- Look for extract by preg rule
3423 
+        else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
3424 3424 
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
3425 3425
3426 
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
3427 
-              $v_extract = true;
3428 
-          }
3429 
-      }
3426 
+            if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
3427 
+                $v_extract = true;
3428 
+            }
3429 
+        }
3430 3430
3431 
-      // ----- Look for extract by index rule
3432 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
3431 
+        // ----- Look for extract by index rule
3432 
+        else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
3433 3433 
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
3434 3434
3435 
-          // ----- Look if the index is in the list
3436 
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
3435 
+            // ----- Look if the index is in the list
3436 
+            for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
3437 3437
3438 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
3439 
-                  $v_extract = true;
3440 
-              }
3441 
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
3442 
-                  $j_start = $j+1;
3443 
-              }
3438 
+                if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
3439 
+                    $v_extract = true;
3440 
+                }
3441 
+                if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
3442 
+                    $j_start = $j+1;
3443 
+                }
3444 3444
3445 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
3446 
-                  break;
3447 
-              }
3448 
-          }
3449 
-      }
3445 
+                if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
3446 
+                    break;
3447 
+                }
3448 
+            }
3449 
+        }
3450 3450
3451 
-      // ----- Look for no rule, which means extract all the archive
3452 
-      else {
3453 
-          $v_extract = true;
3454 
-      }
3451 
+        // ----- Look for no rule, which means extract all the archive
3452 
+        else {
3453 
+            $v_extract = true;
3454 
+        }
3455 3455
3456 
-	  // ----- Check compression method
3457 
-	  if (   ($v_extract)
3458 
-	      && (   ($v_header['compression'] != 8)
3459 
-		      && ($v_header['compression'] != 0))) {
3460 
-          $v_header['status'] = 'unsupported_compression';
3456 
+        // ----- Check compression method
3457 
+        if (   ($v_extract)
3458 
+          && (   ($v_header['compression'] != 8)
3459 
+              && ($v_header['compression'] != 0))) {
3460 
+            $v_header['status'] = 'unsupported_compression';
3461 3461
3462 
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
3463 
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
3464 
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3462 
+            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
3463 
+            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
3464 
+              && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3465 3465
3466 
-              $this->privSwapBackMagicQuotes();
3466 
+                $this->privSwapBackMagicQuotes();
3467 3467
3468 
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
3469 
-			                       "Filename '".$v_header['stored_filename']."' is "
3470 
-				  	    	  	   ."compressed by an unsupported compression "
3471 
-				  	    	  	   ."method (".$v_header['compression'].") ");
3468 
+                PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
3469 
+                                    "Filename '".$v_header['stored_filename']."' is "
3470 
+                                        ."compressed by an unsupported compression "
3471 
+                                        ."method (".$v_header['compression'].") ");
3472 3472
3473 
-              return PclZip::errorCode();
3474 
-		  }
3475 
-	  }
3473 
+                return PclZip::errorCode();
3474 
+            }
3475 
+        }
3476 3476
3477 
-	  // ----- Check encrypted files
3478 
-	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
3479 
-          $v_header['status'] = 'unsupported_encryption';
3477 
+        // ----- Check encrypted files
3478 
+        if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
3479 
+            $v_header['status'] = 'unsupported_encryption';
3480 3480
3481 
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
3482 
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
3483 
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3481 
+            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
3482 
+            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
3483 
+              && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3484 3484
3485 
-              $this->privSwapBackMagicQuotes();
3485 
+                $this->privSwapBackMagicQuotes();
3486 3486
3487 
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
3488 
-			                       "Unsupported encryption for "
3489 
-				  	    	  	   ." filename '".$v_header['stored_filename']
3490 
-								   ."'");
3487 
+                PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
3488 
+                                    "Unsupported encryption for "
3489 
+                                        ." filename '".$v_header['stored_filename']
3490 
+                                    ."'");
3491 3491
3492 
-              return PclZip::errorCode();
3493 
-		  }
3492 
+                return PclZip::errorCode();
3493 
+            }
3494 3494 
     }
3495 3495
3496 
-      // ----- Look for real extraction
3497 
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
3498 
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
3499 
-		                                        $p_file_list[$v_nb_extracted++]);
3500 
-          if ($v_result != 1) {
3501 
-              $this->privCloseFd();
3502 
-              $this->privSwapBackMagicQuotes();
3503 
-              return $v_result;
3504 
-          }
3496 
+        // ----- Look for real extraction
3497 
+        if (($v_extract) && ($v_header['status'] != 'ok')) {
3498 
+            $v_result = $this->privConvertHeader2FileInfo($v_header,
3499 
+                                                $p_file_list[$v_nb_extracted++]);
3500 
+            if ($v_result != 1) {
3501 
+                $this->privCloseFd();
3502 
+                $this->privSwapBackMagicQuotes();
3503 
+                return $v_result;
3504 
+            }
3505 3505
3506 
-          $v_extract = false;
3507 
-      }
3506 
+            $v_extract = false;
3507 
+        }
3508 3508
3509 
-      // ----- Look for real extraction
3510 
-      if ($v_extract)
3511 
-      {
3509 
+        // ----- Look for real extraction
3510 
+        if ($v_extract)
3511 
+        {
3512 3512
3513 3513 
         // ----- Go to the file position
3514 3514 
         @rewind($this->zip_fd);
3515 3515 
         if (@fseek($this->zip_fd, $v_header['offset']))
3516 3516 
         {
3517 
-          // ----- Close the zip file
3518 
-          $this->privCloseFd();
3517 
+            // ----- Close the zip file
3518 
+            $this->privCloseFd();
3519 3519
3520 
-          $this->privSwapBackMagicQuotes();
3520 
+            $this->privSwapBackMagicQuotes();
3521 3521
3522 
-          // ----- Error log
3523 
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
3522 
+            // ----- Error log
3523 
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
3524 3524
3525 
-          // ----- Return
3526 
-          return PclZip::errorCode();
3525 
+            // ----- Return
3526 
+            return PclZip::errorCode();
3527 3527 
         }
3528 3528
3529 3529 
         // ----- Look for extraction as string
3530 3530 
         if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
3531 3531
3532 
-          $v_string = '';
3532 
+            $v_string = '';
3533 3533
3534 
-          // ----- Extracting the file
3535 
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
3536 
-          if ($v_result1 < 1) {
3534 
+            // ----- Extracting the file
3535 
+            $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
3536 
+            if ($v_result1 < 1) {
3537 3537 
             $this->privCloseFd();
3538 3538 
             $this->privSwapBackMagicQuotes();
3539 3539 
             return $v_result1;
3540 
-          }
3540 
+            }
3541 3541
3542 
-          // ----- Get the only interesting attributes
3543 
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
3544 
-          {
3542 
+            // ----- Get the only interesting attributes
3543 
+            if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
3544 
+            {
3545 3545 
             // ----- Close the zip file
3546 3546 
             $this->privCloseFd();
3547 3547 
             $this->privSwapBackMagicQuotes();
3548 3548
3549 3549 
             return $v_result;
3550 
-          }
3550 
+            }
3551 3551
3552 
-          // ----- Set the file content
3553 
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
3552 
+            // ----- Set the file content
3553 
+            $p_file_list[$v_nb_extracted]['content'] = $v_string;
3554 3554
3555 
-          // ----- Next extracted file
3556 
-          $v_nb_extracted++;
3555 
+            // ----- Next extracted file
3556 
+            $v_nb_extracted++;
3557 3557
3558 
-          // ----- Look for user callback abort
3559 
-          if ($v_result1 == 2) {
3560 
-          	break;
3561 
-          }
3558 
+            // ----- Look for user callback abort
3559 
+            if ($v_result1 == 2) {
3560 
+                break;
3561 
+            }
3562 3562 
         }
3563 3563 
         // ----- Look for extraction in standard output
3564 3564 
         elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
3565 
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
3566 
-          // ----- Extracting the file in standard output
3567 
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
3568 
-          if ($v_result1 < 1) {
3565 
+                && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
3566 
+            // ----- Extracting the file in standard output
3567 
+            $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
3568 
+            if ($v_result1 < 1) {
3569 3569 
             $this->privCloseFd();
3570 3570 
             $this->privSwapBackMagicQuotes();
3571 3571 
             return $v_result1;
3572 
-          }
3572 
+            }
3573 3573
3574 
-          // ----- Get the only interesting attributes
3575 
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
3574 
+            // ----- Get the only interesting attributes
3575 
+            if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
3576 3576 
             $this->privCloseFd();
3577 3577 
             $this->privSwapBackMagicQuotes();
3578 3578 
             return $v_result;
3579 
-          }
3579 
+            }
3580 3580
3581 
-          // ----- Look for user callback abort
3582 
-          if ($v_result1 == 2) {
3583 
-          	break;
3584 
-          }
3581 
+            // ----- Look for user callback abort
3582 
+            if ($v_result1 == 2) {
3583 
+                break;
3584 
+            }
3585 3585 
         }
3586 3586 
         // ----- Look for normal extraction
3587 3587 
         else {
3588 
-          // ----- Extracting the file
3589 
-          $v_result1 = $this->privExtractFile($v_header,
3590 
-		                                      $p_path, $p_remove_path,
3591 
-											  $p_remove_all_path,
3592 
-											  $p_options);
3593 
-          if ($v_result1 < 1) {
3588 
+            // ----- Extracting the file
3589 
+            $v_result1 = $this->privExtractFile($v_header,
3590 
+                                                $p_path, $p_remove_path,
3591 
+                                                $p_remove_all_path,
3592 
+                                                $p_options);
3593 
+            if ($v_result1 < 1) {
3594 3594 
             $this->privCloseFd();
3595 3595 
             $this->privSwapBackMagicQuotes();
3596 3596 
             return $v_result1;
3597 
-          }
3597 
+            }
3598 3598
3599 
-          // ----- Get the only interesting attributes
3600 
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
3601 
-          {
3599 
+            // ----- Get the only interesting attributes
3600 
+            if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
3601 
+            {
3602 3602 
             // ----- Close the zip file
3603 3603 
             $this->privCloseFd();
3604 3604 
             $this->privSwapBackMagicQuotes();
3605 3605
3606 3606 
             return $v_result;
3607 
-          }
3607 
+            }
3608 3608
3609 
-          // ----- Look for user callback abort
3610 
-          if ($v_result1 == 2) {
3611 
-          	break;
3612 
-          }
3609 
+            // ----- Look for user callback abort
3610 
+            if ($v_result1 == 2) {
3611 
+                break;
3612 
+            }
3613 
+        }
3613 3614 
         }
3614 
-      }
3615 3615 
     }
3616 3616
3617 3617 
     // ----- Close the zip file

@@ -3620,28 +3620,28 @@  discard block
 
 block discarded – undo
3620 3620
3621 3621 
     // ----- Return
3622 3622 
     return $v_result;
3623 
-  }
3624 
-  // --------------------------------------------------------------------------------
3625 
-
3626 
-  // --------------------------------------------------------------------------------
3627 
-  // Function : privExtractFile()
3628 
-  // Description :
3629 
-  // Parameters :
3630 
-  // Return Values :
3631 
-  //
3632 
-  // 1 : ... ?
3633 
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
3634 
-  // --------------------------------------------------------------------------------
3635 
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
3636 
-  {
3623 
+    }
3624 
+    // --------------------------------------------------------------------------------
3625 
+
3626 
+    // --------------------------------------------------------------------------------
3627 
+    // Function : privExtractFile()
3628 
+    // Description :
3629 
+    // Parameters :
3630 
+    // Return Values :
3631 
+    //
3632 
+    // 1 : ... ?
3633 
+    // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
3634 
+    // --------------------------------------------------------------------------------
3635 
+    function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
3636 
+    {
3637 3637 
     $v_result=1;
3638 3638
3639 3639 
     // ----- Read the file header
3640 3640 
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
3641 3641 
     {
3642 
-      // ----- Return
3643 
-      return $v_result;
3644 
-    }
3642 
+        // ----- Return
3643 
+        return $v_result;
3644 
+    }
3645 3645
3646 3646
3647 3647 
     // ----- Check that the file header is coherent with $p_entry info

@@ -3666,74 +3666,74 @@  discard block
 
 block discarded – undo
3666 3666 
     // ----- Look for path to remove
3667 3667 
     else if ($p_remove_path != "")
3668 3668 
     {
3669 
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
3670 
-      {
3669 
+        if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
3670 
+        {
3671 3671
3672 3672 
         // ----- Change the file status
3673 3673 
         $p_entry['status'] = "filtered";
3674 3674
3675 3675 
         // ----- Return
3676 3676 
         return $v_result;
3677 
-      }
3677 
+        }
3678 3678
3679 
-      $p_remove_path_size = strlen($p_remove_path);
3680 
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
3681 
-      {
3679 
+        $p_remove_path_size = strlen($p_remove_path);
3680 
+        if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
3681 
+        {
3682 3682
3683 3683 
         // ----- Remove the path
3684 3684 
         $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
3685 3685
3686 
-      }
3686 
+        }
3687 3687 
     }
3688 3688
3689 3689 
     // ----- Add the path
3690 3690 
     if ($p_path != '') {
3691 
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
3691 
+        $p_entry['filename'] = $p_path."/".$p_entry['filename'];
3692 3692 
     }
3693 3693
3694 3694 
     // ----- Check a base_dir_restriction
3695 3695 
     if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
3696 
-      $v_inclusion
3697 
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
3696 
+        $v_inclusion
3697 
+        = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
3698 3698 
                                 $p_entry['filename']);
3699 
-      if ($v_inclusion == 0) {
3699 
+        if ($v_inclusion == 0) {
3700 3700
3701 3701 
         PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
3702 
-			                     "Filename '".$p_entry['filename']."' is "
3703 
-								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
3702 
+                                    "Filename '".$p_entry['filename']."' is "
3703 
+                                    ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
3704 3704
3705 3705 
         return PclZip::errorCode();
3706 
-      }
3706 
+        }
3707 3707 
     }
3708 3708
3709 3709 
     // ----- Look for pre-extract callback
3710 3710 
     if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
3711 3711
3712 
-      // ----- Generate a local information
3713 
-      $v_local_header = array();
3714 
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
3712 
+        // ----- Generate a local information
3713 
+        $v_local_header = array();
3714 
+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
3715 3715
3716 
-      // ----- Call the callback
3717 
-      // Here I do not use call_user_func() because I need to send a reference to the
3718 
-      // header.
3716 
+        // ----- Call the callback
3717 
+        // Here I do not use call_user_func() because I need to send a reference to the
3718 
+        // header.
3719 3719 
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
3720 
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
3721 
-      if ($v_result == 0) {
3720 
+        $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
3721 
+        if ($v_result == 0) {
3722 3722 
         // ----- Change the file status
3723 3723 
         $p_entry['status'] = "skipped";
3724 3724 
         $v_result = 1;
3725 
-      }
3725 
+        }
3726 3726
3727 
-      // ----- Look for abort result
3728 
-      if ($v_result == 2) {
3727 
+        // ----- Look for abort result
3728 
+        if ($v_result == 2) {
3729 3729 
         // ----- This status is internal and will be changed in 'skipped'
3730 3730 
         $p_entry['status'] = "aborted";
3731 
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
3732 
-      }
3731 
+            $v_result = PCLZIP_ERR_USER_ABORTED;
3732 
+        }
3733 3733
3734 
-      // ----- Update the informations
3735 
-      // Only some fields can be modified
3736 
-      $p_entry['filename'] = $v_local_header['filename'];
3734 
+        // ----- Update the informations
3735 
+        // Only some fields can be modified
3736 
+        $p_entry['filename'] = $v_local_header['filename'];
3737 3737 
     }
3738 3738
3739 3739 
 

@@ -3744,9 +3744,9 @@  discard block
 
 block discarded – undo
3744 3744 
     if (file_exists($p_entry['filename']))
3745 3745 
     {
3746 3746
3747 
-      // ----- Look if file is a directory
3748 
-      if (is_dir($p_entry['filename']))
3749 
-      {
3747 
+        // ----- Look if file is a directory
3748 
+        if (is_dir($p_entry['filename']))
3749 
+        {
3750 3750
3751 3751 
         // ----- Change the file status
3752 3752 
         $p_entry['status'] = "already_a_directory";

@@ -3755,18 +3755,18 @@  discard block
 
 block discarded – undo
3755 3755 
         // For historical reason first PclZip implementation does not stop
3756 3756 
         // when this kind of error occurs.
3757 3757 
         if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
3758 
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3758 
+            && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3759 3759
3760 3760 
             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
3761 
-			                     "Filename '".$p_entry['filename']."' is "
3762 
-								 ."already used by an existing directory");
3761 
+                                    "Filename '".$p_entry['filename']."' is "
3762 
+                                    ."already used by an existing directory");
3763 3763
3764 3764 
             return PclZip::errorCode();
3765 
-		    }
3766 
-      }
3767 
-      // ----- Look if file is write protected
3768 
-      else if (!is_writeable($p_entry['filename']))
3769 
-      {
3765 
+            }
3766 
+        }
3767 
+        // ----- Look if file is write protected
3768 
+        else if (!is_writeable($p_entry['filename']))
3769 
+        {
3770 3770
3771 3771 
         // ----- Change the file status
3772 3772 
         $p_entry['status'] = "write_protected";

@@ -3775,90 +3775,90 @@  discard block
 
 block discarded – undo
3775 3775 
         // For historical reason first PclZip implementation does not stop
3776 3776 
         // when this kind of error occurs.
3777 3777 
         if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
3778 
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3778 
+            && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3779 3779
3780 3780 
             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
3781 
-			                     "Filename '".$p_entry['filename']."' exists "
3782 
-								 ."and is write protected");
3781 
+                                    "Filename '".$p_entry['filename']."' exists "
3782 
+                                    ."and is write protected");
3783 3783
3784 3784 
             return PclZip::errorCode();
3785 
-		    }
3786 
-      }
3785 
+            }
3786 
+        }
3787 3787
3788 
-      // ----- Look if the extracted file is older
3789 
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
3790 
-      {
3788 
+        // ----- Look if the extracted file is older
3789 
+        else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
3790 
+        {
3791 3791 
         // ----- Change the file status
3792 3792 
         if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
3793 
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
3794 
-	  	  }
3795 
-		    else {
3793 
+            && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
3794 
+            }
3795 
+            else {
3796 3796 
             $p_entry['status'] = "newer_exist";
3797 3797
3798 3798 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
3799 3799 
             // For historical reason first PclZip implementation does not stop
3800 3800 
             // when this kind of error occurs.
3801 3801 
             if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
3802 
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3802 
+                && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
3803 3803
3804 3804 
                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
3805 
-			             "Newer version of '".$p_entry['filename']."' exists "
3806 
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
3805 
+                            "Newer version of '".$p_entry['filename']."' exists "
3806 
+                        ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
3807 3807
3808 3808 
                 return PclZip::errorCode();
3809 
-		      }
3810 
-		    }
3811 
-      }
3812 
-      else {
3813 
-      }
3809 
+                }
3810 
+            }
3811 
+        }
3812 
+        else {
3813 
+        }
3814 3814 
     }
3815 3815
3816 3816 
     // ----- Check the directory availability and create it if necessary
3817 3817 
     else {
3818 
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
3818 
+        if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
3819 3819 
         $v_dir_to_check = $p_entry['filename'];
3820 
-      else if (!strstr($p_entry['filename'], "/"))
3820 
+        else if (!strstr($p_entry['filename'], "/"))
3821 3821 
         $v_dir_to_check = "";
3822 
-      else
3822 
+        else
3823 3823 
         $v_dir_to_check = dirname($p_entry['filename']);
3824 3824
3825 3825 
         if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
3826 3826
3827 
-          // ----- Change the file status
3828 
-          $p_entry['status'] = "path_creation_fail";
3827 
+            // ----- Change the file status
3828 
+            $p_entry['status'] = "path_creation_fail";
3829 3829
3830 
-          // ----- Return
3831 
-          //return $v_result;
3832 
-          $v_result = 1;
3830 
+            // ----- Return
3831 
+            //return $v_result;
3832 
+            $v_result = 1;
3833 
+        }
3833 3834 
         }
3834 
-      }
3835 3835 
     }
3836 3836
3837 3837 
     // ----- Look if extraction should be done
3838 3838 
     if ($p_entry['status'] == 'ok') {
3839 3839
3840 
-      // ----- Do the extraction (if not a folder)
3841 
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
3842 
-      {
3840 
+        // ----- Do the extraction (if not a folder)
3841 
+        if (!(($p_entry['external']&0x00000010)==0x00000010))
3842 
+        {
3843 3843 
         // ----- Look for not compressed file
3844 3844 
         if ($p_entry['compression'] == 0) {
3845 3845
3846 
-    		  // ----- Opening destination file
3847 
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
3848 
-          {
3846 
+                // ----- Opening destination file
3847 
+            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
3848 
+            {
3849 3849
3850 3850 
             // ----- Change the file status
3851 3851 
             $p_entry['status'] = "write_error";
3852 3852
3853 3853 
             // ----- Return
3854 3854 
             return $v_result;
3855 
-          }
3855 
+            }
3856 3856
3857 3857
3858 
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
3859 
-          $v_size = $p_entry['compressed_size'];
3860 
-          while ($v_size != 0)
3861 
-          {
3858 
+            // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
3859 
+            $v_size = $p_entry['compressed_size'];
3860 
+            while ($v_size != 0)
3861 
+            {
3862 3862 
             $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
3863 3863 
             $v_buffer = @fread($this->zip_fd, $v_read_size);
3864 3864 
             /* Try to speed up the code

@@ -3867,38 +3867,38 @@  discard block
 
 block discarded – undo
3867 3867 
             */
3868 3868 
             @fwrite($v_dest_file, $v_buffer, $v_read_size);
3869 3869 
             $v_size -= $v_read_size;
3870 
-          }
3870 
+            }
3871 3871
3872 
-          // ----- Closing the destination file
3873 
-          fclose($v_dest_file);
3872 
+            // ----- Closing the destination file
3873 
+            fclose($v_dest_file);
3874 3874
3875 
-          // ----- Change the file mtime
3876 
-          touch($p_entry['filename'], $p_entry['mtime']);
3875 
+            // ----- Change the file mtime
3876 
+            touch($p_entry['filename'], $p_entry['mtime']);
3877 3877
3878 3878
3879 3879 
         }
3880 3880 
         else {
3881 
-          // ----- TBC
3882 
-          // Need to be finished
3883 
-          if (($p_entry['flag'] & 1) == 1) {
3881 
+            // ----- TBC
3882 
+            // Need to be finished
3883 
+            if (($p_entry['flag'] & 1) == 1) {
3884 3884 
             PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
3885 3885 
             return PclZip::errorCode();
3886 
-          }
3886 
+            }
3887 3887
3888 3888
3889 
-          // ----- Look for using temporary file to unzip
3890 
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
3889 
+            // ----- Look for using temporary file to unzip
3890 
+            if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
3891 3891 
               && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
3892 3892 
                   || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
3893 3893 
                       && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
3894 3894 
             $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
3895 3895 
             if ($v_result < PCLZIP_ERR_NO_ERROR) {
3896 
-              return $v_result;
3896 
+                return $v_result;
3897 
+            }
3897 3898 
             }
3898 
-          }
3899 3899
3900 
-          // ----- Look for extract in memory
3901 
-          else {
3900 
+            // ----- Look for extract in memory
3901 
+            else {
3902 3902
3903 3903
3904 3904 
             // ----- Read the compressed file in a buffer (one shot)

@@ -3909,20 +3909,20 @@  discard block
 
 block discarded – undo
3909 3909 
             unset($v_buffer);
3910 3910 
             if ($v_file_content === FALSE) {
3911 3911
3912 
-              // ----- Change the file status
3913 
-              // TBC
3914 
-              $p_entry['status'] = "error";
3912 
+                // ----- Change the file status
3913 
+                // TBC
3914 
+                $p_entry['status'] = "error";
3915 3915
3916 
-              return $v_result;
3916 
+                return $v_result;
3917 3917 
             }
3918 3918
3919 3919 
             // ----- Opening destination file
3920 3920 
             if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
3921 3921
3922 
-              // ----- Change the file status
3923 
-              $p_entry['status'] = "write_error";
3922 
+                // ----- Change the file status
3923 
+                $p_entry['status'] = "write_error";
3924 3924
3925 
-              return $v_result;
3925 
+                return $v_result;
3926 3926 
             }
3927 3927
3928 3928 
             // ----- Write the uncompressed data

@@ -3932,67 +3932,67 @@  discard block
 
 block discarded – undo
3932 3932 
             // ----- Closing the destination file
3933 3933 
             @fclose($v_dest_file);
3934 3934
3935 
-          }
3935 
+            }
3936 3936
3937 
-          // ----- Change the file mtime
3938 
-          @touch($p_entry['filename'], $p_entry['mtime']);
3937 
+            // ----- Change the file mtime
3938 
+            @touch($p_entry['filename'], $p_entry['mtime']);
3939 3939 
         }
3940 3940
3941 3941 
         // ----- Look for chmod option
3942 3942 
         if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
3943 3943
3944 
-          // ----- Change the mode of the file
3945 
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
3944 
+            // ----- Change the mode of the file
3945 
+            @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
3946 3946 
         }
3947 3947
3948 
-      }
3948 
+        }
3949 3949 
     }
3950 3950
3951 
-  	// ----- Change abort status
3952 
-  	if ($p_entry['status'] == "aborted") {
3951 
+        // ----- Change abort status
3952 
+        if ($p_entry['status'] == "aborted") {
3953 3953 
         $p_entry['status'] = "skipped";
3954 
-  	}
3954 
+        }
3955 3955
3956 3956 
     // ----- Look for post-extract callback
3957 3957 
     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
3958 3958
3959 
-      // ----- Generate a local information
3960 
-      $v_local_header = array();
3961 
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
3959 
+        // ----- Generate a local information
3960 
+        $v_local_header = array();
3961 
+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
3962 3962
3963 
-      // ----- Call the callback
3964 
-      // Here I do not use call_user_func() because I need to send a reference to the
3965 
-      // header.
3963 
+        // ----- Call the callback
3964 
+        // Here I do not use call_user_func() because I need to send a reference to the
3965 
+        // header.
3966 3966 
 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
3967 
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
3967 
+        $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
3968 3968
3969 
-      // ----- Look for abort result
3970 
-      if ($v_result == 2) {
3971 
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
3972 
-      }
3969 
+        // ----- Look for abort result
3970 
+        if ($v_result == 2) {
3971 
+            $v_result = PCLZIP_ERR_USER_ABORTED;
3972 
+        }
3973 3973 
     }
3974 3974
3975 3975 
     // ----- Return
3976 3976 
     return $v_result;
3977 
-  }
3978 
-  // --------------------------------------------------------------------------------
3979 
-
3980 
-  // --------------------------------------------------------------------------------
3981 
-  // Function : privExtractFileUsingTempFile()
3982 
-  // Description :
3983 
-  // Parameters :
3984 
-  // Return Values :
3985 
-  // --------------------------------------------------------------------------------
3986 
-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
3987 
-  {
3977 
+    }
3978 
+    // --------------------------------------------------------------------------------
3979 
+
3980 
+    // --------------------------------------------------------------------------------
3981 
+    // Function : privExtractFileUsingTempFile()
3982 
+    // Description :
3983 
+    // Parameters :
3984 
+    // Return Values :
3985 
+    // --------------------------------------------------------------------------------
3986 
+    function privExtractFileUsingTempFile(&$p_entry, &$p_options)
3987 
+    {
3988 3988 
     $v_result=1;
3989 3989
3990 3990 
     // ----- Creates a temporary file
3991 3991 
     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
3992 3992 
     if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
3993 
-      fclose($v_file);
3994 
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
3995 
-      return PclZip::errorCode();
3993 
+        fclose($v_file);
3994 
+        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
3995 
+        return PclZip::errorCode();
3996 3996 
     }
3997 3997
3998 3998 
 

@@ -4004,11 +4004,11 @@  discard block
 
 block discarded – undo
4004 4004 
     $v_size = $p_entry['compressed_size'];
4005 4005 
     while ($v_size != 0)
4006 4006 
     {
4007 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
4008 
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
4009 
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
4010 
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
4011 
-      $v_size -= $v_read_size;
4007 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
4008 
+        $v_buffer = @fread($this->zip_fd, $v_read_size);
4009 
+        //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
4010 
+        @fwrite($v_dest_file, $v_buffer, $v_read_size);
4011 
+        $v_size -= $v_read_size;
4012 4012 
     }
4013 4013
4014 4014 
     // ----- Write gz file format footer

@@ -4020,27 +4020,27 @@  discard block
 
 block discarded – undo
4020 4020
4021 4021 
     // ----- Opening destination file
4022 4022 
     if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
4023 
-      $p_entry['status'] = "write_error";
4024 
-      return $v_result;
4023 
+        $p_entry['status'] = "write_error";
4024 
+        return $v_result;
4025 4025 
     }
4026 4026
4027 4027 
     // ----- Open the temporary gz file
4028 4028 
     if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
4029 
-      @fclose($v_dest_file);
4030 
-      $p_entry['status'] = "read_error";
4031 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
4032 
-      return PclZip::errorCode();
4029 
+        @fclose($v_dest_file);
4030 
+        $p_entry['status'] = "read_error";
4031 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
4032 
+        return PclZip::errorCode();
4033 4033 
     }
4034 4034
4035 4035
4036 4036 
     // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
4037 4037 
     $v_size = $p_entry['size'];
4038 4038 
     while ($v_size != 0) {
4039 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
4040 
-      $v_buffer = @gzread($v_src_file, $v_read_size);
4041 
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
4042 
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
4043 
-      $v_size -= $v_read_size;
4039 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
4040 
+        $v_buffer = @gzread($v_src_file, $v_read_size);
4041 
+        //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
4042 
+        @fwrite($v_dest_file, $v_buffer, $v_read_size);
4043 
+        $v_size -= $v_read_size;
4044 4044 
     }
4045 4045 
     @fclose($v_dest_file);
4046 4046 
     @gzclose($v_src_file);

@@ -4050,22 +4050,22 @@  discard block
 
 block discarded – undo
4050 4050
4051 4051 
     // ----- Return
4052 4052 
     return $v_result;
4053 
-  }
4054 
-  // --------------------------------------------------------------------------------
4055 
-
4056 
-  // --------------------------------------------------------------------------------
4057 
-  // Function : privExtractFileInOutput()
4058 
-  // Description :
4059 
-  // Parameters :
4060 
-  // Return Values :
4061 
-  // --------------------------------------------------------------------------------
4062 
-  function privExtractFileInOutput(&$p_entry, &$p_options)
4063 
-  {
4053 
+    }
4054 
+    // --------------------------------------------------------------------------------
4055 
+
4056 
+    // --------------------------------------------------------------------------------
4057 
+    // Function : privExtractFileInOutput()
4058 
+    // Description :
4059 
+    // Parameters :
4060 
+    // Return Values :
4061 
+    // --------------------------------------------------------------------------------
4062 
+    function privExtractFileInOutput(&$p_entry, &$p_options)
4063 
+    {
4064 4064 
     $v_result=1;
4065 4065
4066 4066 
     // ----- Read the file header
4067 4067 
     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
4068 
-      return $v_result;
4068 
+        return $v_result;
4069 4069 
     }
4070 4070
4071 4071 
 

@@ -4077,31 +4077,31 @@  discard block
 
 block discarded – undo
4077 4077 
     // ----- Look for pre-extract callback
4078 4078 
     if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
4079 4079
4080 
-      // ----- Generate a local information
4081 
-      $v_local_header = array();
4082 
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
4080 
+        // ----- Generate a local information
4081 
+        $v_local_header = array();
4082 
+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
4083 4083
4084 
-      // ----- Call the callback
4085 
-      // Here I do not use call_user_func() because I need to send a reference to the
4086 
-      // header.
4084 
+        // ----- Call the callback
4085 
+        // Here I do not use call_user_func() because I need to send a reference to the
4086 
+        // header.
4087 4087 
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
4088 
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
4089 
-      if ($v_result == 0) {
4088 
+        $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
4089 
+        if ($v_result == 0) {
4090 4090 
         // ----- Change the file status
4091 4091 
         $p_entry['status'] = "skipped";
4092 4092 
         $v_result = 1;
4093 
-      }
4093 
+        }
4094 4094
4095 
-      // ----- Look for abort result
4096 
-      if ($v_result == 2) {
4095 
+        // ----- Look for abort result
4096 
+        if ($v_result == 2) {
4097 4097 
         // ----- This status is internal and will be changed in 'skipped'
4098 4098 
         $p_entry['status'] = "aborted";
4099 
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
4100 
-      }
4099 
+            $v_result = PCLZIP_ERR_USER_ABORTED;
4100 
+        }
4101 4101
4102 
-      // ----- Update the informations
4103 
-      // Only some fields can be modified
4104 
-      $p_entry['filename'] = $v_local_header['filename'];
4102 
+        // ----- Update the informations
4103 
+        // Only some fields can be modified
4104 
+        $p_entry['filename'] = $v_local_header['filename'];
4105 4105 
     }
4106 4106
4107 4107 
     // ----- Trace

@@ -4109,78 +4109,78 @@  discard block
 
 block discarded – undo
4109 4109 
     // ----- Look if extraction should be done
4110 4110 
     if ($p_entry['status'] == 'ok') {
4111 4111
4112 
-      // ----- Do the extraction (if not a folder)
4113 
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
4112 
+        // ----- Do the extraction (if not a folder)
4113 
+        if (!(($p_entry['external']&0x00000010)==0x00000010)) {
4114 4114 
         // ----- Look for not compressed file
4115 4115 
         if ($p_entry['compressed_size'] == $p_entry['size']) {
4116 4116
4117 
-          // ----- Read the file in a buffer (one shot)
4118 
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
4117 
+            // ----- Read the file in a buffer (one shot)
4118 
+            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
4119 4119
4120 
-          // ----- Send the file to the output
4121 
-          echo $v_buffer;
4122 
-          unset($v_buffer);
4120 
+            // ----- Send the file to the output
4121 
+            echo $v_buffer;
4122 
+            unset($v_buffer);
4123 4123 
         }
4124 4124 
         else {
4125 4125
4126 
-          // ----- Read the compressed file in a buffer (one shot)
4127 
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
4126 
+            // ----- Read the compressed file in a buffer (one shot)
4127 
+            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
4128 4128
4129 
-          // ----- Decompress the file
4130 
-          $v_file_content = gzinflate($v_buffer);
4131 
-          unset($v_buffer);
4129 
+            // ----- Decompress the file
4130 
+            $v_file_content = gzinflate($v_buffer);
4131 
+            unset($v_buffer);
4132 4132
4133 
-          // ----- Send the file to the output
4134 
-          echo $v_file_content;
4135 
-          unset($v_file_content);
4133 
+            // ----- Send the file to the output
4134 
+            echo $v_file_content;
4135 
+            unset($v_file_content);
4136 
+        }
4136 4137 
         }
4137 
-      }
4138 4138 
     }
4139 4139
4140 
-	// ----- Change abort status
4141 
-	if ($p_entry['status'] == "aborted") {
4142 
-      $p_entry['status'] = "skipped";
4143 
-	}
4140 
+    // ----- Change abort status
4141 
+    if ($p_entry['status'] == "aborted") {
4142 
+        $p_entry['status'] = "skipped";
4143 
+    }
4144 4144
4145 4145 
     // ----- Look for post-extract callback
4146 4146 
     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
4147 4147
4148 
-      // ----- Generate a local information
4149 
-      $v_local_header = array();
4150 
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
4148 
+        // ----- Generate a local information
4149 
+        $v_local_header = array();
4150 
+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
4151 4151
4152 
-      // ----- Call the callback
4153 
-      // Here I do not use call_user_func() because I need to send a reference to the
4154 
-      // header.
4152 
+        // ----- Call the callback
4153 
+        // Here I do not use call_user_func() because I need to send a reference to the
4154 
+        // header.
4155 4155 
 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
4156 
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
4156 
+        $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
4157 4157
4158 
-      // ----- Look for abort result
4159 
-      if ($v_result == 2) {
4160 
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
4161 
-      }
4158 
+        // ----- Look for abort result
4159 
+        if ($v_result == 2) {
4160 
+            $v_result = PCLZIP_ERR_USER_ABORTED;
4161 
+        }
4162 4162 
     }
4163 4163
4164 4164 
     return $v_result;
4165 
-  }
4166 
-  // --------------------------------------------------------------------------------
4167 
-
4168 
-  // --------------------------------------------------------------------------------
4169 
-  // Function : privExtractFileAsString()
4170 
-  // Description :
4171 
-  // Parameters :
4172 
-  // Return Values :
4173 
-  // --------------------------------------------------------------------------------
4174 
-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
4175 
-  {
4165 
+    }
4166 
+    // --------------------------------------------------------------------------------
4167 
+
4168 
+    // --------------------------------------------------------------------------------
4169 
+    // Function : privExtractFileAsString()
4170 
+    // Description :
4171 
+    // Parameters :
4172 
+    // Return Values :
4173 
+    // --------------------------------------------------------------------------------
4174 
+    function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
4175 
+    {
4176 4176 
     $v_result=1;
4177 4177
4178 4178 
     // ----- Read the file header
4179 4179 
     $v_header = array();
4180 4180 
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
4181 4181 
     {
4182 
-      // ----- Return
4183 
-      return $v_result;
4182 
+        // ----- Return
4183 
+        return $v_result;
4184 4184 
     }
4185 4185
4186 4186 
 

@@ -4192,110 +4192,110 @@  discard block
 
 block discarded – undo
4192 4192 
     // ----- Look for pre-extract callback
4193 4193 
     if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
4194 4194
4195 
-      // ----- Generate a local information
4196 
-      $v_local_header = array();
4197 
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
4195 
+        // ----- Generate a local information
4196 
+        $v_local_header = array();
4197 
+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
4198 4198
4199 
-      // ----- Call the callback
4200 
-      // Here I do not use call_user_func() because I need to send a reference to the
4201 
-      // header.
4199 
+        // ----- Call the callback
4200 
+        // Here I do not use call_user_func() because I need to send a reference to the
4201 
+        // header.
4202 4202 
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
4203 
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
4204 
-      if ($v_result == 0) {
4203 
+        $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
4204 
+        if ($v_result == 0) {
4205 4205 
         // ----- Change the file status
4206 4206 
         $p_entry['status'] = "skipped";
4207 4207 
         $v_result = 1;
4208 
-      }
4208 
+        }
4209 4209
4210 
-      // ----- Look for abort result
4211 
-      if ($v_result == 2) {
4210 
+        // ----- Look for abort result
4211 
+        if ($v_result == 2) {
4212 4212 
         // ----- This status is internal and will be changed in 'skipped'
4213 4213 
         $p_entry['status'] = "aborted";
4214 
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
4215 
-      }
4214 
+            $v_result = PCLZIP_ERR_USER_ABORTED;
4215 
+        }
4216 4216
4217 
-      // ----- Update the informations
4218 
-      // Only some fields can be modified
4219 
-      $p_entry['filename'] = $v_local_header['filename'];
4217 
+        // ----- Update the informations
4218 
+        // Only some fields can be modified
4219 
+        $p_entry['filename'] = $v_local_header['filename'];
4220 4220 
     }
4221 4221
4222 4222
4223 4223 
     // ----- Look if extraction should be done
4224 4224 
     if ($p_entry['status'] == 'ok') {
4225 4225
4226 
-      // ----- Do the extraction (if not a folder)
4227 
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
4226 
+        // ----- Do the extraction (if not a folder)
4227 
+        if (!(($p_entry['external']&0x00000010)==0x00000010)) {
4228 4228 
         // ----- Look for not compressed file
4229 
-  //      if ($p_entry['compressed_size'] == $p_entry['size'])
4229 
+    //      if ($p_entry['compressed_size'] == $p_entry['size'])
4230 4230 
         if ($p_entry['compression'] == 0) {
4231 4231
4232 
-          // ----- Reading the file
4233 
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
4232 
+            // ----- Reading the file
4233 
+            $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
4234 4234 
         }
4235 4235 
         else {
4236 4236
4237 
-          // ----- Reading the file
4238 
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
4237 
+            // ----- Reading the file
4238 
+            $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
4239 4239
4240 
-          // ----- Decompress the file
4241 
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
4242 
-              // TBC
4243 
-          }
4240 
+            // ----- Decompress the file
4241 
+            if (($p_string = @gzinflate($v_data)) === FALSE) {
4242 
+                // TBC
4243 
+            }
4244 4244 
         }
4245 4245
4246 4246 
         // ----- Trace
4247 
-      }
4248 
-      else {
4249 
-          // TBC : error : can not extract a folder in a string
4250 
-      }
4247 
+        }
4248 
+        else {
4249 
+            // TBC : error : can not extract a folder in a string
4250 
+        }
4251 4251
4252 4252 
     }
4253 4253
4254 
-  	// ----- Change abort status
4255 
-  	if ($p_entry['status'] == "aborted") {
4254 
+        // ----- Change abort status
4255 
+        if ($p_entry['status'] == "aborted") {
4256 4256 
         $p_entry['status'] = "skipped";
4257 
-  	}
4257 
+        }
4258 4258
4259 4259 
     // ----- Look for post-extract callback
4260 4260 
     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
4261 4261
4262 
-      // ----- Generate a local information
4263 
-      $v_local_header = array();
4264 
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
4262 
+        // ----- Generate a local information
4263 
+        $v_local_header = array();
4264 
+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
4265 4265
4266 
-      // ----- Swap the content to header
4267 
-      $v_local_header['content'] = $p_string;
4268 
-      $p_string = '';
4266 
+        // ----- Swap the content to header
4267 
+        $v_local_header['content'] = $p_string;
4268 
+        $p_string = '';
4269 4269
4270 
-      // ----- Call the callback
4271 
-      // Here I do not use call_user_func() because I need to send a reference to the
4272 
-      // header.
4270 
+        // ----- Call the callback
4271 
+        // Here I do not use call_user_func() because I need to send a reference to the
4272 
+        // header.
4273 4273 
 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
4274 
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
4274 
+        $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
4275 4275
4276 
-      // ----- Swap back the content to header
4277 
-      $p_string = $v_local_header['content'];
4278 
-      unset($v_local_header['content']);
4276 
+        // ----- Swap back the content to header
4277 
+        $p_string = $v_local_header['content'];
4278 
+        unset($v_local_header['content']);
4279 4279
4280 
-      // ----- Look for abort result
4281 
-      if ($v_result == 2) {
4282 
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
4283 
-      }
4280 
+        // ----- Look for abort result
4281 
+        if ($v_result == 2) {
4282 
+            $v_result = PCLZIP_ERR_USER_ABORTED;
4283 
+        }
4284 4284 
     }
4285 4285
4286 4286 
     // ----- Return
4287 4287 
     return $v_result;
4288 
-  }
4289 
-  // --------------------------------------------------------------------------------
4290 
-
4291 
-  // --------------------------------------------------------------------------------
4292 
-  // Function : privReadFileHeader()
4293 
-  // Description :
4294 
-  // Parameters :
4295 
-  // Return Values :
4296 
-  // --------------------------------------------------------------------------------
4297 
-  function privReadFileHeader(&$p_header)
4298 
-  {
4288 
+    }
4289 
+    // --------------------------------------------------------------------------------
4290 
+
4291 
+    // --------------------------------------------------------------------------------
4292 
+    // Function : privReadFileHeader()
4293 
+    // Description :
4294 
+    // Parameters :
4295 
+    // Return Values :
4296 
+    // --------------------------------------------------------------------------------
4297 
+    function privReadFileHeader(&$p_header)
4298 
+    {
4299 4299 
     $v_result=1;
4300 4300
4301 4301 
     // ----- Read the 4 bytes signature

@@ -4306,11 +4306,11 @@  discard block
 
 block discarded – undo
4306 4306 
     if ($v_data['id'] != 0x04034b50)
4307 4307 
     {
4308 4308
4309 
-      // ----- Error log
4310 
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
4309 
+        // ----- Error log
4310 
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
4311 4311
4312 
-      // ----- Return
4313 
-      return PclZip::errorCode();
4312 
+        // ----- Return
4313 
+        return PclZip::errorCode();
4314 4314 
     }
4315 4315
4316 4316 
     // ----- Read the first 42 bytes of the header

@@ -4319,14 +4319,14 @@  discard block
 
 block discarded – undo
4319 4319 
     // ----- Look for invalid block size
4320 4320 
     if (strlen($v_binary_data) != 26)
4321 4321 
     {
4322 
-      $p_header['filename'] = "";
4323 
-      $p_header['status'] = "invalid_header";
4322 
+        $p_header['filename'] = "";
4323 
+        $p_header['status'] = "invalid_header";
4324 4324
4325 
-      // ----- Error log
4326 
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
4325 
+        // ----- Error log
4326 
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
4327 4327
4328 
-      // ----- Return
4329 
-      return PclZip::errorCode();
4328 
+        // ----- Return
4329 
+        return PclZip::errorCode();
4330 4330 
     }
4331 4331
4332 4332 
     // ----- Extract the values

@@ -4337,10 +4337,10 @@  discard block
 
 block discarded – undo
4337 4337
4338 4338 
     // ----- Get extra_fields
4339 4339 
     if ($v_data['extra_len'] != 0) {
4340 
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
4340 
+        $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
4341 4341 
     }
4342 4342 
     else {
4343 
-      $p_header['extra'] = '';
4343 
+        $p_header['extra'] = '';
4344 4344 
     }
4345 4345
4346 4346 
     // ----- Extract properties

@@ -4357,23 +4357,23 @@  discard block
 
 block discarded – undo
4357 4357 
     $p_header['mtime'] = $v_data['mtime'];
4358 4358 
     if ($p_header['mdate'] && $p_header['mtime'])
4359 4359 
     {
4360 
-      // ----- Extract time
4361 
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
4362 
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
4363 
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
4360 
+        // ----- Extract time
4361 
+        $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
4362 
+        $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
4363 
+        $v_seconde = ($p_header['mtime'] & 0x001F)*2;
4364 4364
4365 
-      // ----- Extract date
4366 
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
4367 
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
4368 
-      $v_day = $p_header['mdate'] & 0x001F;
4365 
+        // ----- Extract date
4366 
+        $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
4367 
+        $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
4368 
+        $v_day = $p_header['mdate'] & 0x001F;
4369 4369
4370 
-      // ----- Get UNIX date format
4371 
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
4370 
+        // ----- Get UNIX date format
4371 
+        $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
4372 4372
4373 4373 
     }
4374 4374 
     else
4375 4375 
     {
4376 
-      $p_header['mtime'] = time();
4376 
+        $p_header['mtime'] = time();
4377 4377 
     }
4378 4378
4379 4379 
     // TBC

@@ -4388,17 +4388,17 @@  discard block
 
 block discarded – undo
4388 4388
4389 4389 
     // ----- Return
4390 4390 
     return $v_result;
4391 
-  }
4392 
-  // --------------------------------------------------------------------------------
4393 
-
4394 
-  // --------------------------------------------------------------------------------
4395 
-  // Function : privReadCentralFileHeader()
4396 
-  // Description :
4397 
-  // Parameters :
4398 
-  // Return Values :
4399 
-  // --------------------------------------------------------------------------------
4400 
-  function privReadCentralFileHeader(&$p_header)
4401 
-  {
4391 
+    }
4392 
+    // --------------------------------------------------------------------------------
4393 
+
4394 
+    // --------------------------------------------------------------------------------
4395 
+    // Function : privReadCentralFileHeader()
4396 
+    // Description :
4397 
+    // Parameters :
4398 
+    // Return Values :
4399 
+    // --------------------------------------------------------------------------------
4400 
+    function privReadCentralFileHeader(&$p_header)
4401 
+    {
4402 4402 
     $v_result=1;
4403 4403
4404 4404 
     // ----- Read the 4 bytes signature

@@ -4409,11 +4409,11 @@  discard block
 
 block discarded – undo
4409 4409 
     if ($v_data['id'] != 0x02014b50)
4410 4410 
     {
4411 4411
4412 
-      // ----- Error log
4413 
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
4412 
+        // ----- Error log
4413 
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
4414 4414
4415 
-      // ----- Return
4416 
-      return PclZip::errorCode();
4415 
+        // ----- Return
4416 
+        return PclZip::errorCode();
4417 4417 
     }
4418 4418
4419 4419 
     // ----- Read the first 42 bytes of the header

@@ -4422,14 +4422,14 @@  discard block
 
 block discarded – undo
4422 4422 
     // ----- Look for invalid block size
4423 4423 
     if (strlen($v_binary_data) != 42)
4424 4424 
     {
4425 
-      $p_header['filename'] = "";
4426 
-      $p_header['status'] = "invalid_header";
4425 
+        $p_header['filename'] = "";
4426 
+        $p_header['status'] = "invalid_header";
4427 4427
4428 
-      // ----- Error log
4429 
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
4428 
+        // ----- Error log
4429 
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
4430 4430
4431 
-      // ----- Return
4432 
-      return PclZip::errorCode();
4431 
+        // ----- Return
4432 
+        return PclZip::errorCode();
4433 4433 
     }
4434 4434
4435 4435 
     // ----- Extract the values

@@ -4437,28 +4437,28 @@  discard block
 
 block discarded – undo
4437 4437
4438 4438 
     // ----- Get filename
4439 4439 
     if ($p_header['filename_len'] != 0)
4440 
-      //
4441 
-      // --------------------------------------------------------------------------------
4442 
-      // A patch about stored filenames with backslash directory separator (Windows style).
4443 
-      // Archives created by the utility IZArc 3.81 (possibly new versions too) need this patch.
4444 
-      //$p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
4445 
-      $p_header['filename'] = str_replace("\\", '/', fread($this->zip_fd, $p_header['filename_len']));
4446 
-      // --------------------------------------------------------------------------------
4447 
-      //
4440 
+        //
4441 
+        // --------------------------------------------------------------------------------
4442 
+        // A patch about stored filenames with backslash directory separator (Windows style).
4443 
+        // Archives created by the utility IZArc 3.81 (possibly new versions too) need this patch.
4444 
+        //$p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
4445 
+        $p_header['filename'] = str_replace("\\", '/', fread($this->zip_fd, $p_header['filename_len']));
4446 
+        // --------------------------------------------------------------------------------
4447 
+        //
4448 4448 
     else
4449 
-      $p_header['filename'] = '';
4449 
+        $p_header['filename'] = '';
4450 4450
4451 4451 
     // ----- Get extra
4452 4452 
     if ($p_header['extra_len'] != 0)
4453 
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
4453 
+        $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
4454 4454 
     else
4455 
-      $p_header['extra'] = '';
4455 
+        $p_header['extra'] = '';
4456 4456
4457 4457 
     // ----- Get comment
4458 4458 
     if ($p_header['comment_len'] != 0)
4459 
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
4459 
+        $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
4460 4460 
     else
4461 
-      $p_header['comment'] = '';
4461 
+        $p_header['comment'] = '';
4462 4462
4463 4463 
     // ----- Extract properties
4464 4464 
 

@@ -4467,23 +4467,23 @@  discard block
 
 block discarded – undo
4467 4467 
     // TBC : bug : this was ignoring time with 0/0/0
4468 4468 
     if (1)
4469 4469 
     {
4470 
-      // ----- Extract time
4471 
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
4472 
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
4473 
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
4470 
+        // ----- Extract time
4471 
+        $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
4472 
+        $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
4473 
+        $v_seconde = ($p_header['mtime'] & 0x001F)*2;
4474 4474
4475 
-      // ----- Extract date
4476 
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
4477 
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
4478 
-      $v_day = $p_header['mdate'] & 0x001F;
4475 
+        // ----- Extract date
4476 
+        $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
4477 
+        $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
4478 
+        $v_day = $p_header['mdate'] & 0x001F;
4479 4479
4480 
-      // ----- Get UNIX date format
4481 
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
4480 
+        // ----- Get UNIX date format
4481 
+        $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
4482 4482
4483 4483 
     }
4484 4484 
     else
4485 4485 
     {
4486 
-      $p_header['mtime'] = time();
4486 
+        $p_header['mtime'] = time();
4487 4487 
     }
4488 4488
4489 4489 
     // ----- Set the stored filename

@@ -4494,63 +4494,63 @@  discard block
 
 block discarded – undo
4494 4494
4495 4495 
     // ----- Look if it is a directory
4496 4496 
     if (substr($p_header['filename'], -1) == '/') {
4497 
-      //$p_header['external'] = 0x41FF0010;
4498 
-      $p_header['external'] = 0x00000010;
4497 
+        //$p_header['external'] = 0x41FF0010;
4498 
+        $p_header['external'] = 0x00000010;
4499 4499 
     }
4500 4500
4501 4501
4502 4502 
     // ----- Return
4503 4503 
     return $v_result;
4504 
-  }
4505 
-  // --------------------------------------------------------------------------------
4506 
-
4507 
-  // --------------------------------------------------------------------------------
4508 
-  // Function : privCheckFileHeaders()
4509 
-  // Description :
4510 
-  // Parameters :
4511 
-  // Return Values :
4512 
-  //   1 on success,
4513 
-  //   0 on error;
4514 
-  // --------------------------------------------------------------------------------
4515 
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
4516 
-  {
4504 
+    }
4505 
+    // --------------------------------------------------------------------------------
4506 
+
4507 
+    // --------------------------------------------------------------------------------
4508 
+    // Function : privCheckFileHeaders()
4509 
+    // Description :
4510 
+    // Parameters :
4511 
+    // Return Values :
4512 
+    //   1 on success,
4513 
+    //   0 on error;
4514 
+    // --------------------------------------------------------------------------------
4515 
+    function privCheckFileHeaders(&$p_local_header, &$p_central_header)
4516 
+    {
4517 4517 
     $v_result=1;
4518 4518
4519 
-  	// ----- Check the static values
4520 
-  	// TBC
4521 
-  	if ($p_local_header['filename'] != $p_central_header['filename']) {
4522 
-  	}
4523 
-  	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
4524 
-  	}
4525 
-  	if ($p_local_header['flag'] != $p_central_header['flag']) {
4526 
-  	}
4527 
-  	if ($p_local_header['compression'] != $p_central_header['compression']) {
4528 
-  	}
4529 
-  	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
4530 
-  	}
4531 
-  	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
4532 
-  	}
4533 
-
4534 
-  	// ----- Look for flag bit 3
4535 
-  	if (($p_local_header['flag'] & 8) == 8) {
4536 
-          $p_local_header['size'] = $p_central_header['size'];
4537 
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
4538 
-          $p_local_header['crc'] = $p_central_header['crc'];
4539 
-  	}
4519 
+        // ----- Check the static values
4520 
+        // TBC
4521 
+        if ($p_local_header['filename'] != $p_central_header['filename']) {
4522 
+        }
4523 
+        if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
4524 
+        }
4525 
+        if ($p_local_header['flag'] != $p_central_header['flag']) {
4526 
+        }
4527 
+        if ($p_local_header['compression'] != $p_central_header['compression']) {
4528 
+        }
4529 
+        if ($p_local_header['mtime'] != $p_central_header['mtime']) {
4530 
+        }
4531 
+        if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
4532 
+        }
4533 
+
4534 
+        // ----- Look for flag bit 3
4535 
+        if (($p_local_header['flag'] & 8) == 8) {
4536 
+            $p_local_header['size'] = $p_central_header['size'];
4537 
+            $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
4538 
+            $p_local_header['crc'] = $p_central_header['crc'];
4539 
+        }
4540 4540
4541 4541 
     // ----- Return
4542 4542 
     return $v_result;
4543 
-  }
4544 
-  // --------------------------------------------------------------------------------
4545 
-
4546 
-  // --------------------------------------------------------------------------------
4547 
-  // Function : privReadEndCentralDir()
4548 
-  // Description :
4549 
-  // Parameters :
4550 
-  // Return Values :
4551 
-  // --------------------------------------------------------------------------------
4552 
-  function privReadEndCentralDir(&$p_central_dir)
4553 
-  {
4543 
+    }
4544 
+    // --------------------------------------------------------------------------------
4545 
+
4546 
+    // --------------------------------------------------------------------------------
4547 
+    // Function : privReadEndCentralDir()
4548 
+    // Description :
4549 
+    // Parameters :
4550 
+    // Return Values :
4551 
+    // --------------------------------------------------------------------------------
4552 
+    function privReadEndCentralDir(&$p_central_dir)
4553 
+    {
4554 4554 
     $v_result=1;
4555 4555
4556 4556 
     // ----- Go to the end of the zip file

@@ -4558,59 +4558,59 @@  discard block
 
 block discarded – undo
4558 4558 
     @fseek($this->zip_fd, $v_size);
4559 4559 
     if (@ftell($this->zip_fd) != $v_size)
4560 4560 
     {
4561 
-      // ----- Error log
4562 
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
4561 
+        // ----- Error log
4562 
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
4563 4563
4564 
-      // ----- Return
4565 
-      return PclZip::errorCode();
4564 
+        // ----- Return
4565 
+        return PclZip::errorCode();
4566 4566 
     }
4567 4567
4568 4568 
     // ----- First try : look if this is an archive with no commentaries (most of the time)
4569 4569 
     // in this case the end of central dir is at 22 bytes of the file end
4570 4570 
     $v_found = 0;
4571 4571 
     if ($v_size > 26) {
4572 
-      @fseek($this->zip_fd, $v_size-22);
4573 
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
4574 
-      {
4572 
+        @fseek($this->zip_fd, $v_size-22);
4573 
+        if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
4574 
+        {
4575 4575 
         // ----- Error log
4576 4576 
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
4577 4577
4578 4578 
         // ----- Return
4579 4579 
         return PclZip::errorCode();
4580 
-      }
4580 
+        }
4581 4581
4582 
-      // ----- Read for bytes
4583 
-      $v_binary_data = @fread($this->zip_fd, 4);
4584 
-      $v_data = @unpack('Vid', $v_binary_data);
4582 
+        // ----- Read for bytes
4583 
+        $v_binary_data = @fread($this->zip_fd, 4);
4584 
+        $v_data = @unpack('Vid', $v_binary_data);
4585 4585
4586 
-      // ----- Check signature
4587 
-      if ($v_data['id'] == 0x06054b50) {
4586 
+        // ----- Check signature
4587 
+        if ($v_data['id'] == 0x06054b50) {
4588 4588 
         $v_found = 1;
4589 
-      }
4589 
+        }
4590 4590
4591 
-      $v_pos = ftell($this->zip_fd);
4591 
+        $v_pos = ftell($this->zip_fd);
4592 4592 
     }
4593 4593
4594 4594 
     // ----- Go back to the maximum possible size of the Central Dir End Record
4595 4595 
     if (!$v_found) {
4596 
-      $v_maximum_size = 65557; // 0xFFFF + 22;
4597 
-      if ($v_maximum_size > $v_size)
4596 
+        $v_maximum_size = 65557; // 0xFFFF + 22;
4597 
+        if ($v_maximum_size > $v_size)
4598 4598 
         $v_maximum_size = $v_size;
4599 
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
4600 
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
4601 
-      {
4599 
+        @fseek($this->zip_fd, $v_size-$v_maximum_size);
4600 
+        if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
4601 
+        {
4602 4602 
         // ----- Error log
4603 4603 
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
4604 4604
4605 4605 
         // ----- Return
4606 4606 
         return PclZip::errorCode();
4607 
-      }
4607 
+        }
4608 4608
4609 
-      // ----- Read byte per byte in order to find the signature
4610 
-      $v_pos = ftell($this->zip_fd);
4611 
-      $v_bytes = 0x00000000;
4612 
-      while ($v_pos < $v_size)
4613 
-      {
4609 
+        // ----- Read byte per byte in order to find the signature
4610 
+        $v_pos = ftell($this->zip_fd);
4611 
+        $v_bytes = 0x00000000;
4612 
+        while ($v_pos < $v_size)
4613 
+        {
4614 4614 
         // ----- Read a byte
4615 4615 
         $v_byte = @fread($this->zip_fd, 1);
4616 4616 
 

@@ -4623,23 +4623,23 @@  discard block
 
 block discarded – undo
4623 4623 
         // ----- Compare the bytes
4624 4624 
         if ($v_bytes == 0x504b0506)
4625 4625 
         {
4626 
-          $v_pos++;
4627 
-          break;
4626 
+            $v_pos++;
4627 
+            break;
4628 4628 
         }
4629 4629
4630 4630 
         $v_pos++;
4631 
-      }
4631 
+        }
4632 4632
4633 
-      // ----- Look if not found end of central dir
4634 
-      if ($v_pos == $v_size)
4635 
-      {
4633 
+        // ----- Look if not found end of central dir
4634 
+        if ($v_pos == $v_size)
4635 
+        {
4636 4636
4637 4637 
         // ----- Error log
4638 4638 
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
4639 4639
4640 4640 
         // ----- Return
4641 4641 
         return PclZip::errorCode();
4642 
-      }
4642 
+        }
4643 4643 
     }
4644 4644
4645 4645 
     // ----- Read the first 18 bytes of the header

@@ -4649,11 +4649,11 @@  discard block
 
 block discarded – undo
4649 4649 
     if (strlen($v_binary_data) != 18)
4650 4650 
     {
4651 4651
4652 
-      // ----- Error log
4653 
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
4652 
+        // ----- Error log
4653 
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
4654 4654
4655 
-      // ----- Return
4656 
-      return PclZip::errorCode();
4655 
+        // ----- Return
4656 
+        return PclZip::errorCode();
4657 4657 
     }
4658 4658
4659 4659 
     // ----- Extract the values

@@ -4662,27 +4662,27 @@  discard block
 
 block discarded – undo
4662 4662 
     // ----- Check the global size
4663 4663 
     if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
4664 4664
4665 
-	  // ----- Removed in release 2.2 see readme file
4666 
-	  // The check of the file size is a little too strict.
4667 
-	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
4668 
-	  // While decrypted, zip has training 0 bytes
4669 
-	  if (0) {
4670 
-      // ----- Error log
4671 
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
4672 
-	                       'The central dir is not at the end of the archive.'
4673 
-						   .' Some trailing bytes exists after the archive.');
4665 
+        // ----- Removed in release 2.2 see readme file
4666 
+        // The check of the file size is a little too strict.
4667 
+        // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
4668 
+        // While decrypted, zip has training 0 bytes
4669 
+        if (0) {
4670 
+        // ----- Error log
4671 
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
4672 
+                            'The central dir is not at the end of the archive.'
4673 
+                            .' Some trailing bytes exists after the archive.');
4674 4674
4675 
-      // ----- Return
4676 
-      return PclZip::errorCode();
4677 
-	  }
4675 
+        // ----- Return
4676 
+        return PclZip::errorCode();
4677 
+        }
4678 4678 
     }
4679 4679
4680 4680 
     // ----- Get comment
4681 4681 
     if ($v_data['comment_size'] != 0) {
4682 
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
4682 
+        $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
4683 4683 
     }
4684 4684 
     else
4685 
-      $p_central_dir['comment'] = '';
4685 
+        $p_central_dir['comment'] = '';
4686 4686
4687 4687 
     $p_central_dir['entries'] = $v_data['entries'];
4688 4688 
     $p_central_dir['disk_entries'] = $v_data['disk_entries'];

@@ -4697,33 +4697,33 @@  discard block
 
 block discarded – undo
4697 4697
4698 4698 
     // ----- Return
4699 4699 
     return $v_result;
4700 
-  }
4701 
-  // --------------------------------------------------------------------------------
4702 
-
4703 
-  // --------------------------------------------------------------------------------
4704 
-  // Function : privDeleteByRule()
4705 
-  // Description :
4706 
-  // Parameters :
4707 
-  // Return Values :
4708 
-  // --------------------------------------------------------------------------------
4709 
-  function privDeleteByRule(&$p_result_list, &$p_options)
4710 
-  {
4700 
+    }
4701 
+    // --------------------------------------------------------------------------------
4702 
+
4703 
+    // --------------------------------------------------------------------------------
4704 
+    // Function : privDeleteByRule()
4705 
+    // Description :
4706 
+    // Parameters :
4707 
+    // Return Values :
4708 
+    // --------------------------------------------------------------------------------
4709 
+    function privDeleteByRule(&$p_result_list, &$p_options)
4710 
+    {
4711 4711 
     $v_result=1;
4712 4712 
     $v_list_detail = array();
4713 4713
4714 4714 
     // ----- Open the zip file
4715 4715 
     if (($v_result=$this->privOpenFd('rb')) != 1)
4716 4716 
     {
4717 
-      // ----- Return
4718 
-      return $v_result;
4717 
+        // ----- Return
4718 
+        return $v_result;
4719 4719 
     }
4720 4720
4721 4721 
     // ----- Read the central directory informations
4722 4722 
     $v_central_dir = array();
4723 4723 
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
4724 4724 
     {
4725 
-      $this->privCloseFd();
4726 
-      return $v_result;
4725 
+        $this->privCloseFd();
4726 
+        return $v_result;
4727 4727 
     }
4728 4728
4729 4729 
     // ----- Go to beginning of File

@@ -4735,14 +4735,14 @@  discard block
 
 block discarded – undo
4735 4735 
     @rewind($this->zip_fd);
4736 4736 
     if (@fseek($this->zip_fd, $v_pos_entry))
4737 4737 
     {
4738 
-      // ----- Close the zip file
4739 
-      $this->privCloseFd();
4738 
+        // ----- Close the zip file
4739 
+        $this->privCloseFd();
4740 4740
4741 
-      // ----- Error log
4742 
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
4741 
+        // ----- Error log
4742 
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
4743 4743
4744 
-      // ----- Return
4745 
-      return PclZip::errorCode();
4744 
+        // ----- Return
4745 
+        return PclZip::errorCode();
4746 4746 
     }
4747 4747
4748 4748 
     // ----- Read each entry

@@ -4751,53 +4751,53 @@  discard block
 
 block discarded – undo
4751 4751 
     for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
4752 4752 
     {
4753 4753
4754 
-      // ----- Read the file header
4755 
-      $v_header_list[$v_nb_extracted] = array();
4756 
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
4757 
-      {
4754 
+        // ----- Read the file header
4755 
+        $v_header_list[$v_nb_extracted] = array();
4756 
+        if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
4757 
+        {
4758 4758 
         // ----- Close the zip file
4759 4759 
         $this->privCloseFd();
4760 4760
4761 4761 
         return $v_result;
4762 
-      }
4762 
+        }
4763 4763
4764 4764
4765 
-      // ----- Store the index
4766 
-      $v_header_list[$v_nb_extracted]['index'] = $i;
4765 
+        // ----- Store the index
4766 
+        $v_header_list[$v_nb_extracted]['index'] = $i;
4767 4767
4768 
-      // ----- Look for the specific extract rules
4769 
-      $v_found = false;
4768 
+        // ----- Look for the specific extract rules
4769 
+        $v_found = false;
4770 4770
4771 
-      // ----- Look for extract by name rule
4772 
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
4771 
+        // ----- Look for extract by name rule
4772 
+        if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
4773 4773 
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
4774 4774
4775 
-          // ----- Look if the filename is in the list
4776 
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
4775 
+            // ----- Look if the filename is in the list
4776 
+            for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
4777 4777
4778 
-              // ----- Look for a directory
4779 
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
4778 
+                // ----- Look for a directory
4779 
+                if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
4780 4780
4781 
-                  // ----- Look if the directory is in the filename path
4782 
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
4781 
+                    // ----- Look if the directory is in the filename path
4782 
+                    if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
4783 4783 
                       && (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])) {
4784 
-                      $v_found = true;
4785 
-                  }
4786 
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
4784 
+                        $v_found = true;
4785 
+                    }
4786 
+                    elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
4787 4787 
                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
4788 
-                      $v_found = true;
4789 
-                  }
4790 
-              }
4791 
-              // ----- Look for a filename
4792 
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
4793 
-                  $v_found = true;
4794 
-              }
4795 
-          }
4796 
-      }
4788 
+                        $v_found = true;
4789 
+                    }
4790 
+                }
4791 
+                // ----- Look for a filename
4792 
+                elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
4793 
+                    $v_found = true;
4794 
+                }
4795 
+            }
4796 
+        }
4797 4797
4798 
-      // ----- Look for extract by ereg rule
4799 
-      // ereg() is deprecated with PHP 5.3
4800 
-      /*
4798 
+        // ----- Look for extract by ereg rule
4799 
+        // ereg() is deprecated with PHP 5.3
4800 
+        /*
4801 4801 
       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
4802 4802 
                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
4803 4803 
 

@@ -4807,47 +4807,47 @@  discard block
 
 block discarded – undo
4807 4807 
       }
4808 4808 
       */
4809 4809
4810 
-      // ----- Look for extract by preg rule
4811 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
4810 
+        // ----- Look for extract by preg rule
4811 
+        else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
4812 4812 
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
4813 4813
4814 
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
4815 
-              $v_found = true;
4816 
-          }
4817 
-      }
4814 
+            if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
4815 
+                $v_found = true;
4816 
+            }
4817 
+        }
4818 4818
4819 
-      // ----- Look for extract by index rule
4820 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
4819 
+        // ----- Look for extract by index rule
4820 
+        else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
4821 4821 
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
4822 4822
4823 
-          // ----- Look if the index is in the list
4824 
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
4823 
+            // ----- Look if the index is in the list
4824 
+            for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
4825 4825
4826 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
4827 
-                  $v_found = true;
4828 
-              }
4829 
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
4830 
-                  $j_start = $j+1;
4831 
-              }
4826 
+                if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
4827 
+                    $v_found = true;
4828 
+                }
4829 
+                if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
4830 
+                    $j_start = $j+1;
4831 
+                }
4832 4832
4833 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
4834 
-                  break;
4835 
-              }
4836 
-          }
4837 
-      }
4838 
-      else {
4839 
-      	$v_found = true;
4840 
-      }
4833 
+                if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
4834 
+                    break;
4835 
+                }
4836 
+            }
4837 
+        }
4838 
+        else {
4839 
+            $v_found = true;
4840 
+        }
4841 4841
4842 
-      // ----- Look for deletion
4843 
-      if ($v_found)
4844 
-      {
4842 
+        // ----- Look for deletion
4843 
+        if ($v_found)
4844 
+        {
4845 4845 
         unset($v_header_list[$v_nb_extracted]);
4846 
-      }
4847 
-      else
4848 
-      {
4846 
+        }
4847 
+        else
4848 
+        {
4849 4849 
         $v_nb_extracted++;
4850 
-      }
4850 
+        }
4851 4851 
     }
4852 4852
4853 4853 
     // ----- Look if something need to be deleted

@@ -4899,7 +4899,7 @@  discard block
 
 block discarded – undo
4899 4899
4900 4900 
             // ----- Check that local file header is same as central file header
4901 4901 
             if ($this->privCheckFileHeaders($v_local_header,
4902 
-			                                $v_header_list[$i]) != 1) {
4902 
+                                            $v_header_list[$i]) != 1) {
4903 4903 
                 // TBC
4904 4904 
             }
4905 4905 
             unset($v_local_header);

@@ -4950,7 +4950,7 @@  discard block
 
 block discarded – undo
4950 4950 
         // ----- Zip file comment
4951 4951 
         $v_comment = '';
4952 4952 
         if (isset($p_options[PCLZIP_OPT_COMMENT])) {
4953 
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
4953 
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
4954 4954 
         }
4955 4955
4956 4956 
         // ----- Calculate the size of the central header

@@ -4990,11 +4990,11 @@  discard block
 
 block discarded – undo
4990 4990 
         $this->privCloseFd();
4991 4991
4992 4992 
         if (($v_result = $this->privOpenFd('wb')) != 1) {
4993 
-          return $v_result;
4993 
+            return $v_result;
4994 4994 
         }
4995 4995
4996 4996 
         if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
4997 
-          return $v_result;
4997 
+            return $v_result;
4998 4998 
         }
4999 4999
5000 5000 
         $this->privCloseFd();

@@ -5002,35 +5002,35 @@  discard block
 
 block discarded – undo
5002 5002
5003 5003 
     // ----- Return
5004 5004 
     return $v_result;
5005 
-  }
5006 
-  // --------------------------------------------------------------------------------
5007 
-
5008 
-  // --------------------------------------------------------------------------------
5009 
-  // Function : privDirCheck()
5010 
-  // Description :
5011 
-  //   Check if a directory exists, if not it creates it and all the parents directory
5012 
-  //   which may be useful.
5013 
-  // Parameters :
5014 
-  //   $p_dir : Directory path to check.
5015 
-  // Return Values :
5016 
-  //    1 : OK
5017 
-  //   -1 : Unable to create directory
5018 
-  // --------------------------------------------------------------------------------
5019 
-  function privDirCheck($p_dir, $p_is_dir=false)
5020 
-  {
5005 
+    }
5006 
+    // --------------------------------------------------------------------------------
5007 
+
5008 
+    // --------------------------------------------------------------------------------
5009 
+    // Function : privDirCheck()
5010 
+    // Description :
5011 
+    //   Check if a directory exists, if not it creates it and all the parents directory
5012 
+    //   which may be useful.
5013 
+    // Parameters :
5014 
+    //   $p_dir : Directory path to check.
5015 
+    // Return Values :
5016 
+    //    1 : OK
5017 
+    //   -1 : Unable to create directory
5018 
+    // --------------------------------------------------------------------------------
5019 
+    function privDirCheck($p_dir, $p_is_dir=false)
5020 
+    {
5021 5021 
     $v_result = 1;
5022 5022
5023 5023
5024 5024 
     // ----- Remove the final '/'
5025 5025 
     if (($p_is_dir) && (substr($p_dir, -1)=='/'))
5026 5026 
     {
5027 
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
5027 
+        $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
5028 5028 
     }
5029 5029
5030 5030 
     // ----- Check the directory availability
5031 5031 
     if ((is_dir($p_dir)) || ($p_dir == ""))
5032 5032 
     {
5033 
-      return 1;
5033 
+        return 1;
5034 5034 
     }
5035 5035
5036 5036 
     // ----- Extract parent directory

@@ -5039,77 +5039,77 @@  discard block
 
 block discarded – undo
5039 5039 
     // ----- Just a check
5040 5040 
     if ($p_parent_dir != $p_dir)
5041 5041 
     {
5042 
-      // ----- Look for parent directory
5043 
-      if ($p_parent_dir != "")
5044 
-      {
5042 
+        // ----- Look for parent directory
5043 
+        if ($p_parent_dir != "")
5044 
+        {
5045 5045 
         if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
5046 5046 
         {
5047 
-          return $v_result;
5047 
+            return $v_result;
5048 
+        }
5048 5049 
         }
5049 
-      }
5050 5050 
     }
5051 5051
5052 5052 
     // ----- Create the directory
5053 5053 
     if (!@mkdir($p_dir, 0777))
5054 5054 
     {
5055 
-      // ----- Error log
5056 
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
5055 
+        // ----- Error log
5056 
+        PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
5057 5057
5058 
-      // ----- Return
5059 
-      return PclZip::errorCode();
5058 
+        // ----- Return
5059 
+        return PclZip::errorCode();
5060 5060 
     }
5061 5061
5062 5062 
     // ----- Return
5063 5063 
     return $v_result;
5064 
-  }
5065 
-  // --------------------------------------------------------------------------------
5066 
-
5067 
-  // --------------------------------------------------------------------------------
5068 
-  // Function : privMerge()
5069 
-  // Description :
5070 
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
5071 
-  // Parameters :
5072 
-  // Return Values :
5073 
-  // --------------------------------------------------------------------------------
5074 
-  function privMerge(&$p_archive_to_add)
5075 
-  {
5064 
+    }
5065 
+    // --------------------------------------------------------------------------------
5066 
+
5067 
+    // --------------------------------------------------------------------------------
5068 
+    // Function : privMerge()
5069 
+    // Description :
5070 
+    //   If $p_archive_to_add does not exist, the function exit with a success result.
5071 
+    // Parameters :
5072 
+    // Return Values :
5073 
+    // --------------------------------------------------------------------------------
5074 
+    function privMerge(&$p_archive_to_add)
5075 
+    {
5076 5076 
     $v_result=1;
5077 5077
5078 5078 
     // ----- Look if the archive_to_add exists
5079 5079 
     if (!is_file($p_archive_to_add->zipname))
5080 5080 
     {
5081 5081
5082 
-      // ----- Nothing to merge, so merge is a success
5083 
-      $v_result = 1;
5082 
+        // ----- Nothing to merge, so merge is a success
5083 
+        $v_result = 1;
5084 5084
5085 
-      // ----- Return
5086 
-      return $v_result;
5085 
+        // ----- Return
5086 
+        return $v_result;
5087 5087 
     }
5088 5088
5089 5089 
     // ----- Look if the archive exists
5090 5090 
     if (!is_file($this->zipname))
5091 5091 
     {
5092 5092
5093 
-      // ----- Do a duplicate
5094 
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
5093 
+        // ----- Do a duplicate
5094 
+        $v_result = $this->privDuplicate($p_archive_to_add->zipname);
5095 5095
5096 
-      // ----- Return
5097 
-      return $v_result;
5096 
+        // ----- Return
5097 
+        return $v_result;
5098 5098 
     }
5099 5099
5100 5100 
     // ----- Open the zip file
5101 5101 
     if (($v_result=$this->privOpenFd('rb')) != 1)
5102 5102 
     {
5103 
-      // ----- Return
5104 
-      return $v_result;
5103 
+        // ----- Return
5104 
+        return $v_result;
5105 5105 
     }
5106 5106
5107 5107 
     // ----- Read the central directory informations
5108 5108 
     $v_central_dir = array();
5109 5109 
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
5110 5110 
     {
5111 
-      $this->privCloseFd();
5112 
-      return $v_result;
5111 
+        $this->privCloseFd();
5112 
+        return $v_result;
5113 5113 
     }
5114 5114
5115 5115 
     // ----- Go to beginning of File

@@ -5118,20 +5118,20 @@  discard block
 
 block discarded – undo
5118 5118 
     // ----- Open the archive_to_add file
5119 5119 
     if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
5120 5120 
     {
5121 
-      $this->privCloseFd();
5121 
+        $this->privCloseFd();
5122 5122
5123 
-      // ----- Return
5124 
-      return $v_result;
5123 
+        // ----- Return
5124 
+        return $v_result;
5125 5125 
     }
5126 5126
5127 5127 
     // ----- Read the central directory informations
5128 5128 
     $v_central_dir_to_add = array();
5129 5129 
     if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
5130 5130 
     {
5131 
-      $this->privCloseFd();
5132 
-      $p_archive_to_add->privCloseFd();
5131 
+        $this->privCloseFd();
5132 
+        $p_archive_to_add->privCloseFd();
5133 5133
5134 
-      return $v_result;
5134 
+        return $v_result;
5135 5135 
     }
5136 5136
5137 5137 
     // ----- Go to beginning of File

@@ -5143,13 +5143,13 @@  discard block
 
 block discarded – undo
5143 5143 
     // ----- Open the temporary file in write mode
5144 5144 
     if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
5145 5145 
     {
5146 
-      $this->privCloseFd();
5147 
-      $p_archive_to_add->privCloseFd();
5146 
+        $this->privCloseFd();
5147 
+        $p_archive_to_add->privCloseFd();
5148 5148
5149 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
5149 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
5150 5150
5151 
-      // ----- Return
5152 
-      return PclZip::errorCode();
5151 
+        // ----- Return
5152 
+        return PclZip::errorCode();
5153 5153 
     }
5154 5154
5155 5155 
     // ----- Copy the files from the archive to the temporary file

@@ -5157,20 +5157,20 @@  discard block
 
 block discarded – undo
5157 5157 
     $v_size = $v_central_dir['offset'];
5158 5158 
     while ($v_size != 0)
5159 5159 
     {
5160 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5161 
-      $v_buffer = fread($this->zip_fd, $v_read_size);
5162 
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
5163 
-      $v_size -= $v_read_size;
5160 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5161 
+        $v_buffer = fread($this->zip_fd, $v_read_size);
5162 
+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
5163 
+        $v_size -= $v_read_size;
5164 5164 
     }
5165 5165
5166 5166 
     // ----- Copy the files from the archive_to_add into the temporary file
5167 5167 
     $v_size = $v_central_dir_to_add['offset'];
5168 5168 
     while ($v_size != 0)
5169 5169 
     {
5170 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5171 
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
5172 
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
5173 
-      $v_size -= $v_read_size;
5170 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5171 
+        $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
5172 
+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
5173 
+        $v_size -= $v_read_size;
5174 5174 
     }
5175 5175
5176 5176 
     // ----- Store the offset of the central dir

@@ -5180,20 +5180,20 @@  discard block
 
 block discarded – undo
5180 5180 
     $v_size = $v_central_dir['size'];
5181 5181 
     while ($v_size != 0)
5182 5182 
     {
5183 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5184 
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
5185 
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
5186 
-      $v_size -= $v_read_size;
5183 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5184 
+        $v_buffer = @fread($this->zip_fd, $v_read_size);
5185 
+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
5186 
+        $v_size -= $v_read_size;
5187 5187 
     }
5188 5188
5189 5189 
     // ----- Copy the block of file headers from the archive_to_add
5190 5190 
     $v_size = $v_central_dir_to_add['size'];
5191 5191 
     while ($v_size != 0)
5192 5192 
     {
5193 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5194 
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
5195 
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
5196 
-      $v_size -= $v_read_size;
5193 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5194 
+        $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
5195 
+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
5196 
+        $v_size -= $v_read_size;
5197 5197 
     }
5198 5198
5199 5199 
     // ----- Merge the file comments

@@ -5212,16 +5212,16 @@  discard block
 
 block discarded – undo
5212 5212 
     // ----- Create the central dir footer
5213 5213 
     if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
5214 5214 
     {
5215 
-      $this->privCloseFd();
5216 
-      $p_archive_to_add->privCloseFd();
5217 
-      @fclose($v_zip_temp_fd);
5218 
-      $this->zip_fd = null;
5215 
+        $this->privCloseFd();
5216 
+        $p_archive_to_add->privCloseFd();
5217 
+        @fclose($v_zip_temp_fd);
5218 
+        $this->zip_fd = null;
5219 5219
5220 
-      // ----- Reset the file list
5221 
-      unset($v_header_list);
5220 
+        // ----- Reset the file list
5221 
+        unset($v_header_list);
5222 5222
5223 
-      // ----- Return
5224 
-      return $v_result;
5223 
+        // ----- Return
5224 
+        return $v_result;
5225 5225 
     }
5226 5226
5227 5227 
     // ----- Swap back the file descriptor

@@ -5247,46 +5247,46 @@  discard block
 
 block discarded – undo
5247 5247
5248 5248 
     // ----- Return
5249 5249 
     return $v_result;
5250 
-  }
5251 
-  // --------------------------------------------------------------------------------
5252 
-
5253 
-  // --------------------------------------------------------------------------------
5254 
-  // Function : privDuplicate()
5255 
-  // Description :
5256 
-  // Parameters :
5257 
-  // Return Values :
5258 
-  // --------------------------------------------------------------------------------
5259 
-  function privDuplicate($p_archive_filename)
5260 
-  {
5250 
+    }
5251 
+    // --------------------------------------------------------------------------------
5252 
+
5253 
+    // --------------------------------------------------------------------------------
5254 
+    // Function : privDuplicate()
5255 
+    // Description :
5256 
+    // Parameters :
5257 
+    // Return Values :
5258 
+    // --------------------------------------------------------------------------------
5259 
+    function privDuplicate($p_archive_filename)
5260 
+    {
5261 5261 
     $v_result=1;
5262 5262
5263 5263 
     // ----- Look if the $p_archive_filename exists
5264 5264 
     if (!is_file($p_archive_filename))
5265 5265 
     {
5266 5266
5267 
-      // ----- Nothing to duplicate, so duplicate is a success.
5268 
-      $v_result = 1;
5267 
+        // ----- Nothing to duplicate, so duplicate is a success.
5268 
+        $v_result = 1;
5269 5269
5270 
-      // ----- Return
5271 
-      return $v_result;
5270 
+        // ----- Return
5271 
+        return $v_result;
5272 5272 
     }
5273 5273
5274 5274 
     // ----- Open the zip file
5275 5275 
     if (($v_result=$this->privOpenFd('wb')) != 1)
5276 5276 
     {
5277 
-      // ----- Return
5278 
-      return $v_result;
5277 
+        // ----- Return
5278 
+        return $v_result;
5279 5279 
     }
5280 5280
5281 5281 
     // ----- Open the temporary file in write mode
5282 5282 
     if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
5283 5283 
     {
5284 
-      $this->privCloseFd();
5284 
+        $this->privCloseFd();
5285 5285
5286 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
5286 
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
5287 5287
5288 
-      // ----- Return
5289 
-      return PclZip::errorCode();
5288 
+        // ----- Return
5289 
+        return PclZip::errorCode();
5290 5290 
     }
5291 5291
5292 5292 
     // ----- Copy the files from the archive to the temporary file

@@ -5294,10 +5294,10 @@  discard block
 
 block discarded – undo
5294 5294 
     $v_size = filesize($p_archive_filename);
5295 5295 
     while ($v_size != 0)
5296 5296 
     {
5297 
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5298 
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
5299 
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
5300 
-      $v_size -= $v_read_size;
5297 
+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
5298 
+        $v_buffer = fread($v_zip_temp_fd, $v_read_size);
5299 
+        @fwrite($this->zip_fd, $v_buffer, $v_read_size);
5300 
+        $v_size -= $v_read_size;
5301 5301 
     }
5302 5302
5303 5303 
     // ----- Close

@@ -5308,211 +5308,211 @@  discard block
 
 block discarded – undo
5308 5308
5309 5309 
     // ----- Return
5310 5310 
     return $v_result;
5311 
-  }
5312 
-  // --------------------------------------------------------------------------------
5313 
-
5314 
-  // --------------------------------------------------------------------------------
5315 
-  // Function : privErrorLog()
5316 
-  // Description :
5317 
-  // Parameters :
5318 
-  // --------------------------------------------------------------------------------
5319 
-  function privErrorLog($p_error_code=0, $p_error_string='')
5320 
-  {
5311 
+    }
5312 
+    // --------------------------------------------------------------------------------
5313 
+
5314 
+    // --------------------------------------------------------------------------------
5315 
+    // Function : privErrorLog()
5316 
+    // Description :
5317 
+    // Parameters :
5318 
+    // --------------------------------------------------------------------------------
5319 
+    function privErrorLog($p_error_code=0, $p_error_string='')
5320 
+    {
5321 5321 
     if (PCLZIP_ERROR_EXTERNAL == 1) {
5322 
-      PclError($p_error_code, $p_error_string);
5322 
+        PclError($p_error_code, $p_error_string);
5323 5323 
     }
5324 5324 
     else {
5325 
-      $this->error_code = $p_error_code;
5326 
-      $this->error_string = $p_error_string;
5327 
-    }
5328 
-  }
5329 
-  // --------------------------------------------------------------------------------
5330 
-
5331 
-  // --------------------------------------------------------------------------------
5332 
-  // Function : privErrorReset()
5333 
-  // Description :
5334 
-  // Parameters :
5335 
-  // --------------------------------------------------------------------------------
5336 
-  function privErrorReset()
5337 
-  {
5325 
+        $this->error_code = $p_error_code;
5326 
+        $this->error_string = $p_error_string;
5327 
+    }
5328 
+    }
5329 
+    // --------------------------------------------------------------------------------
5330 
+
5331 
+    // --------------------------------------------------------------------------------
5332 
+    // Function : privErrorReset()
5333 
+    // Description :
5334 
+    // Parameters :
5335 
+    // --------------------------------------------------------------------------------
5336 
+    function privErrorReset()
5337 
+    {
5338 5338 
     if (PCLZIP_ERROR_EXTERNAL == 1) {
5339 
-      PclErrorReset();
5339 
+        PclErrorReset();
5340 5340 
     }
5341 5341 
     else {
5342 
-      $this->error_code = 0;
5343 
-      $this->error_string = '';
5344 
-    }
5345 
-  }
5346 
-  // --------------------------------------------------------------------------------
5347 
-
5348 
-  // --------------------------------------------------------------------------------
5349 
-  // Function : privDisableMagicQuotes()
5350 
-  // Description :
5351 
-  // Parameters :
5352 
-  // Return Values :
5353 
-  // --------------------------------------------------------------------------------
5354 
-  function privDisableMagicQuotes()
5355 
-  {
5342 
+        $this->error_code = 0;
5343 
+        $this->error_string = '';
5344 
+    }
5345 
+    }
5346 
+    // --------------------------------------------------------------------------------
5347 
+
5348 
+    // --------------------------------------------------------------------------------
5349 
+    // Function : privDisableMagicQuotes()
5350 
+    // Description :
5351 
+    // Parameters :
5352 
+    // Return Values :
5353 
+    // --------------------------------------------------------------------------------
5354 
+    function privDisableMagicQuotes()
5355 
+    {
5356 5356 
     $v_result=1;
5357 5357
5358 5358 
     // ----- Look if function exists
5359 5359 
     if (   (!function_exists("get_magic_quotes_runtime"))
5360 
-	    || (!function_exists("set_magic_quotes_runtime"))) {
5361 
-      return $v_result;
5362 
-	}
5360 
+        || (!function_exists("set_magic_quotes_runtime"))) {
5361 
+        return $v_result;
5362 
+    }
5363 5363
5364 5364 
     // ----- Look if already done
5365 5365 
     if ($this->magic_quotes_status != -1) {
5366 
-      return $v_result;
5367 
-	}
5366 
+        return $v_result;
5367 
+    }
5368 5368
5369 
-	// ----- Get and memorize the magic_quote value
5370 
-	$this->magic_quotes_status = @get_magic_quotes_runtime();
5369 
+    // ----- Get and memorize the magic_quote value
5370 
+    $this->magic_quotes_status = @get_magic_quotes_runtime();
5371 5371
5372 
-	// ----- Disable magic_quotes
5373 
-	if ($this->magic_quotes_status == 1) {
5374 
-	  @set_magic_quotes_runtime(0);
5375 
-	}
5372 
+    // ----- Disable magic_quotes
5373 
+    if ($this->magic_quotes_status == 1) {
5374 
+        @set_magic_quotes_runtime(0);
5375 
+    }
5376 5376
5377 5377 
     // ----- Return
5378 5378 
     return $v_result;
5379 
-  }
5380 
-  // --------------------------------------------------------------------------------
5381 
-
5382 
-  // --------------------------------------------------------------------------------
5383 
-  // Function : privSwapBackMagicQuotes()
5384 
-  // Description :
5385 
-  // Parameters :
5386 
-  // Return Values :
5387 
-  // --------------------------------------------------------------------------------
5388 
-  function privSwapBackMagicQuotes()
5389 
-  {
5379 
+    }
5380 
+    // --------------------------------------------------------------------------------
5381 
+
5382 
+    // --------------------------------------------------------------------------------
5383 
+    // Function : privSwapBackMagicQuotes()
5384 
+    // Description :
5385 
+    // Parameters :
5386 
+    // Return Values :
5387 
+    // --------------------------------------------------------------------------------
5388 
+    function privSwapBackMagicQuotes()
5389 
+    {
5390 5390 
     $v_result=1;
5391 5391
5392 5392 
     // ----- Look if function exists
5393 5393 
     if (   (!function_exists("get_magic_quotes_runtime"))
5394 
-	    || (!function_exists("set_magic_quotes_runtime"))) {
5395 
-      return $v_result;
5396 
-	}
5394 
+        || (!function_exists("set_magic_quotes_runtime"))) {
5395 
+        return $v_result;
5396 
+    }
5397 5397
5398 5398 
     // ----- Look if something to do
5399 5399 
     if ($this->magic_quotes_status != -1) {
5400 
-      return $v_result;
5401 
-	}
5400 
+        return $v_result;
5401 
+    }
5402 5402
5403 
-	// ----- Swap back magic_quotes
5404 
-	if ($this->magic_quotes_status == 1) {
5405 
-  	  @set_magic_quotes_runtime($this->magic_quotes_status);
5406 
-	}
5403 
+    // ----- Swap back magic_quotes
5404 
+    if ($this->magic_quotes_status == 1) {
5405 
+        @set_magic_quotes_runtime($this->magic_quotes_status);
5406 
+    }
5407 5407
5408 5408 
     // ----- Return
5409 5409 
     return $v_result;
5410 
-  }
5411 
-  // --------------------------------------------------------------------------------
5412 
-
5413 
-  }
5414 
-  // End of class
5415 
-  // --------------------------------------------------------------------------------
5416 
-
5417 
-  // --------------------------------------------------------------------------------
5418 
-  // Function : PclZipUtilPathReduction()
5419 
-  // Description :
5420 
-  // Parameters :
5421 
-  // Return Values :
5422 
-  // --------------------------------------------------------------------------------
5423 
-  function PclZipUtilPathReduction($p_dir)
5424 
-  {
5410 
+    }
5411 
+    // --------------------------------------------------------------------------------
5412 
+
5413 
+    }
5414 
+    // End of class
5415 
+    // --------------------------------------------------------------------------------
5416 
+
5417 
+    // --------------------------------------------------------------------------------
5418 
+    // Function : PclZipUtilPathReduction()
5419 
+    // Description :
5420 
+    // Parameters :
5421 
+    // Return Values :
5422 
+    // --------------------------------------------------------------------------------
5423 
+    function PclZipUtilPathReduction($p_dir)
5424 
+    {
5425 5425 
     $v_result = "";
5426 5426
5427 5427 
     // ----- Look for not empty path
5428 5428 
     if ($p_dir != "") {
5429 
-      // ----- Explode path by directory names
5430 
-      $v_list = explode("/", $p_dir);
5429 
+        // ----- Explode path by directory names
5430 
+        $v_list = explode("/", $p_dir);
5431 5431
5432 
-      // ----- Study directories from last to first
5433 
-      $v_skip = 0;
5434 
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
5432 
+        // ----- Study directories from last to first
5433 
+        $v_skip = 0;
5434 
+        for ($i=sizeof($v_list)-1; $i>=0; $i--) {
5435 5435 
         // ----- Look for current path
5436 5436 
         if ($v_list[$i] == ".") {
5437 
-          // ----- Ignore this directory
5438 
-          // Should be the first $i=0, but no check is done
5437 
+            // ----- Ignore this directory
5438 
+            // Should be the first $i=0, but no check is done
5439 5439 
         }
5440 5440 
         else if ($v_list[$i] == "..") {
5441 
-		  $v_skip++;
5441 
+            $v_skip++;
5442 5442 
         }
5443 5443 
         else if ($v_list[$i] == "") {
5444 
-		  // ----- First '/' i.e. root slash
5445 
-		  if ($i == 0) {
5444 
+            // ----- First '/' i.e. root slash
5445 
+            if ($i == 0) {
5446 5446 
             $v_result = "/".$v_result;
5447 
-		    if ($v_skip > 0) {
5448 
-		        // ----- It is an invalid path, so the path is not modified
5449 
-		        // TBC
5450 
-		        $v_result = $p_dir;
5447 
+            if ($v_skip > 0) {
5448 
+                // ----- It is an invalid path, so the path is not modified
5449 
+                // TBC
5450 
+                $v_result = $p_dir;
5451 5451 
                 $v_skip = 0;
5452 
-		    }
5453 
-		  }
5454 
-		  // ----- Last '/' i.e. indicates a directory
5455 
-		  else if ($i == (sizeof($v_list)-1)) {
5452 
+            }
5453 
+            }
5454 
+            // ----- Last '/' i.e. indicates a directory
5455 
+            else if ($i == (sizeof($v_list)-1)) {
5456 5456 
             $v_result = $v_list[$i];
5457 
-		  }
5458 
-		  // ----- Double '/' inside the path
5459 
-		  else {
5457 
+            }
5458 
+            // ----- Double '/' inside the path
5459 
+            else {
5460 5460 
             // ----- Ignore only the double '//' in path,
5461 5461 
             // but not the first and last '/'
5462 
-		  }
5462 
+            }
5463 5463 
         }
5464 5464 
         else {
5465 
-		  // ----- Look for item to skip
5466 
-		  if ($v_skip > 0) {
5467 
-		    $v_skip--;
5468 
-		  }
5469 
-		  else {
5465 
+            // ----- Look for item to skip
5466 
+            if ($v_skip > 0) {
5467 
+            $v_skip--;
5468 
+            }
5469 
+            else {
5470 5470 
             $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
5471 
-		  }
5471 
+            }
5472 
+        }
5472 5473 
         }
5473 
-      }
5474 5474
5475 
-      // ----- Look for skip
5476 
-      if ($v_skip > 0) {
5475 
+        // ----- Look for skip
5476 
+        if ($v_skip > 0) {
5477 5477 
         while ($v_skip > 0) {
5478 5478 
             $v_result = '../'.$v_result;
5479 5479 
             $v_skip--;
5480 5480 
         }
5481 
-      }
5481 
+        }
5482 5482 
     }
5483 5483
5484 5484 
     // ----- Return
5485 5485 
     return $v_result;
5486 
-  }
5487 
-  // --------------------------------------------------------------------------------
5488 
-
5489 
-  // --------------------------------------------------------------------------------
5490 
-  // Function : PclZipUtilPathInclusion()
5491 
-  // Description :
5492 
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
5493 
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
5494 
-  //   $p_dir.
5495 
-  //   The function indicates also if the path is exactly the same as the dir.
5496 
-  //   This function supports path with duplicated '/' like '//', but does not
5497 
-  //   support '.' or '..' statements.
5498 
-  // Parameters :
5499 
-  // Return Values :
5500 
-  //   0 if $p_path is not inside directory $p_dir
5501 
-  //   1 if $p_path is inside directory $p_dir
5502 
-  //   2 if $p_path is exactly the same as $p_dir
5503 
-  // --------------------------------------------------------------------------------
5504 
-  function PclZipUtilPathInclusion($p_dir, $p_path)
5505 
-  {
5486 
+    }
5487 
+    // --------------------------------------------------------------------------------
5488 
+
5489 
+    // --------------------------------------------------------------------------------
5490 
+    // Function : PclZipUtilPathInclusion()
5491 
+    // Description :
5492 
+    //   This function indicates if the path $p_path is under the $p_dir tree. Or,
5493 
+    //   said in an other way, if the file or sub-dir $p_path is inside the dir
5494 
+    //   $p_dir.
5495 
+    //   The function indicates also if the path is exactly the same as the dir.
5496 
+    //   This function supports path with duplicated '/' like '//', but does not
5497 
+    //   support '.' or '..' statements.
5498 
+    // Parameters :
5499 
+    // Return Values :
5500 
+    //   0 if $p_path is not inside directory $p_dir
5501 
+    //   1 if $p_path is inside directory $p_dir
5502 
+    //   2 if $p_path is exactly the same as $p_dir
5503 
+    // --------------------------------------------------------------------------------
5504 
+    function PclZipUtilPathInclusion($p_dir, $p_path)
5505 
+    {
5506 5506 
     $v_result = 1;
5507 5507
5508 5508 
     // ----- Look for path beginning by ./
5509 5509 
     if (   ($p_dir == '.')
5510 5510 
         || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
5511 
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
5511 
+        $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
5512 5512 
     }
5513 5513 
     if (   ($p_path == '.')
5514 5514 
         || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
5515 
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
5515 
+        $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
5516 5516 
     }
5517 5517
5518 5518 
     // ----- Explode dir and path by directory separator

@@ -5526,196 +5526,196 @@  discard block
 
 block discarded – undo
5526 5526 
     $j = 0;
5527 5527 
     while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
5528 5528
5529 
-      // ----- Look for empty dir (path reduction)
5530 
-      if ($v_list_dir[$i] == '') {
5529 
+        // ----- Look for empty dir (path reduction)
5530 
+        if ($v_list_dir[$i] == '') {
5531 5531 
         $i++;
5532 5532 
         continue;
5533 
-      }
5534 
-      if ($v_list_path[$j] == '') {
5533 
+        }
5534 
+        if ($v_list_path[$j] == '') {
5535 5535 
         $j++;
5536 5536 
         continue;
5537 
-      }
5537 
+        }
5538 5538
5539 
-      // ----- Compare the items
5540 
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
5539 
+        // ----- Compare the items
5540 
+        if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
5541 5541 
         $v_result = 0;
5542 
-      }
5542 
+        }
5543 5543
5544 
-      // ----- Next items
5545 
-      $i++;
5546 
-      $j++;
5544 
+        // ----- Next items
5545 
+        $i++;
5546 
+        $j++;
5547 5547 
     }
5548 5548
5549 5549 
     // ----- Look if everything seems to be the same
5550 5550 
     if ($v_result) {
5551 
-      // ----- Skip all the empty items
5552 
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
5553 
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
5551 
+        // ----- Skip all the empty items
5552 
+        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
5553 
+        while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
5554 5554
5555 
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
5555 
+        if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
5556 5556 
         // ----- There are exactly the same
5557 5557 
         $v_result = 2;
5558 
-      }
5559 
-      else if ($i < $v_list_dir_size) {
5558 
+        }
5559 
+        else if ($i < $v_list_dir_size) {
5560 5560 
         // ----- The path is shorter than the dir
5561 5561 
         $v_result = 0;
5562 
-      }
5562 
+        }
5563 5563 
     }
5564 5564
5565 5565 
     // ----- Return
5566 5566 
     return $v_result;
5567 
-  }
5568 
-  // --------------------------------------------------------------------------------
5569 
-
5570 
-  // --------------------------------------------------------------------------------
5571 
-  // Function : PclZipUtilCopyBlock()
5572 
-  // Description :
5573 
-  // Parameters :
5574 
-  //   $p_mode : read/write compression mode
5575 
-  //             0 : src & dest normal
5576 
-  //             1 : src gzip, dest normal
5577 
-  //             2 : src normal, dest gzip
5578 
-  //             3 : src & dest gzip
5579 
-  // Return Values :
5580 
-  // --------------------------------------------------------------------------------
5581 
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
5582 
-  {
5567 
+    }
5568 
+    // --------------------------------------------------------------------------------
5569 
+
5570 
+    // --------------------------------------------------------------------------------
5571 
+    // Function : PclZipUtilCopyBlock()
5572 
+    // Description :
5573 
+    // Parameters :
5574 
+    //   $p_mode : read/write compression mode
5575 
+    //             0 : src & dest normal
5576 
+    //             1 : src gzip, dest normal
5577 
+    //             2 : src normal, dest gzip
5578 
+    //             3 : src & dest gzip
5579 
+    // Return Values :
5580 
+    // --------------------------------------------------------------------------------
5581 
+    function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
5582 
+    {
5583 5583 
     $v_result = 1;
5584 5584
5585 5585 
     if ($p_mode==0)
5586 5586 
     {
5587 
-      while ($p_size != 0)
5588 
-      {
5587 
+        while ($p_size != 0)
5588 
+        {
5589 5589 
         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
5590 5590 
         $v_buffer = @fread($p_src, $v_read_size);
5591 5591 
         @fwrite($p_dest, $v_buffer, $v_read_size);
5592 5592 
         $p_size -= $v_read_size;
5593 
-      }
5593 
+        }
5594 5594 
     }
5595 5595 
     else if ($p_mode==1)
5596 5596 
     {
5597 
-      while ($p_size != 0)
5598 
-      {
5597 
+        while ($p_size != 0)
5598 
+        {
5599 5599 
         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
5600 5600 
         $v_buffer = @gzread($p_src, $v_read_size);
5601 5601 
         @fwrite($p_dest, $v_buffer, $v_read_size);
5602 5602 
         $p_size -= $v_read_size;
5603 
-      }
5603 
+        }
5604 5604 
     }
5605 5605 
     else if ($p_mode==2)
5606 5606 
     {
5607 
-      while ($p_size != 0)
5608 
-      {
5607 
+        while ($p_size != 0)
5608 
+        {
5609 5609 
         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
5610 5610 
         $v_buffer = @fread($p_src, $v_read_size);
5611 5611 
         @gzwrite($p_dest, $v_buffer, $v_read_size);
5612 5612 
         $p_size -= $v_read_size;
5613 
-      }
5613 
+        }
5614 5614 
     }
5615 5615 
     else if ($p_mode==3)
5616 5616 
     {
5617 
-      while ($p_size != 0)
5618 
-      {
5617 
+        while ($p_size != 0)
5618 
+        {
5619 5619 
         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
5620 5620 
         $v_buffer = @gzread($p_src, $v_read_size);
5621 5621 
         @gzwrite($p_dest, $v_buffer, $v_read_size);
5622 5622 
         $p_size -= $v_read_size;
5623 
-      }
5623 
+        }
5624 5624 
     }
5625 5625
5626 5626 
     // ----- Return
5627 5627 
     return $v_result;
5628 
-  }
5629 
-  // --------------------------------------------------------------------------------
5630 
-
5631 
-  // --------------------------------------------------------------------------------
5632 
-  // Function : PclZipUtilRename()
5633 
-  // Description :
5634 
-  //   This function tries to do a simple rename() function. If it fails, it
5635 
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
5636 
-  //   first one.
5637 
-  // Parameters :
5638 
-  //   $p_src : Old filename
5639 
-  //   $p_dest : New filename
5640 
-  // Return Values :
5641 
-  //   1 on success, 0 on failure.
5642 
-  // --------------------------------------------------------------------------------
5643 
-  function PclZipUtilRename($p_src, $p_dest)
5644 
-  {
5628 
+    }
5629 
+    // --------------------------------------------------------------------------------
5630 
+
5631 
+    // --------------------------------------------------------------------------------
5632 
+    // Function : PclZipUtilRename()
5633 
+    // Description :
5634 
+    //   This function tries to do a simple rename() function. If it fails, it
5635 
+    //   tries to copy the $p_src file in a new $p_dest file and then unlink the
5636 
+    //   first one.
5637 
+    // Parameters :
5638 
+    //   $p_src : Old filename
5639 
+    //   $p_dest : New filename
5640 
+    // Return Values :
5641 
+    //   1 on success, 0 on failure.
5642 
+    // --------------------------------------------------------------------------------
5643 
+    function PclZipUtilRename($p_src, $p_dest)
5644 
+    {
5645 5645 
     $v_result = 1;
5646 5646
5647 5647 
     // ----- Try to rename the files
5648 5648 
     if (!@rename($p_src, $p_dest)) {
5649 5649
5650 
-      // ----- Try to copy & unlink the src
5651 
-      if (!@copy($p_src, $p_dest)) {
5650 
+        // ----- Try to copy & unlink the src
5651 
+        if (!@copy($p_src, $p_dest)) {
5652 5652 
         $v_result = 0;
5653 
-      }
5654 
-      else if (!@unlink($p_src)) {
5653 
+        }
5654 
+        else if (!@unlink($p_src)) {
5655 5655 
         $v_result = 0;
5656 
-      }
5656 
+        }
5657 5657 
     }
5658 5658
5659 5659 
     // ----- Return
5660 5660 
     return $v_result;
5661 
-  }
5662 
-  // --------------------------------------------------------------------------------
5663 
-
5664 
-  // --------------------------------------------------------------------------------
5665 
-  // Function : PclZipUtilOptionText()
5666 
-  // Description :
5667 
-  //   Translate option value in text. Mainly for debug purpose.
5668 
-  // Parameters :
5669 
-  //   $p_option : the option value.
5670 
-  // Return Values :
5671 
-  //   The option text value.
5672 
-  // --------------------------------------------------------------------------------
5673 
-  function PclZipUtilOptionText($p_option)
5674 
-  {
5661 
+    }
5662 
+    // --------------------------------------------------------------------------------
5663 
+
5664 
+    // --------------------------------------------------------------------------------
5665 
+    // Function : PclZipUtilOptionText()
5666 
+    // Description :
5667 
+    //   Translate option value in text. Mainly for debug purpose.
5668 
+    // Parameters :
5669 
+    //   $p_option : the option value.
5670 
+    // Return Values :
5671 
+    //   The option text value.
5672 
+    // --------------------------------------------------------------------------------
5673 
+    function PclZipUtilOptionText($p_option)
5674 
+    {
5675 5675
5676 5676 
     $v_list = get_defined_constants();
5677 5677 
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
5678 
-	    $v_prefix = substr($v_key, 0, 10);
5679 
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
5678 
+        $v_prefix = substr($v_key, 0, 10);
5679 
+        if ((   ($v_prefix == 'PCLZIP_OPT')
5680 5680 
            || ($v_prefix == 'PCLZIP_CB_')
5681 5681 
            || ($v_prefix == 'PCLZIP_ATT'))
5682 
-	        && ($v_list[$v_key] == $p_option)) {
5682 
+            && ($v_list[$v_key] == $p_option)) {
5683 5683 
         return $v_key;
5684 
-	    }
5684 
+        }
5685 5685 
     }
5686 5686
5687 5687 
     $v_result = 'Unknown';
5688 5688
5689 5689 
     return $v_result;
5690 
-  }
5691 
-  // --------------------------------------------------------------------------------
5692 
-
5693 
-  // --------------------------------------------------------------------------------
5694 
-  // Function : PclZipUtilTranslateWinPath()
5695 
-  // Description :
5696 
-  //   Translate windows path by replacing '\' by '/' and optionally removing
5697 
-  //   drive letter.
5698 
-  // Parameters :
5699 
-  //   $p_path : path to translate.
5700 
-  //   $p_remove_disk_letter : true | false
5701 
-  // Return Values :
5702 
-  //   The path translated.
5703 
-  // --------------------------------------------------------------------------------
5704 
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
5705 
-  {
5690 
+    }
5691 
+    // --------------------------------------------------------------------------------
5692 
+
5693 
+    // --------------------------------------------------------------------------------
5694 
+    // Function : PclZipUtilTranslateWinPath()
5695 
+    // Description :
5696 
+    //   Translate windows path by replacing '\' by '/' and optionally removing
5697 
+    //   drive letter.
5698 
+    // Parameters :
5699 
+    //   $p_path : path to translate.
5700 
+    //   $p_remove_disk_letter : true | false
5701 
+    // Return Values :
5702 
+    //   The path translated.
5703 
+    // --------------------------------------------------------------------------------
5704 
+    function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
5705 
+    {
5706 5706 
     if (stristr(php_uname(), 'windows')) {
5707 
-      // ----- Look for potential disk letter
5708 
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
5709 
-          $p_path = substr($p_path, $v_position+1);
5710 
-      }
5711 
-      // ----- Change potential windows directory separator
5712 
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
5713 
-          $p_path = strtr($p_path, '\\', '/');
5714 
-      }
5707 
+        // ----- Look for potential disk letter
5708 
+        if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
5709 
+            $p_path = substr($p_path, $v_position+1);
5710 
+        }
5711 
+        // ----- Change potential windows directory separator
5712 
+        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
5713 
+            $p_path = strtr($p_path, '\\', '/');
5714 
+        }
5715 5715 
     }
5716 5716 
     return $p_path;
5717 
-  }
5718 
-  // --------------------------------------------------------------------------------
5717 
+    }
5718 
+    // --------------------------------------------------------------------------------
5719 5719
5720 5720
5721 5721 
 ?>
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/receivers.php 1 patch
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch 
@@ -10,64 +10,64 @@  discard block
 
 block discarded – undo
10 10 
  */
11 11 
 class HTML_QuickForm_receivers extends HTML_QuickForm_group
12 12 
 {
13 
-	/**
14 
-	 * Array of all receivers
15 
-	 */
16 
-	var $receivers;
17 
-	/**
18 
-	 * Array of selected receivers
19 
-	 */
20 
-	var $receivers_selected;
21 
-	/**
22 
-	 * Constructor
23 
-	 * @param string $elementName
24 
-	 * @param string $elementLabel
25 
-	 * @param array $attributes This should contain the keys 'receivers' and
26 
-	 * 'receivers_selected'
27 
-	 */
28 
-	function HTML_QuickForm_receivers($elementName = null, $elementLabel = null, $attributes = null)
29 
-	{
30 
-		$this->receivers = $attributes['receivers'];
31 
-		$this->receivers_selected = $attributes['receivers_selected'];
32 
-		unset($attributes['receivers']);
33 
-		unset($attributes['receivers_selected']);
34 
-		$this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
35 
-		$this->_persistantFreeze = true;
36 
-		$this->_appendName = true;
37 
-		$this->_type = 'receivers';
38 
-	}
39 
-	/**
40 
-	 * Create the form elements to build this element group
41 
-	 */
42 
-	function _createElements()
43 
-	{
44 
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
45 
-		$this->_elements[0]->setChecked(true);
46 
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
47 
-		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
48 
-		$this->_elements[2]->setSelected($this->receivers_selected);
49 
-	}
50 
-	/**
51 
-	 * HTML representation
52 
-	 */
53 
-	function toHtml()
54 
-	{
55 
-		include_once ('HTML/QuickForm/Renderer/Default.php');
56 
-		$this->_separator = '<br/>';
57 
-		$renderer = & new HTML_QuickForm_Renderer_Default();
58 
-		$renderer->setElementTemplate('{element}');
59 
-		$select_boxes = $this->_elements[2];
60 
-		$select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
61 
-		parent :: accept($renderer);
62 
-		$js = $this->getElementJS();
63 
-		return $renderer->toHtml().$js;
64 
-	}
65 
-	/**
66 
-	 * Get the necessary javascript
67 
-	 */
68 
-	function getElementJS()
69 
-	{
70 
-		$js = "<script type=\"text/javascript\">
13 
+    /**
14 
+     * Array of all receivers
15 
+     */
16 
+    var $receivers;
17 
+    /**
18 
+     * Array of selected receivers
19 
+     */
20 
+    var $receivers_selected;
21 
+    /**
22 
+     * Constructor
23 
+     * @param string $elementName
24 
+     * @param string $elementLabel
25 
+     * @param array $attributes This should contain the keys 'receivers' and
26 
+     * 'receivers_selected'
27 
+     */
28 
+    function HTML_QuickForm_receivers($elementName = null, $elementLabel = null, $attributes = null)
29 
+    {
30 
+        $this->receivers = $attributes['receivers'];
31 
+        $this->receivers_selected = $attributes['receivers_selected'];
32 
+        unset($attributes['receivers']);
33 
+        unset($attributes['receivers_selected']);
34 
+        $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
35 
+        $this->_persistantFreeze = true;
36 
+        $this->_appendName = true;
37 
+        $this->_type = 'receivers';
38 
+    }
39 
+    /**
40 
+     * Create the form elements to build this element group
41 
+     */
42 
+    function _createElements()
43 
+    {
44 
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
45 
+        $this->_elements[0]->setChecked(true);
46 
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
47 
+        $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
48 
+        $this->_elements[2]->setSelected($this->receivers_selected);
49 
+    }
50 
+    /**
51 
+     * HTML representation
52 
+     */
53 
+    function toHtml()
54 
+    {
55 
+        include_once ('HTML/QuickForm/Renderer/Default.php');
56 
+        $this->_separator = '<br/>';
57 
+        $renderer = & new HTML_QuickForm_Renderer_Default();
58 
+        $renderer->setElementTemplate('{element}');
59 
+        $select_boxes = $this->_elements[2];
60 
+        $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
61 
+        parent :: accept($renderer);
62 
+        $js = $this->getElementJS();
63 
+        return $renderer->toHtml().$js;
64 
+    }
65 
+    /**
66 
+     * Get the necessary javascript
67 
+     */
68 
+    function getElementJS()
69 
+    {
70 
+        $js = "<script type=\"text/javascript\">
71 71 
 					/* <![CDATA[ */
72 72 
 					receivers_hide('receivers_to');
73 73 
 					function receivers_show(item) {
 
@@ -80,14 +80,14 @@  discard block
 
 block discarded – undo
80 80 
 					}
81 81 
 					/* ]]> */
82 82 
 					</script>\n";
83 
-		return $js;
84 
-	}
85 
-	/**
86 
-	 * accept renderer
87 
-	 */
88 
-	function accept(& $renderer, $required = false, $error = null)
89 
-	{
90 
-		$renderer->renderElement($this, $required, $error);
91 
-	}
83 
+        return $js;
84 
+    }
85 
+    /**
86 
+     * accept renderer
87 
+     */
88 
+    function accept(& $renderer, $required = false, $error = null)
89 
+    {
90 
+        $renderer->renderElement($this, $required, $error);
91 
+    }
92 92 
 }
93 93 
 ?>
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/DateRangePicker.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -7,8 +7,8 @@  discard block
 
 block discarded – undo
7 7 
 class DateRangePicker extends HTML_QuickForm_text
8 8 
 {
9 9 
     /**
10 
-    * Constructor
11 
-    */
10 
+     * Constructor
11 
+     */
12 12 
     public function __construct($elementName = null, $elementLabel = null, $attributes = null)
13 13 
     {
14 14 
         if (!isset($attributes['id'])) {
 
@@ -144,10 +144,10 @@  discard block
 
 block discarded – undo
144 144 
     }
145 145
146 146 
     /**
147 
-    * @param array $dates result of parseDateRange()
148 
-    *
149 
-    * @return bool
150 
-    */
147 
+     * @param array $dates result of parseDateRange()
148 
+     *
149 
+     * @return bool
150 
+     */
151 151 
     public function validateDates($dates, $format = null)
152 152 
     {
153 153 
         if (empty($dates['start']) || empty($dates['end'])) {
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/HtmlEditor.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -74,9 +74,9 @@
 
 block discarded – undo
74 74 
             $styleCss = $this->editor->getConfigAttribute('style');
75 75
76 76 
             if ($styleCss) {
77 
-               $style = true;
77 
+                $style = true;
78 78 
             } else {
79 
-               $style = false;
79 
+                $style = false;
80 80 
             }
81 81
82 82 
             return $this->buildEditor($style);
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/DatePicker.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -26,10 +26,10 @@
 
 block discarded – undo
26 26 
     }
27 27
28 28 
     /**
29 
-    * HTML code to display this datepicker
29 
+     * HTML code to display this datepicker
30 30 
      *
31 31 
      * @return string
32 
-    */
32 
+     */
33 33 
     public function toHtml()
34 34 
     {
35 35 
         if ($this->_flagFrozen) {
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/Url.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -1,10 +1,10 @@
 
 block discarded – undo
1 1 
 <?php
2 2 
 /* For licensing terms, see /license.txt */
3 3 
 /**
4 
- * Url element
5 
- *
6 
- * Class Url
7 
- */
4 
+     * Url element
5 
+     *
6 
+     * Class Url
7 
+     */
8 8 
 class Url extends HTML_QuickForm_text
9 9 
 {
10 10
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/SelectTheme.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -6,18 +6,18 @@
 
 block discarded – undo
6 6 
 */
7 7 
 class SelectTheme extends HTML_QuickForm_select
8 8 
 {
9 
-	/**
10 
-	 * Class constructor
11 
-	 */
12 
-	function SelectTheme($elementName=null, $elementLabel=null, $options=null, $attributes=null) {
13 
-		parent::__construct($elementName, $elementLabel, $options, $attributes);
14 
-		// Get all languages
15 
-		$themes = api_get_themes();
16 
-		$this->_options = array();
17 
-		$this->_values = array();
18 
-		$this->addOption('--',''); // no theme select
19 
-		for ($i=0; $i< count($themes[0]);$i++) {
20 
-			$this->addOption($themes[1][$i],$themes[0][$i]);
21 
-		}
22 
-	}
9 
+    /**
10 
+     * Class constructor
11 
+     */
12 
+    function SelectTheme($elementName=null, $elementLabel=null, $options=null, $attributes=null) {
13 
+        parent::__construct($elementName, $elementLabel, $options, $attributes);
14 
+        // Get all languages
15 
+        $themes = api_get_themes();
16 
+        $this->_options = array();
17 
+        $this->_values = array();
18 
+        $this->addOption('--',''); // no theme select
19 
+        for ($i=0; $i< count($themes[0]);$i++) {
20 
+            $this->addOption($themes[1][$i],$themes[0][$i]);
21 
+        }
22 
+    }
23 23 
 }
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/SelectLanguage.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch 
@@ -6,22 +6,22 @@
 
 block discarded – undo
6 6 
 */
7 7 
 class SelectLanguage extends HTML_QuickForm_select
8 8 
 {
9 
-	/**
10 
-	 * Class constructor
11 
-	 */
12 
-	function SelectLanguage($elementName=null, $elementLabel=null, $options=null, $attributes=null)
13 
-	{
14 
-		parent::__construct($elementName, $elementLabel, $options, $attributes);
15 
-		// Get all languages
16 
-		$languages = api_get_languages();
17 
-		$this->_options = array();
18 
-		$this->_values = array();
19 
-		foreach ($languages['name'] as $index => $name) {
20 
-			if($languages['folder'][$index] == api_get_setting('platformLanguage')) {
21 
-				$this->addOption($name,$languages['folder'][$index],array('selected'=>'selected'));
22 
-			} else {
23 
-				$this->addOption($name,$languages['folder'][$index]);
24 
-			}
25 
-		}
26 
-	}
9 
+    /**
10 
+     * Class constructor
11 
+     */
12 
+    function SelectLanguage($elementName=null, $elementLabel=null, $options=null, $attributes=null)
13 
+    {
14 
+        parent::__construct($elementName, $elementLabel, $options, $attributes);
15 
+        // Get all languages
16 
+        $languages = api_get_languages();
17 
+        $this->_options = array();
18 
+        $this->_values = array();
19 
+        foreach ($languages['name'] as $index => $name) {
20 
+            if($languages['folder'][$index] == api_get_setting('platformLanguage')) {
21 
+                $this->addOption($name,$languages['folder'][$index],array('selected'=>'selected'));
22 
+            } else {
23 
+                $this->addOption($name,$languages['folder'][$index]);
24 
+            }
25 
+        }
26 
+    }
27 27 
 }
Please login to merge, or discard this patch.