Changeset 13301

Timestamp:

02/22/2010 06:41:38 PM (17 years ago)

Author:

wpmuguru

Message:

multisite UX, see #11644, add manage_ caps for super_admin, fixes #11803

Location:

trunk/wp-admin

Files:

• includes/ms.php (modified) (1 diff)
• menu.php (modified) (1 diff)
• ms-admin.php (modified) (1 diff)
• ms-edit.php (modified) (15 diffs)
• ms-options.php (modified) (1 diff)
• ms-sites.php (modified) (1 diff)
• ms-themes.php (modified) (1 diff)
• ms-upgrade-network.php (moved) (moved from trunk/wp-admin/ms-upgrade-site.php ) (3 diffs, 1 prop)
• ms-users.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -653 +653 @@
         printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a site administrator.") . "</div>", $current_user->user_login);
         if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
-                echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="ms-upgrade-site.php">Upgrade Site</a> page to update all your blogs.' ) . "</div>";
+                echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="ms-upgrade-network.php">Upgrade Network</a> page to update all your blogs.' ) . "</div>";
         }
 }

trunk/wp-admin/menu.php

@@ -28 +28 @@
 if ( is_multisite() && is_super_admin() ) {
         /* translators: Network menu item */
-        $menu[0] = array(__('Network'), 'super_admin', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
-        $submenu[ 'ms-admin.php' ][1] = array( __('Admin'), 'super_admin', 'ms-admin.php' );
+        $menu[0] = array(__('Network'), 'manage_network', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
+        $submenu[ 'ms-admin.php' ][1] = array( __('Admin'), 'manage_network', 'ms-admin.php' );
         /* translators: Sites menu item */
-        $submenu[ 'ms-admin.php' ][5] = array( __('Sites'), 'super_admin', 'ms-sites.php' );
-        $submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'super_admin', 'ms-users.php' );
-        $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'super_admin', 'ms-themes.php' );
-        $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'super_admin', 'ms-options.php' );
-        $submenu[ 'ms-admin.php' ][30] = array( __('Upgrade'), 'super_admin', 'ms-upgrade-site.php' );
+        $submenu[ 'ms-admin.php' ][5] = array( __('Sites'), 'manage_sites', 'ms-sites.php' );
+        $submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'manage_network_users', 'ms-users.php' );
+        $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'manage_network_themes', 'ms-themes.php' );
+        $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'manage_network_options', 'ms-options.php' );
+        $submenu[ 'ms-admin.php' ][30] = array( __('Upgrade'), 'manage_network', 'ms-upgrade-network.php' );
 
         $menu[1] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );

trunk/wp-admin/ms-admin.php

@@ -15 +15 @@
 require_once('admin-header.php');
 
-if ( !is_super_admin() )
+if ( ! current_user_can( 'manage_network' ) )
         wp_die( __('You do not have permission to access this page.') );
 

trunk/wp-admin/ms-edit.php

@@ -4 +4 @@
 if ( !is_multisite() )
         wp_die( __('Multisite support is not enabled.') );
-
-if ( !is_super_admin() )
-        wp_die( __('You do not have permission to access this page.') );
 
 do_action('wpmuadminedit', '');
@@ -21 +18 @@
         case "siteoptions":
                 check_admin_referer('siteoptions');
+                if ( ! current_user_can( 'manage_network_options' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 if ( empty( $_POST ) )
                         wp_die( __("You probably need to go back to the <a href='ms-options.php'>options page</a>") );
@@ -138 +138 @@
                 check_admin_referer('add-blog');
 
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 if ( is_array( $_POST[ 'blog' ] ) == false )
                         wp_die( "Can't create an empty blog." );
@@ -188 +191 @@
         case "updateblog":
                 check_admin_referer('editblog');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 if ( empty( $_POST ) )
                         wp_die( __('You probably need to go back to the <a href="ms-sites.php">sites page</a>') );
@@ -289 +295 @@
         case "deleteblog":
                 check_admin_referer('deleteblog');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 if ( $id != '0' && $id != $current_site->blog_id )
                         wpmu_delete_blog( $id, true );
@@ -298 +307 @@
         case "allblogs":
                 check_admin_referer('allblogs');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 foreach ( (array) $_POST[ 'allblogs' ] as $key => $val ) {
                         if ( $val != '0' && $val != $current_site->blog_id ) {
@@ -321 +333 @@
         case "archiveblog":
                 check_admin_referer('archiveblog');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 update_blog_status( $id, "archived", '1' );
                 do_action( "archive_blog", $id );
@@ -329 +344 @@
         case "unarchiveblog":
                 check_admin_referer('unarchiveblog');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 do_action( "unarchive_blog", $id );
                 update_blog_status( $id, "archived", '0' );
@@ -337 +355 @@
         case "activateblog":
                 check_admin_referer('activateblog');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 update_blog_status( $id, "deleted", '0' );
                 do_action( "activate_blog", $id );
@@ -345 +366 @@
         case "deactivateblog":
                 check_admin_referer('deactivateblog');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 do_action( "deactivate_blog", $id );
                 update_blog_status( $id, "deleted", '1' );
@@ -353 +377 @@
         case "unspamblog":
                 check_admin_referer('unspamblog');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 update_blog_status( $id, "spam", '0' );
                 wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'unspam'), $_POST['ref'] ) );
@@ -360 +387 @@
         case "spamblog":
                 check_admin_referer('spamblog');
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 update_blog_status( $id, "spam", '1' );
                 wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'spam'), $_POST['ref'] ) );
@@ -382 +412 @@
         // Themes
     case "updatethemes":
+        if ( ! current_user_can( 'manage_network_themes' ) )
+                wp_die( __('You do not have permission to access this page.') );
+
         if ( is_array( $_POST['theme'] ) ) {
                         $themes = get_themes();
@@ -439 +472 @@
         case "allusers":
                 check_admin_referer('allusers');
+                if ( ! current_user_can( 'manage_network_users' ) )
+                        wp_die( __('You do not have permission to access this page.') );
+
                 if ( isset($_POST['alluser_delete']) ) {
                         require_once('admin-header.php');
@@ -488 +524 @@
         case "adduser":
                 check_admin_referer('add-user');
+                if ( ! current_user_can( 'manage_network_users' ) )
+                        wp_die( __('You do not have permission to access this page.') );
 
                 if ( is_array( $_POST[ 'user' ] ) == false )

trunk/wp-admin/ms-options.php

@@ -10 +10 @@
 include('admin-header.php');
 
-if ( !is_super_admin() )
+if ( ! current_user_can( 'manage_network_options' ) )
     wp_die( __('You do not have permission to access this page.') );
 

trunk/wp-admin/ms-sites.php

@@ -12 +12 @@
 require_once('admin-header.php');
 
-if ( !is_super_admin() )
+if ( ! current_user_can( 'manage_sites' ) )
         wp_die( __('You do not have permission to access this page.') );
 

trunk/wp-admin/ms-themes.php

@@ -6 +6 @@
 require_once('admin-header.php');
 
-if ( !is_super_admin() )
+if ( ! current_user_can( 'manage_network_themes' ) )
         wp_die( __('You do not have permission to access this page.') );
 

trunk/wp-admin/ms-upgrade-network.php

@@ -7 +7 @@
 require_once( ABSPATH . WPINC . '/http.php' );
 
-$title = __('Upgrade Site');
+$title = __('Upgrade Network');
 $parent_file = 'ms-admin.php';
 require_once('admin-header.php');
 
-if ( !is_super_admin() )
+if ( ! current_user_can( 'manage_network' ) )
         wp_die( __('You do not have permission to access this page.') );
 
 echo '<div class="wrap">';
 screen_icon();
-echo '<h2>'.__('Upgrade Site').'</h2>';
+echo '<h2>'.__('Upgrade Network').'</h2>';
 
 $action = isset($_GET['action']) ? $_GET['action'] : 'show';
@@ -44 +44 @@
                         }
                         echo "</ul>";
-                        ?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="ms-upgrade-site.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Blogs"); ?></a></p>
+                        ?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
                         <script type='text/javascript'>
                         <!--
                         function nextpage() {
-                                location.href = "ms-upgrade-site.php?action=upgrade&n=<?php echo ($n + 5) ?>";
+                                location.href = "ms-upgrade-network.php?action=upgrade&n=<?php echo ($n + 5) ?>";
                         }
                         setTimeout( "nextpage()", 250 );
@@ -59 +59 @@
         case 'show':
         default:
-                ?><p><?php _e("You can upgrade all the blogs on your site through this page. It works by calling the upgrade script of each blog automatically. Hit the link below to upgrade."); ?></p>
-                <p><a class="button" href="ms-upgrade-site.php?action=upgrade"><?php _e("Upgrade Site"); ?></a></p><?php
+                ?><p><?php _e("You can upgrade all the sites on your network through this page. It works by calling the upgrade script of each site automatically. Hit the link below to upgrade."); ?></p>
+                <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Upgrade Network"); ?></a></p><?php
                 do_action( 'wpmu_upgrade_page' );
         break;

trunk/wp-admin/ms-users.php

@@ -12 +12 @@
 require_once('admin-header.php');
 
-if ( !is_super_admin() )
+if ( ! current_user_can( 'manage_network_users' ) )
         wp_die( __('You do not have permission to access this page.') );