← All changes | modules/plugin-search.php +178 -225 13.1.5 → 7.1.4 View file →

		@@ -1,30 +1,18 @@
1		-<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
	1	+<?php
2	2	/**
3		- * Adds the PSH functionality to Jetpack.
4		- *
5		- * @package automattic/jetpack
	3	+ * Disable direct access and execution.
6	4	*/
7		-
8		-// phpcs:disable Universal.Files.SeparateFunctionsFromOO.Mixed -- TODO: Move classes to appropriately-named class files.
9		-
10		-use Automattic\Jetpack\Constants;
11		-use Automattic\Jetpack\Current_Plan as Jetpack_Plan;
12		-use Automattic\Jetpack\Redirect;
13		-use Automattic\Jetpack\Tracking;
14		-
15		-// Disable direct access and execution.
16	5	if ( ! defined( 'ABSPATH' ) ) {
17	6	exit;
18	7	}
19	8
	9	+
20	10	if (
21	11	is_admin() &&
22		- Jetpack::is_connection_ready() &&
	12	+ Jetpack::is_active() &&
23	13	/** This filter is documented in _inc/lib/admin-pages/class.jetpack-react-page.php */
24	14	apply_filters( 'jetpack_show_promotions', true ) &&
25		- // Disable feature hints when plugins cannot be installed.
26		- ! Constants::is_true( 'DISALLOW_FILE_MODS' ) &&
27	15	jetpack_is_psh_active()
28	16	) {
29	17	Jetpack_Plugin_Search::init();
30	18	}
		@@ -39,24 +27,15 @@
39	27	* @since 7.1.0
40	28	*/
41	29	class Jetpack_Plugin_Search {
42	30
43		- /**
44		- * PSH slug name.
45		- *
46		- * @var string
47		- */
48		- public static $slug = 'jetpack-plugin-search';
	31	+ static $slug = 'jetpack-plugin-search';
49	32
50		- /**
51		- * Singleton constructor.
52		- *
53		- * @return Jetpack_Plugin_Search
54		- */
55	33	public static function init() {
56	34	static $instance = null;
57	35
58	36	if ( ! $instance ) {
	37	+ jetpack_require_lib( 'tracks/client' );
59	38	$instance = new Jetpack_Plugin_Search();
60	39	}
61	40
62	41	return $instance;
		@@ -61,11 +40,8 @@
61	40
62	41	return $instance;
63	42	}
64	43
65		- /**
66		- * Jetpack_Plugin_Search constructor.
67		- */
68	44	public function __construct() {
69	45	add_action( 'current_screen', array( $this, 'start' ) );
70	46	}
71	47
		@@ -71,14 +47,14 @@
71	47
72	48	/**
73	49	* Add actions and filters only if this is the plugin installation screen and it's the first page.
74	50	*
75		- * @param object $screen WP SCreen object.
	51	+ * @param object $screen
76	52	*
77	53	* @since 7.1.0
78	54	*/
79	55	public function start( $screen ) {
80		- if ( 'plugin-install' === $screen->base && ( ! isset( $_GET['paged'] ) || 1 === intval( $_GET['paged'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	56	+ if ( 'plugin-install' === $screen->base && ( ! isset( $_GET['paged'] ) || 1 == $_GET['paged'] ) ) {
81	57	add_action( 'admin_enqueue_scripts', array( $this, 'load_plugins_search_script' ) );
82	58	add_filter( 'plugins_api_result', array( $this, 'inject_jetpack_module_suggestion' ), 10, 3 );
83	59	add_filter( 'self_admin_url', array( $this, 'plugin_details' ) );
84	60	add_filter( 'plugin_install_action_links', array( $this, 'insert_module_related_links' ), 10, 2 );
		@@ -105,25 +81,21 @@
105	81	*
106	82	* @since 7.1.0
107	83	*/
108	84	public static function register_endpoints() {
109		- register_rest_route(
110		- 'jetpack/v4',
111		- '/hints',
112		- array(
113		- 'methods' => WP_REST_Server::EDITABLE,
114		- 'callback' => __CLASS__ . '::dismiss',
115		- 'permission_callback' => __CLASS__ . '::can_request',
116		- 'args' => array(
117		- 'hint' => array(
118		- 'default' => '',
119		- 'type' => 'string',
120		- 'required' => true,
121		- 'validate_callback' => __CLASS__ . '::is_hint_id',
122		- ),
	85	+ register_rest_route( 'jetpack/v4', '/hints', array(
	86	+ 'methods' => WP_REST_Server::EDITABLE,
	87	+ 'callback' => __CLASS__ . '::dismiss',
	88	+ 'permission_callback' => __CLASS__ . '::can_request',
	89	+ 'args' => array(
	90	+ 'hint' => array(
	91	+ 'default' => '',
	92	+ 'type' => 'string',
	93	+ 'required' => true,
	94	+ 'validate_callback' => __CLASS__ . '::is_hint_id',
123	95	),
124	96	)
125		- );
	97	+ ) );
126	98	}
127	99
128	100	/**
129	101	* A WordPress REST API permission callback method that accepts a request object and
		@@ -141,11 +113,11 @@
141	113	* Validates that the ID of the hint to dismiss is a string.
142	114	*
143	115	* @since 7.1.0
144	116	*
145		- * @param string|bool $value Value to check.
	117	+ * @param string|bool $value Value to check.
146	118	* @param WP_REST_Request $request The request sent to the WP REST API.
147		- * @param string $param Name of the parameter passed to endpoint holding $value.
	119	+ * @param string $param Name of the parameter passed to endpoint holding $value.
148	120	*
149	121	* @return bool|WP_Error
150	122	*/
151	123	public static function is_hint_id( $value, $request, $param ) {
		@@ -150,9 +122,8 @@
150	122	*/
151	123	public static function is_hint_id( $value, $request, $param ) {
152	124	return in_array( $value, Jetpack::get_available_modules(), true )
153	125	? true
154		- /* translators: %s is the name of a parameter passed to an endpoint. */
155	126	: new WP_Error( 'invalid_param', sprintf( esc_html__( '%s must be an alphanumeric string.', 'jetpack' ), $param ) );
156	127	}
157	128
158	129	/**
		@@ -201,36 +172,20 @@
201	172	return Jetpack_Options::update_option( 'dismissed_hints', array_merge( self::get_dismissed_hints(), array( $hint ) ) );
202	173	}
203	174
204	175	/**
205		- * Checks that the module slug passed should be displayed.
	176	+ * Checks that the module slug passed, the hint, is not in the list of previously dismissed hints.
206	177	*
207		- * A feature hint will be displayed if it has not been dismissed before or if 2 or fewer other hints have been dismissed.
	178	+ * @since 7.1.0
208	179	*
209		- * @since 7.2.1
210		- *
211	180	* @param string $hint The hint id, which is a Jetpack module slug.
212	181	*
213		- * @return bool True if $hint should be displayed.
	182	+ * @return bool True if $hint wasn't already dismissed.
214	183	*/
215		- protected function should_display_hint( $hint ) {
216		- $dismissed_hints = static::get_dismissed_hints();
217		- // If more than 2 hints have been dismissed, then show no more.
218		- if ( 2 < count( $dismissed_hints ) ) {
219		- return false;
220		- }
221		-
222		- $plan = Jetpack_Plan::get();
223		- if ( isset( $plan['class'] ) && ( 'free' === $plan['class'] || 'personal' === $plan['class'] ) && 'vaultpress' === $hint ) {
224		- return false;
225		- }
226		-
227		- return ! in_array( $hint, $dismissed_hints, true );
	184	+ protected function is_not_dismissed( $hint ) {
	185	+ return ! in_array( $hint, $this->get_dismissed_hints(), true );
228	186	}
229	187
230		- /**
231		- * Load the search scripts and CSS for PSH.
232		- */
233	188	public function load_plugins_search_script() {
234	189	wp_enqueue_script( self::$slug, plugins_url( 'modules/plugin-search/plugin-search.js', JETPACK__PLUGIN_FILE ), array( 'jquery' ), JETPACK__VERSION, true );
235	190	wp_localize_script(
236	191	self::$slug,
		@@ -237,9 +192,8 @@
237	192	'jetpackPluginSearch',
238	193	array(
239	194	'nonce' => wp_create_nonce( 'wp_rest' ),
240	195	'base_rest_url' => rest_url( '/jetpack/v4' ),
241		- 'poweredBy' => esc_html__( 'by Jetpack (installed)', 'jetpack' ),
242	196	'manageSettings' => esc_html__( 'Configure', 'jetpack' ),
243	197	'activateModule' => esc_html__( 'Activate Module', 'jetpack' ),
244	198	'getStarted' => esc_html__( 'Get started', 'jetpack' ),
245	199	'activated' => esc_html__( 'Activated', 'jetpack' ),
		@@ -245,21 +199,16 @@
245	199	'activated' => esc_html__( 'Activated', 'jetpack' ),
246	200	'activating' => esc_html__( 'Activating', 'jetpack' ),
247	201	'logo' => 'https://ps.w.org/jetpack/assets/icon.svg?rev=1791404',
248	202	'legend' => esc_html__(
249		- 'This suggestion was made by Jetpack, the security and performance plugin already installed on your site.',
	203	+ 'Jetpack is trusted by millions to help secure and speed up their WordPress site. Make the most of it today.',
250	204	'jetpack'
251	205	),
252		- 'supportText' => esc_html__(
253		- 'Learn more about these suggestions.',
254		- 'jetpack'
255		- ),
256		- 'supportLink' => Redirect::get_url( 'plugin-hint-learn-support' ),
257	206	'hideText' => esc_html__( 'Hide this suggestion', 'jetpack' ),
258	207	)
259	208	);
260	209
261		- wp_enqueue_style( self::$slug, plugins_url( 'modules/plugin-search/plugin-search.css', JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
	210	+ wp_enqueue_style( self::$slug, plugins_url( 'modules/plugin-search/plugin-search.css', JETPACK__PLUGIN_FILE ) );
262	211	}
263	212
264	213	/**
265	214	* Get the plugin repo's data for Jetpack to populate the fields with.
		@@ -269,23 +218,20 @@
269	218	public static function get_jetpack_plugin_data() {
270	219	$data = get_transient( 'jetpack_plugin_data' );
271	220
272	221	if ( false === $data || is_wp_error( $data ) ) {
273		- include_once ABSPATH . 'wp-admin/includes/plugin-install.php';
274		- $data = plugins_api(
275		- 'plugin_information',
276		- array(
277		- 'slug' => 'jetpack',
278		- 'is_ssl' => is_ssl(),
279		- 'fields' => array(
280		- 'banners' => true,
281		- 'reviews' => true,
282		- 'active_installs' => true,
283		- 'versions' => false,
284		- 'sections' => false,
285		- ),
286		- )
287		- );
	222	+ include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
	223	+ $data = plugins_api( 'plugin_information', array(
	224	+ 'slug' => 'jetpack',
	225	+ 'is_ssl' => is_ssl(),
	226	+ 'fields' => array(
	227	+ 'banners' => true,
	228	+ 'reviews' => true,
	229	+ 'active_installs' => true,
	230	+ 'versions' => false,
	231	+ 'sections' => false,
	232	+ ),
	233	+ ) );
288	234	set_transient( 'jetpack_plugin_data', $data, DAY_IN_SECONDS );
289	235	}
290	236
291	237	return $data;
		@@ -300,16 +246,16 @@
300	246	*/
301	247	public function get_extra_features() {
302	248	return array(
303	249	'akismet' => array(
304		- 'name' => 'Akismet',
305		- 'search_terms' => 'akismet, anti-spam, antispam, comments, spam, spam protection, form spam, captcha, no captcha, nocaptcha, recaptcha, phising, google',
306		- 'short_description' => esc_html__( 'Keep your visitors and search engines happy by stopping comment and contact form spam with Akismet.', 'jetpack' ),
	250	+ 'name' => 'Akismet',
	251	+ 'search_terms' => 'akismet, anti-spam, antispam, comments, spam, spam protection, form spam, captcha, no captcha, nocaptcha, recaptcha, phising, google',
	252	+ 'short_description' => esc_html__( 'Keep your visitors and search engines happy by stopping comment and contact form spam with Akismet.', 'jetpack' ),
307	253	'requires_connection' => true,
308		- 'module' => 'akismet',
309		- 'sort' => '16',
310		- 'learn_more_button' => Redirect::get_url( 'plugin-hint-upgrade-akismet' ),
311		- 'configure_url' => admin_url( 'admin.php?page=akismet-key-config' ),
	254	+ 'module' => 'akismet',
	255	+ 'sort' => '16',
	256	+ 'learn_more_button' => 'https://jetpack.com/features/security/spam-filtering/',
	257	+ 'configure_url' => admin_url( 'admin.php?page=akismet-key-config' ),
312	258	),
313	259	);
314	260	}
315	261
		@@ -314,95 +260,67 @@
314	260	}
315	261
316	262	/**
317	263	* Intercept the plugins API response and add in an appropriate card for Jetpack
318		- *
319		- * @param object $result Plugin search results.
320		- * @param string $action unused.
321		- * @param object $args Search args.
322	264	*/
323	265	public function inject_jetpack_module_suggestion( $result, $action, $args ) {
324		- /*
325		- * Bail if something else hooks into the Plugins' API response
326		- * and does not return results.
327		- */
328		- if ( empty( $result->plugins ) || is_wp_error( $result ) ) {
329		- return $result;
330		- }
331	266
332		- // Looks like a search query; it's matching time.
	267	+ // Looks like a search query; it's matching time
333	268	if ( ! empty( $args->search ) ) {
334	269	require_once JETPACK__PLUGIN_DIR . 'class.jetpack-admin.php';
335		- $tracking = new Tracking();
336	270	$jetpack_modules_list = array_intersect_key(
337	271	array_merge( $this->get_extra_features(), Jetpack_Admin::init()->get_modules() ),
338		- array_flip(
339		- array(
340		- 'contact-form',
341		- 'monitor',
342		- 'photon',
343		- 'photon-cdn',
344		- 'protect',
345		- 'publicize',
346		- 'related-posts',
347		- 'sharedaddy',
348		- 'akismet',
349		- 'vaultpress',
350		- 'videopress',
351		- 'search',
352		- )
353		- )
	272	+ array_flip( array(
	273	+ 'contact-form',
	274	+ 'lazy-images',
	275	+ 'monitor',
	276	+ 'photon',
	277	+ 'photon-cdn',
	278	+ 'protect',
	279	+ 'publicize',
	280	+ 'related-posts',
	281	+ 'sharedaddy',
	282	+ 'akismet',
	283	+ 'vaultpress',
	284	+ 'videopress',
	285	+ 'search',
	286	+ ) )
354	287	);
355	288	uasort( $jetpack_modules_list, array( $this, 'by_sorting_option' ) );
356	289
357		- // Record event when user searches for a term over 3 chars (less than 3 is not very useful).
358		- if ( strlen( $args->search ) >= 3 ) {
359		- $tracking->record_user_event( 'wpa_plugin_search_term', array( 'search_term' => $args->search ) );
360		- }
	290	+ // Record event when user searches for a term
	291	+ JetpackTracking::record_user_event( 'wpa_plugin_search_term', array( 'search_term' => $args->search ) );
361	292
362		- // Lowercase, trim, remove punctuation/special chars, decode url, remove 'jetpack'.
	293	+ // Lowercase, trim, remove punctuation/special chars, decode url, remove 'jetpack'
363	294	$normalized_term = $this->sanitize_search_term( $args->search );
364	295
365	296	$matching_module = null;
366	297
367		- // Try to match a passed search term with module's search terms.
	298	+ // Try to match a passed search term with module's search terms
368	299	foreach ( $jetpack_modules_list as $module_slug => $module_opts ) {
369		- /*
370		- * Does the site's current plan support the feature?
371		- * We don't use Jetpack_Plan::supports() here because
372		- * that check always returns Akismet as supported,
373		- * since Akismet has a free version.
374		- */
375		- $current_plan = Jetpack_Plan::get();
376		- $is_supported_by_plan = in_array( $module_slug, $current_plan['supports'], true );
377		-
378		- if (
379		- false !== stripos( $module_opts['search_terms'] . ', ' . $module_opts['name'], $normalized_term )
380		- && $is_supported_by_plan
381		- ) {
	300	+ if ( false !== stripos( $module_opts['search_terms'] . ', ' . $module_opts['name'], $normalized_term ) ) {
382	301	$matching_module = $module_slug;
383	302	break;
384	303	}
385	304	}
386	305
387		- if ( isset( $matching_module ) && $this->should_display_hint( $matching_module ) ) {
388		- // Record event when a matching feature is found.
389		- $tracking->record_user_event( 'wpa_plugin_search_match_found', array( 'feature' => $matching_module ) );
	306	+ if ( isset( $matching_module ) && $this->is_not_dismissed( $matching_module ) ) {
	307	+ // Record event when a matching feature is found
	308	+ JetpackTracking::record_user_event( 'wpa_plugin_search_match_found', array( 'feature' => $matching_module ) );
390	309
391		- $inject = (array) self::get_jetpack_plugin_data();
	310	+ $inject = (array) self::get_jetpack_plugin_data();
392	311	$image_url = plugins_url( 'modules/plugin-search/psh', JETPACK__PLUGIN_FILE );
393	312	$overrides = array(
394		- 'plugin-search' => true, // Helps to determine if that an injected card.
395		- 'name' => sprintf( // Supplement name/description so that they clearly indicate this was added.
396		- /* translators: Jetpack module name */
	313	+ 'plugin-search' => true, // Helps to determine if that an injected card.
	314	+ 'name' => sprintf( // Supplement name/description so that they clearly indicate this was added.
397	315	esc_html_x( 'Jetpack: %s', 'Jetpack: Module Name', 'jetpack' ),
398	316	$jetpack_modules_list[ $matching_module ]['name']
399	317	),
400		- 'short_description' => $jetpack_modules_list[ $matching_module ]['short_description'],
	318	+ 'short_description' => $jetpack_modules_list[ $matching_module ]['short_description'],
401	319	'requires_connection' => (bool) $jetpack_modules_list[ $matching_module ]['requires_connection'],
402		- 'slug' => self::$slug,
403		- 'version' => JETPACK__VERSION,
404		- 'icons' => array(
	320	+ 'slug' => self::$slug,
	321	+ 'version' => JETPACK__VERSION,
	322	+ 'icons' => array(
405	323	'1x' => "$image_url-128.png",
406	324	'2x' => "$image_url-256.png",
407	325	'svg' => "$image_url.svg",
408	326	),
		@@ -407,12 +325,12 @@
407	325	'svg' => "$image_url.svg",
408	326	),
409	327	);
410	328
411		- // Splice in the base module data.
	329	+ // Splice in the base module data
412	330	$inject = array_merge( $inject, $jetpack_modules_list[ $matching_module ], $overrides );
413	331
414		- // Add it to the top of the list.
	332	+ // Add it to the top of the list
415	333	$result->plugins = array_filter( $result->plugins, array( $this, 'filter_cards' ) );
416	334	array_unshift( $result->plugins, $inject );
417	335	}
418	336	}
		@@ -419,34 +337,19 @@
419	337	return $result;
420	338	}
421	339
422	340	/**
423		- * Remove cards for Jetpack plugins since we don't want duplicates.
	341	+ * Remove cards for Akismet, Jetpack and VaultPress plugins since we don't want duplicates.
424	342	*
425		- * @since 7.1.0
426		- * @since 7.2.0 Only remove Jetpack.
427		- * @since 7.4.0 Simplify for WordPress 5.1+.
	343	+ * @param array|object $plugin
428	344	*
429		- * @param array|object $plugin WordPress search result card.
430		- *
431	345	* @return bool
432	346	*/
433		- public function filter_cards( $plugin ) {
434		- /*
435		- * $plugin is normally an array.
436		- * However, since the response data can be filtered,
437		- * we cannot fully trust its format.
438		- * Let's handle both arrays and objects, and bail if it's neither.
439		- */
440		- if ( is_array( $plugin ) && ! empty( $plugin['slug'] ) ) {
441		- $slug = $plugin['slug'];
442		- } elseif ( is_object( $plugin ) && ! empty( $plugin->slug ) ) {
443		- $slug = $plugin->slug;
444		- } else {
445		- return false;
446		- }
447		-
448		- return ! in_array( $slug, array( 'jetpack' ), true );
	347	+ function filter_cards( $plugin ) {
	348	+ // Take in account that before WordPress 5.1, the list of plugins is an array of objects.
	349	+ // With WordPress 5.1 the list of plugins is an array of arrays.
	350	+ $slug = is_array( $plugin ) ? $plugin['slug'] : $plugin->slug;
	351	+ return ! in_array( $slug, array( 'akismet', 'jetpack', 'vaultpress' ), true );
449	352	}
450	353
451	354	/**
452	355	* Take a raw search query and return something a bit more standardized and
		@@ -451,10 +354,10 @@
451	354	/**
452	355	* Take a raw search query and return something a bit more standardized and
453	356	* easy to work with.
454	357	*
455		- * @param string $term The raw search term.
456		- * @return string A simplified/sanitized version.
	358	+ * @param String $term The raw search term
	359	+ * @return String A simplified/sanitized version.
457	360	*/
458	361	private function sanitize_search_term( $term ) {
459	362	$term = strtolower( urldecode( $term ) );
460	363
		@@ -468,14 +371,28 @@
468	371	}
469	372
470	373	/**
471	374	* Callback function to sort the array of modules by the sort option.
	375	+ */
	376	+ private function by_sorting_option( $m1, $m2 ) {
	377	+ return $m1['sort'] - $m2['sort'];
	378	+ }
	379	+
	380	+ /**
	381	+ * Builds a URL to purchase and upgrade inserting the site fragment and the affiliate code if it exists.
472	382	*
473		- * @param array $m1 Array 1 to sort.
474		- * @param array $m2 Array 2 to sort.
	383	+ * @param string $feature Module slug (or forged one for extra features).
	384	+ *
	385	+ * @since 7.1.0
	386	+ *
	387	+ * @return string URL to upgrade.
475	388	*/
476		- private function by_sorting_option( $m1, $m2 ) {
477		- return $m1['sort'] <=> $m2['sort'];
	389	+ private function get_upgrade_url( $feature ) {
	390	+ $site_raw_url = Jetpack::build_raw_urls( get_home_url() );
	391	+ $affiliateCode = Jetpack_Affiliate::init()->get_affiliate_code();
	392	+ $user = wp_get_current_user()->ID;
	393	+ return "https://jetpack.com/redirect/?source=plugin-hint-upgrade-$feature&site=$site_raw_url&u=$user" .
	394	+ ( $affiliateCode ? "&aff=$affiliateCode" : '' );
478	395	}
479	396
480	397	/**
481	398	* Modify the URL to the feature settings, for example Publicize.
		@@ -481,38 +398,30 @@
481	398	* Modify the URL to the feature settings, for example Publicize.
482	399	* Sharing is included here because while we still have a page in WP Admin,
483	400	* we prefer to send users to Calypso.
484	401	*
485		- * @param string $feature Feature.
486		- * @param string $configure_url URL to configure feature.
	402	+ * @param string $feature
	403	+ * @param string $configure_url
487	404	*
488	405	* @return string
489	406	* @since 7.1.0
	407	+ *
490	408	*/
491	409	private function get_configure_url( $feature, $configure_url ) {
	410	+ $siteFragment = Jetpack::build_raw_urls( get_home_url() );
492	411	switch ( $feature ) {
493	412	case 'sharing':
494	413	case 'publicize':
495		- $configure_url = Redirect::get_url( 'calypso-marketing-connections' );
	414	+ $configure_url = "https://wordpress.com/sharing/$siteFragment";
496	415	break;
497	416	case 'seo-tools':
498		- $configure_url = Redirect::get_url(
499		- 'calypso-marketing-traffic',
500		- array(
501		- 'anchor' => 'seo',
502		- )
503		- );
	417	+ $configure_url = "https://wordpress.com/settings/traffic/$siteFragment#seo";
504	418	break;
505	419	case 'google-analytics':
506		- $configure_url = Redirect::get_url(
507		- 'calypso-marketing-traffic',
508		- array(
509		- 'anchor' => 'analytics',
510		- )
511		- );
	420	+ $configure_url = "https://wordpress.com/settings/traffic/$siteFragment#analytics";
512	421	break;
513	422	case 'wordads':
514		- $configure_url = Redirect::get_url( 'wpcom-ads-settings' );
	423	+ $configure_url = "https://wordpress.com/ads/settings/$siteFragment";
515	424	break;
516	425	}
517	426	return $configure_url;
518	427	}
		@@ -518,11 +427,8 @@
518	427	}
519	428
520	429	/**
521	430	* Put some more appropriate links on our custom result cards.
522		- *
523		- * @param array $links Related links.
524		- * @param array $plugin Plugin result information.
525	431	*/
526	432	public function insert_module_related_links( $links, $plugin ) {
527	433	if ( self::$slug !== $plugin['slug'] ) {
528	434	return $links;
		@@ -536,9 +442,9 @@
536	442	if ( 'akismet' === $plugin['module'] || 'vaultpress' === $plugin['module'] ) {
537	443	$links['jp_get_started'] = '<a
538	444	id="plugin-select-settings"
539	445	class="jetpack-plugin-search__primary jetpack-plugin-search__get-started button"
540		- href="' . esc_url( Redirect::get_url( 'plugin-hint-learn-' . $plugin['module'] ) ) . '"
	446	+ href="https://jetpack.com/redirect/?source=plugin-hint-learn-' . $plugin['module'] . '"
541	447	data-module="' . esc_attr( $plugin['module'] ) . '"
542	448	data-track="get_started"
543	449	>' . esc_html__( 'Get started', 'jetpack' ) . '</a>';
544	450	// Jetpack installed, active, feature not enabled; prompt to enable.
		@@ -543,17 +449,23 @@
543	449	>' . esc_html__( 'Get started', 'jetpack' ) . '</a>';
544	450	// Jetpack installed, active, feature not enabled; prompt to enable.
545	451	} elseif (
546	452	current_user_can( 'jetpack_activate_modules' ) &&
547		- ! Jetpack::is_module_active( $plugin['module'] ) &&
548		- Jetpack_Plan::supports( $plugin['module'] )
	453	+ ! Jetpack::is_module_active( $plugin['module'] )
549	454	) {
550		- $links[] = '<button
	455	+ $links[] = Jetpack::active_plan_supports( $plugin['module'] )
	456	+ ? '<button
551	457	id="plugin-select-activate"
552	458	class="jetpack-plugin-search__primary button"
553	459	data-module="' . esc_attr( $plugin['module'] ) . '"
554	460	data-configure-url="' . esc_url( $this->get_configure_url( $plugin['module'], $plugin['configure_url'] ) ) . '"
555		- > ' . esc_html__( 'Enable', 'jetpack' ) . '</button>';
	461	+ > ' . esc_html__( 'Enable', 'jetpack' ) . '</button>'
	462	+ : '<a
	463	+ class="jetpack-plugin-search__primary button"
	464	+ href="' . esc_url( $this->get_upgrade_url( $plugin['module'] ) ) . '"
	465	+ data-module="' . esc_attr( $plugin['module'] ) . '"
	466	+ data-track="purchase"
	467	+ > ' . esc_html__( 'Purchase', 'jetpack' ) . '</button>';
556	468
557	469	// Jetpack installed, active, feature enabled; link to settings.
558	470	} elseif (
559	471	! empty( $plugin['configure_url'] ) &&
		@@ -568,14 +480,14 @@
568	480	href="' . esc_url( $this->get_configure_url( $plugin['module'], $plugin['configure_url'] ) ) . '"
569	481	data-module="' . esc_attr( $plugin['module'] ) . '"
570	482	data-track="configure"
571	483	>' . esc_html__( 'Configure', 'jetpack' ) . '</a>';
572		- // Module is active, doesn't have options to configure.
	484	+ // Module is active, doesn't have options to configure
573	485	} elseif ( Jetpack::is_module_active( $plugin['module'] ) ) {
574	486	$links['jp_get_started'] = '<a
575	487	id="plugin-select-settings"
576	488	class="jetpack-plugin-search__primary jetpack-plugin-search__get-started button"
577		- href="' . esc_url( Redirect::get_url( 'plugin-hint-learn-' . $plugin['module'] ) ) . '"
	489	+ href="https://jetpack.com/redirect/?source=plugin-hint-learn-' . $plugin['module'] . '"
578	490	data-module="' . esc_attr( $plugin['module'] ) . '"
579	491	data-track="get_started"
580	492	>' . esc_html__( 'Get started', 'jetpack' ) . '</a>';
581	493	}
		@@ -590,9 +502,9 @@
590	502	data-track="learn_more"
591	503	>' . esc_html__( 'Learn more', 'jetpack' ) . '</a>';
592	504	}
593	505
594		- // Dismiss link.
	506	+ // Dismiss link
595	507	$links[] = '<a
596	508	class="jetpack-plugin-search__dismiss"
597	509	data-module="' . esc_attr( $plugin['module'] ) . '"
598	510	>' . esc_html__( 'Hide this suggestion', 'jetpack' ) . '</a>';
		@@ -598,8 +510,9 @@
598	510	>' . esc_html__( 'Hide this suggestion', 'jetpack' ) . '</a>';
599	511
600	512	return $links;
601	513	}
	514	+
602	515	}
603	516
604	517	/**
605	518	* Master control that checks if Plugin search hints is active.
		@@ -608,13 +521,53 @@
608	521	*
609	522	* @return bool True if PSH is active.
610	523	*/
611	524	function jetpack_is_psh_active() {
612		- /**
613		- * Disables the Plugin Search Hints feature found when searching the plugins page.
614		- *
615		- * @since 8.7.0
616		- *
617		- * @param bool Set false to disable the feature.
618		- */
619		- return apply_filters( 'jetpack_psh_active', true );
	525	+ // false means unset, 1 means active, 0 means inactive.
	526	+ $status = get_transient( 'jetpack_psh_status' );
	527	+
	528	+ if ( false === $status ) {
	529	+ $error = false;
	530	+ $status = jetpack_get_remote_is_psh_active( $error );
	531	+ set_transient(
	532	+ 'jetpack_psh_status',
	533	+ // Cache as int
	534	+ (int) $status,
	535	+ // If there was an error, still cache but for a shorter time
	536	+ ( $error ? 5 : 15 ) * MINUTE_IN_SECONDS
	537	+ );
	538	+ }
	539	+
	540	+ return (bool) $status;
	541	+}
	542	+
	543	+/**
	544	+ * Makes remote request to determine if Plugin search hints is active.
	545	+ *
	546	+ * @since 7.1.1
	547	+ * @internal
	548	+ *
	549	+ * @param bool &$error Did the remote request result in an error?
	550	+ * @return bool True if PSH is active.
	551	+ */
	552	+function jetpack_get_remote_is_psh_active( &$error ) {
	553	+ $response = wp_remote_get( 'https://jetpack.com/psh-status/' );
	554	+ if ( is_wp_error( $response ) ) {
	555	+ $error = true;
	556	+ return true;
	557	+ }
	558	+
	559	+ $body = wp_remote_retrieve_body( $response );
	560	+ if ( empty( $body ) ) {
	561	+ $error = true;
	562	+ return true;
	563	+ }
	564	+
	565	+ $json = json_decode( $body );
	566	+ if ( ! isset( $json->active ) ) {
	567	+ $error = true;
	568	+ return true;
	569	+ }
	570	+
	571	+ $error = false;
	572	+ return (bool) $json->active;
620	573	}