Changeset 14003

Timestamp:

04/05/2010 02:59:10 AM (14 years ago)

Author:

wpmuguru

Message:

more manage_network_* caps, see #12109

Location:

trunk/wp-admin

Files:

• plugins.php (modified) (4 diffs)
• user-edit.php (modified) (4 diffs)

trunk/wp-admin/plugins.php

@@ -40 +40 @@
 if ( !empty($action) ) {
     $network_wide = false;
-    if ( ( isset( $_GET['networkwide'] ) || 'network-activate-selected' == $action ) && is_multisite() && is_super_admin() )
+    if ( ( isset( $_GET['networkwide'] ) || 'network-activate-selected' == $action ) && is_multisite() && current_user_can( 'manage_network_plugins' ) )
         $network_wide = true;
 
@@ -379 +379 @@
 $network_plugins = array();
 $mustuse_plugins = $dropins_plugins = array();
-if ( ! is_multisite() || ( is_multisite() && current_user_can('manage_network_plugins') ) ) {
+if ( ! is_multisite() || current_user_can('manage_network_plugins') ) {
     if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) )
         $mustuse_plugins = get_mu_plugins();
@@ -407 +407 @@
 foreach ( (array) $all_plugins as $plugin_file => $plugin_data) {
     // Filter into individual sections
-    if ( is_plugin_active_for_network($plugin_file) ) {
-        if ( is_super_admin() )
-            $network_plugins[ $plugin_file ] = $plugin_data;
+    if ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
+        unset( $all_plugins[ $plugin_file ] );
+        continue;
+    } elseif ( is_plugin_active_for_network($plugin_file) ) {
+        $network_plugins[ $plugin_file ] = $plugin_data;
     } elseif ( is_plugin_active($plugin_file) ) {
         $active_plugins[ $plugin_file ] = $plugin_data;
@@ -570 +572 @@
                     $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
 
-                if ( is_multisite() && is_super_admin() )
+                if ( is_multisite() && current_user_can( 'manage_network_plugins' ) )
                     $actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
 

trunk/wp-admin/user-edit.php

@@ -59 +59 @@
 
 // Only allow super admins on multisite to edit every user.
-if ( is_multisite() && ! is_super_admin() && $user_id != $current_user->ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) )
+if ( is_multisite() && ! current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) )
     wp_die( __( 'You do not have permission to edit this user.' ) );
 
@@ -122 +122 @@
         delete_user_meta( $user_id, $blog_prefix . 'capabilities' );
 
-    if ( is_multisite() && is_super_admin() && !IS_PROFILE_PAGE )
+    if ( is_multisite() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) )
         empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
 }
@@ -142 +142 @@
 ?>
 
-<?php if ( !IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) ) { ?>
+<?php if ( !IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
     <div class="updated"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super admin privileges.'); ?></p></div>
 <?php } ?>
@@ -236 +236 @@
 ?>
 </select>
-<?php if ( is_multisite() && is_super_admin() ) { ?>
+<?php if ( is_multisite() && current_user_can( 'manage_network_options' ) ) { ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.'); ?></label></p>
 <?php } ?>