Changeset 7840

Timestamp:

04/25/2008 09:34:54 PM (18 years ago)

Author:

ryan

Message:

tempnam workarounds from DD32. see #6465

File:

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

trunk/wp-admin/includes/file.php

@@ -55 +55 @@
 
         return '/tmp/';
+}
+
+function wp_tempnam($filename = '', $dir = ''){
+        if ( empty($dir) )
+                $dir = get_temp_dir();
+        $filename = basename($filename);
+        if ( empty($filename) )
+                $filename = time();
+
+        $filename = $dir . wp_unique_filename($dir, $filename);
+        touch($filename);
+        return $filename;
 }
 
@@ -201 +213 @@
                 return new WP_Error('http_no_url', __('Invalid URL Provided'));
 
-        $tmpfname = tempnam(get_temp_dir(), 'wpupdate');
+        $tmpfname = wp_tempnam($url);
         if( ! $tmpfname )
                 return new WP_Error('http_no_file', __('Could not create Temporary file'));
@@ -298 +310 @@
 }
 
-function WP_Filesystem( $args = false, $preference = false ) {
+function WP_Filesystem( $args = false ) {
         global $wp_filesystem;
 
-        $method = get_filesystem_method($preference);
+        $method = get_filesystem_method();
         if ( ! $method )
                 return false;
@@ -320 +332 @@
 
 function get_filesystem_method() {
-        $tempFile = tempnam(get_temp_dir(), 'WPU');
-
-        if ( getmyuid() == fileowner($tempFile) ) {
-                unlink($tempFile);
-                return 'direct';
-        } else {
-                unlink($tempFile);
-        }
-
-        if ( extension_loaded('ftp') ) return 'ftpext';
-        if ( extension_loaded('sockets') || function_exists('fsockopen') ) return 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
-        return false;
+        $method = false;
+        if( function_exists('getmyuid') && function_exists('fileowner') ){
+                $temp_file = wp_tempnam();
+                if ( getmyuid() == fileowner($temp_file) )
+                        $method = 'direct';
+                unlink($temp_file);
+        }
+
+        if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
+        if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+        return apply_filters('filesystem_method', $method);
 }