<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[47123] trunk/src/wp-admin/includes/class-pclzip.php: Docs: Fix typos in `wp-admin/includes/class-pclzip.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/47123">47123</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47123","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-01-29 00:54:21 +0000 (Wed, 29 Jan 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Docs: Fix typos in `wp-admin/includes/class-pclzip.php`.
With the upstream library not updated in 10 years since the last time it was merged, it should be safe to treat it as "adopted" rather than external, and make these fixes.
Props passoniate, ottok.
Fixes <a href="https://core.trac.wordpress.org/ticket/49163">#49163</a>. See <a href="https://core.trac.wordpress.org/ticket/38464">#38464</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasspclzipphp">trunk/src/wp-admin/includes/class-pclzip.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasspclzipphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-pclzip.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-pclzip.php 2020-01-29 00:43:23 UTC (rev 47122)
+++ trunk/src/wp-admin/includes/class-pclzip.php 2020-01-29 00:54:21 UTC (rev 47123)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,12 +34,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // In version 1.x of PclZip, the separator for file list is a space
</span><span class="cx" style="display: block; padding: 0 10px"> // (which is not a very smart choice, specifically for windows paths !).
</span><span class="cx" style="display: block; padding: 0 10px"> // A better separator should be a comma (,). This constant gives you the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // abilty to change that.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ability to change that.
</ins><span class="cx" style="display: block; padding: 0 10px"> // However notice that changing this value, may have impact on existing
</span><span class="cx" style="display: block; padding: 0 10px"> // scripts, using space separated filenames.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Recommanded values for compatibility with older versions :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Recommended values for compatibility with older versions :
</ins><span class="cx" style="display: block; padding: 0 10px"> //define( 'PCLZIP_SEPARATOR', ' ' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Recommanded values for smart separation of filenames.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Recommended values for smart separation of filenames.
</ins><span class="cx" style="display: block; padding: 0 10px"> if (!defined('PCLZIP_SEPARATOR')) {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'PCLZIP_SEPARATOR', ',' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Optional threshold ratio for use of temporary files
</span><span class="cx" style="display: block; padding: 0 10px"> // Pclzip sense the size of the file to add/extract and decide to
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // use or not temporary file. The algorythm is looking for
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // use or not temporary file. The algorithm is looking for
</ins><span class="cx" style="display: block; padding: 0 10px"> // memory_limit of PHP and apply a ratio.
</span><span class="cx" style="display: block; padding: 0 10px"> // threshold = memory_limit * ratio.
</span><span class="cx" style="display: block; padding: 0 10px"> // Recommended values are under 0.5. Default 0.47.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // When a directory is in the list, the directory and its content is added
</span><span class="cx" style="display: block; padding: 0 10px"> // in the archive.
</span><span class="cx" style="display: block; padding: 0 10px"> // In this synopsis, the function takes an optional variable list of
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // options. See bellow the supported options.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // options. See below the supported options.
</ins><span class="cx" style="display: block; padding: 0 10px"> // Parameters :
</span><span class="cx" style="display: block; padding: 0 10px"> // $p_filelist : An array containing file or directory names, or
</span><span class="cx" style="display: block; padding: 0 10px"> // a string containing one filename or one directory name, or
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,7 +682,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // By default, if a newer file with the same name already exists, the
</span><span class="cx" style="display: block; padding: 0 10px"> // file is not extracted.
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH options
</ins><span class="cx" style="display: block; padding: 0 10px"> // are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
</span><span class="cx" style="display: block; padding: 0 10px"> // at the end of the path value of PCLZIP_OPT_PATH.
</span><span class="cx" style="display: block; padding: 0 10px"> // Parameters :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,7 +1064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Function : deleteByIndex()
</span><span class="cx" style="display: block; padding: 0 10px"> // Description :
</span><span class="cx" style="display: block; padding: 0 10px"> // ***** Deprecated *****
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // delete(PCLZIP_OPT_BY_INDEX, $p_index) should be preferred.
</ins><span class="cx" style="display: block; padding: 0 10px"> // --------------------------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> function deleteByIndex($p_index)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1126,7 +1126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Read the central directory informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Read the central directory information
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_central_dir = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,7 +1391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return(false);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Check that the file is readeable
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Check that the file is readable
</ins><span class="cx" style="display: block; padding: 0 10px"> if (!is_readable($this->zipname)) {
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Error log
</span><span class="cx" style="display: block; padding: 0 10px"> PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1698,7 +1698,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
</span><span class="cx" style="display: block; padding: 0 10px"> $v_sort_flag=true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- TBC : An automatic sort should be writen ...
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- TBC : An automatic sort should be written ...
</ins><span class="cx" style="display: block; padding: 0 10px"> // ----- Error log
</span><span class="cx" style="display: block; padding: 0 10px"> PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2189,7 +2189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $v_result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Read the central directory informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Read the central directory information
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_central_dir = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2201,7 +2201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Go to beginning of File
</span><span class="cx" style="display: block; padding: 0 10px"> @rewind($this->zip_fd);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Creates a temporay file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Creates a temporary file
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Open the temporary file in write mode
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2391,7 +2391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Function : privAddList()
</span><span class="cx" style="display: block; padding: 0 10px"> // Description :
</span><span class="cx" style="display: block; padding: 0 10px"> // $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // different from the real path of the file. This is usefull if you want to have PclTar
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // different from the real path of the file. This is useful if you want to have PclTar
</ins><span class="cx" style="display: block; padding: 0 10px"> // running in any directory, and memorize relative path from an other directory.
</span><span class="cx" style="display: block; padding: 0 10px"> // Parameters :
</span><span class="cx" style="display: block; padding: 0 10px"> // $p_list : An array containing the file or directory names to add in the tar
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2631,7 +2631,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $v_result = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Update the informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Update the information
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only some fields can be modified
</span><span class="cx" style="display: block; padding: 0 10px"> if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
</span><span class="cx" style="display: block; padding: 0 10px"> $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2783,7 +2783,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $v_result = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Update the informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Update the information
</ins><span class="cx" style="display: block; padding: 0 10px"> // Nothing can be modified
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2946,7 +2946,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Look for short name change
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Its when we cahnge just the filename but not the path
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Its when we change just the filename but not the path
</ins><span class="cx" style="display: block; padding: 0 10px"> if (isset($p_filedescr['new_short_name'])) {
</span><span class="cx" style="display: block; padding: 0 10px"> $v_path_info = pathinfo($p_filename);
</span><span class="cx" style="display: block; padding: 0 10px"> $v_dir = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3169,7 +3169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return PclZip::errorCode();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Read the central directory informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Read the central directory information
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_central_dir = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3220,7 +3220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // --------------------------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> // Function : privConvertHeader2FileInfo()
</span><span class="cx" style="display: block; padding: 0 10px"> // Description :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This function takes the file informations from the central directory
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This function takes the file information from the central directory
</ins><span class="cx" style="display: block; padding: 0 10px"> // entries and extract the interesting parameters that will be given back.
</span><span class="cx" style="display: block; padding: 0 10px"> // The resulting file infos are set in the array $p_info
</span><span class="cx" style="display: block; padding: 0 10px"> // $p_info['filename'] : Filename with full path. Given by user (add),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3313,7 +3313,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $v_result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Read the central directory informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Read the central directory information
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_central_dir = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3713,7 +3713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $v_result = PCLZIP_ERR_USER_ABORTED;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Update the informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Update the information
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only some fields can be modified
</span><span class="cx" style="display: block; padding: 0 10px"> $p_entry['filename'] = $v_local_header['filename'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4080,7 +4080,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $v_result = PCLZIP_ERR_USER_ABORTED;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Update the informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Update the information
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only some fields can be modified
</span><span class="cx" style="display: block; padding: 0 10px"> $p_entry['filename'] = $v_local_header['filename'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4193,7 +4193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $v_result = PCLZIP_ERR_USER_ABORTED;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Update the informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Update the information
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only some fields can be modified
</span><span class="cx" style="display: block; padding: 0 10px"> $p_entry['filename'] = $v_local_header['filename'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4689,7 +4689,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $v_result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Read the central directory informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Read the central directory information
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_central_dir = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4824,7 +4824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Look if something need to be deleted
</span><span class="cx" style="display: block; padding: 0 10px"> if ($v_nb_extracted > 0) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Creates a temporay file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Creates a temporary file
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Creates a temporary zip archive
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5075,7 +5075,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $v_result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Read the central directory informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Read the central directory information
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_central_dir = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5095,7 +5095,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $v_result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Read the central directory informations
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Read the central directory information
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_central_dir_to_add = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5108,7 +5108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Go to beginning of File
</span><span class="cx" style="display: block; padding: 0 10px"> @rewind($p_archive_to_add->zip_fd);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ----- Creates a temporay file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ----- Creates a temporary file
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Open the temporary file in write mode
</span></span></pre>
</div>
</div>
</body>
</html>