PluginProbe
Jetpack – WP Security, Backup, Speed, & Growth / 16.3-a.1
Jetpack – WP Security, Backup, Speed, & Growth v16.3-a.1
16.3 16.3-beta 16.3-a.5 16.3-a.7 16.3-a.3 16.3-a.1 16.2 16.2-beta 12.0.3 12.1.3 12.2.3 12.3.2 12.4.2 12.5.2 12.6.4 12.7.3 12.8.3 12.9.5 13.0.2 13.1.5 13.2.4 13.3.3 13.4.5 13.5.2 13.6.2 All 508 releases
← All changes | _inc/lib/admin-pages/class.jetpack-admin-page.php +19 -47 16.3-a.5 → 16.3-a.1 View file →
@@ -6,10 +6,8 @@
6 6 */
7 7
8 8 use Automattic\Jetpack\Current_Plan as Jetpack_Plan;
9 9 use Automattic\Jetpack\Identity_Crisis;
10 -use Automattic\Jetpack\Plugin\Admin_Chrome_Logo;
11 -use Automattic\Jetpack\Plugin\Footer_Links;
12 10 use Automattic\Jetpack\Redirect;
13 11 use Automattic\Jetpack\Status;
14 12 use Automattic\Jetpack\Status\Host;
15 13
@@ -107,10 +105,10 @@
107 105 if ( $this->block_page_rendering_for_idc() ) {
108 106 return;
109 107 }
110 108
111 - // The Settings app draws its own header and footer.
112 - if ( isset( $_GET['page'] ) && 'jetpack-settings' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- View logic.
109 + // Check if we are looking at the main dashboard.
110 + if ( isset( $_GET['page'] ) && 'jetpack' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- View logic.
113 111 $this->page_render();
114 112 return;
115 113 }
116 114
@@ -165,28 +163,8 @@
165 163 apply_filters( 'rest_authentication_errors', true );
166 164 }
167 165
168 166 /**
169 - * Fallback redirect meta tag if the REST API is disabled.
170 - *
171 - * @return void
172 - */
173 - public function add_fallback_head_meta() {
174 - echo '<meta http-equiv="refresh" content="0; url=?page=jetpack_modules">';
175 - }
176 -
177 - /**
178 - * Fallback meta tag wrapped in noscript tags for all browsers in case they have JavaScript disabled.
179 - *
180 - * @return void
181 - */
182 - public function add_noscript_head_meta() {
183 - echo '<noscript>';
184 - $this->add_fallback_head_meta();
185 - echo '</noscript>';
186 - }
187 -
188 - /**
189 167 * Checks the site plan and deactivates modules that were active but are no longer included in the plan.
190 168 *
191 169 * @since 4.4.0
192 170 *
@@ -200,9 +178,8 @@
200 178 || ! in_array(
201 179 $page->base,
202 180 array(
203 181 'toplevel_page_jetpack',
204 - 'jetpack_page_jetpack-settings',
205 182 'admin_page_jetpack_modules',
206 183 'jetpack_page_vaultpress',
207 184 'jetpack_page_stats',
208 185 'jetpack_page_akismet-key-config',
@@ -277,12 +254,9 @@
277 254 // True means that Jetpack is NOT connected and NOT in offline mode.
278 255 // If Jetpack is connected OR in offline mode, this will be false.
279 256 $connectable = ! Jetpack::is_connection_ready() && ! ( new Status() )->is_offline_mode();
280 257
281 - $my_jetpack_available = Footer_Links::is_my_jetpack_available();
282 - $my_jetpack_url = admin_url( 'admin.php?page=my-jetpack#/overview' );
283 - $jetpack_logo = Admin_Chrome_Logo::render( 20, '', __( 'Jetpack logo', 'jetpack' ) );
284 -
258 + $jetpack_admin_url = admin_url( 'admin.php?page=jetpack' );
285 259 $jetpack_about_url = ! $connectable
286 260 ? admin_url( 'admin.php?page=jetpack_about' )
287 261 : Redirect::get_url( 'jetpack' );
288 262
@@ -296,13 +270,11 @@
296 270
297 271 <header class="jp-masthead">
298 272 <div class="jp-masthead__inside-container">
299 273 <div class="jp-masthead__title-container">
300 - <?php if ( $my_jetpack_available ) : ?>
301 - <a class="jp-masthead__logo-link" href="<?php echo esc_url( $my_jetpack_url ); ?>"><?php echo $jetpack_logo; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Static SVG built above. ?></a>
302 - <?php else : ?>
303 - <span class="jp-masthead__logo-link"><?php echo $jetpack_logo; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Static SVG built above. ?></span>
304 - <?php endif; ?>
274 + <a class="jp-masthead__logo-link" href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/overview' ) ); ?>">
275 + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" height="20" aria-label="<?php esc_attr_e( 'Jetpack logo', 'jetpack' ); ?>"><path fill="#069e08" d="M16,0C7.2,0,0,7.2,0,16s7.2,16,16,16s16-7.2,16-16S24.8,0,16,0z M15,19H7l8-16V19z M17,29V13h8L17,29z"></path></svg>
276 + </a>
305 277 <h2 class="jp-masthead__title">
306 278 <?php
307 279 // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- View logic only.
308 280 $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
@@ -314,17 +286,11 @@
314 286 $current_label = __( 'About', 'jetpack' );
315 287 } elseif ( 'jetpack-debugger' === $page ) {
316 288 $current_label = __( 'Debug', 'jetpack' );
317 289 }
318 -
319 - // "Jetpack" is a product name, do not translate.
320 290 ?>
321 291 <?php if ( $current_label ) : ?>
322 - <?php if ( $my_jetpack_available ) : ?>
323 - <a class="jp-masthead__title-link" href="<?php echo esc_url( $my_jetpack_url ); ?>">Jetpack</a>
324 - <?php else : ?>
325 - Jetpack
326 - <?php endif; ?>
292 + <a class="jp-masthead__title-link" href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/overview' ) ); ?>">Jetpack</a><?php // "Jetpack" is a product name, do not translate. ?>
327 293 <span class="jp-masthead__title-separator" aria-hidden="true">/</span>
328 294 <?php if ( $is_offline_mode ) : ?>
329 295 <span class="jp-masthead__title-offline"><?php esc_html_e( 'Offline Mode', 'jetpack' ); ?></span>
330 296 <span class="jp-masthead__title-separator" aria-hidden="true">/</span>
@@ -330,9 +296,9 @@
330 296 <span class="jp-masthead__title-separator" aria-hidden="true">/</span>
331 297 <?php endif; ?>
332 298 <span class="jp-masthead__title-current"><?php echo esc_html( $current_label ); ?></span>
333 299 <?php else : ?>
334 - Jetpack
300 + Jetpack<?php // "Jetpack" is a product name, do not translate. ?>
335 301 <?php endif; ?>
336 302 </h2>
337 303 </div>
338 304 <?php
@@ -358,11 +324,18 @@
358 324 <?php
359 325 }
360 326 ?>
361 327 </span>
362 - <?php } elseif ( current_user_can( 'jetpack_manage_modules' ) ) { ?>
328 + <?php } else { ?>
363 329 <span class="dops-button-group">
364 - <a href="<?php echo esc_url( admin_url( 'admin.php?page=jetpack-settings#/settings' ) ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Settings', 'jetpack' ); ?></a>
330 + <a href="<?php echo esc_url( $jetpack_admin_url ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Dashboard', 'jetpack' ); ?></a>
331 + <?php
332 + if ( current_user_can( 'jetpack_manage_modules' ) ) {
333 + ?>
334 + <a href="<?php echo esc_url( $jetpack_admin_url . '#/settings' ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Settings', 'jetpack' ); ?></a>
335 + <?php
336 + }
337 + ?>
365 338 </span>
366 339 <?php } ?>
367 340 </div>
368 341 <?php endif; ?>
@@ -405,12 +378,11 @@
405 378 <path fill="#000" d="M16,0C7.2,0,0,7.2,0,16s7.2,16,16,16s16-7.2,16-16S24.8,0,16,0z M15,19H7l8-16V19z M17,29V13h8L17,29z"></path>
406 379 </svg>
407 380 <span class="jp-footer__module-name"><?php esc_html_e( 'Jetpack', 'jetpack' ); ?></span>
408 381 </div>
409 - <?php if ( ! ( new Host() )->is_wpcom_platform() && $my_jetpack_available ) : ?>
410 - <?php $products_section = Footer_Links::get_my_jetpack_products_section(); ?>
382 + <?php if ( ! ( new Host() )->is_wpcom_platform() ) : ?>
411 383 <div class="jp-footer__menu">
412 - <a href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/' . $products_section['slug'] ) ); ?>" class="jp-footer__menu-item"><?php echo esc_html( $products_section['label'] ); ?></a>
384 + <a href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/products' ) ); ?>" class="jp-footer__menu-item"><?php echo esc_html_x( 'Products', 'Navigation item', 'jetpack' ); ?></a>
413 385 <a href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/help' ) ); ?>" class="jp-footer__menu-item"><?php echo esc_html_x( 'Help', 'Navigation item', 'jetpack' ); ?></a>
414 386 </div>
415 387 <?php endif; ?>
416 388 <a class="jp-footer__a8c-logo" href="<?php echo esc_url( $jetpack_about_url ); ?>" aria-label="<?php echo esc_attr__( 'An Automattic Airline', 'jetpack' ); ?>">