enmi-conf.org: comparison wp/wp-admin/includes/class-pclzip.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 // ----- File list separator
 // In version 1.x of PclZip, the separator for file list is a space
 // (which is not a very smart choice, specifically for windows paths !).
 // A better separator should be a comma (,). This constant gives you the
-// abilty to change that.
+// ability to change that.
 // However notice that changing this value, may have impact on existing
 // scripts, using space separated filenames.
-// Recommanded values for compatibility with older versions :
+// Recommended values for compatibility with older versions :
 //define( 'PCLZIP_SEPARATOR', ' ' );
-// Recommanded values for smart separation of filenames.
+// Recommended values for smart separation of filenames.
 if (!defined('PCLZIP_SEPARATOR')) {
 define( 'PCLZIP_SEPARATOR', ',' );
 }
 // ----- Error configuration
 define( 'PCLZIP_TEMPORARY_DIR', '' );
 }
 // ----- Optional threshold ratio for use of temporary files
 //       Pclzip sense the size of the file to add/extract and decide to
-//       use or not temporary file. The algorythm is looking for
+//       use or not temporary file. The algorithm is looking for
 //       memory_limit of PHP and apply a ratio.
 //       threshold = memory_limit * ratio.
 //       Recommended values are under 0.5. Default 0.47.
 //       Samples :
 // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
 //   are added in the archive. See the parameters description for the
 //   supported format of $p_filelist.
 //   When a directory is in the list, the directory and its content is added
 //   in the archive.
 //   In this synopsis, the function takes an optional variable list of
-//   options. See bellow the supported options.
+//   options. See below the supported options.
 // Parameters :
 //   $p_filelist : An array containing file or directory names, or
 //                 a string containing one filename or one directory name, or
 //                 a string containing a list of filenames and/or directory
 //                 names separated by spaces.
 //   If you want to ignore the 'root' part of path of the memorized files
 //   you can indicate this in the optional $p_remove_path parameter.
 //   By default, if a newer file with the same name already exists, the
 //   file is not extracted.
 //
-//   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+//   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH options
 //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
 //   at the end of the path value of PCLZIP_OPT_PATH.
 // Parameters :
 //   $p_path : Path where the files and directories are to be extracted
 //   $p_remove_path : First part ('root' part) of the memorized path
 // --------------------------------------------------------------------------------
 // Function : deleteByIndex()
 // Description :
 //   ***** Deprecated *****
-//   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+//   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be preferred.
 // --------------------------------------------------------------------------------
 function deleteByIndex($p_index)
 {
 $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
 // ----- Return
 return 0;
 }
-// ----- Read the central directory informations
+// ----- Read the central directory information
 $v_central_dir = array();
 if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
 {
 $this->privSwapBackMagicQuotes();
 return 0;
 // ----- Error log
 PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
 return(false);
 }
-// ----- Check that the file is readeable
+// ----- Check that the file is readable
 if (!is_readable($this->zipname)) {
 // ----- Error log
 PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
 return(false);
 }
 // ----- Look for list sort
 if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
 $v_sort_flag=true;
-// ----- TBC : An automatic sort should be writen ...
+// ----- TBC : An automatic sort should be written ...
 // ----- Error log
 PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 // ----- Return
 return PclZip::errorCode();
 // ----- Return
 return $v_result;
 }
-// ----- Read the central directory informations
+// ----- Read the central directory information
 $v_central_dir = array();
 if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
 {
 $this->privCloseFd();
 $this->privSwapBackMagicQuotes();
 }
 // ----- Go to beginning of File
 @rewind($this->zip_fd);
-// ----- Creates a temporay file
+// ----- Creates a temporary file
 $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 // ----- Open the temporary file in write mode
 if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
 {
 // --------------------------------------------------------------------------------
 // Function : privAddList()
 // Description :
 //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-//   different from the real path of the file. This is usefull if you want to have PclTar
+//   different from the real path of the file. This is useful if you want to have PclTar
 //   running in any directory, and memorize relative path from an other directory.
 // Parameters :
 //   $p_list : An array containing the file or directory names to add in the tar
 //   $p_result_list : list of added files with their properties (specially the status field)
 //   $p_add_dir : Path to add in the filename path archived
 // ----- Change the file status
 $p_header['status'] = "skipped";
 $v_result = 1;
 }
-// ----- Update the informations
+// ----- Update the information
 // Only some fields can be modified
 if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
 $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
 }
 }
 if ($v_result == 0) {
 // ----- Ignored
 $v_result = 1;
 }
-// ----- Update the informations
+// ----- Update the information
 // Nothing can be modified
 }
 // ----- Return
 return $v_result;
 // ----- Look for path and/or short name change
 else {
 // ----- Look for short name change
-// Its when we cahnge just the filename but not the path
+// Its when we change just the filename but not the path
 if (isset($p_filedescr['new_short_name'])) {
 $v_path_info = pathinfo($p_filename);
 $v_dir = '';
 if ($v_path_info['dirname'] != '') {
 $v_dir = $v_path_info['dirname'].'/';
 // ----- Return
 return PclZip::errorCode();
 }
-// ----- Read the central directory informations
+// ----- Read the central directory information
 $v_central_dir = array();
 if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
 {
 $this->privSwapBackMagicQuotes();
 return $v_result;
 // --------------------------------------------------------------------------------
 // --------------------------------------------------------------------------------
 // Function : privConvertHeader2FileInfo()
 // Description :
-//   This function takes the file informations from the central directory
+//   This function takes the file information from the central directory
 //   entries and extract the interesting parameters that will be given back.
 //   The resulting file infos are set in the array $p_info
 //     $p_info['filename'] : Filename with full path. Given by user (add),
 //                           extracted in the filesystem (extract).
 //     $p_info['stored_filename'] : Stored filename in the archive.
 {
 $this->privSwapBackMagicQuotes();
 return $v_result;
 }
-// ----- Read the central directory informations
+// ----- Read the central directory information
 $v_central_dir = array();
 if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
 {
 // ----- Close the zip file
 $this->privCloseFd();
 // ----- This status is internal and will be changed in 'skipped'
 $p_entry['status'] = "aborted";
 	$v_result = PCLZIP_ERR_USER_ABORTED;
 }
-// ----- Update the informations
+// ----- Update the information
 // Only some fields can be modified
 $p_entry['filename'] = $v_local_header['filename'];
 }
 // ----- This status is internal and will be changed in 'skipped'
 $p_entry['status'] = "aborted";
 	$v_result = PCLZIP_ERR_USER_ABORTED;
 }
-// ----- Update the informations
+// ----- Update the information
 // Only some fields can be modified
 $p_entry['filename'] = $v_local_header['filename'];
 }
 // ----- Trace
 // ----- This status is internal and will be changed in 'skipped'
 $p_entry['status'] = "aborted";
 	$v_result = PCLZIP_ERR_USER_ABORTED;
 }
-// ----- Update the informations
+// ----- Update the information
 // Only some fields can be modified
 $p_entry['filename'] = $v_local_header['filename'];
 }
 {
 // ----- Return
 return $v_result;
 }
-// ----- Read the central directory informations
+// ----- Read the central directory information
 $v_central_dir = array();
 if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
 {
 $this->privCloseFd();
 return $v_result;
 }
 // ----- Look if something need to be deleted
 if ($v_nb_extracted > 0) {
-// ----- Creates a temporay file
+// ----- Creates a temporary file
 $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 // ----- Creates a temporary zip archive
 $v_temp_zip = new PclZip($v_zip_temp_name);
 {
 // ----- Return
 return $v_result;
 }
-// ----- Read the central directory informations
+// ----- Read the central directory information
 $v_central_dir = array();
 if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
 {
 $this->privCloseFd();
 return $v_result;
 // ----- Return
 return $v_result;
 }
-// ----- Read the central directory informations
+// ----- Read the central directory information
 $v_central_dir_to_add = array();
 if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
 {
 $this->privCloseFd();
 $p_archive_to_add->privCloseFd();
 }
 // ----- Go to beginning of File
 @rewind($p_archive_to_add->zip_fd);
-// ----- Creates a temporay file
+// ----- Creates a temporary file
 $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 // ----- Open the temporary file in write mode
 if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
 {
 // --------------------------------------------------------------------------------
 function privDisableMagicQuotes()
 {
 $v_result=1;
+	// EDIT for WordPress 5.3.0
+	// magic_quote functions are deprecated in PHP 7.4, now assuming it's always off.
+	/*
 // ----- Look if function exists
 if (   (!function_exists("get_magic_quotes_runtime"))
 	    || (!function_exists("set_magic_quotes_runtime"))) {
 return $v_result;
 	}
 	// ----- Disable magic_quotes
 	if ($this->magic_quotes_status == 1) {
 	  @set_magic_quotes_runtime(0);
 	}
+	*/
 // ----- Return
 return $v_result;
 }
 // --------------------------------------------------------------------------------
 // Return Values :
 // --------------------------------------------------------------------------------
 function privSwapBackMagicQuotes()
 {
 $v_result=1;
+	// EDIT for WordPress 5.3.0
+	// magic_quote functions are deprecated in PHP 7.4, now assuming it's always off.
+	/*
 // ----- Look if function exists
 if (   (!function_exists("get_magic_quotes_runtime"))
 	    || (!function_exists("set_magic_quotes_runtime"))) {
 return $v_result;
 	// ----- Swap back magic_quotes
 	if ($this->magic_quotes_status == 1) {
 	  @set_magic_quotes_runtime($this->magic_quotes_status);
 	}
+	*/
 // ----- Return
 return $v_result;
 }
 // --------------------------------------------------------------------------------

changeset 16	a86126ab1dd4
parent 7	cf61fcea0001
child 18	be944660c56a