| @@ -7,33 +7,38 @@ | ||
| 7 | 7 | * @package automattic/jetpack |
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | 10 | use Automattic\Jetpack\Assets; |
| 11 | -use Automattic\Jetpack\Assets\Logo as Jetpack_Logo; | |
| 12 | 11 | use Automattic\Jetpack\Boost_Speed_Score\Speed_Score; |
| 13 | 12 | use Automattic\Jetpack\Config; |
| 13 | +use Automattic\Jetpack\Connection\Authorize_Json_Api; | |
| 14 | 14 | use Automattic\Jetpack\Connection\Client; |
| 15 | -use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State; | |
| 16 | 15 | use Automattic\Jetpack\Connection\Manager as Connection_Manager; |
| 17 | -use Automattic\Jetpack\Connection\Nonce_Handler; | |
| 18 | 16 | use Automattic\Jetpack\Connection\Rest_Authentication as Connection_Rest_Authentication; |
| 19 | 17 | use Automattic\Jetpack\Connection\Secrets; |
| 20 | 18 | use Automattic\Jetpack\Connection\Tokens; |
| 21 | -use Automattic\Jetpack\Connection\Utils as Connection_Utils; | |
| 19 | +use Automattic\Jetpack\Connection\Webhooks\Authorize_Redirect; | |
| 22 | 20 | use Automattic\Jetpack\Constants; |
| 23 | 21 | use Automattic\Jetpack\CookieState; |
| 24 | 22 | use Automattic\Jetpack\Current_Plan as Jetpack_Plan; |
| 25 | 23 | use Automattic\Jetpack\Device_Detection\User_Agent_Info; |
| 26 | 24 | use Automattic\Jetpack\Errors; |
| 25 | +use Automattic\Jetpack\Feature_Policy; | |
| 27 | 26 | use Automattic\Jetpack\Files; |
| 27 | +use Automattic\Jetpack\Heartbeat; | |
| 28 | 28 | use Automattic\Jetpack\Identity_Crisis; |
| 29 | +use Automattic\Jetpack\Import\Main as Import_Main; | |
| 29 | 30 | use Automattic\Jetpack\Licensing; |
| 30 | 31 | use Automattic\Jetpack\Modules; |
| 31 | 32 | use Automattic\Jetpack\My_Jetpack\Initializer as My_Jetpack_Initializer; |
| 32 | -use Automattic\Jetpack\Partner; | |
| 33 | +use Automattic\Jetpack\Newsletter\Reader_Link; | |
| 33 | 34 | use Automattic\Jetpack\Paths; |
| 35 | +use Automattic\Jetpack\Plugin\Deprecate; | |
| 34 | 36 | use Automattic\Jetpack\Plugin\Tracking as Plugin_Tracking; |
| 37 | +use Automattic\Jetpack\Podcast\Podcast; | |
| 35 | 38 | use Automattic\Jetpack\Redirect; |
| 39 | +use Automattic\Jetpack\Scan_Page\Jetpack_Scan as Scan_Page_Init; | |
| 40 | +use Automattic\Jetpack\SEO\Initializer as Jetpack_SEO_Initializer; | |
| 36 | 41 | use Automattic\Jetpack\Status; |
| 37 | 42 | use Automattic\Jetpack\Status\Host; |
| 38 | 43 | use Automattic\Jetpack\Status\Visitor; |
| 39 | 44 | use Automattic\Jetpack\Sync\Actions as Sync_Actions; |
| @@ -40,9 +45,14 @@ | ||
| 40 | 45 | use Automattic\Jetpack\Sync\Health; |
| 41 | 46 | use Automattic\Jetpack\Sync\Sender; |
| 42 | 47 | use Automattic\Jetpack\Terms_Of_Service; |
| 43 | 48 | use Automattic\Jetpack\Tracking; |
| 49 | +use Automattic\Woocommerce_Analytics; | |
| 44 | 50 | |
| 51 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 52 | + exit( 0 ); | |
| 53 | +} | |
| 54 | + | |
| 45 | 55 | /* |
| 46 | 56 | Options: |
| 47 | 57 | jetpack_options (array) |
| 48 | 58 | An array of options. |
| @@ -77,49 +87,8 @@ | ||
| 77 | 87 | */ |
| 78 | 88 | public $xmlrpc_server = null; |
| 79 | 89 | |
| 80 | 90 | /** |
| 81 | - * The handles of styles that are concatenated into jetpack.css. | |
| 82 | - * | |
| 83 | - * When making changes to that list, you must also update concat_list in tools/webpack.config.css.js. | |
| 84 | - * | |
| 85 | - * @var array The handles of styles that are concatenated into jetpack.css. | |
| 86 | - */ | |
| 87 | - public $concatenated_style_handles = array( | |
| 88 | - 'jetpack-carousel-swiper-css', | |
| 89 | - 'jetpack-carousel', | |
| 90 | - 'grunion.css', | |
| 91 | - 'the-neverending-homepage', | |
| 92 | - 'jetpack_likes', | |
| 93 | - 'jetpack_related-posts', | |
| 94 | - 'sharedaddy', | |
| 95 | - 'jetpack-slideshow', | |
| 96 | - 'presentations', | |
| 97 | - 'quiz', | |
| 98 | - 'jetpack-subscriptions', | |
| 99 | - 'jetpack-responsive-videos', | |
| 100 | - 'jetpack-social-menu', | |
| 101 | - 'tiled-gallery', | |
| 102 | - 'jetpack_display_posts_widget', | |
| 103 | - 'gravatar-profile-widget', | |
| 104 | - 'goodreads-widget', | |
| 105 | - 'jetpack_social_media_icons_widget', | |
| 106 | - 'jetpack-top-posts-widget', | |
| 107 | - 'jetpack_image_widget', | |
| 108 | - 'jetpack-my-community-widget', | |
| 109 | - 'jetpack-authors-widget', | |
| 110 | - 'wordads', | |
| 111 | - 'eu-cookie-law-style', | |
| 112 | - 'flickr-widget-style', | |
| 113 | - 'jetpack-search-widget', | |
| 114 | - 'jetpack-simple-payments-widget-style', | |
| 115 | - 'jetpack-widget-social-icons-styles', | |
| 116 | - 'wpcom_instagram_widget', | |
| 117 | - 'milestone-widget', | |
| 118 | - 'subscribe-modal-css', | |
| 119 | - ); | |
| 120 | - | |
| 121 | - /** | |
| 122 | 91 | * Contains all assets that have had their URL rewritten to minified versions. |
| 123 | 92 | * |
| 124 | 93 | * @var array |
| 125 | 94 | */ |
| @@ -134,11 +103,8 @@ | ||
| 134 | 103 | 'contact-form' => array( |
| 135 | 104 | array( 'grunion-contact-form/grunion-contact-form.php', 'Grunion Contact Form' ), |
| 136 | 105 | array( 'mullet/mullet-contact-form.php', 'Mullet Contact Form' ), |
| 137 | 106 | ), |
| 138 | - 'custom-css' => array( | |
| 139 | - array( 'safecss/safecss.php', 'WordPress.com Custom CSS' ), | |
| 140 | - ), | |
| 141 | 107 | 'gravatar-hovercards' => array( |
| 142 | 108 | array( 'jetpack-gravatar-hovercards/gravatar-hovercards.php', 'Jetpack Gravatar Hovercards' ), |
| 143 | 109 | ), |
| 144 | 110 | 'latex' => array( |
| @@ -309,9 +275,8 @@ | ||
| 309 | 275 | * Graph tags via filter when their Social Meta modules are active: |
| 310 | 276 | * |
| 311 | 277 | * - All in One SEO Pack, All in one SEO Pack Pro |
| 312 | 278 | * - WordPress SEO by Yoast, WordPress SEO Premium by Yoast |
| 313 | - * - SEOPress, SEOPress Pro | |
| 314 | 279 | * |
| 315 | 280 | * Plugin authors: If you'd like to prevent Jetpack's Open Graph tag generation in your plugin, you can do so via this filter: |
| 316 | 281 | * add_filter( 'jetpack_enable_open_graph', '__return_false' ); |
| 317 | 282 | * |
| @@ -354,8 +319,10 @@ | ||
| 354 | 319 | 'wp-caregiver/wp-caregiver.php', // WP Caregiver. |
| 355 | 320 | 'wp-facebook-like-send-open-graph-meta/wp-facebook-like-send-open-graph-meta.php', // WP Facebook Like Send & Open Graph Meta. |
| 356 | 321 | 'wp-facebook-open-graph-protocol/wp-facebook-ogp.php', // WP Facebook Open Graph protocol. |
| 357 | 322 | 'wp-ogp/wp-ogp.php', // WP-OGP. |
| 323 | + 'wp-seopress/seopress.php', // SEOPress. | |
| 324 | + 'wp-seopress-pro/seopress-pro.php', // SEOPress Pro. | |
| 358 | 325 | 'zoltonorg-social-plugin/zosp.php', // Zolton.org Social Plugin. |
| 359 | 326 | 'wp-fb-share-like-button/wp_fb_share-like_widget.php', // WP Facebook Like Button. |
| 360 | 327 | 'open-graph-metabox/open-graph-metabox.php', // Open Graph Metabox. |
| 361 | 328 | 'seo-by-rank-math/rank-math.php', // Rank Math. |
| @@ -422,8 +389,10 @@ | ||
| 422 | 389 | |
| 423 | 390 | /** |
| 424 | 391 | * Verified data for JSON authorization request |
| 425 | 392 | * |
| 393 | + * @deprecated 13.4 | |
| 394 | + * | |
| 426 | 395 | * @var array |
| 427 | 396 | */ |
| 428 | 397 | public $json_api_authorization_request = array(); |
| 429 | 398 | |
| @@ -464,8 +433,16 @@ | ||
| 464 | 433 | */ |
| 465 | 434 | public static $instance = false; |
| 466 | 435 | |
| 467 | 436 | /** |
| 437 | + * Resolved answer for `is_premium_analytics_enabled()`, or null before the first call. | |
| 438 | + * | |
| 439 | + * @since 16.1 | |
| 440 | + * @var bool|null | |
| 441 | + */ | |
| 442 | + private static $premium_analytics_enabled = null; | |
| 443 | + | |
| 444 | + /** | |
| 468 | 445 | * Singleton |
| 469 | 446 | * |
| 470 | 447 | * @static |
| 471 | 448 | */ |
| @@ -505,9 +482,9 @@ | ||
| 505 | 482 | if ( array_diff( $unfiltered_modules, $modules ) ) { |
| 506 | 483 | self::update_active_modules( $modules ); |
| 507 | 484 | } |
| 508 | 485 | |
| 509 | - add_action( 'init', array( __CLASS__, 'activate_new_modules' ) ); | |
| 486 | + self::register_upgrade_init_hooks(); | |
| 510 | 487 | |
| 511 | 488 | // Upgrade to 4.3.0. |
| 512 | 489 | if ( Jetpack_Options::get_option( 'identity_crisis_whitelist' ) ) { |
| 513 | 490 | Jetpack_Options::delete_option( 'identity_crisis_whitelist' ); |
| @@ -562,8 +539,16 @@ | ||
| 562 | 539 | Jetpack_Options::delete_option( 'autoupdate_plugins' ); |
| 563 | 540 | } // Should we have some type of fallback if something fails here? |
| 564 | 541 | } |
| 565 | 542 | |
| 543 | + // Set the newsletter send default option for existing sites. | |
| 544 | + if ( false === get_option( 'wpcom_newsletter_send_default' ) ) { | |
| 545 | + add_option( 'wpcom_newsletter_send_default', 1 ); | |
| 546 | + } | |
| 547 | + | |
| 548 | + // Its handler went with the Recommendations assistant. | |
| 549 | + wp_clear_scheduled_hook( 'jetpack_recommend_videopress' ); | |
| 550 | + | |
| 566 | 551 | if ( did_action( 'wp_loaded' ) ) { |
| 567 | 552 | self::upgrade_on_load(); |
| 568 | 553 | } else { |
| 569 | 554 | add_action( |
| @@ -597,9 +582,8 @@ | ||
| 597 | 582 | } |
| 598 | 583 | |
| 599 | 584 | if ( |
| 600 | 585 | class_exists( 'Jetpack_Sitemap_Manager' ) |
| 601 | - && version_compare( JETPACK__VERSION, '5.3', '>=' ) | |
| 602 | 586 | ) { |
| 603 | 587 | do_action( 'jetpack_sitemaps_purge_data' ); |
| 604 | 588 | } |
| 605 | 589 | |
| @@ -614,9 +598,9 @@ | ||
| 614 | 598 | * Also fires Action hooks for each newly activated and deactivated module. |
| 615 | 599 | * |
| 616 | 600 | * @param array $modules Array of active modules to be saved in options. |
| 617 | 601 | * |
| 618 | - * @return $success bool true for success, false for failure. | |
| 602 | + * @return bool $success true for success, false for failure. | |
| 619 | 603 | */ |
| 620 | 604 | public static function update_active_modules( $modules ) { |
| 621 | 605 | return ( new Modules() )->update_active( $modules ); |
| 622 | 606 | } |
| @@ -646,10 +630,10 @@ | ||
| 646 | 630 | sort( $taken_priorities ); |
| 647 | 631 | |
| 648 | 632 | $first_priority = array_shift( $taken_priorities ); |
| 649 | 633 | |
| 650 | - if ( defined( 'PHP_INT_MAX' ) && $first_priority <= - PHP_INT_MAX ) { | |
| 651 | - $new_priority = - PHP_INT_MAX; | |
| 634 | + if ( $first_priority <= PHP_INT_MIN ) { | |
| 635 | + $new_priority = PHP_INT_MIN; | |
| 652 | 636 | } else { |
| 653 | 637 | $new_priority = $first_priority - 1; |
| 654 | 638 | } |
| 655 | 639 | |
| @@ -670,41 +654,17 @@ | ||
| 670 | 654 | add_action( 'network_plugin_loaded', array( $this, 'add_configure_hook' ), 90 ); |
| 671 | 655 | add_action( 'mu_plugin_loaded', array( $this, 'add_configure_hook' ), 90 ); |
| 672 | 656 | add_action( 'plugins_loaded', array( $this, 'late_initialization' ), 90 ); |
| 673 | 657 | |
| 674 | - add_action( 'jetpack_verify_signature_error', array( $this, 'track_xmlrpc_error' ) ); | |
| 675 | - | |
| 676 | - add_filter( | |
| 677 | - 'jetpack_signature_check_token', | |
| 678 | - array( __CLASS__, 'verify_onboarding_token' ), | |
| 679 | - 10, | |
| 680 | - 3 | |
| 681 | - ); | |
| 682 | - | |
| 683 | 658 | /** |
| 684 | 659 | * Prepare Gutenberg Editor functionality |
| 660 | + * | |
| 661 | + * The hooks previously here have been moved to modules/blocks.php but leaving this here pending | |
| 662 | + * a longer investigation to see if code is expecting the Gutenberg class to always be available. | |
| 685 | 663 | */ |
| 686 | 664 | require_once JETPACK__PLUGIN_DIR . 'class.jetpack-gutenberg.php'; |
| 687 | - add_action( 'plugins_loaded', array( 'Jetpack_Gutenberg', 'load_independent_blocks' ) ); | |
| 688 | - add_action( 'plugins_loaded', array( 'Jetpack_Gutenberg', 'load_block_editor_extensions' ), 9 ); | |
| 689 | - /** | |
| 690 | - * We've switched from enqueue_block_editor_assets to enqueue_block_assets in WP-Admin because the assets with the former are loaded on the main site-editor.php. | |
| 691 | - * | |
| 692 | - * With the latter, the assets are now loaded in the SE iframe; the implementation is now faster because Gutenberg doesn't need to inject the assets in the iframe on client-side. | |
| 693 | - */ | |
| 694 | - if ( is_admin() ) { | |
| 695 | - add_action( 'enqueue_block_assets', array( 'Jetpack_Gutenberg', 'enqueue_block_editor_assets' ) ); | |
| 696 | - } else { | |
| 697 | - add_action( 'enqueue_block_editor_assets', array( 'Jetpack_Gutenberg', 'enqueue_block_editor_assets' ) ); | |
| 698 | - } | |
| 699 | - add_filter( 'render_block', array( 'Jetpack_Gutenberg', 'display_deprecated_block_message' ), 10, 2 ); | |
| 700 | - | |
| 701 | 665 | add_action( 'set_user_role', array( $this, 'maybe_clear_other_linked_admins_transient' ), 10, 3 ); |
| 702 | 666 | |
| 703 | - // Unlink user before deleting the user from WP.com. | |
| 704 | - add_action( 'deleted_user', array( $this, 'disconnect_user' ), 10, 1 ); | |
| 705 | - add_action( 'remove_user_from_blog', array( $this, 'disconnect_user' ), 10, 1 ); | |
| 706 | - | |
| 707 | 667 | add_action( 'jetpack_event_log', array( 'Jetpack', 'log' ), 10, 2 ); |
| 708 | 668 | |
| 709 | 669 | add_filter( 'login_url', array( $this, 'login_url' ), 10, 2 ); |
| 710 | 670 | add_action( 'login_init', array( $this, 'login_init' ) ); |
| @@ -711,8 +671,13 @@ | ||
| 711 | 671 | |
| 712 | 672 | // Set up the REST authentication hooks. |
| 713 | 673 | Connection_Rest_Authentication::init(); |
| 714 | 674 | |
| 675 | + // Register Jetpack-specific connection tests (sync health, etc.) with the connection | |
| 676 | + // package's health test suite. This runs on all requests (not just admin), because | |
| 677 | + // the connection/test REST endpoint can be called outside admin context. | |
| 678 | + add_action( 'jetpack_connection_tests_loaded', array( $this, 'register_jetpack_connection_tests' ) ); | |
| 679 | + | |
| 715 | 680 | add_action( 'admin_init', array( $this, 'admin_init' ) ); |
| 716 | 681 | add_action( 'admin_init', array( $this, 'dismiss_jetpack_notice' ) ); |
| 717 | 682 | |
| 718 | 683 | add_filter( 'admin_body_class', array( $this, 'admin_body_class' ), 20 ); |
| @@ -726,12 +691,8 @@ | ||
| 726 | 691 | |
| 727 | 692 | // Returns HTTPS support status. |
| 728 | 693 | add_action( 'wp_ajax_jetpack-recheck-ssl', array( $this, 'ajax_recheck_ssl' ) ); |
| 729 | 694 | |
| 730 | - add_action( 'wp_ajax_jetpack_connection_banner', array( $this, 'jetpack_connection_banner_callback' ) ); | |
| 731 | - | |
| 732 | - add_action( 'wp_ajax_jetpack_recommendations_banner', array( 'Jetpack_Recommendations_Banner', 'ajax_callback' ) ); | |
| 733 | - | |
| 734 | 695 | add_action( 'wp_loaded', array( $this, 'register_assets' ) ); |
| 735 | 696 | |
| 736 | 697 | /** |
| 737 | 698 | * These actions run checks to load additional files. |
| @@ -749,29 +710,8 @@ | ||
| 749 | 710 | |
| 750 | 711 | add_filter( 'jetpack_get_default_modules', array( $this, 'filter_default_modules' ) ); |
| 751 | 712 | add_filter( 'jetpack_get_default_modules', array( $this, 'handle_deprecated_modules' ), 99 ); |
| 752 | 713 | |
| 753 | - require_once JETPACK__PLUGIN_DIR . 'class-jetpack-pre-connection-jitms.php'; | |
| 754 | - $jetpack_jitm_messages = ( new Jetpack_Pre_Connection_JITMs() ); | |
| 755 | - add_filter( 'jetpack_pre_connection_jitms', array( $jetpack_jitm_messages, 'add_pre_connection_jitms' ) ); | |
| 756 | - | |
| 757 | - /* | |
| 758 | - * If enabled, point edit post, page, and comment links to Calypso instead of WP-Admin. | |
| 759 | - * We should make sure to only do this for front end links. | |
| 760 | - */ | |
| 761 | - if ( self::get_option( 'edit_links_calypso_redirect' ) && ! is_admin() ) { | |
| 762 | - add_filter( 'get_edit_post_link', array( $this, 'point_edit_post_links_to_calypso' ), 1, 2 ); | |
| 763 | - add_filter( 'get_edit_comment_link', array( $this, 'point_edit_comment_links_to_calypso' ), 1 ); | |
| 764 | - | |
| 765 | - /* | |
| 766 | - * We'll shortcircuit wp_notify_postauthor and wp_notify_moderator pluggable functions | |
| 767 | - * so they point moderation links on emails to Calypso. | |
| 768 | - */ | |
| 769 | - require_once JETPACK__PLUGIN_DIR . '_inc/lib/functions.wp-notify.php'; | |
| 770 | - add_filter( 'comment_notification_recipients', 'jetpack_notify_postauthor', 1, 2 ); | |
| 771 | - add_filter( 'notify_moderator', 'jetpack_notify_moderator', 1, 2 ); | |
| 772 | - } | |
| 773 | - | |
| 774 | 714 | add_action( |
| 775 | 715 | 'plugins_loaded', |
| 776 | 716 | function () { |
| 777 | 717 | if ( User_Agent_Info::is_mobile_app() ) { |
| @@ -782,18 +722,10 @@ | ||
| 782 | 722 | |
| 783 | 723 | // Update the site's Jetpack plan and products from API on heartbeats. |
| 784 | 724 | add_action( 'jetpack_heartbeat', array( Jetpack_Plan::class, 'refresh_from_wpcom' ) ); |
| 785 | 725 | |
| 786 | - /** | |
| 787 | - * This is the hack to concatenate all css files into one. | |
| 788 | - * For description and reasoning see the implode_frontend_css method. | |
| 789 | - * | |
| 790 | - * Super late priority so we catch all the registered styles. | |
| 791 | - */ | |
| 792 | - if ( ! is_admin() ) { | |
| 793 | - add_action( 'wp_print_styles', array( $this, 'implode_frontend_css' ), -1 ); // Run first. | |
| 794 | - add_action( 'wp_print_footer_scripts', array( $this, 'implode_frontend_css' ), -1 ); // Run first to trigger before `print_late_styles`. | |
| 795 | - } | |
| 726 | + // The Connection package fetches the site record for `jetpack/v4/site`; reuse it to refresh the plan. | |
| 727 | + add_action( 'jetpack_site_data_fetched', array( Jetpack_Plan::class, 'update_from_site_record' ) ); | |
| 796 | 728 | |
| 797 | 729 | // Actually push the stats on shutdown. |
| 798 | 730 | if ( ! has_action( 'shutdown', array( $this, 'push_stats' ) ) ) { |
| 799 | 731 | add_action( 'shutdown', array( $this, 'push_stats' ) ); |
| @@ -801,8 +733,10 @@ | ||
| 801 | 733 | |
| 802 | 734 | // After a successful connection. |
| 803 | 735 | add_action( 'jetpack_site_registered', array( $this, 'activate_default_modules_on_site_register' ) ); |
| 804 | 736 | add_action( 'jetpack_site_registered', array( $this, 'handle_unique_registrations_stats' ) ); |
| 737 | + add_action( 'jetpack_site_registered', array( Reader_Link::class, 'activate_on_connection' ), 9 ); | |
| 738 | + add_action( 'jetpack_site_registered', array( \Automattic\Jetpack\Reprint_Export\Reprint_Exporter::class, 'discard_credentials' ) ); | |
| 805 | 739 | |
| 806 | 740 | // Actions for Manager::authorize(). |
| 807 | 741 | add_action( 'jetpack_authorize_starting', array( $this, 'authorize_starting' ) ); |
| 808 | 742 | add_action( 'jetpack_authorize_ending_linked', array( $this, 'authorize_ending_linked' ) ); |
| @@ -807,8 +741,9 @@ | ||
| 807 | 741 | add_action( 'jetpack_authorize_starting', array( $this, 'authorize_starting' ) ); |
| 808 | 742 | add_action( 'jetpack_authorize_ending_linked', array( $this, 'authorize_ending_linked' ) ); |
| 809 | 743 | add_action( 'jetpack_authorize_ending_authorized', array( $this, 'authorize_ending_authorized' ) ); |
| 810 | 744 | |
| 745 | + Jetpack_Client_Server::init(); | |
| 811 | 746 | add_action( 'jetpack_client_authorize_error', array( Jetpack_Client_Server::class, 'client_authorize_error' ) ); |
| 812 | 747 | add_filter( 'jetpack_client_authorize_already_authorized_url', array( Jetpack_Client_Server::class, 'client_authorize_already_authorized_url' ) ); |
| 813 | 748 | add_action( 'jetpack_client_authorize_processing', array( Jetpack_Client_Server::class, 'client_authorize_processing' ) ); |
| 814 | 749 | add_filter( 'jetpack_client_authorize_fallback_url', array( Jetpack_Client_Server::class, 'client_authorize_fallback_url' ) ); |
| @@ -813,9 +748,9 @@ | ||
| 813 | 748 | add_action( 'jetpack_client_authorize_processing', array( Jetpack_Client_Server::class, 'client_authorize_processing' ) ); |
| 814 | 749 | add_filter( 'jetpack_client_authorize_fallback_url', array( Jetpack_Client_Server::class, 'client_authorize_fallback_url' ) ); |
| 815 | 750 | |
| 816 | 751 | // Filters for the Manager::get_token() urls and request body. |
| 817 | - add_filter( 'jetpack_token_redirect_url', array( __CLASS__, 'filter_connect_redirect_url' ) ); | |
| 752 | + add_filter( 'jetpack_token_redirect_url', array( Authorize_Redirect::class, 'filter_connect_redirect_url' ) ); | |
| 818 | 753 | add_filter( 'jetpack_token_request_body', array( __CLASS__, 'filter_token_request_body' ) ); |
| 819 | 754 | |
| 820 | 755 | // Filter for the `jetpack/v4/connection/data` API response. |
| 821 | 756 | add_filter( 'jetpack_current_user_connection_data', array( __CLASS__, 'filter_jetpack_current_user_connection_data' ) ); |
| @@ -841,13 +776,142 @@ | ||
| 841 | 776 | |
| 842 | 777 | // Register product descriptions for partner coupon usage. |
| 843 | 778 | add_filter( 'jetpack_partner_coupon_products', array( $this, 'get_partner_coupon_product_descriptions' ) ); |
| 844 | 779 | |
| 845 | - // Actions for conditional recommendations. | |
| 846 | - add_action( 'plugins_loaded', array( 'Jetpack_Recommendations', 'init_conditional_recommendation_actions' ) ); | |
| 780 | + // Add 5-star | |
| 781 | + add_filter( 'plugin_row_meta', array( $this, 'add_5_star_review_link' ), 10, 2 ); | |
| 782 | + add_action( 'init', array( Deprecate::class, 'instance' ) ); | |
| 783 | + | |
| 784 | + // Register Jetpack module management abilities (WordPress Abilities API, WP 6.9+). | |
| 785 | + \Automattic\Jetpack\Plugin\Abilities\Modules_Abilities::init(); | |
| 786 | + | |
| 787 | + // Register Connection abilities (WordPress Abilities API, WP 6.9+). Scoped to the | |
| 788 | + // Jetpack plugin for now: the Connection package no longer auto-wires these, so | |
| 789 | + // connection-only consumers (Boost, Protect, Search, etc.) do not register them yet. | |
| 790 | + \Automattic\Jetpack\Connection\Abilities\Connection_Abilities::init(); | |
| 847 | 791 | } |
| 848 | 792 | |
| 849 | 793 | /** |
| 794 | + * Whether the current request should eagerly initialize the admin/REST-only | |
| 795 | + * packages (the Import package and My Jetpack) now, at `plugins_loaded` time. | |
| 796 | + * | |
| 797 | + * Returns true for admin, cron, POST, and WP-CLI requests — the contexts, | |
| 798 | + * knowable this early, where those packages have work to do. Returns false | |
| 799 | + * for a plain front-end GET *and* for a REST request: the two can't be told | |
| 800 | + * apart yet (this runs before `rest_api_init`), so callers defer the REST | |
| 801 | + * case by initializing the package on `rest_api_init` instead, while a plain | |
| 802 | + * page view never fires that hook and so loads nothing. This keeps | |
| 803 | + * admin/REST-only PHP out of opcache on the front-end GET hot path. | |
| 804 | + * | |
| 805 | + * No in-repo code depends on the deferral. The one externally observable | |
| 806 | + * change is timing: the packages' documented init hooks | |
| 807 | + * (`jetpack_import_initialized`, `jetpack_feature_import_enabled`, and | |
| 808 | + * `my_jetpack_init`) no longer fire on a plain front-end GET — they fire on | |
| 809 | + * the admin, cron, POST, WP-CLI, and REST requests where the packages load. | |
| 810 | + * | |
| 811 | + * @return bool | |
| 812 | + */ | |
| 813 | + private static function should_eager_load_packages() { | |
| 814 | + $is_post_request = isset( $_SERVER['REQUEST_METHOD'] ) && 'POST' === strtoupper( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_METHOD'] ) ) ); | |
| 815 | + $is_wp_cli = Constants::is_true( 'WP_CLI' ); | |
| 816 | + | |
| 817 | + return is_admin() || wp_doing_cron() || $is_post_request || $is_wp_cli; | |
| 818 | + } | |
| 819 | + | |
| 820 | + /** | |
| 821 | + * Configure the Import package from a deferred hook. | |
| 822 | + * | |
| 823 | + * The eager path uses Config::ensure( 'import' ), but the deferred REST path | |
| 824 | + * runs after Config::on_plugins_loaded() has already processed its feature | |
| 825 | + * flags, so it needs a hookable bootstrap callback. Preserve Config's | |
| 826 | + * feature-enabled action for hook consumers. | |
| 827 | + * | |
| 828 | + * @since 16.0 | |
| 829 | + * | |
| 830 | + * @return void | |
| 831 | + */ | |
| 832 | + public static function configure_import_package() { | |
| 833 | + if ( class_exists( Import_Main::class ) ) { | |
| 834 | + Import_Main::configure(); | |
| 835 | + | |
| 836 | + if ( ! did_action( 'jetpack_feature_import_enabled' ) ) { | |
| 837 | + do_action( 'jetpack_feature_import_enabled' ); | |
| 838 | + } | |
| 839 | + } | |
| 840 | + } | |
| 841 | + | |
| 842 | + /** | |
| 843 | + * Whether the bundled Stats v2 dashboard is enabled. | |
| 844 | + * | |
| 845 | + * Stats v2 (formerly "Premium Analytics") ships with the plugin behind this | |
| 846 | + * flag while it rolls out (WOOA7S-1595). When enabled it adds its own admin | |
| 847 | + * menu alongside the existing Stats UI; it never replaces or hides the | |
| 848 | + * legacy Stats menu, admin-bar entries, post-list column, or WP dashboard | |
| 849 | + * widget. The Stats module's tracking is unaffected either way, and Stats v2 | |
| 850 | + * reads what that module collects, so while the module is off the plugin | |
| 851 | + * answers false here before even reading the flag. | |
| 852 | + * | |
| 853 | + * The package has to be loadable for this to be true, so a site with the | |
| 854 | + * flag on but a missing package answers false here and never adds the | |
| 855 | + * Stats v2 menu (a warning is logged instead). | |
| 856 | + * | |
| 857 | + * @since 16.1 | |
| 858 | + * | |
| 859 | + * @return bool | |
| 860 | + */ | |
| 861 | + public static function is_premium_analytics_enabled() { | |
| 862 | + if ( null !== self::$premium_analytics_enabled ) { | |
| 863 | + return self::$premium_analytics_enabled; | |
| 864 | + } | |
| 865 | + | |
| 866 | + if ( ! self::is_module_active( 'stats' ) ) { | |
| 867 | + self::$premium_analytics_enabled = false; | |
| 868 | + return false; | |
| 869 | + } | |
| 870 | + | |
| 871 | + /** | |
| 872 | + * Filters whether the bundled Premium Analytics dashboard is enabled. | |
| 873 | + * | |
| 874 | + * Resolved once, from `Jetpack::configure()` on `plugins_loaded`, and only | |
| 875 | + * while the Stats module is active. Register this from a mu-plugin or a | |
| 876 | + * plugin's main file — a callback added on `plugins_loaded` or later runs | |
| 877 | + * too late to be seen. | |
| 878 | + * | |
| 879 | + * @since 16.1 | |
| 880 | + * | |
| 881 | + * @param bool $enabled Defaults to the `jetpack_premium_analytics_enabled` option (false). | |
| 882 | + */ | |
| 883 | + $flag = (bool) apply_filters( 'jetpack_premium_analytics_enabled', (bool) get_option( 'jetpack_premium_analytics_enabled' ) ); | |
| 884 | + | |
| 885 | + self::$premium_analytics_enabled = $flag && class_exists( 'Automattic\Jetpack\PremiumAnalytics\Analytics' ); | |
| 886 | + | |
| 887 | + if ( $flag && ! self::$premium_analytics_enabled ) { | |
| 888 | + wp_trigger_error( | |
| 889 | + __METHOD__, | |
| 890 | + 'The jetpack_premium_analytics_enabled flag is on but the Premium Analytics package is not loadable; keeping the Stats UI in place.' | |
| 891 | + ); | |
| 892 | + } | |
| 893 | + | |
| 894 | + return self::$premium_analytics_enabled; | |
| 895 | + } | |
| 896 | + | |
| 897 | + /** | |
| 898 | + * Expose the setting that turns the Premium Analytics dashboard on and off. | |
| 899 | + * | |
| 900 | + * Deliberately not behind is_premium_analytics_enabled(): this is the setting that flips that | |
| 901 | + * check, so it has to answer while the dashboard is still off. | |
| 902 | + * | |
| 903 | + * @since 16.2 | |
| 904 | + * | |
| 905 | + * @return void | |
| 906 | + */ | |
| 907 | + public static function register_premium_analytics_enablement_setting() { | |
| 908 | + if ( class_exists( 'Automattic\Jetpack\PremiumAnalytics\Enablement_Setting' ) ) { | |
| 909 | + \Automattic\Jetpack\PremiumAnalytics\Enablement_Setting::register(); | |
| 910 | + } | |
| 911 | + } | |
| 912 | + | |
| 913 | + /** | |
| 850 | 914 | * Before everything else starts getting initalized, we need to initialize Jetpack using the |
| 851 | 915 | * Config object. |
| 852 | 916 | */ |
| 853 | 917 | public function configure() { |
| @@ -856,13 +920,10 @@ | ||
| 856 | 920 | foreach ( |
| 857 | 921 | array( |
| 858 | 922 | 'jitm', |
| 859 | 923 | 'sync', |
| 924 | + 'account_protection', | |
| 860 | 925 | 'waf', |
| 861 | - 'videopress', | |
| 862 | - 'stats', | |
| 863 | - 'stats_admin', | |
| 864 | - 'import', | |
| 865 | 926 | ) |
| 866 | 927 | as $feature |
| 867 | 928 | ) { |
| 868 | 929 | $config->ensure( $feature ); |
| @@ -867,8 +928,103 @@ | ||
| 867 | 928 | ) { |
| 868 | 929 | $config->ensure( $feature ); |
| 869 | 930 | } |
| 870 | 931 | |
| 932 | + // Enable the VideoPress admin UI (the "Jetpack > VideoPress" dashboard) inside the | |
| 933 | + // Jetpack plugin, mirroring the standalone Jetpack VideoPress plugin. The dashboard | |
| 934 | + // only renders when the VideoPress module is active (Status::is_active()); when it | |
| 935 | + // is not, the menu item links to the My Jetpack interstitial to activate it. | |
| 936 | + $config->ensure( 'videopress', array( 'admin_ui' => true ) ); | |
| 937 | + | |
| 938 | + /* | |
| 939 | + * The Import package only registers `jetpack/v4/import` REST routes — it | |
| 940 | + * does nothing when rendering a front-end page — so gate its `ensure()` | |
| 941 | + * to keep its PHP out of opcache on the front-end GET hot path. It still | |
| 942 | + * loads on admin, cron, POST, and WP-CLI requests, and on `rest_api_init` | |
| 943 | + * for REST: a REST request can't be identified yet at `plugins_loaded` | |
| 944 | + * (this runs before `Config::on_plugins_loaded`, and `rest_api_init` | |
| 945 | + * fires later), so it is initialized directly when that hook fires, while | |
| 946 | + * a plain page view never fires it and so loads nothing. | |
| 947 | + * | |
| 948 | + * JITM stays eager (above): unlike Import, its `register()` adds a | |
| 949 | + * `jetpack_sync_before_send_updated_option` filter that records the | |
| 950 | + * `jetpack_last_plugin_sync` transient, and a Jetpack Sync send can fire | |
| 951 | + * on a plain front-end GET — including the dedicated-sync `spawn-sync` | |
| 952 | + * GET, which runs on `init` and exits before `rest_api_init`. Deferring | |
| 953 | + * JITM would skip that bookkeeping and leave its message cache stale after | |
| 954 | + * a plugin change, so it loads on every request as before. | |
| 955 | + */ | |
| 956 | + if ( self::should_eager_load_packages() ) { | |
| 957 | + $config->ensure( 'import' ); | |
| 958 | + } else { | |
| 959 | + add_action( | |
| 960 | + 'rest_api_init', | |
| 961 | + array( __CLASS__, 'configure_import_package' ), | |
| 962 | + 0 | |
| 963 | + ); | |
| 964 | + } | |
| 965 | + | |
| 966 | + /* | |
| 967 | + * The Stats and Stats Admin packages only do work when the Stats module | |
| 968 | + * is active (the front-end tracking pixel) or on wp-admin, REST, cron, | |
| 969 | + * POST, and WP-CLI requests: the Stats dashboard page, the stats / | |
| 970 | + * stats-app REST endpoints (which the block editor also calls for | |
| 971 | + * email-open rates), the transient-cleanup cron, the connection | |
| 972 | + * package's package-version tracker (which runs on POSTs and reads the | |
| 973 | + * `jetpack_package_versions` filter that Stats registers), and CLI | |
| 974 | + * introspection such as the heartbeat inspector. On a plain front-end | |
| 975 | + * GET page view with the module off they are inert: the pixel | |
| 976 | + * short-circuits on `Stats\Main::should_track()` and every other entry | |
| 977 | + * point only hooks rest_api_init, admin, cron, the POST-only tracker, or | |
| 978 | + * is reached through WP-CLI. | |
| 979 | + * Skip loading them — and eagerly constructing the Stats Admin REST | |
| 980 | + * controller — on that hot path to keep their PHP out of opcache, but | |
| 981 | + * keep loading them everywhere else exactly as before so the stats REST | |
| 982 | + * permission mapping (view_stats, registered by Stats\Main), the | |
| 983 | + * editor's stats-app calls, the cleanup cron, and the package-version | |
| 984 | + * tracker are all unchanged. | |
| 985 | + * | |
| 986 | + * REST requests are not yet identifiable here (REST_REQUEST is defined | |
| 987 | + * after plugins_loaded), so defer those to rest_api_init. Call the | |
| 988 | + * package initializers directly rather than `$config->ensure()`: ensure() | |
| 989 | + * only flags a feature for `Config::on_plugins_loaded()` (plugins_loaded | |
| 990 | + * priority 2), which has already run by the time rest_api_init fires. | |
| 991 | + * Priority 0 runs before each package's own priority-10 route | |
| 992 | + * registration, so their routes still register within the same dispatch. | |
| 993 | + * A plain page view never fires rest_api_init, so the packages stay | |
| 994 | + * unloaded there. See JETPACK-1747. | |
| 995 | + */ | |
| 996 | + $is_post_request = isset( $_SERVER['REQUEST_METHOD'] ) && 'POST' === $_SERVER['REQUEST_METHOD']; | |
| 997 | + $is_wp_cli = defined( 'WP_CLI' ) && WP_CLI; | |
| 998 | + | |
| 999 | + if ( self::is_module_active( 'stats' ) || is_admin() || wp_doing_cron() || $is_post_request || $is_wp_cli ) { | |
| 1000 | + $config->ensure( 'stats' ); | |
| 1001 | + $config->ensure( 'stats_admin' ); | |
| 1002 | + } else { | |
| 1003 | + add_action( | |
| 1004 | + 'rest_api_init', | |
| 1005 | + static function () { | |
| 1006 | + if ( class_exists( 'Automattic\Jetpack\Stats\Main' ) ) { | |
| 1007 | + \Automattic\Jetpack\Stats\Main::init(); | |
| 1008 | + } | |
| 1009 | + if ( class_exists( 'Automattic\Jetpack\Stats_Admin\Main' ) ) { | |
| 1010 | + \Automattic\Jetpack\Stats_Admin\Main::init(); | |
| 1011 | + } | |
| 1012 | + }, | |
| 1013 | + 0 | |
| 1014 | + ); | |
| 1015 | + } | |
| 1016 | + | |
| 1017 | + // Stats v2 (WOOA7S-1595). Unlike Stats above it cannot be deferred when enabled — see | |
| 1018 | + // Analytics::init() for why, and for why it takes no menu_title here. | |
| 1019 | + if ( self::is_premium_analytics_enabled() ) { | |
| 1020 | + \Automattic\Jetpack\PremiumAnalytics\Analytics::init(); | |
| 1021 | + } | |
| 1022 | + | |
| 1023 | + // Outside the check above on purpose — see Enablement_Setting. Deferred like Stats, to keep | |
| 1024 | + // the autoload off the front-end hot path. | |
| 1025 | + add_action( 'rest_api_init', array( __CLASS__, 'register_premium_analytics_enablement_setting' ), 0 ); | |
| 1026 | + | |
| 871 | 1027 | $config->ensure( |
| 872 | 1028 | 'connection', |
| 873 | 1029 | array( |
| 874 | 1030 | 'slug' => 'jetpack', |
| @@ -886,12 +1042,8 @@ | ||
| 886 | 1042 | ); |
| 887 | 1043 | |
| 888 | 1044 | $config->ensure( 'search' ); |
| 889 | 1045 | |
| 890 | - if ( defined( 'ENABLE_WORDADS_SHARED_UI' ) && ENABLE_WORDADS_SHARED_UI ) { | |
| 891 | - $config->ensure( 'wordads' ); | |
| 892 | - } | |
| 893 | - | |
| 894 | 1046 | if ( ! $this->connection_manager ) { |
| 895 | 1047 | $this->connection_manager = new Connection_Manager( 'jetpack' ); |
| 896 | 1048 | } |
| 897 | 1049 | |
| @@ -899,8 +1051,10 @@ | ||
| 899 | 1051 | if ( $modules->is_active( 'publicize' ) && $this->connection_manager->has_connected_user() ) { |
| 900 | 1052 | $config->ensure( 'publicize' ); |
| 901 | 1053 | } |
| 902 | 1054 | |
| 1055 | + add_action( 'jetpack_initialize_tracking', array( $this, 'initialize_tracking' ) ); | |
| 1056 | + | |
| 903 | 1057 | /* |
| 904 | 1058 | * Load things that should only be in Network Admin. |
| 905 | 1059 | * |
| 906 | 1060 | * For now blow away everything else until a more full |
| @@ -915,8 +1069,9 @@ | ||
| 915 | 1069 | $is_connection_ready = self::is_connection_ready(); |
| 916 | 1070 | |
| 917 | 1071 | if ( $is_connection_ready ) { |
| 918 | 1072 | add_action( 'login_form_jetpack_json_api_authorization', array( $this, 'login_form_json_api_authorization' ) ); |
| 1073 | + $this->run_initialize_tracking_action(); | |
| 919 | 1074 | |
| 920 | 1075 | Jetpack_Heartbeat::init(); |
| 921 | 1076 | if ( self::is_module_active( 'stats' ) && self::is_module_active( 'search' ) ) { |
| 922 | 1077 | require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-search-performance-logger.php'; |
| @@ -921,8 +1076,19 @@ | ||
| 921 | 1076 | if ( self::is_module_active( 'stats' ) && self::is_module_active( 'search' ) ) { |
| 922 | 1077 | require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-search-performance-logger.php'; |
| 923 | 1078 | Jetpack_Search_Performance_Logger::init(); |
| 924 | 1079 | } |
| 1080 | + } else { | |
| 1081 | + add_action( 'jetpack_agreed_to_terms_of_service', array( $this, 'run_initialize_tracking_action' ) ); | |
| 1082 | + add_action( 'rest_api_init', array( $this, 'run_initialize_tracking_action' ) ); | |
| 1083 | + add_filter( | |
| 1084 | + 'xmlrpc_methods', | |
| 1085 | + function ( $methods ) { | |
| 1086 | + $this->run_initialize_tracking_action(); | |
| 1087 | + return $methods; | |
| 1088 | + }, | |
| 1089 | + 1 | |
| 1090 | + ); | |
| 925 | 1091 | } |
| 926 | 1092 | |
| 927 | 1093 | // Initialize remote file upload request handlers. |
| 928 | 1094 | $this->add_remote_request_handlers(); |
| @@ -932,20 +1098,10 @@ | ||
| 932 | 1098 | */ |
| 933 | 1099 | if ( $is_connection_ready ) { |
| 934 | 1100 | require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-iframe-embed.php'; |
| 935 | 1101 | add_action( 'init', array( 'Jetpack_Iframe_Embed', 'init' ), 9, 0 ); |
| 936 | - require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-keyring-service-helper.php'; | |
| 937 | - add_action( 'init', array( 'Jetpack_Keyring_Service_Helper', 'init' ), 9, 0 ); | |
| 1102 | + add_action( 'rest_api_init', array( $this, 'maybe_initialize_rest_jsonapi' ) ); | |
| 938 | 1103 | } |
| 939 | - | |
| 940 | - if ( ( new Tracking( 'jetpack', $this->connection_manager ) )->should_enable_tracking( new Terms_Of_Service(), new Status() ) ) { | |
| 941 | - add_action( 'init', array( new Plugin_Tracking(), 'init' ) ); | |
| 942 | - } else { | |
| 943 | - /** | |
| 944 | - * Initialize tracking right after the user agrees to the terms of service. | |
| 945 | - */ | |
| 946 | - add_action( 'jetpack_agreed_to_terms_of_service', array( new Plugin_Tracking(), 'init' ) ); | |
| 947 | - } | |
| 948 | 1104 | } |
| 949 | 1105 | |
| 950 | 1106 | /** |
| 951 | 1107 | * Runs on plugins_loaded. Use this to add code that needs to be executed later than other |
| @@ -953,17 +1109,58 @@ | ||
| 953 | 1109 | * |
| 954 | 1110 | * @action plugins_loaded |
| 955 | 1111 | */ |
| 956 | 1112 | public function late_initialization() { |
| 957 | - add_action( 'plugins_loaded', array( 'Jetpack', 'load_modules' ), 100 ); | |
| 1113 | + add_action( 'after_setup_theme', array( 'Jetpack', 'load_modules' ), -2 ); | |
| 958 | 1114 | |
| 959 | - Partner::init(); | |
| 960 | - My_Jetpack_Initializer::init(); | |
| 1115 | + /* | |
| 1116 | + * My Jetpack is a wp-admin dashboard. Its Initializer::init() only wires | |
| 1117 | + * up admin-menu, admin_init, and rest_api_init surfaces — and eagerly | |
| 1118 | + * loads every product class (backup, boost, protect, …) just to register | |
| 1119 | + * admin plugin-action links — so none of it is needed on a plain | |
| 1120 | + * front-end GET page view. (The pieces that do immediate work, e.g. | |
| 1121 | + * Connection REST authentication and Licensing, are already initialized | |
| 1122 | + * unconditionally in Jetpack's constructor, so they are unaffected here.) | |
| 1123 | + * | |
| 1124 | + * Gate the call to the request types where My Jetpack actually does work. | |
| 1125 | + * REST can't be detected yet at plugins_loaded, so initialize on | |
| 1126 | + * rest_api_init for that branch; a plain page view never fires it, so My | |
| 1127 | + * Jetpack stays unloaded there. | |
| 1128 | + */ | |
| 1129 | + if ( self::should_eager_load_packages() ) { | |
| 1130 | + My_Jetpack_Initializer::init(); | |
| 1131 | + } else { | |
| 1132 | + add_action( 'rest_api_init', array( My_Jetpack_Initializer::class, 'init' ), 0 ); | |
| 1133 | + } | |
| 961 | 1134 | |
| 962 | - // Initialize Boost Speed Score | |
| 963 | - $modules = Jetpack_Boost_Modules::init(); | |
| 964 | - new Speed_Score( $modules, 'jetpack-dashboard' ); | |
| 1135 | + Scan_Page_Init::initialize(); | |
| 1136 | + Jetpack_SEO_Initializer::init(); | |
| 965 | 1137 | |
| 1138 | + if ( ( new Modules() )->is_active( 'podcast' ) ) { | |
| 1139 | + Podcast::init(); | |
| 1140 | + } | |
| 1141 | + | |
| 1142 | + /* | |
| 1143 | + * Initialize Boost Speed Score. It only does work on REST requests (the | |
| 1144 | + * dashboard speed-score endpoints) and on a few Jetpack Boost lifecycle | |
| 1145 | + * actions, so defer constructing it — and loading the boost-speed-score | |
| 1146 | + * package classes — until one of those hooks actually fires instead of on | |
| 1147 | + * every request. Priority 0 ensures the object's own callbacks (added in | |
| 1148 | + * its constructor at the default priority) still run for the firing hook. | |
| 1149 | + */ | |
| 1150 | + $initialize_speed_score = static function () { | |
| 1151 | + static $initialized = false; | |
| 1152 | + if ( $initialized ) { | |
| 1153 | + return; | |
| 1154 | + } | |
| 1155 | + $initialized = true; | |
| 1156 | + new Speed_Score( array(), 'jetpack-dashboard' ); | |
| 1157 | + }; | |
| 1158 | + add_action( 'rest_api_init', $initialize_speed_score, 0 ); | |
| 1159 | + add_action( 'jetpack_boost_deactivate', $initialize_speed_score, 0 ); | |
| 1160 | + add_action( 'jetpack_boost_environment_changed', $initialize_speed_score, 0 ); | |
| 1161 | + add_action( 'handle_environment_change', $initialize_speed_score, 0 ); | |
| 1162 | + | |
| 966 | 1163 | /** |
| 967 | 1164 | * Fires when Jetpack is fully loaded and ready. This is the point where it's safe |
| 968 | 1165 | * to instantiate classes from packages and namespaces that are managed by the Jetpack Autoloader. |
| 969 | 1166 | * |
| @@ -1001,8 +1198,10 @@ | ||
| 1001 | 1198 | |
| 1002 | 1199 | /** |
| 1003 | 1200 | * Redirect edit post links to Calypso. |
| 1004 | 1201 | * |
| 1202 | + * @deprecated since 13.9 | |
| 1203 | + * | |
| 1005 | 1204 | * @param string $default_url Post edit URL. |
| 1006 | 1205 | * @param int $post_id Post ID. |
| 1007 | 1206 | * |
| 1008 | 1207 | * @return string |
| @@ -1007,8 +1206,10 @@ | ||
| 1007 | 1206 | * |
| 1008 | 1207 | * @return string |
| 1009 | 1208 | */ |
| 1010 | 1209 | public function point_edit_post_links_to_calypso( $default_url, $post_id ) { |
| 1210 | + _deprecated_function( __METHOD__, '13.9' ); | |
| 1211 | + | |
| 1011 | 1212 | $post = get_post( $post_id ); |
| 1012 | 1213 | |
| 1013 | 1214 | if ( empty( $post ) ) { |
| 1014 | 1215 | return $default_url; |
| @@ -1039,13 +1240,17 @@ | ||
| 1039 | 1240 | |
| 1040 | 1241 | /** |
| 1041 | 1242 | * Redirect edit comment links to Calypso. |
| 1042 | 1243 | * |
| 1244 | + * @deprecated since 13.9 | |
| 1245 | + * | |
| 1043 | 1246 | * @param string $url Comment edit URL. |
| 1044 | 1247 | * |
| 1045 | 1248 | * @return string |
| 1046 | 1249 | */ |
| 1047 | 1250 | public function point_edit_comment_links_to_calypso( $url ) { |
| 1251 | + _deprecated_function( __METHOD__, '13.9' ); | |
| 1252 | + | |
| 1048 | 1253 | // Take the `query` key value from the URL, and parse its parts to the $query_args. `amp;c` matches the comment ID. |
| 1049 | 1254 | $query_args = null; |
| 1050 | 1255 | wp_parse_str( wp_parse_url( $url, PHP_URL_QUERY ), $query_args ); |
| 1051 | 1256 | |
| @@ -1064,30 +1269,16 @@ | ||
| 1064 | 1269 | * |
| 1065 | 1270 | * @return array list of callables. |
| 1066 | 1271 | */ |
| 1067 | 1272 | public function filter_sync_callable_whitelist( $callables ) { |
| 1068 | - | |
| 1069 | 1273 | // Jetpack Functions. |
| 1070 | 1274 | $jetpack_callables = array( |
| 1071 | 1275 | 'single_user_site' => array( 'Jetpack', 'is_single_user_site' ), |
| 1072 | 1276 | 'updates' => array( 'Jetpack', 'get_updates' ), |
| 1073 | 1277 | 'available_jetpack_blocks' => array( 'Jetpack_Gutenberg', 'get_availability' ), // Includes both Gutenberg blocks *and* plugins. |
| 1278 | + 'theme_styles' => array( 'Automattic\\Jetpack\\Plugin\\Theme_Styles_Sync', 'get_theme_styles' ), | |
| 1074 | 1279 | ); |
| 1075 | - $callables = array_merge( $callables, $jetpack_callables ); | |
| 1076 | - | |
| 1077 | - // Jetpack_SSO_Helpers. | |
| 1078 | - if ( include_once JETPACK__PLUGIN_DIR . 'modules/sso/class.jetpack-sso-helpers.php' ) { | |
| 1079 | - $sso_helpers = array( | |
| 1080 | - 'sso_is_two_step_required' => array( 'Jetpack_SSO_Helpers', 'is_two_step_required' ), | |
| 1081 | - 'sso_should_hide_login_form' => array( 'Jetpack_SSO_Helpers', 'should_hide_login_form' ), | |
| 1082 | - 'sso_match_by_email' => array( 'Jetpack_SSO_Helpers', 'match_by_email' ), | |
| 1083 | - 'sso_new_user_override' => array( 'Jetpack_SSO_Helpers', 'new_user_override' ), | |
| 1084 | - 'sso_bypass_default_login_form' => array( 'Jetpack_SSO_Helpers', 'bypass_login_forward_wpcom' ), | |
| 1085 | - ); | |
| 1086 | - $callables = array_merge( $callables, $sso_helpers ); | |
| 1087 | - } | |
| 1088 | - | |
| 1089 | - return $callables; | |
| 1280 | + return array_merge( $callables, $jetpack_callables ); | |
| 1090 | 1281 | } |
| 1091 | 1282 | |
| 1092 | 1283 | /** |
| 1093 | 1284 | * Extend Sync multisite callables with Jetpack Plugin functions. |
| @@ -1112,41 +1303,8 @@ | ||
| 1112 | 1303 | return $callables; |
| 1113 | 1304 | } |
| 1114 | 1305 | |
| 1115 | 1306 | /** |
| 1116 | - * Deprecated | |
| 1117 | - * Please use Automattic\Jetpack\JITMS\JITM::jetpack_track_last_sync_callback instead. | |
| 1118 | - * | |
| 1119 | - * @param array $params The action parameters. | |
| 1120 | - * | |
| 1121 | - * @deprecated since 9.8. | |
| 1122 | - */ | |
| 1123 | - public function jetpack_track_last_sync_callback( $params ) { | |
| 1124 | - _deprecated_function( __METHOD__, 'jetpack-9.8', '\Automattic\Jetpack\JITMS\JITM->jetpack_track_last_sync_callback' ); | |
| 1125 | - return Automattic\Jetpack\JITMS\JITM::get_instance()->jetpack_track_last_sync_callback( $params ); | |
| 1126 | - } | |
| 1127 | - | |
| 1128 | - /** | |
| 1129 | - * Jetpack Connection banner callback function. | |
| 1130 | - * | |
| 1131 | - * @return void | |
| 1132 | - */ | |
| 1133 | - public function jetpack_connection_banner_callback() { | |
| 1134 | - check_ajax_referer( 'jp-connection-banner-nonce', 'nonce' ); | |
| 1135 | - | |
| 1136 | - // Disable the banner dismiss functionality if the pre-connection prompt helpers filter is set. | |
| 1137 | - if ( | |
| 1138 | - isset( $_REQUEST['dismissBanner'] ) && | |
| 1139 | - ! Jetpack_Connection_Banner::force_display() | |
| 1140 | - ) { | |
| 1141 | - Jetpack_Options::update_option( 'dismissed_connection_banner', 1 ); | |
| 1142 | - wp_send_json_success(); | |
| 1143 | - } | |
| 1144 | - | |
| 1145 | - wp_die(); | |
| 1146 | - } | |
| 1147 | - | |
| 1148 | - /** | |
| 1149 | 1307 | * If there are any stats that need to be pushed, but haven't been, push them now. |
| 1150 | 1308 | */ |
| 1151 | 1309 | public function push_stats() { |
| 1152 | 1310 | if ( ! empty( $this->stats ) ) { |
| @@ -1161,16 +1319,8 @@ | ||
| 1161 | 1319 | * @param string $cap Capability name. |
| 1162 | 1320 | */ |
| 1163 | 1321 | public function jetpack_custom_caps( $caps, $cap ) { |
| 1164 | 1322 | switch ( $cap ) { |
| 1165 | - case 'jetpack_manage_modules': | |
| 1166 | - case 'jetpack_activate_modules': | |
| 1167 | - case 'jetpack_deactivate_modules': | |
| 1168 | - $caps = array( 'manage_options' ); | |
| 1169 | - break; | |
| 1170 | - case 'jetpack_configure_modules': | |
| 1171 | - $caps = array( 'manage_options' ); | |
| 1172 | - break; | |
| 1173 | 1323 | case 'jetpack_manage_autoupdates': |
| 1174 | 1324 | $caps = array( |
| 1175 | 1325 | 'manage_options', |
| 1176 | 1326 | 'update_plugins', |
| @@ -1188,9 +1338,9 @@ | ||
| 1188 | 1338 | if ( $is_offline_mode ) { |
| 1189 | 1339 | $caps = array( 'manage_options' ); |
| 1190 | 1340 | break; |
| 1191 | 1341 | } else { |
| 1192 | - $caps = array( 'read' ); | |
| 1342 | + $caps = array( 'edit_posts' ); | |
| 1193 | 1343 | } |
| 1194 | 1344 | break; |
| 1195 | 1345 | } |
| 1196 | 1346 | return $caps; |
| @@ -1349,9 +1499,9 @@ | ||
| 1349 | 1499 | } |
| 1350 | 1500 | /** |
| 1351 | 1501 | * Does the network allow admins to add new users. |
| 1352 | 1502 | * |
| 1353 | - * @return boolian | |
| 1503 | + * @return bool | |
| 1354 | 1504 | */ |
| 1355 | 1505 | public static function network_add_new_users() { |
| 1356 | 1506 | return (bool) get_site_option( 'add_new_users' ); |
| 1357 | 1507 | } |
| @@ -1358,9 +1508,9 @@ | ||
| 1358 | 1508 | /** |
| 1359 | 1509 | * File upload psace left per site in MB. |
| 1360 | 1510 | * -1 means NO LIMIT. |
| 1361 | 1511 | * |
| 1362 | - * @return number | |
| 1512 | + * @return int | |
| 1363 | 1513 | */ |
| 1364 | 1514 | public static function network_site_upload_space() { |
| 1365 | 1515 | // value in MB. |
| 1366 | 1516 | return ( get_site_option( 'upload_space_check_disabled' ) ? -1 : get_space_allowed() ); |
| @@ -1377,9 +1527,9 @@ | ||
| 1377 | 1527 | |
| 1378 | 1528 | /** |
| 1379 | 1529 | * Maximum file upload size set by the network. |
| 1380 | 1530 | * |
| 1381 | - * @return number | |
| 1531 | + * @return int | |
| 1382 | 1532 | */ |
| 1383 | 1533 | public static function network_max_upload_file_size() { |
| 1384 | 1534 | // value in KB. |
| 1385 | 1535 | return get_site_option( 'fileupload_maxk', 300 ); |
| @@ -1633,44 +1783,8 @@ | ||
| 1633 | 1783 | return apply_filters( 'jetpack_is_connection_ready', self::connection()->is_connected(), self::connection() ); |
| 1634 | 1784 | } |
| 1635 | 1785 | |
| 1636 | 1786 | /** |
| 1637 | - * Deprecated: Is Jetpack in development (offline) mode? | |
| 1638 | - * | |
| 1639 | - * This static method is being left here intentionally without the use of _deprecated_function(), as other plugins | |
| 1640 | - * and themes still use it, and we do not want to flood them with notices. | |
| 1641 | - * | |
| 1642 | - * Please use Automattic\Jetpack\Status()->is_offline_mode() instead. | |
| 1643 | - * | |
| 1644 | - * @deprecated since 8.0. | |
| 1645 | - */ | |
| 1646 | - public static function is_development_mode() { | |
| 1647 | - _deprecated_function( __METHOD__, 'jetpack-8.0', '\Automattic\Jetpack\Status->is_offline_mode' ); | |
| 1648 | - return ( new Status() )->is_offline_mode(); | |
| 1649 | - } | |
| 1650 | - | |
| 1651 | - /** | |
| 1652 | - * Whether the site is currently onboarding or not. | |
| 1653 | - * A site is considered as being onboarded if it currently has an onboarding token. | |
| 1654 | - * | |
| 1655 | - * @since 5.8 | |
| 1656 | - * @deprecated Use \Automattic\Jetpack\Status()->is_onboarding() | |
| 1657 | - * | |
| 1658 | - * @access public | |
| 1659 | - * @static | |
| 1660 | - * | |
| 1661 | - * @return bool True if the site is currently onboarding, false otherwise | |
| 1662 | - */ | |
| 1663 | - public static function is_onboarding() { | |
| 1664 | - _deprecated_function( __METHOD__, 'jetpack-10.9', 'Automattic\\Jetpack\\Status\\is_onboarding' ); | |
| 1665 | - | |
| 1666 | - if ( ! method_exists( 'Automattic\Jetpack\Status', 'is_onboarding' ) ) { | |
| 1667 | - return Jetpack_Options::get_option( 'onboarding' ) !== false; | |
| 1668 | - } | |
| 1669 | - return ( new Status() )->is_onboarding(); | |
| 1670 | - } | |
| 1671 | - | |
| 1672 | - /** | |
| 1673 | 1787 | * Determines reason for Jetpack offline mode. |
| 1674 | 1788 | */ |
| 1675 | 1789 | public static function development_mode_trigger_text() { |
| 1676 | 1790 | $status = new Status(); |
| @@ -1684,11 +1798,10 @@ | ||
| 1684 | 1798 | } elseif ( defined( 'WP_LOCAL_DEV' ) && WP_LOCAL_DEV ) { |
| 1685 | 1799 | $notice = __( 'The WP_LOCAL_DEV constant is defined in wp-config.php or elsewhere.', 'jetpack' ); |
| 1686 | 1800 | } elseif ( $status->is_local_site() ) { |
| 1687 | 1801 | $notice = __( 'The site URL is a known local development environment URL (e.g. http://localhost).', 'jetpack' ); |
| 1688 | - /** This filter is documented in packages/status/src/class-status.php */ | |
| 1689 | - } elseif ( has_filter( 'jetpack_development_mode' ) && apply_filters( 'jetpack_development_mode', false ) ) { // This is a deprecated filter name. | |
| 1690 | - $notice = __( 'The jetpack_development_mode filter is set to true.', 'jetpack' ); | |
| 1802 | + } elseif ( get_option( 'jetpack_offline_mode' ) ) { | |
| 1803 | + $notice = __( 'The jetpack_offline_mode option is set to true.', 'jetpack' ); | |
| 1691 | 1804 | } else { |
| 1692 | 1805 | $notice = __( 'The jetpack_offline_mode filter is set to true.', 'jetpack' ); |
| 1693 | 1806 | } |
| 1694 | 1807 | |
| @@ -1718,15 +1831,8 @@ | ||
| 1718 | 1831 | $notice = sprintf( __( 'You are currently running a development version of Jetpack. <a href="%s" target="_blank">Submit your feedback</a>', 'jetpack' ), esc_url( Redirect::get_url( 'jetpack-contact-support-beta-group' ) ) ); |
| 1719 | 1832 | |
| 1720 | 1833 | echo '<div class="updated" style="border-color: #f0821e;"><p>' . $notice . '</p></div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- All provided text. |
| 1721 | 1834 | } |
| 1722 | - // Throw up a notice if using staging mode. | |
| 1723 | - if ( ( new Status() )->is_staging_site() ) { | |
| 1724 | - /* translators: %s is a URL */ | |
| 1725 | - $notice = sprintf( __( 'You are running Jetpack on a <a href="%s" target="_blank">staging server</a>.', 'jetpack' ), esc_url( Redirect::get_url( 'jetpack-support-staging-sites' ) ) ); | |
| 1726 | - | |
| 1727 | - echo '<div class="updated" style="border-color: #f0821e;"><p>' . $notice . '</p></div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- All provided text. | |
| 1728 | - } | |
| 1729 | 1835 | } |
| 1730 | 1836 | |
| 1731 | 1837 | /** |
| 1732 | 1838 | * Whether Jetpack's version maps to a public release, or a development version. |
| @@ -1747,28 +1853,8 @@ | ||
| 1747 | 1853 | ); |
| 1748 | 1854 | } |
| 1749 | 1855 | |
| 1750 | 1856 | /** |
| 1751 | - * Is a given user (or the current user if none is specified) linked to a WordPress.com user? | |
| 1752 | - * | |
| 1753 | - * @param int $user_id User ID or will use get_current_user_id if false/not provided. | |
| 1754 | - */ | |
| 1755 | - public static function is_user_connected( $user_id = false ) { | |
| 1756 | - _deprecated_function( __METHOD__, 'jetpack-9.5', 'Automattic\\Jetpack\\Connection\\Manager\\is_user_connected' ); | |
| 1757 | - return self::connection()->is_user_connected( $user_id ); | |
| 1758 | - } | |
| 1759 | - | |
| 1760 | - /** | |
| 1761 | - * Get the wpcom user data of the current|specified connected user. | |
| 1762 | - * | |
| 1763 | - * @param null|int $user_id User ID or will use get_current_user_id if null. | |
| 1764 | - */ | |
| 1765 | - public static function get_connected_user_data( $user_id = null ) { | |
| 1766 | - _deprecated_function( __METHOD__, 'jetpack-9.5', 'Automattic\\Jetpack\\Connection\\Manager\\get_connected_user_data' ); | |
| 1767 | - return self::connection()->get_connected_user_data( $user_id ); | |
| 1768 | - } | |
| 1769 | - | |
| 1770 | - /** | |
| 1771 | 1857 | * Get the wpcom email of the current|specified connected user. |
| 1772 | 1858 | * |
| 1773 | 1859 | * @param null|int $user_id User ID or will use get_current_user_id if null. |
| 1774 | 1860 | */ |
| @@ -1820,18 +1906,11 @@ | ||
| 1820 | 1906 | */ |
| 1821 | 1907 | public static function load_modules() { |
| 1822 | 1908 | $status = new Status(); |
| 1823 | 1909 | |
| 1824 | - if ( method_exists( $status, 'is_onboarding' ) ) { | |
| 1825 | - $is_onboarding = $status->is_onboarding(); | |
| 1826 | - } else { | |
| 1827 | - $is_onboarding = self::is_onboarding(); | |
| 1828 | - } | |
| 1829 | - | |
| 1830 | 1910 | if ( |
| 1831 | 1911 | ! self::is_connection_ready() |
| 1832 | 1912 | && ! $status->is_offline_mode() |
| 1833 | - && ! $is_onboarding | |
| 1834 | 1913 | && ( |
| 1835 | 1914 | ! is_multisite() |
| 1836 | 1915 | || ! get_site_option( 'jetpack_protect_active' ) |
| 1837 | 1916 | ) |
| @@ -1952,22 +2031,14 @@ | ||
| 1952 | 2031 | * |
| 1953 | 2032 | * @todo Store the result in core's object cache maybe? |
| 1954 | 2033 | */ |
| 1955 | 2034 | public static function get_active_plugins() { |
| 1956 | - $active_plugins = (array) get_option( 'active_plugins', array() ); | |
| 1957 | - | |
| 1958 | - if ( is_multisite() ) { | |
| 1959 | - // Due to legacy code, active_sitewide_plugins stores them in the keys, | |
| 1960 | - // whereas active_plugins stores them in the values. | |
| 1961 | - $network_plugins = array_keys( get_site_option( 'active_sitewide_plugins', array() ) ); | |
| 1962 | - if ( $network_plugins ) { | |
| 1963 | - $active_plugins = array_merge( $active_plugins, $network_plugins ); | |
| 1964 | - } | |
| 2035 | + // Older Connection copies can load first and lack this method. | |
| 2036 | + if ( ! method_exists( Heartbeat::class, 'get_active_plugins' ) ) { | |
| 2037 | + return array(); | |
| 1965 | 2038 | } |
| 1966 | 2039 | |
| 1967 | - sort( $active_plugins ); | |
| 1968 | - | |
| 1969 | - return array_unique( $active_plugins ); | |
| 2040 | + return Heartbeat::get_active_plugins(); | |
| 1970 | 2041 | } |
| 1971 | 2042 | |
| 1972 | 2043 | /** |
| 1973 | 2044 | * Gets and parses additional plugin data to send with the heartbeat data |
| @@ -2105,8 +2176,10 @@ | ||
| 2105 | 2176 | * |
| 2106 | 2177 | * @param bool true Should Twitter Card Meta tags be disabled. Default to true. |
| 2107 | 2178 | */ |
| 2108 | 2179 | if ( ! apply_filters( 'jetpack_disable_twitter_cards', false ) ) { |
| 2180 | + // @todo Remove this require once the deprecated Jetpack_Twitter_Cards wrapper has been removed. | |
| 2181 | + // Twitter Cards functionality now lives in the jetpack-post-media package (Automattic\Jetpack\Post_Media\Twitter_Cards). | |
| 2109 | 2182 | require_once JETPACK__PLUGIN_DIR . 'class.jetpack-twitter-cards.php'; |
| 2110 | 2183 | } |
| 2111 | 2184 | } |
| 2112 | 2185 | |
| @@ -2209,9 +2282,9 @@ | ||
| 2209 | 2282 | if ( isset( $_GET['page'] ) && in_array( $_GET['page'], array( 'jetpack', 'jetpack_modules' ), true ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- we're not changing the site. |
| 2210 | 2283 | $page = sanitize_text_field( wp_unslash( $_GET['page'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- we're not changing the site. |
| 2211 | 2284 | } |
| 2212 | 2285 | wp_safe_redirect( self::admin_url( 'page=' . rawurlencode( $page ) ) ); |
| 2213 | - exit; | |
| 2286 | + exit( 0 ); | |
| 2214 | 2287 | } |
| 2215 | 2288 | } |
| 2216 | 2289 | |
| 2217 | 2290 | /** |
| @@ -2258,8 +2331,12 @@ | ||
| 2258 | 2331 | default: |
| 2259 | 2332 | break; |
| 2260 | 2333 | } |
| 2261 | 2334 | } |
| 2335 | + if ( method_exists( Feature_Policy::class, 'ensure_hooks' ) ) { | |
| 2336 | + Feature_Policy::ensure_hooks(); | |
| 2337 | + } | |
| 2338 | + | |
| 2262 | 2339 | /** |
| 2263 | 2340 | * Filters the array of default modules. |
| 2264 | 2341 | * |
| 2265 | 2342 | * @since 2.5.0 |
| @@ -2291,12 +2368,14 @@ | ||
| 2291 | 2368 | * @return array |
| 2292 | 2369 | */ |
| 2293 | 2370 | public function handle_deprecated_modules( $modules ) { |
| 2294 | 2371 | $deprecated_modules = array( |
| 2295 | - 'debug' => null, // Closed out and moved to the debugger library. | |
| 2296 | - 'wpcc' => 'sso', // Closed out in 2.6 -- SSO provides the same functionality. | |
| 2297 | - 'gplus-authorship' => null, // Closed out in 3.2 -- Google dropped support. | |
| 2298 | - 'minileven' => null, // Closed out in 8.3 -- Responsive themes are common now, and so is AMP. | |
| 2372 | + 'debug' => null, // Closed out and moved to the debugger library. | |
| 2373 | + 'wpcc' => 'sso', // Closed out in 2.6 -- SSO provides the same functionality. | |
| 2374 | + 'gplus-authorship' => null, // Closed out in 3.2 -- Google dropped support. | |
| 2375 | + 'minileven' => null, // Closed out in 8.3 -- Responsive themes are common now, and so is AMP. | |
| 2376 | + 'lazy-images' => null, // Closed out in 12.8 -- WordPress core now has native lazy loading. | |
| 2377 | + 'enhanced-distribution' => null, // Closed out in 13.3 -- WP.com is winding down the firehose. | |
| 2299 | 2378 | ); |
| 2300 | 2379 | |
| 2301 | 2380 | // Don't activate SSO if they never completed activating WPCC. |
| 2302 | 2381 | if ( self::is_module_active( 'wpcc' ) ) { |
| @@ -2350,8 +2429,17 @@ | ||
| 2350 | 2429 | } |
| 2351 | 2430 | } |
| 2352 | 2431 | } |
| 2353 | 2432 | |
| 2433 | + // Special case to convert block setting to a block module. | |
| 2434 | + $block_key = array_search( 'blocks', $modules, true ); | |
| 2435 | + if ( $block_key !== false ) { // Only care if 'blocks' made it through the previous filters. | |
| 2436 | + $block_option = get_option( 'jetpack_blocks_disabled', null ); | |
| 2437 | + if ( $block_option ) { | |
| 2438 | + unset( $modules[ $block_key ] ); | |
| 2439 | + } | |
| 2440 | + } | |
| 2441 | + | |
| 2354 | 2442 | return $modules; |
| 2355 | 2443 | } |
| 2356 | 2444 | |
| 2357 | 2445 | /** |
| @@ -2408,23 +2496,30 @@ | ||
| 2408 | 2496 | |
| 2409 | 2497 | /** |
| 2410 | 2498 | * Return module name translation. Uses matching string created in modules/module-headings.php. |
| 2411 | 2499 | * |
| 2500 | + * The module list is globbed from `modules/` at runtime, so a module can be listed with no | |
| 2501 | + * entry in that generated file. Fall back to the untranslated header rather than overwriting | |
| 2502 | + * it with the null `jetpack_get_module_i18n()` returns for an unknown slug. | |
| 2503 | + * | |
| 2412 | 2504 | * @since 3.9.2 |
| 2413 | 2505 | * |
| 2414 | 2506 | * @param array $modules Array of Jetpack modules. |
| 2415 | 2507 | * |
| 2416 | - * @return string|void | |
| 2508 | + * @return array | |
| 2417 | 2509 | */ |
| 2418 | 2510 | public static function get_translated_modules( $modules ) { |
| 2419 | 2511 | foreach ( $modules as $index => $module ) { |
| 2420 | 2512 | $i18n_module = jetpack_get_module_i18n( $module['module'] ); |
| 2421 | - if ( isset( $module['name'] ) ) { | |
| 2422 | - $modules[ $index ]['name'] = $i18n_module['name']; | |
| 2513 | + $name = $i18n_module['name'] ?? null; | |
| 2514 | + $description = $i18n_module['description'] ?? null; | |
| 2515 | + | |
| 2516 | + if ( null !== $name && isset( $module['name'] ) ) { | |
| 2517 | + $modules[ $index ]['name'] = $name; | |
| 2423 | 2518 | } |
| 2424 | - if ( isset( $module['description'] ) ) { | |
| 2425 | - $modules[ $index ]['description'] = $i18n_module['description']; | |
| 2426 | - $modules[ $index ]['short_description'] = $i18n_module['description']; | |
| 2519 | + if ( null !== $description && isset( $module['description'] ) ) { | |
| 2520 | + $modules[ $index ]['description'] = $description; | |
| 2521 | + $modules[ $index ]['short_description'] = $description; | |
| 2427 | 2522 | } |
| 2428 | 2523 | if ( isset( $module['module_tags'] ) ) { |
| 2429 | 2524 | $modules[ $index ]['module_tags'] = array_map( 'jetpack_get_module_i18n_tag', $module['module_tags'] ); |
| 2430 | 2525 | } |
| @@ -2464,20 +2559,28 @@ | ||
| 2464 | 2559 | |
| 2465 | 2560 | /** |
| 2466 | 2561 | * Catches PHP errors. Must be used in conjunction with output buffering. |
| 2467 | 2562 | * |
| 2563 | + * @deprecated since 13.5 | |
| 2468 | 2564 | * @param bool $catch True to start catching, False to stop. |
| 2469 | 2565 | * |
| 2470 | 2566 | * @static |
| 2567 | + * @deprecated 13.5 | |
| 2568 | + * @see \Automattic\Jetpack\Errors | |
| 2471 | 2569 | */ |
| 2472 | 2570 | public static function catch_errors( $catch ) { |
| 2571 | + _deprecated_function( __METHOD__, '13.5' ); | |
| 2572 | + // @phan-suppress-next-line PhanDeprecatedClass | |
| 2473 | 2573 | return ( new Errors() )->catch_errors( $catch ); |
| 2474 | 2574 | } |
| 2475 | 2575 | |
| 2476 | 2576 | /** |
| 2477 | 2577 | * Saves any generated PHP errors in ::state( 'php_errors', {errors} ) |
| 2578 | + * | |
| 2579 | + * @deprecated since 13.5 | |
| 2478 | 2580 | */ |
| 2479 | 2581 | public static function catch_errors_on_shutdown() { |
| 2582 | + _deprecated_function( __METHOD__, '13.5' ); | |
| 2480 | 2583 | self::state( 'php_errors', self::alias_directories( ob_get_clean() ) ); |
| 2481 | 2584 | } |
| 2482 | 2585 | |
| 2483 | 2586 | /** |
| @@ -2581,9 +2684,9 @@ | ||
| 2581 | 2684 | ), |
| 2582 | 2685 | add_query_arg( compact( 'min_version', 'max_version', 'other_modules' ), self::admin_url( 'page=jetpack' ) ) |
| 2583 | 2686 | ); |
| 2584 | 2687 | wp_safe_redirect( $url ); |
| 2585 | - exit; | |
| 2688 | + exit( 0 ); | |
| 2586 | 2689 | } |
| 2587 | 2690 | } |
| 2588 | 2691 | |
| 2589 | 2692 | /** |
| @@ -2601,9 +2704,8 @@ | ||
| 2601 | 2704 | |
| 2602 | 2705 | // Check each module for fatal errors, a la wp-admin/plugins.php::activate before activating. |
| 2603 | 2706 | if ( $send_state_messages ) { |
| 2604 | 2707 | self::restate(); |
| 2605 | - self::catch_errors( true ); | |
| 2606 | 2708 | } |
| 2607 | 2709 | |
| 2608 | 2710 | $active = self::get_active_modules(); |
| 2609 | 2711 | |
| @@ -2671,10 +2773,8 @@ | ||
| 2671 | 2773 | if ( $send_state_messages ) { |
| 2672 | 2774 | self::state( 'error', false ); |
| 2673 | 2775 | self::state( 'module', false ); |
| 2674 | 2776 | } |
| 2675 | - | |
| 2676 | - self::catch_errors( false ); | |
| 2677 | 2777 | /** |
| 2678 | 2778 | * Fires when default modules are activated. |
| 2679 | 2779 | * |
| 2680 | 2780 | * @since 1.9.0 |
| @@ -2732,9 +2832,9 @@ | ||
| 2732 | 2832 | * @return string $url module configuration URL. |
| 2733 | 2833 | */ |
| 2734 | 2834 | public static function module_configuration_url( $module ) { |
| 2735 | 2835 | $module = self::get_module_slug( $module ); |
| 2736 | - $default_url = self::admin_url() . "#/settings?term=$module"; | |
| 2836 | + $default_url = self::admin_url( array( 'page' => 'jetpack-settings' ) ) . "#/settings?term=$module"; | |
| 2737 | 2837 | /** |
| 2738 | 2838 | * Allows to modify configure_url of specific module to be able to redirect to some custom location. |
| 2739 | 2839 | * |
| 2740 | 2840 | * @since 6.9.0 |
| @@ -2752,9 +2852,9 @@ | ||
| 2752 | 2852 | * |
| 2753 | 2853 | * @param string $message Error message. |
| 2754 | 2854 | * @param bool $deactivate Deactivate Jetpack or not. |
| 2755 | 2855 | * |
| 2756 | - * @return void | |
| 2856 | + * @return never | |
| 2757 | 2857 | */ |
| 2758 | 2858 | public static function bail_on_activation( $message, $deactivate = true ) { |
| 2759 | 2859 | ?> |
| 2760 | 2860 | <!doctype html> |
| @@ -2792,9 +2892,9 @@ | ||
| 2792 | 2892 | if ( $update ) { |
| 2793 | 2893 | update_option( 'active_plugins', array_filter( $plugins ) ); |
| 2794 | 2894 | } |
| 2795 | 2895 | } |
| 2796 | - exit; | |
| 2896 | + exit( 0 ); | |
| 2797 | 2897 | } |
| 2798 | 2898 | |
| 2799 | 2899 | /** |
| 2800 | 2900 | * Attached to activate_{ plugin_basename( __FILES__ ) } by register_activation_hook() |
| @@ -2819,12 +2919,18 @@ | ||
| 2819 | 2919 | update_option( 'jetpack_activation_source', self::get_activation_source( wp_get_referer() ) ); |
| 2820 | 2920 | |
| 2821 | 2921 | Health::on_jetpack_activated(); |
| 2822 | 2922 | |
| 2923 | + \Automattic\Jetpack\Reprint_Export\Reprint_Exporter::discard_credentials(); | |
| 2924 | + | |
| 2823 | 2925 | if ( self::is_connection_ready() && method_exists( 'Automattic\Jetpack\Sync\Actions', 'do_only_first_initial_sync' ) ) { |
| 2824 | 2926 | Sync_Actions::do_only_first_initial_sync(); |
| 2825 | 2927 | } |
| 2826 | 2928 | |
| 2929 | + if ( ! defined( 'WC_ANALYTICS' ) && class_exists( 'Automattic\Woocommerce_Analytics' ) ) { | |
| 2930 | + Woocommerce_Analytics::maybe_add_proxy_speed_module(); | |
| 2931 | + } | |
| 2932 | + | |
| 2827 | 2933 | self::plugin_initialize(); |
| 2828 | 2934 | } |
| 2829 | 2935 | |
| 2830 | 2936 | /** |
| @@ -2859,9 +2965,9 @@ | ||
| 2859 | 2965 | |
| 2860 | 2966 | if ( $plugins_path === $referer['path'] ) { |
| 2861 | 2967 | $source_type = 'list'; |
| 2862 | 2968 | } elseif ( $plugins_install_path === $referer['path'] ) { |
| 2863 | - $tab = isset( $query_parts['tab'] ) ? $query_parts['tab'] : 'featured'; | |
| 2969 | + $tab = $query_parts['tab'] ?? 'featured'; | |
| 2864 | 2970 | switch ( $tab ) { |
| 2865 | 2971 | case 'popular': |
| 2866 | 2972 | $source_type = 'popular'; |
| 2867 | 2973 | break; |
| @@ -2871,10 +2977,10 @@ | ||
| 2871 | 2977 | case 'favorites': |
| 2872 | 2978 | $source_type = 'favorites'; |
| 2873 | 2979 | break; |
| 2874 | 2980 | case 'search': |
| 2875 | - $source_type = 'search-' . ( isset( $query_parts['type'] ) ? $query_parts['type'] : 'term' ); | |
| 2876 | - $source_query = isset( $query_parts['s'] ) ? $query_parts['s'] : null; | |
| 2981 | + $source_type = 'search-' . ( $query_parts['type'] ?? 'term' ); | |
| 2982 | + $source_query = $query_parts['s'] ?? null; | |
| 2877 | 2983 | break; |
| 2878 | 2984 | default: |
| 2879 | 2985 | $source_type = 'featured'; |
| 2880 | 2986 | } |
| @@ -2883,29 +2989,171 @@ | ||
| 2883 | 2989 | return array( $source_type, $source_query ); |
| 2884 | 2990 | } |
| 2885 | 2991 | |
| 2886 | 2992 | /** |
| 2887 | - * Runs before bumping version numbers up to a new version | |
| 2993 | + * Runs before bumping version numbers up to a new version. | |
| 2888 | 2994 | * |
| 2889 | - * @param string $version Version:timestamp. | |
| 2995 | + * Only ever registered the hooks for the release post update modal, which has been removed. | |
| 2996 | + * No longer hooked to `updating_jetpack_version`. | |
| 2997 | + * | |
| 2998 | + * @deprecated 16.2 | |
| 2999 | + * | |
| 3000 | + * @param string $version Version:timestamp. | |
| 2890 | 3001 | * @param string $old_version Old Version:timestamp or false if not set yet. |
| 2891 | 3002 | */ |
| 2892 | - public static function do_version_bump( $version, $old_version ) { | |
| 2893 | - if ( $old_version ) { // For existing Jetpack installations. | |
| 2894 | - add_action( 'admin_enqueue_scripts', __CLASS__ . '::enqueue_block_style' ); | |
| 3003 | + public static function do_version_bump( $version, $old_version ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable -- Signature preserved for the deprecation shim. | |
| 3004 | + _deprecated_function( __METHOD__, 'jetpack-16.2' ); | |
| 3005 | + } | |
| 2895 | 3006 | |
| 2896 | - // If a front end page is visited after the update, the 'wp' action will fire. | |
| 2897 | - add_action( 'wp', 'Jetpack::set_update_modal_display' ); | |
| 3007 | + /** | |
| 3008 | + * Enables the Newsletter (subscriptions) module for existing sites now that it is a default-on module. | |
| 3009 | + * | |
| 3010 | + * Fresh installs receive the module via its "Auto Activate: Yes" header, so this only handles sites | |
| 3011 | + * upgrading from a version where the module defaulted off. It runs once per site (guarded by the | |
| 3012 | + * subscriptions_default_on_migrated option). Fresh installs are marked as migrated immediately so the | |
| 3013 | + * migration never runs for them. After it has run, the user's choice to deactivate the module again | |
| 3014 | + * (for example from the My Jetpack Products page) is respected and never reverted. | |
| 3015 | + * | |
| 3016 | + * The module requires a connection, so on a disconnected site the migration is deferred without setting | |
| 3017 | + * the guard, allowing a later version bump to retry once the site is connected. | |
| 3018 | + * | |
| 3019 | + * @param string $version New Jetpack version:timestamp. | |
| 3020 | + * @param string|false $old_version Previous Jetpack version:timestamp, or false on a fresh install. | |
| 3021 | + */ | |
| 3022 | + public static function activate_subscriptions_module_for_existing_sites( $version, $old_version ) { | |
| 3023 | + if ( get_option( 'jetpack_subscriptions_default_on_migrated' ) ) { | |
| 3024 | + return; | |
| 3025 | + } | |
| 2898 | 3026 | |
| 2899 | - // If an admin page is visited after the update, the 'current_screen' action will fire. | |
| 2900 | - add_action( 'current_screen', 'Jetpack::set_update_modal_display' ); | |
| 3027 | + // Fresh installs get the module via its "Auto Activate: Yes" header. Mark them as migrated so a | |
| 3028 | + // later opt-out is never reverted by the existing-site path on a subsequent version bump. | |
| 3029 | + if ( ! $old_version ) { | |
| 3030 | + update_option( 'jetpack_subscriptions_default_on_migrated', true ); | |
| 3031 | + return; | |
| 2901 | 3032 | } |
| 3033 | + | |
| 3034 | + if ( ! self::is_connection_ready() ) { | |
| 3035 | + return; | |
| 3036 | + } | |
| 3037 | + | |
| 3038 | + // Mark as migrated only once the module is active, so a transient activation failure is retried on | |
| 3039 | + // a later version bump rather than being silently skipped. | |
| 3040 | + if ( self::is_module_active( 'subscriptions' ) || self::activate_module( 'subscriptions', false, false ) ) { | |
| 3041 | + update_option( 'jetpack_subscriptions_default_on_migrated', true ); | |
| 3042 | + } | |
| 2902 | 3043 | } |
| 2903 | 3044 | |
| 2904 | 3045 | /** |
| 3046 | + * Option flag that records the AI master-switch opt-out reconciliation has run, | |
| 3047 | + * so it never runs twice. | |
| 3048 | + * | |
| 3049 | + * @var string | |
| 3050 | + */ | |
| 3051 | + const AI_MASTER_OPTOUT_MIGRATED_OPTION = 'jetpack_ai_master_optout_migrated'; | |
| 3052 | + | |
| 3053 | + /** | |
| 3054 | + * Register the on-upgrade init hooks whose relative ORDER matters, extracted so | |
| 3055 | + * the ordering can be asserted in tests without invoking plugin_upgrade() (whose | |
| 3056 | + * guards make it unreliable to trigger under test). activate_new_modules() | |
| 3057 | + * (init, default priority 10) auto-activates "Auto Activate: Yes" modules | |
| 3058 | + * including the `ai` master; reconcile_ai_master_optout() must run at a LATER | |
| 3059 | + * priority to honor an explicit AI opt-out. | |
| 3060 | + * | |
| 3061 | + * @return void | |
| 3062 | + */ | |
| 3063 | + public static function register_upgrade_init_hooks() { | |
| 3064 | + add_action( 'init', array( __CLASS__, 'activate_new_modules' ) ); | |
| 3065 | + add_action( 'init', array( __CLASS__, 'reconcile_ai_master_optout' ), 20 ); | |
| 3066 | + } | |
| 3067 | + | |
| 3068 | + /** | |
| 3069 | + * Preserves an explicit Jetpack AI opt-out when the `ai` module becomes the site-wide | |
| 3070 | + * master switch off WordPress.com Simple (self-hosted and Atomic). | |
| 3071 | + * | |
| 3072 | + * The `ai` module is "Auto Activate: Yes", so on upgrade {@see self::activate_new_modules()} | |
| 3073 | + * turns it on for connected sites — the desired default-on / auto-enable-on-connection | |
| 3074 | + * behavior, which this method deliberately leaves alone. The one case it corrects is a site | |
| 3075 | + * that had explicitly disabled Jetpack AI (the `jetpack_ai_enabled` option present and falsey) | |
| 3076 | + * before the module shipped: that opt-out must survive the module becoming the master, so the | |
| 3077 | + * module is deactivated for exactly those sites. An absent or truthy option is left untouched. | |
| 3078 | + * | |
| 3079 | + * Ordering is the whole point. `activate_new_modules()` is hooked on `init` at priority 10 and | |
| 3080 | + * auto-activates the module there; this method is hooked on `init` at priority 20 (see | |
| 3081 | + * {@see self::plugin_upgrade()}), so it runs AFTER the auto-activation and its deactivation is | |
| 3082 | + * the final state. A version-guarded block that ran inline during `plugins_loaded` would be | |
| 3083 | + * undone by the later auto-activation, which is why this is a late-init hook rather than an | |
| 3084 | + * inline upgrade step. | |
| 3085 | + * | |
| 3086 | + * WordPress.com Simple never runs modules — the option stays the master there — so this is a | |
| 3087 | + * no-op on Simple. The {@see self::AI_MASTER_OPTOUT_MIGRATED_OPTION} flag makes it run exactly | |
| 3088 | + * once, which matters because off-Simple the option is no longer the master after this runs: | |
| 3089 | + * a stale falsey option must not keep re-deactivating a module the user later turns back on. | |
| 3090 | + * | |
| 3091 | + * @return void | |
| 3092 | + */ | |
| 3093 | + public static function reconcile_ai_master_optout() { | |
| 3094 | + if ( get_option( self::AI_MASTER_OPTOUT_MIGRATED_OPTION ) ) { | |
| 3095 | + return; | |
| 3096 | + } | |
| 3097 | + | |
| 3098 | + // Simple keeps the `jetpack_ai_enabled` option as the master; modules don't run there. | |
| 3099 | + if ( ( new Host() )->is_wpcom_simple() ) { | |
| 3100 | + return; | |
| 3101 | + } | |
| 3102 | + | |
| 3103 | + // A sentinel default distinguishes an absent option (leave auto-activation alone) from one | |
| 3104 | + // explicitly stored falsey (an opt-out to preserve). | |
| 3105 | + $stored = get_option( 'jetpack_ai_enabled', 'not-set' ); | |
| 3106 | + if ( 'not-set' !== $stored && ! (bool) $stored ) { | |
| 3107 | + ( new Modules() )->deactivate( 'ai' ); | |
| 3108 | + } | |
| 3109 | + | |
| 3110 | + update_option( self::AI_MASTER_OPTOUT_MIGRATED_OPTION, true ); | |
| 3111 | + } | |
| 3112 | + | |
| 3113 | + /** | |
| 3114 | + * Deletes obsolete SEO module-state options without changing module activation. | |
| 3115 | + * | |
| 3116 | + * @since 16.3 | |
| 3117 | + */ | |
| 3118 | + public static function cleanup_seo_module_state_options() { | |
| 3119 | + delete_option( 'jetpack_seo_sitemap_enabled' ); | |
| 3120 | + delete_option( 'jetpack_seo_canonical_urls_enabled' ); | |
| 3121 | + delete_option( 'jetpack_seo_module_state_reconciled' ); | |
| 3122 | + } | |
| 3123 | + | |
| 3124 | + /** | |
| 3125 | + * Seeds the Jetpack SEO discoverability cohort once, so the new SEO surface is | |
| 3126 | + * auto-discoverable on fresh installs but opt-in on existing ones (JETPACK-1700). | |
| 3127 | + * | |
| 3128 | + * Hooked on `updating_jetpack_version`, which fires on every install including the | |
| 3129 | + * first — with `$old_version === false` on a brand-new site (the same signal | |
| 3130 | + * {@see self::activate_subscriptions_module_for_existing_sites()} keys off). Fresh | |
| 3131 | + * installs are seeded visible; existing installs are seeded hidden and opt in later | |
| 3132 | + * via the legacy Traffic page or My Jetpack. `add_option()` makes this seed-once: it | |
| 3133 | + * never overrides a value a later opt-in (or opt-out) has set. WordPress.com sites | |
| 3134 | + * ignore this option entirely (always visible) — see | |
| 3135 | + * {@see \Automattic\Jetpack\SEO\Initializer::is_seo_surface_visible()}. | |
| 3136 | + * | |
| 3137 | + * @param string $version The new Jetpack version (unused). | |
| 3138 | + * @param string|false $old_version The previous version, or false on a fresh install. | |
| 3139 | + */ | |
| 3140 | + public static function seed_seo_visibility_cohort( $version, $old_version ) { | |
| 3141 | + add_option( Jetpack_SEO_Initializer::VISIBILITY_OPTION, ! $old_version ); | |
| 3142 | + } | |
| 3143 | + | |
| 3144 | + /** | |
| 2905 | 3145 | * Sets the display_update_modal state. |
| 3146 | + * | |
| 3147 | + * The release post update modal that read this state has been removed. The write is kept so the | |
| 3148 | + * method still behaves as documented for the deprecation window. When this is deleted, also drop | |
| 3149 | + * the matching `display_update_modal` guard in Automattic\Jetpack\CookieState::should_set_cookie(), | |
| 3150 | + * which exists only to keep this key out of the cookie on the Jetpack admin screen. | |
| 3151 | + * | |
| 3152 | + * @deprecated 16.2 | |
| 2906 | 3153 | */ |
| 2907 | 3154 | public static function set_update_modal_display() { |
| 3155 | + _deprecated_function( __METHOD__, 'jetpack-16.2' ); | |
| 2908 | 3156 | self::state( 'display_update_modal', true ); |
| 2909 | 3157 | } |
| 2910 | 3158 | |
| 2911 | 3159 | /** |
| @@ -2910,11 +3158,16 @@ | ||
| 2910 | 3158 | |
| 2911 | 3159 | /** |
| 2912 | 3160 | * Enqueues the block library styles. |
| 2913 | 3161 | * |
| 3162 | + * Only ever used by the release post update modal, which has been removed. | |
| 3163 | + * | |
| 3164 | + * @deprecated 16.2 | |
| 3165 | + * | |
| 2914 | 3166 | * @param string $hook The current admin page. |
| 2915 | 3167 | */ |
| 2916 | 3168 | public static function enqueue_block_style( $hook ) { |
| 3169 | + _deprecated_function( __METHOD__, 'jetpack-16.2' ); | |
| 2917 | 3170 | if ( 'toplevel_page_jetpack' === $hook ) { |
| 2918 | 3171 | wp_enqueue_style( 'wp-block-library' ); |
| 2919 | 3172 | } |
| 2920 | 3173 | } |
| @@ -2943,9 +3196,8 @@ | ||
| 2943 | 3196 | |
| 2944 | 3197 | self::load_modules(); |
| 2945 | 3198 | |
| 2946 | 3199 | Jetpack_Options::delete_option( 'do_activate' ); |
| 2947 | - Jetpack_Options::delete_option( 'dismissed_connection_banner' ); | |
| 2948 | 3200 | } |
| 2949 | 3201 | |
| 2950 | 3202 | /** |
| 2951 | 3203 | * Handles the activation of the default modules depending on the current state of the site: |
| @@ -3004,8 +3256,12 @@ | ||
| 3004 | 3256 | add_filter( 'jetpack_update_activated_state_on_disconnect', '__return_false' ); |
| 3005 | 3257 | self::disconnect(); |
| 3006 | 3258 | Jetpack_Options::delete_option( 'version' ); |
| 3007 | 3259 | } |
| 3260 | + | |
| 3261 | + if ( ! defined( 'WC_ANALYTICS' ) && class_exists( 'Automattic\Woocommerce_Analytics' ) ) { | |
| 3262 | + Woocommerce_Analytics::maybe_remove_proxy_speed_module(); | |
| 3263 | + } | |
| 3008 | 3264 | } |
| 3009 | 3265 | |
| 3010 | 3266 | /** |
| 3011 | 3267 | * Set activated option to 4 on jetpack_idc_disconnect action. |
| @@ -3033,9 +3289,9 @@ | ||
| 3033 | 3289 | $connection->remove_connection( ! Identity_Crisis::validate_sync_error_idc_option() ); |
| 3034 | 3290 | } |
| 3035 | 3291 | |
| 3036 | 3292 | /** |
| 3037 | - * Happens after a successfull disconnection. | |
| 3293 | + * Happens after a successful disconnection. | |
| 3038 | 3294 | * |
| 3039 | 3295 | * @static |
| 3040 | 3296 | */ |
| 3041 | 3297 | public static function jetpack_site_disconnected() { |
| @@ -3040,8 +3296,10 @@ | ||
| 3040 | 3296 | */ |
| 3041 | 3297 | public static function jetpack_site_disconnected() { |
| 3042 | 3298 | Identity_Crisis::clear_all_idc_options(); |
| 3043 | 3299 | |
| 3300 | + \Automattic\Jetpack\Reprint_Export\Reprint_Exporter::discard_credentials(); | |
| 3301 | + | |
| 3044 | 3302 | // Delete all the sync related data. Since it could be taking up space. |
| 3045 | 3303 | Sender::get_instance()->uninstall(); |
| 3046 | 3304 | |
| 3047 | 3305 | /** |
| @@ -3058,10 +3316,13 @@ | ||
| 3058 | 3316 | } |
| 3059 | 3317 | } |
| 3060 | 3318 | |
| 3061 | 3319 | /** |
| 3062 | - * Disconnects the user | |
| 3320 | + * Disconnects the user. | |
| 3063 | 3321 | * |
| 3322 | + * @deprecated 13.4 | |
| 3323 | + * @see \Automattic\Jetpack\Connection\Manager::disconnect_user() | |
| 3324 | + * | |
| 3064 | 3325 | * @param int $user_id The user ID to disconnect. |
| 3065 | 3326 | */ |
| 3066 | 3327 | public function disconnect_user( $user_id ) { |
| 3067 | 3328 | $this->connection_manager->disconnect_user( $user_id ); |
| @@ -3067,21 +3328,8 @@ | ||
| 3067 | 3328 | $this->connection_manager->disconnect_user( $user_id ); |
| 3068 | 3329 | } |
| 3069 | 3330 | |
| 3070 | 3331 | /** |
| 3071 | - * Attempts Jetpack registration. If it fail, a state flag is set: @see ::admin_page_load() | |
| 3072 | - * | |
| 3073 | - * @deprecated since Jetpack 9.7.0 | |
| 3074 | - * @see Automattic\Jetpack\Connection\Manager::try_registration() | |
| 3075 | - * | |
| 3076 | - * @return bool|WP_Error | |
| 3077 | - */ | |
| 3078 | - public static function try_registration() { | |
| 3079 | - _deprecated_function( __METHOD__, 'jetpack-9.7', 'Automattic\\Jetpack\\Connection\\Manager::try_registration' ); | |
| 3080 | - return static::connection()->try_registration(); | |
| 3081 | - } | |
| 3082 | - | |
| 3083 | - /** | |
| 3084 | 3332 | * Checking the domain names in beta versions. |
| 3085 | 3333 | * If this is a development version, before attempting to connect, let's make sure that the domains are viable. |
| 3086 | 3334 | * |
| 3087 | 3335 | * @param null|\WP_Error $error The domain validation error, or `null` if everything's fine. |
| @@ -3088,9 +3336,9 @@ | ||
| 3088 | 3336 | * |
| 3089 | 3337 | * @return null|\WP_Error The domain validation error, or `null` if everything's fine. |
| 3090 | 3338 | */ |
| 3091 | 3339 | public static function registration_check_domains( $error ) { |
| 3092 | - if ( static::is_development_version() && defined( 'PHP_URL_HOST' ) ) { | |
| 3340 | + if ( static::is_development_version() ) { | |
| 3093 | 3341 | $domains_to_check = array_unique( |
| 3094 | 3342 | array( |
| 3095 | 3343 | 'siteurl' => wp_parse_url( get_site_url(), PHP_URL_HOST ), |
| 3096 | 3344 | 'homeurl' => wp_parse_url( get_home_url(), PHP_URL_HOST ), |
| @@ -3115,10 +3363,17 @@ | ||
| 3115 | 3363 | * @param mixed $code Error code to log. |
| 3116 | 3364 | * @param mixed $data Data to log. |
| 3117 | 3365 | */ |
| 3118 | 3366 | public static function log( $code, $data = null ) { |
| 3367 | + | |
| 3368 | + $raw_log = Jetpack_Options::get_option( 'log', array() ); | |
| 3369 | + // This can be modified by the `jetpack_options` filter, so abort if we don't have an array. | |
| 3370 | + if ( ! is_array( $raw_log ) ) { | |
| 3371 | + return; | |
| 3372 | + } | |
| 3373 | + | |
| 3119 | 3374 | // only grab the latest 200 entries. |
| 3120 | - $log = array_slice( Jetpack_Options::get_option( 'log', array() ), -199, 199 ); | |
| 3375 | + $log = array_slice( $raw_log, -199, 199 ); | |
| 3121 | 3376 | |
| 3122 | 3377 | // Append our event to the log. |
| 3123 | 3378 | $log_entry = array( |
| 3124 | 3379 | 'time' => time(), |
| @@ -3218,8 +3473,15 @@ | ||
| 3218 | 3473 | |
| 3219 | 3474 | /** |
| 3220 | 3475 | * Return stat data for WPCOM sync. |
| 3221 | 3476 | * |
| 3477 | + * The Sync stats module was this method's last caller and moved to the Connection package's | |
| 3478 | + * `Heartbeat::generate_stats_array()`, which assembles the heartbeat data through the | |
| 3479 | + * `jetpack_heartbeat_stats_array` filter. Note the package method does not include the extended | |
| 3480 | + * data from `get_additional_stat_data()`, so callers relying on `$extended` need to add it themselves. | |
| 3481 | + * | |
| 3482 | + * @deprecated 16.2 | |
| 3483 | + * | |
| 3222 | 3484 | * @param bool $encode JSON encode the result. |
| 3223 | 3485 | * @param bool $extended Adds additional stats data. |
| 3224 | 3486 | * |
| 3225 | 3487 | * @return array|string Stats data. Array if $encode is false. JSON-encoded string is $encode is true. |
| @@ -3224,10 +3486,15 @@ | ||
| 3224 | 3486 | * |
| 3225 | 3487 | * @return array|string Stats data. Array if $encode is false. JSON-encoded string is $encode is true. |
| 3226 | 3488 | */ |
| 3227 | 3489 | public static function get_stat_data( $encode = true, $extended = true ) { |
| 3228 | - $data = Jetpack_Heartbeat::generate_stats_array(); | |
| 3490 | + _deprecated_function( __METHOD__, 'jetpack-16.2', 'Automattic\\Jetpack\\Heartbeat::generate_stats_array' ); | |
| 3229 | 3491 | |
| 3492 | + $env_stats = method_exists( Heartbeat::class, 'get_environment_stats' ) | |
| 3493 | + ? Heartbeat::get_environment_stats() | |
| 3494 | + : array(); | |
| 3495 | + $data = array_merge( Jetpack_Heartbeat::generate_stats_array(), $env_stats ); | |
| 3496 | + | |
| 3230 | 3497 | if ( $extended ) { |
| 3231 | 3498 | $additional_data = self::get_additional_stat_data(); |
| 3232 | 3499 | $data = array_merge( $data, $additional_data ); |
| 3233 | 3500 | } |
| @@ -3232,9 +3499,9 @@ | ||
| 3232 | 3499 | $data = array_merge( $data, $additional_data ); |
| 3233 | 3500 | } |
| 3234 | 3501 | |
| 3235 | 3502 | if ( $encode ) { |
| 3236 | - return wp_json_encode( $data ); | |
| 3503 | + return wp_json_encode( $data, JSON_UNESCAPED_SLASHES ); | |
| 3237 | 3504 | } |
| 3238 | 3505 | |
| 3239 | 3506 | return $data; |
| 3240 | 3507 | } |
| @@ -3306,23 +3573,24 @@ | ||
| 3306 | 3573 | $fallback_no_verify_ssl_certs = Jetpack_Options::get_option( 'fallback_no_verify_ssl_certs' ); |
| 3307 | 3574 | /** Already documented in automattic/jetpack-connection::src/class-client.php */ |
| 3308 | 3575 | $client_verify_ssl_certs = apply_filters( 'jetpack_client_verify_ssl_certs', false ); |
| 3309 | 3576 | |
| 3310 | - if ( ! $is_offline_mode ) { | |
| 3311 | - Jetpack_Connection_Banner::init(); | |
| 3312 | - Jetpack_Connection_Widget::init(); | |
| 3313 | - } | |
| 3577 | + // Run post-activation actions if needed. | |
| 3578 | + $this->plugin_post_activation(); | |
| 3314 | 3579 | |
| 3315 | 3580 | if ( ( self::is_connection_ready() || $is_offline_mode ) && false === $fallback_no_verify_ssl_certs && ! $client_verify_ssl_certs ) { |
| 3316 | 3581 | // Upgrade: 1.1 -> 1.1.1 |
| 3317 | 3582 | // Check and see if host can verify the Jetpack servers' SSL certificate. |
| 3318 | 3583 | $args = array(); |
| 3584 | + // @phan-suppress-next-line PhanAccessMethodInternal -- Phan is correct, but the usage is intentional. | |
| 3319 | 3585 | Client::_wp_remote_request( self::connection()->api_url( 'test' ), $args, true ); |
| 3320 | 3586 | } |
| 3321 | 3587 | |
| 3322 | - Jetpack_Recommendations_Banner::init(); | |
| 3323 | - | |
| 3324 | - if ( current_user_can( 'manage_options' ) && ! self::permit_ssl() ) { | |
| 3588 | + if ( | |
| 3589 | + current_user_can( 'manage_options' ) | |
| 3590 | + && ! self::permit_ssl() | |
| 3591 | + && ! $is_offline_mode | |
| 3592 | + ) { | |
| 3325 | 3593 | add_action( 'jetpack_notices', array( $this, 'alert_auto_ssl_fail' ) ); |
| 3326 | 3594 | } |
| 3327 | 3595 | |
| 3328 | 3596 | add_action( 'load-plugins.php', array( $this, 'intercept_plugin_error_scrape_init' ) ); |
| @@ -3331,12 +3599,8 @@ | ||
| 3331 | 3599 | if ( ! ( is_multisite() && is_plugin_active_for_network( 'jetpack/jetpack.php' ) && ! is_network_admin() ) ) { |
| 3332 | 3600 | add_action( 'admin_enqueue_scripts', array( $this, 'deactivate_dialog' ) ); |
| 3333 | 3601 | } |
| 3334 | 3602 | |
| 3335 | - if ( isset( $_COOKIE['jetpackState']['display_update_modal'] ) ) { | |
| 3336 | - add_action( 'admin_enqueue_scripts', __CLASS__ . '::enqueue_block_style' ); | |
| 3337 | - } | |
| 3338 | - | |
| 3339 | 3603 | add_filter( 'plugin_action_links_' . plugin_basename( JETPACK__PLUGIN_DIR . 'jetpack.php' ), array( $this, 'plugin_action_links' ) ); |
| 3340 | 3604 | |
| 3341 | 3605 | if ( self::is_connection_ready() || $is_offline_mode ) { |
| 3342 | 3606 | // Artificially throw errors in certain specific cases during plugin activation. |
| @@ -3341,13 +3605,8 @@ | ||
| 3341 | 3605 | if ( self::is_connection_ready() || $is_offline_mode ) { |
| 3342 | 3606 | // Artificially throw errors in certain specific cases during plugin activation. |
| 3343 | 3607 | add_action( 'activate_plugin', array( $this, 'throw_error_on_activate_plugin' ) ); |
| 3344 | 3608 | } |
| 3345 | - | |
| 3346 | - // Add custom column in wp-admin/users.php to show whether user is linked. | |
| 3347 | - add_filter( 'manage_users_columns', array( $this, 'jetpack_icon_user_connected' ) ); | |
| 3348 | - add_action( 'manage_users_custom_column', array( $this, 'jetpack_show_user_connected_icon' ), 10, 3 ); | |
| 3349 | - add_action( 'admin_print_styles', array( $this, 'jetpack_user_col_style' ) ); | |
| 3350 | 3609 | } |
| 3351 | 3610 | |
| 3352 | 3611 | /** |
| 3353 | 3612 | * Adds body classes. |
| @@ -3380,8 +3639,9 @@ | ||
| 3380 | 3639 | * Sometimes a plugin can activate without causing errors, but it will cause errors on the next page load. |
| 3381 | 3640 | * This function artificially throws errors for such cases (per a specific list). |
| 3382 | 3641 | * |
| 3383 | 3642 | * @param string $plugin The activated plugin. |
| 3643 | + * @throws RuntimeException If a conflicting plugin is detected. | |
| 3384 | 3644 | */ |
| 3385 | 3645 | public function throw_error_on_activate_plugin( $plugin ) { |
| 3386 | 3646 | $active_modules = self::get_active_modules(); |
| 3387 | 3647 | |
| @@ -3394,8 +3654,9 @@ | ||
| 3394 | 3654 | if ( 'stats.php' === basename( $plugin ) ) { |
| 3395 | 3655 | $throw = true; |
| 3396 | 3656 | } |
| 3397 | 3657 | } else { |
| 3658 | + // @phan-suppress-next-line PhanUndeclaredFunctionInCallable -- Checked above. See also https://github.com/phan/phan/issues/1204. | |
| 3398 | 3659 | $reflection = new ReflectionFunction( 'stats_get_api_key' ); |
| 3399 | 3660 | if ( basename( $plugin ) === basename( $reflection->getFileName() ) ) { |
| 3400 | 3661 | $throw = true; |
| 3401 | 3662 | } |
| @@ -3402,9 +3663,9 @@ | ||
| 3402 | 3663 | } |
| 3403 | 3664 | |
| 3404 | 3665 | if ( $throw ) { |
| 3405 | 3666 | /* translators: Plugin name to deactivate. */ |
| 3406 | - trigger_error( sprintf( esc_html__( 'Jetpack contains the most recent version of the old “%1$s” plugin.', 'jetpack' ), 'WordPress.com Stats' ), E_USER_ERROR ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error | |
| 3667 | + throw new RuntimeException( sprintf( __( 'Jetpack contains the most recent version of the old "%1$s" plugin.', 'jetpack' ), 'WordPress.com Stats' ) ); | |
| 3407 | 3668 | } |
| 3408 | 3669 | } |
| 3409 | 3670 | } |
| 3410 | 3671 | |
| @@ -3486,8 +3747,9 @@ | ||
| 3486 | 3747 | /** |
| 3487 | 3748 | * Handler for Jetpack remote file uploads. |
| 3488 | 3749 | * |
| 3489 | 3750 | * @access public |
| 3751 | + * @return never | |
| 3490 | 3752 | */ |
| 3491 | 3753 | public function remote_request_handlers() { |
| 3492 | 3754 | switch ( current_filter() ) { |
| 3493 | 3755 | case 'wp_ajax_nopriv_jetpack_upload_file': |
| @@ -3514,18 +3776,17 @@ | ||
| 3514 | 3776 | if ( ! is_int( $status_code ) ) { |
| 3515 | 3777 | $status_code = 400; |
| 3516 | 3778 | } |
| 3517 | 3779 | |
| 3518 | - status_header( $status_code ); | |
| 3519 | - die( wp_json_encode( (object) compact( 'error', 'error_description' ) ) ); | |
| 3780 | + wp_send_json( (object) compact( 'error', 'error_description' ), $status_code, JSON_UNESCAPED_SLASHES ); | |
| 3520 | 3781 | } |
| 3521 | 3782 | |
| 3522 | - status_header( 200 ); | |
| 3523 | 3783 | if ( true === $response ) { |
| 3524 | - exit; | |
| 3784 | + status_header( 200 ); | |
| 3785 | + exit( 0 ); | |
| 3525 | 3786 | } |
| 3526 | 3787 | |
| 3527 | - die( wp_json_encode( (object) $response ) ); | |
| 3788 | + wp_send_json( (object) $response, 200, JSON_UNESCAPED_SLASHES ); | |
| 3528 | 3789 | } |
| 3529 | 3790 | |
| 3530 | 3791 | /** |
| 3531 | 3792 | * Uploads a file gotten from the global $_FILES. |
| @@ -3533,9 +3794,9 @@ | ||
| 3533 | 3794 | * the attachment file of the media item (gotten through of the post_id) |
| 3534 | 3795 | * will be updated instead of add a new one. |
| 3535 | 3796 | * |
| 3536 | 3797 | * @param boolean $update_media_item - update media attachment. |
| 3537 | - * @return array - An array describing the uploadind files process. | |
| 3798 | + * @return array|WP_Error - An array describing the uploading files process. | |
| 3538 | 3799 | */ |
| 3539 | 3800 | public function upload_handler( $update_media_item = false ) { |
| 3540 | 3801 | if ( isset( $_SERVER['REQUEST_METHOD'] ) && 'POST' !== strtoupper( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_METHOD'] ) ) ) ) { |
| 3541 | 3802 | return new WP_Error( 405, get_status_header_desc( 405 ), 405 ); |
| @@ -3586,9 +3847,9 @@ | ||
| 3586 | 3847 | return new WP_Error( 'handler_cannot_upload', __( 'The upload handler cannot upload files', 'jetpack' ), 400 ); |
| 3587 | 3848 | } |
| 3588 | 3849 | |
| 3589 | 3850 | $uploaded_files = array(); |
| 3590 | - $global_post = isset( $GLOBALS['post'] ) ? $GLOBALS['post'] : null; | |
| 3851 | + $global_post = $GLOBALS['post'] ?? null; | |
| 3591 | 3852 | unset( $GLOBALS['post'] ); |
| 3592 | 3853 | if ( empty( $_FILES['media']['name'] ) ) { |
| 3593 | 3854 | // Nothing to process, just return. |
| 3594 | 3855 | return $uploaded_files; |
| @@ -3595,9 +3856,9 @@ | ||
| 3595 | 3856 | } |
| 3596 | 3857 | foreach ( $_FILES['media']['name'] as $index => $name ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- As above, unslash sniff is wrong. Validation should happen below. |
| 3597 | 3858 | $file = array(); |
| 3598 | 3859 | foreach ( $media_keys as $media_key ) { |
| 3599 | - $file[ $media_key ] = isset( $_FILES['media'][ $media_key ][ $index ] ) ? $_FILES['media'][ $media_key ][ $index ] : null; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- As above, the unslash sniff is wrong. | |
| 3860 | + $file[ $media_key ] = $_FILES['media'][ $media_key ][ $index ] ?? null; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash,,WordPress.Security.NonceVerification.Missing,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- As above, the unslash sniff is wrong. | |
| 3600 | 3861 | } |
| 3601 | 3862 | |
| 3602 | 3863 | list( $hmac_provided, $salt ) = isset( $_POST['_jetpack_file_hmac_media'][ $index ] ) ? explode( ':', filter_var( wp_unslash( $_POST['_jetpack_file_hmac_media'][ $index ] ) ) ) : array( 'no', '' ); // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce should have been checked by the caller. |
| 3603 | 3864 | |
| @@ -3643,9 +3904,9 @@ | ||
| 3643 | 3904 | 'type' => (string) $edited_media_item->post_mime_type, |
| 3644 | 3905 | 'meta' => (array) wp_get_attachment_metadata( $post_id ), |
| 3645 | 3906 | ); |
| 3646 | 3907 | |
| 3647 | - return (array) array( $response ); | |
| 3908 | + return array( $response ); | |
| 3648 | 3909 | } |
| 3649 | 3910 | |
| 3650 | 3911 | $attachment_id = media_handle_upload( |
| 3651 | 3912 | '.jetpack.upload.', |
| @@ -3684,67 +3945,8 @@ | ||
| 3684 | 3945 | return $uploaded_files; |
| 3685 | 3946 | } |
| 3686 | 3947 | |
| 3687 | 3948 | /** |
| 3688 | - * Add help to the Jetpack page | |
| 3689 | - * | |
| 3690 | - * @since Jetpack (1.2.3) | |
| 3691 | - * @return void | |
| 3692 | - */ | |
| 3693 | - public function admin_help() { | |
| 3694 | - $current_screen = get_current_screen(); | |
| 3695 | - | |
| 3696 | - // Overview. | |
| 3697 | - $current_screen->add_help_tab( | |
| 3698 | - array( | |
| 3699 | - 'id' => 'home', | |
| 3700 | - 'title' => __( 'Home', 'jetpack' ), | |
| 3701 | - 'content' => | |
| 3702 | - '<p><strong>' . __( 'Jetpack', 'jetpack' ) . '</strong></p>' . | |
| 3703 | - '<p>' . __( 'Jetpack supercharges your self-hosted WordPress site with the awesome cloud power of WordPress.com.', 'jetpack' ) . '</p>' . | |
| 3704 | - '<p>' . __( 'On this page, you are able to view the modules available within Jetpack, learn more about them, and activate or deactivate them as needed.', 'jetpack' ) . '</p>', | |
| 3705 | - ) | |
| 3706 | - ); | |
| 3707 | - | |
| 3708 | - // Screen Content. | |
| 3709 | - if ( current_user_can( 'manage_options' ) ) { | |
| 3710 | - $current_screen->add_help_tab( | |
| 3711 | - array( | |
| 3712 | - 'id' => 'settings', | |
| 3713 | - 'title' => __( 'Settings', 'jetpack' ), | |
| 3714 | - 'content' => | |
| 3715 | - '<p><strong>' . __( 'Jetpack', 'jetpack' ) . '</strong></p>' . | |
| 3716 | - '<p>' . __( 'You can activate or deactivate individual Jetpack modules to suit your needs.', 'jetpack' ) . '</p>' . | |
| 3717 | - '<ol>' . | |
| 3718 | - '<li>' . __( 'Each module has an Activate or Deactivate link so you can toggle one individually.', 'jetpack' ) . '</li>' . | |
| 3719 | - '<li>' . __( 'Using the checkboxes next to each module, you can select multiple modules to toggle via the Bulk Actions menu at the top of the list.', 'jetpack' ) . '</li>' . | |
| 3720 | - '</ol>' . | |
| 3721 | - '<p>' . __( 'Using the tools on the right, you can search for specific modules, filter by module categories or which are active, or change the sorting order.', 'jetpack' ) . '</p>', | |
| 3722 | - ) | |
| 3723 | - ); | |
| 3724 | - } | |
| 3725 | - | |
| 3726 | - // Help Sidebar. | |
| 3727 | - $support_url = Redirect::get_url( 'jetpack-support' ); | |
| 3728 | - $faq_url = Redirect::get_url( 'jetpack-faq' ); | |
| 3729 | - $current_screen->set_help_sidebar( | |
| 3730 | - '<p><strong>' . __( 'For more information:', 'jetpack' ) . '</strong></p>' . | |
| 3731 | - '<p><a href="' . esc_url( $faq_url ) . '" rel="noopener noreferrer" target="_blank">' . __( 'Jetpack FAQ', 'jetpack' ) . '</a></p>' . | |
| 3732 | - '<p><a href="' . esc_url( $support_url ) . '" rel="noopener noreferrer" target="_blank">' . __( 'Jetpack Support', 'jetpack' ) . '</a></p>' . | |
| 3733 | - '<p><a href="' . esc_url( self::admin_url( array( 'page' => 'jetpack-debugger' ) ) ) . '">' . __( 'Jetpack Debugging Center', 'jetpack' ) . '</a></p>' | |
| 3734 | - ); | |
| 3735 | - } | |
| 3736 | - | |
| 3737 | - /** | |
| 3738 | - * Enqueues the jetpack-icons style. | |
| 3739 | - * | |
| 3740 | - * @return void | |
| 3741 | - */ | |
| 3742 | - public function admin_menu_css() { | |
| 3743 | - wp_enqueue_style( 'jetpack-icons' ); | |
| 3744 | - } | |
| 3745 | - | |
| 3746 | - /** | |
| 3747 | 3949 | * Add action links for the Jetpack plugin. |
| 3748 | 3950 | * |
| 3749 | 3951 | * @param array $actions Plugin actions. |
| 3750 | 3952 | * |
| @@ -3750,14 +3952,11 @@ | ||
| 3750 | 3952 | * |
| 3751 | 3953 | * @return array |
| 3752 | 3954 | */ |
| 3753 | 3955 | public function plugin_action_links( $actions ) { |
| 3754 | - $support_link = ( new Host() )->is_woa_site() ? 'https://wordpress.com/help/contact/' : self::admin_url( 'page=jetpack-debugger' ); | |
| 3755 | - | |
| 3756 | 3956 | if ( current_user_can( 'jetpack_manage_modules' ) && ( self::is_connection_ready() || ( new Status() )->is_offline_mode() ) ) { |
| 3757 | 3957 | return array_merge( |
| 3758 | - array( 'settings' => sprintf( '<a href="%s">%s</a>', esc_url( self::admin_url( 'page=jetpack#/settings' ) ), __( 'Settings', 'jetpack' ) ) ), | |
| 3759 | - array( 'support' => sprintf( '<a href="%s">%s</a>', esc_url( $support_link ), __( 'Support', 'jetpack' ) ) ), | |
| 3958 | + array( 'settings' => sprintf( '<a href="%s">%s</a>', esc_url( self::admin_url( 'page=jetpack-settings#/settings' ) ), __( 'Settings', 'jetpack' ) ) ), | |
| 3760 | 3959 | $actions |
| 3761 | 3960 | ); |
| 3762 | 3961 | } |
| 3763 | 3962 | |
| @@ -3764,53 +3963,8 @@ | ||
| 3764 | 3963 | return $actions; |
| 3765 | 3964 | } |
| 3766 | 3965 | |
| 3767 | 3966 | /** |
| 3768 | - * Add an activation modal to the plugins page and the main dashboard. | |
| 3769 | - * | |
| 3770 | - * @param string $hook The current admin page. | |
| 3771 | - * | |
| 3772 | - * @return void | |
| 3773 | - */ | |
| 3774 | - public function activate_dialog( $hook ) { | |
| 3775 | - /* | |
| 3776 | - * We do not need it on other plugin pages, | |
| 3777 | - * or when Jetpack is already connected. | |
| 3778 | - */ | |
| 3779 | - if ( | |
| 3780 | - ! in_array( $hook, array( 'plugins.php', 'index.php' ), true ) | |
| 3781 | - || self::is_connection_ready() | |
| 3782 | - ) { | |
| 3783 | - return; | |
| 3784 | - } | |
| 3785 | - | |
| 3786 | - // add an activation script that will pick up deactivation actions for the Jetpack plugin. | |
| 3787 | - Assets::register_script( | |
| 3788 | - 'jetpack-full-activation-modal-js', | |
| 3789 | - '_inc/build/activation-modal.js', | |
| 3790 | - JETPACK__PLUGIN_FILE, | |
| 3791 | - array( | |
| 3792 | - 'enqueue' => true, | |
| 3793 | - 'in_footer' => true, | |
| 3794 | - 'textdomain' => 'jetpack', | |
| 3795 | - 'dependencies' => array( | |
| 3796 | - 'wp-polyfill', | |
| 3797 | - 'wp-components', | |
| 3798 | - ), | |
| 3799 | - ) | |
| 3800 | - ); | |
| 3801 | - | |
| 3802 | - // Add objects to be passed to the initial state of the app. | |
| 3803 | - // Use wp_add_inline_script instead of wp_localize_script, see https://core.trac.wordpress.org/ticket/25280. | |
| 3804 | - wp_add_inline_script( 'jetpack-full-activation-modal-js', 'var Initial_State=JSON.parse(decodeURIComponent("' . rawurlencode( wp_json_encode( Jetpack_Redux_State_Helper::get_minimal_state() ) ) . '"));', 'before' ); | |
| 3805 | - | |
| 3806 | - // Adds Connection package initial state. | |
| 3807 | - Connection_Initial_State::render_script( 'jetpack-full-activation-modal-js' ); | |
| 3808 | - | |
| 3809 | - add_action( 'admin_notices', array( $this, 'jetpack_plugin_portal_containers' ) ); | |
| 3810 | - } | |
| 3811 | - | |
| 3812 | - /** | |
| 3813 | 3967 | * Adds the deactivation warning modal for Jetpack. |
| 3814 | 3968 | * |
| 3815 | 3969 | * @param string $hook The current admin page. |
| 3816 | 3970 | * |
| @@ -3830,14 +3984,10 @@ | ||
| 3830 | 3984 | 'jetpack-plugins-page-js', |
| 3831 | 3985 | '_inc/build/plugins-page.js', |
| 3832 | 3986 | JETPACK__PLUGIN_FILE, |
| 3833 | 3987 | array( |
| 3834 | - 'in_footer' => true, | |
| 3835 | - 'textdomain' => 'jetpack', | |
| 3836 | - 'dependencies' => array( | |
| 3837 | - 'wp-polyfill', | |
| 3838 | - 'wp-components', | |
| 3839 | - ), | |
| 3988 | + 'in_footer' => true, | |
| 3989 | + 'textdomain' => 'jetpack', | |
| 3840 | 3990 | ) |
| 3841 | 3991 | ); |
| 3842 | 3992 | Assets::enqueue_script( 'jetpack-plugins-page-js' ); |
| 3843 | 3993 | |
| @@ -3842,9 +3992,9 @@ | ||
| 3842 | 3992 | Assets::enqueue_script( 'jetpack-plugins-page-js' ); |
| 3843 | 3993 | |
| 3844 | 3994 | // Add objects to be passed to the initial state of the app. |
| 3845 | 3995 | // Use wp_add_inline_script instead of wp_localize_script, see https://core.trac.wordpress.org/ticket/25280. |
| 3846 | - wp_add_inline_script( 'jetpack-plugins-page-js', 'var Initial_State=JSON.parse(decodeURIComponent("' . rawurlencode( wp_json_encode( Jetpack_Redux_State_Helper::get_minimal_state() ) ) . '"));', 'before' ); | |
| 3996 | + wp_add_inline_script( 'jetpack-plugins-page-js', 'var Initial_State=' . wp_json_encode( Jetpack_Redux_State_Helper::get_plugins_page_state(), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ) . ';', 'before' ); | |
| 3847 | 3997 | |
| 3848 | 3998 | add_action( 'admin_footer', array( $this, 'jetpack_plugin_portal_containers' ) ); |
| 3849 | 3999 | } |
| 3850 | 4000 | } |
| @@ -3893,9 +4043,9 @@ | ||
| 3893 | 4043 | // @todo provide way to go to specific calypso env. |
| 3894 | 4044 | self::get_calypso_host() . 'jetpack/connect' |
| 3895 | 4045 | ) |
| 3896 | 4046 | ); |
| 3897 | - exit; | |
| 4047 | + exit( 0 ); | |
| 3898 | 4048 | } |
| 3899 | 4049 | } |
| 3900 | 4050 | |
| 3901 | 4051 | /* |
| @@ -3930,8 +4080,28 @@ | ||
| 3930 | 4080 | * Done! |
| 3931 | 4081 | */ |
| 3932 | 4082 | |
| 3933 | 4083 | /** |
| 4084 | + * Build the user-facing description stored alongside a registration error code. | |
| 4085 | + * | |
| 4086 | + * @since 16.2 | |
| 4087 | + * | |
| 4088 | + * @param string $error_code The WP_Error code. | |
| 4089 | + * @param string $message The WP_Error message. | |
| 4090 | + * @return string The description, empty when the message is not user-facing copy. | |
| 4091 | + */ | |
| 4092 | + public static function get_registration_error_description( $error_code, $message ) { | |
| 4093 | + // Manager::validate_remote_register_response() does not always put user-facing copy in the | |
| 4094 | + // message slot: wpcom_5??, wpcom_408 and wpcom_bad_response store the HTTP status there, | |
| 4095 | + // and jetpack_id stores the raw response body, which can also overflow the state cookie. | |
| 4096 | + if ( 'jetpack_id' === $error_code || is_numeric( $message ) ) { | |
| 4097 | + return ''; | |
| 4098 | + } | |
| 4099 | + | |
| 4100 | + return mb_substr( (string) $message, 0, 250 ); | |
| 4101 | + } | |
| 4102 | + | |
| 4103 | + /** | |
| 3934 | 4104 | * Handles the page load events for the Jetpack admin page |
| 3935 | 4105 | */ |
| 3936 | 4106 | public function admin_page_load() { |
| 3937 | 4107 | $error = false; |
| @@ -3967,10 +4137,11 @@ | ||
| 3967 | 4137 | $registered = static::connection()->try_registration(); |
| 3968 | 4138 | if ( is_wp_error( $registered ) ) { |
| 3969 | 4139 | $error = $registered->get_error_code(); |
| 3970 | 4140 | self::state( 'error', $error ); |
| 3971 | - self::state( 'error', $registered->get_error_message() ); | |
| 3972 | 4141 | |
| 4142 | + self::state( 'error_description', self::get_registration_error_description( $error, $registered->get_error_message() ) ); | |
| 4143 | + | |
| 3973 | 4144 | /** |
| 3974 | 4145 | * Jetpack registration Error. |
| 3975 | 4146 | * |
| 3976 | 4147 | * @since 7.5.0 |
| @@ -3994,12 +4165,8 @@ | ||
| 3994 | 4165 | do_action( 'jetpack_connection_register_success', $from ); |
| 3995 | 4166 | |
| 3996 | 4167 | $url = $this->build_connect_url( true, $redirect, $from ); |
| 3997 | 4168 | |
| 3998 | - if ( ! empty( $_GET['onboarding'] ) ) { | |
| 3999 | - $url = add_query_arg( 'onboarding', rawurlencode_deep( wp_unslash( $_GET['onboarding'] ) ), $url ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized | |
| 4000 | - } | |
| 4001 | - | |
| 4002 | 4169 | if ( ! empty( $_GET['auth_approved'] ) && 'true' === $_GET['auth_approved'] ) { |
| 4003 | 4170 | $url = add_query_arg( 'auth_approved', 'true', $url ); |
| 4004 | 4171 | } |
| 4005 | 4172 | |
| @@ -4004,9 +4171,9 @@ | ||
| 4004 | 4171 | } |
| 4005 | 4172 | |
| 4006 | 4173 | add_filter( 'allowed_redirect_hosts', array( Host::class, 'allow_wpcom_environments' ) ); |
| 4007 | 4174 | wp_safe_redirect( $url ); |
| 4008 | - exit; | |
| 4175 | + exit( 0 ); | |
| 4009 | 4176 | case 'activate': |
| 4010 | 4177 | if ( ! current_user_can( 'jetpack_activate_modules' ) ) { |
| 4011 | 4178 | $error = 'cheatin'; |
| 4012 | 4179 | break; |
| @@ -4020,9 +4187,9 @@ | ||
| 4020 | 4187 | self::state( 'error', sprintf( __( 'Could not activate %s', 'jetpack' ), $module ) ); |
| 4021 | 4188 | } |
| 4022 | 4189 | // The following two lines will rarely happen, as Jetpack::activate_module normally exits at the end. |
| 4023 | 4190 | wp_safe_redirect( self::admin_url( 'page=jetpack' ) ); |
| 4024 | - exit; | |
| 4191 | + exit( 0 ); | |
| 4025 | 4192 | case 'activate_default_modules': |
| 4026 | 4193 | check_admin_referer( 'activate_default_modules' ); |
| 4027 | 4194 | self::log( 'activate_default_modules' ); |
| 4028 | 4195 | self::restate(); |
| @@ -4030,9 +4197,9 @@ | ||
| 4030 | 4197 | $max_version = isset( $_GET['max_version'] ) ? sanitize_text_field( wp_unslash( $_GET['max_version'] ) ) : false; |
| 4031 | 4198 | $other_modules = isset( $_GET['other_modules'] ) && is_array( $_GET['other_modules'] ) ? array_map( 'sanitize_text_field', wp_unslash( $_GET['other_modules'] ) ) : array(); |
| 4032 | 4199 | self::activate_default_modules( $min_version, $max_version, $other_modules ); |
| 4033 | 4200 | wp_safe_redirect( self::admin_url( 'page=jetpack' ) ); |
| 4034 | - exit; | |
| 4201 | + exit( 0 ); | |
| 4035 | 4202 | case 'disconnect': |
| 4036 | 4203 | if ( ! current_user_can( 'jetpack_disconnect' ) ) { |
| 4037 | 4204 | $error = 'cheatin'; |
| 4038 | 4205 | break; |
| @@ -4041,9 +4208,9 @@ | ||
| 4041 | 4208 | check_admin_referer( 'jetpack-disconnect' ); |
| 4042 | 4209 | self::log( 'disconnect' ); |
| 4043 | 4210 | self::disconnect(); |
| 4044 | 4211 | wp_safe_redirect( self::admin_url( 'disconnected=true' ) ); |
| 4045 | - exit; | |
| 4212 | + exit( 0 ); | |
| 4046 | 4213 | case 'reconnect': |
| 4047 | 4214 | if ( ! current_user_can( 'jetpack_reconnect' ) ) { |
| 4048 | 4215 | $error = 'cheatin'; |
| 4049 | 4216 | break; |
| @@ -4054,9 +4221,9 @@ | ||
| 4054 | 4221 | self::disconnect(); |
| 4055 | 4222 | |
| 4056 | 4223 | add_filter( 'allowed_redirect_hosts', array( Host::class, 'allow_wpcom_environments' ) ); |
| 4057 | 4224 | wp_safe_redirect( $this->build_connect_url( true, false, 'reconnect' ) ); |
| 4058 | - exit; | |
| 4225 | + exit( 0 ); | |
| 4059 | 4226 | case 'deactivate': |
| 4060 | 4227 | if ( ! current_user_can( 'jetpack_deactivate_modules' ) ) { |
| 4061 | 4228 | $error = 'cheatin'; |
| 4062 | 4229 | break; |
| @@ -4070,9 +4237,9 @@ | ||
| 4070 | 4237 | self::state( 'message', 'module_deactivated' ); |
| 4071 | 4238 | } |
| 4072 | 4239 | self::state( 'module', $modules ); |
| 4073 | 4240 | wp_safe_redirect( self::admin_url( 'page=jetpack' ) ); |
| 4074 | - exit; | |
| 4241 | + exit( 0 ); | |
| 4075 | 4242 | case 'unlink': |
| 4076 | 4243 | $redirect = isset( $_GET['redirect'] ) ? sanitize_text_field( wp_unslash( $_GET['redirect'] ) ) : ''; |
| 4077 | 4244 | check_admin_referer( 'jetpack-unlink' ); |
| 4078 | 4245 | self::log( 'unlink' ); |
| @@ -4082,32 +4249,9 @@ | ||
| 4082 | 4249 | wp_safe_redirect( admin_url() ); |
| 4083 | 4250 | } else { |
| 4084 | 4251 | wp_safe_redirect( self::admin_url( array( 'page' => rawurlencode( $redirect ) ) ) ); |
| 4085 | 4252 | } |
| 4086 | - exit; | |
| 4087 | - case 'onboard': | |
| 4088 | - if ( ! current_user_can( 'manage_options' ) ) { | |
| 4089 | - wp_safe_redirect( self::admin_url( 'page=jetpack' ) ); | |
| 4090 | - } else { | |
| 4091 | - self::create_onboarding_token(); | |
| 4092 | - $url = $this->build_connect_url( true ); | |
| 4093 | - | |
| 4094 | - $token = Jetpack_Options::get_option( 'onboarding' ); | |
| 4095 | - | |
| 4096 | - if ( false !== ( $token ) ) { | |
| 4097 | - $url = add_query_arg( 'onboarding', $token, $url ); | |
| 4098 | - } | |
| 4099 | - | |
| 4100 | - $calypso_env = ( new Host() )->get_calypso_env(); | |
| 4101 | - if ( ! empty( $calypso_env ) ) { | |
| 4102 | - $url = add_query_arg( 'calypso_env', $calypso_env, $url ); | |
| 4103 | - } | |
| 4104 | - | |
| 4105 | - add_filter( 'allowed_redirect_hosts', array( Host::class, 'allow_wpcom_environments' ) ); | |
| 4106 | - wp_safe_redirect( $url ); | |
| 4107 | - exit; | |
| 4108 | - } | |
| 4109 | - exit; | |
| 4253 | + exit( 0 ); | |
| 4110 | 4254 | default: |
| 4111 | 4255 | /** |
| 4112 | 4256 | * Fires when a Jetpack admin page is loaded with an unrecognized parameter. |
| 4113 | 4257 | * |
| @@ -4330,37 +4474,8 @@ | ||
| 4330 | 4474 | endif; |
| 4331 | 4475 | } |
| 4332 | 4476 | |
| 4333 | 4477 | /** |
| 4334 | - * We can't always respond to a signed XML-RPC request with a | |
| 4335 | - * helpful error message. In some circumstances, doing so could | |
| 4336 | - * leak information. | |
| 4337 | - * | |
| 4338 | - * Instead, track that the error occurred via a Jetpack_Option, | |
| 4339 | - * and send that data back in the heartbeat. | |
| 4340 | - * All this does is increment a number, but it's enough to find | |
| 4341 | - * trends. | |
| 4342 | - * | |
| 4343 | - * @param WP_Error $xmlrpc_error The error produced during | |
| 4344 | - * signature validation. | |
| 4345 | - */ | |
| 4346 | - public function track_xmlrpc_error( $xmlrpc_error ) { | |
| 4347 | - $code = is_wp_error( $xmlrpc_error ) | |
| 4348 | - ? $xmlrpc_error->get_error_code() | |
| 4349 | - : 'should-not-happen'; | |
| 4350 | - | |
| 4351 | - $xmlrpc_errors = Jetpack_Options::get_option( 'xmlrpc_errors', array() ); | |
| 4352 | - if ( isset( $xmlrpc_errors[ $code ] ) && $xmlrpc_errors[ $code ] ) { | |
| 4353 | - // No need to update the option if we already have | |
| 4354 | - // this code stored. | |
| 4355 | - return; | |
| 4356 | - } | |
| 4357 | - $xmlrpc_errors[ $code ] = true; | |
| 4358 | - | |
| 4359 | - Jetpack_Options::update_option( 'xmlrpc_errors', $xmlrpc_errors, false ); | |
| 4360 | - } | |
| 4361 | - | |
| 4362 | - /** | |
| 4363 | 4478 | * Initialize the jetpack stats instance only when needed |
| 4364 | 4479 | * |
| 4365 | 4480 | * @return void |
| 4366 | 4481 | */ |
| @@ -4483,9 +4598,9 @@ | ||
| 4483 | 4598 | return $this->build_connect_url( $raw, $redirect, $from, true ); |
| 4484 | 4599 | } |
| 4485 | 4600 | } |
| 4486 | 4601 | |
| 4487 | - $url = static::build_authorize_url( $redirect ); | |
| 4602 | + $url = ( new Authorize_Redirect( static::connection() ) )->build_authorize_url( $redirect ); | |
| 4488 | 4603 | } |
| 4489 | 4604 | |
| 4490 | 4605 | if ( $from ) { |
| 4491 | 4606 | $url = add_query_arg( 'from', $from, $url ); |
| @@ -4510,66 +4625,30 @@ | ||
| 4510 | 4625 | * @param null $deprecated Deprecated since Jetpack 10.9. |
| 4511 | 4626 | * |
| 4512 | 4627 | * @todo Update default value for redirect since the called function expects a string. |
| 4513 | 4628 | * |
| 4629 | + * @deprecated 13.4 | |
| 4630 | + * | |
| 4514 | 4631 | * @return mixed|void |
| 4515 | 4632 | */ |
| 4516 | 4633 | public static function build_authorize_url( $redirect = false, $deprecated = null ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable |
| 4634 | + _deprecated_function( __METHOD__, 'jetpack-13.4', 'Authorize_Redirect::build_authorize_url' ); | |
| 4517 | 4635 | |
| 4518 | - add_filter( 'jetpack_connect_request_body', array( __CLASS__, 'filter_connect_request_body' ) ); | |
| 4519 | - add_filter( 'jetpack_connect_redirect_url', array( __CLASS__, 'filter_connect_redirect_url' ) ); | |
| 4520 | - | |
| 4521 | - $c8n = self::connection(); | |
| 4522 | - $url = $c8n->get_authorization_url( wp_get_current_user(), $redirect ); | |
| 4523 | - | |
| 4524 | - remove_filter( 'jetpack_connect_request_body', array( __CLASS__, 'filter_connect_request_body' ) ); | |
| 4525 | - remove_filter( 'jetpack_connect_redirect_url', array( __CLASS__, 'filter_connect_redirect_url' ) ); | |
| 4526 | - | |
| 4527 | - /** | |
| 4528 | - * Filter the URL used when authorizing a user to a WordPress.com account. | |
| 4529 | - * | |
| 4530 | - * @since 8.9.0 | |
| 4531 | - * | |
| 4532 | - * @param string $url Connection URL. | |
| 4533 | - */ | |
| 4534 | - return apply_filters( 'jetpack_build_authorize_url', $url ); | |
| 4636 | + return ( new Authorize_Redirect( static::connection() ) )->build_authorize_url( $redirect ); | |
| 4535 | 4637 | } |
| 4536 | 4638 | |
| 4537 | 4639 | /** |
| 4538 | 4640 | * Filters the connection URL parameter array. |
| 4539 | 4641 | * |
| 4642 | + * @deprecated 13.4 | |
| 4643 | + * | |
| 4540 | 4644 | * @param array $args default URL parameters used by the package. |
| 4541 | 4645 | * @return array the modified URL arguments array. |
| 4542 | 4646 | */ |
| 4543 | 4647 | public static function filter_connect_request_body( $args ) { |
| 4544 | - if ( | |
| 4545 | - Constants::is_defined( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) | |
| 4546 | - && include_once Constants::get_constant( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) | |
| 4547 | - ) { | |
| 4548 | - $gp_locale = GP_Locales::by_field( 'wp_locale', get_locale() ); | |
| 4549 | - $args['locale'] = isset( $gp_locale ) && isset( $gp_locale->slug ) | |
| 4550 | - ? $gp_locale->slug | |
| 4551 | - : ''; | |
| 4552 | - } | |
| 4648 | + _deprecated_function( __METHOD__, 'jetpack-13.4', 'Authorize_Redirect::filter_connect_request_body' ); | |
| 4553 | 4649 | |
| 4554 | - $tracking = new Tracking(); | |
| 4555 | - $tracks_identity = $tracking->tracks_get_identity( $args['state'] ); | |
| 4556 | - | |
| 4557 | - $args = array_merge( | |
| 4558 | - $args, | |
| 4559 | - array( | |
| 4560 | - '_ui' => $tracks_identity['_ui'], | |
| 4561 | - '_ut' => $tracks_identity['_ut'], | |
| 4562 | - ) | |
| 4563 | - ); | |
| 4564 | - | |
| 4565 | - $calypso_env = ( new Host() )->get_calypso_env(); | |
| 4566 | - | |
| 4567 | - if ( ! empty( $calypso_env ) ) { | |
| 4568 | - $args['calypso_env'] = $calypso_env; | |
| 4569 | - } | |
| 4570 | - | |
| 4571 | - return $args; | |
| 4650 | + return Authorize_Redirect::filter_connect_request_body( $args ); | |
| 4572 | 4651 | } |
| 4573 | 4652 | |
| 4574 | 4653 | /** |
| 4575 | 4654 | * Filters the `jetpack/v4/connection/data` API response of the Connection package in order to |
| @@ -4606,41 +4685,19 @@ | ||
| 4606 | 4685 | return $current_user_connection_data; |
| 4607 | 4686 | } |
| 4608 | 4687 | |
| 4609 | 4688 | /** |
| 4610 | - * Filters the URL that will process the connection data. It can be different from the URL | |
| 4611 | - * that we send the user to after everything is done. | |
| 4612 | - * | |
| 4613 | - * @param String $processing_url the default redirect URL used by the package. | |
| 4614 | - * @return String the modified URL. | |
| 4615 | - * | |
| 4616 | - * @deprecated since Jetpack 9.5.0 | |
| 4617 | - */ | |
| 4618 | - public static function filter_connect_processing_url( $processing_url ) { | |
| 4619 | - _deprecated_function( __METHOD__, 'jetpack-9.5' ); | |
| 4620 | - | |
| 4621 | - $processing_url = admin_url( 'admin.php?page=jetpack' ); // Making PHPCS happy. | |
| 4622 | - return $processing_url; | |
| 4623 | - } | |
| 4624 | - | |
| 4625 | - /** | |
| 4626 | 4689 | * Filters the redirection URL that is used for connect requests. The redirect |
| 4627 | 4690 | * URL should return the user back to the Jetpack console. |
| 4628 | 4691 | * |
| 4692 | + * @deprecated 13.4 | |
| 4693 | + * | |
| 4629 | 4694 | * @param String $redirect the default redirect URL used by the package. |
| 4630 | 4695 | * @return String the modified URL. |
| 4631 | 4696 | */ |
| 4632 | 4697 | public static function filter_connect_redirect_url( $redirect ) { |
| 4633 | - $jetpack_admin_page = esc_url_raw( admin_url( 'admin.php?page=jetpack' ) ); | |
| 4634 | - $redirect = $redirect | |
| 4635 | - ? wp_validate_redirect( esc_url_raw( $redirect ), $jetpack_admin_page ) | |
| 4636 | - : $jetpack_admin_page; | |
| 4637 | - | |
| 4638 | - if ( isset( $_REQUEST['is_multisite'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- not making a site change here. | |
| 4639 | - $redirect = Jetpack_Network::init()->get_url( 'network_admin_page' ); | |
| 4640 | - } | |
| 4641 | - | |
| 4642 | - return $redirect; | |
| 4698 | + _deprecated_function( __METHOD__, 'jetpack-13.4', 'Authorize_Redirect::filter_connect_redirect_url' ); | |
| 4699 | + return Authorize_Redirect::filter_connect_redirect_url( $redirect ); | |
| 4643 | 4700 | } |
| 4644 | 4701 | |
| 4645 | 4702 | /** |
| 4646 | 4703 | * This action fires at the beginning of the Manager::authorize method. |
| @@ -4704,11 +4761,8 @@ | ||
| 4704 | 4761 | * |
| 4705 | 4762 | * @param array $data The request data. |
| 4706 | 4763 | */ |
| 4707 | 4764 | public static function authorize_ending_authorized( $data ) { |
| 4708 | - // If this site has been through the Jetpack Onboarding flow, delete the onboarding token. | |
| 4709 | - self::invalidate_onboarding_token(); | |
| 4710 | - | |
| 4711 | 4765 | // If redirect_uri is SSO, ensure SSO module is enabled. |
| 4712 | 4766 | parse_str( wp_parse_url( $data['redirect_uri'], PHP_URL_QUERY ), $redirect_options ); |
| 4713 | 4767 | |
| 4714 | 4768 | /** This filter is documented in class.jetpack-cli.php */ |
| @@ -4832,13 +4886,9 @@ | ||
| 4832 | 4886 | * |
| 4833 | 4887 | * @return int 0 if the same sort or (+/-) to indicate which is greater. |
| 4834 | 4888 | */ |
| 4835 | 4889 | public static function sort_modules( $a, $b ) { |
| 4836 | - if ( $a['sort'] === $b['sort'] ) { | |
| 4837 | - return 0; | |
| 4838 | - } | |
| 4839 | - | |
| 4840 | - return ( $a['sort'] < $b['sort'] ) ? -1 : 1; | |
| 4890 | + return $a['sort'] <=> $b['sort']; | |
| 4841 | 4891 | } |
| 4842 | 4892 | |
| 4843 | 4893 | /** |
| 4844 | 4894 | * Recheck SSL status for use via an AJAX call. |
| @@ -4852,10 +4902,12 @@ | ||
| 4852 | 4902 | $result = self::permit_ssl( true ); |
| 4853 | 4903 | wp_send_json( |
| 4854 | 4904 | array( |
| 4855 | 4905 | 'enabled' => $result, |
| 4856 | - 'message' => get_transient( 'jetpack_https_test_message' ), | |
| 4857 | - ) | |
| 4906 | + 'message' => self::get_ssl_test_message(), | |
| 4907 | + ), | |
| 4908 | + null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- It takes null, but its phpdoc only says int. | |
| 4909 | + JSON_UNESCAPED_SLASHES | |
| 4858 | 4910 | ); |
| 4859 | 4911 | } |
| 4860 | 4912 | |
| 4861 | 4913 | /* Client API */ |
| @@ -4862,8 +4914,10 @@ | ||
| 4862 | 4914 | |
| 4863 | 4915 | /** |
| 4864 | 4916 | * Verify the onboarding token. |
| 4865 | 4917 | * |
| 4918 | + * @deprecated since 13.9 | |
| 4919 | + * | |
| 4866 | 4920 | * @param array $token_data Token data. |
| 4867 | 4921 | * @param string $token Token value. |
| 4868 | 4922 | * @param string $request_data JSON-encoded request data. |
| 4869 | 4923 | * |
| @@ -4869,8 +4923,9 @@ | ||
| 4869 | 4923 | * |
| 4870 | 4924 | * @return mixed |
| 4871 | 4925 | */ |
| 4872 | 4926 | public static function verify_onboarding_token( $token_data, $token, $request_data ) { |
| 4927 | + _deprecated_function( __METHOD__, '13.9' ); | |
| 4873 | 4928 | // Default to a blog token. |
| 4874 | 4929 | $token_type = 'blog'; |
| 4875 | 4930 | |
| 4876 | 4931 | // Let's see if this is onboarding. In such case, use user token type and the provided user id. |
| @@ -4898,9 +4953,9 @@ | ||
| 4898 | 4953 | $jp_user = get_user_by( 'email', $jpo_user ); |
| 4899 | 4954 | if ( is_a( $jp_user, 'WP_User' ) ) { |
| 4900 | 4955 | wp_set_current_user( $jp_user->ID ); |
| 4901 | 4956 | $user_can = is_multisite() |
| 4902 | - ? current_user_can_for_blog( get_current_blog_id(), 'manage_options' ) | |
| 4957 | + ? current_user_can_for_site( get_current_blog_id(), 'manage_options' ) | |
| 4903 | 4958 | : current_user_can( 'manage_options' ); |
| 4904 | 4959 | if ( $user_can ) { |
| 4905 | 4960 | $token_type = 'user'; |
| 4906 | 4961 | $token->external_user_id = $jp_user->ID; |
| @@ -4917,11 +4972,13 @@ | ||
| 4917 | 4972 | |
| 4918 | 4973 | /** |
| 4919 | 4974 | * Create a random secret for validating onboarding payload |
| 4920 | 4975 | * |
| 4976 | + * @deprecated since 13.9 | |
| 4921 | 4977 | * @return string Secret token |
| 4922 | 4978 | */ |
| 4923 | 4979 | public static function create_onboarding_token() { |
| 4980 | + _deprecated_function( __METHOD__, '13.9' ); | |
| 4924 | 4981 | $token = Jetpack_Options::get_option( 'onboarding' ); |
| 4925 | 4982 | if ( false === ( $token ) ) { |
| 4926 | 4983 | $token = wp_generate_password( 32, false ); |
| 4927 | 4984 | Jetpack_Options::update_option( 'onboarding', $token ); |
| @@ -4932,11 +4989,13 @@ | ||
| 4932 | 4989 | |
| 4933 | 4990 | /** |
| 4934 | 4991 | * Remove the onboarding token |
| 4935 | 4992 | * |
| 4993 | + * @deprecated since 13.9 | |
| 4936 | 4994 | * @return bool True on success, false on failure |
| 4937 | 4995 | */ |
| 4938 | 4996 | public static function invalidate_onboarding_token() { |
| 4997 | + _deprecated_function( __METHOD__, '13.9' ); | |
| 4939 | 4998 | return Jetpack_Options::delete_option( 'onboarding' ); |
| 4940 | 4999 | } |
| 4941 | 5000 | |
| 4942 | 5001 | /** |
| @@ -4941,8 +5000,10 @@ | ||
| 4941 | 5000 | |
| 4942 | 5001 | /** |
| 4943 | 5002 | * Validate an onboarding token for a specific action |
| 4944 | 5003 | * |
| 5004 | + * @deprecated since 13.9 | |
| 5005 | + * | |
| 4945 | 5006 | * @param string $token Onboarding token. |
| 4946 | 5007 | * @param string $action Action name. |
| 4947 | 5008 | * |
| 4948 | 5009 | * @return boolean True if token/action pair is accepted, false if not |
| @@ -4947,8 +5008,9 @@ | ||
| 4947 | 5008 | * |
| 4948 | 5009 | * @return boolean True if token/action pair is accepted, false if not |
| 4949 | 5010 | */ |
| 4950 | 5011 | public static function validate_onboarding_token_action( $token, $action ) { |
| 5012 | + _deprecated_function( __METHOD__, '13.9' ); | |
| 4951 | 5013 | // Compare tokens, bail if tokens do not match. |
| 4952 | 5014 | if ( ! hash_equals( $token, Jetpack_Options::get_option( 'onboarding' ) ) ) { |
| 4953 | 5015 | return false; |
| 4954 | 5016 | } |
| @@ -4974,39 +5036,41 @@ | ||
| 4974 | 5036 | * @return boolean |
| 4975 | 5037 | * @since 2.3.3 |
| 4976 | 5038 | */ |
| 4977 | 5039 | public static function permit_ssl( $force_recheck = false ) { |
| 4978 | - // Do some fancy tests to see if ssl is being supported. | |
| 4979 | - if ( ! $force_recheck ) { | |
| 4980 | - $ssl = get_transient( 'jetpack_https_test' ); | |
| 5040 | + if ( ! method_exists( Heartbeat::class, 'permit_ssl' ) ) { | |
| 5041 | + // Skip the SSL-fail notice when the check cannot run. | |
| 5042 | + return true; | |
| 4981 | 5043 | } |
| 4982 | 5044 | |
| 4983 | - if ( $force_recheck || false === $ssl ) { | |
| 4984 | - $message = ''; | |
| 4985 | - if ( 'https' !== substr( JETPACK__API_BASE, 0, 5 ) ) { | |
| 4986 | - $ssl = 0; | |
| 4987 | - } else { | |
| 4988 | - $ssl = 1; | |
| 5045 | + return Heartbeat::permit_ssl( $force_recheck ); | |
| 5046 | + } | |
| 4989 | 5047 | |
| 4990 | - if ( ! wp_http_supports( array( 'ssl' => true ) ) ) { | |
| 4991 | - $ssl = 0; | |
| 4992 | - $message = __( 'WordPress reports no SSL support', 'jetpack' ); | |
| 4993 | - } else { | |
| 4994 | - $response = wp_remote_get( JETPACK__API_BASE . 'test/1/' ); | |
| 4995 | - if ( is_wp_error( $response ) ) { | |
| 4996 | - $ssl = 0; | |
| 4997 | - $message = __( 'WordPress reports no SSL support', 'jetpack' ); | |
| 4998 | - } elseif ( 'OK' !== wp_remote_retrieve_body( $response ) ) { | |
| 4999 | - $ssl = 0; | |
| 5000 | - $message = __( 'Response was not OK: ', 'jetpack' ) . wp_remote_retrieve_body( $response ); | |
| 5001 | - } | |
| 5002 | - } | |
| 5003 | - } | |
| 5004 | - set_transient( 'jetpack_https_test', $ssl, DAY_IN_SECONDS ); | |
| 5005 | - set_transient( 'jetpack_https_test_message', $message, DAY_IN_SECONDS ); | |
| 5048 | + /** | |
| 5049 | + * Returns a localized message describing the last SSL connectivity failure, if any. | |
| 5050 | + * | |
| 5051 | + * The Connection package's canonical SSL check stores a neutral reason code; this maps it to | |
| 5052 | + * a translated, `jetpack`-domain message for display in the admin notice and AJAX recheck. | |
| 5053 | + * | |
| 5054 | + * @since 16.1 | |
| 5055 | + * | |
| 5056 | + * @return string The localized message, or an empty string when there is no failure. | |
| 5057 | + */ | |
| 5058 | + public static function get_ssl_test_message() { | |
| 5059 | + if ( ! method_exists( Heartbeat::class, 'get_ssl_test_error' ) ) { | |
| 5060 | + return ''; | |
| 5006 | 5061 | } |
| 5007 | 5062 | |
| 5008 | - return (bool) $ssl; | |
| 5063 | + $error = Heartbeat::get_ssl_test_error(); | |
| 5064 | + | |
| 5065 | + switch ( $error['code'] ) { | |
| 5066 | + case 'no_ssl_support': | |
| 5067 | + return __( 'WordPress reports no SSL support', 'jetpack' ); | |
| 5068 | + case 'bad_response': | |
| 5069 | + return __( 'Response was not OK: ', 'jetpack' ) . $error['detail']; | |
| 5070 | + default: | |
| 5071 | + return ''; | |
| 5072 | + } | |
| 5009 | 5073 | } |
| 5010 | 5074 | |
| 5011 | 5075 | /** |
| 5012 | 5076 | * Displays an admin_notice, alerting the user that outbound SSL isn't working. |
| @@ -5025,9 +5089,9 @@ | ||
| 5025 | 5089 | <p><?php esc_html_e( 'Your site could not connect to WordPress.com via HTTPS. This could be due to any number of reasons, including faulty SSL certificates, misconfigured or missing SSL libraries, or network issues.', 'jetpack' ); ?></p> |
| 5026 | 5090 | <p> |
| 5027 | 5091 | <?php esc_html_e( 'Jetpack will re-test for HTTPS support once a day, but you can click here to try again immediately: ', 'jetpack' ); ?> |
| 5028 | 5092 | <a href="#" id="jetpack-recheck-ssl-button"><?php esc_html_e( 'Try again', 'jetpack' ); ?></a> |
| 5029 | - <span id="jetpack-recheck-ssl-output"><?php echo esc_html( get_transient( 'jetpack_https_test_message' ) ); ?></span> | |
| 5093 | + <span id="jetpack-recheck-ssl-output"><?php echo esc_html( self::get_ssl_test_message() ); ?></span> | |
| 5030 | 5094 | </p> |
| 5031 | 5095 | <p> |
| 5032 | 5096 | <?php |
| 5033 | 5097 | printf( |
| @@ -5046,18 +5110,18 @@ | ||
| 5046 | 5110 | <script type="text/javascript"> |
| 5047 | 5111 | jQuery( document ).ready( function( $ ) { |
| 5048 | 5112 | $( '#jetpack-recheck-ssl-button' ).click( function( e ) { |
| 5049 | 5113 | var $this = $( this ); |
| 5050 | - $this.html( <?php echo wp_json_encode( __( 'Checking', 'jetpack' ) ); ?> ); | |
| 5114 | + $this.html( <?php echo wp_json_encode( esc_html__( 'Checking', 'jetpack' ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?> ); | |
| 5051 | 5115 | $( '#jetpack-recheck-ssl-output' ).html( '' ); |
| 5052 | 5116 | e.preventDefault(); |
| 5053 | - var data = { action: 'jetpack-recheck-ssl', 'ajax-nonce': <?php echo wp_json_encode( $ajax_nonce ); ?> }; | |
| 5117 | + var data = { action: 'jetpack-recheck-ssl', 'ajax-nonce': <?php echo wp_json_encode( $ajax_nonce, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?> }; | |
| 5054 | 5118 | $.post( ajaxurl, data ) |
| 5055 | 5119 | .done( function( response ) { |
| 5056 | 5120 | if ( response.enabled ) { |
| 5057 | 5121 | $( '#jetpack-ssl-warning' ).hide(); |
| 5058 | 5122 | } else { |
| 5059 | - this.html( <?php echo wp_json_encode( __( 'Try again', 'jetpack' ) ); ?> ); | |
| 5123 | + this.html( <?php echo wp_json_encode( esc_html__( 'Try again', 'jetpack' ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?> ); | |
| 5060 | 5124 | $( '#jetpack-recheck-ssl-output' ).html( 'SSL Failed: ' + response.message ); |
| 5061 | 5125 | } |
| 5062 | 5126 | }.bind( $this ) ); |
| 5063 | 5127 | } ); |
| @@ -5083,26 +5147,8 @@ | ||
| 5083 | 5147 | return $jetpack->connection_manager; |
| 5084 | 5148 | } |
| 5085 | 5149 | |
| 5086 | 5150 | /** |
| 5087 | - * Creates two secret tokens and the end of life timestamp for them. | |
| 5088 | - * | |
| 5089 | - * Note these tokens are unique per call, NOT static per site for connecting. | |
| 5090 | - * | |
| 5091 | - * @deprecated 9.5 Use Automattic\Jetpack\Connection\Secrets->generate() instead. | |
| 5092 | - * | |
| 5093 | - * @since 2.6 | |
| 5094 | - * @param String $action The action name. | |
| 5095 | - * @param Integer $user_id The user identifier. | |
| 5096 | - * @param Integer $exp Expiration time in seconds. | |
| 5097 | - * @return array | |
| 5098 | - */ | |
| 5099 | - public static function generate_secrets( $action, $user_id = false, $exp = 600 ) { | |
| 5100 | - _deprecated_function( __METHOD__, 'jetpack-9.5', 'Automattic\\Jetpack\\Connection\\Secrets->generate' ); | |
| 5101 | - return self::connection()->generate_secrets( $action, $user_id, $exp ); | |
| 5102 | - } | |
| 5103 | - | |
| 5104 | - /** | |
| 5105 | 5151 | * Get verification secrets. |
| 5106 | 5152 | * |
| 5107 | 5153 | * @param string $action Action name. |
| 5108 | 5154 | * @param int $user_id User ID. |
| @@ -5123,35 +5169,8 @@ | ||
| 5123 | 5169 | return $secrets; |
| 5124 | 5170 | } |
| 5125 | 5171 | |
| 5126 | 5172 | /** |
| 5127 | - * Register a connection. | |
| 5128 | - * | |
| 5129 | - * @deprecated Jetpack 9.7.0 | |
| 5130 | - * @see Automattic\Jetpack\Connection\Manager::try_registration() | |
| 5131 | - * | |
| 5132 | - * @return bool|WP_Error | |
| 5133 | - */ | |
| 5134 | - public static function register() { | |
| 5135 | - _deprecated_function( __METHOD__, 'jetpack-9.7', 'Automattic\\Jetpack\\Connection\\Manager::try_registration' ); | |
| 5136 | - return static::connection()->try_registration( false ); | |
| 5137 | - } | |
| 5138 | - | |
| 5139 | - /** | |
| 5140 | - * Filters the registration request body to include tracking properties. | |
| 5141 | - * | |
| 5142 | - * @deprecated Jetpack 9.7.0 | |
| 5143 | - * @see Automattic\Jetpack\Connection\Utils::filter_register_request_body() | |
| 5144 | - * | |
| 5145 | - * @param array $properties Token request properties. | |
| 5146 | - * @return array amended properties. | |
| 5147 | - */ | |
| 5148 | - public static function filter_register_request_body( $properties ) { | |
| 5149 | - _deprecated_function( __METHOD__, 'jetpack-9.7', 'Automattic\\Jetpack\\Connection\\Utils::filter_register_request_body' ); | |
| 5150 | - return Connection_Utils::filter_register_request_body( $properties ); | |
| 5151 | - } | |
| 5152 | - | |
| 5153 | - /** | |
| 5154 | 5173 | * Filters the token request body to include tracking properties. |
| 5155 | 5174 | * |
| 5156 | 5175 | * @param array $properties Token request properties. |
| 5157 | 5176 | * |
| @@ -5172,9 +5191,9 @@ | ||
| 5172 | 5191 | |
| 5173 | 5192 | /** |
| 5174 | 5193 | * If the db version is showing something other that what we've got now, bump it to current. |
| 5175 | 5194 | * |
| 5176 | - * @return bool: True if the option was incorrect and updated, false if nothing happened. | |
| 5195 | + * @return bool True if the option was incorrect and updated, false if nothing happened. | |
| 5177 | 5196 | */ |
| 5178 | 5197 | public static function maybe_set_version_option() { |
| 5179 | 5198 | list( $version ) = explode( ':', Jetpack_Options::get_option( 'version' ) ); |
| 5180 | 5199 | if ( JETPACK__VERSION !== $version ) { |
| @@ -5192,21 +5211,8 @@ | ||
| 5192 | 5211 | |
| 5193 | 5212 | /* Client Server API */ |
| 5194 | 5213 | |
| 5195 | 5214 | /** |
| 5196 | - * Loads the Jetpack XML-RPC client. | |
| 5197 | - * No longer necessary, as the XML-RPC client will be automagically loaded. | |
| 5198 | - * | |
| 5199 | - * Note: we cannot remove this function yet as it is used in this plugin: | |
| 5200 | - * https://wordpress.org/plugins/jetpack-subscription-form/ | |
| 5201 | - * | |
| 5202 | - * @deprecated since 7.7.0 | |
| 5203 | - */ | |
| 5204 | - public static function load_xml_rpc_client() { | |
| 5205 | - _deprecated_function( __METHOD__, 'jetpack-7.7' ); | |
| 5206 | - } | |
| 5207 | - | |
| 5208 | - /** | |
| 5209 | 5215 | * State is passed via cookies from one request to the next, but never to subsequent requests. |
| 5210 | 5216 | * SET: state( $key, $value ); |
| 5211 | 5217 | * GET: $value = state( $key ); |
| 5212 | 5218 | * |
| @@ -5280,20 +5286,8 @@ | ||
| 5280 | 5286 | |
| 5281 | 5287 | self::state( 'privacy_checks', $privacy_checks ); |
| 5282 | 5288 | } |
| 5283 | 5289 | |
| 5284 | - /** | |
| 5285 | - * Serve a WordPress.com static resource via a randomized wp.com subdomain. | |
| 5286 | - * | |
| 5287 | - * @deprecated 9.3.0 Use Assets::staticize_subdomain. | |
| 5288 | - * | |
| 5289 | - * @param string $url WordPress.com static resource URL. | |
| 5290 | - */ | |
| 5291 | - public static function staticize_subdomain( $url ) { | |
| 5292 | - _deprecated_function( __METHOD__, 'jetpack-9.3.0', 'Automattic\Jetpack\Assets::staticize_subdomain' ); | |
| 5293 | - return Assets::staticize_subdomain( $url ); | |
| 5294 | - } | |
| 5295 | - | |
| 5296 | 5290 | /* JSON API Authorization */ |
| 5297 | 5291 | |
| 5298 | 5292 | /** |
| 5299 | 5293 | * Handles the login action for Authorizing the JSON API |
| @@ -5298,13 +5292,14 @@ | ||
| 5298 | 5292 | /** |
| 5299 | 5293 | * Handles the login action for Authorizing the JSON API |
| 5300 | 5294 | */ |
| 5301 | 5295 | public function login_form_json_api_authorization() { |
| 5302 | - $this->verify_json_api_authorization_request(); | |
| 5296 | + $authorize_json_api = new Authorize_Json_Api(); | |
| 5297 | + $authorize_json_api->verify_json_api_authorization_request(); | |
| 5303 | 5298 | |
| 5304 | - add_action( 'wp_login', array( $this, 'store_json_api_authorization_token' ), 10, 2 ); | |
| 5299 | + add_action( 'wp_login', array( $authorize_json_api, 'store_json_api_authorization_token' ), 10, 2 ); | |
| 5305 | 5300 | |
| 5306 | - add_action( 'login_message', array( $this, 'login_message_json_api_authorization' ) ); | |
| 5301 | + add_action( 'login_message', array( $authorize_json_api, 'login_message_json_api_authorization' ) ); | |
| 5307 | 5302 | add_action( 'login_form', array( $this, 'preserve_action_in_login_form_for_json_api_authorization' ) ); |
| 5308 | 5303 | add_filter( 'site_url', array( $this, 'post_login_form_to_signed_url' ), 10, 3 ); |
| 5309 | 5304 | } |
| 5310 | 5305 | |
| @@ -5342,16 +5337,17 @@ | ||
| 5342 | 5337 | |
| 5343 | 5338 | /** |
| 5344 | 5339 | * If someone logs in to approve API access, store the Access Code in usermeta. |
| 5345 | 5340 | * |
| 5341 | + * @deprecated 13.4 | |
| 5342 | + * | |
| 5346 | 5343 | * @param string $user_login Unused. |
| 5347 | 5344 | * @param WP_User $user User logged in. |
| 5348 | 5345 | */ |
| 5349 | 5346 | public function store_json_api_authorization_token( $user_login, $user ) { |
| 5350 | - add_filter( 'login_redirect', array( $this, 'add_token_to_login_redirect_json_api_authorization' ), 10, 3 ); | |
| 5351 | - add_filter( 'allowed_redirect_hosts', array( $this, 'allow_wpcom_public_api_domain' ) ); | |
| 5352 | - $token = wp_generate_password( 32, false ); | |
| 5353 | - update_user_meta( $user->ID, 'jetpack_json_api_' . $this->json_api_authorization_request['client_id'], $token ); | |
| 5347 | + _deprecated_function( __METHOD__, 'jetpack-13.4', 'Automattic\\Jetpack\\Connection\\Authorize_Json_Api::store_json_api_authorization_token' ); | |
| 5348 | + | |
| 5349 | + return ( new Authorize_Json_Api() )->store_json_api_authorization_token( $user_login, $user ); | |
| 5354 | 5350 | } |
| 5355 | 5351 | |
| 5356 | 5352 | /** |
| 5357 | 5353 | * Add public-api.wordpress.com to the safe redirect allowed list - only added when someone allows API access. |
| @@ -5357,23 +5353,29 @@ | ||
| 5357 | 5353 | * Add public-api.wordpress.com to the safe redirect allowed list - only added when someone allows API access. |
| 5358 | 5354 | * |
| 5359 | 5355 | * To be used with a filter of allowed domains for a redirect. |
| 5360 | 5356 | * |
| 5357 | + * @deprecated 13.4 | |
| 5358 | + * | |
| 5361 | 5359 | * @param array $domains Allowed WP.com Environments. |
| 5362 | 5360 | */ |
| 5363 | 5361 | public function allow_wpcom_public_api_domain( $domains ) { |
| 5364 | - $domains[] = 'public-api.wordpress.com'; | |
| 5365 | - return $domains; | |
| 5362 | + _deprecated_function( __METHOD__, 'jetpack-13.4', 'Automattic\\Jetpack\\Status\\Host::allow_wpcom_public_api_domain' ); | |
| 5363 | + | |
| 5364 | + return Host::allow_wpcom_public_api_domain( $domains ); | |
| 5366 | 5365 | } |
| 5367 | 5366 | |
| 5368 | 5367 | /** |
| 5369 | 5368 | * Check if the redirect is encoded. |
| 5370 | 5369 | * |
| 5370 | + * @deprecated 13.4 | |
| 5371 | + * | |
| 5371 | 5372 | * @param string $redirect_url Redirect URL. |
| 5372 | 5373 | * |
| 5373 | 5374 | * @return bool If redirect has been encoded. |
| 5374 | 5375 | */ |
| 5375 | 5376 | public static function is_redirect_encoded( $redirect_url ) { |
| 5377 | + _deprecated_function( __METHOD__, 'jetpack-13.4' ); | |
| 5376 | 5378 | return preg_match( '/https?%3A%2F%2F/i', $redirect_url ) > 0; |
| 5377 | 5379 | } |
| 5378 | 5380 | |
| 5379 | 5381 | /** |
| @@ -5391,8 +5393,10 @@ | ||
| 5391 | 5393 | |
| 5392 | 5394 | /** |
| 5393 | 5395 | * Add the Access Code details to the public-api.wordpress.com redirect. |
| 5394 | 5396 | * |
| 5397 | + * @deprecated 13.4 | |
| 5398 | + * | |
| 5395 | 5399 | * @param string $redirect_to URL. |
| 5396 | 5400 | * @param string $original_redirect_to URL. |
| 5397 | 5401 | * @param WP_User $user WP_User for the redirect. |
| 5398 | 5402 | * |
| @@ -5398,23 +5402,18 @@ | ||
| 5398 | 5402 | * |
| 5399 | 5403 | * @return string |
| 5400 | 5404 | */ |
| 5401 | 5405 | public function add_token_to_login_redirect_json_api_authorization( $redirect_to, $original_redirect_to, $user ) { |
| 5402 | - return add_query_arg( | |
| 5403 | - urlencode_deep( | |
| 5404 | - array( | |
| 5405 | - 'jetpack-code' => get_user_meta( $user->ID, 'jetpack_json_api_' . $this->json_api_authorization_request['client_id'], true ), | |
| 5406 | - 'jetpack-user-id' => (int) $user->ID, | |
| 5407 | - 'jetpack-state' => $this->json_api_authorization_request['state'], | |
| 5408 | - ) | |
| 5409 | - ), | |
| 5410 | - $redirect_to | |
| 5411 | - ); | |
| 5406 | + _deprecated_function( __METHOD__, 'jetpack-13.4', 'Automattic\\Jetpack\\Connection\\Authorize_Json_Api::add_token_to_login_redirect_json_api_authorization' ); | |
| 5407 | + | |
| 5408 | + return ( new Authorize_Json_Api() )->add_token_to_login_redirect_json_api_authorization( $redirect_to, $original_redirect_to, $user ); | |
| 5412 | 5409 | } |
| 5413 | 5410 | |
| 5414 | 5411 | /** |
| 5415 | 5412 | * Verifies the request by checking the signature |
| 5416 | 5413 | * |
| 5414 | + * @deprecated 13.4 | |
| 5415 | + * | |
| 5417 | 5416 | * @since 4.6.0 Method was updated to use `$_REQUEST` instead of `$_GET` and `$_POST`. Method also updated to allow |
| 5418 | 5417 | * passing in an `$environment` argument that overrides `$_REQUEST`. This was useful for integrating with SSO. |
| 5419 | 5418 | * |
| 5420 | 5419 | * @param null|array $environment Value to override $_REQUEST. |
| @@ -5419,194 +5418,24 @@ | ||
| 5419 | 5418 | * |
| 5420 | 5419 | * @param null|array $environment Value to override $_REQUEST. |
| 5421 | 5420 | */ |
| 5422 | 5421 | public function verify_json_api_authorization_request( $environment = null ) { |
| 5423 | - $environment = $environment === null | |
| 5424 | - ? $_REQUEST // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- nonce verification handled later in function. | |
| 5425 | - : $environment; | |
| 5422 | + _deprecated_function( __METHOD__, 'jetpack-13.4', 'Automattic\\Jetpack\\Connection\\Authorize_Json_Api::verify_json_api_authorization_request' ); | |
| 5426 | 5423 | |
| 5427 | - list( $env_token,, $env_user_id ) = explode( ':', $environment['token'] ); | |
| 5428 | - $token = ( new Tokens() )->get_access_token( $env_user_id, $env_token ); | |
| 5429 | - if ( ! $token || empty( $token->secret ) ) { | |
| 5430 | - wp_die( esc_html__( 'You must connect your Jetpack plugin to WordPress.com to use this feature.', 'jetpack' ) ); | |
| 5431 | - } | |
| 5432 | - | |
| 5433 | - $die_error = __( 'Someone may be trying to trick you into giving them access to your site. Or it could be you just encountered a bug :). Either way, please close this window.', 'jetpack' ); | |
| 5434 | - | |
| 5435 | - // Host has encoded the request URL, probably as a result of a bad http => https redirect. | |
| 5436 | - if ( self::is_redirect_encoded( esc_url_raw( wp_unslash( $_GET['redirect_to'] ) ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotValidated -- no site changes, we're erroring out. | |
| 5437 | - /** | |
| 5438 | - * Jetpack authorisation request Error. | |
| 5439 | - * | |
| 5440 | - * @since 7.5.0 | |
| 5441 | - */ | |
| 5442 | - do_action( 'jetpack_verify_api_authorization_request_error_double_encode' ); | |
| 5443 | - $die_error = sprintf( | |
| 5444 | - /* translators: %s is a URL */ | |
| 5445 | - __( 'Your site is incorrectly double-encoding redirects from http to https. This is preventing Jetpack from authenticating your connection. Please visit our <a href="%s">support page</a> for details about how to resolve this.', 'jetpack' ), | |
| 5446 | - esc_url( Redirect::get_url( 'jetpack-support-double-encoding' ) ) | |
| 5447 | - ); | |
| 5448 | - } | |
| 5449 | - | |
| 5450 | - $jetpack_signature = new Jetpack_Signature( $token->secret, (int) Jetpack_Options::get_option( 'time_diff' ) ); | |
| 5451 | - | |
| 5452 | - if ( isset( $environment['jetpack_json_api_original_query'] ) ) { | |
| 5453 | - $signature = $jetpack_signature->sign_request( | |
| 5454 | - $environment['token'], | |
| 5455 | - $environment['timestamp'], | |
| 5456 | - $environment['nonce'], | |
| 5457 | - '', | |
| 5458 | - 'GET', | |
| 5459 | - $environment['jetpack_json_api_original_query'], | |
| 5460 | - null, | |
| 5461 | - true | |
| 5462 | - ); | |
| 5463 | - } else { | |
| 5464 | - $signature = $jetpack_signature->sign_current_request( | |
| 5465 | - array( | |
| 5466 | - 'body' => null, | |
| 5467 | - 'method' => 'GET', | |
| 5468 | - ) | |
| 5469 | - ); | |
| 5470 | - } | |
| 5471 | - | |
| 5472 | - if ( ! $signature ) { | |
| 5473 | - wp_die( | |
| 5474 | - wp_kses( | |
| 5475 | - $die_error, | |
| 5476 | - array( | |
| 5477 | - 'a' => array( | |
| 5478 | - 'href' => array(), | |
| 5479 | - ), | |
| 5480 | - ) | |
| 5481 | - ) | |
| 5482 | - ); | |
| 5483 | - } elseif ( is_wp_error( $signature ) ) { | |
| 5484 | - wp_die( | |
| 5485 | - wp_kses( | |
| 5486 | - $die_error, | |
| 5487 | - array( | |
| 5488 | - 'a' => array( | |
| 5489 | - 'href' => array(), | |
| 5490 | - ), | |
| 5491 | - ) | |
| 5492 | - ) | |
| 5493 | - ); | |
| 5494 | - } elseif ( ! hash_equals( $signature, $environment['signature'] ) ) { | |
| 5495 | - if ( is_ssl() ) { | |
| 5496 | - // If we signed an HTTP request on the Jetpack Servers, but got redirected to HTTPS by the local blog, check the HTTP signature as well. | |
| 5497 | - $signature = $jetpack_signature->sign_current_request( | |
| 5498 | - array( | |
| 5499 | - 'scheme' => 'http', | |
| 5500 | - 'body' => null, | |
| 5501 | - 'method' => 'GET', | |
| 5502 | - ) | |
| 5503 | - ); | |
| 5504 | - if ( ! $signature || is_wp_error( $signature ) || ! hash_equals( $signature, $environment['signature'] ) ) { | |
| 5505 | - wp_die( | |
| 5506 | - wp_kses( | |
| 5507 | - $die_error, | |
| 5508 | - array( | |
| 5509 | - 'a' => array( | |
| 5510 | - 'href' => array(), | |
| 5511 | - ), | |
| 5512 | - ) | |
| 5513 | - ) | |
| 5514 | - ); | |
| 5515 | - } | |
| 5516 | - } else { | |
| 5517 | - wp_die( | |
| 5518 | - wp_kses( | |
| 5519 | - $die_error, | |
| 5520 | - array( | |
| 5521 | - 'a' => array( | |
| 5522 | - 'href' => array(), | |
| 5523 | - ), | |
| 5524 | - ) | |
| 5525 | - ) | |
| 5526 | - ); | |
| 5527 | - } | |
| 5528 | - } | |
| 5529 | - | |
| 5530 | - $timestamp = (int) $environment['timestamp']; | |
| 5531 | - $nonce = stripslashes( (string) $environment['nonce'] ); | |
| 5532 | - | |
| 5533 | - if ( ! $this->connection_manager ) { | |
| 5534 | - $this->connection_manager = new Connection_Manager(); | |
| 5535 | - } | |
| 5536 | - | |
| 5537 | - if ( ! ( new Nonce_Handler() )->add( $timestamp, $nonce ) ) { | |
| 5538 | - // De-nonce the nonce, at least for 5 minutes. | |
| 5539 | - // We have to reuse this nonce at least once (used the first time when the initial request is made, used a second time when the login form is POSTed). | |
| 5540 | - $old_nonce_time = get_option( "jetpack_nonce_{$timestamp}_{$nonce}" ); | |
| 5541 | - if ( $old_nonce_time < time() - 300 ) { | |
| 5542 | - wp_die( esc_html__( 'The authorization process expired. Please go back and try again.', 'jetpack' ) ); | |
| 5543 | - } | |
| 5544 | - } | |
| 5545 | - | |
| 5546 | - $data = json_decode( base64_decode( stripslashes( $environment['data'] ) ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_decode | |
| 5547 | - $data_filters = array( | |
| 5548 | - 'state' => 'opaque', | |
| 5549 | - 'client_id' => 'int', | |
| 5550 | - 'client_title' => 'string', | |
| 5551 | - 'client_image' => 'url', | |
| 5552 | - ); | |
| 5553 | - | |
| 5554 | - foreach ( $data_filters as $key => $sanitation ) { | |
| 5555 | - if ( ! isset( $data->$key ) ) { | |
| 5556 | - wp_die( | |
| 5557 | - wp_kses( | |
| 5558 | - $die_error, | |
| 5559 | - array( | |
| 5560 | - 'a' => array( | |
| 5561 | - 'href' => array(), | |
| 5562 | - ), | |
| 5563 | - ) | |
| 5564 | - ) | |
| 5565 | - ); | |
| 5566 | - } | |
| 5567 | - | |
| 5568 | - switch ( $sanitation ) { | |
| 5569 | - case 'int': | |
| 5570 | - $this->json_api_authorization_request[ $key ] = (int) $data->$key; | |
| 5571 | - break; | |
| 5572 | - case 'opaque': | |
| 5573 | - $this->json_api_authorization_request[ $key ] = (string) $data->$key; | |
| 5574 | - break; | |
| 5575 | - case 'string': | |
| 5576 | - $this->json_api_authorization_request[ $key ] = wp_kses( (string) $data->$key, array() ); | |
| 5577 | - break; | |
| 5578 | - case 'url': | |
| 5579 | - $this->json_api_authorization_request[ $key ] = esc_url_raw( (string) $data->$key ); | |
| 5580 | - break; | |
| 5581 | - } | |
| 5582 | - } | |
| 5583 | - | |
| 5584 | - if ( empty( $this->json_api_authorization_request['client_id'] ) ) { | |
| 5585 | - wp_die( | |
| 5586 | - wp_kses( | |
| 5587 | - $die_error, | |
| 5588 | - array( | |
| 5589 | - 'a' => array( | |
| 5590 | - 'href' => array(), | |
| 5591 | - ), | |
| 5592 | - ) | |
| 5593 | - ) | |
| 5594 | - ); | |
| 5595 | - } | |
| 5424 | + return ( new Authorize_Json_Api() )->verify_json_api_authorization_request( $environment ); | |
| 5596 | 5425 | } |
| 5597 | 5426 | |
| 5598 | 5427 | /** |
| 5599 | 5428 | * HTML for the JSON API authorization notice. |
| 5600 | 5429 | * |
| 5430 | + * @deprecated 13.4 | |
| 5431 | + * | |
| 5601 | 5432 | * @return string |
| 5602 | 5433 | */ |
| 5603 | 5434 | public function login_message_json_api_authorization() { |
| 5604 | - return '<p class="message">' . sprintf( | |
| 5605 | - /* translators: Name/image of the client requesting authorization */ | |
| 5606 | - esc_html__( '%s wants to access your site’s data. Log in to authorize that access.', 'jetpack' ), | |
| 5607 | - '<strong>' . esc_html( $this->json_api_authorization_request['client_title'] ) . '</strong>' | |
| 5608 | - ) . '<img src="' . esc_url( $this->json_api_authorization_request['client_image'] ) . '" /></p>'; | |
| 5435 | + _deprecated_function( __METHOD__, 'jetpack-13.4', 'Automattic\\Jetpack\\Connection\\Authorize_Json_Api::login_message_json_api_authorization' ); | |
| 5436 | + | |
| 5437 | + return ( new Authorize_Json_Api() )->login_message_json_api_authorization(); | |
| 5609 | 5438 | } |
| 5610 | 5439 | |
| 5611 | 5440 | /** |
| 5612 | 5441 | * Get $content_width, but with a <s>twist</s> filter. |
| @@ -5650,28 +5479,20 @@ | ||
| 5650 | 5479 | |
| 5651 | 5480 | /** |
| 5652 | 5481 | * Checks if the site is currently in an identity crisis. |
| 5653 | 5482 | * |
| 5483 | + * Now delegates to the Connection package so this matches what the heartbeat itself reports. | |
| 5484 | + * Note the package guards on `Connection\Manager::is_connected()` where this used to guard on | |
| 5485 | + * `Jetpack::is_connection_ready()`, so the `jetpack_is_connection_ready` filter no longer applies. | |
| 5486 | + * | |
| 5487 | + * @deprecated 16.2 | |
| 5488 | + * | |
| 5654 | 5489 | * @return array|bool Array of options that are in a crisis, or false if everything is OK. |
| 5655 | 5490 | */ |
| 5656 | 5491 | public static function check_identity_crisis() { |
| 5657 | - if ( ! self::is_connection_ready() || ( new Status() )->is_offline_mode() || ! Identity_Crisis::validate_sync_error_idc_option() ) { | |
| 5658 | - return false; | |
| 5659 | - } | |
| 5660 | - return Jetpack_Options::get_option( 'sync_error_idc' ); | |
| 5661 | - } | |
| 5492 | + _deprecated_function( __METHOD__, 'jetpack-16.2', 'Automattic\\Jetpack\\Identity_Crisis::check_identity_crisis' ); | |
| 5662 | 5493 | |
| 5663 | - /** | |
| 5664 | - * Checks whether the sync_error_idc option is valid or not, and if not, will do cleanup. | |
| 5665 | - * | |
| 5666 | - * @since 4.4.0 | |
| 5667 | - * @since 5.4.0 Do not call get_sync_error_idc_option() unless site is in IDC | |
| 5668 | - * | |
| 5669 | - * @return bool | |
| 5670 | - */ | |
| 5671 | - public static function validate_sync_error_idc_option() { | |
| 5672 | - _deprecated_function( __METHOD__, 'jetpack-9.8', '\\Automattic\\Jetpack\\Identity_Crisis::validate_sync_error_idc_option' ); | |
| 5673 | - return Identity_Crisis::validate_sync_error_idc_option(); | |
| 5494 | + return Identity_Crisis::check_identity_crisis(); | |
| 5674 | 5495 | } |
| 5675 | 5496 | |
| 5676 | 5497 | /** |
| 5677 | 5498 | * Normalizes a url by doing three things: |
| @@ -5695,35 +5516,8 @@ | ||
| 5695 | 5516 | return $url; |
| 5696 | 5517 | } |
| 5697 | 5518 | |
| 5698 | 5519 | /** |
| 5699 | - * Gets the value that is to be saved in the jetpack_sync_error_idc option. | |
| 5700 | - * | |
| 5701 | - * @since 4.4.0 | |
| 5702 | - * @since 5.4.0 Add transient since home/siteurl retrieved directly from DB | |
| 5703 | - * @deprecated 9.8.0 Use \\Automattic\\Jetpack\\Identity_Crisis::get_sync_error_idc_option | |
| 5704 | - * | |
| 5705 | - * @param array $response HTTP response. | |
| 5706 | - * @return array Array of the local urls, wpcom urls, and error code | |
| 5707 | - */ | |
| 5708 | - public static function get_sync_error_idc_option( $response = array() ) { | |
| 5709 | - _deprecated_function( __METHOD__, 'jetpack-9.8', '\\Automattic\\Jetpack\\Identity_Crisis::get_sync_error_idc_option' ); | |
| 5710 | - return Identity_Crisis::get_sync_error_idc_option( $response ); | |
| 5711 | - } | |
| 5712 | - | |
| 5713 | - /** | |
| 5714 | - * Returns the value of the jetpack_sync_idc_optin filter, or constant. | |
| 5715 | - * If set to true, the site will be put into staging mode. | |
| 5716 | - * | |
| 5717 | - * @since 4.3.2 | |
| 5718 | - * @return bool | |
| 5719 | - */ | |
| 5720 | - public static function sync_idc_optin() { | |
| 5721 | - _deprecated_function( __METHOD__, 'jetpack-9.8', '\\Automattic\\Jetpack\\Identity_Crisis::sync_idc_optin' ); | |
| 5722 | - return Identity_Crisis::sync_idc_optin(); | |
| 5723 | - } | |
| 5724 | - | |
| 5725 | - /** | |
| 5726 | 5520 | * Maybe Use a .min.css stylesheet, maybe not. |
| 5727 | 5521 | * |
| 5728 | 5522 | * Hooks onto `plugins_url` filter at priority 1, and accepts all 3 args. |
| 5729 | 5523 | * |
| @@ -5744,9 +5538,9 @@ | ||
| 5744 | 5538 | // Strip out the abspath. |
| 5745 | 5539 | $base = dirname( plugin_basename( $plugin ) ); |
| 5746 | 5540 | |
| 5747 | 5541 | // Short out on non-Jetpack assets. |
| 5748 | - if ( 'jetpack/' !== substr( $base, 0, 8 ) ) { | |
| 5542 | + if ( ! str_starts_with( $base, 'jetpack/' ) ) { | |
| 5749 | 5543 | return $url; |
| 5750 | 5544 | } |
| 5751 | 5545 | |
| 5752 | 5546 | // File name parsing. |
| @@ -5786,15 +5580,15 @@ | ||
| 5786 | 5580 | * |
| 5787 | 5581 | * @return mixed |
| 5788 | 5582 | */ |
| 5789 | 5583 | public static function set_suffix_on_min( $src, $handle ) { |
| 5790 | - if ( false === strpos( $src, '.min.css' ) ) { | |
| 5584 | + if ( ! is_string( $src ) || ! str_contains( $src, '.min.css' ) ) { | |
| 5791 | 5585 | return $src; |
| 5792 | 5586 | } |
| 5793 | 5587 | |
| 5794 | 5588 | if ( ! empty( self::$min_assets ) ) { |
| 5795 | 5589 | foreach ( self::$min_assets as $file => $path ) { |
| 5796 | - if ( false !== strpos( $src, $file ) ) { | |
| 5590 | + if ( str_contains( $src, $file ) ) { | |
| 5797 | 5591 | wp_style_add_data( $handle, 'suffix', '.min' ); |
| 5798 | 5592 | return $src; |
| 5799 | 5593 | } |
| 5800 | 5594 | } |
| @@ -5824,8 +5618,10 @@ | ||
| 5824 | 5618 | * |
| 5825 | 5619 | * Data passed in with the $data parameter will be available in the |
| 5826 | 5620 | * template file as $data['value'] |
| 5827 | 5621 | * |
| 5622 | + * @html-template-var array $data | |
| 5623 | + * | |
| 5828 | 5624 | * @param string $template - Template file to load. |
| 5829 | 5625 | * @param array $data - Any data to pass along to the template. |
| 5830 | 5626 | * @return boolean - If template file was found. |
| 5831 | 5627 | **/ |
| @@ -5843,8 +5639,19 @@ | ||
| 5843 | 5639 | return false; |
| 5844 | 5640 | } |
| 5845 | 5641 | |
| 5846 | 5642 | /** |
| 5643 | + * Register Jetpack-specific tests on the connection package's health test suite. | |
| 5644 | + * | |
| 5645 | + * @param \Automattic\Jetpack\Connection\Connection_Health_Tests $connection_tests The test suite instance. | |
| 5646 | + */ | |
| 5647 | + public function register_jetpack_connection_tests( $connection_tests ) { | |
| 5648 | + require_once JETPACK__PLUGIN_DIR . '_inc/lib/debugger/class-jetpack-cxn-tests.php'; | |
| 5649 | + $jetpack_tests = new Jetpack_Cxn_Tests(); | |
| 5650 | + $jetpack_tests->register_tests_on( $connection_tests ); | |
| 5651 | + } | |
| 5652 | + | |
| 5653 | + /** | |
| 5847 | 5654 | * Throws warnings for deprecated hooks to be removed from Jetpack that cannot remain in the original place in the code. |
| 5848 | 5655 | */ |
| 5849 | 5656 | public function deprecated_hooks() { |
| 5850 | 5657 | $filter_deprecated_list = array( |
| @@ -6060,8 +5867,18 @@ | ||
| 6060 | 5867 | 'jetpack_subscriptions_modal_enabled' => array( |
| 6061 | 5868 | 'replacement' => null, |
| 6062 | 5869 | 'version' => 'jetpack-12.7.0', |
| 6063 | 5870 | ), |
| 5871 | + 'jetpack_pre_connection_prompt_helpers' => array( | |
| 5872 | + 'replacement' => null, | |
| 5873 | + 'version' => 'jetpack-13.2.0', | |
| 5874 | + ), | |
| 5875 | + 'jetpack_contact_form_use_package' => array( | |
| 5876 | + 'replacement' => null, | |
| 5877 | + 'version' => 'jetpack-13.4.0', | |
| 5878 | + ), | |
| 5879 | + // jetpack_implode_frontend_css has been removed, but is not listed here. The updated behavior is exactly the only use of the filter. | |
| 5880 | + // We can reassess formally deprecating it here later; for now, it would be noise with no functional difference. | |
| 6064 | 5881 | ); |
| 6065 | 5882 | |
| 6066 | 5883 | foreach ( $filter_deprecated_list as $tag => $args ) { |
| 6067 | 5884 | if ( has_filter( $tag ) ) { |
| @@ -6164,9 +5981,9 @@ | ||
| 6164 | 5981 | foreach ( $matches as $match ) { |
| 6165 | 5982 | $url = trim( $match['path'], "'\" \t" ); |
| 6166 | 5983 | |
| 6167 | 5984 | // If this is a data url, we don't want to mess with it. |
| 6168 | - if ( 'data:' === substr( $url, 0, 5 ) ) { | |
| 5985 | + if ( str_starts_with( $url, 'data:' ) ) { | |
| 6169 | 5986 | continue; |
| 6170 | 5987 | } |
| 6171 | 5988 | |
| 6172 | 5989 | // If this is an absolute or protocol-agnostic url, |
| @@ -6192,113 +6009,8 @@ | ||
| 6192 | 6009 | return $css; |
| 6193 | 6010 | } |
| 6194 | 6011 | |
| 6195 | 6012 | /** |
| 6196 | - * This methods removes all of the registered css files on the front end | |
| 6197 | - * from Jetpack in favor of using a single file. In effect "imploding" | |
| 6198 | - * all the files into one file. | |
| 6199 | - * | |
| 6200 | - * Pros: | |
| 6201 | - * - Uses only ONE css asset connection instead of 15 | |
| 6202 | - * - Saves a minimum of 56k | |
| 6203 | - * - Reduces server load | |
| 6204 | - * - Reduces time to first painted byte | |
| 6205 | - * | |
| 6206 | - * Cons: | |
| 6207 | - * - Loads css for ALL modules. However all selectors are prefixed so it | |
| 6208 | - * should not cause any issues with themes. | |
| 6209 | - * - Plugins/themes dequeuing styles no longer do anything. See | |
| 6210 | - * jetpack_implode_frontend_css filter for a workaround | |
| 6211 | - * | |
| 6212 | - * For some situations developers may wish to disable css imploding and | |
| 6213 | - * instead operate in legacy mode where each file loads seperately and | |
| 6214 | - * can be edited individually or dequeued. This can be accomplished with | |
| 6215 | - * the following line: | |
| 6216 | - * | |
| 6217 | - * add_filter( 'jetpack_implode_frontend_css', '__return_false' ); | |
| 6218 | - * | |
| 6219 | - * @param bool $travis_test Is this a test run. | |
| 6220 | - * | |
| 6221 | - * @since 3.2 | |
| 6222 | - */ | |
| 6223 | - public function implode_frontend_css( $travis_test = false ) { | |
| 6224 | - $do_implode = true; | |
| 6225 | - if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) { | |
| 6226 | - $do_implode = false; | |
| 6227 | - } | |
| 6228 | - | |
| 6229 | - // Do not implode CSS when the page loads via the AMP plugin. | |
| 6230 | - if ( class_exists( Jetpack_AMP_Support::class ) && Jetpack_AMP_Support::is_amp_request() ) { | |
| 6231 | - $do_implode = false; | |
| 6232 | - } | |
| 6233 | - | |
| 6234 | - /** | |
| 6235 | - * Allow CSS to be concatenated into a single jetpack.css file. | |
| 6236 | - * | |
| 6237 | - * @since 3.2.0 | |
| 6238 | - * | |
| 6239 | - * @param bool $do_implode Should CSS be concatenated? Default to true. | |
| 6240 | - */ | |
| 6241 | - $do_implode = apply_filters( 'jetpack_implode_frontend_css', $do_implode ); | |
| 6242 | - | |
| 6243 | - // Do not use the imploded file when default behavior was altered through the filter. | |
| 6244 | - if ( ! $do_implode ) { | |
| 6245 | - return; | |
| 6246 | - } | |
| 6247 | - | |
| 6248 | - // We do not want to use the imploded file in dev mode, or if not connected. | |
| 6249 | - if ( ( new Status() )->is_offline_mode() || ! self::is_connection_ready() ) { | |
| 6250 | - if ( ! $travis_test ) { | |
| 6251 | - return; | |
| 6252 | - } | |
| 6253 | - } | |
| 6254 | - | |
| 6255 | - // Do not use the imploded file if sharing css was dequeued via the sharing settings screen. | |
| 6256 | - if ( get_option( 'sharedaddy_disable_resources' ) ) { | |
| 6257 | - return; | |
| 6258 | - } | |
| 6259 | - | |
| 6260 | - /* | |
| 6261 | - * Now we assume Jetpack is connected and able to serve the single | |
| 6262 | - * file. | |
| 6263 | - * | |
| 6264 | - * In the future there will be a check here to serve the file locally | |
| 6265 | - * or potentially from the Jetpack CDN | |
| 6266 | - * | |
| 6267 | - * For now: | |
| 6268 | - * - Enqueue a single imploded css file | |
| 6269 | - * - Zero out the style_loader_tag for the bundled ones | |
| 6270 | - * - Be happy, drink scotch | |
| 6271 | - */ | |
| 6272 | - | |
| 6273 | - add_filter( 'style_loader_tag', array( $this, 'concat_remove_style_loader_tag' ), 10, 2 ); | |
| 6274 | - | |
| 6275 | - $version = self::is_development_version() ? filemtime( JETPACK__PLUGIN_DIR . 'css/jetpack.css' ) : JETPACK__VERSION; | |
| 6276 | - | |
| 6277 | - wp_enqueue_style( 'jetpack_css', plugins_url( 'css/jetpack.css', __FILE__ ), array(), $version ); | |
| 6278 | - wp_style_add_data( 'jetpack_css', 'rtl', 'replace' ); | |
| 6279 | - } | |
| 6280 | - | |
| 6281 | - /** | |
| 6282 | - * Removes styles that are part of concatenated group. | |
| 6283 | - * | |
| 6284 | - * @param string $tag Style tag. | |
| 6285 | - * @param string $handle Style handle. | |
| 6286 | - * | |
| 6287 | - * @return string | |
| 6288 | - */ | |
| 6289 | - public function concat_remove_style_loader_tag( $tag, $handle ) { | |
| 6290 | - if ( in_array( $handle, $this->concatenated_style_handles, true ) ) { | |
| 6291 | - $tag = ''; | |
| 6292 | - if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) { | |
| 6293 | - $tag = '<!-- `' . esc_html( $handle ) . "` is included in the concatenated jetpack.css -->\r\n"; | |
| 6294 | - } | |
| 6295 | - } | |
| 6296 | - | |
| 6297 | - return $tag; | |
| 6298 | - } | |
| 6299 | - | |
| 6300 | - /** | |
| 6301 | 6013 | * Check the heartbeat data |
| 6302 | 6014 | * |
| 6303 | 6015 | * Organizes the heartbeat data by severity. For example, if the site |
| 6304 | 6016 | * is in an ID crisis, it will be in the $filtered_data['bad'] array. |
| @@ -6310,9 +6022,23 @@ | ||
| 6310 | 6022 | * |
| 6311 | 6023 | * $return array $filtered_data |
| 6312 | 6024 | */ |
| 6313 | 6025 | public static function jetpack_check_heartbeat_data() { |
| 6314 | - $raw_data = Jetpack_Heartbeat::generate_stats_array(); | |
| 6026 | + /* | |
| 6027 | + * Site environment stats (incl. wp-version/php-version checked below) now live in the Connection package, | |
| 6028 | + * and the IDC stat is contributed by the Connection package's `jetpack_heartbeat_stats_array` filter | |
| 6029 | + * callback. We rebuild the stat here rather than running that filter: the filter's callbacks have side | |
| 6030 | + * effects (Connection\Manager::add_stats_to_heartbeat() consumes and deletes the `xmlrpc_errors` option) | |
| 6031 | + * and return non-scalar values, neither of which is appropriate for this read-only diagnostic. | |
| 6032 | + */ | |
| 6033 | + $env_stats = method_exists( Heartbeat::class, 'get_environment_stats' ) | |
| 6034 | + ? Heartbeat::get_environment_stats() | |
| 6035 | + : array(); | |
| 6036 | + $raw_data = array_merge( | |
| 6037 | + Jetpack_Heartbeat::generate_stats_array(), | |
| 6038 | + $env_stats, | |
| 6039 | + array( 'identitycrisis' => Identity_Crisis::check_identity_crisis() ? 'yes' : 'no' ) | |
| 6040 | + ); | |
| 6315 | 6041 | |
| 6316 | 6042 | $good = array(); |
| 6317 | 6043 | $caution = array(); |
| 6318 | 6044 | $bad = array(); |
| @@ -6378,23 +6104,8 @@ | ||
| 6378 | 6104 | return Jetpack_Options::get_options_for_reset(); |
| 6379 | 6105 | } |
| 6380 | 6106 | |
| 6381 | 6107 | /** |
| 6382 | - * Strip http:// or https:// from a url, replaces forward slash with ::, | |
| 6383 | - * so we can bring them directly to their site in calypso. | |
| 6384 | - * | |
| 6385 | - * @deprecated 9.2.0 Use Automattic\Jetpack\Status::get_site_suffix | |
| 6386 | - * | |
| 6387 | - * @param string $url URL. | |
| 6388 | - * @return string url without the guff. | |
| 6389 | - */ | |
| 6390 | - public static function build_raw_urls( $url ) { | |
| 6391 | - _deprecated_function( __METHOD__, 'jetpack-9.2.0', 'Automattic\Jetpack\Status::get_site_suffix' ); | |
| 6392 | - | |
| 6393 | - return ( new Status() )->get_site_suffix( $url ); | |
| 6394 | - } | |
| 6395 | - | |
| 6396 | - /** | |
| 6397 | 6108 | * Get the user's meta box order. |
| 6398 | 6109 | * |
| 6399 | 6110 | * @param array $sorted Value for the user's option. |
| 6400 | 6111 | * @return mixed |
| @@ -6404,9 +6115,9 @@ | ||
| 6404 | 6115 | return $sorted; |
| 6405 | 6116 | } |
| 6406 | 6117 | |
| 6407 | 6118 | foreach ( $sorted as $box_context => $ids ) { |
| 6408 | - if ( false === strpos( $ids, 'dashboard_stats' ) ) { | |
| 6119 | + if ( ! str_contains( $ids, 'dashboard_stats' ) ) { | |
| 6409 | 6120 | // If the old id isn't anywhere in the ids, don't bother exploding and fail out. |
| 6410 | 6121 | continue; |
| 6411 | 6122 | } |
| 6412 | 6123 | |
| @@ -6423,68 +6134,9 @@ | ||
| 6423 | 6134 | } |
| 6424 | 6135 | |
| 6425 | 6136 | return $sorted; |
| 6426 | 6137 | } |
| 6427 | - | |
| 6428 | 6138 | /** |
| 6429 | - * Adds a "blank" column in the user admin table to display indication of user connection. | |
| 6430 | - * | |
| 6431 | - * @param array $columns User list table columns. | |
| 6432 | - * | |
| 6433 | - * @return array | |
| 6434 | - */ | |
| 6435 | - public function jetpack_icon_user_connected( $columns ) { | |
| 6436 | - $columns['user_jetpack'] = ''; | |
| 6437 | - return $columns; | |
| 6438 | - } | |
| 6439 | - | |
| 6440 | - /** | |
| 6441 | - * Show Jetpack icon if the user is linked. | |
| 6442 | - * | |
| 6443 | - * @param string $val HTML for the icon. | |
| 6444 | - * @param string $col User list table column. | |
| 6445 | - * @param int $user_id User ID. | |
| 6446 | - * | |
| 6447 | - * @return string | |
| 6448 | - */ | |
| 6449 | - public function jetpack_show_user_connected_icon( $val, $col, $user_id ) { | |
| 6450 | - if ( 'user_jetpack' === $col && self::connection()->is_user_connected( $user_id ) ) { | |
| 6451 | - $jetpack_logo = new Jetpack_Logo(); | |
| 6452 | - $emblem_html = sprintf( | |
| 6453 | - '<a title="%1$s" class="jp-emblem-user-admin">%2$s</a>', | |
| 6454 | - esc_attr__( 'This user is linked and ready to fly with Jetpack.', 'jetpack' ), | |
| 6455 | - $jetpack_logo->get_jp_emblem() | |
| 6456 | - ); | |
| 6457 | - return $emblem_html; | |
| 6458 | - } | |
| 6459 | - | |
| 6460 | - return $val; | |
| 6461 | - } | |
| 6462 | - | |
| 6463 | - /** | |
| 6464 | - * Style the Jetpack user column | |
| 6465 | - */ | |
| 6466 | - public function jetpack_user_col_style() { | |
| 6467 | - global $current_screen; | |
| 6468 | - if ( ! empty( $current_screen->base ) && 'users' === $current_screen->base ) { | |
| 6469 | - ?> | |
| 6470 | - <style> | |
| 6471 | - .fixed .column-user_jetpack { | |
| 6472 | - width: 21px; | |
| 6473 | - } | |
| 6474 | - .jp-emblem-user-admin svg { | |
| 6475 | - width: 20px; | |
| 6476 | - height: 20px; | |
| 6477 | - } | |
| 6478 | - .jp-emblem-user-admin path { | |
| 6479 | - fill: #069e08; | |
| 6480 | - } | |
| 6481 | - </style> | |
| 6482 | - <?php | |
| 6483 | - } | |
| 6484 | - } | |
| 6485 | - | |
| 6486 | - /** | |
| 6487 | 6139 | * Checks if Akismet is active and working. |
| 6488 | 6140 | * |
| 6489 | 6141 | * We dropped support for Akismet 3.0 with Jetpack 6.1.1 while introducing a check for an Akismet valid key |
| 6490 | 6142 | * that implied usage of methods present since more recent version. |
| @@ -6645,13 +6297,20 @@ | ||
| 6645 | 6297 | } |
| 6646 | 6298 | } |
| 6647 | 6299 | |
| 6648 | 6300 | /** |
| 6649 | - * Returns a boolean for whether backups UI should be displayed or not. | |
| 6301 | + * Whether UI for backups should be displayed. | |
| 6650 | 6302 | * |
| 6303 | + * On WPCom platforms this is gated on the backups-self-serve site feature. | |
| 6304 | + * On self-hosted Jetpack sites it falls back to the jetpack_show_backups filter. | |
| 6305 | + * | |
| 6651 | 6306 | * @return bool Should backups UI be displayed? |
| 6652 | 6307 | */ |
| 6653 | 6308 | public static function show_backups_ui() { |
| 6309 | + if ( ( new \Automattic\Jetpack\Status\Host() )->is_wpcom_platform() ) { | |
| 6310 | + return function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( 'backups-self-serve' ); | |
| 6311 | + } | |
| 6312 | + | |
| 6654 | 6313 | /** |
| 6655 | 6314 | * Whether UI for backups should be displayed. |
| 6656 | 6315 | * |
| 6657 | 6316 | * @since 6.5.0 |
| @@ -6661,8 +6320,24 @@ | ||
| 6661 | 6320 | return self::is_plugin_active( 'vaultpress/vaultpress.php' ) || apply_filters( 'jetpack_show_backups', true ); |
| 6662 | 6321 | } |
| 6663 | 6322 | |
| 6664 | 6323 | /** |
| 6324 | + * Whether UI for security scanning should be displayed. | |
| 6325 | + * | |
| 6326 | + * On WPCom platforms this is gated on the scan-self-serve site feature. | |
| 6327 | + * On self-hosted Jetpack sites it always returns true. | |
| 6328 | + * | |
| 6329 | + * @return bool Should scan UI be displayed? | |
| 6330 | + */ | |
| 6331 | + public static function show_scan_ui() { | |
| 6332 | + if ( ( new \Automattic\Jetpack\Status\Host() )->is_wpcom_platform() ) { | |
| 6333 | + return function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( 'scan-self-serve' ); | |
| 6334 | + } | |
| 6335 | + | |
| 6336 | + return true; | |
| 6337 | + } | |
| 6338 | + | |
| 6339 | + /** | |
| 6665 | 6340 | * Clean leftoveruser meta. |
| 6666 | 6341 | * |
| 6667 | 6342 | * Delete Jetpack-related user meta when it is no longer needed. |
| 6668 | 6343 | * |
| @@ -6734,8 +6409,40 @@ | ||
| 6734 | 6409 | 'url' => Redirect::get_url( 'jetpack-faq-backup-disclaimer' ), |
| 6735 | 6410 | ), |
| 6736 | 6411 | ); |
| 6737 | 6412 | |
| 6413 | + $products['creator'] = array( | |
| 6414 | + 'title' => __( 'Jetpack Creator', 'jetpack' ), | |
| 6415 | + 'slug' => 'jetpack_creator_yearly', | |
| 6416 | + 'description' => __( 'Craft stunning content, boost your subscriber base, and monetize your online presence.', 'jetpack' ), | |
| 6417 | + 'show_promotion' => true, | |
| 6418 | + 'discount_percent' => 50, | |
| 6419 | + 'included_in_plans' => array( 'complete' ), | |
| 6420 | + 'features' => array( | |
| 6421 | + _x( 'Unlimited subscriber imports', 'Creator Product Feature', 'jetpack' ), | |
| 6422 | + _x( 'Earn more from your content', 'Creator Product Feature', 'jetpack' ), | |
| 6423 | + _x( 'Accept payments with PayPal', 'Creator Product Feature', 'jetpack' ), | |
| 6424 | + _x( 'Increase earnings with WordAds', 'Creator Product Feature', 'jetpack' ), | |
| 6425 | + ), | |
| 6426 | + ); | |
| 6427 | + | |
| 6428 | + $products['growth'] = array( | |
| 6429 | + 'title' => __( 'Jetpack Growth', 'jetpack' ), | |
| 6430 | + 'slug' => 'jetpack_growth_yearly', | |
| 6431 | + 'description' => __( 'Essential tools to help you grow your audience, track visitor engagement, and turn leads into loyal customers and advocates.', 'jetpack' ), | |
| 6432 | + 'show_promotion' => true, | |
| 6433 | + 'discount_percent' => 50, | |
| 6434 | + 'included_in_plans' => array( 'complete' ), | |
| 6435 | + 'features' => array( | |
| 6436 | + _x( 'Jetpack Social', 'Growth Product Feature', 'jetpack' ), | |
| 6437 | + _x( 'Jetpack Stats (10K site views, upgradeable)', 'Growth Product Feature', 'jetpack' ), | |
| 6438 | + _x( 'Unlimited subscriber imports', 'Growth Product Feature', 'jetpack' ), | |
| 6439 | + _x( 'Earn more from your content', 'Growth Product Feature', 'jetpack' ), | |
| 6440 | + _x( 'Accept payments with PayPal', 'Growth Product Feature', 'jetpack' ), | |
| 6441 | + _x( 'Increase earnings with WordAds', 'Growth Product Feature', 'jetpack' ), | |
| 6442 | + ), | |
| 6443 | + ); | |
| 6444 | + | |
| 6738 | 6445 | $products['scan'] = array( |
| 6739 | 6446 | 'title' => __( 'Jetpack Scan', 'jetpack' ), |
| 6740 | 6447 | 'slug' => 'jetpack_scan', |
| 6741 | 6448 | 'description' => __( 'Automatic scanning and one-click fixes keep your site one step ahead of security threats and malware.', 'jetpack' ), |
| @@ -6859,6 +6566,108 @@ | ||
| 6859 | 6566 | return false; |
| 6860 | 6567 | } |
| 6861 | 6568 | |
| 6862 | 6569 | return true; |
| 6570 | + } | |
| 6571 | + | |
| 6572 | + /** | |
| 6573 | + * Add 5-star review link on the Jetpack Plugin meta, in the plugins list table (on the plugins page). | |
| 6574 | + * | |
| 6575 | + * @param array $plugin_meta An array of the plugin's metadata. | |
| 6576 | + * @param string $plugin_file Path to the plugin file. | |
| 6577 | + * | |
| 6578 | + * @return array $plugin_meta An array of the plugin's metadata. | |
| 6579 | + */ | |
| 6580 | + public function add_5_star_review_link( $plugin_meta, $plugin_file ) { | |
| 6581 | + if ( $plugin_file !== 'jetpack/jetpack.php' ) { | |
| 6582 | + return $plugin_meta; | |
| 6583 | + } | |
| 6584 | + | |
| 6585 | + $u = get_current_user_id(); | |
| 6586 | + $site = get_site_url(); | |
| 6587 | + | |
| 6588 | + $plugin_meta[] = '<a href="https://jetpack.com/redirect?source=jetpack-plugin-review&site=' . esc_attr( $site ) . '&u=' . esc_attr( $u ) . '" target="_blank" rel="noopener noreferrer" title="' . esc_attr__( 'Rate Jetpack on WordPress.org', 'jetpack' ) . '" style="color: #ffb900">' | |
| 6589 | + . str_repeat( '<span class="dashicons dashicons-star-filled" style="font-size: 16px; width:16px; height: 16px"></span>', 5 ) | |
| 6590 | + . '</a>'; | |
| 6591 | + | |
| 6592 | + return $plugin_meta; | |
| 6593 | + } | |
| 6594 | + | |
| 6595 | + /** | |
| 6596 | + * Lazy instantiation of the Plugin_Tracking object. | |
| 6597 | + * | |
| 6598 | + * @since 13.9 | |
| 6599 | + * | |
| 6600 | + * @return void | |
| 6601 | + */ | |
| 6602 | + public function initialize_tracking() { | |
| 6603 | + if ( did_action( 'jetpack_initialize_tracking' ) > 1 ) { | |
| 6604 | + // Only need to run once. | |
| 6605 | + return; | |
| 6606 | + } | |
| 6607 | + | |
| 6608 | + if ( ( new Tracking( 'jetpack', $this->connection_manager ) )->should_enable_tracking( new Terms_Of_Service(), new Status() ) || static::is_connection_ready() ) { | |
| 6609 | + ( new Plugin_Tracking() )->init(); | |
| 6610 | + } | |
| 6611 | + } | |
| 6612 | + | |
| 6613 | + /** | |
| 6614 | + * Run the "initialize tracking" hook. | |
| 6615 | + * | |
| 6616 | + * @since 13.9 | |
| 6617 | + */ | |
| 6618 | + public function run_initialize_tracking_action() { | |
| 6619 | + /** | |
| 6620 | + * Fires when the tracking needs to be initialized. | |
| 6621 | + * Doesn't necessarily mean that will actually happen, depends if the 'jetpack_tos_agreed' option is set. | |
| 6622 | + * | |
| 6623 | + * @since 13.9 | |
| 6624 | + */ | |
| 6625 | + do_action( 'jetpack_initialize_tracking' ); | |
| 6626 | + } | |
| 6627 | + | |
| 6628 | + /** | |
| 6629 | + * Initialize REST jsonAPI if needed. | |
| 6630 | + * | |
| 6631 | + * @return void | |
| 6632 | + */ | |
| 6633 | + public function maybe_initialize_rest_jsonapi() { | |
| 6634 | + // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 6635 | + if ( ! empty( $_GET['jsonapi'] ) && ( ! defined( 'IS_WPCOM' ) || ! IS_WPCOM ) ) { | |
| 6636 | + require_once ABSPATH . 'wp-admin/includes/admin.php'; // JSON API relies on WP functionality not autoloaded in REST. | |
| 6637 | + | |
| 6638 | + define( 'WPCOM_JSON_API__BASE', 'public-api.wordpress.com/rest/v1' ); | |
| 6639 | + require_once JETPACK__PLUGIN_DIR . 'class.json-api-endpoints.php'; | |
| 6640 | + } | |
| 6641 | + } | |
| 6642 | + | |
| 6643 | + /** | |
| 6644 | + * Run plugin post-activation actions if we need to. | |
| 6645 | + * | |
| 6646 | + * @return void | |
| 6647 | + */ | |
| 6648 | + private function plugin_post_activation() { | |
| 6649 | + if ( ( new Status() )->is_offline_mode() ) { | |
| 6650 | + return; | |
| 6651 | + } | |
| 6652 | + | |
| 6653 | + if ( get_transient( 'activated_jetpack' ) ) { | |
| 6654 | + delete_transient( 'activated_jetpack' ); | |
| 6655 | + | |
| 6656 | + if ( ( new Host() )->is_woa_site() ) { | |
| 6657 | + $redirect_url = static::admin_url( 'page=jetpack' ); | |
| 6658 | + } elseif ( is_network_admin() ) { | |
| 6659 | + $redirect_url = admin_url( 'network/admin.php?page=jetpack' ); | |
| 6660 | + } elseif ( get_transient( 'my_jetpack_product_activated' ) ) { | |
| 6661 | + // don't redirect if this is an activation that just came from My Jetpack | |
| 6662 | + // My Jetpack has its own set of post-activation redirects | |
| 6663 | + return; | |
| 6664 | + } elseif ( My_Jetpack_Initializer::should_initialize() ) { | |
| 6665 | + $redirect_url = static::admin_url( 'page=my-jetpack' ); | |
| 6666 | + } else { | |
| 6667 | + $redirect_url = static::admin_url( 'page=jetpack' ); | |
| 6668 | + } | |
| 6669 | + | |
| 6670 | + wp_safe_redirect( $redirect_url ); | |
| 6671 | + } | |
| 6863 | 6672 | } |
| 6864 | 6673 | } |
