-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
+
+
+
+
-
+
- 'save-post', 'tabindex'=> 4 ) ); ?>
+ 'save-post' ) ); ?>
-
-
-
-
@@ -550,10 +570,6 @@ function wp_dashboard_quick_press_output() {
wp_dashboard_recent_drafts( $drafts );
}
-function wp_dashboard_quick_press() {
- echo '
' . __( 'Loading…' ) . '
' . __('This widget requires JavaScript.') . '
';
-}
-
function wp_dashboard_recent_drafts( $drafts = false ) {
if ( !$drafts ) {
$drafts_query = new WP_Query( array(
@@ -573,15 +589,15 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
$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 ) ? '…' : '' ) . '
';
+ if ( $the_content = wp_trim_words( $draft->post_content, 10 ) )
+ $item .= '
' . $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" ) ) {
+ $comments_query = array( 'number' => $total_items * 5, 'offset' => 0 );
+ if ( ! current_user_can( 'edit_posts' ) )
+ $comments_query['status'] = 'approve';
+ while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
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;
+ if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+ continue;
+ $comments[] = $comment;
+ if ( count( $comments ) == $total_items )
+ break 2;
}
-
- $start = $start + 50;
+ $comments_query['offset'] += $comments_query['number'];
+ $comments_query['number'] = $total_items * 10;
}
- if ( $comments ) :
-?>
-
-
+ echo '
';
-
-
-views();
wp_comment_reply( -1, false, 'dashboard', false );
wp_comment_trashnotice();
-
- else :
-?>
-
-
-
-' . __( 'No comments yet.' ) . '';
+ }
}
function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
@@ -677,15 +680,15 @@ 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'] = "';
- $actions['unapprove'] = "';
+ $actions['approve'] = "
" . __( 'Approve' ) . ' ';
+ $actions['unapprove'] = "
" . __( 'Unapprove' ) . ' ';
$actions['edit'] = "
". __('Edit') . ' ';
$actions['reply'] = '
' . __('Reply') . ' ';
- $actions['spam'] = "';
+ $actions['spam'] = "
" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ' ';
if ( !EMPTY_TRASH_DAYS )
- $actions['delete'] = "';
+ $actions['delete'] = "
" . __('Delete Permanently') . ' ';
else
- $actions['trash'] = "';
+ $actions['trash'] = "
" . _x('Trash', 'verb') . ' ';
$actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
@@ -767,7 +770,7 @@ function wp_dashboard_recent_comments_control() {
}
function wp_dashboard_incoming_links() {
- echo '
' . __( 'Loading…' ) . '
' . __('This widget requires JavaScript.') . '
';
+ wp_dashboard_cached_rss_widget( 'dashboard_incoming_links', 'wp_dashboard_incoming_links_output' );
}
/**
@@ -824,7 +827,7 @@ function wp_dashboard_incoming_links_output() {
$publisher = "
$publisher ";
$content = $item->get_content();
- $content = wp_html_excerpt($content, 50) . ' ...';
+ $content = wp_html_excerpt( $content, 50, ' …' );
if ( $link )
/* translators: incoming links feed, %1$s is other person, %3$s is content */
@@ -833,10 +836,13 @@ function wp_dashboard_incoming_links_output() {
/* 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' );
+ if ( !empty( $show_date ) ) {
+ if ( $link )
+ /* translators: incoming links feed, %1$s is other person, %3$s is content, %4$s is the date */
+ $text = __( '%1$s linked here
saying , "%3$s" on %4$s' );
+ else
+ /* translators: incoming links feed, %1$s is other person, %3$s is content, %4$s is the date */
+ $text = __( '%1$s linked here saying, "%3$s" on %4$s' );
$date = esc_html( strip_tags( $item->get_date() ) );
$date = strtotime( $date );
$date = gmdate( get_option( 'date_format' ), $date );
@@ -855,7 +861,7 @@ function wp_dashboard_incoming_links_control() {
}
function wp_dashboard_primary() {
- echo '
' . __( 'Loading…' ) . '
' . __('This widget requires JavaScript.') . '
';
+ wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_rss_output' );
}
function wp_dashboard_primary_control() {
@@ -863,7 +869,7 @@ function wp_dashboard_primary_control() {
}
/**
- * {@internal Missing Short Description}}
+ * Display primary dashboard RSS widget feed.
*
* @since 2.5.0
*
@@ -877,7 +883,7 @@ function wp_dashboard_rss_output( $widget_id ) {
}
function wp_dashboard_secondary() {
- echo '
' . __( 'Loading…' ) . '
' . __('This widget requires JavaScript.') . '
';
+ wp_dashboard_cached_rss_widget( 'dashboard_secondary', 'wp_dashboard_secondary_output' );
}
function wp_dashboard_secondary_control() {
@@ -916,7 +922,10 @@ function wp_dashboard_secondary_output() {
}
function wp_dashboard_plugins() {
- echo '
' . __( 'Loading…' ) . '
' . __('This widget requires JavaScript.') . '
';
+ wp_dashboard_cached_rss_widget( 'dashboard_plugins', 'wp_dashboard_plugins_output', array(
+ 'http://wordpress.org/plugins/rss/browse/popular/',
+ 'http://wordpress.org/plugins/rss/browse/new/'
+ ) );
}
/**
@@ -925,16 +934,15 @@ function wp_dashboard_plugins() {
* @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/' );
+ $popular = fetch_feed( 'http://wordpress.org/plugins/rss/browse/popular/' );
+ $new = fetch_feed( 'http://wordpress.org/plugins/rss/browse/new/' );
if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
$plugin_slugs = array_keys( get_plugins() );
- set_transient( 'plugin_slugs', $plugin_slugs, 86400 );
+ set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS );
}
- foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins'), 'updated' => __('Recently Updated') ) as $feed => $label ) {
+ foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins') ) as $feed => $label ) {
if ( is_wp_error($$feed) || !$$feed->get_item_quantity() )
continue;
@@ -979,12 +987,7 @@ function wp_dashboard_plugins_output() {
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 );
+ $title = esc_html( $item->get_title() );
$description = esc_html( strip_tags(@html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) );
@@ -1004,7 +1007,7 @@ function wp_dashboard_plugins_output() {
* Checks to see if all of the feed url in $check_urls are cached.
*
* If $check_urls is empty, look for the rss feed url found in the dashboard
- * widget optios of $widget_id. If cached, call $callback, a function that
+ * widget options of $widget_id. If cached, call $callback, a function that
* echoes out output for this widget. If not cache, echo a "Loading..." stub
* which is later replaced by AJAX call (see top of /wp-admin/index.php)
*
@@ -1016,30 +1019,35 @@ function wp_dashboard_plugins_output() {
* @return bool False on failure. True on success.
*/
function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
- $loading = '
' . __( 'Loading…' ) . '
';
+ $loading = '
' . __( 'Loading…' ) . '
' . __( 'This widget requires JavaScript.' ) . '
';
+ $doing_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
if ( empty($check_urls) ) {
$widgets = get_option( 'dashboard_widget_options' );
- if ( empty($widgets[$widget_id]['url']) ) {
+ if ( empty($widgets[$widget_id]['url']) && ! $doing_ajax ) {
echo $loading;
return false;
}
$check_urls = array( $widgets[$widget_id]['url'] );
}
- include_once ABSPATH . WPINC . '/class-feed.php';
- foreach ( $check_urls as $check_url ) {
- $cache = new WP_Feed_Cache_Transient('', md5($check_url), '');
- if ( ! $cache->load() ) {
- echo $loading;
- return false;
- }
+ $cache_key = 'dash_' . md5( $widget_id );
+ if ( false !== ( $output = get_transient( $cache_key ) ) ) {
+ echo $output;
+ return true;
+ }
+
+ if ( ! $doing_ajax ) {
+ echo $loading;
+ return false;
}
if ( $callback && is_callable( $callback ) ) {
$args = array_slice( func_get_args(), 2 );
array_unshift( $args, $widget_id );
+ 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)
}
return true;
@@ -1085,9 +1093,9 @@ 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
+ // 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) ) {
@@ -1099,24 +1107,34 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
}
}
update_option( 'dashboard_widget_options', $widget_options );
+ $cache_key = 'dash_' . md5( $widget_id );
+ delete_transient( $cache_key );
}
wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
}
-// Display File upload quota on dashboard
+/**
+ * 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('edit_posts') || 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 ) ? ( ( $percentused >= 40 ) ? 'waiting' : 'approved' ) : 'spam';
+ $used_color = ( $percentused >= 70 ) ? ' spam' : '';
$used = round( $used, 2 );
$percentused = number_format( $percentused );
@@ -1125,7 +1143,7 @@ function wp_dashboard_quota() {
- %2$sMB' ), esc_url( admin_url( 'upload.php' ) ), $quota ); ?>
+ %2$sMB' ), esc_url( admin_url( 'upload.php' ) ), number_format_i18n( $quota ) ); ?>
@@ -1133,8 +1151,8 @@ function wp_dashboard_quota() {
@@ -1143,9 +1161,147 @@ function wp_dashboard_quota() {
}
add_action( 'activity_box_end', 'wp_dashboard_quota' );
+// Display Browser Nag Meta Box
+function wp_dashboard_browser_nag() {
+ $notice = '';
+ $response = wp_check_browser_version();
+
+ if ( $response ) {
+ if ( $response['insecure'] ) {
+ $msg = sprintf( __( "It looks like you're using an insecure version of
%s . Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
+ } else {
+ $msg = sprintf( __( "It looks like you're using an old version of
%s . For the best WordPress experience, please update your browser." ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
+ }
+
+ $browser_nag_class = '';
+ if ( !empty( $response['img_src'] ) ) {
+ $img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) )? $response['img_src_ssl'] : $response['img_src'];
+
+ $notice .= '
';
+ $browser_nag_class = ' has-browser-icon';
+ }
+ $notice .= "
{$msg}
";
+
+ $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 .= '
';
+ }
+
+ echo apply_filters( 'browse-happy-notice', $notice, $response );
+}
+
+function dashboard_browser_nag_class( $classes ) {
+ $response = wp_check_browser_version();
+
+ if ( $response && $response['insecure'] )
+ $classes[] = 'browser-insecure';
+
+ return $classes;
+}
+
+/**
+ * Check if the user needs a browser update
+ *
+ * @since 3.2.0
+ *
+ * @return array|bool False on failure, array of browser data on success.
+ */
+function wp_check_browser_version() {
+ if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
+ return false;
+
+ $key = md5( $_SERVER['HTTP_USER_AGENT'] );
+
+ if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
+ global $wp_version;
+
+ $options = array(
+ 'body' => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
+ 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url()
+ );
+
+ $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.0/', $options );
+
+ if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+ return false;
+
+ /**
+ * Response should be an array with:
+ * 'name' - string - A user friendly browser name
+ * 'version' - string - The most recent version of the browser
+ * 'current_version' - string - The version of the browser the user is using
+ * 'upgrade' - boolean - Whether the browser needs an upgrade
+ * 'insecure' - boolean - Whether the browser is deemed insecure
+ * 'upgrade_url' - string - The url to visit to upgrade
+ * 'img_src' - string - An image representing the browser
+ * 'img_src_ssl' - string - An image (over SSL) representing the browser
+ */
+ $response = maybe_unserialize( wp_remote_retrieve_body( $response ) );
+
+ if ( ! is_array( $response ) )
+ return false;
+
+ set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
+ }
+
+ return $response;
+}
+
/**
* Empty function usable by plugins to output empty dashboard widget (to be populated later by JS).
*/
function wp_dashboard_empty() {}
-?>
+/**
+ * Displays a welcome panel to introduce users to WordPress.
+ *
+ * @since 3.3.0
+ */
+function wp_welcome_panel() {
+ ?>
+
+
+
+
+
+
+
+
+ true ) ) ) > 1 ) ) : ?>
+
change your theme completely' ), admin_url( 'themes.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( '/' ) ); ?>
+
+
+
', admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); ?>
+
' . __( 'Turn comments on or off' ) . '', admin_url( 'options-discussion.php' ) ); ?>
+
' . __( 'Learn more about getting started' ) . '', __( 'http://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?>
+
+
+
+
+