Changeset 17525

Timestamp:

03/22/2011 12:04:15 AM (14 years ago)

Author:

dd32

Message:

Optimisations to WP_Filesystem; Pass known information to called functions. Props aldenta (John Ford) for investigation and patch. See #10913

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-direct.php (modified) (3 diffs)
• class-wp-filesystem-ftpext.php (modified) (4 diffs)
• class-wp-filesystem-ftpsockets.php (modified) (3 diffs)
• class-wp-filesystem-ssh2.php (modified) (4 diffs)
• file.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-filesystem-direct.php

@@ -194 +194 @@
     }
 
-    function copy($source, $destination, $overwrite = false) {
+    function copy($source, $destination, $overwrite = false, $mode = false) {
         if ( ! $overwrite && $this->exists($destination) )
             return false;
 
-        return copy($source, $destination);
+        $rtval = copy($source, $destination);
+        if ( $mode )
+            $this->chmod($destination, $mode);
+        return $rtval;
     }
 
@@ -217 +220 @@
     }
 
-    function delete($file, $recursive = false) {
+    function delete($file, $recursive = false, $type = false) {
         if ( empty($file) ) //Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
             return false;
         $file = str_replace('\\', '/', $file); //for win32, occasional problems deleteing files otherwise
 
-        if ( $this->is_file($file) )
+        if ( 'f' == $type || $this->is_file($file) )
             return @unlink($file);
         if ( ! $recursive && $this->is_dir($file) )
@@ -234 +237 @@
         if ( is_array($filelist) ) //false if no files, So check first.
             foreach ($filelist as $filename => $fileinfo)
-                if ( ! $this->delete($file . $filename, $recursive) )
+                if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
                     $retval = false;
 

trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -184 +184 @@
         return $dir[$file]['group'];
     }
-    function copy($source, $destination, $overwrite = false ) {
+    function copy($source, $destination, $overwrite = false, $mode = false) {
         if ( ! $overwrite && $this->exists($destination) )
             return false;
@@ -190 +190 @@
         if ( false === $content)
             return false;
-        return $this->put_contents($destination, $content);
+        return $this->put_contents($destination, $content, $mode);
     }
     function move($source, $destination, $overwrite = false) {
@@ -196 +196 @@
     }
 
-    function delete($file, $recursive = false ) {
+    function delete($file, $recursive = false, $type = false) {
         if ( empty($file) )
             return false;
-        if ( $this->is_file($file) )
+        if ( 'f' == $type || $this->is_file($file) )
             return @ftp_delete($this->link, $file);
         if ( !$recursive )
@@ -207 +207 @@
         if ( !empty($filelist) )
             foreach ( $filelist as $delete_file )
-                $this->delete( trailingslashit($file) . $delete_file['name'], $recursive);
+                $this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
         return @ftp_rmdir($this->link, $file);
     }

trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -194 +194 @@
     }
 
-    function copy($source, $destination, $overwrite = false ) {
+    function copy($source, $destination, $overwrite = false, $mode = false) {
         if ( ! $overwrite && $this->exists($destination) )
             return false;
@@ -202 +202 @@
             return false;
 
-        return $this->put_contents($destination, $content);
+        return $this->put_contents($destination, $content, $mode);
     }
 
@@ -209 +209 @@
     }
 
-    function delete($file, $recursive = false ) {
+    function delete($file, $recursive = false, $type = false) {
         if ( empty($file) )
             return false;
-        if ( $this->is_file($file) )
+        if ( 'f' == $type || $this->is_file($file) )
             return $this->ftp->delete($file);
         if ( !$recursive )

trunk/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -239 +239 @@
     }
 
-    function copy($source, $destination, $overwrite = false ) {
+    function copy($source, $destination, $overwrite = false, $mode = false) {
         if ( ! $overwrite && $this->exists($destination) )
             return false;
@@ -245 +245 @@
         if ( false === $content)
             return false;
-        return $this->put_contents($destination, $content);
+        return $this->put_contents($destination, $content, $mode);
     }
 
@@ -252 +252 @@
     }
 
-    function delete($file, $recursive = false) {
-        if ( $this->is_file($file) )
+    function delete($file, $recursive = false, $type = false) {
+        if ( 'f' == $type || $this->is_file($file) )
             return ssh2_sftp_unlink($this->sftp_link, $file);
         if ( ! $recursive )
@@ -260 +260 @@
         if ( is_array($filelist) ) {
             foreach ( $filelist as $filename => $fileinfo) {
-                $this->delete($file . '/' . $filename, $recursive);
+                $this->delete($file . '/' . $filename, $recursive, $fileinfo['type']);
             }
         }

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 {
@@ -774 +774 @@
     foreach ( (array) $dirlist as $filename => $fileinfo ) {
         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) ) {