WP Merge with revision 8075

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

1 files changed, 209 insertions, 109 deletions

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 8e6b707..2353275 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -8,41 +8,98 @@ if( is_array( $menu_perms ) == false )
 if( $menu_perms[ 'plugins' ] != 1 )
 	return;
 
-if ( isset($_GET['action']) ) {
-	if ( isset($_GET['plugin']) )
-		$plugin = trim($_GET['plugin']);
-
-	if ( 'activate' == $_GET['action'] ) {
-		check_admin_referer('activate-plugin_' . $_GET['plugin']);
-		$result = activate_plugin($_GET['plugin'], 'plugins.php?error=true&plugin=' . $plugin);
-		if ( is_wp_error( $result ) )
-			wp_die( $result->get_error_message() );
-		wp_redirect('plugins.php?activate=true'); // overrides the ?error=true one above
-	} elseif ( 'error_scrape' == $_GET['action'] ) {
-		check_admin_referer('plugin-activation-error_' . $plugin);
-		$valid = validate_plugin($plugin);
-		if ( is_wp_error($valid) )
-			wp_die($valid);
-		error_reporting( E_ALL ^ E_NOTICE );
-		@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
-		include(ABSPATH . PLUGINDIR . '/' . $plugin);
-	} elseif ( 'deactivate' == $_GET['action'] ) {
-		check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
-		deactivate_plugins($_GET['plugin']);
-		wp_redirect('plugins.php?deactivate=true');
-	} elseif ( 'deactivate-all' == $_GET['action'] ) {
-		check_admin_referer('deactivate-all');
-		deactivate_all_plugins();
-		wp_redirect('plugins.php?deactivate-all=true');
-	} elseif ('reactivate-all' == $_GET['action']) {
-		check_admin_referer('reactivate-all');
-		reactivate_all_plugins('plugins.php?errors=true');
-		wp_redirect('plugins.php?reactivate-all=true'); // overrides the ?error=true one above
+$action = '';
+foreach( array('activate-selected', 'deactivate-selected', 'delete-selected') as $action_key ) {
+	if( isset($_POST[$action_key]) ) {
+		$action = $action_key;
+		break;
 	}
+}
+
+if( isset($_GET['action']) )
+	$action = $_GET['action'];
+
+$plugin = $_REQUEST['plugin'];
+
+if( !empty($action) ) {
+	switch( $action ) {
+		case 'activate':
+			check_admin_referer('activate-plugin_' . $plugin);
+			$result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin);
+			if ( is_wp_error( $result ) )
+				wp_die( $result->get_error_message() );
+			$recent = (array)get_option('recently_activated');
+			if( isset($recent[ $plugin ]) ){
+				unset($recent[ $plugin ]);
+				update_option('recently_activated', $recent);
+			}
+			wp_redirect('plugins.php?activate=true'); // overrides the ?error=true one above
+			exit;
+			break;
+		case 'activate-selected':
+			check_admin_referer('mass-manage-plugins');
+			activate_plugins($_POST['checked'], 'plugins.php?error=true');
+
+			$recent = (array)get_option('recently_activated');
+			foreach( (array)$_POST['checked'] as $plugin => $time) {
+				if( isset($recent[ $plugin ]) )
+					unset($recent[ $plugin ]);
+			}
+			if( $recent != get_option('recently_activated') ) //If array changed, update it.
+				update_option('recently_activated', $recent);
+
+			wp_redirect('plugins.php?activate-multi=true');
+			exit;
+			break;
+		case 'error_scrape':
+			check_admin_referer('plugin-activation-error_' . $plugin);
+			$valid = validate_plugin($plugin);
+			if ( is_wp_error($valid) )
+				wp_die($valid);
+			error_reporting( E_ALL ^ E_NOTICE );
+			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
+			include(WP_PLUGIN_DIR . '/' . $plugin);
+			exit;
+			break;
+		case 'deactivate':
+			check_admin_referer('deactivate-plugin_' . $plugin);
+			deactivate_plugins($plugin);
+			update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
+			wp_redirect('plugins.php?deactivate=true');
+			exit;
+			break;
+		case 'deactivate-selected':
+			check_admin_referer('mass-manage-plugins');
+			deactivate_plugins($_POST['checked']);
+			$deactivated = array();
+			foreach( (array)$_POST['checked'] as $plugin )
+				$deactivated[ $plugin ] = time();
+			update_option('recently_activated', $deactivated + (array)get_option('recently_activated'));
+			wp_redirect('plugins.php?deactivate-multi=true');
+			exit;
+			break;
+		case 'delete-selected':
+			if( ! current_user_can('delete_plugins') )
+				wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
+			check_admin_referer('mass-manage-plugins');
+			$plugins = $_REQUEST['checked'];
+			include(ABSPATH . 'wp-admin/update.php');
+
+			$title = __('Delete Plugin');
+			$parent_file = 'plugins.php';
+
+			$delete_result = delete_plugins($plugins);
 
-	exit;
+			wp_cache_delete('plugins', 'plugins');
+
+			break;
+		default:
+			var_dump("Unknown Action $action");
+	}
 }
 
+wp_enqueue_script('admin-forms');
+
 $title = __('Manage Plugins');
 require_once('admin-header.php');
 
@@ -53,23 +110,26 @@ validate_active_plugins();
 <?php if ( isset($_GET['error']) ) : ?>
 	<div id="message" class="updated fade"><p><?php _e('Plugin could not be activated because it triggered a <strong>fatal error</strong>.') ?></p>
 	<?php
-		$plugin = trim($_GET['plugin']);
 		if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?>
-	<iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo attribute_escape($plugin); ?>&amp;_wpnonce=<?php echo attribute_escape($_GET['_error_nonce']); ?>"></iframe>
+	<iframe style="border:0" width="100%" height="70px" src="<?php echo admin_url('plugins.php?action=error_scrape&amp;plugin=' . attribute_escape($plugin) . '&amp;_wpnonce=' . attribute_escape($_GET['_error_nonce'])); ?>"></iframe>
 	<?php
 		}
 	?>
 	</div>
-<?php elseif ( isset($_GET['errors']) ) : ?>
-	<div id="message" class="updated fade"><p><?php _e('Some plugins could not be reactivated because they triggered a <strong>fatal error</strong>.') ?></p></div>
+<?php elseif ( 'delete-selected' == $action ) :
+		if ( is_wp_error($delete_result) ) : ?>
+		<div id="message" class="updated fade"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
+		<?php else : ?>
+		<div id="message" class="updated fade"><p><?php _e('The selected plugins have been <strong>deleted</strong>.'); ?></p></div>
+		<?php endif; ?>
 <?php elseif ( isset($_GET['activate']) ) : ?>
 	<div id="message" class="updated fade"><p><?php _e('Plugin <strong>activated</strong>.') ?></p></div>
+<?php elseif (isset($_GET['activate-multi'])) : ?>
+	<div id="message" class="updated fade"><p><?php _e('Selected plugins <strong>activated</strong>.'); ?></p></div>
 <?php elseif ( isset($_GET['deactivate']) ) : ?>
 	<div id="message" class="updated fade"><p><?php _e('Plugin <strong>deactivated</strong>.') ?></p></div>
-<?php elseif (isset($_GET['deactivate-all'])) : ?>
-	<div id="message" class="updated fade"><p><?php _e('All plugins <strong>deactivated</strong>.'); ?></p></div>
-<?php elseif (isset($_GET['reactivate-all'])) : ?>
-	<div id="message" class="updated fade"><p><?php _e('Plugins <strong>reactivated</strong>.'); ?></p></div>
+<?php elseif (isset($_GET['deactivate-multi'])) : ?>
+	<div id="message" class="updated fade"><p><?php _e('Selected plugins <strong>deactivated</strong>.'); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap">
@@ -77,106 +137,146 @@ validate_active_plugins();
 <p><?php _e('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.'); ?></p>
 <?php
 
-$plugins = get_plugins();
+$active_plugins = array();
+$available_plugins = array();
+$recent_plugins = array();
+$recently_activated = (array)get_option('recently_activated');
 
-if (empty($plugins)) {
-	echo '<p>';
-	_e("Couldn&#8217;t open plugins directory or there are no plugins available."); // TODO: make more helpful
-	echo '</p>';
-} else {
-?>
+//Clean out any plugins which were deactivated over a week ago.
+foreach( $recently_activated as $key => $time )
+	if( $time + (7*24*60*60) < time() ) //1 week
+		unset($recently_activated[ $key ]);
+if( $recently_activated != get_option('recently_activated') ) //If array changed, update it.
+	update_option('recently_activated', $recently_activated);
 
-<div class="tablenav">
-	<div class="alignleft">
-	<?php
-	$active = get_option('active_plugins');
-	$inactive = get_option('deactivated_plugins');
-	if ( !empty($active) ) {
-	?>
-	<a class="button-secondary delete" href="<?php echo wp_nonce_url('plugins.php?action=deactivate-all', 'deactivate-all'); ?>"><?php _e('Deactivate All Plugins'); ?></a>
-	<?php
-	} elseif ( empty($active) && !empty($inactive) ) {
-	?>
-	<a class="button-secondary delete" href="<?php echo wp_nonce_url('plugins.php?action=reactivate-all', 'reactivate-all'); ?>"><?php _e('Reactivate Plugins'); ?></a>
-	<?php
-	} // endif active/inactive plugin check
-	?>
-	</div>
-	<br class="clear" />
-</div>
+$all_plugins = get_plugins();
 
-<br class="clear" />
+$plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
+
+foreach( (array)$all_plugins as $plugin_file => $plugin_data) {
 
-<table class="widefat">
+	// Sanitize all displayed data
+	$plugin_data['Title']       = wp_kses($plugin_data['Title'], $plugins_allowedtags);
+	$plugin_data['Version']     = wp_kses($plugin_data['Version'], $plugins_allowedtags);
+	$plugin_data['Description'] = wp_kses($plugin_data['Description'], $plugins_allowedtags);
+	$plugin_data['Author']      = wp_kses($plugin_data['Author'], $plugins_allowedtags);
+	if( ! empty($plugin_data['Author']) )
+		$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.</cite>';
+
+	if ( is_plugin_active($plugin_file) ) {
+		$active_plugins[ $plugin_file ] = $plugin_data;
+	} else {
+		if ( isset( $recently_activated[ $plugin_file ] ) ) //Was the plugin recently activated?
+			$recent_plugins[ $plugin_file ] = $plugin_data;
+		else
+			$available_plugins[ $plugin_file ] = $plugin_data;
+	}
+}
+
+?>
+
+<?php
+function print_plugins_table($plugins, $context = '') {
+?>
+<table class="widefat" id="<?php echo $context ?>-plugins-table">
 	<thead>
 	<tr>
-		<th><?php _e('Plugin'); ?></th>
-		<th class="num"><?php _e('Version'); ?></th>
-		<th><?php _e('Description'); ?></th>
-		<th class="status"><?php _e('Status') ?></th>
-		<th class="action-links"><?php _e('Action'); ?></th>
+		<th scope="col" class="check-column"><input type="checkbox" /></th>
+		<th scope="col"><?php _e('Plugin'); ?></th>
+		<th scope="col" class="num"><?php _e('Version'); ?></th>
+		<th scope="col"><?php _e('Description'); ?></th>
+		<th scope="col" class="action-links"><?php _e('Action'); ?></th>
 	</tr>
 	</thead>
-	<tbody id="plugins">
+	<tbody class="plugins">
 <?php
-	foreach($plugins as $plugin_file => $plugin_data) {
-		$action_links = array();
-		
-		$style = '';
-
-		if ( is_plugin_active($plugin_file) ) {
-			$action_links[] = "<a href='" . wp_nonce_url("plugins.php?action=deactivate&amp;plugin=$plugin_file", 'deactivate-plugin_' . $plugin_file) . "' title='".__('Deactivate this plugin')."' class='delete'>".__('Deactivate')."</a>";
-			$style = 'active';
-		} else {
-			$action_links[] = "<a href='" . wp_nonce_url("plugins.php?action=activate&amp;plugin=$plugin_file", 'activate-plugin_' . $plugin_file) . "' title='".__('Activate this plugin')."' class='edit'>".__('Activate')."</a>";
-		}
 
-		$plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
+	if( empty($plugins) ) {
+		echo '<tr>
+			<td colspan="6">' . __('No plugins to show') . '</td>
+		</tr>';
+	}
+	foreach( (array)$plugins as $plugin_file => $plugin_data) {
+		$action_links = array();
 
-		// Sanitize all displayed data
-		$plugin_data['Title']       = wp_kses($plugin_data['Title'], $plugins_allowedtags);
-		$plugin_data['Version']     = wp_kses($plugin_data['Version'], $plugins_allowedtags);
-		$plugin_data['Description'] = wp_kses($plugin_data['Description'], $plugins_allowedtags);
-		$plugin_data['Author']      = wp_kses($plugin_data['Author'], $plugins_allowedtags);
-		$author = ( empty($plugin_data['Author']) ) ? '' :  ' <cite>' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.</cite>';
+		if( 'active' == $context )
+			$action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '" class="delete">' . __('Deactivate') . '</a>';
+		else //Available or Recently deactivated
+			$action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
 
-		if ( $style != '' )
-			$style = ' class="' . $style . '"';
+		if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
+			$action_links[] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
 
-		$action_links = apply_filters('plugin_action_links', $action_links, $plugin_file, $plugin_info);
+		$action_links = apply_filters('plugin_action_links', $action_links, $plugin_file, $plugin_data, $context);
 
 		echo "
-	<tr$style>
+	<tr class='$context'>
+		<th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . attribute_escape($plugin_file) . "' /></th>
 		<td class='name'>{$plugin_data['Title']}</td>
 		<td class='vers'>{$plugin_data['Version']}</td>
-		<td class='desc'><p>{$plugin_data['Description']}$author</p></td>
-		<td class='status'>";
-		if ( is_plugin_active($plugin_file) )
-			echo  __('<span class="active">Active</span>');
-		else
-			_e('<span class="inactive">Inactive</span>');
-		echo "</td>
-		<td class='togl action-links'>$toggle";  
+		<td class='desc'><p>{$plugin_data['Description']}</p></td>
+		<td class='togl action-links'>";  
 		if ( !empty($action_links) )
 			echo implode(' | ', $action_links);
-		echo "</td> 
-	</tr>";
-	do_action( 'after_plugin_row', $plugin_file );
+		echo '</td> 
+	</tr>';
+		do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context );
 	}
 ?>
 	</tbody>
 </table>
-
-<?php
-}
+<?php 
+} //End print_plugins_table()
 ?>
 
+<h3 id="currently-active"><?php _e('Currently Active Plugins') ?></h3>
+<form method="post" action="<?php echo admin_url('plugins.php') ?>">
+<?php wp_nonce_field('mass-manage-plugins') ?>
+
+<div class="tablenav">
+	<div class="alignleft">
+		<input type="submit" name="deactivate-selected" value="<?php _e('Deactivate') ?>" class="button-secondary" />
+	</div>
+</div>
+<br class="clear" />
+<?php print_plugins_table($active_plugins, 'active') ?>
+</form>
+
+<p><?php printf(__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR); ?></p>
+
+<?php if ( ! empty($recent_plugins) ) : ?>
+<h3 id="recent-plugins"><?php _e('Recently Active Plugins') ?></h3>
+<form method="post" action="<?php echo admin_url('plugins.php') ?>">
+<?php wp_nonce_field('mass-manage-plugins') ?>
+
+<div class="tablenav">
+	<div class="alignleft">
+		<input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" />
+	</div>
+</div>
+<br class="clear" />
+<?php print_plugins_table($recent_plugins, 'recent') ?>
+</form>
+<?php endif; ?>
+
+<h3 id="available-plugins"><?php _e('Available Plugins') ?></h3>
+<form method="post" action="<?php echo admin_url('plugins.php') ?>">
+<?php wp_nonce_field('mass-manage-plugins') ?>
+
+<div class="tablenav">
+	<div class="alignleft">
+		<input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" />
+	</div>
+</div>
+<br class="clear" />
+<?php print_plugins_table($available_plugins, 'available') ?>
+</form>
 <?php if( is_site_admin() ) { ?>
 <p><?php printf(__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), PLUGINDIR); ?></p>
 
 <h2><?php _e('Get More Plugins'); ?></h2>
 <p><?php _e('You can find additional plugins for your site in the <a href="http://wordpress.org/extend/plugins/">WordPress plugin directory</a>.'); ?></p>
-<p><?php printf(__('To install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory. Once a plugin is uploaded, you may activate it here.'), PLUGINDIR); ?></p>
+<p><?php printf(__('To install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory. Once a plugin is uploaded, you may activate it here.'), WP_PLUGIN_DIR); ?></p>
 
 <?php } // is_site_admin() ?>
 </div>