PluginProbe
Jetpack – WP Security, Backup, Speed, & Growth / 16.2
Jetpack – WP Security, Backup, Speed, & Growth v16.2
16.2 16.2-beta 12.0.3 12.1.3 12.2.3 12.3.2 12.4.2 12.5.2 12.6.4 12.7.3 12.8.3 12.9.5 13.0.2 13.1.5 13.2.4 13.3.3 13.4.5 13.5.2 13.6.2 13.7.2 13.8.3 13.9.2 14.0.1 14.1.1 14.2.2 All 502 releases
← All changes | modules/stats.php +79 -457 13.7.216.2 View file →
@@ -1,8 +1,8 @@
1 1 <?php
2 2 /**
3 3 * Module Name: Jetpack Stats
4 - * Module Description: Collect valuable traffic stats and insights.
4 + * Module Description: Clear, concise traffic insights right in your WordPress dashboard.
5 5 * Sort Order: 1
6 6 * Recommendation Order: 2
7 7 * First Introduced: 1.1
8 8 * Requires Connection: Yes
@@ -15,10 +15,8 @@
15 15 */
16 16
17 17 use Automattic\Jetpack\Admin_UI\Admin_Menu;
18 18 use Automattic\Jetpack\Connection\Client;
19 -use Automattic\Jetpack\Connection\Manager as Connection_Manager;
20 -use Automattic\Jetpack\Connection\XMLRPC_Async_Call;
21 19 use Automattic\Jetpack\Redirect;
22 20 use Automattic\Jetpack\Stats\Main as Stats;
23 21 use Automattic\Jetpack\Stats\Options as Stats_Options;
24 22 use Automattic\Jetpack\Stats\Tracking_Pixel as Stats_Tracking_Pixel;
@@ -23,14 +21,18 @@
23 21 use Automattic\Jetpack\Stats\Options as Stats_Options;
24 22 use Automattic\Jetpack\Stats\Tracking_Pixel as Stats_Tracking_Pixel;
25 23 use Automattic\Jetpack\Stats\WPCOM_Stats;
26 24 use Automattic\Jetpack\Stats\XMLRPC_Provider as Stats_XMLRPC;
25 +use Automattic\Jetpack\Stats_Admin\Admin_Post_List_Column;
27 26 use Automattic\Jetpack\Stats_Admin\Dashboard as Stats_Dashboard;
28 27 use Automattic\Jetpack\Stats_Admin\Main as Stats_Main;
29 -use Automattic\Jetpack\Stats_Admin\Notices as Stats_Notices;
30 28 use Automattic\Jetpack\Status\Host;
31 29 use Automattic\Jetpack\Tracking;
32 30
31 +if ( ! defined( 'ABSPATH' ) ) {
32 + exit( 0 );
33 +}
34 +
33 35 if ( defined( 'STATS_DASHBOARD_SERVER' ) ) {
34 36 return;
35 37 }
36 38
@@ -53,20 +55,21 @@
53 55 */
54 56 function stats_load() {
55 57 Jetpack::enable_module_configurable( __FILE__ );
56 58
57 - add_action( 'wp_head', 'stats_admin_bar_head', 100 );
59 + // Only run the callback for those who can see the stats.
60 + if ( is_user_logged_in() && current_user_can( 'view_stats' ) ) {
61 + add_action( 'admin_head', 'stats_admin_bar_head', 100 );
62 + add_action( 'wp_head', 'stats_admin_bar_head', 100 );
63 + }
58 64
65 + Admin_Post_List_Column::register();
66 +
59 67 add_action( 'jetpack_admin_menu', 'stats_admin_menu' );
68 + add_action( 'wp_before_admin_bar_render', 'stats_add_link_to_admin_bar_site_menu' );
60 69
61 70 add_filter( 'pre_option_db_version', 'stats_ignore_db_version' );
62 71
63 - // Add an icon to see stats in WordPress.com for a particular post.
64 - add_action( 'admin_print_styles-edit.php', 'jetpack_stats_load_admin_css' );
65 - add_filter( 'manage_posts_columns', 'jetpack_stats_post_table' );
66 - add_filter( 'manage_pages_columns', 'jetpack_stats_post_table' );
67 - add_action( 'manage_posts_custom_column', 'jetpack_stats_post_table_cell', 10, 2 );
68 - add_action( 'manage_pages_custom_column', 'jetpack_stats_post_table_cell', 10, 2 );
69 72 // Filter for adding the Jetpack plugin version to tracking stats.
70 73 add_filter( 'stats_array', 'filter_stats_array_add_jp_version' );
71 74
72 75 require_once __DIR__ . '/stats/class-jetpack-stats-upgrade-nudges.php';
@@ -229,9 +232,9 @@
229 232 $redirect_url = str_replace( array( '/wp-admin/index.php?', '/wp-admin/?' ), '/wp-admin/admin.php?', isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : null );
230 233 $relative_pos = strpos( $redirect_url, '/wp-admin/' );
231 234 if ( false !== $relative_pos ) {
232 235 wp_safe_redirect( admin_url( substr( $redirect_url, $relative_pos + 10 ) ) );
233 - exit;
236 + exit( 0 );
234 237 }
235 238 }
236 239
237 240 // phpcs:ignore WordPress.Security.NonceVerification.Recommended
@@ -249,11 +252,9 @@
249 252 $hook = Admin_Menu::add_menu( __( 'Stats', 'jetpack' ), __( 'Stats', 'jetpack' ), 'view_stats', 'stats', 'jetpack_admin_ui_stats_report_page_wrapper' );
250 253 add_action( "load-$hook", 'stats_reports_load' );
251 254 } else {
252 255 // Enable the new Odyssey Stats experience.
253 - $stats_dashboard = new Stats_Dashboard();
254 - $hook = Admin_Menu::add_menu( __( 'Stats', 'jetpack' ), __( 'Stats', 'jetpack' ), 'view_stats', 'stats', array( $stats_dashboard, 'render' ) );
255 - add_action( "load-$hook", array( $stats_dashboard, 'admin_init' ) );
256 + Stats_Dashboard::init();
256 257 }
257 258 }
258 259
259 260 /**
@@ -293,9 +294,8 @@
293 294 // Detect if JS is on. If so, remove cookie so next page load is via JS.
294 295 add_action( 'admin_print_footer_scripts', 'stats_js_remove_stnojs_cookie' );
295 296 } elseif ( ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
296 297 // Normal page load. Load page content via JS.
297 - add_action( 'admin_print_footer_scripts', 'stats_js_load_page_via_ajax' );
298 298 add_action( 'admin_print_footer_scripts', 'stats_script_dismiss_nudge_handler' );
299 299 }
300 300 }
301 301
@@ -314,10 +314,10 @@
314 314 element.classList.toggle( "is-hidden" );
315 315 // Send an AJAX request.
316 316 // Note we can provide a 'postponed_for' parameter to set the delay.
317 317 // Without a parameter it defaults to 30 days which is what we want here.
318 - let nonce = <?php echo wp_json_encode( wp_create_nonce( 'wp_rest' ) ); ?>;
319 - let url = <?php echo wp_json_encode( rest_url( '/jetpack/v4/stats-app/stats/notices' ) ); ?>;
318 + let nonce = <?php echo wp_json_encode( wp_create_nonce( 'wp_rest' ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?>;
319 + let url = <?php echo wp_json_encode( rest_url( '/jetpack/v4/stats-app/stats/notices' ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?>;
320 320 let data = {
321 321 id: 'opt_in_new_stats',
322 322 status: 'postponed',
323 323 };
@@ -345,16 +345,8 @@
345 345 max-width: 1040px;
346 346 margin: 0 auto;
347 347 overflow: hidden;
348 348 }
349 -
350 -#stats-loading-wrap p {
351 - text-align: center;
352 - font-size: 2em;
353 - margin-bottom: 3em;
354 - height: 64px;
355 - line-height: 64px;
356 -}
357 349 </style>
358 350 <?php
359 351 }
360 352
@@ -368,9 +360,9 @@
368 360 $parsed = wp_parse_url( admin_url() );
369 361 ?>
370 362 <script type="text/javascript">
371 363 /* <![CDATA[ */
372 -document.cookie = 'stnojs=0; expires=Wed, 9 Mar 2011 16:55:50 UTC; path=<?php echo esc_js( $parsed['path'] ); ?>';
364 +document.cookie = <?php echo wp_json_encode( 'stnojs=0; expires=Wed, 9 Mar 2011 16:55:50 UTC; path=' . $parsed['path'], JSON_UNESCAPED_SLASHES | JSON_HEX_TAG ); ?>;
373 365 /* ]]> */
374 366 </script>
375 367 <?php
376 368 }
@@ -375,33 +367,8 @@
375 367 <?php
376 368 }
377 369
378 370 /**
379 - * Normal page load. Load page content via JS.
380 - *
381 - * @access public
382 - * @return void
383 - */
384 -function stats_js_load_page_via_ajax() {
385 - ?>
386 -<script type="text/javascript">
387 -/* <![CDATA[ */
388 -if ( -1 == document.location.href.indexOf( 'noheader' ) ) {
389 - jQuery( function( $ ) {
390 - const loadStatsUrl = new URL( document.location.href );
391 - loadStatsUrl.searchParams.append( 'noheader', 1 );
392 - $.get( loadStatsUrl.toString(), function( responseText ) {
393 - $( '#stats-loading-wrap' ).replaceWith( responseText );
394 - $( '#jp-stats-wrap' )[0].dispatchEvent( new Event( 'stats-loaded' ) );
395 - } );
396 - } );
397 -}
398 -/* ]]> */
399 -</script>
400 - <?php
401 -}
402 -
403 -/**
404 371 * Jetpack Admin Page Wrapper.
405 372 */
406 373 function jetpack_admin_ui_stats_report_page_wrapper() {
407 374 if ( ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) && empty( $_COOKIE['stnojs'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
@@ -419,9 +386,9 @@
419 386 */
420 387 function stats_reports_page( $main_chart_only = false ) {
421 388 if ( isset( $_GET['dashboard'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
422 389 stats_dashboard_widget_content();
423 - exit; // @phan-suppress-current-line PhanPluginUnreachableCode -- Safer to include it even though stats_dashboard_widget_content() never returns.
390 + exit( 0 ); // @phan-suppress-current-line PhanPluginUnreachableCode -- Safer to include it even though stats_dashboard_widget_content() never returns.
424 391 }
425 392
426 393 $blog_id = Stats_Options::get_option( 'blog_id' );
427 394 $learn_url = Redirect::get_url( 'jetpack-stats-learn-more' );
@@ -428,12 +395,9 @@
428 395 $redirect_url = admin_url( 'admin.php?page=stats&enable_new_stats=1' );
429 396 $stats_bg_url = plugins_url( 'images/odyssey-upgrade/background.png', JETPACK__PLUGIN_FILE );
430 397 $stats_bg_gradient_url = plugins_url( 'images/odyssey-upgrade/gradient.png', JETPACK__PLUGIN_FILE );
431 398
432 - if ( ! $main_chart_only && ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) && empty( $_COOKIE['stnojs'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
433 - $nojs_url = add_query_arg( 'nojs', '1' );
434 - $http = is_ssl() ? 'https' : 'http';
435 - // Loading message. No JS fallback message.
399 + if ( ! $main_chart_only && ! isset( $_GET['noheader'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
436 400 ?>
437 401
438 402 <style>
439 403 .stats-odyssey-notice {
@@ -532,9 +496,9 @@
532 496 $i18n_headers = jetpack_get_module_i18n( 'stats' );
533 497 ?>
534 498 <a
535 499 style="font-size:13px;"
536 - href="<?php echo esc_url( admin_url( 'admin.php?page=jetpack#/settings?term=' . rawurlencode( $i18n_headers['name'] ) ) ); ?>"
500 + href="<?php echo esc_url( admin_url( 'admin.php?page=jetpack#/settings?term=' . rawurlencode( $i18n_headers['name'] ?? '' ) ) ); ?>"
537 501 >
538 502 <?php esc_html_e( 'Configure', 'jetpack' ); ?>
539 503 </a>
540 504 <?php
@@ -539,19 +503,8 @@
539 503 </a>
540 504 <?php
541 505 endif;
542 506
543 - /**
544 - * Sets external resource URL.
545 - *
546 - * @module stats
547 - *
548 - * @since 1.4.0
549 - * @todo Clean up various uses of this filter. It's seemingly filtering different types of images in different places.
550 - *
551 - * @param string $args URL of external resource.
552 - */
553 - $static_url = apply_filters( 'jetpack_static_url', "{$http}://en.wordpress.com/i/loading/loading-64.gif" );
554 507 ?>
555 508 </h2>
556 509 </div>
557 510 <div class="wrap">
@@ -557,9 +510,9 @@
557 510 <div class="wrap">
558 511 <div class="stats-odyssey-notice stats-odyssey-notice--content__highlighted">
559 512 <div class="stats-odyssey-notice--content">
560 513 <h2 class="stats-odyssey-notice--content-header"><?php esc_html_e( 'Deprecated Jetpack Stats Experience', 'jetpack' ); ?></h2>
561 - <p class="stats-odyssey-notice--content-text"><?php esc_html_e( 'The old Jetpack Stats has been deprecated and will be removed soon. Please click the button to enable the new experience.', 'jetpack' ); ?></p>
514 + <p class="stats-odyssey-notice--content-text"><?php esc_html_e( 'The old Jetpack Stats has been deprecated. Please click the button to enable the new experience.', 'jetpack' ); ?></p>
562 515 <div class="stats-odyssey-notice--action-bar">
563 516 <button class="dops-button stats-odyssey-notice--primary-button">
564 517 <a class="is-primary-link" href="<?php echo esc_url( $redirect_url ); ?>"><?php esc_html_e( 'Switch to new Stats', 'jetpack' ); ?></a>
565 518 </button>
@@ -568,13 +521,9 @@
568 521 </div>
569 522 <div class="stats-odyssey-notice--image-container"></div>
570 523 </div>
571 524 </div>
572 - <div id="stats-loading-wrap" class="wrap">
573 - <p class="hide-if-no-js"><img width="32" height="32" alt="<?php esc_attr_e( 'Loading&hellip;', 'jetpack' ); ?>" src="<?php echo esc_url( $static_url ); ?>" /></p>
574 - <p class="hide-if-js"><?php esc_html_e( 'Jetpack Stats work better with JavaScript enabled.', 'jetpack' ); ?><br />
575 - <a href="<?php echo esc_url( $nojs_url ); ?>"><?php esc_html_e( 'View Jetpack Stats without JavaScript', 'jetpack' ); ?></a>.</p>
576 - </div>
525 + <p></p>
577 526 </div>
578 527 <?php
579 528 return;
580 529 }
@@ -637,15 +586,14 @@
637 586 }
638 587 }
639 588 }
640 589
590 + $url = 'https://' . STATS_DASHBOARD_SERVER . '/wp-admin/index.php';
641 591 if ( isset( $_GET['chart'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
642 592 if ( preg_match( '/^[a-z0-9-]+$/', $_GET['chart'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput
643 593 $chart = sanitize_title( $_GET['chart'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput
644 594 $url = 'https://' . STATS_DASHBOARD_SERVER . "/wp-includes/charts/{$chart}.php";
645 595 }
646 - } else {
647 - $url = 'https://' . STATS_DASHBOARD_SERVER . '/wp-admin/index.php';
648 596 }
649 597
650 598 $url = add_query_arg( $q, $url );
651 599 $method = 'GET';
@@ -653,34 +601,19 @@
653 601 $user_id = 0; // Means use the blog token.
654 602
655 603 $get = Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
656 604 $get_code = wp_remote_retrieve_response_code( $get );
657 - if ( is_wp_error( $get ) || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
605 + if ( is_wp_error( $get ) || $get_code === '' || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
658 606 stats_print_wp_remote_error( $get, $url );
659 - } else {
660 - if ( ! empty( $get['headers']['content-type'] ) ) {
661 - $type = $get['headers']['content-type'];
662 - if ( str_starts_with( $type, 'image' ) ) {
663 - $img = $get['body'];
664 - header( 'Content-Type: ' . $type );
665 - header( 'Content-Length: ' . strlen( $img ) );
666 - echo $img; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
667 - die();
668 - }
607 + } elseif ( ! empty( $get['headers']['content-type'] ) ) {
608 + $type = $get['headers']['content-type'];
609 + if ( str_starts_with( $type, 'image' ) ) {
610 + $img = $get['body'];
611 + header( 'Content-Type: ' . $type );
612 + header( 'Content-Length: ' . strlen( $img ) );
613 + echo $img; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
614 + die( 0 );
669 615 }
670 - $body = stats_convert_post_titles( $get['body'] );
671 - $body = stats_convert_chart_urls( $body );
672 - $body = stats_convert_image_urls( $body );
673 - $body = stats_convert_admin_urls( $body );
674 -
675 - // The response can contain either the content to display OR
676 - // the scripts for the chart UI. The following calls inspect the
677 - // response, insert the Odyssey nudge as needed, and make sure
678 - // everything is output correctly.
679 - stats_print_header_section( $body );
680 - stats_print_odyssey_nudge( $body );
681 - stats_print_content_section( $body );
682 - stats_print_chart_scripts( $body );
683 616 }
684 617
685 618 if ( isset( $_GET['page'] ) && 'stats' === $_GET['page'] && ! isset( $_GET['chart'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
686 619 $tracking = new Tracking();
@@ -687,246 +620,13 @@
687 620 $tracking->record_user_event( 'wpa_page_view', array( 'path' => 'old_stats' ) );
688 621 }
689 622
690 623 if ( isset( $_GET['noheader'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
691 - die;
624 + die( 0 );
692 625 }
693 626 }
694 627
695 628 /**
696 - * Legacy Stats: Print Header Section
697 - *
698 - * @access public
699 - * @param mixed $html HTML.
700 - * @return void
701 - */
702 -function stats_print_header_section( $html ) {
703 - $header = stats_parse_header_section( $html );
704 - if ( $header !== '' ) {
705 - echo $header; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
706 - }
707 -}
708 -
709 -/**
710 - * Legacy Stats: Print Content Section
711 - *
712 - * @access public
713 - * @param mixed $html HTML.
714 - * @return void
715 - */
716 -function stats_print_content_section( $html ) {
717 - $content = stats_parse_content_section( $html );
718 - if ( $content !== '' ) {
719 - echo $content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
720 - }
721 -}
722 -
723 -/**
724 - * Legacy Stats: Print Chart Scripts
725 - *
726 - * @access public
727 - * @param mixed $html HTML.
728 - * @return void
729 - */
730 -function stats_print_chart_scripts( $html ) {
731 - if ( is_chart_scripts( $html ) ) {
732 - echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
733 - }
734 -}
735 -
736 -/**
737 - * Legacy Stats: Test for presence of chart scripts
738 - *
739 - * @access public
740 - * @param mixed $html Input HTML that may or may not include the chart scripts.
741 - * @return bool
742 - */
743 -function is_chart_scripts( $html ) {
744 - $pos = strpos( $html, STATS_CONTENT_MARKER );
745 - return $pos === false;
746 -}
747 -
748 -/**
749 - * Legacy Stats: Parse Header Section
750 - *
751 - * Returns the section of the content up to and including the date header.
752 - *
753 - * @access public
754 - * @param mixed $html HTML.
755 - * @return string
756 - */
757 -function stats_parse_header_section( $html ) {
758 - $head = strstr( $html, STATS_CONTENT_MARKER, true );
759 - // Enforce a string result instead of string|false.
760 - if ( $head === false ) {
761 - return '';
762 - }
763 - return $head;
764 -}
765 -
766 -/**
767 - * Legacy Stats: Print Content Section
768 - *
769 - * Returns the section of the content excluding the date header.
770 - *
771 - * @access public
772 - * @param mixed $html HTML.
773 - * @return string
774 - */
775 -function stats_parse_content_section( $html ) {
776 - $body = strstr( $html, STATS_BODY_MARKER );
777 - // Enforce a string result instead of string|false.
778 - if ( $body === false ) {
779 - return '';
780 - }
781 - return $body;
782 -}
783 -
784 -/**
785 - * Legacy Stats: Determine if we need to show the Odyssey upgrade nudge.
786 - *
787 - * @access public
788 - * @return boolean
789 - */
790 -function stats_should_show_odyssey_nudge() {
791 - $stats_notices = ( new Stats_Notices() )->get_notices_to_show();
792 - return isset( $stats_notices[ Stats_Notices::OPT_IN_NEW_STATS_NOTICE_ID ] )
793 - && $stats_notices[ Stats_Notices::OPT_IN_NEW_STATS_NOTICE_ID ];
794 -}
795 -
796 -/**
797 - * Legacy Stats: Print the Odyssey upgrade nudge.
798 - *
799 - * @access public
800 - * @param mixed $html HTML.
801 - * @return void
802 - */
803 -function stats_print_odyssey_nudge( $html ) {
804 - if ( ! stats_should_show_odyssey_nudge() ) {
805 - return;
806 - }
807 - $pos = strpos( $html, STATS_CONTENT_MARKER );
808 - if ( $pos === false ) {
809 - return;
810 - }
811 - $learn_url = Redirect::get_url( 'jetpack-stats-learn-more' );
812 - $redirect_url = admin_url( 'admin.php?page=stats&enable_new_stats=1' );
813 - ?>
814 - <style>
815 - .stats-odyssey-notice {
816 - display: flex;
817 - font-size: var( --font-body );
818 -
819 - border: 1px solid var( --jp-gray-5 );
820 - border-left-color: var( --jp-black );
821 - border-left-width: 6px;
822 - border-radius: 4px;
823 -
824 - margin-top: 24px;
825 - background: white;
826 - position: relative;
827 - }
828 - .stats-odyssey-notice--content {
829 - padding: 24px 0 24px 30px;
830 - font-size: 2em;
831 - width: 100%;
832 - }
833 - .stats-odyssey-notice--content-header {
834 - font-size: 24px;
835 - line-height: 32px;
836 - margin: 0;
837 - margin-bottom: 8px;
838 - }
839 - .stats-odyssey-notice--content-text {
840 - font-size: 16px;
841 - margin: 0;
842 - }
843 - .stats-odyssey-notice--image-container {
844 - background-image: url("/wp-content/plugins/jetpack/images/odyssey-upgrade/background.png"), url("/wp-content/plugins/jetpack/images/odyssey-upgrade/gradient.png");
845 - background-size: cover;
846 - padding-right: 28px;
847 - width: 100%;
848 - }
849 - .stats-odyssey-notice--close-button {
850 - position: absolute;
851 - top: 1rem;
852 - right: 1rem;
853 - background-color: transparent;
854 - border: none;
855 - cursor: pointer;
856 - }
857 - .stats-odyssey-notice--action-bar {
858 - display: flex;
859 - align-items: center;
860 - margin-top: 24px;
861 - }
862 - .stats-odyssey-notice--primary-button {
863 - margin-right: 18px;
864 - padding-left: 20px;
865 - padding-right: 20px;
866 - font-size: 16px;
867 - border-color: black;
868 - background-color: black;
869 - }
870 - .stats-odyssey-notice--primary-button:hover {
871 - border-color: #3c434a;
872 - background-color: #3c434a;
873 - }
874 - .is-primary-link {
875 - color: white;
876 - text-decoration: none;
877 - }
878 - .is-primary-link:active {
879 - color: white;
880 - }
881 - .is-primary-link:focus {
882 - color: white;
883 - box-shadow: none;
884 - outline: none;
885 - }
886 - .is-primary-link:hover {
887 - color: white;
888 - }
889 - .is-secondary-link {
890 - color: black;
891 - font-size: var( --font-body );
892 - }
893 - .is-secondary-link:hover {
894 - color: black;
895 - }
896 - .is-hidden {
897 - display: none;
898 - }
899 - </style>
900 - <div id="stats-odyssey-nudge-main" class="stats-odyssey-notice">
901 - <div class="stats-odyssey-notice--content">
902 - <h2 class="stats-odyssey-notice--content-header"><?php esc_html_e( 'Explore the new Jetpack Stats', 'jetpack' ); ?></h2>
903 - <p class="stats-odyssey-notice--content-text"><?php esc_html_e( "We've added new stats and insights in a more modern and mobile friendly experience to help you grow your site.", 'jetpack' ); ?></p>
904 - <div class="stats-odyssey-notice--action-bar">
905 - <button class="dops-button stats-odyssey-notice--primary-button">
906 - <a class="is-primary-link" href="<?php echo esc_url( $redirect_url ); ?>"><?php esc_html_e( 'Switch to new Stats', 'jetpack' ); ?></a>
907 - </button>
908 - <a class="is-secondary-link" href="<?php echo esc_url( $learn_url ); ?>" rel="noopener noreferrer" target="_blank"><?php esc_html_e( 'Learn about Stats', 'jetpack' ); ?> <svg xmlns="http://www.w3.org/2000/svg" style="vertical-align: middle;" viewBox="0 0 24 24" width="16" height="16" aria-hidden="true" focusable="false"><path d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"></path></svg></a>
909 - </div>
910 - </div>
911 - <div class="stats-odyssey-notice--image-container"></div>
912 - <button class="stats-odyssey-notice--close-button" onclick="stats_odyssey_dismiss_nudge()"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg></button>
913 - </div>
914 - <?php
915 -}
916 -
917 -/**
918 - * Stats Convert Admin Urls.
919 - *
920 - * @access public
921 - * @param mixed $html HTML.
922 - * @return string
923 - */
924 -function stats_convert_admin_urls( $html ) {
925 - return str_replace( 'index.php?page=stats', 'admin.php?page=stats', $html );
926 -}
927 -
928 -/**
929 629 * Stats Convert Image URLs.
930 630 *
931 631 * @access public
932 632 * @param mixed $html HTML.
@@ -1031,8 +731,13 @@
1031 731 * @access public
1032 732 * @return void
1033 733 */
1034 734 function stats_admin_bar_head() {
735 + // Let's not show the stats admin bar to users who are not logged in.
736 + if ( ! is_user_logged_in() ) {
737 + return;
738 + }
739 +
1035 740 if ( ! Stats_Options::get_option( 'admin_bar' ) ) {
1036 741 return;
1037 742 }
1038 743
@@ -1113,9 +818,9 @@
1113 818
1114 819 $menu = array(
1115 820 'id' => 'stats',
1116 821 'href' => add_query_arg( 'page', 'stats', admin_url( 'admin.php' ) ), // no menu_page_url() blog-side.
1117 - 'title' => "<div><img src='$img_src' srcset='$img_src 1x, $img_src_2x 2x' width='112' height='24' alt='$alt' title='$title'></div>",
822 + 'title' => "<div><img fetchpriority='low' loading='lazy' decoding='async' src='$img_src' srcset='$img_src 1x, $img_src_2x 2x' width='112' height='24' alt='$alt' title='$title'></div>",
1118 823 );
1119 824
1120 825 $wp_admin_bar->add_menu( $menu );
1121 826 }
@@ -1120,21 +825,33 @@
1120 825 $wp_admin_bar->add_menu( $menu );
1121 826 }
1122 827
1123 828 /**
829 + * Adds a Stats link to the site-name admin bar submenu, alongside Dashboard.
1124 830 *
1125 - * Deprecated. The stats module should not update blog details. This is handled by Sync.
1126 - *
1127 - * Stats Update Blog.
1128 - *
1129 831 * @access public
1130 832 * @return void
1131 - *
1132 - * @deprecated since 10.3.
1133 833 */
1134 -function stats_update_blog() {
1135 - _deprecated_function( __METHOD__, 'jetpack-10.3' );
1136 - XMLRPC_Async_Call::add_call( 'jetpack.updateBlog', 0, stats_get_blog() );
834 +function stats_add_link_to_admin_bar_site_menu() {
835 + global $wp_admin_bar;
836 +
837 + if (
838 + ! is_object( $wp_admin_bar ) ||
839 + ! $wp_admin_bar->get_node( 'dashboard' ) ||
840 + ! current_user_can( 'view_stats' ) ||
841 + ( new Host() )->is_wpcom_platform()
842 + ) {
843 + return;
844 + }
845 +
846 + $wp_admin_bar->add_node(
847 + array(
848 + 'parent' => 'site-name',
849 + 'id' => 'jetpack-stats',
850 + 'title' => __( 'Stats', 'jetpack' ),
851 + 'href' => admin_url( 'admin.php?page=stats' ),
852 + )
853 + );
1137 854 }
1138 855
1139 856 /**
1140 857 * Stats Get Blog.
@@ -1365,9 +1082,9 @@
1365 1082 $user_id = 0; // Means use the blog token.
1366 1083
1367 1084 $get = Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
1368 1085 $get_code = wp_remote_retrieve_response_code( $get );
1369 - if ( is_wp_error( $get ) || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
1086 + if ( is_wp_error( $get ) || $get_code === '' || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
1370 1087 stats_print_wp_remote_error( $get, $url );
1371 1088 } else {
1372 1089 $body = stats_convert_post_titles( $get['body'] );
1373 1090 $body = stats_convert_chart_urls( $body );
@@ -1470,9 +1187,9 @@
1470 1187 </div>
1471 1188 </div>
1472 1189 </div>
1473 1190 <?php
1474 - exit;
1191 + exit( 0 );
1475 1192 }
1476 1193
1477 1194 /**
1478 1195 * Stats Print WP Remote Error.
@@ -1484,9 +1201,9 @@
1484 1201 */
1485 1202 function stats_print_wp_remote_error( $get, $url ) {
1486 1203 $state_name = 'stats_remote_error_' . substr( md5( $url ), 0, 8 );
1487 1204 $previous_error = Jetpack::state( $state_name );
1488 - $error = md5( wp_json_encode( compact( 'get', 'url' ) ) );
1205 + $error = md5( wp_json_encode( compact( 'get', 'url' ), JSON_UNESCAPED_SLASHES ) );
1489 1206 Jetpack::state( $state_name, $error );
1490 1207 if ( $error !== $previous_error ) {
1491 1208 ?>
1492 1209 <div class="wrap">
@@ -1546,8 +1263,9 @@
1546 1263 * @type string $days The length of the desired time frame. Default is 30. Maximum 90 days.
1547 1264 * @type int $limit The maximum number of records to return. Default is 10. Maximum 100.
1548 1265 * @type int $post_id The ID of the post to retrieve stats data for
1549 1266 * @type string $summarize If present, summarizes all matching records. Default Null.
1267 + * @type int $blog_id The WordPress.com blog ID to retrieve stats data for. Default is the current blog.
1550 1268 *
1551 1269 * }
1552 1270 *
1553 1271 * @return array {
@@ -1569,13 +1287,13 @@
1569 1287 'days' => false,
1570 1288 'limit' => 3,
1571 1289 'post_id' => false,
1572 1290 'summarize' => '',
1291 + 'blog_id' => Jetpack_Options::get_option( 'id' ),
1573 1292 );
1574 1293
1575 - $args = wp_parse_args( $args, $defaults );
1576 - $args['table'] = $table;
1577 - $args['blog_id'] = Jetpack_Options::get_option( 'id' );
1294 + $args = wp_parse_args( $args, $defaults );
1295 + $args['table'] = $table;
1578 1296
1579 1297 $stats_csv_url = add_query_arg( $args, 'https://stats.wordpress.com/csv.php' );
1580 1298
1581 1299 $key = md5( $stats_csv_url );
@@ -1645,9 +1363,9 @@
1645 1363 $user_id = 0; // Blog token.
1646 1364
1647 1365 $get = Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
1648 1366 $get_code = wp_remote_retrieve_response_code( $get );
1649 - if ( is_wp_error( $get ) || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
1367 + if ( is_wp_error( $get ) || $get_code === '' || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
1650 1368 return array(); // @todo: return an error?
1651 1369 } else {
1652 1370 return stats_str_getcsv( $get['body'] );
1653 1371 }
@@ -1661,10 +1379,16 @@
1661 1379 * @param mixed $csv CSV.
1662 1380 * @return array
1663 1381 */
1664 1382 function stats_str_getcsv( $csv ) {
1665 - $lines = str_getcsv( $csv, "\n" );
1666 - return array_map( 'str_getcsv', $lines );
1383 + // @todo Correctly handle embedded newlines. Note, despite claims online, `str_getcsv( $csv, "\n" )` does not actually work.
1384 + $lines = explode( "\n", rtrim( $csv, "\n" ) );
1385 + return array_map(
1386 + function ( $line ) {
1387 + return str_getcsv( $line, ',', '"', '' );
1388 + },
1389 + $lines
1390 + );
1667 1391 }
1668 1392
1669 1393 /**
1670 1394 * Abstract out building the rest api stats path.
@@ -1691,9 +1415,9 @@
1691 1415 _deprecated_function( __METHOD__, 'jetpack-11.5', 'Please checkout the methods available in Automattic\Jetpack\Stats\WPCOM_Stats' );
1692 1416 $endpoint = jetpack_stats_api_path( $resource );
1693 1417 $api_version = '1.1';
1694 1418 $args = wp_parse_args( $args, array() );
1695 - $cache_key = md5( implode( '|', array( $endpoint, $api_version, wp_json_encode( $args ) ) ) );
1419 + $cache_key = md5( implode( '|', array( $endpoint, $api_version, wp_json_encode( $args, JSON_UNESCAPED_SLASHES ) ) ) );
1696 1420
1697 1421 $transient_name = "jetpack_restapi_stats_cache_{$cache_key}";
1698 1422
1699 1423 $stats_cache = get_transient( $transient_name );
@@ -1727,110 +1451,8 @@
1727 1451 // To reduce size in storage: store with time as key, store JSON encoded data (unless error).
1728 1452 set_transient( $transient_name, array( time() => $data ), 5 * MINUTE_IN_SECONDS );
1729 1453
1730 1454 return $return;
1731 -}
1732 -
1733 -/**
1734 - * Load CSS needed for Stats column width in WP-Admin area.
1735 - *
1736 - * @since 4.7.0
1737 - */
1738 -function jetpack_stats_load_admin_css() {
1739 - ?>
1740 - <style type="text/css">
1741 - .fixed .column-stats {
1742 - width: 5em;
1743 - }
1744 - </style>
1745 - <?php
1746 -}
1747 -
1748 -/**
1749 - * Set header for column that allows to view an entry's stats.
1750 - *
1751 - * @param array $columns An array of column names.
1752 - *
1753 - * @since 4.7.0
1754 - *
1755 - * @return mixed
1756 - */
1757 -function jetpack_stats_post_table( $columns ) {
1758 - /*
1759 - * Stats can be accessed in wp-admin or in Calypso,
1760 - * depending on what version of the stats screen is enabled on your site.
1761 - *
1762 - * In both cases, the user must be allowed to access stats.
1763 - *
1764 - * If the Odyssey Stats experience isn't enabled, the user will need to go to Calypso,
1765 - * so they need to be connected to WordPress.com to be able to access that page.
1766 - */
1767 - if (
1768 - ! current_user_can( 'view_stats' )
1769 - || (
1770 - ! Stats_Options::get_option( 'enable_odyssey_stats' )
1771 - && ! ( new Connection_Manager( 'jetpack' ) )->is_user_connected()
1772 - )
1773 - ) {
1774 - return $columns;
1775 - }
1776 -
1777 - // Array-Fu to add before comments.
1778 - $pos = array_search( 'comments', array_keys( $columns ), true );
1779 -
1780 - // Fallback to the last position if the post type does not support comments.
1781 - if ( ! is_int( $pos ) ) {
1782 - $pos = count( $columns );
1783 - }
1784 -
1785 - // Final fallback, if the array was malformed by another plugin for example.
1786 - if ( ! is_int( $pos ) ) {
1787 - return $columns;
1788 - }
1789 -
1790 - $chunks = array_chunk( $columns, $pos, true );
1791 - $chunks[0]['stats'] = esc_html__( 'Stats', 'jetpack' );
1792 -
1793 - return call_user_func_array( 'array_merge', $chunks );
1794 -}
1795 -
1796 -/**
1797 - * Set content for cell with link to an entry's stats in Odyssey Stats.
1798 - *
1799 - * @param string $column The name of the column to display.
1800 - * @param int $post_id The current post ID.
1801 - *
1802 - * @since 4.7.0
1803 - *
1804 - * @return mixed
1805 - */
1806 -function jetpack_stats_post_table_cell( $column, $post_id ) {
1807 - if ( 'stats' === $column ) {
1808 - if ( 'publish' !== get_post_status( $post_id ) ) {
1809 - printf(
1810 - '<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
1811 - esc_html__( 'No stats', 'jetpack' )
1812 - );
1813 - } else {
1814 - // Link to the wp-admin stats page.
1815 - $stats_post_url = admin_url( sprintf( 'admin.php?page=stats#!/stats/post/%d/%d', $post_id, Jetpack_Options::get_option( 'id', 0 ) ) );
1816 - // Unless the user is on a Default style WOA site, in which case link to Calypso.
1817 - if ( ( new Host() )->is_woa_site() && Stats_Options::get_option( 'enable_odyssey_stats' ) && 'wp-admin' !== get_option( 'wpcom_admin_interface' ) ) {
1818 - $stats_post_url = Redirect::get_url(
1819 - 'calypso-stats-post',
1820 - array(
1821 - 'path' => $post_id,
1822 - )
1823 - );
1824 - }
1825 -
1826 - printf(
1827 - '<a href="%s" title="%s" class="dashicons dashicons-chart-bar" target="_blank"></a>',
1828 - esc_url( $stats_post_url ),
1829 - esc_html__( 'View stats for this post', 'jetpack' )
1830 - );
1831 - }
1832 - }
1833 1455 }
1834 1456
1835 1457 /**
1836 1458 * Add the Jetpack plugin version to the stats tracking data.