X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/b609ea801799cbbd5f02d95e0dc547ab53a56f4c..03f2fa83c13c1b532284205fa7efcab9b8b2c41f:/wp-admin/includes/dashboard.php
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 2b10928b..144fcc04 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -1,6 +1,6 @@
5,
- );
- }
- $recent_comments_title = __( 'Recent Comments' );
- wp_add_dashboard_widget( 'dashboard_recent_comments', $recent_comments_title, 'wp_dashboard_recent_comments', 'wp_dashboard_recent_comments_control' );
- }
-
- // Incoming Links Widget
- if ( is_blog_admin() && current_user_can('publish_posts') ) {
- if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) {
- $update = true;
- $num_items = isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10;
- $widget_options['dashboard_incoming_links'] = array(
- 'home' => get_option('home'),
- 'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
- 'url' => isset($widget_options['dashboard_incoming_links']['url']) ? apply_filters( 'dashboard_incoming_links_feed', $widget_options['dashboard_incoming_links']['url'] ) : apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?scoring=d&ie=utf-8&num=' . $num_items . '&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
- 'items' => $num_items,
- 'show_date' => isset($widget_options['dashboard_incoming_links']['show_date']) ? $widget_options['dashboard_incoming_links']['show_date'] : false
- );
- }
- wp_add_dashboard_widget( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_incoming_links', 'wp_dashboard_incoming_links_control' );
+ // Activity Widget
+ if ( is_blog_admin() ) {
+ wp_add_dashboard_widget( 'dashboard_activity', __( 'Activity' ), 'wp_dashboard_site_activity' );
}
- // WP Plugins Widget
- if ( ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) )
- wp_add_dashboard_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_plugins' );
-
// QuickPress Widget
- if ( is_blog_admin() && current_user_can('edit_posts') )
- wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' );
-
- // Recent Drafts
- if ( is_blog_admin() && current_user_can('edit_posts') )
- wp_add_dashboard_widget( 'dashboard_recent_drafts', __('Recent Drafts'), 'wp_dashboard_recent_drafts' );
-
- // Primary feed (Dev Blog) Widget
- if ( !isset( $widget_options['dashboard_primary'] ) ) {
- $update = true;
- $widget_options['dashboard_primary'] = array(
- 'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
- 'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
- 'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
- 'items' => 2,
- 'show_summary' => 1,
- 'show_author' => 0,
- 'show_date' => 1,
- );
- }
- wp_add_dashboard_widget( 'dashboard_primary', $widget_options['dashboard_primary']['title'], 'wp_dashboard_primary', 'wp_dashboard_primary_control' );
-
- // Secondary Feed (Planet) Widget
- if ( !isset( $widget_options['dashboard_secondary'] ) ) {
- $update = true;
- $widget_options['dashboard_secondary'] = array(
- 'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
- 'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
- 'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
- 'items' => 5,
- 'show_summary' => 0,
- 'show_author' => 0,
- 'show_date' => 0,
- );
+ if ( is_blog_admin() && current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+ $quick_draft_title = sprintf( '%1$s %2$s', __( 'Quick Draft' ), __( 'Drafts' ) );
+ wp_add_dashboard_widget( 'dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press' );
}
- wp_add_dashboard_widget( 'dashboard_secondary', $widget_options['dashboard_secondary']['title'], 'wp_dashboard_secondary', 'wp_dashboard_secondary_control' );
- // Hook to register new widgets
- // Filter widget order
+ // WordPress News
+ wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress News' ), 'wp_dashboard_primary' );
+
if ( is_network_admin() ) {
+
+ /**
+ * Fires after core widgets for the Network Admin dashboard have been registered.
+ *
+ * @since 3.1.0
+ */
do_action( 'wp_network_dashboard_setup' );
+
+ /**
+ * Filter the list of widgets to load for the Network Admin dashboard.
+ *
+ * @since 3.1.0
+ *
+ * @param array $dashboard_widgets An array of dashboard widgets.
+ */
$dashboard_widgets = apply_filters( 'wp_network_dashboard_widgets', array() );
} elseif ( is_user_admin() ) {
+
+ /**
+ * Fires after core widgets for the User Admin dashboard have been registered.
+ *
+ * @since 3.1.0
+ */
do_action( 'wp_user_dashboard_setup' );
+
+ /**
+ * Filter the list of widgets to load for the User Admin dashboard.
+ *
+ * @since 3.1.0
+ *
+ * @param array $dashboard_widgets An array of dashboard widgets.
+ */
$dashboard_widgets = apply_filters( 'wp_user_dashboard_widgets', array() );
} else {
+
+ /**
+ * Fires after core widgets for the admin dashboard have been registered.
+ *
+ * @since 2.5.0
+ */
do_action( 'wp_dashboard_setup' );
+
+ /**
+ * Filter the list of widgets to load for the admin dashboard.
+ *
+ * @since 2.5.0
+ *
+ * @param array $dashboard_widgets An array of dashboard widgets.
+ */
$dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() );
}
@@ -121,6 +114,7 @@ function wp_dashboard_setup() {
}
if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id']) ) {
+ check_admin_referer( 'edit-dashboard-widget_' . $_POST['widget_id'], 'dashboard-widget-nonce' );
ob_start(); // hack - but the same hack wp-admin/widgets.php uses
wp_dashboard_trigger_widget_control( $_POST['widget_id'] );
ob_end_clean();
@@ -128,14 +122,24 @@ function wp_dashboard_setup() {
exit;
}
- if ( $update )
- update_option( 'dashboard_widget_options', $widget_options );
+ /** This action is documented in wp-admin/edit-form-advanced.php */
+ do_action( 'do_meta_boxes', $screen->id, 'normal', '' );
- do_action('do_meta_boxes', $screen->id, 'normal', '');
- do_action('do_meta_boxes', $screen->id, 'side', '');
+ /** This action is documented in wp-admin/edit-form-advanced.php */
+ do_action( 'do_meta_boxes', $screen->id, 'side', '' );
}
-function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null ) {
+/**
+ *
+ * @global array $wp_dashboard_control_callbacks
+ *
+ * @param string $widget_id
+ * @param string $widget_name
+ * @param callable $callback
+ * @param callable $control_callback
+ * @param array $callback_args
+ */
+function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null ) {
$screen = get_current_screen();
global $wp_dashboard_control_callbacks;
@@ -151,22 +155,28 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_
}
}
- if ( is_blog_admin () )
- $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
- else if (is_network_admin() )
- $side_widgets = array('dashboard_primary', 'dashboard_secondary');
- else
- $side_widgets = array();
+ $side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
$location = 'normal';
if ( in_array($widget_id, $side_widgets) )
$location = 'side';
- add_meta_box( $widget_id, $widget_name , $callback, $screen->id, $location, 'core' );
+
+ $priority = 'core';
+ if ( 'dashboard_browser_nag' === $widget_id )
+ $priority = 'high';
+
+ add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
}
+/**
+ *
+ * @param type $dashboard
+ * @param type $meta_box
+ */
function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
- echo '
';
@@ -178,238 +188,178 @@ function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
* @since 2.5.0
*/
function wp_dashboard() {
- global $screen_layout_columns;
-
$screen = get_current_screen();
-
- $hide2 = $hide3 = $hide4 = '';
- switch ( $screen_layout_columns ) {
- case 4:
- $width = 'width:24.5%;';
- break;
- case 3:
- $width = 'width:32.67%;';
- $hide4 = 'display:none;';
- break;
- case 2:
- $width = 'width:49%;';
- $hide3 = $hide4 = 'display:none;';
- break;
- default:
- $width = 'width:98%;';
- $hide2 = $hide3 = $hide4 = 'display:none;';
+ $columns = absint( $screen->get_columns() );
+ $columns_css = '';
+ if ( $columns ) {
+ $columns_css = " columns-$columns";
}
-?>
-
-\n";
- do_meta_boxes( $screen->id, 'normal', '' );
-
- echo "\t
\n";
- do_meta_boxes( $screen->id, 'side', '' );
- echo "\t
\n";
- do_meta_boxes( $screen->id, 'column3', '' );
-
- echo "\t
\n";
- do_meta_boxes( $screen->id, 'column4', '' );
?>
-
+
-
-';
- echo "\n\t".'' . __('Content') . '
'."\n\t".'';
- echo "\n\t".'';
-
- // Posts
- $num = number_format_i18n( $num_posts->publish );
- $text = _n( 'Post', 'Posts', intval($num_posts->publish) );
- if ( current_user_can( 'edit_posts' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo '
';
- /* TODO: Show status breakdown on hover
- if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can
- $post_type_texts[] = ''.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'';
- }
- if ( $can_edit_posts && !empty($num_posts->draft) ) {
- $post_type_texts[] = ''.sprintf( _n( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).'';
- }
- if ( $can_edit_posts && !empty($num_posts->future) ) {
- $post_type_texts[] = ''.sprintf( _n( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).'';
- }
- if ( current_user_can('publish_posts') && !empty($num_posts->pending) ) {
- $pending_text = sprintf( _n( 'There is %2$s post pending your review.', 'There are %2$s posts pending your review.', $num_posts->pending ), 'edit.php?post_status=pending', number_format_i18n( $num_posts->pending ) );
- } else {
- $pending_text = '';
- }
- */
-
- // Pages
- $num = number_format_i18n( $num_pages->publish );
- $text = _n( 'Page', 'Pages', $num_pages->publish );
- if ( current_user_can( 'edit_pages' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo '
';
-
- // Categories
- $num = number_format_i18n( $num_cats );
- $text = _n( 'Category', 'Categories', $num_cats );
- if ( current_user_can( 'manage_categories' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo '
';
-
- // Tags
- $num = number_format_i18n( $num_tags );
- $text = _n( 'Tag', 'Tags', $num_tags );
- if ( current_user_can( 'manage_categories' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo "
";
- do_action('right_now_content_table_end');
- echo "\n\t
\n\t";
-
-
- echo "\n\t".'';
- echo "\n\t".'
' . __('Discussion') . '
'."\n\t".'
';
- echo "\n\t".'';
+?>
+
+
+ publish ) {
+ if ( 'post' == $post_type ) {
+ $text = _n( '%s Post', '%s Posts', $num_posts->publish );
+ } else {
+ $text = _n( '%s Page', '%s Pages', $num_posts->publish );
+ }
+ $text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
+ $post_type_object = get_post_type_object( $post_type );
+ if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) {
+ printf( '- %2$s
', $post_type, $text );
+ } else {
+ printf( '- %2$s
', $post_type, $text );
+ }
- // Total Comments
- $num = '' . number_format_i18n($num_comm->total_comments) . '';
- $text = _n( 'Comment', 'Comments', $num_comm->total_comments );
- if ( current_user_can( 'moderate_comments' ) ) {
- $num = '' . $num . '';
- $text = '' . $text . '';
+ }
}
- echo '';
- echo '';
-
- echo '
';
-
- // Approved Comments
- $num = '' . number_format_i18n($num_comm->approved) . '';
- $text = _nx( 'Approved', 'Approved', $num_comm->approved, 'Right Now' );
- if ( current_user_can( 'moderate_comments' ) ) {
- $num = "$num";
- $text = "$text";
+ // Comments
+ $num_comm = wp_count_comments();
+ if ( $num_comm && $num_comm->approved ) {
+ $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
+ ?>
+
+ moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) );
+ ?>
+
+ ' . $num . '';
- echo '' . $text . ' | ';
-
- echo "
\n\t";
- // Pending Comments
- $num = '' . number_format_i18n($num_comm->moderated) . '';
- $text = _n( 'Pending', 'Pending', $num_comm->moderated );
- if ( current_user_can( 'moderate_comments' ) ) {
- $num = "$num";
- $text = "$text";
+ /**
+ * Filter the array of extra elements to list in the 'At a Glance'
+ * dashboard widget.
+ *
+ * Prior to 3.8.0, the widget was named 'Right Now'. Each element
+ * is wrapped in list-item tags on output.
+ *
+ * @since 3.8.0
+ *
+ * @param array $items Array of extra 'At a Glance' widget items.
+ */
+ $elements = apply_filters( 'dashboard_glance_items', array() );
+
+ if ( $elements ) {
+ echo '' . implode( "\n", $elements ) . "\n";
}
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
- echo "
\n\t";
+ ?>
+
+ spam);
- $text = _nx( 'Spam', 'Spam', $num_comm->spam, 'comment' );
- if ( current_user_can( 'moderate_comments' ) ) {
- $num = "$num";
- $text = "$text";
+ // Check if search engines are asked not to index this site.
+ if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '1' != get_option( 'blog_public' ) ) {
+
+ /**
+ * Filter the link title attribute for the 'Search Engines Discouraged'
+ * message displayed in the 'At a Glance' dashboard widget.
+ *
+ * Prior to 3.8.0, the widget was named 'Right Now'.
+ *
+ * @since 3.0.0
+ *
+ * @param string $title Default attribute text.
+ */
+ $title = apply_filters( 'privacy_on_link_title', __( 'Your site is asking search engines not to index its content' ) );
+
+ /**
+ * Filter the link label for the 'Search Engines Discouraged' message
+ * displayed in the 'At a Glance' dashboard widget.
+ *
+ * Prior to 3.8.0, the widget was named 'Right Now'.
+ *
+ * @since 3.0.0
+ *
+ * @param string $content Default text.
+ */
+ $content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
+
+ echo "$content
";
}
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo "
";
- do_action('right_now_table_end');
- do_action('right_now_discussion_table_end');
- echo "\n\t
\n\t
";
-
- echo "\n\t".'';
- $ct = current_theme_info();
-
- echo "\n\t
";
- if ( !empty($wp_registered_sidebars) ) {
- $sidebars_widgets = wp_get_sidebars_widgets();
- $num_widgets = 0;
- foreach ( (array) $sidebars_widgets as $k => $v ) {
- if ( 'wp_inactive_widgets' == $k )
- continue;
- if ( is_array($v) )
- $num_widgets = $num_widgets + count($v);
- }
- $num = number_format_i18n( $num_widgets );
+ ?>
+
+ title;
- if ( current_user_can( 'switch_themes') ) {
- echo '' . __('Change Theme') . '';
- $switch_themes = '' . $switch_themes . '';
- }
- if ( current_user_can( 'edit_theme_options' ) ) {
- printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $switch_themes, $num);
- } else {
- printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $switch_themes, $num);
- }
- } else {
- if ( current_user_can( 'switch_themes' ) ) {
- echo '' . __('Change Theme') . '';
- printf( __('Theme %1$s'), $ct->title );
- } else {
- printf( __('Theme %1$s'), $ct->title );
- }
- }
- echo '';
+ /**
+ * Fires at the end of the 'At a Glance' dashboard widget.
+ *
+ * Prior to 3.8.0, the widget was named 'Right Now'.
+ *
+ * @since 2.0.0
+ */
+ do_action( 'activity_box_end' );
- update_right_now_message();
+ $actions = ob_get_clean();
- echo "\n\t".'
';
- do_action( 'rightnow_end' );
- do_action( 'activity_box_end' );
+ if ( !empty( $actions ) ) : ?>
+
+
+
+
-
-
-
' . __( 'Post published. View post | Edit post' ) . '
', esc_url( $view ), $edit );
- else
- printf( '', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
- } else {
- printf( '', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
- $drafts_query = new WP_Query( array(
- 'post_type' => 'post',
- 'post_status' => 'draft',
- 'author' => $GLOBALS['current_user']->ID,
- 'posts_per_page' => 1,
- 'orderby' => 'modified',
- 'order' => 'DESC'
- ) );
-
- if ( $drafts_query->posts )
- $drafts =& $drafts_query->posts;
- }
- printf('' . __('You can also try %s, easy blogging from anywhere on the Web.') . '
', '' . __('Press This') . '' );
- $_REQUEST = array(); // hack for get_default_post_to_edit()
+ if ( ! current_user_can( 'edit_posts' ) ) {
+ return;
}
/* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
@@ -492,180 +453,139 @@ function wp_dashboard_quick_press_output() {
if ( $last_post_id ) {
$post = get_post( $last_post_id );
if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
- $post = get_default_post_to_edit('post', true);
- update_user_option( (int) $GLOBALS['current_user']->ID, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+ $post = get_default_post_to_edit( 'post', true );
+ update_user_option( get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
} else {
$post->post_title = ''; // Remove the auto draft title
}
} else {
- $post = get_default_post_to_edit('post', true);
- update_user_option( (int) $GLOBALS['current_user']->ID, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+ $post = get_default_post_to_edit( 'post' , true);
+ $user_id = get_current_user_id();
+ // Don't create an option if this is a super admin who does not belong to this site.
+ if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) )
+ update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
}
$post_ID = (int) $post->ID;
?>
-