X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..0b8a53f298029318648c37e477703e903dfcb82b:/wp-admin/admin-header.php

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 81711f38..ac793409 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -7,47 +7,69 @@
  */
 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if (!isset($_GET["page"])) require_once('admin.php');
+if ( ! defined( 'WP_ADMIN' ) )
+	require_once( './admin.php' );
 
 get_admin_page_title();
 $title = esc_html( strip_tags( $title ) );
+
+if ( is_network_admin() )
+	$admin_title = __( 'Network Admin' );
+elseif ( is_user_admin() )
+	$admin_title = __( 'Global Dashboard' );
+else
+	$admin_title = get_bloginfo( 'name' );
+
+if ( $admin_title == $title )
+	$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
+else
+	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
+
+$admin_title = apply_filters( 'admin_title', $admin_title, $title );
+
 wp_user_settings();
 wp_menu_unfold();
+
 ?>
 <!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(); ?>>
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php echo $title; ?> &lsaquo; <?php bloginfo('name') ?>  &#8212; WordPress</title>
+<title><?php echo $admin_title; ?></title>
 <?php
 
-wp_admin_css( 'css/global' );
+wp_admin_css( 'global' );
 wp_admin_css();
-wp_admin_css( 'css/colors' );
-wp_admin_css( 'css/ie' );
+wp_admin_css( 'colors' );
+wp_admin_css( 'ie' );
+if ( is_multisite() )
+	wp_admin_css( 'ms' );
 wp_enqueue_script('utils');
 
-$hook_suffix = '';
-if ( isset($page_hook) )
-	$hook_suffix = "$page_hook";
-else if ( isset($plugin_page) )
-	$hook_suffix = "$plugin_page";
-else if ( isset($pagenow) )
-	$hook_suffix = "$pagenow";
-
 $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 <script type="text/javascript">
 //<![CDATA[
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time() ?>'};
-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = '<?php echo substr($pagenow, 0, -4); ?>', adminpage = '<?php echo $admin_body_class; ?>',  thousandsSeparator = '<?php echo $wp_locale->number_format['thousands_sep']; ?>', decimalPoint = '<?php echo $wp_locale->number_format['decimal_point']; ?>';
+var userSettings = {
+		'url': '<?php echo SITECOOKIEPATH; ?>',
+		'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
+		'time':'<?php echo time() ?>'
+	},
+	ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
+	pagenow = '<?php echo $current_screen->id; ?>',
+	typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
+	adminpage = '<?php echo $admin_body_class; ?>',
+	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+	isRtl = <?php echo (int) is_rtl(); ?>;
 //]]>
 </script>
 <?php
 
-if ( in_array( $pagenow, array('post.php', 'post-new.php', 'page.php', 'page-new.php') ) ) {
+if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
 	add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
+	add_action( 'admin_print_footer_scripts', 'wp_tiny_mce_preload_dialogs', 30 );
 	wp_enqueue_script('quicktags');
 }
 
@@ -59,9 +81,11 @@ do_action('admin_print_scripts');
 do_action("admin_head-$hook_suffix");
 do_action('admin_head');
 
-if ( get_user_setting('mfold') == 'f' ) {
+if ( get_user_setting('mfold') == 'f' )
 	$admin_body_class .= ' folded';
-}
+
+if ( is_admin_bar_showing() )
+	$admin_body_class .= ' admin-bar';
 
 if ( $is_iphone ) { ?>
 <style type="text/css">.row-actions{visibility:visible;}</style>
@@ -82,14 +106,21 @@ document.body.className = c;
 <div id="wpcontent">
 <div id="wphead">
 <?php
-$blog_name = get_bloginfo('name', 'display');
+
+if ( is_network_admin() )
+	$blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
+elseif ( is_user_admin() )
+	$blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
+else
+	$blog_name = get_bloginfo('name', 'display');
 if ( '' == $blog_name ) {
-	$blog_name = '&nbsp;';
+	$blog_name = __( 'Visit Site' );
 } else {
 	$blog_name_excerpt = wp_html_excerpt($blog_name, 40);
 	if ( $blog_name != $blog_name_excerpt )
 		$blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
 	$blog_name = $blog_name_excerpt;
+	unset($blog_name_excerpt);
 }
 $title_class = '';
 if ( function_exists('mb_strlen') ) {
@@ -101,28 +132,65 @@ if ( function_exists('mb_strlen') ) {
 }
 ?>
 
-<img id="header-logo" src="../wp-includes/images/blank.gif" alt="" width="32" height="32" /> <h1 id="site-heading" <?php echo $title_class ?>><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit Site') ?>"><span id="site-title"><?php echo $blog_name ?></span> <em id="site-visit-button"><?php _e('Visit Site') ?></em></a></h1>
+<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="32" height="32" />
+<h1 id="site-heading" <?php echo $title_class ?>>
+	<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 ( !is_network_admin() && !is_user_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>
+
+<?php do_action('in_admin_header'); ?>
 
 <div id="wphead-info">
 <div id="user_info">
-<p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?>
-<?php if ( ! $is_opera ) { ?><span class="turbo-nag hidden"> | <a href="tools.php"><?php _e('Turbo') ?></a></span><?php } ?> |
-<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
+<p><?php
+$links = array();
+$links[5] = sprintf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity);
+if ( is_multisite() && is_super_admin() ) {
+	if ( !is_network_admin() )
+		$links[10] = '| <a href="' . network_admin_url() . '" title="' . ( ! empty( $update_title ) ? $update_title : esc_attr__('Network Admin') ) . '">' . __('Network Admin') . ( ! empty( $total_update_count ) ? ' (' . number_format_i18n( $total_update_count ) . ')' : '' ) . '</a>';
+	else
+		$links[10] = '| <a href="' . get_dashboard_url( get_current_user_id() ) . '" 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);
+
+echo implode(' ', $links);
+?></p>
 </div>
 
-<?php favorite_actions($hook_suffix); ?>
+<?php favorite_actions($current_screen); ?>
 </div>
 </div>
 
 <div id="wpbody">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+<?php
+unset($title_class, $blog_name, $total_update_count, $update_title);
+
+require(ABSPATH . 'wp-admin/menu-header.php');
+
+$current_screen->parent_file = $parent_file;
+$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
+$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);
+?>
 
 <div id="wpbody-content">
 <?php
-screen_meta($hook_suffix);
+screen_meta($current_screen);
 
-do_action('admin_notices');
+if ( is_network_admin() )
+	do_action('network_admin_notices');
+elseif ( is_user_admin() )
+	do_action('user_admin_notices');
+else
+	do_action('admin_notices');
 
-if ( $parent_file == 'options-general.php' ) {
+do_action('all_admin_notices');
+
+if ( $parent_file == 'options-general.php' )
 	require(ABSPATH . 'wp-admin/options-head.php');
-}
