]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/includes/dashboard.php
WordPress 4.2
[autoinstalls/wordpress.git] / wp-admin / includes / dashboard.php
index fb50197e17ab4f48091482a75d457c7b295a3c77..7179aa3480c7f51fd2711daa48c1b2537ab2c6a6 100644 (file)
@@ -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();
@@ -123,9 +118,6 @@ 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', '' );
 
@@ -163,7 +155,7 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_
 }
 
 function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
-       echo '<form action="" method="post" class="dashboard-widget-control-form">';
+       echo '<form method="post" class="dashboard-widget-control-form">';
        wp_dashboard_trigger_widget_control( $meta_box['id'] );
        wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' );
        echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
@@ -186,16 +178,16 @@ function wp_dashboard() {
 
 ?>
 <div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
-       <div id='postbox-container-1' class='postbox-container'>
+       <div id="postbox-container-1" class="postbox-container">
        <?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
        </div>
-       <div id='postbox-container-2' class='postbox-container'>
+       <div id="postbox-container-2" class="postbox-container">
        <?php do_meta_boxes( $screen->id, 'side', '' ); ?>
        </div>
-       <div id='postbox-container-3' class='postbox-container'>
+       <div id="postbox-container-3" class="postbox-container">
        <?php do_meta_boxes( $screen->id, 'column3', '' ); ?>
        </div>
-       <div id='postbox-container-4' class='postbox-container'>
+       <div id="postbox-container-4" class="postbox-container">
        <?php do_meta_boxes( $screen->id, 'column4', '' ); ?>
        </div>
 </div>
@@ -218,11 +210,6 @@ function wp_dashboard() {
  * @since 2.7.0
  */
 function wp_dashboard_right_now() {
-       $theme = wp_get_theme();
-       if ( current_user_can( 'switch_themes' ) )
-               $theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme->display('Name') );
-       else
-               $theme_name = $theme->display('Name');
 ?>
        <div class="main">
        <ul>
@@ -248,8 +235,8 @@ function wp_dashboard_right_now() {
        }
        // 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 ) );
+       if ( $num_comm && $num_comm->approved ) {
+               $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
                ?>
                <li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
                <?php
@@ -392,14 +379,16 @@ function wp_network_dashboard_right_now() {
 
        <form action="<?php echo network_admin_url('users.php'); ?>" method="get">
                <p>
-                       <input type="search" name="s" value="" size="30" autocomplete="off" />
+                       <label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
+                       <input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
                        <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
                </p>
        </form>
 
        <form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
                <p>
-                       <input type="search" name="s" value="" size="30" autocomplete="off" />
+                       <label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
+                       <input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
                        <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
                </p>
        </form>
@@ -469,7 +458,7 @@ function wp_dashboard_quick_press( $error_msg = false ) {
 
                <div class="textarea-wrap" id="description-wrap">
                        <label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e( 'What&#8217;s on your mind?' ); ?></label>
-                       <textarea name="content" id="content" class="mceEditor" rows="3" cols="15"></textarea>
+                       <textarea name="content" id="content" class="mceEditor" rows="3" cols="15" autocomplete="off"></textarea>
                </div>
 
                <p class="submit">
@@ -531,7 +520,7 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
 function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
        $GLOBALS['comment'] =& $comment;
 
-       $comment_post_title = strip_tags(get_the_title( $comment->comment_post_ID ));
+       $comment_post_title = _draft_or_post_title( $comment->comment_post_ID );
 
        if ( current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
                $comment_post_url = get_edit_post_link( $comment->comment_post_ID );
@@ -544,7 +533,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 
        $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' => '',
@@ -614,16 +603,16 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 
                        <?php
                        else :
-                               switch ( $comment->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 );
                        ?>
                        <div class="dashboard-comment-wrap">
@@ -702,6 +691,15 @@ function wp_dashboard_recent_posts( $args ) {
                'cache_results'  => false,
                'perm'           => ( 'future' === $args['status'] ) ? 'editable' : 'readable',
        );
+
+       /**
+        * Filter the query arguments used for the Recent Posts widget.
+        *
+        * @since 4.2.0
+        *
+        * @param array $query_args The arguments passed to WP_Query to produce the list of posts.
+        */
+       $query_args = apply_filters( 'dashboard_recent_posts_query_args', $query_args );
        $posts = new WP_Query( $query_args );
 
        if ( $posts->have_posts() ) {
@@ -712,7 +710,6 @@ function wp_dashboard_recent_posts( $args ) {
 
                echo '<ul>';
 
-               $i = 0;
                $today    = date( 'Y-m-d', current_time( 'timestamp' ) );
                $tomorrow = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) );
 
@@ -729,15 +726,12 @@ function wp_dashboard_recent_posts( $args ) {
                                $relative = date_i18n( __( 'M jS' ), $time );
                        }
 
-                       if ( current_user_can( 'edit_post', get_the_ID() ) ) {
-                               /* translators: 1: relative date, 2: time, 3: post edit link, 4: post title */
-                               $format = __( '<span>%1$s, %2$s</span> <a href="%3$s">%4$s</a>' );
-                               printf( "<li>$format</li>", $relative, get_the_time(), get_edit_post_link(), _draft_or_post_title() );
-                       } else {
-                               /* translators: 1: relative date, 2: time, 3: post title */
-                               $format = __( '<span>%1$s, %2$s</span> %3$s' );
-                               printf( "<li>$format</li>", $relative, get_the_time(), _draft_or_post_title() );
-                       }
+                       // Use the post edit link for those who can edit, the permalink otherwise.
+                       $recent_post_link = current_user_can( 'edit_post', get_the_ID() ) ? get_edit_post_link() : get_permalink();
+
+                       /* translators: 1: relative date, 2: time, 3: post edit link or permalink, 4: post title */
+                       $format = __( '<span>%1$s, %2$s</span> <a href="%3$s">%4$s</a>' );
+                       printf( "<li>$format</li>", $relative, get_the_time(), $recent_post_link, _draft_or_post_title() );
                }
 
                echo '</ul>';
@@ -761,11 +755,8 @@ function wp_dashboard_recent_posts( $args ) {
  * @return bool False if no comments were found. True otherwise.
  */
 function wp_dashboard_recent_comments( $total_items = 5 ) {
-       global $wpdb;
-
        // Select all comment types and filter out spam later for better query performance.
        $comments = array();
-       $start = 0;
 
        $comments_query = array(
                'number' => $total_items * 5,
@@ -786,8 +777,6 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
                $comments_query['number'] = $total_items * 10;
        }
 
-
-
        if ( $comments ) {
                echo '<div id="latest-comments" class="activity-block">';
                echo '<h4>' . __( 'Comments' ) . '</h4>';
@@ -864,8 +853,8 @@ 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(), 12 * HOUR_IN_SECONDS ); // Default lifetime in cache of 12 hours (same as the feeds)
@@ -917,7 +906,8 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
                $_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] );
                $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
                $widget_options[$widget_id]['number'] = $number;
-               // title is optional. If black, fill it if possible
+
+               // 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) ) {
@@ -985,7 +975,7 @@ function wp_dashboard_primary() {
                         *
                         * @param string $link The widget's secondary link URL.
                         */
-                       'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
+                       'link' => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ),
 
                        /**
                         * Filter the secondary feed URL for the 'WordPress News' dashboard widget.
@@ -994,7 +984,7 @@ function wp_dashboard_primary() {
                         *
                         * @param string $url The widget's secondary feed URL.
                         */
-                       'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
+                       'url' => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ),
 
                        /**
                         * Filter the secondary link title for the 'WordPress News' dashboard widget.
@@ -1065,13 +1055,11 @@ function wp_dashboard_plugins_output( $rss, $args = array() ) {
 
        echo '<ul>';
 
-       foreach ( array(
-               'popular' => __( 'Popular Plugin' )
-       ) as $feed => $label ) {
-               if ( is_wp_error($$feed) || !$$feed->get_item_quantity() )
+       foreach ( array( $popular ) as $feed ) {
+               if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
                        continue;
 
-               $items = $$feed->get_items(0, 5);
+               $items = $feed->get_items(0, 5);
 
                // Pick a random, non-installed plugin
                while ( true ) {
@@ -1114,14 +1102,11 @@ function wp_dashboard_plugins_output( $rss, $args = array() ) {
 
                $title = esc_html( $item->get_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) . '&amp;TB_iframe=true&amp;width=600&amp;height=800';
+               echo "<li class='dashboard-news-plugin'><span>" . __( 'Popular Plugin' ) . ":</span> <a href='$link' class='dashboard-news-plugin-link'>$title</a>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span></li>";
 
-               echo "<li class='dashboard-news-plugin'><span>$label:</span> <a href='$link' class='dashboard-news-plugin-link'>$title</a>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span></li>";
-
-               $$feed->__destruct();
-               unset( $$feed );
+               $feed->__destruct();
+               unset( $feed );
        }
 
        echo '</ul>';
@@ -1134,7 +1119,7 @@ function wp_dashboard_plugins_output( $rss, $args = array() ) {
  *
  * @since 3.0.0
  *
- * @return bool True if not multisite, user can't upload files, or the space check option is disabled.
+ * @return bool|null 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' ) )
@@ -1303,8 +1288,10 @@ function wp_welcome_panel() {
        <p class="about-description"><?php _e( 'We&#8217;ve assembled some links to get you started:' ); ?></p>
        <div class="welcome-panel-column-container">
        <div class="welcome-panel-column">
-               <h4><?php _e( 'Get Started' ); ?></h4>
-               <a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+               <?php if ( current_user_can( 'customize' ) ): ?>
+                       <h4><?php _e( 'Get Started' ); ?></h4>
+                       <a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+               <?php endif; ?>
                <a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
                <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
                        <p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>
@@ -1345,7 +1332,7 @@ function wp_welcome_panel() {
                <?php if ( current_user_can( 'manage_options' ) ) : ?>
                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
                <?php endif; ?>
-                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', __( 'http://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?></li>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', __( 'https://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?></li>
                </ul>
        </div>
        </div>