← All changes | class.jetpack.php +841 -531 13.5.2 → 16.3-a.7 View file →

		@@ -21,16 +21,24 @@
21	21	use Automattic\Jetpack\CookieState;
22	22	use Automattic\Jetpack\Current_Plan as Jetpack_Plan;
23	23	use Automattic\Jetpack\Device_Detection\User_Agent_Info;
24	24	use Automattic\Jetpack\Errors;
	25	+use Automattic\Jetpack\Feature_Policy;
25	26	use Automattic\Jetpack\Files;
	27	+use Automattic\Jetpack\Heartbeat;
26	28	use Automattic\Jetpack\Identity_Crisis;
	29	+use Automattic\Jetpack\Import\Main as Import_Main;
27	30	use Automattic\Jetpack\Licensing;
28	31	use Automattic\Jetpack\Modules;
29	32	use Automattic\Jetpack\My_Jetpack\Initializer as My_Jetpack_Initializer;
	33	+use Automattic\Jetpack\Newsletter\Reader_Link;
30	34	use Automattic\Jetpack\Paths;
	35	+use Automattic\Jetpack\Plugin\Deprecate;
31	36	use Automattic\Jetpack\Plugin\Tracking as Plugin_Tracking;
	37	+use Automattic\Jetpack\Podcast\Podcast;
32	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;
33	41	use Automattic\Jetpack\Status;
34	42	use Automattic\Jetpack\Status\Host;
35	43	use Automattic\Jetpack\Status\Visitor;
36	44	use Automattic\Jetpack\Sync\Actions as Sync_Actions;
		@@ -37,9 +45,14 @@
37	45	use Automattic\Jetpack\Sync\Health;
38	46	use Automattic\Jetpack\Sync\Sender;
39	47	use Automattic\Jetpack\Terms_Of_Service;
40	48	use Automattic\Jetpack\Tracking;
	49	+use Automattic\Woocommerce_Analytics;
41	50
	51	+if ( ! defined( 'ABSPATH' ) ) {
	52	+ exit( 0 );
	53	+}
	54	+
42	55	/*
43	56	Options:
44	57	jetpack_options (array)
45	58	An array of options.
		@@ -74,75 +87,8 @@
74	87	*/
75	88	public $xmlrpc_server = null;
76	89
77	90	/**
78		- * List of Jetpack modules that have CSS that gets concatenated into jetpack.css.
79		- *
80		- * See $concatenated_style_handles for the list of handles,
81		- * and the implode_frontend_css method for more details.
82		- *
83		- * When updating this list, make sure to update $concatenated_style_handles as well.
84		- *
85		- * @var array List of Jetpack modules.
86		- */
87		- public $modules_with_concatenated_css = array(
88		- 'carousel',
89		- 'contact-form',
90		- 'infinite-scroll',
91		- 'likes',
92		- 'related-posts',
93		- 'sharedaddy',
94		- 'shortcodes',
95		- 'subscriptions',
96		- 'tiled-gallery',
97		- 'widgets',
98		- );
99		-
100		- /**
101		- * The handles of styles that are concatenated into jetpack.css.
102		- *
103		- * When making changes to that list,
104		- * you must also update concat_list in tools/webpack.config.css.js,
105		- * and to $modules_with_concatenated_css if necessary.
106		- *
107		- * @var array The handles of styles that are concatenated into jetpack.css.
108		- */
109		- public $concatenated_style_handles = array(
110		- 'jetpack-carousel-swiper-css',
111		- 'jetpack-carousel',
112		- 'grunion.css',
113		- 'the-neverending-homepage',
114		- 'jetpack_likes',
115		- 'jetpack_related-posts',
116		- 'sharedaddy',
117		- 'jetpack-slideshow',
118		- 'presentations',
119		- 'quiz',
120		- 'jetpack-subscriptions',
121		- 'jetpack-responsive-videos',
122		- 'jetpack-social-menu',
123		- 'tiled-gallery',
124		- 'jetpack_display_posts_widget',
125		- 'gravatar-profile-widget',
126		- 'goodreads-widget',
127		- 'jetpack_social_media_icons_widget',
128		- 'jetpack-top-posts-widget',
129		- 'jetpack_image_widget',
130		- 'jetpack-my-community-widget',
131		- 'jetpack-authors-widget',
132		- 'wordads',
133		- 'eu-cookie-law-style',
134		- 'flickr-widget-style',
135		- 'jetpack-search-widget',
136		- 'jetpack-simple-payments-widget-style',
137		- 'jetpack-widget-social-icons-styles',
138		- 'wpcom_instagram_widget',
139		- 'milestone-widget',
140		- 'subscribe-modal-css',
141		- 'subscribe-overlay-css',
142		- );
143		-
144		- /**
145	91	* Contains all assets that have had their URL rewritten to minified versions.
146	92	*
147	93	* @var array
148	94	*/
		@@ -157,11 +103,8 @@
157	103	'contact-form' => array(
158	104	array( 'grunion-contact-form/grunion-contact-form.php', 'Grunion Contact Form' ),
159	105	array( 'mullet/mullet-contact-form.php', 'Mullet Contact Form' ),
160	106	),
161		- 'custom-css' => array(
162		- array( 'safecss/safecss.php', 'WordPress.com Custom CSS' ),
163		- ),
164	107	'gravatar-hovercards' => array(
165	108	array( 'jetpack-gravatar-hovercards/gravatar-hovercards.php', 'Jetpack Gravatar Hovercards' ),
166	109	),
167	110	'latex' => array(
		@@ -332,9 +275,8 @@
332	275	* Graph tags via filter when their Social Meta modules are active:
333	276	*
334	277	* - All in One SEO Pack, All in one SEO Pack Pro
335	278	* - WordPress SEO by Yoast, WordPress SEO Premium by Yoast
336		- * - SEOPress, SEOPress Pro
337	279	*
338	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:
339	281	* add_filter( 'jetpack_enable_open_graph', '__return_false' );
340	282	*
		@@ -377,8 +319,10 @@
377	319	'wp-caregiver/wp-caregiver.php', // WP Caregiver.
378	320	'wp-facebook-like-send-open-graph-meta/wp-facebook-like-send-open-graph-meta.php', // WP Facebook Like Send & Open Graph Meta.
379	321	'wp-facebook-open-graph-protocol/wp-facebook-ogp.php', // WP Facebook Open Graph protocol.
380	322	'wp-ogp/wp-ogp.php', // WP-OGP.
	323	+ 'wp-seopress/seopress.php', // SEOPress.
	324	+ 'wp-seopress-pro/seopress-pro.php', // SEOPress Pro.
381	325	'zoltonorg-social-plugin/zosp.php', // Zolton.org Social Plugin.
382	326	'wp-fb-share-like-button/wp_fb_share-like_widget.php', // WP Facebook Like Button.
383	327	'open-graph-metabox/open-graph-metabox.php', // Open Graph Metabox.
384	328	'seo-by-rank-math/rank-math.php', // Rank Math.
		@@ -489,8 +433,16 @@
489	433	*/
490	434	public static $instance = false;
491	435
492	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	+ /**
493	445	* Singleton
494	446	*
495	447	* @static
496	448	*/
		@@ -530,9 +482,9 @@
530	482	if ( array_diff( $unfiltered_modules, $modules ) ) {
531	483	self::update_active_modules( $modules );
532	484	}
533	485
534		- add_action( 'init', array( __CLASS__, 'activate_new_modules' ) );
	486	+ self::register_upgrade_init_hooks();
535	487
536	488	// Upgrade to 4.3.0.
537	489	if ( Jetpack_Options::get_option( 'identity_crisis_whitelist' ) ) {
538	490	Jetpack_Options::delete_option( 'identity_crisis_whitelist' );
		@@ -587,8 +539,16 @@
587	539	Jetpack_Options::delete_option( 'autoupdate_plugins' );
588	540	} // Should we have some type of fallback if something fails here?
589	541	}
590	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	+
591	551	if ( did_action( 'wp_loaded' ) ) {
592	552	self::upgrade_on_load();
593	553	} else {
594	554	add_action(
		@@ -622,9 +582,8 @@
622	582	}
623	583
624	584	if (
625	585	class_exists( 'Jetpack_Sitemap_Manager' )
626		- && version_compare( JETPACK__VERSION, '5.3', '>=' )
627	586	) {
628	587	do_action( 'jetpack_sitemaps_purge_data' );
629	588	}
630	589
		@@ -695,35 +654,15 @@
695	654	add_action( 'network_plugin_loaded', array( $this, 'add_configure_hook' ), 90 );
696	655	add_action( 'mu_plugin_loaded', array( $this, 'add_configure_hook' ), 90 );
697	656	add_action( 'plugins_loaded', array( $this, 'late_initialization' ), 90 );
698	657
699		- add_action( 'jetpack_verify_signature_error', array( $this, 'track_xmlrpc_error' ) );
700		-
701		- add_filter(
702		- 'jetpack_signature_check_token',
703		- array( __CLASS__, 'verify_onboarding_token' ),
704		- 10,
705		- 3
706		- );
707		-
708	658	/**
709	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.
710	663	*/
711	664	require_once JETPACK__PLUGIN_DIR . 'class.jetpack-gutenberg.php';
712		- add_action( 'plugins_loaded', array( 'Jetpack_Gutenberg', 'load_independent_blocks' ) );
713		- add_action( 'plugins_loaded', array( 'Jetpack_Gutenberg', 'load_block_editor_extensions' ), 9 );
714		- /**
715		- * 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.
716		- *
717		- * 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.
718		- */
719		- if ( is_admin() ) {
720		- add_action( 'enqueue_block_assets', array( 'Jetpack_Gutenberg', 'enqueue_block_editor_assets' ) );
721		- } else {
722		- add_action( 'enqueue_block_editor_assets', array( 'Jetpack_Gutenberg', 'enqueue_block_editor_assets' ) );
723		- }
724		- add_filter( 'render_block', array( 'Jetpack_Gutenberg', 'display_deprecated_block_message' ), 10, 2 );
725		-
726	665	add_action( 'set_user_role', array( $this, 'maybe_clear_other_linked_admins_transient' ), 10, 3 );
727	666
728	667	add_action( 'jetpack_event_log', array( 'Jetpack', 'log' ), 10, 2 );
729	668
		@@ -732,8 +671,13 @@
732	671
733	672	// Set up the REST authentication hooks.
734	673	Connection_Rest_Authentication::init();
735	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	+
736	680	add_action( 'admin_init', array( $this, 'admin_init' ) );
737	681	add_action( 'admin_init', array( $this, 'dismiss_jetpack_notice' ) );
738	682
739	683	add_filter( 'admin_body_class', array( $this, 'admin_body_class' ), 20 );
		@@ -766,25 +710,8 @@
766	710
767	711	add_filter( 'jetpack_get_default_modules', array( $this, 'filter_default_modules' ) );
768	712	add_filter( 'jetpack_get_default_modules', array( $this, 'handle_deprecated_modules' ), 99 );
769	713
770		- /*
771		- * If enabled, point edit post, page, and comment links to Calypso instead of WP-Admin.
772		- * We should make sure to only do this for front end links.
773		- */
774		- if ( self::get_option( 'edit_links_calypso_redirect' ) && ! is_admin() ) {
775		- add_filter( 'get_edit_post_link', array( $this, 'point_edit_post_links_to_calypso' ), 1, 2 );
776		- add_filter( 'get_edit_comment_link', array( $this, 'point_edit_comment_links_to_calypso' ), 1 );
777		-
778		- /*
779		- * We'll shortcircuit wp_notify_postauthor and wp_notify_moderator pluggable functions
780		- * so they point moderation links on emails to Calypso.
781		- */
782		- require_once JETPACK__PLUGIN_DIR . '_inc/lib/functions.wp-notify.php';
783		- add_filter( 'comment_notification_recipients', 'jetpack_notify_postauthor', 1, 2 );
784		- add_filter( 'notify_moderator', 'jetpack_notify_moderator', 1, 2 );
785		- }
786		-
787	714	add_action(
788	715	'plugins_loaded',
789	716	function () {
790	717	if ( User_Agent_Info::is_mobile_app() ) {
		@@ -795,18 +722,10 @@
795	722
796	723	// Update the site's Jetpack plan and products from API on heartbeats.
797	724	add_action( 'jetpack_heartbeat', array( Jetpack_Plan::class, 'refresh_from_wpcom' ) );
798	725
799		- /**
800		- * This is the hack to concatenate all css files into one.
801		- * For description and reasoning see the implode_frontend_css method.
802		- *
803		- * Super late priority so we catch all the registered styles.
804		- */
805		- if ( ! is_admin() ) {
806		- add_action( 'wp_print_styles', array( $this, 'implode_frontend_css' ), -1 ); // Run first.
807		- add_action( 'wp_print_footer_scripts', array( $this, 'implode_frontend_css' ), -1 ); // Run first to trigger before `print_late_styles`.
808		- }
	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' ) );
809	728
810	729	// Actually push the stats on shutdown.
811	730	if ( ! has_action( 'shutdown', array( $this, 'push_stats' ) ) ) {
812	731	add_action( 'shutdown', array( $this, 'push_stats' ) );
		@@ -814,8 +733,10 @@
814	733
815	734	// After a successful connection.
816	735	add_action( 'jetpack_site_registered', array( $this, 'activate_default_modules_on_site_register' ) );
817	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' ) );
818	739
819	740	// Actions for Manager::authorize().
820	741	add_action( 'jetpack_authorize_starting', array( $this, 'authorize_starting' ) );
821	742	add_action( 'jetpack_authorize_ending_linked', array( $this, 'authorize_ending_linked' ) );
		@@ -855,16 +776,180 @@
855	776
856	777	// Register product descriptions for partner coupon usage.
857	778	add_filter( 'jetpack_partner_coupon_products', array( $this, 'get_partner_coupon_product_descriptions' ) );
858	779
859		- // Actions for conditional recommendations.
860		- add_action( 'plugins_loaded', array( 'Jetpack_Recommendations', 'init_conditional_recommendation_actions' ) );
861		-
862	780	// Add 5-star
863	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();
864	791	}
865	792
866	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	+ * Enable the bundled Backup dashboard.
	844	+ *
	845	+ * The standalone plugin initializes the package first, so with both active this is a no-op.
	846	+ *
	847	+ * @return void
	848	+ */
	849	+ public static function configure_backup_package() {
	850	+ // Not offered on multisite, which the Backup package does not support, or without a
	851	+ // connected owner, since buying and managing backups needs a linked account.
	852	+ if ( is_multisite() || ! self::is_connection_ready() || ! self::connection()->has_connected_owner() ) {
	853	+ return;
	854	+ }
	855	+
	856	+ /**
	857	+ * Filters whether the Jetpack plugin offers its bundled Backup dashboard.
	858	+ *
	859	+ * Resolved at the earliest `plugins_loaded` priority, so hook it from a mu-plugin.
	860	+ *
	861	+ * @since 16.3
	862	+ *
	863	+ * @param bool $enabled Whether to initialize the bundled Backup dashboard. Default true.
	864	+ */
	865	+ if ( ! apply_filters( 'jetpack_backup_dashboard_enabled', true ) ) {
	866	+ return;
	867	+ }
	868	+
	869	+ $backup = 'Automattic\\Jetpack\\Backup\\V0005\\Jetpack_Backup';
	870	+
	871	+ // An older package would take over the connection (see Jetpack_Backup::DEFAULT_INIT_OPTIONS);
	872	+ // only the standalone plugin ships one that old, and it draws its own menu.
	873	+ if ( ! class_exists( $backup ) || ! defined( $backup . '::DEFAULT_INIT_OPTIONS' ) ) {
	874	+ return;
	875	+ }
	876	+
	877	+ $backup::initialize( array( 'manage_connection' => false ) );
	878	+ }
	879	+
	880	+ /**
	881	+ * Whether the bundled Stats v2 dashboard is enabled.
	882	+ *
	883	+ * Stats v2 (formerly "Premium Analytics") ships with the plugin behind this
	884	+ * flag while it rolls out (WOOA7S-1595). When enabled it adds its own admin
	885	+ * menu alongside the existing Stats UI; it never replaces or hides the
	886	+ * legacy Stats menu, admin-bar entries, post-list column, or WP dashboard
	887	+ * widget. The Stats module's tracking is unaffected either way, and Stats v2
	888	+ * reads what that module collects, so while the module is off the plugin
	889	+ * answers false here before even reading the flag.
	890	+ *
	891	+ * The package has to be loadable for this to be true, so a site with the
	892	+ * flag on but a missing package answers false here and never adds the
	893	+ * Stats v2 menu (a warning is logged instead).
	894	+ *
	895	+ * @since 16.1
	896	+ *
	897	+ * @return bool
	898	+ */
	899	+ public static function is_premium_analytics_enabled() {
	900	+ if ( null !== self::$premium_analytics_enabled ) {
	901	+ return self::$premium_analytics_enabled;
	902	+ }
	903	+
	904	+ if ( ! self::is_module_active( 'stats' ) ) {
	905	+ self::$premium_analytics_enabled = false;
	906	+ return false;
	907	+ }
	908	+
	909	+ /**
	910	+ * Filters whether the bundled Premium Analytics dashboard is enabled.
	911	+ *
	912	+ * Resolved once, from `Jetpack::configure()` on `plugins_loaded`, and only
	913	+ * while the Stats module is active. Register this from a mu-plugin or a
	914	+ * plugin's main file — a callback added on `plugins_loaded` or later runs
	915	+ * too late to be seen.
	916	+ *
	917	+ * @since 16.1
	918	+ *
	919	+ * @param bool $enabled Defaults to the `jetpack_premium_analytics_enabled` option (false).
	920	+ */
	921	+ $flag = (bool) apply_filters( 'jetpack_premium_analytics_enabled', (bool) get_option( 'jetpack_premium_analytics_enabled' ) );
	922	+
	923	+ self::$premium_analytics_enabled = $flag && class_exists( 'Automattic\Jetpack\PremiumAnalytics\Analytics' );
	924	+
	925	+ if ( $flag && ! self::$premium_analytics_enabled ) {
	926	+ wp_trigger_error(
	927	+ __METHOD__,
	928	+ 'The jetpack_premium_analytics_enabled flag is on but the Premium Analytics package is not loadable; keeping the Stats UI in place.'
	929	+ );
	930	+ }
	931	+
	932	+ return self::$premium_analytics_enabled;
	933	+ }
	934	+
	935	+ /**
	936	+ * Expose the setting that turns the Premium Analytics dashboard on and off.
	937	+ *
	938	+ * Deliberately not behind is_premium_analytics_enabled(): this is the setting that flips that
	939	+ * check, so it has to answer while the dashboard is still off.
	940	+ *
	941	+ * @since 16.2
	942	+ *
	943	+ * @return void
	944	+ */
	945	+ public static function register_premium_analytics_enablement_setting() {
	946	+ if ( class_exists( 'Automattic\Jetpack\PremiumAnalytics\Enablement_Setting' ) ) {
	947	+ \Automattic\Jetpack\PremiumAnalytics\Enablement_Setting::register();
	948	+ }
	949	+ }
	950	+
	951	+ /**
867	952	* Before everything else starts getting initalized, we need to initialize Jetpack using the
868	953	* Config object.
869	954	*/
870	955	public function configure() {
		@@ -873,13 +958,10 @@
873	958	foreach (
874	959	array(
875	960	'jitm',
876	961	'sync',
	962	+ 'account_protection',
877	963	'waf',
878		- 'videopress',
879		- 'stats',
880		- 'stats_admin',
881		- 'import',
882	964	)
883	965	as $feature
884	966	) {
885	967	$config->ensure( $feature );
		@@ -884,8 +966,110 @@
884	966	) {
885	967	$config->ensure( $feature );
886	968	}
887	969
	970	+ // Enable the VideoPress admin UI (the "Jetpack > VideoPress" dashboard) inside the
	971	+ // Jetpack plugin, mirroring the standalone Jetpack VideoPress plugin. The dashboard
	972	+ // only renders when the VideoPress module is active (Status::is_active()); when it
	973	+ // is not, the menu item links to the My Jetpack interstitial to activate it.
	974	+ $config->ensure( 'videopress', array( 'admin_ui' => true ) );
	975	+
	976	+ // The Backup dashboard is only an admin menu and REST routes, so it is deferred like Import below.
	977	+ if ( self::should_eager_load_packages() ) {
	978	+ self::configure_backup_package();
	979	+ } else {
	980	+ add_action( 'rest_api_init', array( __CLASS__, 'configure_backup_package' ), 0 );
	981	+ }
	982	+
	983	+ /*
	984	+ * The Import package only registers `jetpack/v4/import` REST routes — it
	985	+ * does nothing when rendering a front-end page — so gate its `ensure()`
	986	+ * to keep its PHP out of opcache on the front-end GET hot path. It still
	987	+ * loads on admin, cron, POST, and WP-CLI requests, and on `rest_api_init`
	988	+ * for REST: a REST request can't be identified yet at `plugins_loaded`
	989	+ * (this runs before `Config::on_plugins_loaded`, and `rest_api_init`
	990	+ * fires later), so it is initialized directly when that hook fires, while
	991	+ * a plain page view never fires it and so loads nothing.
	992	+ *
	993	+ * JITM stays eager (above): unlike Import, its `register()` adds a
	994	+ * `jetpack_sync_before_send_updated_option` filter that records the
	995	+ * `jetpack_last_plugin_sync` transient, and a Jetpack Sync send can fire
	996	+ * on a plain front-end GET — including the dedicated-sync `spawn-sync`
	997	+ * GET, which runs on `init` and exits before `rest_api_init`. Deferring
	998	+ * JITM would skip that bookkeeping and leave its message cache stale after
	999	+ * a plugin change, so it loads on every request as before.
	1000	+ */
	1001	+ if ( self::should_eager_load_packages() ) {
	1002	+ $config->ensure( 'import' );
	1003	+ } else {
	1004	+ add_action(
	1005	+ 'rest_api_init',
	1006	+ array( __CLASS__, 'configure_import_package' ),
	1007	+ 0
	1008	+ );
	1009	+ }
	1010	+
	1011	+ /*
	1012	+ * The Stats and Stats Admin packages only do work when the Stats module
	1013	+ * is active (the front-end tracking pixel) or on wp-admin, REST, cron,
	1014	+ * POST, and WP-CLI requests: the Stats dashboard page, the stats /
	1015	+ * stats-app REST endpoints (which the block editor also calls for
	1016	+ * email-open rates), the transient-cleanup cron, the connection
	1017	+ * package's package-version tracker (which runs on POSTs and reads the
	1018	+ * `jetpack_package_versions` filter that Stats registers), and CLI
	1019	+ * introspection such as the heartbeat inspector. On a plain front-end
	1020	+ * GET page view with the module off they are inert: the pixel
	1021	+ * short-circuits on `Stats\Main::should_track()` and every other entry
	1022	+ * point only hooks rest_api_init, admin, cron, the POST-only tracker, or
	1023	+ * is reached through WP-CLI.
	1024	+ * Skip loading them — and eagerly constructing the Stats Admin REST
	1025	+ * controller — on that hot path to keep their PHP out of opcache, but
	1026	+ * keep loading them everywhere else exactly as before so the stats REST
	1027	+ * permission mapping (view_stats, registered by Stats\Main), the
	1028	+ * editor's stats-app calls, the cleanup cron, and the package-version
	1029	+ * tracker are all unchanged.
	1030	+ *
	1031	+ * REST requests are not yet identifiable here (REST_REQUEST is defined
	1032	+ * after plugins_loaded), so defer those to rest_api_init. Call the
	1033	+ * package initializers directly rather than `$config->ensure()`: ensure()
	1034	+ * only flags a feature for `Config::on_plugins_loaded()` (plugins_loaded
	1035	+ * priority 2), which has already run by the time rest_api_init fires.
	1036	+ * Priority 0 runs before each package's own priority-10 route
	1037	+ * registration, so their routes still register within the same dispatch.
	1038	+ * A plain page view never fires rest_api_init, so the packages stay
	1039	+ * unloaded there. See JETPACK-1747.
	1040	+ */
	1041	+ $is_post_request = isset( $_SERVER['REQUEST_METHOD'] ) && 'POST' === $_SERVER['REQUEST_METHOD'];
	1042	+ $is_wp_cli = defined( 'WP_CLI' ) && WP_CLI;
	1043	+
	1044	+ if ( self::is_module_active( 'stats' ) || is_admin() || wp_doing_cron() || $is_post_request || $is_wp_cli ) {
	1045	+ $config->ensure( 'stats' );
	1046	+ $config->ensure( 'stats_admin' );
	1047	+ } else {
	1048	+ add_action(
	1049	+ 'rest_api_init',
	1050	+ static function () {
	1051	+ if ( class_exists( 'Automattic\Jetpack\Stats\Main' ) ) {
	1052	+ \Automattic\Jetpack\Stats\Main::init();
	1053	+ }
	1054	+ if ( class_exists( 'Automattic\Jetpack\Stats_Admin\Main' ) ) {
	1055	+ \Automattic\Jetpack\Stats_Admin\Main::init();
	1056	+ }
	1057	+ },
	1058	+ 0
	1059	+ );
	1060	+ }
	1061	+
	1062	+ // Stats v2 (WOOA7S-1595). Unlike Stats above it cannot be deferred when enabled — see
	1063	+ // Analytics::init() for why, and for why it takes no menu_title here.
	1064	+ if ( self::is_premium_analytics_enabled() ) {
	1065	+ \Automattic\Jetpack\PremiumAnalytics\Analytics::init();
	1066	+ }
	1067	+
	1068	+ // Outside the check above on purpose — see Enablement_Setting. Deferred like Stats, to keep
	1069	+ // the autoload off the front-end hot path.
	1070	+ add_action( 'rest_api_init', array( __CLASS__, 'register_premium_analytics_enablement_setting' ), 0 );
	1071	+
888	1072	$config->ensure(
889	1073	'connection',
890	1074	array(
891	1075	'slug' => 'jetpack',
		@@ -903,12 +1087,8 @@
903	1087	);
904	1088
905	1089	$config->ensure( 'search' );
906	1090
907		- if ( defined( 'ENABLE_WORDADS_SHARED_UI' ) && ENABLE_WORDADS_SHARED_UI ) {
908		- $config->ensure( 'wordads' );
909		- }
910		-
911	1091	if ( ! $this->connection_manager ) {
912	1092	$this->connection_manager = new Connection_Manager( 'jetpack' );
913	1093	}
914	1094
		@@ -916,8 +1096,10 @@
916	1096	if ( $modules->is_active( 'publicize' ) && $this->connection_manager->has_connected_user() ) {
917	1097	$config->ensure( 'publicize' );
918	1098	}
919	1099
	1100	+ add_action( 'jetpack_initialize_tracking', array( $this, 'initialize_tracking' ) );
	1101	+
920	1102	/*
921	1103	* Load things that should only be in Network Admin.
922	1104	*
923	1105	* For now blow away everything else until a more full
		@@ -932,8 +1114,9 @@
932	1114	$is_connection_ready = self::is_connection_ready();
933	1115
934	1116	if ( $is_connection_ready ) {
935	1117	add_action( 'login_form_jetpack_json_api_authorization', array( $this, 'login_form_json_api_authorization' ) );
	1118	+ $this->run_initialize_tracking_action();
936	1119
937	1120	Jetpack_Heartbeat::init();
938	1121	if ( self::is_module_active( 'stats' ) && self::is_module_active( 'search' ) ) {
939	1122	require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-search-performance-logger.php';
		@@ -938,8 +1121,19 @@
938	1121	if ( self::is_module_active( 'stats' ) && self::is_module_active( 'search' ) ) {
939	1122	require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-search-performance-logger.php';
940	1123	Jetpack_Search_Performance_Logger::init();
941	1124	}
	1125	+ } else {
	1126	+ add_action( 'jetpack_agreed_to_terms_of_service', array( $this, 'run_initialize_tracking_action' ) );
	1127	+ add_action( 'rest_api_init', array( $this, 'run_initialize_tracking_action' ) );
	1128	+ add_filter(
	1129	+ 'xmlrpc_methods',
	1130	+ function ( $methods ) {
	1131	+ $this->run_initialize_tracking_action();
	1132	+ return $methods;
	1133	+ },
	1134	+ 1
	1135	+ );
942	1136	}
943	1137
944	1138	// Initialize remote file upload request handlers.
945	1139	$this->add_remote_request_handlers();
		@@ -949,20 +1143,10 @@
949	1143	*/
950	1144	if ( $is_connection_ready ) {
951	1145	require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-iframe-embed.php';
952	1146	add_action( 'init', array( 'Jetpack_Iframe_Embed', 'init' ), 9, 0 );
953		- require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-keyring-service-helper.php';
954		- add_action( 'init', array( 'Jetpack_Keyring_Service_Helper', 'init' ), 9, 0 );
	1147	+ add_action( 'rest_api_init', array( $this, 'maybe_initialize_rest_jsonapi' ) );
955	1148	}
956		-
957		- if ( ( new Tracking( 'jetpack', $this->connection_manager ) )->should_enable_tracking( new Terms_Of_Service(), new Status() ) ) {
958		- add_action( 'init', array( new Plugin_Tracking(), 'init' ) );
959		- } else {
960		- /**
961		- * Initialize tracking right after the user agrees to the terms of service.
962		- */
963		- add_action( 'jetpack_agreed_to_terms_of_service', array( new Plugin_Tracking(), 'init' ) );
964		- }
965	1149	}
966	1150
967	1151	/**
968	1152	* Runs on plugins_loaded. Use this to add code that needs to be executed later than other
		@@ -970,15 +1154,58 @@
970	1154	*
971	1155	* @action plugins_loaded
972	1156	*/
973	1157	public function late_initialization() {
974		- add_action( 'plugins_loaded', array( 'Jetpack', 'load_modules' ), 100 );
	1158	+ add_action( 'after_setup_theme', array( 'Jetpack', 'load_modules' ), -2 );
975	1159
976		- My_Jetpack_Initializer::init();
	1160	+ /*
	1161	+ * My Jetpack is a wp-admin dashboard. Its Initializer::init() only wires
	1162	+ * up admin-menu, admin_init, and rest_api_init surfaces — and eagerly
	1163	+ * loads every product class (backup, boost, protect, …) just to register
	1164	+ * admin plugin-action links — so none of it is needed on a plain
	1165	+ * front-end GET page view. (The pieces that do immediate work, e.g.
	1166	+ * Connection REST authentication and Licensing, are already initialized
	1167	+ * unconditionally in Jetpack's constructor, so they are unaffected here.)
	1168	+ *
	1169	+ * Gate the call to the request types where My Jetpack actually does work.
	1170	+ * REST can't be detected yet at plugins_loaded, so initialize on
	1171	+ * rest_api_init for that branch; a plain page view never fires it, so My
	1172	+ * Jetpack stays unloaded there.
	1173	+ */
	1174	+ if ( self::should_eager_load_packages() ) {
	1175	+ My_Jetpack_Initializer::init();
	1176	+ } else {
	1177	+ add_action( 'rest_api_init', array( My_Jetpack_Initializer::class, 'init' ), 0 );
	1178	+ }
977	1179
978		- // Initialize Boost Speed Score
979		- new Speed_Score( array(), 'jetpack-dashboard' );
	1180	+ Scan_Page_Init::initialize();
	1181	+ Jetpack_SEO_Initializer::init();
980	1182
	1183	+ if ( ( new Modules() )->is_active( 'podcast' ) ) {
	1184	+ Podcast::init();
	1185	+ }
	1186	+
	1187	+ /*
	1188	+ * Initialize Boost Speed Score. It only does work on REST requests (the
	1189	+ * dashboard speed-score endpoints) and on a few Jetpack Boost lifecycle
	1190	+ * actions, so defer constructing it — and loading the boost-speed-score
	1191	+ * package classes — until one of those hooks actually fires instead of on
	1192	+ * every request. Priority 0 ensures the object's own callbacks (added in
	1193	+ * its constructor at the default priority) still run for the firing hook.
	1194	+ */
	1195	+ $initialize_speed_score = static function () {
	1196	+ static $initialized = false;
	1197	+ if ( $initialized ) {
	1198	+ return;
	1199	+ }
	1200	+ $initialized = true;
	1201	+ new Speed_Score( array(), 'jetpack-dashboard' );
	1202	+ };
	1203	+ add_action( 'rest_api_init', $initialize_speed_score, 0 );
	1204	+ add_action( 'jetpack_boost_deactivate', $initialize_speed_score, 0 );
	1205	+ add_action( 'jetpack_boost_environment_changed', $initialize_speed_score, 0 );
	1206	+ add_action( 'handle_environment_change', $initialize_speed_score, 0 );
	1207	+
981	1208	/**
982	1209	* Fires when Jetpack is fully loaded and ready. This is the point where it's safe
983	1210	* to instantiate classes from packages and namespaces that are managed by the Jetpack Autoloader.
984	1211	*
		@@ -1016,8 +1243,10 @@
1016	1243
1017	1244	/**
1018	1245	* Redirect edit post links to Calypso.
1019	1246	*
	1247	+ * @deprecated since 13.9
	1248	+ *
1020	1249	* @param string $default_url Post edit URL.
1021	1250	* @param int $post_id Post ID.
1022	1251	*
1023	1252	* @return string
		@@ -1022,8 +1251,10 @@
1022	1251	*
1023	1252	* @return string
1024	1253	*/
1025	1254	public function point_edit_post_links_to_calypso( $default_url, $post_id ) {
	1255	+ _deprecated_function( __METHOD__, '13.9' );
	1256	+
1026	1257	$post = get_post( $post_id );
1027	1258
1028	1259	if ( empty( $post ) ) {
1029	1260	return $default_url;
		@@ -1054,13 +1285,17 @@
1054	1285
1055	1286	/**
1056	1287	* Redirect edit comment links to Calypso.
1057	1288	*
	1289	+ * @deprecated since 13.9
	1290	+ *
1058	1291	* @param string $url Comment edit URL.
1059	1292	*
1060	1293	* @return string
1061	1294	*/
1062	1295	public function point_edit_comment_links_to_calypso( $url ) {
	1296	+ _deprecated_function( __METHOD__, '13.9' );
	1297	+
1063	1298	// Take the `query` key value from the URL, and parse its parts to the $query_args. `amp;c` matches the comment ID.
1064	1299	$query_args = null;
1065	1300	wp_parse_str( wp_parse_url( $url, PHP_URL_QUERY ), $query_args );
1066	1301
		@@ -1084,8 +1319,9 @@
1084	1319	$jetpack_callables = array(
1085	1320	'single_user_site' => array( 'Jetpack', 'is_single_user_site' ),
1086	1321	'updates' => array( 'Jetpack', 'get_updates' ),
1087	1322	'available_jetpack_blocks' => array( 'Jetpack_Gutenberg', 'get_availability' ), // Includes both Gutenberg blocks *and* plugins.
	1323	+ 'theme_styles' => array( 'Automattic\\Jetpack\\Plugin\\Theme_Styles_Sync', 'get_theme_styles' ),
1088	1324	);
1089	1325	return array_merge( $callables, $jetpack_callables );
1090	1326	}
1091	1327
		@@ -1128,16 +1364,8 @@
1128	1364	* @param string $cap Capability name.
1129	1365	*/
1130	1366	public function jetpack_custom_caps( $caps, $cap ) {
1131	1367	switch ( $cap ) {
1132		- case 'jetpack_manage_modules':
1133		- case 'jetpack_activate_modules':
1134		- case 'jetpack_deactivate_modules':
1135		- $caps = array( 'manage_options' );
1136		- break;
1137		- case 'jetpack_configure_modules':
1138		- $caps = array( 'manage_options' );
1139		- break;
1140	1368	case 'jetpack_manage_autoupdates':
1141	1369	$caps = array(
1142	1370	'manage_options',
1143	1371	'update_plugins',
		@@ -1155,9 +1383,9 @@
1155	1383	if ( $is_offline_mode ) {
1156	1384	$caps = array( 'manage_options' );
1157	1385	break;
1158	1386	} else {
1159		- $caps = array( 'read' );
	1387	+ $caps = array( 'edit_posts' );
1160	1388	}
1161	1389	break;
1162	1390	}
1163	1391	return $caps;
		@@ -1600,29 +1828,8 @@
1600	1828	return apply_filters( 'jetpack_is_connection_ready', self::connection()->is_connected(), self::connection() );
1601	1829	}
1602	1830
1603	1831	/**
1604		- * Whether the site is currently onboarding or not.
1605		- * A site is considered as being onboarded if it currently has an onboarding token.
1606		- *
1607		- * @since 5.8
1608		- * @deprecated Use \Automattic\Jetpack\Status()->is_onboarding()
1609		- *
1610		- * @access public
1611		- * @static
1612		- *
1613		- * @return bool True if the site is currently onboarding, false otherwise
1614		- */
1615		- public static function is_onboarding() {
1616		- _deprecated_function( __METHOD__, 'jetpack-10.9', 'Automattic\\Jetpack\\Status\\is_onboarding' );
1617		-
1618		- if ( ! method_exists( 'Automattic\Jetpack\Status', 'is_onboarding' ) ) {
1619		- return Jetpack_Options::get_option( 'onboarding' ) !== false;
1620		- }
1621		- return ( new Status() )->is_onboarding();
1622		- }
1623		-
1624		- /**
1625	1832	* Determines reason for Jetpack offline mode.
1626	1833	*/
1627	1834	public static function development_mode_trigger_text() {
1628	1835	$status = new Status();
		@@ -1636,11 +1843,10 @@
1636	1843	} elseif ( defined( 'WP_LOCAL_DEV' ) && WP_LOCAL_DEV ) {
1637	1844	$notice = __( 'The WP_LOCAL_DEV constant is defined in wp-config.php or elsewhere.', 'jetpack' );
1638	1845	} elseif ( $status->is_local_site() ) {
1639	1846	$notice = __( 'The site URL is a known local development environment URL (e.g. http://localhost).', 'jetpack' );
1640		- /** This filter is documented in packages/status/src/class-status.php */
1641		- } elseif ( has_filter( 'jetpack_development_mode' ) && apply_filters( 'jetpack_development_mode', false ) ) { // This is a deprecated filter name.
1642		- $notice = __( 'The jetpack_development_mode filter is set to true.', 'jetpack' );
	1847	+ } elseif ( get_option( 'jetpack_offline_mode' ) ) {
	1848	+ $notice = __( 'The jetpack_offline_mode option is set to true.', 'jetpack' );
1643	1849	} else {
1644	1850	$notice = __( 'The jetpack_offline_mode filter is set to true.', 'jetpack' );
1645	1851	}
1646	1852
		@@ -1670,15 +1876,8 @@
1670	1876	$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' ) ) );
1671	1877
1672	1878	echo '<div class="updated" style="border-color: #f0821e;"><p>' . $notice . '</p></div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- All provided text.
1673	1879	}
1674		- // Throw up a notice if using staging mode.
1675		- if ( ( new Status() )->is_staging_site() ) {
1676		- /* translators: %s is a URL */
1677		- $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' ) ) );
1678		-
1679		- echo '<div class="updated" style="border-color: #f0821e;"><p>' . $notice . '</p></div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- All provided text.
1680		- }
1681	1880	}
1682	1881
1683	1882	/**
1684	1883	* Whether Jetpack's version maps to a public release, or a development version.
		@@ -1752,18 +1951,11 @@
1752	1951	*/
1753	1952	public static function load_modules() {
1754	1953	$status = new Status();
1755	1954
1756		- if ( method_exists( $status, 'is_onboarding' ) ) {
1757		- $is_onboarding = $status->is_onboarding();
1758		- } else {
1759		- $is_onboarding = self::is_onboarding();
1760		- }
1761		-
1762	1955	if (
1763	1956	! self::is_connection_ready()
1764	1957	&& ! $status->is_offline_mode()
1765		- && ! $is_onboarding
1766	1958	&& (
1767	1959	! is_multisite()
1768	1960	|| ! get_site_option( 'jetpack_protect_active' )
1769	1961	)
		@@ -1884,22 +2076,14 @@
1884	2076	*
1885	2077	* @todo Store the result in core's object cache maybe?
1886	2078	*/
1887	2079	public static function get_active_plugins() {
1888		- $active_plugins = (array) get_option( 'active_plugins', array() );
1889		-
1890		- if ( is_multisite() ) {
1891		- // Due to legacy code, active_sitewide_plugins stores them in the keys,
1892		- // whereas active_plugins stores them in the values.
1893		- $network_plugins = array_keys( get_site_option( 'active_sitewide_plugins', array() ) );
1894		- if ( $network_plugins ) {
1895		- $active_plugins = array_merge( $active_plugins, $network_plugins );
1896		- }
	2080	+ // Older Connection copies can load first and lack this method.
	2081	+ if ( ! method_exists( Heartbeat::class, 'get_active_plugins' ) ) {
	2082	+ return array();
1897	2083	}
1898	2084
1899		- sort( $active_plugins );
1900		-
1901		- return array_unique( $active_plugins );
	2085	+ return Heartbeat::get_active_plugins();
1902	2086	}
1903	2087
1904	2088	/**
1905	2089	* Gets and parses additional plugin data to send with the heartbeat data
		@@ -2037,8 +2221,10 @@
2037	2221	*
2038	2222	* @param bool true Should Twitter Card Meta tags be disabled. Default to true.
2039	2223	*/
2040	2224	if ( ! apply_filters( 'jetpack_disable_twitter_cards', false ) ) {
	2225	+ // @todo Remove this require once the deprecated Jetpack_Twitter_Cards wrapper has been removed.
	2226	+ // Twitter Cards functionality now lives in the jetpack-post-media package (Automattic\Jetpack\Post_Media\Twitter_Cards).
2041	2227	require_once JETPACK__PLUGIN_DIR . 'class.jetpack-twitter-cards.php';
2042	2228	}
2043	2229	}
2044	2230
		@@ -2141,9 +2327,9 @@
2141	2327	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.
2142	2328	$page = sanitize_text_field( wp_unslash( $_GET['page'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- we're not changing the site.
2143	2329	}
2144	2330	wp_safe_redirect( self::admin_url( 'page=' . rawurlencode( $page ) ) );
2145		- exit;
	2331	+ exit( 0 );
2146	2332	}
2147	2333	}
2148	2334
2149	2335	/**
		@@ -2190,8 +2376,12 @@
2190	2376	default:
2191	2377	break;
2192	2378	}
2193	2379	}
	2380	+ if ( method_exists( Feature_Policy::class, 'ensure_hooks' ) ) {
	2381	+ Feature_Policy::ensure_hooks();
	2382	+ }
	2383	+
2194	2384	/**
2195	2385	* Filters the array of default modules.
2196	2386	*
2197	2387	* @since 2.5.0
		@@ -2284,8 +2474,17 @@
2284	2474	}
2285	2475	}
2286	2476	}
2287	2477
	2478	+ // Special case to convert block setting to a block module.
	2479	+ $block_key = array_search( 'blocks', $modules, true );
	2480	+ if ( $block_key !== false ) { // Only care if 'blocks' made it through the previous filters.
	2481	+ $block_option = get_option( 'jetpack_blocks_disabled', null );
	2482	+ if ( $block_option ) {
	2483	+ unset( $modules[ $block_key ] );
	2484	+ }
	2485	+ }
	2486	+
2288	2487	return $modules;
2289	2488	}
2290	2489
2291	2490	/**
		@@ -2342,23 +2541,30 @@
2342	2541
2343	2542	/**
2344	2543	* Return module name translation. Uses matching string created in modules/module-headings.php.
2345	2544	*
	2545	+ * The module list is globbed from `modules/` at runtime, so a module can be listed with no
	2546	+ * entry in that generated file. Fall back to the untranslated header rather than overwriting
	2547	+ * it with the null `jetpack_get_module_i18n()` returns for an unknown slug.
	2548	+ *
2346	2549	* @since 3.9.2
2347	2550	*
2348	2551	* @param array $modules Array of Jetpack modules.
2349	2552	*
2350		- * @return string|void
	2553	+ * @return array
2351	2554	*/
2352	2555	public static function get_translated_modules( $modules ) {
2353	2556	foreach ( $modules as $index => $module ) {
2354	2557	$i18n_module = jetpack_get_module_i18n( $module['module'] );
2355		- if ( isset( $module['name'] ) ) {
2356		- $modules[ $index ]['name'] = $i18n_module['name'];
	2558	+ $name = $i18n_module['name'] ?? null;
	2559	+ $description = $i18n_module['description'] ?? null;
	2560	+
	2561	+ if ( null !== $name && isset( $module['name'] ) ) {
	2562	+ $modules[ $index ]['name'] = $name;
2357	2563	}
2358		- if ( isset( $module['description'] ) ) {
2359		- $modules[ $index ]['description'] = $i18n_module['description'];
2360		- $modules[ $index ]['short_description'] = $i18n_module['description'];
	2564	+ if ( null !== $description && isset( $module['description'] ) ) {
	2565	+ $modules[ $index ]['description'] = $description;
	2566	+ $modules[ $index ]['short_description'] = $description;
2361	2567	}
2362	2568	if ( isset( $module['module_tags'] ) ) {
2363	2569	$modules[ $index ]['module_tags'] = array_map( 'jetpack_get_module_i18n_tag', $module['module_tags'] );
2364	2570	}
		@@ -2523,9 +2729,9 @@
2523	2729	),
2524	2730	add_query_arg( compact( 'min_version', 'max_version', 'other_modules' ), self::admin_url( 'page=jetpack' ) )
2525	2731	);
2526	2732	wp_safe_redirect( $url );
2527		- exit;
	2733	+ exit( 0 );
2528	2734	}
2529	2735	}
2530	2736
2531	2737	/**
		@@ -2671,9 +2877,9 @@
2671	2877	* @return string $url module configuration URL.
2672	2878	*/
2673	2879	public static function module_configuration_url( $module ) {
2674	2880	$module = self::get_module_slug( $module );
2675		- $default_url = self::admin_url() . "#/settings?term=$module";
	2881	+ $default_url = self::admin_url( array( 'page' => 'jetpack-settings' ) ) . "#/settings?term=$module";
2676	2882	/**
2677	2883	* Allows to modify configure_url of specific module to be able to redirect to some custom location.
2678	2884	*
2679	2885	* @since 6.9.0
		@@ -2731,9 +2937,9 @@
2731	2937	if ( $update ) {
2732	2938	update_option( 'active_plugins', array_filter( $plugins ) );
2733	2939	}
2734	2940	}
2735		- exit;
	2941	+ exit( 0 );
2736	2942	}
2737	2943
2738	2944	/**
2739	2945	* Attached to activate_{ plugin_basename( __FILES__ ) } by register_activation_hook()
		@@ -2758,12 +2964,18 @@
2758	2964	update_option( 'jetpack_activation_source', self::get_activation_source( wp_get_referer() ) );
2759	2965
2760	2966	Health::on_jetpack_activated();
2761	2967
	2968	+ \Automattic\Jetpack\Reprint_Export\Reprint_Exporter::discard_credentials();
	2969	+
2762	2970	if ( self::is_connection_ready() && method_exists( 'Automattic\Jetpack\Sync\Actions', 'do_only_first_initial_sync' ) ) {
2763	2971	Sync_Actions::do_only_first_initial_sync();
2764	2972	}
2765	2973
	2974	+ if ( ! defined( 'WC_ANALYTICS' ) && class_exists( 'Automattic\Woocommerce_Analytics' ) ) {
	2975	+ Woocommerce_Analytics::maybe_add_proxy_speed_module();
	2976	+ }
	2977	+
2766	2978	self::plugin_initialize();
2767	2979	}
2768	2980
2769	2981	/**
		@@ -2798,9 +3010,9 @@
2798	3010
2799	3011	if ( $plugins_path === $referer['path'] ) {
2800	3012	$source_type = 'list';
2801	3013	} elseif ( $plugins_install_path === $referer['path'] ) {
2802		- $tab = isset( $query_parts['tab'] ) ? $query_parts['tab'] : 'featured';
	3014	+ $tab = $query_parts['tab'] ?? 'featured';
2803	3015	switch ( $tab ) {
2804	3016	case 'popular':
2805	3017	$source_type = 'popular';
2806	3018	break;
		@@ -2810,10 +3022,10 @@
2810	3022	case 'favorites':
2811	3023	$source_type = 'favorites';
2812	3024	break;
2813	3025	case 'search':
2814		- $source_type = 'search-' . ( isset( $query_parts['type'] ) ? $query_parts['type'] : 'term' );
2815		- $source_query = isset( $query_parts['s'] ) ? $query_parts['s'] : null;
	3026	+ $source_type = 'search-' . ( $query_parts['type'] ?? 'term' );
	3027	+ $source_query = $query_parts['s'] ?? null;
2816	3028	break;
2817	3029	default:
2818	3030	$source_type = 'featured';
2819	3031	}
		@@ -2822,29 +3034,171 @@
2822	3034	return array( $source_type, $source_query );
2823	3035	}
2824	3036
2825	3037	/**
2826		- * Runs before bumping version numbers up to a new version
	3038	+ * Runs before bumping version numbers up to a new version.
2827	3039	*
2828		- * @param string $version Version:timestamp.
	3040	+ * Only ever registered the hooks for the release post update modal, which has been removed.
	3041	+ * No longer hooked to `updating_jetpack_version`.
	3042	+ *
	3043	+ * @deprecated 16.2
	3044	+ *
	3045	+ * @param string $version Version:timestamp.
2829	3046	* @param string $old_version Old Version:timestamp or false if not set yet.
2830	3047	*/
2831		- public static function do_version_bump( $version, $old_version ) {
2832		- if ( $old_version ) { // For existing Jetpack installations.
2833		- add_action( 'admin_enqueue_scripts', __CLASS__ . '::enqueue_block_style' );
	3048	+ public static function do_version_bump( $version, $old_version ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable -- Signature preserved for the deprecation shim.
	3049	+ _deprecated_function( __METHOD__, 'jetpack-16.2' );
	3050	+ }
2834	3051
2835		- // If a front end page is visited after the update, the 'wp' action will fire.
2836		- add_action( 'wp', 'Jetpack::set_update_modal_display' );
	3052	+ /**
	3053	+ * Enables the Newsletter (subscriptions) module for existing sites now that it is a default-on module.
	3054	+ *
	3055	+ * Fresh installs receive the module via its "Auto Activate: Yes" header, so this only handles sites
	3056	+ * upgrading from a version where the module defaulted off. It runs once per site (guarded by the
	3057	+ * subscriptions_default_on_migrated option). Fresh installs are marked as migrated immediately so the
	3058	+ * migration never runs for them. After it has run, the user's choice to deactivate the module again
	3059	+ * (for example from the My Jetpack Products page) is respected and never reverted.
	3060	+ *
	3061	+ * The module requires a connection, so on a disconnected site the migration is deferred without setting
	3062	+ * the guard, allowing a later version bump to retry once the site is connected.
	3063	+ *
	3064	+ * @param string $version New Jetpack version:timestamp.
	3065	+ * @param string|false $old_version Previous Jetpack version:timestamp, or false on a fresh install.
	3066	+ */
	3067	+ public static function activate_subscriptions_module_for_existing_sites( $version, $old_version ) {
	3068	+ if ( get_option( 'jetpack_subscriptions_default_on_migrated' ) ) {
	3069	+ return;
	3070	+ }
2837	3071
2838		- // If an admin page is visited after the update, the 'current_screen' action will fire.
2839		- add_action( 'current_screen', 'Jetpack::set_update_modal_display' );
	3072	+ // Fresh installs get the module via its "Auto Activate: Yes" header. Mark them as migrated so a
	3073	+ // later opt-out is never reverted by the existing-site path on a subsequent version bump.
	3074	+ if ( ! $old_version ) {
	3075	+ update_option( 'jetpack_subscriptions_default_on_migrated', true );
	3076	+ return;
2840	3077	}
	3078	+
	3079	+ if ( ! self::is_connection_ready() ) {
	3080	+ return;
	3081	+ }
	3082	+
	3083	+ // Mark as migrated only once the module is active, so a transient activation failure is retried on
	3084	+ // a later version bump rather than being silently skipped.
	3085	+ if ( self::is_module_active( 'subscriptions' ) || self::activate_module( 'subscriptions', false, false ) ) {
	3086	+ update_option( 'jetpack_subscriptions_default_on_migrated', true );
	3087	+ }
2841	3088	}
2842	3089
2843	3090	/**
	3091	+ * Option flag that records the AI master-switch opt-out reconciliation has run,
	3092	+ * so it never runs twice.
	3093	+ *
	3094	+ * @var string
	3095	+ */
	3096	+ const AI_MASTER_OPTOUT_MIGRATED_OPTION = 'jetpack_ai_master_optout_migrated';
	3097	+
	3098	+ /**
	3099	+ * Register the on-upgrade init hooks whose relative ORDER matters, extracted so
	3100	+ * the ordering can be asserted in tests without invoking plugin_upgrade() (whose
	3101	+ * guards make it unreliable to trigger under test). activate_new_modules()
	3102	+ * (init, default priority 10) auto-activates "Auto Activate: Yes" modules
	3103	+ * including the `ai` master; reconcile_ai_master_optout() must run at a LATER
	3104	+ * priority to honor an explicit AI opt-out.
	3105	+ *
	3106	+ * @return void
	3107	+ */
	3108	+ public static function register_upgrade_init_hooks() {
	3109	+ add_action( 'init', array( __CLASS__, 'activate_new_modules' ) );
	3110	+ add_action( 'init', array( __CLASS__, 'reconcile_ai_master_optout' ), 20 );
	3111	+ }
	3112	+
	3113	+ /**
	3114	+ * Preserves an explicit Jetpack AI opt-out when the `ai` module becomes the site-wide
	3115	+ * master switch off WordPress.com Simple (self-hosted and Atomic).
	3116	+ *
	3117	+ * The `ai` module is "Auto Activate: Yes", so on upgrade {@see self::activate_new_modules()}
	3118	+ * turns it on for connected sites — the desired default-on / auto-enable-on-connection
	3119	+ * behavior, which this method deliberately leaves alone. The one case it corrects is a site
	3120	+ * that had explicitly disabled Jetpack AI (the `jetpack_ai_enabled` option present and falsey)
	3121	+ * before the module shipped: that opt-out must survive the module becoming the master, so the
	3122	+ * module is deactivated for exactly those sites. An absent or truthy option is left untouched.
	3123	+ *
	3124	+ * Ordering is the whole point. `activate_new_modules()` is hooked on `init` at priority 10 and
	3125	+ * auto-activates the module there; this method is hooked on `init` at priority 20 (see
	3126	+ * {@see self::plugin_upgrade()}), so it runs AFTER the auto-activation and its deactivation is
	3127	+ * the final state. A version-guarded block that ran inline during `plugins_loaded` would be
	3128	+ * undone by the later auto-activation, which is why this is a late-init hook rather than an
	3129	+ * inline upgrade step.
	3130	+ *
	3131	+ * WordPress.com Simple never runs modules — the option stays the master there — so this is a
	3132	+ * no-op on Simple. The {@see self::AI_MASTER_OPTOUT_MIGRATED_OPTION} flag makes it run exactly
	3133	+ * once, which matters because off-Simple the option is no longer the master after this runs:
	3134	+ * a stale falsey option must not keep re-deactivating a module the user later turns back on.
	3135	+ *
	3136	+ * @return void
	3137	+ */
	3138	+ public static function reconcile_ai_master_optout() {
	3139	+ if ( get_option( self::AI_MASTER_OPTOUT_MIGRATED_OPTION ) ) {
	3140	+ return;
	3141	+ }
	3142	+
	3143	+ // Simple keeps the `jetpack_ai_enabled` option as the master; modules don't run there.
	3144	+ if ( ( new Host() )->is_wpcom_simple() ) {
	3145	+ return;
	3146	+ }
	3147	+
	3148	+ // A sentinel default distinguishes an absent option (leave auto-activation alone) from one
	3149	+ // explicitly stored falsey (an opt-out to preserve).
	3150	+ $stored = get_option( 'jetpack_ai_enabled', 'not-set' );
	3151	+ if ( 'not-set' !== $stored && ! (bool) $stored ) {
	3152	+ ( new Modules() )->deactivate( 'ai' );
	3153	+ }
	3154	+
	3155	+ update_option( self::AI_MASTER_OPTOUT_MIGRATED_OPTION, true );
	3156	+ }
	3157	+
	3158	+ /**
	3159	+ * Deletes obsolete SEO module-state options without changing module activation.
	3160	+ *
	3161	+ * @since 16.3
	3162	+ */
	3163	+ public static function cleanup_seo_module_state_options() {
	3164	+ delete_option( 'jetpack_seo_sitemap_enabled' );
	3165	+ delete_option( 'jetpack_seo_canonical_urls_enabled' );
	3166	+ delete_option( 'jetpack_seo_module_state_reconciled' );
	3167	+ }
	3168	+
	3169	+ /**
	3170	+ * Seeds the Jetpack SEO discoverability cohort once, so the new SEO surface is
	3171	+ * auto-discoverable on fresh installs but opt-in on existing ones (JETPACK-1700).
	3172	+ *
	3173	+ * Hooked on `updating_jetpack_version`, which fires on every install including the
	3174	+ * first — with `$old_version === false` on a brand-new site (the same signal
	3175	+ * {@see self::activate_subscriptions_module_for_existing_sites()} keys off). Fresh
	3176	+ * installs are seeded visible; existing installs are seeded hidden and opt in later
	3177	+ * via the legacy Traffic page or My Jetpack. `add_option()` makes this seed-once: it
	3178	+ * never overrides a value a later opt-in (or opt-out) has set. WordPress.com sites
	3179	+ * ignore this option entirely (always visible) — see
	3180	+ * {@see \Automattic\Jetpack\SEO\Initializer::is_seo_surface_visible()}.
	3181	+ *
	3182	+ * @param string $version The new Jetpack version (unused).
	3183	+ * @param string|false $old_version The previous version, or false on a fresh install.
	3184	+ */
	3185	+ public static function seed_seo_visibility_cohort( $version, $old_version ) {
	3186	+ add_option( Jetpack_SEO_Initializer::VISIBILITY_OPTION, ! $old_version );
	3187	+ }
	3188	+
	3189	+ /**
2844	3190	* Sets the display_update_modal state.
	3191	+ *
	3192	+ * The release post update modal that read this state has been removed. The write is kept so the
	3193	+ * method still behaves as documented for the deprecation window. When this is deleted, also drop
	3194	+ * the matching `display_update_modal` guard in Automattic\Jetpack\CookieState::should_set_cookie(),
	3195	+ * which exists only to keep this key out of the cookie on the Jetpack admin screen.
	3196	+ *
	3197	+ * @deprecated 16.2
2845	3198	*/
2846	3199	public static function set_update_modal_display() {
	3200	+ _deprecated_function( __METHOD__, 'jetpack-16.2' );
2847	3201	self::state( 'display_update_modal', true );
2848	3202	}
2849	3203
2850	3204	/**
		@@ -2849,11 +3203,16 @@
2849	3203
2850	3204	/**
2851	3205	* Enqueues the block library styles.
2852	3206	*
	3207	+ * Only ever used by the release post update modal, which has been removed.
	3208	+ *
	3209	+ * @deprecated 16.2
	3210	+ *
2853	3211	* @param string $hook The current admin page.
2854	3212	*/
2855	3213	public static function enqueue_block_style( $hook ) {
	3214	+ _deprecated_function( __METHOD__, 'jetpack-16.2' );
2856	3215	if ( 'toplevel_page_jetpack' === $hook ) {
2857	3216	wp_enqueue_style( 'wp-block-library' );
2858	3217	}
2859	3218	}
		@@ -2942,8 +3301,12 @@
2942	3301	add_filter( 'jetpack_update_activated_state_on_disconnect', '__return_false' );
2943	3302	self::disconnect();
2944	3303	Jetpack_Options::delete_option( 'version' );
2945	3304	}
	3305	+
	3306	+ if ( ! defined( 'WC_ANALYTICS' ) && class_exists( 'Automattic\Woocommerce_Analytics' ) ) {
	3307	+ Woocommerce_Analytics::maybe_remove_proxy_speed_module();
	3308	+ }
2946	3309	}
2947	3310
2948	3311	/**
2949	3312	* Set activated option to 4 on jetpack_idc_disconnect action.
		@@ -2971,9 +3334,9 @@
2971	3334	$connection->remove_connection( ! Identity_Crisis::validate_sync_error_idc_option() );
2972	3335	}
2973	3336
2974	3337	/**
2975		- * Happens after a successfull disconnection.
	3338	+ * Happens after a successful disconnection.
2976	3339	*
2977	3340	* @static
2978	3341	*/
2979	3342	public static function jetpack_site_disconnected() {
		@@ -2978,8 +3341,10 @@
2978	3341	*/
2979	3342	public static function jetpack_site_disconnected() {
2980	3343	Identity_Crisis::clear_all_idc_options();
2981	3344
	3345	+ \Automattic\Jetpack\Reprint_Export\Reprint_Exporter::discard_credentials();
	3346	+
2982	3347	// Delete all the sync related data. Since it could be taking up space.
2983	3348	Sender::get_instance()->uninstall();
2984	3349
2985	3350	/**
		@@ -3043,10 +3408,17 @@
3043	3408	* @param mixed $code Error code to log.
3044	3409	* @param mixed $data Data to log.
3045	3410	*/
3046	3411	public static function log( $code, $data = null ) {
	3412	+
	3413	+ $raw_log = Jetpack_Options::get_option( 'log', array() );
	3414	+ // This can be modified by the `jetpack_options` filter, so abort if we don't have an array.
	3415	+ if ( ! is_array( $raw_log ) ) {
	3416	+ return;
	3417	+ }
	3418	+
3047	3419	// only grab the latest 200 entries.
3048		- $log = array_slice( Jetpack_Options::get_option( 'log', array() ), -199, 199 );
	3420	+ $log = array_slice( $raw_log, -199, 199 );
3049	3421
3050	3422	// Append our event to the log.
3051	3423	$log_entry = array(
3052	3424	'time' => time(),
		@@ -3146,8 +3518,15 @@
3146	3518
3147	3519	/**
3148	3520	* Return stat data for WPCOM sync.
3149	3521	*
	3522	+ * The Sync stats module was this method's last caller and moved to the Connection package's
	3523	+ * `Heartbeat::generate_stats_array()`, which assembles the heartbeat data through the
	3524	+ * `jetpack_heartbeat_stats_array` filter. Note the package method does not include the extended
	3525	+ * data from `get_additional_stat_data()`, so callers relying on `$extended` need to add it themselves.
	3526	+ *
	3527	+ * @deprecated 16.2
	3528	+ *
3150	3529	* @param bool $encode JSON encode the result.
3151	3530	* @param bool $extended Adds additional stats data.
3152	3531	*
3153	3532	* @return array|string Stats data. Array if $encode is false. JSON-encoded string is $encode is true.
		@@ -3152,10 +3531,15 @@
3152	3531	*
3153	3532	* @return array|string Stats data. Array if $encode is false. JSON-encoded string is $encode is true.
3154	3533	*/
3155	3534	public static function get_stat_data( $encode = true, $extended = true ) {
3156		- $data = Jetpack_Heartbeat::generate_stats_array();
	3535	+ _deprecated_function( __METHOD__, 'jetpack-16.2', 'Automattic\\Jetpack\\Heartbeat::generate_stats_array' );
3157	3536
	3537	+ $env_stats = method_exists( Heartbeat::class, 'get_environment_stats' )
	3538	+ ? Heartbeat::get_environment_stats()
	3539	+ : array();
	3540	+ $data = array_merge( Jetpack_Heartbeat::generate_stats_array(), $env_stats );
	3541	+
3158	3542	if ( $extended ) {
3159	3543	$additional_data = self::get_additional_stat_data();
3160	3544	$data = array_merge( $data, $additional_data );
3161	3545	}
		@@ -3160,9 +3544,9 @@
3160	3544	$data = array_merge( $data, $additional_data );
3161	3545	}
3162	3546
3163	3547	if ( $encode ) {
3164		- return wp_json_encode( $data );
	3548	+ return wp_json_encode( $data, JSON_UNESCAPED_SLASHES );
3165	3549	}
3166	3550
3167	3551	return $data;
3168	3552	}
		@@ -3241,12 +3625,17 @@
3241	3625	if ( ( self::is_connection_ready() || $is_offline_mode ) && false === $fallback_no_verify_ssl_certs && ! $client_verify_ssl_certs ) {
3242	3626	// Upgrade: 1.1 -> 1.1.1
3243	3627	// Check and see if host can verify the Jetpack servers' SSL certificate.
3244	3628	$args = array();
	3629	+ // @phan-suppress-next-line PhanAccessMethodInternal -- Phan is correct, but the usage is intentional.
3245	3630	Client::_wp_remote_request( self::connection()->api_url( 'test' ), $args, true );
3246	3631	}
3247	3632
3248		- if ( current_user_can( 'manage_options' ) && ! self::permit_ssl() ) {
	3633	+ if (
	3634	+ current_user_can( 'manage_options' )
	3635	+ && ! self::permit_ssl()
	3636	+ && ! $is_offline_mode
	3637	+ ) {
3249	3638	add_action( 'jetpack_notices', array( $this, 'alert_auto_ssl_fail' ) );
3250	3639	}
3251	3640
3252	3641	add_action( 'load-plugins.php', array( $this, 'intercept_plugin_error_scrape_init' ) );
		@@ -3255,12 +3644,8 @@
3255	3644	if ( ! ( is_multisite() && is_plugin_active_for_network( 'jetpack/jetpack.php' ) && ! is_network_admin() ) ) {
3256	3645	add_action( 'admin_enqueue_scripts', array( $this, 'deactivate_dialog' ) );
3257	3646	}
3258	3647
3259		- if ( isset( $_COOKIE['jetpackState']['display_update_modal'] ) ) {
3260		- add_action( 'admin_enqueue_scripts', __CLASS__ . '::enqueue_block_style' );
3261		- }
3262		-
3263	3648	add_filter( 'plugin_action_links_' . plugin_basename( JETPACK__PLUGIN_DIR . 'jetpack.php' ), array( $this, 'plugin_action_links' ) );
3264	3649
3265	3650	if ( self::is_connection_ready() || $is_offline_mode ) {
3266	3651	// Artificially throw errors in certain specific cases during plugin activation.
		@@ -3299,8 +3684,9 @@
3299	3684	* Sometimes a plugin can activate without causing errors, but it will cause errors on the next page load.
3300	3685	* This function artificially throws errors for such cases (per a specific list).
3301	3686	*
3302	3687	* @param string $plugin The activated plugin.
	3688	+ * @throws RuntimeException If a conflicting plugin is detected.
3303	3689	*/
3304	3690	public function throw_error_on_activate_plugin( $plugin ) {
3305	3691	$active_modules = self::get_active_modules();
3306	3692
		@@ -3322,9 +3708,9 @@
3322	3708	}
3323	3709
3324	3710	if ( $throw ) {
3325	3711	/* translators: Plugin name to deactivate. */
3326		- trigger_error( sprintf( esc_html__( 'Jetpack contains the most recent version of the old &#8220;%1$s&#8221; plugin.', 'jetpack' ), 'WordPress.com Stats' ), E_USER_ERROR ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
	3712	+ throw new RuntimeException( sprintf( __( 'Jetpack contains the most recent version of the old "%1$s" plugin.', 'jetpack' ), 'WordPress.com Stats' ) );
3327	3713	}
3328	3714	}
3329	3715	}
3330	3716
		@@ -3435,18 +3821,17 @@
3435	3821	if ( ! is_int( $status_code ) ) {
3436	3822	$status_code = 400;
3437	3823	}
3438	3824
3439		- status_header( $status_code );
3440		- die( wp_json_encode( (object) compact( 'error', 'error_description' ) ) );
	3825	+ wp_send_json( (object) compact( 'error', 'error_description' ), $status_code, JSON_UNESCAPED_SLASHES );
3441	3826	}
3442	3827
3443		- status_header( 200 );
3444	3828	if ( true === $response ) {
3445		- exit;
	3829	+ status_header( 200 );
	3830	+ exit( 0 );
3446	3831	}
3447	3832
3448		- die( wp_json_encode( (object) $response ) );
	3833	+ wp_send_json( (object) $response, 200, JSON_UNESCAPED_SLASHES );
3449	3834	}
3450	3835
3451	3836	/**
3452	3837	* Uploads a file gotten from the global $_FILES.
		@@ -3507,9 +3892,9 @@
3507	3892	return new WP_Error( 'handler_cannot_upload', __( 'The upload handler cannot upload files', 'jetpack' ), 400 );
3508	3893	}
3509	3894
3510	3895	$uploaded_files = array();
3511		- $global_post = isset( $GLOBALS['post'] ) ? $GLOBALS['post'] : null;
	3896	+ $global_post = $GLOBALS['post'] ?? null;
3512	3897	unset( $GLOBALS['post'] );
3513	3898	if ( empty( $_FILES['media']['name'] ) ) {
3514	3899	// Nothing to process, just return.
3515	3900	return $uploaded_files;
		@@ -3516,9 +3901,9 @@
3516	3901	}
3517	3902	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.
3518	3903	$file = array();
3519	3904	foreach ( $media_keys as $media_key ) {
3520		- $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.
	3905	+ $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.
3521	3906	}
3522	3907
3523	3908	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.
3524	3909
		@@ -3564,9 +3949,9 @@
3564	3949	'type' => (string) $edited_media_item->post_mime_type,
3565	3950	'meta' => (array) wp_get_attachment_metadata( $post_id ),
3566	3951	);
3567	3952
3568		- return (array) array( $response );
	3953	+ return array( $response );
3569	3954	}
3570	3955
3571	3956	$attachment_id = media_handle_upload(
3572	3957	'.jetpack.upload.',
		@@ -3605,58 +3990,8 @@
3605	3990	return $uploaded_files;
3606	3991	}
3607	3992
3608	3993	/**
3609		- * Add help to the Jetpack page
3610		- *
3611		- * @since Jetpack (1.2.3)
3612		- * @return void
3613		- */
3614		- public function admin_help() {
3615		- $current_screen = get_current_screen();
3616		-
3617		- // Overview.
3618		- $current_screen->add_help_tab(
3619		- array(
3620		- 'id' => 'home',
3621		- 'title' => __( 'Home', 'jetpack' ),
3622		- 'content' =>
3623		- '<p><strong>' . __( 'Jetpack', 'jetpack' ) . '</strong></p>' .
3624		- '<p>' . __( 'Jetpack supercharges your self-hosted WordPress site with the awesome cloud power of WordPress.com.', 'jetpack' ) . '</p>' .
3625		- '<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>',
3626		- )
3627		- );
3628		-
3629		- // Screen Content.
3630		- if ( current_user_can( 'manage_options' ) ) {
3631		- $current_screen->add_help_tab(
3632		- array(
3633		- 'id' => 'settings',
3634		- 'title' => __( 'Settings', 'jetpack' ),
3635		- 'content' =>
3636		- '<p><strong>' . __( 'Jetpack', 'jetpack' ) . '</strong></p>' .
3637		- '<p>' . __( 'You can activate or deactivate individual Jetpack modules to suit your needs.', 'jetpack' ) . '</p>' .
3638		- '<ol>' .
3639		- '<li>' . __( 'Each module has an Activate or Deactivate link so you can toggle one individually.', 'jetpack' ) . '</li>' .
3640		- '<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>' .
3641		- '</ol>' .
3642		- '<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>',
3643		- )
3644		- );
3645		- }
3646		-
3647		- // Help Sidebar.
3648		- $support_url = Redirect::get_url( 'jetpack-support' );
3649		- $faq_url = Redirect::get_url( 'jetpack-faq' );
3650		- $current_screen->set_help_sidebar(
3651		- '<p><strong>' . __( 'For more information:', 'jetpack' ) . '</strong></p>' .
3652		- '<p><a href="' . esc_url( $faq_url ) . '" rel="noopener noreferrer" target="_blank">' . __( 'Jetpack FAQ', 'jetpack' ) . '</a></p>' .
3653		- '<p><a href="' . esc_url( $support_url ) . '" rel="noopener noreferrer" target="_blank">' . __( 'Jetpack Support', 'jetpack' ) . '</a></p>' .
3654		- '<p><a href="' . esc_url( self::admin_url( array( 'page' => 'jetpack-debugger' ) ) ) . '">' . __( 'Jetpack Debugging Center', 'jetpack' ) . '</a></p>'
3655		- );
3656		- }
3657		-
3658		- /**
3659	3994	* Add action links for the Jetpack plugin.
3660	3995	*
3661	3996	* @param array $actions Plugin actions.
3662	3997	*
		@@ -3664,9 +3999,9 @@
3664	3999	*/
3665	4000	public function plugin_action_links( $actions ) {
3666	4001	if ( current_user_can( 'jetpack_manage_modules' ) && ( self::is_connection_ready() || ( new Status() )->is_offline_mode() ) ) {
3667	4002	return array_merge(
3668		- array( 'settings' => sprintf( '<a href="%s">%s</a>', esc_url( self::admin_url( 'page=jetpack#/settings' ) ), __( 'Settings', 'jetpack' ) ) ),
	4003	+ array( 'settings' => sprintf( '<a href="%s">%s</a>', esc_url( self::admin_url( 'page=jetpack-settings#/settings' ) ), __( 'Settings', 'jetpack' ) ) ),
3669	4004	$actions
3670	4005	);
3671	4006	}
3672	4007
		@@ -3694,14 +4029,10 @@
3694	4029	'jetpack-plugins-page-js',
3695	4030	'_inc/build/plugins-page.js',
3696	4031	JETPACK__PLUGIN_FILE,
3697	4032	array(
3698		- 'in_footer' => true,
3699		- 'textdomain' => 'jetpack',
3700		- 'dependencies' => array(
3701		- 'wp-polyfill',
3702		- 'wp-components',
3703		- ),
	4033	+ 'in_footer' => true,
	4034	+ 'textdomain' => 'jetpack',
3704	4035	)
3705	4036	);
3706	4037	Assets::enqueue_script( 'jetpack-plugins-page-js' );
3707	4038
		@@ -3706,9 +4037,9 @@
3706	4037	Assets::enqueue_script( 'jetpack-plugins-page-js' );
3707	4038
3708	4039	// Add objects to be passed to the initial state of the app.
3709	4040	// Use wp_add_inline_script instead of wp_localize_script, see https://core.trac.wordpress.org/ticket/25280.
3710		- 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' );
	4041	+ 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' );
3711	4042
3712	4043	add_action( 'admin_footer', array( $this, 'jetpack_plugin_portal_containers' ) );
3713	4044	}
3714	4045	}
		@@ -3757,9 +4088,9 @@
3757	4088	// @todo provide way to go to specific calypso env.
3758	4089	self::get_calypso_host() . 'jetpack/connect'
3759	4090	)
3760	4091	);
3761		- exit;
	4092	+ exit( 0 );
3762	4093	}
3763	4094	}
3764	4095
3765	4096	/*
		@@ -3794,8 +4125,28 @@
3794	4125	* Done!
3795	4126	*/
3796	4127
3797	4128	/**
	4129	+ * Build the user-facing description stored alongside a registration error code.
	4130	+ *
	4131	+ * @since 16.2
	4132	+ *
	4133	+ * @param string $error_code The WP_Error code.
	4134	+ * @param string $message The WP_Error message.
	4135	+ * @return string The description, empty when the message is not user-facing copy.
	4136	+ */
	4137	+ public static function get_registration_error_description( $error_code, $message ) {
	4138	+ // Manager::validate_remote_register_response() does not always put user-facing copy in the
	4139	+ // message slot: wpcom_5??, wpcom_408 and wpcom_bad_response store the HTTP status there,
	4140	+ // and jetpack_id stores the raw response body, which can also overflow the state cookie.
	4141	+ if ( 'jetpack_id' === $error_code || is_numeric( $message ) ) {
	4142	+ return '';
	4143	+ }
	4144	+
	4145	+ return mb_substr( (string) $message, 0, 250 );
	4146	+ }
	4147	+
	4148	+ /**
3798	4149	* Handles the page load events for the Jetpack admin page
3799	4150	*/
3800	4151	public function admin_page_load() {
3801	4152	$error = false;
		@@ -3831,10 +4182,11 @@
3831	4182	$registered = static::connection()->try_registration();
3832	4183	if ( is_wp_error( $registered ) ) {
3833	4184	$error = $registered->get_error_code();
3834	4185	self::state( 'error', $error );
3835		- self::state( 'error', $registered->get_error_message() );
3836	4186
	4187	+ self::state( 'error_description', self::get_registration_error_description( $error, $registered->get_error_message() ) );
	4188	+
3837	4189	/**
3838	4190	* Jetpack registration Error.
3839	4191	*
3840	4192	* @since 7.5.0
		@@ -3858,12 +4210,8 @@
3858	4210	do_action( 'jetpack_connection_register_success', $from );
3859	4211
3860	4212	$url = $this->build_connect_url( true, $redirect, $from );
3861	4213
3862		- if ( ! empty( $_GET['onboarding'] ) ) {
3863		- $url = add_query_arg( 'onboarding', rawurlencode_deep( wp_unslash( $_GET['onboarding'] ) ), $url ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
3864		- }
3865		-
3866	4214	if ( ! empty( $_GET['auth_approved'] ) && 'true' === $_GET['auth_approved'] ) {
3867	4215	$url = add_query_arg( 'auth_approved', 'true', $url );
3868	4216	}
3869	4217
		@@ -3868,9 +4216,9 @@
3868	4216	}
3869	4217
3870	4218	add_filter( 'allowed_redirect_hosts', array( Host::class, 'allow_wpcom_environments' ) );
3871	4219	wp_safe_redirect( $url );
3872		- exit;
	4220	+ exit( 0 );
3873	4221	case 'activate':
3874	4222	if ( ! current_user_can( 'jetpack_activate_modules' ) ) {
3875	4223	$error = 'cheatin';
3876	4224	break;
		@@ -3884,9 +4232,9 @@
3884	4232	self::state( 'error', sprintf( __( 'Could not activate %s', 'jetpack' ), $module ) );
3885	4233	}
3886	4234	// The following two lines will rarely happen, as Jetpack::activate_module normally exits at the end.
3887	4235	wp_safe_redirect( self::admin_url( 'page=jetpack' ) );
3888		- exit;
	4236	+ exit( 0 );
3889	4237	case 'activate_default_modules':
3890	4238	check_admin_referer( 'activate_default_modules' );
3891	4239	self::log( 'activate_default_modules' );
3892	4240	self::restate();
		@@ -3894,9 +4242,9 @@
3894	4242	$max_version = isset( $_GET['max_version'] ) ? sanitize_text_field( wp_unslash( $_GET['max_version'] ) ) : false;
3895	4243	$other_modules = isset( $_GET['other_modules'] ) && is_array( $_GET['other_modules'] ) ? array_map( 'sanitize_text_field', wp_unslash( $_GET['other_modules'] ) ) : array();
3896	4244	self::activate_default_modules( $min_version, $max_version, $other_modules );
3897	4245	wp_safe_redirect( self::admin_url( 'page=jetpack' ) );
3898		- exit;
	4246	+ exit( 0 );
3899	4247	case 'disconnect':
3900	4248	if ( ! current_user_can( 'jetpack_disconnect' ) ) {
3901	4249	$error = 'cheatin';
3902	4250	break;
		@@ -3905,9 +4253,9 @@
3905	4253	check_admin_referer( 'jetpack-disconnect' );
3906	4254	self::log( 'disconnect' );
3907	4255	self::disconnect();
3908	4256	wp_safe_redirect( self::admin_url( 'disconnected=true' ) );
3909		- exit;
	4257	+ exit( 0 );
3910	4258	case 'reconnect':
3911	4259	if ( ! current_user_can( 'jetpack_reconnect' ) ) {
3912	4260	$error = 'cheatin';
3913	4261	break;
		@@ -3918,9 +4266,9 @@
3918	4266	self::disconnect();
3919	4267
3920	4268	add_filter( 'allowed_redirect_hosts', array( Host::class, 'allow_wpcom_environments' ) );
3921	4269	wp_safe_redirect( $this->build_connect_url( true, false, 'reconnect' ) );
3922		- exit;
	4270	+ exit( 0 );
3923	4271	case 'deactivate':
3924	4272	if ( ! current_user_can( 'jetpack_deactivate_modules' ) ) {
3925	4273	$error = 'cheatin';
3926	4274	break;
		@@ -3934,9 +4282,9 @@
3934	4282	self::state( 'message', 'module_deactivated' );
3935	4283	}
3936	4284	self::state( 'module', $modules );
3937	4285	wp_safe_redirect( self::admin_url( 'page=jetpack' ) );
3938		- exit;
	4286	+ exit( 0 );
3939	4287	case 'unlink':
3940	4288	$redirect = isset( $_GET['redirect'] ) ? sanitize_text_field( wp_unslash( $_GET['redirect'] ) ) : '';
3941	4289	check_admin_referer( 'jetpack-unlink' );
3942	4290	self::log( 'unlink' );
		@@ -3946,32 +4294,9 @@
3946	4294	wp_safe_redirect( admin_url() );
3947	4295	} else {
3948	4296	wp_safe_redirect( self::admin_url( array( 'page' => rawurlencode( $redirect ) ) ) );
3949	4297	}
3950		- exit;
3951		- case 'onboard':
3952		- if ( ! current_user_can( 'manage_options' ) ) {
3953		- wp_safe_redirect( self::admin_url( 'page=jetpack' ) );
3954		- } else {
3955		- self::create_onboarding_token();
3956		- $url = $this->build_connect_url( true );
3957		-
3958		- $token = Jetpack_Options::get_option( 'onboarding' );
3959		-
3960		- if ( false !== ( $token ) ) {
3961		- $url = add_query_arg( 'onboarding', $token, $url );
3962		- }
3963		-
3964		- $calypso_env = ( new Host() )->get_calypso_env();
3965		- if ( ! empty( $calypso_env ) ) {
3966		- $url = add_query_arg( 'calypso_env', $calypso_env, $url );
3967		- }
3968		-
3969		- add_filter( 'allowed_redirect_hosts', array( Host::class, 'allow_wpcom_environments' ) );
3970		- wp_safe_redirect( $url );
3971		- exit;
3972		- }
3973		- exit;
	4298	+ exit( 0 );
3974	4299	default:
3975	4300	/**
3976	4301	* Fires when a Jetpack admin page is loaded with an unrecognized parameter.
3977	4302	*
		@@ -4194,37 +4519,8 @@
4194	4519	endif;
4195	4520	}
4196	4521
4197	4522	/**
4198		- * We can't always respond to a signed XML-RPC request with a
4199		- * helpful error message. In some circumstances, doing so could
4200		- * leak information.
4201		- *
4202		- * Instead, track that the error occurred via a Jetpack_Option,
4203		- * and send that data back in the heartbeat.
4204		- * All this does is increment a number, but it's enough to find
4205		- * trends.
4206		- *
4207		- * @param WP_Error $xmlrpc_error The error produced during
4208		- * signature validation.
4209		- */
4210		- public function track_xmlrpc_error( $xmlrpc_error ) {
4211		- $code = is_wp_error( $xmlrpc_error )
4212		- ? $xmlrpc_error->get_error_code()
4213		- : 'should-not-happen';
4214		-
4215		- $xmlrpc_errors = Jetpack_Options::get_option( 'xmlrpc_errors', array() );
4216		- if ( isset( $xmlrpc_errors[ $code ] ) && $xmlrpc_errors[ $code ] ) {
4217		- // No need to update the option if we already have
4218		- // this code stored.
4219		- return;
4220		- }
4221		- $xmlrpc_errors[ $code ] = true;
4222		-
4223		- Jetpack_Options::update_option( 'xmlrpc_errors', $xmlrpc_errors, false );
4224		- }
4225		-
4226		- /**
4227	4523	* Initialize the jetpack stats instance only when needed
4228	4524	*
4229	4525	* @return void
4230	4526	*/
		@@ -4510,11 +4806,8 @@
4510	4806	*
4511	4807	* @param array $data The request data.
4512	4808	*/
4513	4809	public static function authorize_ending_authorized( $data ) {
4514		- // If this site has been through the Jetpack Onboarding flow, delete the onboarding token.
4515		- self::invalidate_onboarding_token();
4516		-
4517	4810	// If redirect_uri is SSO, ensure SSO module is enabled.
4518	4811	parse_str( wp_parse_url( $data['redirect_uri'], PHP_URL_QUERY ), $redirect_options );
4519	4812
4520	4813	/** This filter is documented in class.jetpack-cli.php */
		@@ -4654,10 +4947,12 @@
4654	4947	$result = self::permit_ssl( true );
4655	4948	wp_send_json(
4656	4949	array(
4657	4950	'enabled' => $result,
4658		- 'message' => get_transient( 'jetpack_https_test_message' ),
4659		- )
	4951	+ 'message' => self::get_ssl_test_message(),
	4952	+ ),
	4953	+ null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- It takes null, but its phpdoc only says int.
	4954	+ JSON_UNESCAPED_SLASHES
4660	4955	);
4661	4956	}
4662	4957
4663	4958	/* Client API */
		@@ -4664,8 +4959,10 @@
4664	4959
4665	4960	/**
4666	4961	* Verify the onboarding token.
4667	4962	*
	4963	+ * @deprecated since 13.9
	4964	+ *
4668	4965	* @param array $token_data Token data.
4669	4966	* @param string $token Token value.
4670	4967	* @param string $request_data JSON-encoded request data.
4671	4968	*
		@@ -4671,8 +4968,9 @@
4671	4968	*
4672	4969	* @return mixed
4673	4970	*/
4674	4971	public static function verify_onboarding_token( $token_data, $token, $request_data ) {
	4972	+ _deprecated_function( __METHOD__, '13.9' );
4675	4973	// Default to a blog token.
4676	4974	$token_type = 'blog';
4677	4975
4678	4976	// Let's see if this is onboarding. In such case, use user token type and the provided user id.
		@@ -4700,9 +4998,9 @@
4700	4998	$jp_user = get_user_by( 'email', $jpo_user );
4701	4999	if ( is_a( $jp_user, 'WP_User' ) ) {
4702	5000	wp_set_current_user( $jp_user->ID );
4703	5001	$user_can = is_multisite()
4704		- ? current_user_can_for_blog( get_current_blog_id(), 'manage_options' )
	5002	+ ? current_user_can_for_site( get_current_blog_id(), 'manage_options' )
4705	5003	: current_user_can( 'manage_options' );
4706	5004	if ( $user_can ) {
4707	5005	$token_type = 'user';
4708	5006	$token->external_user_id = $jp_user->ID;
		@@ -4719,11 +5017,13 @@
4719	5017
4720	5018	/**
4721	5019	* Create a random secret for validating onboarding payload
4722	5020	*
	5021	+ * @deprecated since 13.9
4723	5022	* @return string Secret token
4724	5023	*/
4725	5024	public static function create_onboarding_token() {
	5025	+ _deprecated_function( __METHOD__, '13.9' );
4726	5026	$token = Jetpack_Options::get_option( 'onboarding' );
4727	5027	if ( false === ( $token ) ) {
4728	5028	$token = wp_generate_password( 32, false );
4729	5029	Jetpack_Options::update_option( 'onboarding', $token );
		@@ -4734,11 +5034,13 @@
4734	5034
4735	5035	/**
4736	5036	* Remove the onboarding token
4737	5037	*
	5038	+ * @deprecated since 13.9
4738	5039	* @return bool True on success, false on failure
4739	5040	*/
4740	5041	public static function invalidate_onboarding_token() {
	5042	+ _deprecated_function( __METHOD__, '13.9' );
4741	5043	return Jetpack_Options::delete_option( 'onboarding' );
4742	5044	}
4743	5045
4744	5046	/**
		@@ -4743,8 +5045,10 @@
4743	5045
4744	5046	/**
4745	5047	* Validate an onboarding token for a specific action
4746	5048	*
	5049	+ * @deprecated since 13.9
	5050	+ *
4747	5051	* @param string $token Onboarding token.
4748	5052	* @param string $action Action name.
4749	5053	*
4750	5054	* @return boolean True if token/action pair is accepted, false if not
		@@ -4749,8 +5053,9 @@
4749	5053	*
4750	5054	* @return boolean True if token/action pair is accepted, false if not
4751	5055	*/
4752	5056	public static function validate_onboarding_token_action( $token, $action ) {
	5057	+ _deprecated_function( __METHOD__, '13.9' );
4753	5058	// Compare tokens, bail if tokens do not match.
4754	5059	if ( ! hash_equals( $token, Jetpack_Options::get_option( 'onboarding' ) ) ) {
4755	5060	return false;
4756	5061	}
		@@ -4776,39 +5081,41 @@
4776	5081	* @return boolean
4777	5082	* @since 2.3.3
4778	5083	*/
4779	5084	public static function permit_ssl( $force_recheck = false ) {
4780		- // Do some fancy tests to see if ssl is being supported.
4781		- if ( ! $force_recheck ) {
4782		- $ssl = get_transient( 'jetpack_https_test' );
	5085	+ if ( ! method_exists( Heartbeat::class, 'permit_ssl' ) ) {
	5086	+ // Skip the SSL-fail notice when the check cannot run.
	5087	+ return true;
4783	5088	}
4784	5089
4785		- if ( $force_recheck || false === $ssl ) {
4786		- $message = '';
4787		- if ( ! str_starts_with( JETPACK__API_BASE, 'https' ) ) {
4788		- $ssl = 0;
4789		- } else {
4790		- $ssl = 1;
	5090	+ return Heartbeat::permit_ssl( $force_recheck );
	5091	+ }
4791	5092
4792		- if ( ! wp_http_supports( array( 'ssl' => true ) ) ) {
4793		- $ssl = 0;
4794		- $message = __( 'WordPress reports no SSL support', 'jetpack' );
4795		- } else {
4796		- $response = wp_remote_get( JETPACK__API_BASE . 'test/1/' );
4797		- if ( is_wp_error( $response ) ) {
4798		- $ssl = 0;
4799		- $message = __( 'WordPress reports no SSL support', 'jetpack' );
4800		- } elseif ( 'OK' !== wp_remote_retrieve_body( $response ) ) {
4801		- $ssl = 0;
4802		- $message = __( 'Response was not OK: ', 'jetpack' ) . wp_remote_retrieve_body( $response );
4803		- }
4804		- }
4805		- }
4806		- set_transient( 'jetpack_https_test', $ssl, DAY_IN_SECONDS );
4807		- set_transient( 'jetpack_https_test_message', $message, DAY_IN_SECONDS );
	5093	+ /**
	5094	+ * Returns a localized message describing the last SSL connectivity failure, if any.
	5095	+ *
	5096	+ * The Connection package's canonical SSL check stores a neutral reason code; this maps it to
	5097	+ * a translated, `jetpack`-domain message for display in the admin notice and AJAX recheck.
	5098	+ *
	5099	+ * @since 16.1
	5100	+ *
	5101	+ * @return string The localized message, or an empty string when there is no failure.
	5102	+ */
	5103	+ public static function get_ssl_test_message() {
	5104	+ if ( ! method_exists( Heartbeat::class, 'get_ssl_test_error' ) ) {
	5105	+ return '';
4808	5106	}
4809	5107
4810		- return (bool) $ssl;
	5108	+ $error = Heartbeat::get_ssl_test_error();
	5109	+
	5110	+ switch ( $error['code'] ) {
	5111	+ case 'no_ssl_support':
	5112	+ return __( 'WordPress reports no SSL support', 'jetpack' );
	5113	+ case 'bad_response':
	5114	+ return __( 'Response was not OK: ', 'jetpack' ) . $error['detail'];
	5115	+ default:
	5116	+ return '';
	5117	+ }
4811	5118	}
4812	5119
4813	5120	/**
4814	5121	* Displays an admin_notice, alerting the user that outbound SSL isn't working.
		@@ -4827,9 +5134,9 @@
4827	5134	<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>
4828	5135	<p>
4829	5136	<?php esc_html_e( 'Jetpack will re-test for HTTPS support once a day, but you can click here to try again immediately: ', 'jetpack' ); ?>
4830	5137	<a href="#" id="jetpack-recheck-ssl-button"><?php esc_html_e( 'Try again', 'jetpack' ); ?></a>
4831		- <span id="jetpack-recheck-ssl-output"><?php echo esc_html( get_transient( 'jetpack_https_test_message' ) ); ?></span>
	5138	+ <span id="jetpack-recheck-ssl-output"><?php echo esc_html( self::get_ssl_test_message() ); ?></span>
4832	5139	</p>
4833	5140	<p>
4834	5141	<?php
4835	5142	printf(
		@@ -4848,18 +5155,18 @@
4848	5155	<script type="text/javascript">
4849	5156	jQuery( document ).ready( function( $ ) {
4850	5157	$( '#jetpack-recheck-ssl-button' ).click( function( e ) {
4851	5158	var $this = $( this );
4852		- $this.html( <?php echo wp_json_encode( __( 'Checking', 'jetpack' ) ); ?> );
	5159	+ $this.html( <?php echo wp_json_encode( esc_html__( 'Checking', 'jetpack' ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?> );
4853	5160	$( '#jetpack-recheck-ssl-output' ).html( '' );
4854	5161	e.preventDefault();
4855		- var data = { action: 'jetpack-recheck-ssl', 'ajax-nonce': <?php echo wp_json_encode( $ajax_nonce ); ?> };
	5162	+ var data = { action: 'jetpack-recheck-ssl', 'ajax-nonce': <?php echo wp_json_encode( $ajax_nonce, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?> };
4856	5163	$.post( ajaxurl, data )
4857	5164	.done( function( response ) {
4858	5165	if ( response.enabled ) {
4859	5166	$( '#jetpack-ssl-warning' ).hide();
4860	5167	} else {
4861		- this.html( <?php echo wp_json_encode( __( 'Try again', 'jetpack' ) ); ?> );
	5168	+ this.html( <?php echo wp_json_encode( esc_html__( 'Try again', 'jetpack' ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?> );
4862	5169	$( '#jetpack-recheck-ssl-output' ).html( 'SSL Failed: ' + response.message );
4863	5170	}
4864	5171	}.bind( $this ) );
4865	5172	} );
		@@ -5217,15 +5524,20 @@
5217	5524
5218	5525	/**
5219	5526	* Checks if the site is currently in an identity crisis.
5220	5527	*
	5528	+ * Now delegates to the Connection package so this matches what the heartbeat itself reports.
	5529	+ * Note the package guards on `Connection\Manager::is_connected()` where this used to guard on
	5530	+ * `Jetpack::is_connection_ready()`, so the `jetpack_is_connection_ready` filter no longer applies.
	5531	+ *
	5532	+ * @deprecated 16.2
	5533	+ *
5221	5534	* @return array|bool Array of options that are in a crisis, or false if everything is OK.
5222	5535	*/
5223	5536	public static function check_identity_crisis() {
5224		- if ( ! self::is_connection_ready() || ( new Status() )->is_offline_mode() || ! Identity_Crisis::validate_sync_error_idc_option() ) {
5225		- return false;
5226		- }
5227		- return Jetpack_Options::get_option( 'sync_error_idc' );
	5537	+ _deprecated_function( __METHOD__, 'jetpack-16.2', 'Automattic\\Jetpack\\Identity_Crisis::check_identity_crisis' );
	5538	+
	5539	+ return Identity_Crisis::check_identity_crisis();
5228	5540	}
5229	5541
5230	5542	/**
5231	5543	* Normalizes a url by doing three things:
		@@ -5313,9 +5625,9 @@
5313	5625	*
5314	5626	* @return mixed
5315	5627	*/
5316	5628	public static function set_suffix_on_min( $src, $handle ) {
5317		- if ( ! str_contains( $src, '.min.css' ) ) {
	5629	+ if ( ! is_string( $src ) || ! str_contains( $src, '.min.css' ) ) {
5318	5630	return $src;
5319	5631	}
5320	5632
5321	5633	if ( ! empty( self::$min_assets ) ) {
		@@ -5372,8 +5684,19 @@
5372	5684	return false;
5373	5685	}
5374	5686
5375	5687	/**
	5688	+ * Register Jetpack-specific tests on the connection package's health test suite.
	5689	+ *
	5690	+ * @param \Automattic\Jetpack\Connection\Connection_Health_Tests $connection_tests The test suite instance.
	5691	+ */
	5692	+ public function register_jetpack_connection_tests( $connection_tests ) {
	5693	+ require_once JETPACK__PLUGIN_DIR . '_inc/lib/debugger/class-jetpack-cxn-tests.php';
	5694	+ $jetpack_tests = new Jetpack_Cxn_Tests();
	5695	+ $jetpack_tests->register_tests_on( $connection_tests );
	5696	+ }
	5697	+
	5698	+ /**
5376	5699	* Throws warnings for deprecated hooks to be removed from Jetpack that cannot remain in the original place in the code.
5377	5700	*/
5378	5701	public function deprecated_hooks() {
5379	5702	$filter_deprecated_list = array(
		@@ -5597,8 +5920,10 @@
5597	5920	'jetpack_contact_form_use_package' => array(
5598	5921	'replacement' => null,
5599	5922	'version' => 'jetpack-13.4.0',
5600	5923	),
	5924	+ // jetpack_implode_frontend_css has been removed, but is not listed here. The updated behavior is exactly the only use of the filter.
	5925	+ // We can reassess formally deprecating it here later; for now, it would be noise with no functional difference.
5601	5926	);
5602	5927
5603	5928	foreach ( $filter_deprecated_list as $tag => $args ) {
5604	5929	if ( has_filter( $tag ) ) {
		@@ -5729,125 +6054,8 @@
5729	6054	return $css;
5730	6055	}
5731	6056
5732	6057	/**
5733		- * This methods removes all of the registered css files on the front end
5734		- * from Jetpack in favor of using a single file. In effect "imploding"
5735		- * all the files into one file.
5736		- *
5737		- * Pros:
5738		- * - Uses only ONE css asset connection instead of 15
5739		- * - Saves a minimum of 56k
5740		- * - Reduces server load
5741		- * - Reduces time to first painted byte
5742		- *
5743		- * Cons:
5744		- * - Loads css for ALL modules. However all selectors are prefixed so it
5745		- * should not cause any issues with themes.
5746		- * - Plugins/themes dequeuing styles no longer do anything. See
5747		- * jetpack_implode_frontend_css filter for a workaround
5748		- *
5749		- * For some situations developers may wish to disable css imploding and
5750		- * instead operate in legacy mode where each file loads seperately and
5751		- * can be edited individually or dequeued. This can be accomplished with
5752		- * the following line:
5753		- *
5754		- * add_filter( 'jetpack_implode_frontend_css', '__return_false' );
5755		- *
5756		- * @param bool $travis_test Is this a test run.
5757		- *
5758		- * @since 3.2
5759		- */
5760		- public function implode_frontend_css( $travis_test = false ) {
5761		- $do_implode = true;
5762		- if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
5763		- $do_implode = false;
5764		- }
5765		-
5766		- // Do not implode CSS when the page loads via the AMP plugin.
5767		- if ( class_exists( Jetpack_AMP_Support::class ) && Jetpack_AMP_Support::is_amp_request() ) {
5768		- $do_implode = false;
5769		- }
5770		-
5771		- /*
5772		- * Only proceed if at least 2 modules with concatenated CSS are active.
5773		- * There is no point in serving a big concatenated CSS file
5774		- * if there are no features (or only one) that actually need some CSS loaded.
5775		- */
5776		- $active_modules = self::get_active_modules();
5777		- $modules_with_concatenated_css = $this->modules_with_concatenated_css;
5778		- $active_module_with_css_count = count( array_intersect( $active_modules, $modules_with_concatenated_css ) );
5779		- if ( $active_module_with_css_count < 2 ) {
5780		- $do_implode = false;
5781		- }
5782		-
5783		- /**
5784		- * Allow CSS to be concatenated into a single jetpack.css file.
5785		- *
5786		- * @since 3.2.0
5787		- *
5788		- * @param bool $do_implode Should CSS be concatenated? Default to true.
5789		- */
5790		- $do_implode = apply_filters( 'jetpack_implode_frontend_css', $do_implode );
5791		-
5792		- // Do not use the imploded file when default behavior was altered through the filter.
5793		- if ( ! $do_implode ) {
5794		- return;
5795		- }
5796		-
5797		- // We do not want to use the imploded file in dev mode, or if not connected.
5798		- if ( ( new Status() )->is_offline_mode() || ! self::is_connection_ready() ) {
5799		- if ( ! $travis_test ) {
5800		- return;
5801		- }
5802		- }
5803		-
5804		- // Do not use the imploded file if sharing css was dequeued via the sharing settings screen.
5805		- if ( get_option( 'sharedaddy_disable_resources' ) ) {
5806		- return;
5807		- }
5808		-
5809		- /*
5810		- * Now we assume Jetpack is connected and able to serve the single
5811		- * file.
5812		- *
5813		- * In the future there will be a check here to serve the file locally
5814		- * or potentially from the Jetpack CDN
5815		- *
5816		- * For now:
5817		- * - Enqueue a single imploded css file
5818		- * - Zero out the style_loader_tag for the bundled ones
5819		- * - Be happy, drink scotch
5820		- */
5821		-
5822		- add_filter( 'style_loader_tag', array( $this, 'concat_remove_style_loader_tag' ), 10, 2 );
5823		-
5824		- $version = self::is_development_version() ? filemtime( JETPACK__PLUGIN_DIR . 'css/jetpack.css' ) : JETPACK__VERSION;
5825		-
5826		- wp_enqueue_style( 'jetpack_css', plugins_url( 'css/jetpack.css', __FILE__ ), array(), $version );
5827		- wp_style_add_data( 'jetpack_css', 'rtl', 'replace' );
5828		- }
5829		-
5830		- /**
5831		- * Removes styles that are part of concatenated group.
5832		- *
5833		- * @param string $tag Style tag.
5834		- * @param string $handle Style handle.
5835		- *
5836		- * @return string
5837		- */
5838		- public function concat_remove_style_loader_tag( $tag, $handle ) {
5839		- if ( in_array( $handle, $this->concatenated_style_handles, true ) ) {
5840		- $tag = '';
5841		- if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
5842		- $tag = '<!-- `' . esc_html( $handle ) . "` is included in the concatenated jetpack.css -->\r\n";
5843		- }
5844		- }
5845		-
5846		- return $tag;
5847		- }
5848		-
5849		- /**
5850	6058	* Check the heartbeat data
5851	6059	*
5852	6060	* Organizes the heartbeat data by severity. For example, if the site
5853	6061	* is in an ID crisis, it will be in the $filtered_data['bad'] array.
		@@ -5859,9 +6067,23 @@
5859	6067	*
5860	6068	* $return array $filtered_data
5861	6069	*/
5862	6070	public static function jetpack_check_heartbeat_data() {
5863		- $raw_data = Jetpack_Heartbeat::generate_stats_array();
	6071	+ /*
	6072	+ * Site environment stats (incl. wp-version/php-version checked below) now live in the Connection package,
	6073	+ * and the IDC stat is contributed by the Connection package's `jetpack_heartbeat_stats_array` filter
	6074	+ * callback. We rebuild the stat here rather than running that filter: the filter's callbacks have side
	6075	+ * effects (Connection\Manager::add_stats_to_heartbeat() consumes and deletes the `xmlrpc_errors` option)
	6076	+ * and return non-scalar values, neither of which is appropriate for this read-only diagnostic.
	6077	+ */
	6078	+ $env_stats = method_exists( Heartbeat::class, 'get_environment_stats' )
	6079	+ ? Heartbeat::get_environment_stats()
	6080	+ : array();
	6081	+ $raw_data = array_merge(
	6082	+ Jetpack_Heartbeat::generate_stats_array(),
	6083	+ $env_stats,
	6084	+ array( 'identitycrisis' => Identity_Crisis::check_identity_crisis() ? 'yes' : 'no' )
	6085	+ );
5864	6086
5865	6087	$good = array();
5866	6088	$caution = array();
5867	6089	$bad = array();
		@@ -6120,13 +6342,20 @@
6120	6342	}
6121	6343	}
6122	6344
6123	6345	/**
6124		- * Returns a boolean for whether backups UI should be displayed or not.
	6346	+ * Whether UI for backups should be displayed.
6125	6347	*
	6348	+ * On WPCom platforms this is gated on the backups-self-serve site feature.
	6349	+ * On self-hosted Jetpack sites it falls back to the jetpack_show_backups filter.
	6350	+ *
6126	6351	* @return bool Should backups UI be displayed?
6127	6352	*/
6128	6353	public static function show_backups_ui() {
	6354	+ if ( ( new \Automattic\Jetpack\Status\Host() )->is_wpcom_platform() ) {
	6355	+ return function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( 'backups-self-serve' );
	6356	+ }
	6357	+
6129	6358	/**
6130	6359	* Whether UI for backups should be displayed.
6131	6360	*
6132	6361	* @since 6.5.0
		@@ -6136,8 +6365,24 @@
6136	6365	return self::is_plugin_active( 'vaultpress/vaultpress.php' ) || apply_filters( 'jetpack_show_backups', true );
6137	6366	}
6138	6367
6139	6368	/**
	6369	+ * Whether UI for security scanning should be displayed.
	6370	+ *
	6371	+ * On WPCom platforms this is gated on the scan-self-serve site feature.
	6372	+ * On self-hosted Jetpack sites it always returns true.
	6373	+ *
	6374	+ * @return bool Should scan UI be displayed?
	6375	+ */
	6376	+ public static function show_scan_ui() {
	6377	+ if ( ( new \Automattic\Jetpack\Status\Host() )->is_wpcom_platform() ) {
	6378	+ return function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( 'scan-self-serve' );
	6379	+ }
	6380	+
	6381	+ return true;
	6382	+ }
	6383	+
	6384	+ /**
6140	6385	* Clean leftoveruser meta.
6141	6386	*
6142	6387	* Delete Jetpack-related user meta when it is no longer needed.
6143	6388	*
		@@ -6224,8 +6469,25 @@
6224	6469	_x( 'Increase earnings with WordAds', 'Creator Product Feature', 'jetpack' ),
6225	6470	),
6226	6471	);
6227	6472
	6473	+ $products['growth'] = array(
	6474	+ 'title' => __( 'Jetpack Growth', 'jetpack' ),
	6475	+ 'slug' => 'jetpack_growth_yearly',
	6476	+ 'description' => __( 'Essential tools to help you grow your audience, track visitor engagement, and turn leads into loyal customers and advocates.', 'jetpack' ),
	6477	+ 'show_promotion' => true,
	6478	+ 'discount_percent' => 50,
	6479	+ 'included_in_plans' => array( 'complete' ),
	6480	+ 'features' => array(
	6481	+ _x( 'Jetpack Social', 'Growth Product Feature', 'jetpack' ),
	6482	+ _x( 'Jetpack Stats (10K site views, upgradeable)', 'Growth Product Feature', 'jetpack' ),
	6483	+ _x( 'Unlimited subscriber imports', 'Growth Product Feature', 'jetpack' ),
	6484	+ _x( 'Earn more from your content', 'Growth Product Feature', 'jetpack' ),
	6485	+ _x( 'Accept payments with PayPal', 'Growth Product Feature', 'jetpack' ),
	6486	+ _x( 'Increase earnings with WordAds', 'Growth Product Feature', 'jetpack' ),
	6487	+ ),
	6488	+ );
	6489	+
6228	6490	$products['scan'] = array(
6229	6491	'title' => __( 'Jetpack Scan', 'jetpack' ),
6230	6492	'slug' => 'jetpack_scan',
6231	6493	'description' => __( 'Automatic scanning and one-click fixes keep your site one step ahead of security threats and malware.', 'jetpack' ),
		@@ -6372,8 +6634,56 @@
6372	6634	. str_repeat( '<span class="dashicons dashicons-star-filled" style="font-size: 16px; width:16px; height: 16px"></span>', 5 )
6373	6635	. '</a>';
6374	6636
6375	6637	return $plugin_meta;
	6638	+ }
	6639	+
	6640	+ /**
	6641	+ * Lazy instantiation of the Plugin_Tracking object.
	6642	+ *
	6643	+ * @since 13.9
	6644	+ *
	6645	+ * @return void
	6646	+ */
	6647	+ public function initialize_tracking() {
	6648	+ if ( did_action( 'jetpack_initialize_tracking' ) > 1 ) {
	6649	+ // Only need to run once.
	6650	+ return;
	6651	+ }
	6652	+
	6653	+ if ( ( new Tracking( 'jetpack', $this->connection_manager ) )->should_enable_tracking( new Terms_Of_Service(), new Status() ) || static::is_connection_ready() ) {
	6654	+ ( new Plugin_Tracking() )->init();
	6655	+ }
	6656	+ }
	6657	+
	6658	+ /**
	6659	+ * Run the "initialize tracking" hook.
	6660	+ *
	6661	+ * @since 13.9
	6662	+ */
	6663	+ public function run_initialize_tracking_action() {
	6664	+ /**
	6665	+ * Fires when the tracking needs to be initialized.
	6666	+ * Doesn't necessarily mean that will actually happen, depends if the 'jetpack_tos_agreed' option is set.
	6667	+ *
	6668	+ * @since 13.9
	6669	+ */
	6670	+ do_action( 'jetpack_initialize_tracking' );
	6671	+ }
	6672	+
	6673	+ /**
	6674	+ * Initialize REST jsonAPI if needed.
	6675	+ *
	6676	+ * @return void
	6677	+ */
	6678	+ public function maybe_initialize_rest_jsonapi() {
	6679	+ // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	6680	+ if ( ! empty( $_GET['jsonapi'] ) && ( ! defined( 'IS_WPCOM' ) || ! IS_WPCOM ) ) {
	6681	+ require_once ABSPATH . 'wp-admin/includes/admin.php'; // JSON API relies on WP functionality not autoloaded in REST.
	6682	+
	6683	+ define( 'WPCOM_JSON_API__BASE', 'public-api.wordpress.com/rest/v1' );
	6684	+ require_once JETPACK__PLUGIN_DIR . 'class.json-api-endpoints.php';
	6685	+ }
6376	6686	}
6377	6687
6378	6688	/**
6379	6689	* Run plugin post-activation actions if we need to.