← All changes | modules/notes.php +29 -36 14.0.1 → 16.2 View file →

		@@ -1,8 +1,8 @@
1	1	<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
2	2	/**
3	3	* Module Name: Notifications
4		- * Module Description: Receive instant notifications of site comments and likes.
	4	+ * Module Description: Receive real‑time notifications about site activity across your devices.
5	5	* Sort Order: 13
6	6	* First Introduced: 1.9
7	7	* Requires Connection: Yes
8	8	* Requires User Connection: Yes
		@@ -16,8 +16,12 @@
16	16
17	17	use Automattic\Jetpack\Connection\Manager as Connection_Manager;
18	18	use Automattic\Jetpack\Status\Host;
19	19
	20	+if ( ! defined( 'ABSPATH' ) ) {
	21	+ exit( 0 );
	22	+}
	23	+
20	24	if ( ! defined( 'JETPACK_NOTES__CACHE_BUSTER' ) ) {
21	25	define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) . '-lite' );
22	26	}
23	27
		@@ -80,22 +84,8 @@
80	84	if ( ! has_filter( 'show_admin_bar', '__return_true' ) && ! is_user_logged_in() ) {
81	85	return;
82	86	}
83	87
84		- // Do not show notifications in the Site Editor, which is always in fullscreen mode.
85		- global $pagenow;
86		-
87		- // Pre 13.7 pages that still need to be supported if < 13.7 is
88		- // still installed.
89		- $allowed_old_pages = array( 'admin.php', 'themes.php' );
90		- $is_old_site_editor_page = in_array( $pagenow, $allowed_old_pages, true ) && isset( $_GET['page'] ) && 'gutenberg-edit-site' === $_GET['page']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
91		- // For Gutenberg > 13.7, the core `site-editor.php` route is used instead
92		- $is_site_editor_page = 'site-editor.php' === $pagenow;
93		-
94		- if ( $is_site_editor_page || $is_old_site_editor_page ) {
95		- return;
96		- }
97		-
98	88	add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 120 );
99	89	add_action( 'wp_head', array( $this, 'styles_and_scripts' ), 120 );
100	90	add_action( 'admin_head', array( $this, 'styles_and_scripts' ) );
101	91	}
		@@ -105,11 +95,8 @@
105	95	*
106	96	* @return void
107	97	*/
108	98	public function styles_and_scripts() {
109		- if ( self::is_block_editor() ) {
110		- return;
111		- }
112	99	$is_rtl = is_rtl();
113	100
114	101	if ( ( new Host() )->is_woa_site() ) {
115	102	/**
		@@ -139,9 +126,9 @@
139	126	$script_handles[] = 'wpcom-notes-common';
140	127	wp_enqueue_script( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-v2.js' ), array( 'wpcom-notes-common' ), JETPACK_NOTES__CACHE_BUSTER, true );
141	128	$script_handles[] = 'wpcom-notes-admin-bar';
142	129
143		- $wp_notes_args = 'var wpNotesArgs = ' . wp_json_encode( array( 'cacheBuster' => JETPACK_NOTES__CACHE_BUSTER ) ) . ';';
	130	+ $wp_notes_args = 'var wpNotesArgs = ' . wp_json_encode( array( 'cacheBuster' => JETPACK_NOTES__CACHE_BUSTER ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ) . ';';
144	131	wp_add_inline_script( 'wpcom-notes-admin-bar', $wp_notes_args, 'before' );
145	132
146	133	if ( class_exists( 'Jetpack_AMP_Support' ) && Jetpack_AMP_Support::is_amp_request() ) {
147	134	add_filter(
		@@ -169,12 +156,8 @@
169	156	if ( ! is_object( $wp_admin_bar ) ) {
170	157	return;
171	158	}
172	159
173		- if ( self::is_block_editor() ) {
174		- return;
175		- }
176		-
177	160	$user_locale = get_user_locale();
178	161
179	162	if ( ! class_exists( 'GP_Locales' ) ) {
180	163	if ( defined( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) && file_exists( JETPACK__GLOTPRESS_LOCALES_PATH ) ) {
		@@ -190,19 +173,27 @@
190	173	}
191	174
192	175	$third_party_cookie_check_iframe = '<span style="display:none;"><iframe class="jetpack-notes-cookie-check" src="https://widgets.wp.com/3rd-party-cookie-check/index.html"></iframe></span>';
193	176
	177	+ // Opt into the v3 notifications panel/iframe via the `notifications=v3` query parameter.
	178	+ $notifications_version = sanitize_key( wp_unslash( $_GET['notifications'] ?? '' ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	179	+ $panel_id = 'v3' === $notifications_version ? 'wpnt-notes-panel3' : 'wpnt-notes-panel2';
	180	+
194	181	$title = self::get_notes_markup();
	182	+
	183	+ // The default fallback is `en_US`. Remove underscore if present, noting that lang codes can be more than three chars.
	184	+ $user_locale = strtolower( explode( '_', $user_locale, 2 )[0] );
	185	+
195	186	$wp_admin_bar->add_menu(
196	187	array(
197	188	'id' => 'notes',
198	189	'title' => $title,
199	190	'meta' => array(
200		- 'html' => '<div id="wpnt-notes-panel2" class="intrinsic-ignore" style="display:none" lang="' . esc_attr( strtolower( substr( $user_locale, 0, 2 ) ) ) . '" dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"><div class="wpnt-notes-panel-header"><span class="wpnt-notes-header">' . __( 'Notifications', 'jetpack' ) . '</span><span class="wpnt-notes-panel-link"></span></div></div>' . $third_party_cookie_check_iframe,
	191	+ 'html' => '<div id="' . esc_attr( $panel_id ) . '" class="intrinsic-ignore" style="display:none" lang="' . esc_attr( $user_locale ) . '" dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"><div class="wpnt-notes-panel-header"><span class="wpnt-notes-header">' . __( 'Notifications', 'jetpack' ) . '</span><span class="wpnt-notes-panel-link"></span></div></div>' . $third_party_cookie_check_iframe,
201	192	'class' => 'menupop',
202	193	),
203	194	'parent' => 'top-secondary',
204		- 'href' => 'https://wordpress.com/notifications',
	195	+ 'href' => 'https://wordpress.com/reader/notifications',
205	196	)
206	197	);
207	198	}
208	199
		@@ -223,19 +214,21 @@
223	214	* @return void
224	215	*/
225	216	public function print_js() {
226	217	$link_accounts_url = is_user_logged_in() && ! ( new Connection_Manager( 'jetpack' ) )->is_user_connected() ? Jetpack::admin_url() : false;
227		- ?>
228		-<script data-ampdevmode type="text/javascript">
229		-/* <![CDATA[ */
230		- var wpNotesIsJetpackClient = true;
231		- var wpNotesIsJetpackClientV2 = true;
232		- <?php if ( $link_accounts_url ) : ?>
233		- var wpNotesLinkAccountsURL = '<?php echo esc_url( $link_accounts_url ); ?>';
234		-<?php endif; ?>
235		-/* ]]> */
236		-</script>
237		- <?php
	218	+ $script_contents = <<<'JS'
	219	+var wpNotesIsJetpackClient = true;
	220	+var wpNotesIsJetpackClientV2 = true;
	221	+JS;
	222	+ if ( $link_accounts_url ) {
	223	+ $script_contents .= "\nvar wpNotesLinkAccountsURL = " . wp_json_encode( $link_accounts_url, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ) . ';';
	224	+ }
	225	+ wp_print_inline_script_tag(
	226	+ $script_contents,
	227	+ array(
	228	+ 'data-ampdevmode' => true,
	229	+ )
	230	+ );
238	231	}
239	232
240	233	/**
241	234	* Checks to see if we're in the block editor.