Changeset 8990

Timestamp:

09/26/2008 06:53:57 AM (17 years ago)

Author:

westi

Message:

Autodetect binary files for FTP filesystems. Fixes #7568 props DD32.

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-base.php (modified) (1 diff)
• class-wp-filesystem-ftpext.php (modified) (3 diffs)
• class-wp-filesystem-ftpsockets.php (modified) (5 diffs)

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

@@ -167 +167 @@
         return $newmode;
     }
+
+    /**
+    * Determines if the string provided contains binary characters.
+    *
+    * @since 2.7
+    * @package WordPress
+    * @subpackage WP_Filesystem
+    *
+    * @param string $text String to test against
+    *
+    */
+    function is_binary( $text ) {
+        return (bool) preg_match('|[^\x20-\x7E]|', $text); //chr(32)..chr(127)
+    }
 }
 

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

@@ -23 +23 @@
     var $permission = null;
 
-    var $filetypes = array(
-                            'php'=>FTP_ASCII,
-                            'css'=>FTP_ASCII,
-                            'txt'=>FTP_ASCII,
-                            'js'=>FTP_ASCII,
-                            'html'=>FTP_ASCII,
-                            'htm'=>FTP_ASCII,
-                            'xml'=>FTP_ASCII,
-
-                            'jpg'=>FTP_BINARY,
-                            'png'=>FTP_BINARY,
-                            'gif'=>FTP_BINARY,
-                            'bmp'=>FTP_BINARY
-                            );
-
     function WP_Filesystem_FTPext($opt='') {
         $this->method = 'ftpext';
@@ -104 +89 @@
 
     function get_contents($file, $type = '', $resumepos = 0 ){
-        if( empty($type) ){
-            $extension = substr(strrchr($file, "."), 1);
-            $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_ASCII;
-        }
+        if( empty($type) )
+            $type = FTP_BINARY;
+
         $temp = tmpfile();
         if ( ! $temp )
             return false;
+
         if( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) )
             return false;
+
         fseek($temp, 0); //Skip back to the start of the file being written to
         $contents = '';
-        while (!feof($temp)) {
+
+        while ( ! feof($temp) )
             $contents .= fread($temp, 8192);
-        }
+
         fclose($temp);
         return $contents;
@@ -125 +112 @@
     }
     function put_contents($file, $contents, $type = '' ) {
-        if( empty($type) ) {
-            $extension = substr(strrchr($file, "."), 1);
-            $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_ASCII;
-        }
+        if( empty($type) )
+            $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
+
         $temp = tmpfile();
         if ( ! $temp )
             return false;
+
         fwrite($temp, $contents);
         fseek($temp, 0); //Skip back to the start of the file being written to
+
         $ret = @ftp_fput($this->link, $file, $temp, $type);
+
         fclose($temp);
         return $ret;

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

@@ -23 +23 @@
     var $permission = null;
 
-    var $filetypes = array(
-                            'php' => FTP_ASCII,
-                            'css' => FTP_ASCII,
-                            'txt' => FTP_ASCII,
-                            'js'  => FTP_ASCII,
-                            'html'=> FTP_ASCII,
-                            'htm' => FTP_ASCII,
-                            'xml' => FTP_ASCII,
-
-                            'jpg' => FTP_BINARY,
-                            'png' => FTP_BINARY,
-                            'gif' => FTP_BINARY,
-                            'bmp' => FTP_BINARY
-                            );
-
     function WP_Filesystem_ftpsockets($opt = '') {
         $this->method = 'ftpsockets';
@@ -106 +91 @@
             return false;
 
-        if( empty($type) ){
-            $extension = substr(strrchr($file, '.'), 1);
-            $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_AUTOASCII;
-        }
+        if( empty($type) )
+            $type = FTP_AUTOASCII;
         $this->ftp->SetType($type);
+
         $temp = wp_tempnam( $file );
+
         if ( ! $temphandle = fopen($temp, 'w+') )
             return false;
+
         if ( ! $this->ftp->fget($temphandle, $file) ) {
             fclose($temphandle);
@@ -119 +105 @@
             return ''; //Blank document, File does exist, Its just blank.
         }
+
         fseek($temphandle, 0); //Skip back to the start of the file being written to
         $contents = '';
+
         while ( ! feof($temphandle) )
             $contents .= fread($temphandle, 8192);
+
         fclose($temphandle);
         unlink($temp);
@@ -133 +122 @@
 
     function put_contents($file, $contents, $type = '' ) {
-        if( empty($type) ){
-            $extension = substr(strrchr($file, '.'), 1);
-            $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_AUTOASCII;
-        }
+        if( empty($type) )
+            $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
+
         $this->ftp->SetType($type);
 
@@ -144 +132 @@
             return false;
         }
+
         fwrite($temphandle, $contents);
         fseek($temphandle, 0); //Skip back to the start of the file being written to
+
         $ret = $this->ftp->fput($file, $temphandle);
+
         fclose($temphandle);
         unlink($temp);