← All changes | modules/plugin-search.php +92 -33 12.5.2 → 16.3-a.1 View file →

		@@ -1,8 +1,10 @@
1	1	<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
2	2	/**
3		- * Adds the PSH functionality to Jetpack.
	3	+ * Plugin Search Hints, aka Feature Suggestions.
4	4	*
	5	+ * @since 7.1.0
	6	+ *
5	7	* @package automattic/jetpack
6	8	*/
7	9
8	10	// phpcs:disable Universal.Files.SeparateFunctionsFromOO.Mixed -- TODO: Move classes to appropriately-named class files.
		@@ -11,13 +13,11 @@
11	13	use Automattic\Jetpack\Current_Plan as Jetpack_Plan;
12	14	use Automattic\Jetpack\Redirect;
13	15	use Automattic\Jetpack\Tracking;
14	16
15		-/**
16		- * Disable direct access and execution.
17		- */
	17	+// Disable direct access and execution.
18	18	if ( ! defined( 'ABSPATH' ) ) {
19		- exit;
	19	+ exit( 0 );
20	20	}
21	21
22	22	if (
23	23	is_admin() &&
		@@ -239,9 +239,8 @@
239	239	'jetpackPluginSearch',
240	240	array(
241	241	'nonce' => wp_create_nonce( 'wp_rest' ),
242	242	'base_rest_url' => rest_url( '/jetpack/v4' ),
243		- 'poweredBy' => esc_html__( 'by Jetpack (installed)', 'jetpack' ),
244	243	'manageSettings' => esc_html__( 'Configure', 'jetpack' ),
245	244	'activateModule' => esc_html__( 'Activate Module', 'jetpack' ),
246	245	'getStarted' => esc_html__( 'Get started', 'jetpack' ),
247	246	'activated' => esc_html__( 'Activated', 'jetpack' ),
		@@ -301,9 +300,9 @@
301	300	* @return array List of features.
302	301	*/
303	302	public function get_extra_features() {
304	303	return array(
305		- 'akismet' => array(
	304	+ 'akismet' => array(
306	305	'name' => 'Akismet',
307	306	'search_terms' => 'akismet, anti-spam, antispam, comments, spam, spam protection, form spam, captcha, no captcha, nocaptcha, recaptcha, phising, google',
308	307	'short_description' => esc_html__( 'Keep your visitors and search engines happy by stopping comment and contact form spam with Akismet.', 'jetpack' ),
309	308	'requires_connection' => true,
		@@ -311,12 +310,33 @@
311	310	'sort' => '16',
312	311	'learn_more_button' => Redirect::get_url( 'plugin-hint-upgrade-akismet' ),
313	312	'configure_url' => admin_url( 'admin.php?page=akismet-key-config' ),
314	313	),
	314	+ 'sharing-block' => array(
	315	+ 'name' => esc_html__( 'Sharing buttons block', 'jetpack' ),
	316	+ 'search_terms' => 'share, sharing, sharing block, sharing button, social buttons, buttons, share facebook, share twitter, social share, icons, email, facebook, twitter, x, linkedin, pinterest, social media',
	317	+ 'short_description' => esc_html__( 'Add sharing buttons blocks anywhere on your website to help your visitors share your content.', 'jetpack' ),
	318	+ 'requires_connection' => false,
	319	+ 'module' => 'sharing-block',
	320	+ 'sort' => '13',
	321	+ 'learn_more_button' => Redirect::get_url( 'jetpack-support-sharing-block' ),
	322	+ 'configure_url' => $this->get_sharing_block_editor_url(),
	323	+ ),
315	324	);
316	325	}
317	326
318	327	/**
	328	+ * Site Editor URL for the template the Sharing Buttons block goes in.
	329	+ *
	330	+ * @return string
	331	+ */
	332	+ private function get_sharing_block_editor_url() {
	333	+ return admin_url(
	334	+ 'site-editor.php?p=' . rawurlencode( '/wp_template/' . get_stylesheet() . '//single' ) . '&canvas=edit'
	335	+ );
	336	+ }
	337	+
	338	+ /**
319	339	* Intercept the plugins API response and add in an appropriate card for Jetpack
320	340	*
321	341	* @param object $result Plugin search results.
322	342	* @param string $action unused.
		@@ -332,29 +352,49 @@
332	352	}
333	353
334	354	// Looks like a search query; it's matching time.
335	355	if ( ! empty( $args->search ) ) {
	356	+ $searchable_modules = array(
	357	+ 'contact-form',
	358	+ 'monitor',
	359	+ 'photon',
	360	+ 'photon-cdn',
	361	+ 'protect',
	362	+ 'publicize',
	363	+ 'related-posts',
	364	+ 'akismet',
	365	+ 'vaultpress',
	366	+ 'videopress',
	367	+ 'search',
	368	+ );
	369	+
	370	+ /*
	371	+ * Let's handle the Sharing feature differently.
	372	+ * If we're using a block-based theme, we should suggest the sharing block.
	373	+ * If using a classic theme, we should suggest the old sharing module.
	374	+ */
	375	+ if ( wp_is_block_theme() ) {
	376	+ $searchable_modules[] = 'sharing-block';
	377	+ } else {
	378	+ $searchable_modules[] = 'sharedaddy';
	379	+ }
	380	+
	381	+ /*
	382	+ * Only surface the SEO Tools hint when the new Jetpack SEO admin page is
	383	+ * available and registered, so its CTA never points to a missing page.
	384	+ */
	385	+ if (
	386	+ \Automattic\Jetpack\SEO\Initializer::is_available()
	387	+ && \Automattic\Jetpack\SEO\Initializer::is_seo_surface_visible()
	388	+ ) {
	389	+ $searchable_modules[] = 'seo-tools';
	390	+ }
	391	+
336	392	require_once JETPACK__PLUGIN_DIR . 'class.jetpack-admin.php';
337	393	$tracking = new Tracking();
338	394	$jetpack_modules_list = array_intersect_key(
339	395	array_merge( $this->get_extra_features(), Jetpack_Admin::init()->get_modules() ),
340		- array_flip(
341		- array(
342		- 'contact-form',
343		- 'lazy-images',
344		- 'monitor',
345		- 'photon',
346		- 'photon-cdn',
347		- 'protect',
348		- 'publicize',
349		- 'related-posts',
350		- 'sharedaddy',
351		- 'akismet',
352		- 'vaultpress',
353		- 'videopress',
354		- 'search',
355		- )
356		- )
	396	+ array_flip( $searchable_modules )
357	397	);
358	398	uasort( $jetpack_modules_list, array( $this, 'by_sorting_option' ) );
359	399
360	400	// Record event when user searches for a term over 3 chars (less than 3 is not very useful).
		@@ -400,8 +440,9 @@
400	440	esc_html_x( 'Jetpack: %s', 'Jetpack: Module Name', 'jetpack' ),
401	441	$jetpack_modules_list[ $matching_module ]['name']
402	442	),
403	443	'short_description' => $jetpack_modules_list[ $matching_module ]['short_description'],
	444	+ 'author' => esc_attr__( 'Jetpack (installed)', 'jetpack' ),
404	445	'requires_connection' => (bool) $jetpack_modules_list[ $matching_module ]['requires_connection'],
405	446	'slug' => self::$slug,
406	447	'version' => JETPACK__VERSION,
407	448	'icons' => array(
		@@ -476,9 +517,9 @@
476	517	* @param array $m1 Array 1 to sort.
477	518	* @param array $m2 Array 2 to sort.
478	519	*/
479	520	private function by_sorting_option( $m1, $m2 ) {
480		- return $m1['sort'] - $m2['sort'];
	521	+ return $m1['sort'] <=> $m2['sort'];
481	522	}
482	523
483	524	/**
484	525	* Modify the URL to the feature settings, for example Publicize.
		@@ -497,14 +538,11 @@
497	538	case 'publicize':
498	539	$configure_url = Redirect::get_url( 'calypso-marketing-connections' );
499	540	break;
500	541	case 'seo-tools':
501		- $configure_url = Redirect::get_url(
502		- 'calypso-marketing-traffic',
503		- array(
504		- 'anchor' => 'seo',
505		- )
506		- );
	542	+ // Jetpack SEO has its own wp-admin page (the new SEO home base);
	543	+ // send users there rather than the legacy Traffic page.
	544	+ $configure_url = admin_url( 'admin.php?page=jetpack-seo' );
507	545	break;
508	546	case 'google-analytics':
509	547	$configure_url = Redirect::get_url(
510	548	'calypso-marketing-traffic',
		@@ -535,13 +573,22 @@
535	573	remove_filter( 'self_admin_url', array( $this, 'plugin_details' ) );
536	574
537	575	$links = array();
538	576
539		- if ( 'akismet' === $plugin['module'] || 'vaultpress' === $plugin['module'] ) {
	577	+ if ( 'sharing-block' === $plugin['module'] ) {
540	578	$links['jp_get_started'] = '<a
541	579	id="plugin-select-settings"
542	580	class="jetpack-plugin-search__primary jetpack-plugin-search__get-started button"
	581	+ href="' . esc_url( $this->get_sharing_block_editor_url() ) . '"
	582	+ data-module="' . esc_attr( $plugin['module'] ) . '"
	583	+ data-track="get_started"
	584	+ >' . esc_html__( 'Add block', 'jetpack' ) . '</a>';
	585	+ } elseif ( 'akismet' === $plugin['module'] || 'vaultpress' === $plugin['module'] ) {
	586	+ $links['jp_get_started'] = '<a
	587	+ id="plugin-select-settings"
	588	+ class="jetpack-plugin-search__primary jetpack-plugin-search__get-started button"
543	589	href="' . esc_url( Redirect::get_url( 'plugin-hint-learn-' . $plugin['module'] ) ) . '"
	590	+ target="_blank"
544	591	data-module="' . esc_attr( $plugin['module'] ) . '"
545	592	data-track="get_started"
546	593	>' . esc_html__( 'Get started', 'jetpack' ) . '</a>';
547	594	// Jetpack installed, active, feature not enabled; prompt to enable.
		@@ -572,13 +619,26 @@
572	619	data-module="' . esc_attr( $plugin['module'] ) . '"
573	620	data-track="configure"
574	621	>' . esc_html__( 'Configure', 'jetpack' ) . '</a>';
575	622	// Module is active, doesn't have options to configure.
	623	+ } elseif ( 'seo-tools' === $plugin['module'] && Jetpack::is_module_active( $plugin['module'] ) ) {
	624	+ // Jetpack SEO has its own wp-admin page; send users there (same tab)
	625	+ // rather than a jetpack.com doc redirect, which isn't registered for
	626	+ // this module. Reuse get_configure_url() so the destination stays in
	627	+ // one place.
	628	+ $links['jp_get_started'] = '<a
	629	+ id="plugin-select-settings"
	630	+ class="jetpack-plugin-search__primary jetpack-plugin-search__get-started button"
	631	+ href="' . esc_url( $this->get_configure_url( $plugin['module'], $plugin['configure_url'] ) ) . '"
	632	+ data-module="' . esc_attr( $plugin['module'] ) . '"
	633	+ data-track="get_started"
	634	+ >' . esc_html__( 'Get started', 'jetpack' ) . '</a>';
576	635	} elseif ( Jetpack::is_module_active( $plugin['module'] ) ) {
577	636	$links['jp_get_started'] = '<a
578	637	id="plugin-select-settings"
579	638	class="jetpack-plugin-search__primary jetpack-plugin-search__get-started button"
580	639	href="' . esc_url( Redirect::get_url( 'plugin-hint-learn-' . $plugin['module'] ) ) . '"
	640	+ target="_blank"
581	641	data-module="' . esc_attr( $plugin['module'] ) . '"
582	642	data-track="get_started"
583	643	>' . esc_html__( 'Get started', 'jetpack' ) . '</a>';
584	644	}
		@@ -601,9 +661,8 @@
601	661	>' . esc_html__( 'Hide this suggestion', 'jetpack' ) . '</a>';
602	662
603	663	return $links;
604	664	}
605		-
606	665	}
607	666
608	667	/**
609	668	* Master control that checks if Plugin search hints is active.