Permalink
Browse files

Network Admin, first pass. see #14435

git-svn-id: http://svn.automattic.com/wordpress/trunk@15481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
ryan
ryan committed Jul 30, 2010
1 parent 2f90a8c commit 21e3f0f7fadcee787c027761ce4dc1e376bdae25
View
@@ -11,9 +11,20 @@
require_once( './admin.php' );
get_admin_page_title();
+
$title = esc_html( strip_tags( $title ) );
+
wp_user_settings();
wp_menu_unfold();
+
+// Save the ID of the last blog admin area visited if super admin.
+if ( is_multisite() && !is_network_admin() && is_super_admin() ) {
+ $last_blog = get_user_option('last-blog-admin-visited');
+ if ( $last_blog != $blog_id )
+ update_user_option(get_current_user_id(), 'last-blog-admin-visited', $blog_id, true);
+ unset($last_blog);
+}
+
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
@@ -86,7 +97,11 @@
<div id="wpcontent">
<div id="wphead">
<?php
-$blog_name = get_bloginfo('name', 'display');
+
+if ( is_network_admin() )
+ $blog_name = esc_html($current_site->site_name);
+else
+ $blog_name = get_bloginfo('name', 'display');
if ( '' == $blog_name ) {
$blog_name = '&nbsp;';
} else {
@@ -111,7 +126,7 @@
<a href="<?php echo trailingslashit( get_bloginfo( 'url' ) ); ?>" title="<?php esc_attr_e('Visit Site') ?>">
<span id="site-title"><?php echo $blog_name ?></span>
</a>
-<?php if ( current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
+<?php if ( !is_network_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
<a id="privacy-on-link" href="options-privacy.php" title="<?php echo esc_attr( apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') ) ); ?>"><?php echo apply_filters('privacy_on_link_text', __('Search Engines Blocked') ); ?></a>
<?php endif; ?>
</h1>
@@ -123,7 +138,13 @@
<p><?php
$links = array();
$links[5] = sprintf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity);
-$links[15] = '| <a href="' . wp_logout_url() . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a>';
+if ( is_multisite() && is_super_admin() ) {
+ if ( !is_network_admin() )
+ $links[10] = '| <a href="' . network_admin_url() . '" title="' . esc_attr__('Network Admin') . '">' . __('Network Admin') . '</a>';
+ elseif ($last_blog = get_user_option('last-blog-admin-visited') )
+ $links[10] = '| <a href="' . get_admin_url($last_blog) . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
+}
+$links[15] = '| <a href="' . wp_logout_url() . '" title="' . esc_attr__('Log Out') . '">' . __('Log Out') . '</a>';
$links = apply_filters('admin_user_info_links', $links, $current_user);
ksort($links);
@@ -132,7 +153,7 @@
?></p>
</div>
-<?php favorite_actions($current_screen); ?>
+<?php !is_network_admin() ? favorite_actions($current_screen) : ''; ?>
</div>
</div>
View
@@ -14,6 +14,9 @@
if ( !defined('WP_ADMIN') )
define('WP_ADMIN', TRUE);
+if ( !defined('WP_NETWORK_ADMIN') )
+ define('WP_NETWORK_ADMIN', FALSE);
+
if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
define('WP_LOAD_IMPORTERS', true);
@@ -90,7 +93,10 @@
else
$taxnow = '';
-require(ABSPATH . 'wp-admin/menu.php');
+if ( WP_NETWORK_ADMIN )
+ require(ABSPATH . 'wp-admin/network/menu.php');
+else
+ require(ABSPATH . 'wp-admin/menu.php');
if ( current_user_can( 'manage_options' ) )
@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', '256M' ) );
View
@@ -0,0 +1,211 @@
+<?php
+
+/**
+ * Build Administration Menu.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+if ( is_network_admin() )
+ do_action('_network_admin_menu');
+else
+ do_action('_admin_menu');
+
+// Create list of page plugin hook names.
+foreach ($menu as $menu_page) {
+ if ( false !== $pos = strpos($menu_page[2], '?') ) {
+ // Handle post_type=post|page|foo pages.
+ $hook_name = substr($menu_page[2], 0, $pos);
+ $hook_args = substr($menu_page[2], $pos + 1);
+ wp_parse_str($hook_args, $hook_args);
+ // Set the hook name to be the post type.
+ if ( isset($hook_args['post_type']) )
+ $hook_name = $hook_args['post_type'];
+ else
+ $hook_name = basename($hook_name, '.php');
+ unset($hook_args);
+ } else {
+ $hook_name = basename($menu_page[2], '.php');
+ }
+ $hook_name = sanitize_title($hook_name);
+
+ if ( isset($compat[$hook_name]) )
+ $hook_name = $compat[$hook_name];
+ elseif ( !$hook_name )
+ continue;
+
+ $admin_page_hooks[$menu_page[2]] = $hook_name;
+}
+unset($menu_page, $compat);
+
+$_wp_submenu_nopriv = array();
+$_wp_menu_nopriv = array();
+// Loop over submenus and remove pages for which the user does not have privs.
+foreach ( array( 'submenu' ) as $sub_loop ) {
+ foreach ($$sub_loop as $parent => $sub) {
+ foreach ($sub as $index => $data) {
+ if ( ! current_user_can($data[1]) ) {
+ unset(${$sub_loop}[$parent][$index]);
+ $_wp_submenu_nopriv[$parent][$data[2]] = true;
+ }
+ }
+ unset($index, $data);
+
+ if ( empty(${$sub_loop}[$parent]) )
+ unset(${$sub_loop}[$parent]);
+ }
+ unset($sub, $parent);
+}
+unset($sub_loop);
+
+// Loop over the top-level menu.
+// Menus for which the original parent is not accessible due to lack of privs will have the next
+// submenu in line be assigned as the new menu parent.
+foreach ( $menu as $id => $data ) {
+ if ( empty($submenu[$data[2]]) )
+ continue;
+ $subs = $submenu[$data[2]];
+ $first_sub = array_shift($subs);
+ $old_parent = $data[2];
+ $new_parent = $first_sub[2];
+ // If the first submenu is not the same as the assigned parent,
+ // make the first submenu the new parent.
+ if ( $new_parent != $old_parent ) {
+ $_wp_real_parent_file[$old_parent] = $new_parent;
+ $menu[$id][2] = $new_parent;
+
+ foreach ($submenu[$old_parent] as $index => $data) {
+ $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
+ unset($submenu[$old_parent][$index]);
+ }
+ unset($submenu[$old_parent], $index);
+
+ if ( isset($_wp_submenu_nopriv[$old_parent]) )
+ $_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+ }
+}
+unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
+
+if ( is_network_admin() )
+ do_action('network_admin_menu', '');
+else
+ do_action('admin_menu', '');
+
+// Remove menus that have no accessible submenus and require privs that the user does not have.
+// Run re-parent loop again.
+foreach ( $menu as $id => $data ) {
+ if ( ! current_user_can($data[1]) )
+ $_wp_menu_nopriv[$data[2]] = true;
+
+ // If submenu is empty...
+ if ( empty($submenu[$data[2]]) ) {
+ // And user doesn't have privs, remove menu.
+ if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
+ unset($menu[$id]);
+ }
+ }
+}
+unset($id, $data);
+
+// Remove any duplicated seperators
+$seperator_found = false;
+foreach ( $menu as $id => $data ) {
+ if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) {
+ if (false == $seperator_found) {
+ $seperator_found = true;
+ } else {
+ unset($menu[$id]);
+ $seperator_found = false;
+ }
+ } else {
+ $seperator_found = false;
+ }
+}
+unset($id, $data);
+
+function add_cssclass($add, $class) {
+ $class = empty($class) ? $add : $class .= ' ' . $add;
+ return $class;
+}
+
+function add_menu_classes($menu) {
+
+ $first = $lastorder = false;
+ $i = 0;
+ $mc = count($menu);
+ foreach ( $menu as $order => $top ) {
+ $i++;
+
+ if ( 0 == $order ) { // dashboard is always shown/single
+ $menu[0][4] = add_cssclass('menu-top-first', $top[4]);
+ $lastorder = 0;
+ continue;
+ }
+
+ if ( 0 === strpos($top[2], 'separator') ) { // if separator
+ $first = true;
+ $c = $menu[$lastorder][4];
+ $menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
+ continue;
+ }
+
+ if ( $first ) {
+ $c = $menu[$order][4];
+ $menu[$order][4] = add_cssclass('menu-top-first', $c);
+ $first = false;
+ }
+
+ if ( $mc == $i ) { // last item
+ $c = $menu[$order][4];
+ $menu[$order][4] = add_cssclass('menu-top-last', $c);
+ }
+
+ $lastorder = $order;
+ }
+
+ return apply_filters( 'add_menu_classes', $menu );
+}
+
+uksort($menu, "strnatcasecmp"); // make it all pretty
+
+if ( apply_filters('custom_menu_order', false) ) {
+ $menu_order = array();
+ foreach ( $menu as $menu_item ) {
+ $menu_order[] = $menu_item[2];
+ }
+ unset($menu_item);
+ $default_menu_order = $menu_order;
+ $menu_order = apply_filters('menu_order', $menu_order);
+ $menu_order = array_flip($menu_order);
+ $default_menu_order = array_flip($default_menu_order);
+
+ function sort_menu($a, $b) {
+ global $menu_order, $default_menu_order;
+ $a = $a[2];
+ $b = $b[2];
+ if ( isset($menu_order[$a]) && !isset($menu_order[$b]) ) {
+ return -1;
+ } elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+ return 1;
+ } elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+ if ( $menu_order[$a] == $menu_order[$b] )
+ return 0;
+ return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
+ } else {
+ return ($default_menu_order[$a] <= $default_menu_order[$b]) ? -1 : 1;
+ }
+ }
+
+ usort($menu, 'sort_menu');
+ unset($menu_order, $default_menu_order);
+}
+
+$menu = add_menu_classes($menu);
+
+if ( !user_can_access_admin_page() ) {
+ do_action('admin_page_access_denied');
+ wp_die( __('You do not have sufficient permissions to access this page.') );
+}
+
+?>
Oops, something went wrong.

0 comments on commit 21e3f0f

Please sign in to comment.