Changeset 12723

Timestamp:

01/14/2010 09:23:53 AM (16 years ago)

Author:

dd32

Message:

Standardise WP_Filesystem_*::put_contents() arguments to support chmod reliably across all transports. Fixes #10889

Location:

trunk/wp-admin/includes

Files:

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

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

@@ -55 +55 @@
      * Write a string to a file
      *
-     * @param $file string Path to the file where to write the data.
+     * @param $file string Remote path to the file where to write the data.
      * @param $contents string The data to write.
      * @param $mode int (optional) The file permissions as octal number, usually 0644.
-     * @param $type string (optional) Specifies additional type of access you require to the file.
      * @return bool False upon failure.
      */
-    function put_contents($file, $contents, $mode = false, $type = '') {
-        if ( ! ($fp = @fopen($file, 'w' . $type)) )
+    function put_contents($file, $contents, $mode = false ) {
+        if ( ! ($fp = @fopen($file, 'w')) )
             return false;
         @fwrite($fp, $contents);

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

@@ -112 +112 @@
         return explode("\n", $this->get_contents($file));
     }
-    function put_contents($file, $contents, $type = '' ) {
-        if ( empty($type) )
-            $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-
+    
+    function put_contents($file, $contents, $mode = false ) {
         $temp = tmpfile();
         if ( ! $temp )
@@ -123 +121 @@
         fseek($temp, 0); //Skip back to the start of the file being written to
 
+        $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
         $ret = @ftp_fput($this->link, $file, $temp, $type);
 
         fclose($temp);
+
+        $this->chmod($file, $mode);
+
         return $ret;
     }

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

@@ -116 +116 @@
     }
 
-    function put_contents($file, $contents, $type = '' ) {
-        if ( empty($type) )
-            $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-
-        $this->ftp->SetType($type);
-
+    function put_contents($file, $contents, $mode = false ) {
         $temp = wp_tempnam( $file );
-        if ( ! $temphandle = fopen($temp, 'w+') ) {
+        if ( ! $temphandle = @fopen($temp, 'w+') ) {
             unlink($temp);
             return false;
@@ -131 +126 @@
         fseek($temphandle, 0); //Skip back to the start of the file being written to
 
+        $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
+        $this->ftp->SetType($type);
+
         $ret = $this->ftp->fput($file, $temphandle);
 
         fclose($temphandle);
         unlink($temp);
+
+        $this->chmod($file, $mode);
+
         return $ret;
     }

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

@@ -161 +161 @@
     }
 
-    function put_contents($file, $contents, $type = '' ) {
-        $file = ltrim($file, '/');
-        return false !== file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+    function put_contents($file, $contents, $mode = false ) {
+        $file = ltrim($file, '/');
+        $ret = file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+
+        $this->chmod($file, $mode);
+
+        return false !== $ret;
     }
 

trunk/wp-admin/includes/file.php

@@ -551 +551 @@
         // We've made sure the folders are there, so let's extract the file now:
         if ( ! $file['folder'] ) {
-            if ( !$fs->put_contents( $to . $file['filename'], $file['content']) )
+            if ( !$fs->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
                 return new WP_Error('copy_failed', __('Could not copy file'), $to . $file['filename']);
-            $fs->chmod($to . $file['filename'], FS_CHMOD_FILE);
         }
     }