<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13005] trunk/wp-admin/includes/file.php:
Introduce ZipArchive version of unzip_file(),
More efficient on memory usage for supporting hosts.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13005">13005</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-07 04:52:35 +0000 (Sun, 07 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce ZipArchive version of unzip_file(), More efficient on memory usage for supporting hosts. See <a href="http://trac.wordpress.org/ticket/10403">#10403</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-02-07 04:21:53 UTC (rev 13004)
+++ trunk/wp-admin/includes/file.php 2010-02-07 04:52:35 UTC (rev 13005)
</span><span class="lines">@@ -504,20 +504,9 @@
</span><span class="cx"> if ( ! $wp_filesystem || !is_object($wp_filesystem) )
</span><span class="cx"> return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
</span><span class="cx">
</span><del>- // Unzip uses a lot of memory, but not this much hopefully
</del><ins>+ // Unzip can use a lot of memory, but not this much hopefully
</ins><span class="cx"> @ini_set('memory_limit', '256M');
</span><span class="cx">
</span><del>- require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
-
- $archive = new PclZip($file);
-
- // Is the archive valid?
- if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
- return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
-
- if ( 0 == count($archive_files) )
- return new WP_Error('empty_archive', __('Empty archive.'));
-
</del><span class="cx"> $needed_dirs = array();
</span><span class="cx"> $to = trailingslashit($to);
</span><span class="cx">
</span><span class="lines">@@ -529,7 +518,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $dir = implode('/', array_slice($path, 0, $i+1) );
</span><del>- if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter only.
</del><ins>+ if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if ( ! $wp_filesystem->is_dir($dir) )
</span><span class="lines">@@ -539,6 +528,67 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( class_exists('ZipArchive') && apply_filters('unzip_file_use_ziparchive', true ) )
+ return _unzip_file_ziparchive($file, $to, $needed_dirs);
+ else
+ return _unzip_file_pclzip($file, $to, $needed_dirs);
+}
+
+function _unzip_file_ziparchive($file, $to, $needed_dirs = array()) {
+ global $wp_filesystem;
+
+ $z = new ZipArchive();
+ if ( ! $z->open($file) )
+ return new WP_Error('incompatible_archive', __('Incompatible Archive.'));
+
+ for ( $i = 0; $i < $z->numFiles; $i++ ) {
+ if ( ! $info = $z->statIndex($i) )
+ return new WP_Error('stat_failure', __('Could not retrieve file from archive.'));
+
+ if ( '/' == substr($info['name'], -1) ) // directory
+ $needed_dirs[] = $to . untrailingslashit($info['name']);
+ else
+ $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+ }
+
+ $needed_dirs = array_unique($needed_dirs);
+ asort($needed_dirs);
+
+ // Create those directories if need be:
+ foreach ( $needed_dirs as $_dir ) {
+ if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way.
+ return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
+ }
+ unset($needed_dirs);
+
+ for ( $i = 0; $i < $z->numFiles; $i++ ) {
+ if ( ! $info = $z->statIndex($i) )
+ return new WP_Error('stat_failure', __('Could not retrieve file from archive.'));
+
+ if ( '/' == substr($info['name'], -1) ) // directory
+ continue;
+
+ if ( ! $wp_filesystem->put_contents( $to . $info['name'], $z->getFromIndex($i), FS_CHMOD_FILE) )
+ return new WP_Error('copy_failed', __('Could not copy file.'), $to . $file['filename']);
+ }
+
+ return true;
+}
+
+function _unzip_file_pclzip($file, $to, $needed_dirs = array()) {
+ global $wp_filesystem;
+
+ require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
+
+ $archive = new PclZip($file);
+
+ // Is the archive valid?
+ if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
+ return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+
+ if ( 0 == count($archive_files) )
+ return new WP_Error('empty_archive', __('Empty archive.'));
+
</ins><span class="cx"> // Determine any children directories needed (From within the archive)
</span><span class="cx"> foreach ( $archive_files as $file )
</span><span class="cx"> $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
</span><span class="lines">@@ -551,6 +601,7 @@
</span><span class="cx"> if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way.
</span><span class="cx"> return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
</span><span class="cx"> }
</span><ins>+ unset($needed_dirs);
</ins><span class="cx">
</span><span class="cx"> // Extract the files from the zip
</span><span class="cx"> foreach ( $archive_files as $file ) {
</span></span></pre>
</div>
</div>
</body>
</html>