Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 164 insertions, 21 deletions

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 45c05e5..75ef4e3 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -1,6 +1,6 @@
 <?php
 
-$wp_file_descriptions = array ('index.php' => __( 'Main Index Template' ), 'style.css' => __( 'Stylesheet' ), 'comments.php' => __( 'Comments' ), 'comments-popup.php' => __( 'Popup Comments' ), 'footer.php' => __( 'Footer' ), 'header.php' => __( 'Header' ), 'sidebar.php' => __( 'Sidebar' ), 'archive.php' => __( 'Archives' ), 'category.php' => __( 'Category Template' ), 'page.php' => __( 'Page Template' ), 'search.php' => __( 'Search Results' ), 'single.php' => __( 'Single Post' ), '404.php' => __( '404 Template' ), 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), '.htaccess' => __( '.htaccess (for rewrite rules )' ),
+$wp_file_descriptions = array ('index.php' => __( 'Main Index Template' ), 'style.css' => __( 'Stylesheet' ), 'rtl.css' => __( 'RTL Stylesheet' ), 'comments.php' => __( 'Comments' ), 'comments-popup.php' => __( 'Popup Comments' ), 'footer.php' => __( 'Footer' ), 'header.php' => __( 'Header' ), 'sidebar.php' => __( 'Sidebar' ), 'archive.php' => __( 'Archives' ), 'category.php' => __( 'Category Template' ), 'page.php' => __( 'Page Template' ), 'search.php' => __( 'Search Results' ), 'searchform.php' => __( 'Search Form' ), 'single.php' => __( 'Single Post' ), '404.php' => __( '404 Template' ), 'link.php' => __( 'Links Template' ), 'functions.php' => __( 'Theme Functions' ), 'attachment.php' => __( 'Attachment Template' ), 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), '.htaccess' => __( '.htaccess (for rewrite rules )' ),
 	// Deprecated files
 	'wp-layout.css' => __( 'Stylesheet' ), 'wp-comments.php' => __( 'Comments Template' ), 'wp-comments-popup.php' => __( 'Popup Comments Template' ));
 function get_file_description( $file ) {
@@ -42,6 +42,20 @@ function get_real_file_to_edit( $file ) {
 	return $real_file;
 }
 
+function get_temp_dir() {
+	if ( defined('WP_TEMP_DIR') )
+		return trailingslashit(WP_TEMP_DIR);
+
+	$temp = ABSPATH . 'wp-content/';
+	if ( is_dir($temp) && is_writable($temp) )
+		return $temp;
+
+	if  ( function_exists('sys_get_temp_dir') )
+		return trailingslashit(sys_get_temp_dir());
+
+	return '/tmp/';
+}
+
 function validate_file( $file, $allowed_files = '' ) {
 	if ( false !== strpos( $file, '..' ))
 		return 1;
@@ -114,6 +128,7 @@ function wp_handle_upload( &$file, $overrides = false ) {
 
 	// If you override this, you must provide $ext and $type!!!!
 	$test_type = true;
+	$mimes = false;
 
 	// Install user overrides. Did we mention that this voids your warranty?
 	if ( is_array( $overrides ) )
@@ -146,32 +161,16 @@ function wp_handle_upload( &$file, $overrides = false ) {
 
 		if ( !$ext )
 			$ext = ltrim(strrchr($file['name'], '.'), '.');
+
+		if ( !$type )
+			$type = $file['type'];
 	}
 
 	// A writable uploads dir will pass this test. Again, there's no point overriding this one.
 	if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
 		return $upload_error_handler( $file, $uploads['error'] );
 
-	// Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
-	if ( isset( $unique_filename_callback ) && function_exists( $unique_filename_callback ) ) {
-		$filename = $unique_filename_callback( $uploads['path'], $file['name'] );
-	} else {
-		$number = '';
-		$filename = str_replace( '#', '_', $file['name'] );
-		$filename = str_replace( array( '\\', "'" ), '', $filename );
-		if ( empty( $ext) )
-			$ext = '';
-		else
-			$ext = ".$ext";
-		while ( file_exists( $uploads['path'] . "/$filename" ) ) {
-			if ( '' == "$number$ext" )
-				$filename = $filename . ++$number . $ext;
-			else
-				$filename = str_replace( "$number$ext", ++$number . $ext, $filename );
-		}
-		$filename = str_replace( $ext, '', $filename );
-		$filename = sanitize_title_with_dashes( $filename ) . $ext;
-	}
+	$filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
 
 	// Move the file to the uploads dir
 	$new_file = $uploads['path'] . "/$filename";
@@ -191,4 +190,148 @@ function wp_handle_upload( &$file, $overrides = false ) {
 	return $return;
 }
 
+/**
+* Downloads a url to a local file using the Snoopy HTTP Class
+*
+* @param string $url the URL of the file to download
+* @return mixed WP_Error on failure, string Filename on success.
+*/
+function download_url( $url ) {
+	//WARNING: The file is not automatically deleted, The script must unlink() the file.
+	if( ! $url )
+		return new WP_Error('http_no_url', __('Invalid URL Provided'));
+
+	$tmpfname = tempnam(get_temp_dir(), 'wpupdate');
+	if( ! $tmpfname )
+		return new WP_Error('http_no_file', __('Could not create Temporary file'));
+
+	$handle = @fopen($tmpfname, 'w');
+	if( ! $handle )
+		return new WP_Error('http_no_file', __('Could not create Temporary file'));
+
+	require_once( ABSPATH . 'wp-includes/class-snoopy.php' );
+	$snoopy = new Snoopy();
+	$snoopy->fetch($url);
+
+	if( $snoopy->status != '200' ){
+		fclose($handle);
+		unlink($tmpfname);
+		return new WP_Error('http_404', trim($snoopy->response_code));
+	}
+	fwrite($handle, $snoopy->results);
+	fclose($handle);
+
+	return $tmpfname;
+}
+
+function unzip_file($file, $to) {
+	global $wp_filesystem;
+
+	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
+		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+
+	$fs =& $wp_filesystem;
+
+	require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
+
+	$archive = new PclZip($file);
+
+	// Is the archive valid?
+	if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
+		return new WP_Error('incompatible_archive', __('Incompatible archive'), $archive->errorInfo(true));
+
+	if ( 0 == count($archive_files) )
+		return new WP_Error('empty_archive', __('Empty archive'));
+
+	$to = trailingslashit($to);
+	$path = explode('/', $to);
+	$tmppath = '';
+	for ( $j = 0; $j < count($path) - 1; $j++ ) {
+		$tmppath .= $path[$j] . '/';
+		if ( ! $fs->is_dir($tmppath) )
+			$fs->mkdir($tmppath, 0755);
+	}
+
+	foreach ($archive_files as $file) {
+		$path = explode('/', $file['filename']);
+		$tmppath = '';
+
+		// Loop through each of the items and check that the folder exists.
+		for ( $j = 0; $j < count($path) - 1; $j++ ) {
+			$tmppath .= $path[$j] . '/';
+			if ( ! $fs->is_dir($to . $tmppath) )
+				if ( !$fs->mkdir($to . $tmppath, 0755) )
+					return new WP_Error('mkdir_failed', __('Could not create directory'));
+		}
+
+		// 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']) )
+				return new WP_Error('copy_failed', __('Could not copy file'));
+			$fs->chmod($to . $file['filename'], 0644);
+	}
+
+	return true;
+}
+
+function copy_dir($from, $to) {
+	global $wp_filesystem;
+
+	$dirlist = $wp_filesystem->dirlist($from);
+
+	$from = trailingslashit($from);
+	$to = trailingslashit($to);
+
+	foreach ( (array) $dirlist as $filename => $fileinfo ) {
+		if ( 'f' == $fileinfo['type'] ) {
+			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) )
+				return false;
+			$wp_filesystem->chmod($to . $filename, 0644);
+		} elseif ( 'd' == $fileinfo['type'] ) {
+			if ( !$wp_filesystem->mkdir($to . $filename, 0755) )
+				return false;
+			if ( !copy_dir($from . $filename, $to . $filename) )
+				return false;
+		}
+	}
+
+	return true;
+}
+
+function WP_Filesystem( $args = false, $preference = false ) {
+	global $wp_filesystem;
+
+	$method = get_filesystem_method($preference);
+	if ( ! $method )
+		return false;
+
+	require_once('class-wp-filesystem-'.$method.'.php');
+	$method = "WP_Filesystem_$method";
+
+	$wp_filesystem = new $method($args);
+
+	if ( $wp_filesystem->errors->get_error_code() )
+		return false;
+
+	if ( !$wp_filesystem->connect() )
+		return false; //There was an erorr connecting to the server.
+
+	return true;
+}
+
+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;
+}
+
 ?>