X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/341dfbb66f24f5145174c373267f889c31615cc5..9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f:/wp-admin/includes/dashboard.php diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 008a4fdd..2a5e74be 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -18,11 +18,6 @@ function wp_dashboard_setup() { $wp_dashboard_control_callbacks = array(); $screen = get_current_screen(); - $update = false; - $widget_options = get_option( 'dashboard_widget_options' ); - if ( !$widget_options || !is_array($widget_options) ) - $widget_options = array(); - /* Register Widgets and Controls */ $response = wp_check_browser_version(); @@ -37,91 +32,75 @@ function wp_dashboard_setup() { // Right Now if ( is_blog_admin() && current_user_can('edit_posts') ) - wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' ); + wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' ); if ( is_network_admin() ) wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' ); - // Recent Comments Widget - if ( is_blog_admin() && current_user_can('moderate_comments') ) { - if ( !isset( $widget_options['dashboard_recent_comments'] ) || !isset( $widget_options['dashboard_recent_comments']['items'] ) ) { - $update = true; - $widget_options['dashboard_recent_comments'] = array( - 'items' => 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, - ); + if ( is_blog_admin() && current_user_can( 'edit_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_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, - ); - } - 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() ); } @@ -131,6 +110,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(); @@ -138,14 +118,14 @@ 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 ) { +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; @@ -161,12 +141,7 @@ 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) ) @@ -176,12 +151,13 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_ if ( 'dashboard_browser_nag' === $widget_id ) $priority = 'high'; - add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority ); + add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args ); } function _wp_dashboard_control_callback( $dashboard, $meta_box ) { echo '
'; wp_dashboard_trigger_widget_control( $meta_box['id'] ); + wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' ); echo ''; submit_button( __('Submit') ); echo '
'; @@ -193,244 +169,171 @@ 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:25%;'; - break; - case 3: - $width = 'width:33.333333%;'; - $hide4 = 'display:none;'; - break; - case 2: - $width = 'width:50%;'; - $hide3 = $hide4 = 'display:none;'; - break; - default: - $width = 'width:100%;'; - $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', '' ); ?> -
+
+
+ id, 'normal', '' ); ?> +
+
+ id, 'side', '' ); ?> +
+
+ id, 'column3', '' ); ?> +
+
+ 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 ''; - echo ''; - - 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 ''; - echo ''; - - 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 ''; - echo ''; - - echo ''; +?> +
+
'; - echo ''; - - echo ""; - do_action('right_now_content_table_end'); - echo "\n\t
' . $num . '' . $text . '
' . $num . '' . $text . '
' . $num . '' . $text . '
' . $num . '' . $text . '
\n\t"; - - - echo "\n\t".'
'; - echo "\n\t".'

' . __('Discussion') . '

'."\n\t".''; - echo "\n\t".''; - - // 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 . ''; + // Comments + $num_comm = wp_count_comments(); + if ( $num_comm && $num_comm->total_comments ) { + $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->total_comments ), number_format_i18n( $num_comm->total_comments ) ); + ?> +
    • + moderated ) { + /* translators: Number of comments in moderation */ + $text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) ); + ?> +
    • + ' . $num . ''; - 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"; + /** + * 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 ''; - echo ''; - echo "\n\t"; + ?> + + ' . number_format_i18n($num_comm->moderated) . ''; - $text = _n( 'Pending', 'Pending', $num_comm->moderated ); - if ( current_user_can( 'moderate_comments' ) ) { - $num = "$num"; - $text = "$text"; - } - echo ''; - echo ''; + // 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' ) ) { - echo "\n\t"; + /** + * 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' ) ); - // Spam Comments - $num = number_format_i18n($num_comm->spam); - $text = _nx( 'Spam', 'Spam', $num_comm->spam, 'comment' ); - if ( current_user_can( 'moderate_comments' ) ) { - $num = "$num"; - $text = "$text"; - } - echo ''; - echo ''; - - echo ""; - do_action('right_now_table_end'); - do_action('right_now_discussion_table_end'); - echo "\n\t
    ' . $text . '
    ' . $num . '' . $text . '
    ' . $num . '' . $text . '
    ' . $num . '' . $text . '
    \n\t
    "; - - echo "\n\t".'
    '; - $ct = current_theme_info(); - - echo "\n\t

    "; - - if ( empty( $ct->stylesheet_dir ) ) { - if ( ! is_multisite() || is_super_admin() ) - echo '' . __('ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.') . ''; - } elseif ( ! 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 || 'orphaned_widgets' == substr( $k, 0, 16 ) ) - continue; - if ( is_array($v) ) - $num_widgets = $num_widgets + count($v); - } - $num = number_format_i18n( $num_widgets ); + /** + * 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' ) ); - $switch_themes = $ct->title; - if ( current_user_can( 'switch_themes') ) - $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' ) ) - printf( __('Theme %1$s'), $ct->title ); - else - printf( __('Theme %1$s'), $ct->title ); + echo "

    $content

    "; } - echo '

    '; - - // Check if search engines are blocked. - if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ) { - $title = apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') ); - $content = apply_filters('privacy_on_link_text', __('Search Engines Blocked') ); + ?> +
    + $content

    "; - } + /** + * 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 ) ) : ?> +
    + +
    +

    - -
    + + + +

    - + 'submit_users' ) ); ?>

    -
    +

    - + 'submit_sites' ) ); ?>

    ' . __( 'Post published. View post | Edit post' ) . '

    ', esc_url( $view ), $edit ); - else - printf( '

    ' . __( 'Post submitted. Preview post | Edit post' ) . '

    ', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit ); - } else { - printf( '

    ' . __( 'Draft saved. Preview post | Edit post' ) . '

    ', 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() - } - /* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */ $last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID 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; ?> -
    -

    -
    - -
    + - -
    - -
    + +
    -

    -
    - -
    +
    + + +
    -

    -
    - +
    + +

    - + - - 'save-post', 'tabindex'=> 4 ) ); ?> - - - - - + + 'save-post' ) ); ?>

    - - 'post', - 'post_status' => 'draft', - 'author' => $GLOBALS['current_user']->ID, - 'posts_per_page' => 5, - 'orderby' => 'modified', - 'order' => 'DESC' - ) ); - $drafts =& $drafts_query->posts; - } - - if ( $drafts && is_array( $drafts ) ) { - $list = array(); - foreach ( $drafts as $draft ) { - $url = get_edit_post_link( $draft->ID ); - $title = _draft_or_post_title( $draft->ID ); - $item = "

    " . esc_html($title) . " " . get_the_time( get_option( 'date_format' ), $draft ) . '

    '; - if ( $the_content = preg_split( '#\s#', strip_tags( $draft->post_content ), 11, PREG_SPLIT_NO_EMPTY ) ) - $item .= '

    ' . join( ' ', array_slice( $the_content, 0, 10 ) ) . ( 10 < count( $the_content ) ? '…' : '' ) . '

    '; - $list[] = $item; - } -?> - -

    -get_results( "SELECT * FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE p.post_status != 'trash' ORDER BY c.comment_date_gmt DESC LIMIT $start, 50" ) ) { - - foreach ( $possible as $comment ) { - if ( count( $comments ) >= $total_items ) - break; - if ( in_array( $comment->comment_approved, $allowed_states ) && current_user_can( 'read_post', $comment->comment_post_ID ) ) - $comments[] = $comment; - } - - $start = $start + 50; - } - - if ( $comments ) : -?> - -
    - - -
    - - - views(); ?> - - -

    - - 'post', + 'post_status' => 'draft', + 'author' => get_current_user_id(), + 'posts_per_page' => 4, + 'orderby' => 'modified', + 'order' => 'DESC' + ); + $drafts = get_posts( $query_args ); + if ( ! $drafts ) { + return; + } + } + + echo '
    '; + if ( count( $drafts ) > 3 ) { + echo '

    ' . _x( 'View all', 'drafts' ) . "

    \n"; + } + echo '

    ' . __( 'Drafts' ) . "

    \n
      "; + + $drafts = array_slice( $drafts, 0, 3 ); + foreach ( $drafts as $draft ) { + $url = get_edit_post_link( $draft->ID ); + $title = _draft_or_post_title( $draft->ID ); + echo "
    • \n"; + echo '
      ' . esc_html( $title ) . ''; + echo '
      '; + if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) { + echo '

      ' . $the_content . '

      '; + } + echo "
      • \n"; + } + echo "
    \n
    "; } function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $GLOBALS['comment'] =& $comment; - $comment_post_url = get_edit_post_link( $comment->comment_post_ID ); $comment_post_title = strip_tags(get_the_title( $comment->comment_post_ID )); - $comment_post_link = "$comment_post_title"; + + if ( current_user_can( 'edit_post', $comment->comment_post_ID ) ) { + $comment_post_url = get_edit_post_link( $comment->comment_post_ID ); + $comment_post_link = "$comment_post_title"; + } else { + $comment_post_link = $comment_post_title; + } + $comment_link = '#'; $actions_string = ''; if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) { - // preorder it: Approve | Reply | Edit | Spam | Trash + // Pre-order it: Approve | Reply | Edit | Spam | Trash. $actions = array( 'approve' => '', 'unapprove' => '', 'reply' => '', @@ -696,16 +549,27 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" ); $delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" ); - $actions['approve'] = "" . __( 'Approve' ) . ''; - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; $actions['edit'] = "". __('Edit') . ''; - $actions['reply'] = '' . __('Reply') . ''; - $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; + $actions['reply'] = '' . __('Reply') . ''; + $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; if ( !EMPTY_TRASH_DAYS ) - $actions['delete'] = "" . __('Delete Permanently') . ''; + $actions['delete'] = "" . __('Delete Permanently') . ''; else - $actions['trash'] = "" . _x('Trash', 'verb') . ''; + $actions['trash'] = "" . _x('Trash', 'verb') . ''; + /** + * Filter the action links displayed for each comment in the 'Recent Comments' + * dashboard widget. + * + * @since 2.6.0 + * + * @param array $actions An array of comment actions. Default actions include: + * 'Approve', 'Unapprove', 'Edit', 'Reply', 'Spam', + * 'Delete', and 'Trash'. + * @param object $comment The comment object. + */ $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment ); $i = 0; @@ -724,9 +588,10 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { ?>
    comment_ID) ) ); ?>> - comment_type || 'comment' == $comment->comment_type ) : ?> - + + + comment_type || 'comment' == $comment->comment_type ) : ?>

    @@ -736,16 +601,16 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { comment_type ) : - case 'pingback' : - $type = __( 'Pingback' ); - break; - case 'trackback' : - $type = __( 'Trackback' ); - break; - default : - $type = ucwords( $comment->comment_type ); - endswitch; + switch ( $comment->comment_type ) { + case 'pingback' : + $type = __( 'Pingback' ); + break; + case 'trackback' : + $type = __( 'Trackback' ); + break; + default : + $type = ucwords( $comment->comment_type ); + } $type = esc_html( $type ); ?>
    @@ -762,127 +627,172 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { } /** - * The recent comments dashboard widget control. + * Callback function for Activity widget. * - * @since 3.0.0 + * @since 3.8.0 */ -function wp_dashboard_recent_comments_control() { - if ( !$widget_options = get_option( 'dashboard_widget_options' ) ) - $widget_options = array(); +function wp_dashboard_site_activity() { - if ( !isset($widget_options['dashboard_recent_comments']) ) - $widget_options['dashboard_recent_comments'] = array(); + echo '
    '; - if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-recent-comments']) ) { - $number = absint( $_POST['widget-recent-comments']['items'] ); - $widget_options['dashboard_recent_comments']['items'] = $number; - update_option( 'dashboard_widget_options', $widget_options ); - } + $future_posts = wp_dashboard_recent_posts( array( + 'max' => 5, + 'status' => 'future', + 'order' => 'ASC', + 'title' => __( 'Publishing Soon' ), + 'id' => 'future-posts', + ) ); + $recent_posts = wp_dashboard_recent_posts( array( + 'max' => 5, + 'status' => 'publish', + 'order' => 'DESC', + 'title' => __( 'Recently Published' ), + 'id' => 'published-posts', + ) ); - $number = isset( $widget_options['dashboard_recent_comments']['items'] ) ? (int) $widget_options['dashboard_recent_comments']['items'] : ''; + $recent_comments = wp_dashboard_recent_comments(); - echo '

    '; - echo '

    '; -} + if ( !$future_posts && !$recent_posts && !$recent_comments ) { + echo '
    '; + echo '

    '; + echo '

    ' . __( 'No activity yet!' ) . '

    '; + echo '
    '; + } -function wp_dashboard_incoming_links() { - wp_dashboard_cached_rss_widget( 'dashboard_incoming_links', 'wp_dashboard_incoming_links_output' ); + echo '
    '; } /** - * Display incoming links dashboard widget content. + * Generates Publishing Soon and Recently Published sections. * - * @since 2.5.0 + * @since 3.8.0 + * + * @param array $args { + * An array of query and display arguments. + * + * @type int $max Number of posts to display. + * @type string $status Post status. + * @type string $order Designates ascending ('ASC') or descending ('DESC') order. + * @type string $title Section title. + * @type string $id The container id. + * } + * @return bool False if no posts were found. True otherwise. */ -function wp_dashboard_incoming_links_output() { - $widgets = get_option( 'dashboard_widget_options' ); - @extract( @$widgets['dashboard_incoming_links'], EXTR_SKIP ); - $rss = fetch_feed( $url ); - - if ( is_wp_error($rss) ) { - if ( is_admin() || current_user_can('manage_options') ) { - echo '

    '; - printf(__('RSS Error: %s'), $rss->get_error_message()); - echo '

    '; - } - return; - } +function wp_dashboard_recent_posts( $args ) { + $query_args = array( + 'post_type' => 'post', + 'post_status' => $args['status'], + 'orderby' => 'date', + 'order' => $args['order'], + 'posts_per_page' => intval( $args['max'] ), + 'no_found_rows' => true, + 'cache_results' => false, + 'perm' => ( 'future' === $args['status'] ) ? 'editable' : 'readable', + ); + $posts = new WP_Query( $query_args ); + + if ( $posts->have_posts() ) { + + echo '
    '; + + echo '

    ' . $args['title'] . '

    '; + + echo '
      '; + + $today = date( 'Y-m-d', current_time( 'timestamp' ) ); + $tomorrow = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) ); + + while ( $posts->have_posts() ) { + $posts->the_post(); + + $time = get_the_time( 'U' ); + if ( date( 'Y-m-d', $time ) == $today ) { + $relative = __( 'Today' ); + } elseif ( date( 'Y-m-d', $time ) == $tomorrow ) { + $relative = __( 'Tomorrow' ); + } else { + /* translators: date and time format for recent posts on the dashboard, see http://php.net/date */ + $relative = date_i18n( __( 'M jS' ), $time ); + } - if ( !$rss->get_item_quantity() ) { - echo '

      ' . __('This dashboard widget queries Google Blog Search so that when another blog links to your site it will show up here. It has found no incoming links… yet. It’s okay — there is no rush.') . "

      \n"; - $rss->__destruct(); - unset($rss); - return; - } + if ( current_user_can( 'edit_post', get_the_ID() ) ) { + /* translators: 1: relative date, 2: time, 3: post edit link, 4: post title */ + $format = __( '%1$s, %2$s %4$s' ); + printf( "
    • $format
      • ", $relative, get_the_time(), get_edit_post_link(), _draft_or_post_title() ); + } else { + /* translators: 1: relative date, 2: time, 3: post title */ + $format = __( '%1$s, %2$s %3$s' ); + printf( "
    • $format
      • ", $relative, get_the_time(), _draft_or_post_title() ); + } + } - echo "
        \n"; + echo '
      '; + echo '
    '; - if ( !isset($items) ) - $items = 10; + } else { + return false; + } - foreach ( $rss->get_items(0, $items) as $item ) { - $publisher = ''; - $site_link = ''; - $link = ''; - $content = ''; - $date = ''; - $link = esc_url( strip_tags( $item->get_link() ) ); + wp_reset_postdata(); - $author = $item->get_author(); - if ( $author ) { - $site_link = esc_url( strip_tags( $author->get_link() ) ); + return true; +} - if ( !$publisher = esc_html( strip_tags( $author->get_name() ) ) ) - $publisher = __( 'Somebody' ); - } else { - $publisher = __( 'Somebody' ); - } - if ( $site_link ) - $publisher = "$publisher"; - else - $publisher = "$publisher"; +/** + * Show Comments section. + * + * @since 3.8.0 + * + * @param int $total_items Optional. Number of comments to query. Default 5. + * @return bool False if no comments were found. True otherwise. + */ +function wp_dashboard_recent_comments( $total_items = 5 ) { + // Select all comment types and filter out spam later for better query performance. + $comments = array(); - $content = $item->get_content(); - $content = wp_html_excerpt($content, 50) . ' ...'; + $comments_query = array( + 'number' => $total_items * 5, + 'offset' => 0 + ); + if ( ! current_user_can( 'edit_posts' ) ) + $comments_query['status'] = 'approve'; - if ( $link ) - /* translators: incoming links feed, %1$s is other person, %3$s is content */ - $text = __( '%1$s linked here saying, "%3$s"' ); - else - /* translators: incoming links feed, %1$s is other person, %3$s is content */ - $text = __( '%1$s linked here saying, "%3$s"' ); - - if ( !empty($show_date) ) { - if ( !empty($show_author) || !empty($show_summary) ) - /* translators: incoming links feed, %4$s is the date */ - $text .= ' ' . __( 'on %4$s' ); - $date = esc_html( strip_tags( $item->get_date() ) ); - $date = strtotime( $date ); - $date = gmdate( get_option( 'date_format' ), $date ); + while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) { + foreach ( $possible as $comment ) { + if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) + continue; + $comments[] = $comment; + if ( count( $comments ) == $total_items ) + break 2; } - - echo "\t
  • " . sprintf( $text, $publisher, $link, $content, $date ) . "
    • \n"; + $comments_query['offset'] += $comments_query['number']; + $comments_query['number'] = $total_items * 10; } - echo "\n"; - $rss->__destruct(); - unset($rss); -} + if ( $comments ) { + echo '
    '; + echo '

    ' . __( 'Comments' ) . '

    '; -function wp_dashboard_incoming_links_control() { - wp_dashboard_rss_control( 'dashboard_incoming_links', array( 'title' => false, 'show_summary' => false, 'show_author' => false ) ); -} + echo '
    '; + foreach ( $comments as $comment ) + _wp_dashboard_recent_comments_row( $comment ); + echo '
    '; -function wp_dashboard_primary() { - wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_rss_output' ); -} + if ( current_user_can('edit_posts') ) + _get_list_table('WP_Comments_List_Table')->views(); -function wp_dashboard_primary_control() { - wp_dashboard_rss_control( 'dashboard_primary' ); + wp_comment_reply( -1, false, 'dashboard', false ); + wp_comment_trashnotice(); + + echo '
    '; + } else { + return false; + } + return true; } /** - * {@internal Missing Short Description}} + * Display generic dashboard RSS widget feed. * * @since 2.5.0 * @@ -891,138 +801,10 @@ function wp_dashboard_primary_control() { function wp_dashboard_rss_output( $widget_id ) { $widgets = get_option( 'dashboard_widget_options' ); echo '
    '; - wp_widget_rss_output( $widgets[$widget_id] ); + wp_widget_rss_output( $widgets[ $widget_id ] ); echo "
    "; } -function wp_dashboard_secondary() { - wp_dashboard_cached_rss_widget( 'dashboard_secondary', 'wp_dashboard_secondary_output' ); -} - -function wp_dashboard_secondary_control() { - wp_dashboard_rss_control( 'dashboard_secondary' ); -} - -/** - * Display secondary dashboard RSS widget feed. - * - * @since 2.5.0 - * - * @return unknown - */ -function wp_dashboard_secondary_output() { - $widgets = get_option( 'dashboard_widget_options' ); - @extract( @$widgets['dashboard_secondary'], EXTR_SKIP ); - $rss = @fetch_feed( $url ); - - if ( is_wp_error($rss) ) { - if ( is_admin() || current_user_can('manage_options') ) { - echo '

    '; - printf(__('RSS Error: %s'), $rss->get_error_message()); - echo '

    '; - } - } elseif ( !$rss->get_item_quantity() ) { - $rss->__destruct(); - unset($rss); - return false; - } else { - echo '
    '; - wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] ); - echo '
    '; - $rss->__destruct(); - unset($rss); - } -} - -function wp_dashboard_plugins() { - wp_dashboard_cached_rss_widget( 'dashboard_plugins', 'wp_dashboard_plugins_output', array( - 'http://wordpress.org/extend/plugins/rss/browse/popular/', - 'http://wordpress.org/extend/plugins/rss/browse/new/', - 'http://wordpress.org/extend/plugins/rss/browse/updated/' - ) ); -} - -/** - * Display plugins most popular, newest plugins, and recently updated widget text. - * - * @since 2.5.0 - */ -function wp_dashboard_plugins_output() { - $popular = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/popular/' ); - $new = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/new/' ); - $updated = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/updated/' ); - - if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) { - $plugin_slugs = array_keys( get_plugins() ); - set_transient( 'plugin_slugs', $plugin_slugs, 86400 ); - } - - foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins'), 'updated' => __('Recently Updated') ) as $feed => $label ) { - if ( is_wp_error($$feed) || !$$feed->get_item_quantity() ) - continue; - - $items = $$feed->get_items(0, 5); - - // Pick a random, non-installed plugin - while ( true ) { - // Abort this foreach loop iteration if there's no plugins left of this type - if ( 0 == count($items) ) - continue 2; - - $item_key = array_rand($items); - $item = $items[$item_key]; - - list($link, $frag) = explode( '#', $item->get_link() ); - - $link = esc_url($link); - if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) ) - $slug = $matches[1]; - else { - unset( $items[$item_key] ); - continue; - } - - // Is this random plugin's slug already installed? If so, try again. - reset( $plugin_slugs ); - foreach ( $plugin_slugs as $plugin_slug ) { - if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) { - unset( $items[$item_key] ); - continue 2; - } - } - - // If we get to this point, then the random plugin isn't installed and we can stop the while(). - break; - } - - // Eliminate some common badly formed plugin descriptions - while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) ) - unset($items[$item_key]); - - if ( !isset($items[$item_key]) ) - continue; - - // current bbPress feed item titles are: user on "topic title" - if ( preg_match( '/"(.*)"/s', $item->get_title(), $matches ) ) - $title = $matches[1]; - else // but let's make it forward compatible if things change - $title = $item->get_title(); - $title = esc_html( $title ); - - $description = esc_html( strip_tags(@html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) ); - - $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . - '&TB_iframe=true&width=600&height=800'; - - echo "

    $label

    \n"; - echo "
    $title
     (" . __( 'Install' ) . ")\n"; - echo "

    $description

    \n"; - - $$feed->__destruct(); - unset($$feed); - } -} - /** * Checks to see if all of the feed url in $check_urls are cached. * @@ -1063,11 +845,11 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar } if ( $callback && is_callable( $callback ) ) { - $args = array_slice( func_get_args(), 2 ); - array_unshift( $args, $widget_id ); + $args = array_slice( func_get_args(), 3 ); + array_unshift( $args, $widget_id, $check_urls ); ob_start(); call_user_func_array( $callback, $args ); - set_transient( $cache_key, ob_get_flush(), 43200); // Default lifetime in cache of 12 hours (same as the feeds) + set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS ); // Default lifetime in cache of 12 hours (same as the feeds) } return true; @@ -1113,9 +895,11 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) { $widget_options[$widget_id]['number'] = $number; if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) { - $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] ); + $_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] ); $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] ); - // title is optional. If black, fill it if possible + $widget_options[$widget_id]['number'] = $number; + + // Title is optional. If black, fill it if possible. if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) { $rss = fetch_feed($widget_options[$widget_id]['url']); if ( is_wp_error($rss) ) { @@ -1134,41 +918,248 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) { wp_widget_rss_form( $widget_options[$widget_id], $form_inputs ); } -// Display File upload quota on dashboard +/** + * WordPress News dashboard widget. + * + * @since 2.7.0 + */ +function wp_dashboard_primary() { + $feeds = array( + 'news' => array( + + /** + * Filter the primary link URL for the 'WordPress News' dashboard widget. + * + * @since 2.5.0 + * + * @param string $link The widget's primary link URL. + */ + 'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ), + + /** + * Filter the primary feed URL for the 'WordPress News' dashboard widget. + * + * @since 2.3.0 + * + * @param string $url The widget's primary feed URL. + */ + 'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ), + + /** + * Filter the primary link title for the 'WordPress News' dashboard widget. + * + * @since 2.3.0 + * + * @param string $title Title attribute for the widget's primary link. + */ + 'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ), + 'items' => 1, + 'show_summary' => 1, + 'show_author' => 0, + 'show_date' => 1, + ), + 'planet' => array( + + /** + * Filter the secondary link URL for the 'WordPress News' dashboard widget. + * + * @since 2.3.0 + * + * @param string $link The widget's secondary link URL. + */ + 'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ), + + /** + * Filter the secondary feed URL for the 'WordPress News' dashboard widget. + * + * @since 2.3.0 + * + * @param string $url The widget's secondary feed URL. + */ + 'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ), + + /** + * Filter the secondary link title for the 'WordPress News' dashboard widget. + * + * @since 2.3.0 + * + * @param string $title Title attribute for the widget's secondary link. + */ + 'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ), + 'items' => 3, + 'show_summary' => 0, + 'show_author' => 0, + 'show_date' => 0, + ) + ); + + 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' ) ) ) { + $feeds['plugins'] = array( + 'link' => '', + 'url' => array( + 'popular' => 'http://wordpress.org/plugins/rss/browse/popular/', + ), + 'title' => '', + 'items' => 1, + 'show_summary' => 0, + 'show_author' => 0, + 'show_date' => 0, + ); + } + + wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_primary_output', $feeds ); +} + +/** + * Display the WordPress news feeds. + * + * @since 3.8.0 + * + * @param string $widget_id Widget ID. + * @param array $feeds Array of RSS feeds. + */ +function wp_dashboard_primary_output( $widget_id, $feeds ) { + foreach( $feeds as $type => $args ) { + $args['type'] = $type; + echo '
    '; + if ( $type === 'plugins' ) { + wp_dashboard_plugins_output( $args['url'], $args ); + } else { + wp_widget_rss_output( $args['url'], $args ); + } + echo "
    "; + } +} + +/** + * Display plugins text for the WordPress news widget. + * + * @since 2.5.0 + */ +function wp_dashboard_plugins_output( $rss, $args = array() ) { + // Plugin feeds plus link to install them + $popular = fetch_feed( $args['url']['popular'] ); + + if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) { + $plugin_slugs = array_keys( get_plugins() ); + set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS ); + } + + echo '
      '; + + foreach ( array( $popular ) as $feed ) { + if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() ) + continue; + + $items = $feed->get_items(0, 5); + + // Pick a random, non-installed plugin + while ( true ) { + // Abort this foreach loop iteration if there's no plugins left of this type + if ( 0 == count($items) ) + continue 2; + + $item_key = array_rand($items); + $item = $items[$item_key]; + + list($link, $frag) = explode( '#', $item->get_link() ); + + $link = esc_url($link); + if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) ) + $slug = $matches[1]; + else { + unset( $items[$item_key] ); + continue; + } + + // Is this random plugin's slug already installed? If so, try again. + reset( $plugin_slugs ); + foreach ( $plugin_slugs as $plugin_slug ) { + if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) { + unset( $items[$item_key] ); + continue 2; + } + } + + // If we get to this point, then the random plugin isn't installed and we can stop the while(). + break; + } + + // Eliminate some common badly formed plugin descriptions + while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) ) + unset($items[$item_key]); + + if ( !isset($items[$item_key]) ) + continue; + + $title = esc_html( $item->get_title() ); + + $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&TB_iframe=true&width=600&height=800'; + echo "
    • " . __( 'Popular Plugin' ) . ": $title (" . __( 'Install' ) . ")
      • "; + + $feed->__destruct(); + unset( $feed ); + } + + echo '
    '; +} + +/** + * Display file upload quota on dashboard. + * + * Runs on the activity_box_end hook in wp_dashboard_right_now(). + * + * @since 3.0.0 + * + * @return bool True if not multisite, user can't upload files, or the space check option is disabled. +*/ function wp_dashboard_quota() { - if ( !is_multisite() || !current_user_can('upload_files') || get_site_option( 'upload_space_check_disabled' ) ) + if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) ) return true; $quota = get_space_allowed(); - $used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024; + $used = get_space_used(); if ( $used > $quota ) $percentused = '100'; else $percentused = ( $used / $quota ) * 100; - $used_color = ( $percentused >= 70 ) ? ' spam' : ''; + $used_class = ( $percentused >= 70 ) ? ' warning' : ''; $used = round( $used, 2 ); $percentused = number_format( $percentused ); ?> -

    -
    - - - - - -
    %2$sMB' ), esc_url( admin_url( 'upload.php' ) ), $quota ); ?>
    -
    -
    - - - - - -
    %2$sMB (%3$s%%)' ), esc_url( admin_url( 'upload.php' ) ), $used, $percentused ); ?>
    +

    +
    +
      +
    • + %3$s', + esc_url( admin_url( 'upload.php' ) ), + __( 'Manage Uploads' ), + $text + ); ?> +
    • + %3$s', + esc_url( admin_url( 'upload.php' ) ), + __( 'Manage Uploads' ), + $text + ); ?> +
      • +
    -
    {$msg}

    "; - $notice .= '

    ' . sprintf( __( 'Update %2$s or learn how to browse happy' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), 'http://browsehappy.com/' ) . '

    '; + + $browsehappy = 'http://browsehappy.com/'; + $locale = get_locale(); + if ( 'en_US' !== $locale ) + $browsehappy = add_query_arg( 'locale', $locale, $browsehappy ); + + $notice .= '

    ' . sprintf( __( 'Update %2$s or learn how to browse happy' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '

    '; $notice .= '

    ' . __( 'Dismiss' ) . '

    '; $notice .= '
    '; } + /** + * Filter the notice output for the 'Browse Happy' nag meta box. + * + * @since 3.2.0 + * + * @param string $notice The notice content. + * @param array $response An array containing web browser information. + */ echo apply_filters( 'browse-happy-notice', $notice, $response ); } @@ -1228,10 +1233,10 @@ function wp_check_browser_version() { $options = array( 'body' => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ), - 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) + 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() ); - $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.0/', $options ); + $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options ); if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) return false; @@ -1247,12 +1252,12 @@ function wp_check_browser_version() { * 'img_src' - string - An image representing the browser * 'img_src_ssl' - string - An image (over SSL) representing the browser */ - $response = unserialize( wp_remote_retrieve_body( $response ) ); + $response = json_decode( wp_remote_retrieve_body( $response ), true ); - if ( ! $response ) + if ( ! is_array( $response ) ) return false; - set_site_transient( 'browser_' . $key, $response, 604800 ); // cache for 1 week + set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS ); } return $response; @@ -1266,98 +1271,63 @@ function wp_dashboard_empty() {} /** * Displays a welcome panel to introduce users to WordPress. * - * @since 3.3 + * @since 3.3.0 */ function wp_welcome_panel() { - global $wp_version; - - if ( ! current_user_can( 'edit_theme_options' ) ) - return; - - $classes = 'welcome-panel'; - - $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); - // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner - $hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) ); - if ( $hide ) - $classes .= ' hidden'; - - list( $display_version ) = explode( '-', $wp_version ); ?> -
    - - -
    -
    -

    -

    First Steps with WordPress. If you’d rather dive right in, here are a few things most people do first when they set up a new WordPress site. If you need help, use the Help tabs in the upper right corner to get information on how to use your current screen and where to go for more assistance.' ); ?>

    +

    +

    -

    -

    -
      -
    • Choose your privacy setting' ), esc_url( admin_url('options-privacy.php') ) ); ?>
      • -
    • Select your tagline and time zone' ), esc_url( admin_url('options-general.php') ) ); ?>
      • -
    • Turn comments on or off' ), esc_url( admin_url('options-discussion.php') ) ); ?>
      • -
    • Fill in your profile' ), esc_url( admin_url('profile.php') ) ); ?>
      • -
    + +

    + + + + true ) ) ) > 1 ) ) : ?> +

    change your theme completely' ), admin_url( 'themes.php' ) ); ?>

    +
    -

    -

    +

      -
    • sample page and post' ), esc_url( get_permalink( 2 ) ), esc_url( get_permalink( 1 ) ) ); ?>
      • -
    • sample page and post' ), esc_url( admin_url('edit.php?post_type=page') ), esc_url( admin_url('edit.php') ) ); ?>
      • -
    • Create an About Me page' ), esc_url( admin_url('edit.php?post_type=page') ) ); ?>
      • -
    • Write your first post' ), esc_url( admin_url('post-new.php') ) ); ?>
      • + +
    • ' . __( 'Edit your front page' ) . '', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?>
      • +
    • ' . __( 'Add additional pages' ) . '', admin_url( 'post-new.php?post_type=page' ) ); ?>
      • + +
    • ' . __( 'Edit your front page' ) . '', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?>
      • +
    • ' . __( 'Add additional pages' ) . '', admin_url( 'post-new.php?post_type=page' ) ); ?>
      • +
    • ' . __( 'Add a blog post' ) . '', admin_url( 'post-new.php' ) ); ?>
      • + +
    • ' . __( 'Write your first blog post' ) . '', admin_url( 'post-new.php' ) ); ?>
      • +
    • ' . __( 'Add an About page' ) . '', admin_url( 'post-new.php?post_type=page' ) ); ?>
      • + +
    • ' . __( 'View your site' ) . '', home_url( '/' ) ); ?>
    -

    - stylesheet_dir ) ) : - echo '

    '; - printf( __( 'Install a theme to get started customizing your site.' ), esc_url( admin_url( 'themes.php' ) ) ); - echo '

    '; - else: - $customize_links = array(); - if ( 'twentyeleven' == $ct->stylesheet ) - $customize_links[] = sprintf( __( 'Choose light or dark' ), esc_url( admin_url( 'themes.php?page=theme_options' ) ) ); - - if ( current_theme_supports( 'custom-background' ) ) - $customize_links[] = sprintf( __( 'Set a background color' ), esc_url( admin_url( 'themes.php?page=custom-background' ) ) ); - - if ( current_theme_supports( 'custom-header' ) ) - $customize_links[] = sprintf( __( 'Select a new header image' ), esc_url( admin_url( 'themes.php?page=custom-header' ) ) ); - - if ( current_theme_supports( 'widgets' ) ) - $customize_links[] = sprintf( __( 'Add some widgets' ), esc_url( admin_url( 'widgets.php' ) ) ); - - if ( ! empty( $customize_links ) ) { - echo '

    '; - printf( __( 'Use the current theme — %1$s — or choose a new one. If you stick with %3$s, here are a few ways to make your site look unique.' ), $ct->title, esc_url( admin_url( 'themes.php' ) ), $ct->title ); - echo '

    '; - ?> -
      - -
      • - -
    - '; - printf( __( 'Use the current theme — %1$s — or choose a new one.' ), $ct->title, esc_url( admin_url( 'themes.php' ) ) ); - echo '

    '; - } - endif; ?> -
    +

    +
      + +
    • widgets or menus' ), + admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); + } elseif ( current_theme_supports( 'widgets' ) ) { + echo '' . __( 'Manage widgets' ) . ''; + } else { + echo '' . __( 'Manage menus' ) . ''; + } + ?>
      • + + +
    • ' . __( 'Turn comments on or off' ) . '', admin_url( 'options-discussion.php' ) ); ?>
      • + +
    • ' . __( 'Learn more about getting started' ) . '', __( 'http://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?>
      • +
    -

    Dismiss this message.' ), esc_url( admin_url( '?welcome=0' ) ) ); ?>