X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..fcaa67f093b5c83deea7a361a8cf8c6ac4e832d3:/wp-admin/menu-header.php?ds=sidebyside

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 90b62969..d73fe9bd 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -1,170 +1,242 @@
 <?php
-$self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
+/**
+ * Displays Administration Menu.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * The current page.
+ *
+ * @global string $self
+ * @name $self
+ * @var string
+ */
+$self = preg_replace('|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/|i', '', $self);
 $self = preg_replace('|^.*/plugins/|i', '', $self);
+$self = preg_replace('|^.*/mu-plugins/|i', '', $self);
 
 global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
 
-get_admin_page_parent();
-
-// We're going to do this loop three times
-?>
+/**
+ * Filter the parent file of an admin menu sub-menu item.
+ *
+ * Allows plugins to move sub-menu items around.
+ *
+ * @since MU
+ *
+ * @param string $parent_file The parent file.
+ */
+$parent_file = apply_filters( 'parent_file', $parent_file );
 
-<ul id="dashmenu">
-<?php
-foreach ( $menu as $key => $item ) {
-	if ( 3 < $key ) // get each menu item before 3
-		continue;
-	$class = '';
-	// 0 = name, 1 = capability, 2 = file
-	if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-
-	if ( !empty($submenu[$item[2]]) ) {
-		$submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
-		$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-		if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
-			echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
-		else
-			echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
-	} else if ( current_user_can($item[1]) ) {
-		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
-		if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
-			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
-		else
-			echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
-	}
-}
-do_action( 'dashmenu' );
-?>
-</ul>
+get_admin_page_parent();
 
-<ul id="adminmenu">
-<?php
-foreach ( $menu as $key => $item ) {
-	if ( 5 > $key || $key > 25 ) // get each menu item before 3
-		continue;
-
-	$class = '';
-
-	// 0 = name, 1 = capability, 2 = file
-	if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-
-	if ( !empty($submenu[$item[2]]) ) {
-		$submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
-		$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-		if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
-			echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
-		else
-			echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
-	} else if ( current_user_can($item[1]) ) {
-		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
-		if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
-			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
-		else
-			echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
+/**
+ * Display menu.
+ *
+ * @access private
+ * @since 2.7.0
+ *
+ * @param array $menu
+ * @param array $submenu
+ * @param bool $submenu_as_parent
+ */
+function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
+	global $self, $parent_file, $submenu_file, $plugin_page, $typenow;
+
+	$first = true;
+	// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url
+	foreach ( $menu as $key => $item ) {
+		$admin_is_parent = false;
+		$class = array();
+		$aria_attributes = '';
+		$aria_hidden = '';
+		$is_separator = false;
+
+		if ( $first ) {
+			$class[] = 'wp-first-item';
+			$first = false;
+		}
+
+		$submenu_items = array();
+		if ( ! empty( $submenu[$item[2]] ) ) {
+			$class[] = 'wp-has-submenu';
+			$submenu_items = $submenu[$item[2]];
+		}
+
+		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
+			$class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
+		} else {
+			$class[] = 'wp-not-current-submenu';
+			if ( ! empty( $submenu_items ) )
+				$aria_attributes .= 'aria-haspopup="true"';
+		}
+
+		if ( ! empty( $item[4] ) )
+			$class[] = esc_attr( $item[4] );
+
+		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+		$img = $img_style = '';
+		$img_class = ' dashicons-before';
+
+		if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+			$is_separator = true;
+		}
+
+		/*
+		 * If the string 'none' (previously 'div') is passed instead of an URL, don't output
+		 * the default menu image so an icon can be added to div.wp-menu-image as background
+		 * with CSS. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
+		 * as special cases.
+		 */
+		if ( ! empty( $item[6] ) ) {
+			$img = '<img src="' . $item[6] . '" alt="" />';
+
+			if ( 'none' === $item[6] || 'div' === $item[6] ) {
+				$img = '<br />';
+			} elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
+				$img = '<br />';
+				$img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+				$img_class = ' svg';
+			} elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+				$img = '<br />';
+				$img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
+			}
+		}
+		$arrow = '<div class="wp-menu-arrow"><div></div></div>';
+
+		$title = wptexturize( $item[0] );
+
+		// hide separators from screen readers
+		if ( $is_separator ) {
+			$aria_hidden = ' aria-hidden="true"';
+		}
+
+		echo "\n\t<li$class$id$aria_hidden>";
+
+		if ( $is_separator ) {
+			echo '<div class="separator"></div>';
+		} elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
+			$submenu_items = array_values( $submenu_items );  // Re-index.
+			$menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+			$menu_file = $submenu_items[0][2];
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+				$menu_file = substr( $menu_file, 0, $pos );
+			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+				$admin_is_parent = true;
+				echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
+			} else {
+				echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
+			}
+		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
+			$menu_file = $item[2];
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+				$menu_file = substr( $menu_file, 0, $pos );
+			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+				$admin_is_parent = true;
+				echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
+			} else {
+				echo "\n\t<a href='{$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
+			}
+		}
+
+		if ( ! empty( $submenu_items ) ) {
+			echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
+			echo "<li class='wp-submenu-head'>{$item[0]}</li>";
+
+			$first = true;
+
+			// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
+			foreach ( $submenu_items as $sub_key => $sub_item ) {
+				if ( ! current_user_can( $sub_item[1] ) )
+					continue;
+
+				$class = array();
+				if ( $first ) {
+					$class[] = 'wp-first-item';
+					$first = false;
+				}
+
+				$menu_file = $item[2];
+
+				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+					$menu_file = substr( $menu_file, 0, $pos );
+
+				// Handle current for post_type=post|page|foo pages, which won't match $self.
+				$self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
+
+				if ( isset( $submenu_file ) ) {
+					if ( $submenu_file == $sub_item[2] )
+						$class[] = 'current';
+				// If plugin_page is set the parent must either match the current page or not physically exist.
+				// This allows plugin pages with the same hook to exist under different parents.
+				} elseif (
+					( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
+					( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+				) {
+					$class[] = 'current';
+				}
+
+				if ( ! empty( $sub_item[4] ) ) {
+					$class[] = esc_attr( $sub_item[4] );
+				}
+
+				$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+
+				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
+				$sub_file = $sub_item[2];
+				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
+					$sub_file = substr($sub_file, 0, $pos);
+
+				$title = wptexturize($sub_item[0]);
+
+				if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
+					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
+					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
+						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
+					else
+						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+
+					$sub_item_url = esc_url( $sub_item_url );
+					echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";
+				} else {
+					echo "<li$class><a href='{$sub_item[2]}'$class>$title</a></li>";
+				}
+			}
+			echo "</ul>";
+		}
+		echo "</li>";
 	}
-}
 
-foreach ( $menu as $key => $item ) {
-	if ( $key < 41 ) // there is a more efficient way to do this!
-		continue;
-
-	$class = '';
-
-	// 0 = name, 1 = capability, 2 = file
-	if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-
-	if ( !empty($submenu[$item[2]]) ) {
-		$submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
-		$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-		if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
-			echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
-		else
-			echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
-	} else if ( current_user_can($item[1]) ) {
-		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
-		if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
-			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
-		else
-			echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
-	}
+	echo '<li id="collapse-menu" class="hide-if-no-js"><div id="collapse-button"><div></div></div>';
+	echo '<span>' . esc_html__( 'Collapse menu' ) . '</span>';
+	echo '</li>';
 }
 
-do_action( 'adminmenu' );
 ?>
-</ul>
 
-<ul id="sidemenu">
+<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e( 'Main menu' ); ?>">
+<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e( 'Skip to main content' ); ?></a>
+<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e( 'Skip to toolbar' ); ?></a>
+<div id="adminmenuback"></div>
+<div id="adminmenuwrap">
+<ul id="adminmenu">
+
 <?php
-$side_items = array();
-foreach ( $menu as $key => $item ) {
-	if ( 26 > $key || $key > 40 )
-		continue;
-
-	$class = '';
-
-	// 0 = name, 1 = capability, 2 = file
-	if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-
-	if ( !empty($submenu[$item[2]]) ) {
-		$submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
-		$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-		if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
-			$side_items[] = "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
-		else
-			$side_items[] = "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
-	} else if ( current_user_can($item[1]) ) {
-		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
-		if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
-			$side_items[] = "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
-		else
-			$side_items[] = "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a>";
-	}
-}
-echo implode(' </li>', $side_items) . '</li>';
-unset($side_items);
-do_action( 'sidemenu' );
-?>
-</ul>
 
+_wp_menu_output( $menu, $submenu );
+/**
+ * Fires after the admin menu has been output.
+ *
+ * @since 2.5.0
+ */
+do_action( 'adminmenu' );
 
-<?php
-// Sub-menu
-if ( isset($submenu["$parent_file"]) ) :
-?>
-<ul id="submenu">
-<?php
-foreach ($submenu["$parent_file"] as $item) :
-	 if ( !current_user_can($item[1]) )
-		 continue;
-
-if ( isset($submenu_file) ) {
-	if ( $submenu_file == $item[2] ) $class = ' class="current"';
-	else $class = '';
-} else if ( (isset($plugin_page) && $plugin_page == $item[2]) || (!isset($plugin_page) && $self == $item[2]) ) $class = ' class="current"';
-else $class = '';
-
-$menu_hook = get_plugin_page_hook($item[2], $parent_file);
-
-if (file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || ! empty($menu_hook)) {
- 	if ( 'admin.php' == $pagenow )
-		echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
-	else
-		echo "\n\t<li><a href='{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
- } else {
-	echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
- }
-endforeach;
 ?>
-
 </ul>
-<?php
-else :
-?>
-<div id="minisub"></div>
-<?php
-
-endif;
-
-do_action('admin_notices');
-
-?>
\ No newline at end of file
+</div>
+</div>