Changeset 20525 for trunk/wp-admin/plugins.php

Timestamp:

04/19/2012 03:41:29 AM (14 years ago)

Author:

nacin

Message:

Clean up plugins.php with regards to recently edited files, deactivations, and the network admin. see #20468, #20104.

• Limit recently_activated to the site dashboard, and properly remove bulk-activated plugins from the array.
• Remove code used from before the network admin, such as the unused 'network' plugin_status.
• Don't try to deactivate a plugin already deactivated.
• Use more specific caps (manage_network_plugins) rather than is_super_admin().

File:

• trunk/wp-admin/plugins.php (modified) (11 diffs)

trunk/wp-admin/plugins.php

@@ -13 +13 @@
         $menu_perms = get_site_option( 'menu_items', array() );
 
-        if ( empty( $menu_perms['plugins'] ) && ! is_super_admin() )
+        if ( empty( $menu_perms['plugins'] ) && ! current_user_can( 'manage_network_plugins' ) )
                 wp_die( __( 'Cheatin’ uh?' ) );
 }
@@ -32 +32 @@
 
 if ( $action ) {
-        $network_wide = false;
-        if ( ( isset( $_GET['networkwide'] ) || 'network-activate-selected' == $action ) && is_multisite() && current_user_can( 'manage_network_plugins' ) )
-                $network_wide = true;
 
         switch ( $action ) {
@@ -43 +40 @@
                         check_admin_referer('activate-plugin_' . $plugin);
 
-                        $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), $network_wide);
+                        $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), is_network_admin() );
                         if ( is_wp_error( $result ) ) {
                                 if ( 'unexpected_output' == $result->get_error_code() ) {
@@ -54 +51 @@
                         }
 
-                        $recent = (array)get_option('recently_activated');
-                        if ( isset($recent[ $plugin ]) ) {
-                                unset($recent[ $plugin ]);
-                                update_option('recently_activated', $recent);
-                        }
+                        if ( ! is_network_admin() ) {
+                                $recent = (array) get_option( 'recently_activated' );
+                                unset( $recent[ $plugin ] );
+                                update_option( 'recently_activated', $recent );
+                        }
+
                         if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
                                 wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
@@ -67 +65 @@
                         break;
                 case 'activate-selected':
-                case 'network-activate-selected':
                         if ( ! current_user_can('activate_plugins') )
                                 wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
@@ -76 +73 @@
 
                         // Only activate plugins which are not already active.
-                        $check = $network_wide ? 'is_plugin_active_for_network' : 'is_plugin_active';
+                        $check = is_network_admin() ? 'is_plugin_active_for_network' : 'is_plugin_active';
                         foreach ( $plugins as $i => $plugin )
                                 if ( $check( $plugin ) )
@@ -86 +83 @@
                         }
 
-                        activate_plugins($plugins, self_admin_url('plugins.php?error=true'), $network_wide);
-
-                        $recent = (array)get_option('recently_activated');
-                        foreach ( $plugins as $plugin => $time)
-                                if ( isset($recent[ $plugin ]) )
-                                        unset($recent[ $plugin ]);
-
-                        update_option('recently_activated', $recent);
+                        activate_plugins($plugins, self_admin_url('plugins.php?error=true'), is_network_admin() );
+
+                        if ( ! is_network_admin() ) {
+                                $recent = (array) get_option('recently_activated' );
+                                foreach ( $plugins as $plugin )
+                                        unset( $recent[ $plugin ] );
+                                update_option( 'recently_activated', $recent );
+                        }
 
                         wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
@@ -154 +151 @@
 
                         check_admin_referer('deactivate-plugin_' . $plugin);
-                        deactivate_plugins($plugin);
-                        update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
+
+                        if ( ! is_network_admin() && is_plugin_active_for_network() ) {
+                                wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+                                exit;
+                        }
+
+                        deactivate_plugins( $plugin, false, is_network_admin() );
+                        if ( ! is_network_admin() )
+                                update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) );
                         if ( headers_sent() )
                                 echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
@@ -169 +173 @@
 
                         $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
-                        $plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated.
+                        // Do not deactivate plugins which are already deactivated.
+                        if ( is_network_admin() ) {
+                                $plugins = array_filter( $plugins, 'is_plugin_active_for_network' );
+                        } else {
+                                $plugins = array_filter( $plugins, 'is_plugin_active' );
+                                $plugins = array_diff( $plugins, array_filter( $plugins, 'is_plugin_active_for_network' ) );
+                        }
                         if ( empty($plugins) ) {
                                 wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
@@ -175 +185 @@
                         }
 
-                        deactivate_plugins($plugins);
-
-                        $deactivated = array();
-                        foreach ( $plugins as $plugin )
-                                $deactivated[ $plugin ] = time();
-
-                        update_option('recently_activated', $deactivated + (array)get_option('recently_activated'));
+                        deactivate_plugins( $plugins, false, is_network_admin() );
+
+                        if ( ! is_network_admin() ) {
+                                $deactivated = array();
+                                foreach ( $plugins as $plugin )
+                                        $deactivated[ $plugin ] = time();
+                                update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) );
+                        }
+
                         wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
                         exit;
@@ -306 +318 @@
                         break;
                 case 'clear-recent-list':
-                        update_option('recently_activated', array());
+                        if ( ! is_network_admin() )
+                                update_option( 'recently_activated', array() );
                         break;
         }