Changeset 8049

Timestamp:

06/04/08 18:09:31 (6 months ago)

Author:

ryan

Message:

Bulk delete/activate/deactivate for plugins. Split plugins into active and available lists. Props DD32. see #7091

Files:

• trunk/wp-admin/css/colors-classic.css (modified) (2 diffs)
• trunk/wp-admin/css/colors-fresh.css (modified) (2 diffs)
• trunk/wp-admin/includes/plugin.php (modified) (1 diff)
• trunk/wp-admin/includes/update.php (modified) (3 diffs)
• trunk/wp-admin/menu-header.php (modified) (1 diff)
• trunk/wp-admin/plugins.php (modified) (3 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)

trunk/wp-admin/css/colors-classic.css

@@ -416 +416 @@
-}
-
-#
+.
-    background-color: #BBEEBB;
-}
-
-#
+.
-    border-right-color: #ccc;
-}
@@ -428 +428 @@
-}
-
-#
+.
-    background-color: #fff;
-}

trunk/wp-admin/css/colors-fresh.css

@@ -385 +385 @@
-}
-
-#
+.
-    background-color: #e7f7d3;
-}
-
-#
+.
-    border-right-color: #ccc;
-}
@@ -397 +397 @@
-}
-
-#
+.
-    background-color: #fff;
-}

trunk/wp-admin/includes/plugin.php

@@ -133 +133 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    $errors = array();
-    foreach ( (array) $plugins as $plugin ) {
-
+
+
+
-        if ( is_wp_error($result) )
-            $errors[$plugin] = $result;
-    }
-
-    delete_option('deactivated_plugins');
-
-    if ( !empty($errors) )
-        return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
-
+    return true;
+}
+
+function delete_plugins($plugins, $redirect = '' ) {
+    global $wp_filesystem;
+
+    if( empty($plugins) )
+        return false;
+
+    $checked = array();
+    foreach( $plugins as $plugin )
+        $checked[] = 'checked[]=' . $plugin;
+
+    ob_start();
+    $url = wp_nonce_url('plugins.php?action=delete-selected&' . implode('&', $checked), 'mass-manage-plugins');
+    if ( false === ($credentials = request_filesystem_credentials($url)) ) {
+        $data = ob_get_contents();
+        ob_end_clean();
+        if( ! empty($data) ){
+            include_once( ABSPATH . 'wp-admin/admin-header.php');
+            echo $data;
+            include( ABSPATH . 'wp-admin/admin-footer.php');
+            exit;
+        }
+        return;
+    }
+
+    if ( ! WP_Filesystem($credentials) ) {
+        request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
+        $data = ob_get_contents();
+        ob_end_clean();
+        if( ! empty($data) ){
+            include_once( ABSPATH . 'wp-admin/admin-header.php');
+            echo $data;
+            include( ABSPATH . 'wp-admin/admin-footer.php');
+            exit;
+        }
+        return;
+    }
+
+    if ( $wp_filesystem->errors->get_error_code() ) {
+        return $wp_filesystem->errors;
+    }
+
+    if ( ! is_object($wp_filesystem) )
+        return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+
+    if ( $wp_filesystem->errors->get_error_code() )
+        return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
+
+    //Get the base plugin folder
+    $plugins_dir = $wp_filesystem->wp_plugins_dir();
+    if ( empty($plugins_dir) )
+        return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
+    
+    $plugins_dir = trailingslashit( $plugins_dir );
+
+    $errors = array();
+
+    foreach( $plugins as $plugin_file ) {
+        $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) );
+        // If plugin is in its own directory, recursively delete the directory.
+        if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
+            $deleted = $wp_filesystem->delete($this_plugin_dir, true);
+        else
+            $deleted = $wp_filesystem->delete($plugins_dir . $plugin_file);
+    
+        if ( ! $deleted )
+            $errors[] = $plugin_file;
+    }
+    
+    if( ! empty($errors) )
+        return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s'), implode(', ', $errors)) );
+    
-    return true;
-}

trunk/wp-admin/includes/update.php

@@ -119 +119 @@
-add_action( 'load-plugins.php', 'wp_update_plugins' );
-
-
-
+
-    $current = get_option( 'update_plugins' );
-    if ( !isset( $current->response[ $file ] ) )
@@ -127 +126 @@
-    $r = $current->response[ $file ];
-
-"<tr><td colspan='5' class='plugin-update'>"
+'<tr><td colspan="5" class="plugin-update">'
-    if ( !current_user_can('edit_plugins') )
-        printf( __('There is a new version of %1$s available. <a href="%2$s">Download version %3$s here</a>.'), $plugin_data['Name'], $r->url, $r->new_version);
@@ -133 +132 @@
-        printf( __('There is a new version of %1$s available. <a href="%2$s">Download version %3$s here</a> <em>automatic upgrade unavailable for this plugin</em>.'), $plugin_data['Name'], $r->url, $r->new_version);
-    else
-"update.php?action=upgrade-plugin&amp;plugin=$file"
-
-"</td></tr>"
-
-
+'update.php?action=upgrade-plugin&amp;plugin=' . $file
+
+'</td></tr>'
+
+, 10, 2
-
-function wp_update_plugin($plugin, $feedback = '') {

trunk/wp-admin/menu-header.php

@@ -2 +2 @@
-$self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
-$self = preg_replace('|^.*/plugins/|i', '', $self);
+
+global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
-
-get_admin_page_parent();

trunk/wp-admin/plugins.php

@@ -2 +2 @@
-require_once('admin.php');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
+
+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':
+            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);
+            
+            //HACK TIME!
+            // Proper way needed, perhaps get_plugins() to convert to wp_cache_get() any reason why it hasnt allready?
+            // This clears the cached plugin list
+            global $wp_plugins;
+            $wp_plugins = null;
+            
+            
+                
+            //TODO: Implement!.. STAT!
+            break;
+        default:
+            var_dump("Unknown Action $action");
+    }
+}
+
+wp_enqueue_script('admin-forms');
-
-$title = __('Manage Plugins');
@@ -47 +109 @@
-    <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) ) { ?>
-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']
+echo admin_url('plugins.php?action=error_scrape&amp;plugin=' . attribute_escape($plugin) . '&amp;_wpnonce=' . attribute_escape($_GET['_error_nonce'])
-    <?php
-        }
-    ?>
-    </div>
-
-
+
+
+
+
+
+
-<?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 endif; ?>
-
@@ -71 +136 @@
-<?php
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-<div class="tablenav">
-    <div class="alignleft">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-<br class="clear" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-<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" />
+<?php if( current_user_can('edit_plugins') ) : ?>
+        <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" />
+<?php endif; ?>
+    </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" />
+<?php if( current_user_can('edit_plugins') ) : ?>
+        <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" />
+<?php endif; ?>
+    </div>
+</div>
+<br class="clear" />
+<?php print_plugins_table($available_plugins, 'available') ?>
+</form>
-
-<h2><?php _e('Get More Plugins'); ?></h2>

trunk/wp-admin/wp-admin.css

@@ -1 @@
-#
+.
-    font-weight: bold;
-}
-
-#
+.
-    margin: 0 4px;
-    padding: 0;
-}
-
-#
+.
-    width: 150px;
-    border-right-width: 1px;