From 12de05107e4c8b006bde6ee8916f34eb476d08da Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 13 Jun 2008 17:21:00 +0000 Subject: WP Merge with revision 8075 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/plugins.php | 318 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 209 insertions(+), 109 deletions(-) (limited to 'wp-admin/plugins.php') 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();

fatal error.') ?>

- +
- -

fatal error.') ?>

+ +

get_error_message() ); ?>

+ +

deleted.'); ?>

+

activated.') ?>

+ +

activated.'); ?>

deactivated.') ?>

- -

deactivated.'); ?>

- -

reactivated.'); ?>

+ +

deactivated.'); ?>

@@ -77,106 +137,146 @@ validate_active_plugins();

'; - _e("Couldn’t open plugins directory or there are no plugins available."); // TODO: make more helpful - echo '

'; -} 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); -
-
- - - - - -
-
-
+$all_plugins = get_plugins(); -
+$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) { - + // 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'] .= ' ' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.'; + + 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; + } +} + +?> + + +
- - - - - + + + + + - + $plugin_data) { - $action_links = array(); - - $style = ''; - - if ( is_plugin_active($plugin_file) ) { - $action_links[] = "".__('Deactivate').""; - $style = 'active'; - } else { - $action_links[] = "".__('Activate').""; - } - $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 ' + + '; + } + 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']) ) ? '' : ' ' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.'; + if( 'active' == $context ) + $action_links[] = '' . __('Deactivate') . ''; + else //Available or Recently deactivated + $action_links[] = '' . __('Activate') . ''; - if ( $style != '' ) - $style = ' class="' . $style . '"'; + if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) ) + $action_links[] = '' . __('Edit') . ''; - $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 " - + + - - - + - "; - do_action( 'after_plugin_row', $plugin_file ); + echo ' + '; + do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context ); } ?>
' . __('No plugins to show') . '
{$plugin_data['Title']} {$plugin_data['Version']}

{$plugin_data['Description']}$author

"; - if ( is_plugin_active($plugin_file) ) - echo __('Active'); - else - _e('Inactive'); - echo "$toggle"; +

{$plugin_data['Description']}

"; if ( !empty($action_links) ) echo implode(' | ', $action_links); - echo "
- - +

+
+ + +
+
+ +
+
+
+ +
+ +

%s directory and it will be automatically deactivated.'), WP_PLUGIN_DIR); ?>

+ + +

+
+ + +
+
+ +
+
+
+ +
+ + +

+
+ + +
+
+ +
+
+
+ +

%s directory and it will be automatically deactivated.'), PLUGINDIR); ?>

WordPress plugin directory.'); ?>

-

%s directory. Once a plugin is uploaded, you may activate it here.'), PLUGINDIR); ?>

+

%s directory. Once a plugin is uploaded, you may activate it here.'), WP_PLUGIN_DIR); ?>

-- cgit