Changes in trunk/wp-admin/includes/file.php [17200:18193]

File:

• trunk/wp-admin/includes/file.php (modified) (9 diffs)

trunk/wp-admin/includes/file.php

@@ -81 +81 @@
     $siteurl = get_option( 'siteurl' );
     if ( $home != '' && $home != $siteurl ) {
-            $wp_path_rel_to_home = str_replace($home, '', $siteurl); /* $siteurl - $home */
-            $pos = strpos($_SERVER["SCRIPT_FILENAME"], $wp_path_rel_to_home);
-            $home_path = substr($_SERVER["SCRIPT_FILENAME"], 0, $pos);
+        $wp_path_rel_to_home = str_replace($home, '', $siteurl); /* $siteurl - $home */
+        $pos = strpos($_SERVER["SCRIPT_FILENAME"], $wp_path_rel_to_home);
+        $home_path = substr($_SERVER["SCRIPT_FILENAME"], 0, $pos);
         $home_path = trailingslashit( $home_path );
     } else {
@@ -154 +154 @@
 
 /**
- * Determines a writable directory for temporary files.
- * Function's preference is to WP_CONTENT_DIR followed by the return value of <code>sys_get_temp_dir()</code>, before finally defaulting to /tmp/
- *
- * In the event that this function does not find a writable location, It may be overridden by the <code>WP_TEMP_DIR</code> constant in your <code>wp-config.php</code> file.
- *
- * @since 2.5.0
- *
- * @return string Writable temporary directory
- */
-function get_temp_dir() {
-    static $temp;
-    if ( defined('WP_TEMP_DIR') )
-        return trailingslashit(WP_TEMP_DIR);
-
-    if ( $temp )
-        return trailingslashit($temp);
-
-    $temp = WP_CONTENT_DIR . '/';
-    if ( is_dir($temp) && @is_writable($temp) )
-        return $temp;
-
-    if  ( function_exists('sys_get_temp_dir') ) {
-        $temp = sys_get_temp_dir();
-        if ( @is_writable($temp) )
-            return trailingslashit($temp);
-    }
-
-    $temp = ini_get('upload_tmp_dir');
-    if ( is_dir($temp) && @is_writable($temp) )
-        return trailingslashit($temp);
-
-    $temp = '/tmp/';
-    return $temp;
-}
-
-/**
  * Returns a filename of a Temporary unique file.
  * Please note that the calling function must unlink() this itself.
@@ -289 +253 @@
     // Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error'].
     $upload_error_strings = array( false,
-        __( "The uploaded file exceeds the <code>upload_max_filesize</code> directive in <code>php.ini</code>." ),
-        __( "The uploaded file exceeds the <em>MAX_FILE_SIZE</em> directive that was specified in the HTML form." ),
+        __( "The uploaded file exceeds the upload_max_filesize directive in php.ini." ),
+        __( "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." ),
         __( "The uploaded file was only partially uploaded." ),
         __( "No file was uploaded." ),
@@ -520 +484 @@
         return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 
-    $handle = @fopen($tmpfname, 'wb');
-    if ( ! $handle )
-        return new WP_Error('http_no_file', __('Could not create Temporary file.'));
-
-    $response = wp_remote_get($url, array('timeout' => $timeout));
-
-    if ( is_wp_error($response) ) {
-        fclose($handle);
-        unlink($tmpfname);
+    $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+
+    if ( is_wp_error( $response ) ) {
+        unlink( $tmpfname );
         return $response;
     }
 
-    if ( $response['response']['code'] != '200' ){
-        fclose($handle);
-        unlink($tmpfname);
-        return new WP_Error('http_404', trim($response['response']['message']));
-    }
-
-    fwrite($handle, $response['body']);
-    fclose($handle);
+    if ( 200 != wp_remote_retrieve_response_code( $response ) ){
+        unlink( $tmpfname );
+        return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+    }
 
     return $tmpfname;
@@ -564 +519 @@
 
     // Unzip can use a lot of memory, but not this much hopefully
-    @ini_set('memory_limit', '256M');
+    @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 
     $needed_dirs = array();
@@ -698 +653 @@
     global $wp_filesystem;
 
+    // See #15789 - PclZip uses string functions on binary data, If it's overloaded with Multibyte safe functions the results are incorrect.
+    if ( ini_get('mbstring.func_overload') && function_exists('mb_internal_encoding') ) {
+        $previous_encoding = mb_internal_encoding();
+        mb_internal_encoding('ISO-8859-1');
+    }
+
     require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
 
     $archive = new PclZip($file);
 
+    $archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING);
+
+    if ( isset($previous_encoding) )
+        mb_internal_encoding($previous_encoding);
+
     // Is the archive valid?
-    if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
+    if ( !is_array($archive_files) )
         return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
 
@@ -762 +728 @@
  * @param string $from source directory
  * @param string $to destination directory
+ * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function copy_dir($from, $to) {
+function copy_dir($from, $to, $skip_list = array() ) {
     global $wp_filesystem;
 
@@ -772 +739 @@
     $to = trailingslashit($to);
 
+    $skip_regex = '';
+    foreach ( (array)$skip_list as $key => $skip_file )
+        $skip_regex .= preg_quote($skip_file, '!') . '|';
+
+    if ( !empty($skip_regex) )
+        $skip_regex = '!(' . rtrim($skip_regex, '|') . ')$!i';
+
     foreach ( (array) $dirlist as $filename => $fileinfo ) {
+        if ( !empty($skip_regex) )
+            if ( preg_match($skip_regex, $from . $filename) )
+                continue;
+
         if ( 'f' == $fileinfo['type'] ) {
-            if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) {
+            if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
                 // If copy failed, chmod file to 0644 and try again.
                 $wp_filesystem->chmod($to . $filename, 0644);
-                if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) )
+                if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
                     return new WP_Error('copy_failed', __('Could not copy file.'), $to . $filename);
             }
-            $wp_filesystem->chmod($to . $filename, FS_CHMOD_FILE);
         } elseif ( 'd' == $fileinfo['type'] ) {
             if ( !$wp_filesystem->is_dir($to . $filename) ) {
@@ -786 +763 @@
                     return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename);
             }
-            $result = copy_dir($from . $filename, $to . $filename);
+            $result = copy_dir($from . $filename, $to . $filename, $skip_list);
             if ( is_wp_error($result) )
                 return $result;