X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8a06f4f9392d1ac373442f82ee40428a3cb81395..449d082fcc4873c1f7d363a0d9f7409be7f6e77d:/wp-admin/update.php

diff --git a/wp-admin/update.php b/wp-admin/update.php
index c3cd2892..803f50e2 100644
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -1,94 +1,24 @@
 <?php
-
+/**
+ * Update Plugin/Theme administration panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
 require_once('admin.php');
 
 if ( ! current_user_can('update_plugins') )
 	wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
 
-function request_filesystem_credentials($form_post, $type = '', $error = false) {
-	$req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error);
-	if ( '' !== $req_cred )
-		return $req_cred;
-
-	if ( empty($type) )
-		$type = get_filesystem_method();
-
-	if ( 'direct' == $type )
-		return true;
-		
-	if( ! $credentials = get_option('ftp_credentials') )
-		$credentials = array();
-	// If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
-	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']);
-	$credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
-	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
-	$credentials['ssl']      = defined('FTP_SSL')  ? FTP_SSL  : ( isset($_POST['ssl'])      ? $_POST['ssl']      : $credentials['ssl']);
-
-	if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {
-		$stored_credentials = $credentials;
-		unset($stored_credentials['password']);
-		update_option('ftp_credentials', $stored_credentials);
-		return $credentials;
-	}
-	$hostname = '';
-	$username = '';
-	$password = '';
-	$ssl = '';
-	if ( !empty($credentials) )
-		extract($credentials, EXTR_OVERWRITE);
-	if( $error )
-		echo '<div id="message" class="error"><p>' . __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.') . '</p></div>';
-?>
-<form action="<?php echo $form_post ?>" method="post">
-<div class="wrap">
-<h2><?php _e('FTP Connection Information') ?></h2>
-<p><?php _e('To perform the requested update, FTP connection information is required.') ?></p>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="hostname"><?php _e('Hostname:') ?></label></th>
-<td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname) ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="username"><?php _e('Username:') ?></label></th>
-<td><input name="username" type="text" id="username" value="<?php echo attribute_escape($username) ?>"<?php if( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="password"><?php _e('Password:') ?></label></th>
-<td><input name="password" type="password" id="password" value=""<?php if( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /><?php if( defined('FTP_PASS') && !empty($password) ) echo '<em>'.__('(Password not shown)').'</em>'; ?></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="ssl"><?php _e('Use SSL:') ?></label></th>
-<td>
-<select name="ssl" id="ssl"<?php if( defined('FTP_SSL') ) echo ' disabled="disabled"' ?>>
-<?php
-foreach ( array(0 => __('No'), 1 => __('Yes')) as $key => $value ) :
-	$selected = ($ssl == $value) ? 'selected="selected"' : '';
-	echo "\n\t<option value='$key' $selected>" . $value . '</option>';
-endforeach;
-?>
-</select>
-</td>
-</tr>
-</table>
-<p class="submit">
-<input type="submit" name="submit" value="<?php _e('Proceed'); ?>" />
-</p>
-</div>
-</form>
-<?php
-	return false;
-}
-
-function show_message($message) {
-	if( is_wp_error($message) ){
-		if( $message->get_error_data() )
-			$message = $message->get_error_message() . ': ' . $message->get_error_data();
-		else 
-			$message = $message->get_error_message();
-	}
-	echo "<p>$message</p>\n";
-}
-
+/**
+ * Plugin upgrade display.
+ *
+ * @since 2.5
+ *
+ * @param string $plugin Plugin
+ */
 function do_plugin_upgrade($plugin) {
 	global $wp_filesystem;
 
@@ -97,7 +27,10 @@ function do_plugin_upgrade($plugin) {
 		return;
 
 	if ( ! WP_Filesystem($credentials) ) {
-		request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
+		$error = true;
+		if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() )
+			$error = $wp_filesystem->errors;
+		request_filesystem_credentials($url, '', $error); //Failed to connect, Error and request again
 		return;
 	}
 
@@ -116,13 +49,74 @@ function do_plugin_upgrade($plugin) {
 
 	if ( is_wp_error($result) ) {
 		show_message($result);
-		show_message( __('Installation Failed') );
+		show_message( __('Plugin upgrade Failed') );
 	} else {
-		//Result is the new plugin file relative to WP_PLUGIN_DIR
-		show_message( __('Plugin upgraded successfully') );	
+		$plugin_file = $result;
+		show_message( __('Plugin upgraded successfully') );
 		if( $result && $was_activated ){
 			show_message(__('Attempting reactivation of the plugin'));
-			echo '<iframe style="border:0" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $result, 'activate-plugin_' . $result) .'"></iframe>';
+			echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) .'"></iframe>';
+		}
+		$update_actions =  array(
+			'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . attribute_escape(__('Activate this plugin')) . '" target="_parent">' . __('Activate Plugin') . '</a>',
+			'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . attribute_escape(__('Goto plugins page')) . '" target="_parent">' . __('Return to Plugins page') . '</a>'
+		);
+		if ( $was_activated )
+			unset( $update_actions['activate_plugin'] );
+
+		$update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $plugin_file);
+		if ( ! empty($update_actions) )
+			show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$update_actions));
+	}
+	echo '</div>';
+}
+
+/**
+ * Theme upgrade display.
+ *
+ * @since 2.5
+ *
+ * @param string $plugin Plugin
+ */
+function do_theme_upgrade($theme) {
+	global $wp_filesystem;
+
+	$url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($theme), 'upgrade-plugin_' . urlencode($theme));
+	if ( false === ($credentials = request_filesystem_credentials($url)) )
+		return;
+
+	if ( ! WP_Filesystem($credentials) ) {
+		$error = true;
+		if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() )
+			$error = $wp_filesystem->errors;
+		request_filesystem_credentials($url, '', $error); //Failed to connect, Error and request again
+		return;
+	}
+
+	echo '<div class="wrap">';
+	echo '<h2>' . __('Upgrade Theme') . '</h2>';
+	if ( $wp_filesystem->errors->get_error_code() ) {
+		foreach ( $wp_filesystem->errors->get_error_messages() as $message )
+			show_message($message);
+		echo '</div>';
+		return;
+	}
+
+	//TODO: Is theme currently active?
+	$was_current = false; //is_plugin_active($plugin); //Check now, It'll be deactivated by the next line if it is
+
+	$result = wp_update_theme($theme, 'show_message');
+
+	if ( is_wp_error($result) ) {
+		show_message($result);
+		show_message( __('Installation Failed') );
+	} else {
+		//Result is the new plugin file relative to WP_PLUGIN_DIR
+		show_message( __('Theme upgraded successfully') );
+		if( $result && $was_current ){
+			show_message(__('Setting theme as Current'));
+			//TODO: Actually set it as active again.
+			//echo '<iframe style="border:0" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $result, 'activate-plugin_' . $result) .'"></iframe>';
 		}
 	}
 	echo '</div>';
@@ -130,34 +124,25 @@ function do_plugin_upgrade($plugin) {
 
 if ( isset($_GET['action']) ) {
 	$plugin = isset($_GET['plugin']) ? trim($_GET['plugin']) : '';
+	$theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
+	$action = isset($_GET['action']) ? $_GET['action'] : '';
 
-	if ( 'upgrade-plugin' == $_GET['action'] ) {
+	if ( 'upgrade-plugin' == $action ) {
 		check_admin_referer('upgrade-plugin_' . $plugin);
 		$title = __('Upgrade Plugin');
 		$parent_file = 'plugins.php';
 		require_once('admin-header.php');
 		do_plugin_upgrade($plugin);
 		include('admin-footer.php');
-	} elseif ('activate-plugin' == $_GET['action'] ) {
+	} elseif ('activate-plugin' == $action ) {
 		check_admin_referer('activate-plugin_' . $plugin);
 		if( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-			wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); 
+			wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
 			activate_plugin($plugin);
-			wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); 
+			wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
 			die();
 		}
-			?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php bloginfo('name') ?> &rsaquo; <?php _e('Plugin Reactivation'); ?> &#8212; <?php _e('WordPress'); ?></title>
-<?php
-wp_admin_css( 'global', true );
-wp_admin_css( 'colors', true );
-?>
-</head>
-<body>
-<?php
+		iframe_header( __('Plugin Reactivation'), true );
 		if( isset($_GET['success']) )
 			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
 
@@ -167,7 +152,14 @@ wp_admin_css( 'colors', true );
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
 			include(WP_PLUGIN_DIR . '/' . $plugin);
 		}
-		echo "</body></html>";
+		iframe_footer();
+	} elseif ( 'upgrade-theme' == $action ) {
+		check_admin_referer('upgrade-theme_' . $theme);
+		$title = __('Upgrade Theme');
+		$parent_file = 'themes.php';
+		require_once('admin-header.php');
+		do_theme_upgrade($theme);
+		include('admin-footer.php');
 	}
 }