Updating Classic Editor, Google Authenticatior, Jetpack, Public Post Preview, Table of Contents, Wordpress Importer

Signed-off-by: Yury German <blueknight@gentoo.org>

1 files changed, 226 insertions, 98 deletions

diff --git a/plugins/jetpack/class.jetpack-connection-banner.php b/plugins/jetpack/class.jetpack-connection-banner.php
index 6a0511d3..73317eca 100644
--- a/plugins/jetpack/class.jetpack-connection-banner.php
+++ b/plugins/jetpack/class.jetpack-connection-banner.php
@@ -3,6 +3,9 @@
 use Automattic\Jetpack\Assets;
 use Automattic\Jetpack\Assets\Logo;
 use Automattic\Jetpack\Constants;
+use Automattic\Jetpack\Device_Detection\User_Agent_Info;
+use Automattic\Jetpack\Licensing;
+use Automattic\Jetpack\Redirect;
 
 class Jetpack_Connection_Banner {
 	/**
@@ -29,6 +32,66 @@ class Jetpack_Connection_Banner {
 	}
 
 	/**
+	 * The banner is forcibly displayed.
+	 *
+	 * @return bool
+	 */
+	public static function force_display() {
+		/**
+		 * This is an experiment for partners to test. Allow customization of the behavior of pre-connection banners.
+		 *
+		 * @since 8.6.0
+		 *
+		 * @param bool $always_show_prompt Should this prompt always appear? Default to false.
+		 */
+		return apply_filters( 'jetpack_pre_connection_prompt_helpers', false );
+	}
+
+	/**
+	 * Can the banner be displayed for the given screen?
+	 *
+	 * @param \WP_Screen $current_screen Current WordPress screen.
+	 *
+	 * @return bool
+	 */
+	public static function can_be_displayed( $current_screen ) {
+		$has_connected_owner = Jetpack::connection()->has_connected_owner();
+		$is_connected        = Jetpack::is_connection_ready();
+		$has_licenses        = ! empty( Licensing::instance()->stored_licenses() );
+
+		// Don't show the connect notice if the site has a connected owner.
+		if ( $has_connected_owner ) {
+			return false;
+		}
+
+		// Don't show the connect notice if a site connection is established and there are no stored licenses.
+		// Stored licenses indicate that a purchased product may not be provisioned yet hence we need to keep
+		// showing the notice to nudge the user to connect in order to have their product(s) provisioned.
+		if ( $is_connected && ! $has_licenses ) {
+			return false;
+		}
+
+		// Kill if banner has been dismissed and the pre-connection helpers filter is not set.
+		if (
+			Jetpack_Options::get_option( 'dismissed_connection_banner' ) &&
+			! self::force_display()
+		) {
+			return false;
+		}
+
+		// Don't show the connect notice anywhere but the plugins.php after activating.
+		if ( 'plugins' !== $current_screen->base && 'dashboard' !== $current_screen->base ) {
+			return false;
+		}
+
+		if ( ! current_user_can( 'jetpack_connect' ) ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
 	 * Given a string for the the banner was added, and an int that represents the slide to
 	 * a URL for, this function returns a connection URL with a from parameter that will
 	 * support split testing.
@@ -48,11 +111,6 @@ class Jetpack_Connection_Banner {
 			false,
 			sprintf( 'connect-banner-%s-%s', $jp_version_banner_added, $current_screen->base )
 		);
-		// Add a tracks event corresponding to the A/B version displayed
-		$ab_test = Jetpack_Options::get_option( 'ab_connect_banner_green_bar' );
-		if ( in_array( $ab_test, array( 'a', 'b' ), true ) ) {
-			$url = add_query_arg( 'ab_connect_banner_green_bar', $ab_test, $url );
-		}
 		return add_query_arg( 'auth_approved', 'true', $url );
 	}
 
@@ -60,32 +118,25 @@ class Jetpack_Connection_Banner {
 	 * Will initialize hooks to display the new (as of 4.4) connection banner if the current user can
 	 * connect Jetpack, if Jetpack has not been deactivated, and if the current page is the plugins page.
 	 *
-	 * This method should not be called if the site is connected to WordPress.com or if the site is in development mode.
-	 *
 	 * @since 4.4.0
 	 * @since 4.5.0 Made the new (as of 4.4) connection banner display to everyone by default.
 	 * @since 5.3.0 Running another split test between 4.4 banner and a new one in 5.3.
 	 * @since 7.2   B test was removed.
+	 * @since 9.7   Moved the connection condition checking to this method to fulfill Licensing requirements.
 	 *
 	 * @param $current_screen
 	 */
 	function maybe_initialize_hooks( $current_screen ) {
-
-		// Kill if banner has been dismissed
-		if ( Jetpack_Options::get_option( 'dismissed_connection_banner' ) ) {
-			return;
-		}
-
-		// Don't show the connect notice anywhere but the plugins.php after activating
-		if ( 'plugins' !== $current_screen->base && 'dashboard' !== $current_screen->base ) {
+		if ( ! self::can_be_displayed( $current_screen ) ) {
 			return;
 		}
 
-		if ( ! current_user_can( 'jetpack_connect' ) ) {
-			return;
+		if ( ! empty( Licensing::instance()->stored_licenses() ) ) {
+			add_action( 'admin_notices', array( $this, 'render_license_aware_banner' ) );
+		} else {
+			add_action( 'admin_notices', array( $this, 'render_banner' ) );
 		}
 
-		add_action( 'admin_notices', array( $this, 'render_banner' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_banner_scripts' ) );
 		add_action( 'admin_print_styles', array( Jetpack::init(), 'admin_banner_styles' ) );
 
@@ -95,7 +146,14 @@ class Jetpack_Connection_Banner {
 
 		// Only fires immediately after plugin activation
 		if ( get_transient( 'activated_jetpack' ) ) {
-			add_action( 'admin_notices', array( $this, 'render_connect_prompt_full_screen' ) );
+			if (
+				! \Jetpack_Options::get_option( 'has_seen_wc_connection_modal', false )
+				&& in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', Jetpack::get_active_plugins() ), true )
+			) {
+				wp_safe_redirect( Jetpack::admin_url( 'page=jetpack#/woo-setup' ) );
+			} else {
+				add_action( 'admin_notices', array( $this, 'render_connect_prompt_full_screen' ) );
+			}
 			delete_transient( 'activated_jetpack' );
 		}
 	}
@@ -156,16 +214,12 @@ class Jetpack_Connection_Banner {
 
 		$jetpackApiUrl = wp_parse_url( Jetpack::connection()->api_url( '' ) );
 
-		// Due to the limitation in how 3rd party cookies are handled in Safari,
-		// we're falling back to the original flow on Safari desktop and mobile.
-		if ( $is_safari ) {
-			$force_variation = 'original';
-		} elseif ( Constants::is_true( 'JETPACK_SHOULD_USE_CONNECTION_IFRAME' ) ) {
-			$force_variation = 'in_place';
-		} elseif ( Constants::is_defined( 'JETPACK_SHOULD_USE_CONNECTION_IFRAME' ) ) {
+		// Due to the limitation in how 3rd party cookies are handled in Safari and Opera,
+		// we're falling back to the original flow.
+		if ( $is_safari || User_Agent_Info::is_opera_desktop() || Constants::is_true( 'JETPACK_SHOULD_NOT_USE_CONNECTION_IFRAME' ) ) {
 			$force_variation = 'original';
 		} else {
-			$force_variation = null;
+			$force_variation = 'in_place';
 		}
 
 		$tracking = new Automattic\Jetpack\Tracking();
@@ -184,7 +238,7 @@ class Jetpack_Connection_Banner {
 				'forceVariation'        => $force_variation,
 				'connectInPlaceUrl'     => Jetpack::admin_url( 'page=jetpack#/setup' ),
 				'dashboardUrl'          => Jetpack::admin_url( 'page=jetpack#/dashboard' ),
-				'plansPromptUrl'        => Jetpack::admin_url( 'page=jetpack#/plans-prompt' ),
+				'plansPromptUrl'        => Redirect::get_url( 'jetpack-connect-plans' ),
 				'identity'              => $identity,
 				'preFetchScript'        => plugins_url( '_inc/build/admin.js', JETPACK__PLUGIN_FILE ) . '?ver=' . JETPACK__VERSION,
 			)
@@ -192,47 +246,34 @@ class Jetpack_Connection_Banner {
 	}
 
 	/**
-	 * Performs an A/B test showing or hiding the green bar at the top of the connection dialog displayed in Dashboard or Plugins.
-	 * We save which version we're showing so we always show the same to the same user.
-	 * The "A" version displays the green bar at the top.
-	 * The "B" version doesn't display it.
+	 * Renders the new connection banner as of 4.4.0.
 	 *
-	 * @return void
+	 * @since 7.2   Copy and visual elements reduced to show the new focus of Jetpack on Security and Performance.
+	 * @since 4.4.0
 	 */
-	function get_ab_banner_top_bar() {
-		$ab_test = Jetpack_Options::get_option( 'ab_connect_banner_green_bar' );
-		// If it doesn't exist yet, generate it for later use and save it, so we always show the same to this user
-		if ( ! $ab_test ) {
-			$ab_test = 1 === rand( 1, 2 ) ? 'a' : 'b';
-			Jetpack_Options::update_option( 'ab_connect_banner_green_bar', $ab_test );
-		}
-		if ( 'a' === $ab_test ) {
-			?>
+	public function render_banner() {
+		?>
+		<div id="message" class="updated jp-wpcom-connect__container">
 			<div class="jp-wpcom-connect__container-top-text">
 				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect x="0" fill="none" width="24" height="24"/><g><path d="M12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2zm1 15h-2v-2h2v2zm0-4h-2l-.5-6h3l-.5 6z"/></g></svg>
 				<span>
 					<?php esc_html_e( 'You’re almost done. Set up Jetpack to enable powerful security and performance tools for WordPress.', 'jetpack' ); ?>
 				</span>
 			</div>
-			<?php
-		}
-	}
-
-	/**
-	 * Renders the new connection banner as of 4.4.0.
-	 *
-	 * @since 7.2   Copy and visual elements reduced to show the new focus of Jetpack on Security and Performance.
-	 * @since 4.4.0
-	 */
-	function render_banner() {
-		?>
-		<div id="message" class="updated jp-wpcom-connect__container">
-			<?php $this->get_ab_banner_top_bar(); ?>
 			<div class="jp-wpcom-connect__inner-container">
-				<span
-					class="notice-dismiss connection-banner-dismiss"
-					title="<?php esc_attr_e( 'Dismiss this notice', 'jetpack' ); ?>">
-				</span>
+
+				<?php
+				if ( ! $this->force_display() ) :
+					?>
+
+					<span
+						class="notice-dismiss connection-banner-dismiss"
+						title="<?php esc_attr_e( 'Dismiss this notice', 'jetpack' ); ?>">
+					</span>
+
+					<?php
+				endif;
+				?>
 
 				<div class="jp-wpcom-connect__content-container">
 
@@ -304,6 +345,74 @@ class Jetpack_Connection_Banner {
 	}
 
 	/**
+	 * Renders the license-away version of the connection banner.
+	 *
+	 * @since 9.0.0
+	 */
+	public function render_license_aware_banner() {
+		?>
+		<div id="message" class="updated jp-wpcom-connect__container">
+			<div class="jp-wpcom-connect__inner-container">
+				<div class="jp-wpcom-connect__content-container">
+					<!-- slide 1: intro -->
+					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-one jp__slide-is-active">
+
+						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
+							<?php echo ( new Logo() )->render(); ?>
+							<img
+								src="<?php echo esc_url( plugins_url( 'images/jetpack-powering-up.svg', JETPACK__PLUGIN_FILE ) ); ?>"
+								class="jp-wpcom-connect__hide-phone-and-smaller"
+								alt="
+								<?php
+								esc_attr_e(
+									'Jetpack premium services offer even more powerful performance, security, and revenue tools to help you keep your site safe, fast, and help generate income.',
+									'jetpack'
+								);
+								?>
+								"
+								height="auto"
+								width="225"
+								/>
+						</div>
+
+						<div class="jp-wpcom-connect__slide-text">
+							<h2 class="jp-wpcom-connect__quest">
+								<svg class="gridicon gridicons-notice jp-wpcom-connect__quest-marker" height="38" width="38" viewBox="0 0 24 24">
+									<g>
+										<rect x="8" y="6" width="8" height="12" style="fill:#000000" />
+										<path d="M12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2zm1 15h-2v-2h2v2zm0-4h-2l-.5-6h3l-.5 6z"></path>
+									</g>
+								</svg>
+								<?php esc_html_e( 'Your Jetpack purchase needs completion! Please set up the plugin for your subscription.', 'jetpack' ); ?>
+							</h2>
+
+							<p>
+								<?php
+								esc_html_e(
+									'Jetpack offers security, performance, and marketing tools made for WordPress sites by WordPress experts. Set up Jetpack to enable new features for this site; don\'t let your subscription go to waste!',
+									'jetpack'
+								);
+								?>
+							</p>
+
+							<div class="jp-banner__button-container">
+								<span class="jp-banner__tos-blurb"><?php jetpack_render_tos_blurb(); ?></span>
+								<a
+									href="<?php echo esc_url( $this->build_connect_url_for_slide( '90' ) ); ?>"
+									class="dops-button is-primary jp-banner__alt-connect-button">
+									<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
+								</a>
+							</div>
+
+						</div>
+					</div> <!-- end slide 1 -->
+				</div>
+			</div>
+		</div>
+		<?php
+	}
+
+	/**
 	 * Renders the full-screen connection prompt.  Only shown once and on plugin activation.
 	 */
 	public static function render_connect_prompt_full_screen() {
@@ -313,8 +422,10 @@ class Jetpack_Connection_Banner {
 		} else {
 			$bottom_connect_url_from = 'landing-page-bottom';
 		}
+
+		$has_no_owner = ! Jetpack::connection()->has_connected_owner();
 		?>
-		<div class="jp-connect-full__container"><div class="jp-connect-full__container-card">
+		<div class="jp-connect-full__container <?php echo $has_no_owner ? 'jp-jetpack-connect__site_connection' : ''; ?>"><div class="jp-connect-full__container-card">
 
 				<?php if ( 'plugins' === $current_screen->base ) : ?>
 					<?php
@@ -322,15 +433,28 @@ class Jetpack_Connection_Banner {
 					echo $logo->render();
 					?>
 
-					<div class="jp-connect-full__dismiss">
-						<svg class="jp-connect-full__svg-dismiss" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>Dismiss Jetpack Connection Window</title><rect x="0" fill="none" /><g><path d="M17.705 7.705l-1.41-1.41L12 10.59 7.705 6.295l-1.41 1.41L10.59 12l-4.295 4.295 1.41 1.41L12 13.41l4.295 4.295 1.41-1.41L13.41 12l4.295-4.295z"/></g></svg>
-					</div>
+					<?php
+					if ( ! self::force_display() ) :
+						?>
+
+						<div class="jp-connect-full__dismiss">
+							<svg class="jp-connect-full__svg-dismiss" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>Dismiss Jetpack Connection Window</title><rect x="0" fill="none" /><g><path d="M17.705 7.705l-1.41-1.41L12 10.59 7.705 6.295l-1.41 1.41L10.59 12l-4.295 4.295 1.41 1.41L12 13.41l4.295 4.295 1.41-1.41L13.41 12l4.295-4.295z"/></g></svg>
+						</div>
+
+						<?php
+					endif;
+					?>
+
 				<?php endif; ?>
 
-				<div class="jp-connect-full__step-header">
+				<div id="jp-connect-full__step1-header" class="jp-connect-full__step-header">
 					<h2 class="jp-connect-full__step-header-title"><?php esc_html_e( 'Activate essential WordPress security and performance tools by setting up Jetpack', 'jetpack' ); ?></h2>
 				</div>
 
+				<div id="jp-connect-full__step2-header" class="jp-connect-full__step-header">
+					<h2 class="jp-connect-full__step-header-title"><?php esc_html_e( 'Jetpack is activated!', 'jetpack' ); ?><br /><?php esc_html_e( 'Unlock more amazing features by connecting a user account', 'jetpack' ); ?></h2>
+				</div>
+
 				<p class="jp-connect-full__tos-blurb">
 					<?php jetpack_render_tos_blurb(); ?>
 				</p>
@@ -346,57 +470,61 @@ class Jetpack_Connection_Banner {
 					<div class="jp-connect-full__slide">
 						<div class="jp-connect-full__slide-card illustration">
 							<img
-									src="<?php echo plugins_url( 'images/security.svg', JETPACK__PLUGIN_FILE ); ?>"
+									src="<?php echo plugins_url( 'images/jetpack-connection-security.svg', JETPACK__PLUGIN_FILE ); ?>"
 									alt="<?php esc_attr_e( 'Security & Backups', 'jetpack' ); ?>"
 							/>
 						</div>
 						<div class="jp-connect-full__slide-card">
-							<p>
-							<?php
-								esc_html_e(
-									'Jetpack protects you against brute force attacks and unauthorized logins. ' .
-									'Basic protection is always free, while premium plans add unlimited backups of your whole site, ' .
-									'spam protection, malware scanning, and automated fixes.',
-									'jetpack'
-								);
-							?>
-								</p>
+							<h3><?php esc_html_e( 'Always-on Security', 'jetpack' ); ?></h3>
+							<ul>
+								<li><?php esc_html_e( 'Stay one step ahead of security threats with automatic scanning, one-click fixes, and spam protection.', 'jetpack' ); ?></li>
+								<li><?php esc_html_e( 'Real-time backups save every change and one-click restores get you back online quickly.', 'jetpack' ); ?></li>
+								<li><?php esc_html_e( 'Free protection against brute force attacks and instant notifications if your site goes down.', 'jetpack' ); ?></li>
+							</ul>
 						</div>
 					</div>
 					<div class="jp-connect-full__slide">
 						<div class="jp-connect-full__slide-card illustration">
 							<img
-									src="<?php echo plugins_url( 'images/jetpack-speed.svg', JETPACK__PLUGIN_FILE ); ?>"
+									src="<?php echo plugins_url( 'images/jetpack-connection-performance.svg', JETPACK__PLUGIN_FILE ); ?>"
 									alt="<?php esc_attr_e( 'Built-in Performance', 'jetpack' ); ?>"
 							/>
 						</div>
 						<div class="jp-connect-full__slide-card">
-							<p>
-							<?php
-								esc_html_e(
-									'Activate site accelerator tools and watch your page load times decrease—' .
-									"we'll optimize your images and serve them from our own powerful global network of servers, " .
-									'and speed up your mobile site to reduce bandwidth usage.',
-									'jetpack'
-								);
-							?>
-								</p>
+							<h3><?php esc_html_e( 'Built-in Performance', 'jetpack' ); ?></h3>
+							<ul>
+								<li><?php esc_html_e( 'Keep people on your site longer with lightning-fast page load times through our free global CDN.', 'jetpack' ); ?></li>
+								<li><?php esc_html_e( 'Speed up your mobile site and reduce bandwidth usage automatically.', 'jetpack' ); ?></li>
+								<li><?php esc_html_e( 'Improve visitor engagement and sales with a customized search experience.', 'jetpack' ); ?></li>
+							</ul>
 						</div>
 					</div>
 				</div>
 
+				<h2 class="jp-connect-full__testimonial"><?php esc_html_e( 'More than 5 million WordPress sites trust Jetpack for their website security and performance.', 'jetpack' ); ?></h2>
+
 				<?php if ( 'plugins' === $current_screen->base ) : ?>
-					<p class="jp-connect-full__dismiss-paragraph">
-						<a>
-							<?php
-							echo esc_html_x(
-								'Not now, thank you.',
-								'a link that closes the modal window that offers to connect Jetpack',
-								'jetpack'
-							);
-							?>
-						</a>
-					</p>
+
+					<?php
+					if ( ! self::force_display() ) :
+						?>
+
+						<p class="jp-connect-full__dismiss-paragraph">
+							<a>
+								<?php
+								echo esc_html_x(
+									'Not now, thank you.',
+									'a link that closes the modal window that offers to connect Jetpack',
+									'jetpack'
+								);
+								?>
+							</a>
+						</p>
+
+						<?php
+						endif;
+					?>
+
 				<?php endif; ?>
 			</div>
 		</div>