PluginProbe
Jetpack – WP Security, Backup, Speed, & Growth / 16.3-a.5
Jetpack – WP Security, Backup, Speed, & Growth v16.3-a.5
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 13.7.2 13.8.3 All 506 releases
← All changes | extensions/blocks/subscriptions/subscriptions.php +441 -264 13.2.4 → 16.3-a.5 View file →
@@ -7,18 +7,21 @@
7 7
8 8 namespace Automattic\Jetpack\Extensions\Subscriptions;
9 9
10 10 use Automattic\Jetpack\Blocks;
11 -use Automattic\Jetpack\Connection\Manager as Connection_Manager;
12 11 use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Abstract_Token_Subscription_Service;
13 12 use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Jetpack_Token_Subscription_Service;
14 -use Automattic\Jetpack\Status;
13 +use Automattic\Jetpack\Modules;
15 14 use Automattic\Jetpack\Status\Host;
16 -use Jetpack;
15 +use Automattic\Jetpack\Status\Request;
17 16 use Jetpack_Gutenberg;
18 17 use Jetpack_Memberships;
19 18 use Jetpack_Subscriptions_Widget;
20 19
20 +if ( ! defined( 'ABSPATH' ) ) {
21 + exit( 0 );
22 +}
23 +
21 24 require_once __DIR__ . '/class-jetpack-subscription-site.php';
22 25 require_once __DIR__ . '/constants.php';
23 26 require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php';
24 27
@@ -29,8 +32,9 @@
29 32 const DEFAULT_BORDER_WEIGHT_VALUE = 1;
30 33 const DEFAULT_FONTSIZE_VALUE = '16px';
31 34 const DEFAULT_PADDING_VALUE = 15;
32 35 const DEFAULT_SPACING_VALUE = 10;
36 +const DEFAULT_BUTTON_WIDTH = 'auto';
33 37
34 38 /**
35 39 * Registers the block for use in Gutenberg
36 40 * This is done via an action so that we can disable
@@ -44,17 +48,24 @@
44 48 \WPForTeams\is_wpforteams_site( get_current_blog_id() ) ) {
45 49 return;
46 50 }
47 51
48 - if (
49 - ( defined( 'IS_WPCOM' ) && IS_WPCOM )
50 - || ( ( new Connection_Manager( 'jetpack' ) )->has_connected_owner() && ! ( new Status() )->is_offline_mode() )
51 - ) {
52 + /*
53 + * Do not proceed if the newsletter feature (Subscriptions module) is not enabled
54 + */
55 + if ( ! ( new Modules() )->is_active( 'subscriptions' ) ) {
56 + return;
57 + }
58 +
59 + require_once JETPACK__PLUGIN_DIR . '/modules/memberships/class-jetpack-memberships.php';
60 +
61 + if ( \Jetpack_Memberships::should_enable_monetize_blocks_in_editor() ) {
52 62 Blocks::jetpack_register_block(
53 63 __DIR__,
54 64 array(
55 - 'render_callback' => __NAMESPACE__ . '\render_block',
56 - 'supports' => array(
65 + 'render_callback' => __NAMESPACE__ . '\render_block',
66 + 'render_email_callback' => __NAMESPACE__ . '\render_email',
67 + 'supports' => array(
57 68 'spacing' => array(
58 69 'margin' => true,
59 70 'padding' => true,
60 71 ),
@@ -63,31 +74,40 @@
63 74 )
64 75 );
65 76 }
66 77
67 - /*
68 - * If the Subscriptions module is not active,
69 - * do not make any further changes on the site.
70 - */
71 - if ( ! Jetpack::is_module_active( 'subscriptions' ) ) {
72 - return;
73 - }
78 + register_post_meta(
79 + 'post',
80 + META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS,
81 + array(
82 + 'show_in_rest' => true,
83 + 'single' => true,
84 + 'type' => 'string',
85 + // The REST schema already rejects non-strings, but non-REST writers
86 + // (importers, XML-RPC, WP-CLI, direct update_post_meta, sync) only pass
87 + // through sanitize_meta(). Coerce anything that isn't a string to ''
88 + // ("everybody") so a corrupt value can't be persisted and later fatal the
89 + // strict string-typed access checks.
90 + 'sanitize_callback' => function ( $value ) {
91 + return is_string( $value ) ? $value : '';
92 + },
93 + 'auth_callback' => function () {
94 + return wp_get_current_user()->has_cap( 'edit_posts' );
95 + },
96 + )
97 + );
74 98
75 - /**
76 - * Do not proceed if the newsletter feature is not enabled
77 - * or if the 'Jetpack_Memberships' class does not exists.
78 - */
79 - if ( ! class_exists( '\Jetpack_Memberships' ) ) {
80 - return;
81 - }
99 + // The meta is a "don't send" flag, so invert the blog option (which defaults to true = "send").
100 + $dont_email_default = ! get_option( 'wpcom_newsletter_send_default', true );
82 101
83 102 register_post_meta(
84 103 'post',
85 - META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS,
104 + META_NAME_FOR_POST_DONT_EMAIL_TO_SUBS,
86 105 array(
106 + 'default' => $dont_email_default,
87 107 'show_in_rest' => true,
88 108 'single' => true,
89 - 'type' => 'string',
109 + 'type' => 'boolean',
90 110 'auth_callback' => function () {
91 111 return wp_get_current_user()->has_cap( 'edit_posts' );
92 112 },
93 113 )
@@ -94,14 +114,13 @@
94 114 );
95 115
96 116 register_post_meta(
97 117 'post',
98 - META_NAME_FOR_POST_DONT_EMAIL_TO_SUBS,
118 + META_NAME_FOR_POST_TIER_ID_SETTINGS,
99 119 array(
100 - 'default' => false,
101 120 'show_in_rest' => true,
102 121 'single' => true,
103 - 'type' => 'boolean',
122 + 'type' => 'integer',
104 123 'auth_callback' => function () {
105 124 return wp_get_current_user()->has_cap( 'edit_posts' );
106 125 },
107 126 )
@@ -108,13 +127,13 @@
108 127 );
109 128
110 129 register_post_meta(
111 130 'post',
112 - META_NAME_FOR_POST_TIER_ID_SETTINGS,
131 + META_NAME_CONTAINS_PAYWALLED_CONTENT,
113 132 array(
114 133 'show_in_rest' => true,
115 134 'single' => true,
116 - 'type' => 'integer',
135 + 'type' => 'boolean',
117 136 'auth_callback' => function () {
118 137 return wp_get_current_user()->has_cap( 'edit_posts' );
119 138 },
120 139 )
@@ -128,8 +147,11 @@
128 147 $allowed_meta,
129 148 array(
130 149 META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS,
131 150 META_NAME_FOR_POST_DONT_EMAIL_TO_SUBS,
151 + META_NAME_CONTAINS_PAYWALLED_CONTENT,
152 + META_NAME_FOR_POST_TIER_ID_SETTINGS,
153 + META_NAME_CONTAINS_PAID_CONTENT,
132 154 )
133 155 );
134 156 }
135 157 );
@@ -143,14 +165,11 @@
143 165
144 166 // Hide existing comments
145 167 add_filter( 'get_comment', __NAMESPACE__ . '\maybe_gate_existing_comments' );
146 168
147 - // Gate the excerpt for a post
148 - add_filter( 'get_the_excerpt', __NAMESPACE__ . '\jetpack_filter_excerpt_for_newsletter', 10, 2 );
149 -
150 169 // Add a 'Newsletter' column to the Edit posts page
151 170 // We only display the "Newsletter" column if we have configured the paid newsletter plan
152 - if ( Jetpack_Memberships::has_configured_plans_jetpack_recurring_payments( 'newsletter' ) ) {
171 + if ( defined( 'WP_ADMIN' ) && WP_ADMIN && Jetpack_Memberships::has_configured_plans_jetpack_recurring_payments( 'newsletter' ) ) {
153 172 add_action( 'manage_post_posts_columns', __NAMESPACE__ . '\register_newsletter_access_column' );
154 173 add_action( 'manage_post_posts_custom_column', __NAMESPACE__ . '\render_newsletter_access_rows', 10, 2 );
155 174 add_action( 'admin_head', __NAMESPACE__ . '\newsletter_access_column_styles' );
156 175 }
@@ -156,9 +175,31 @@
156 175 }
157 176
158 177 add_action( 'init', __NAMESPACE__ . '\maybe_prevent_super_cache_caching' );
159 178
160 - Jetpack_Subscription_Site::init()->handle_subscribe_block_placements();
179 + add_action( 'wp_after_insert_post', __NAMESPACE__ . '\add_paywalled_content_post_meta', 99, 2 );
180 +
181 + add_filter(
182 + 'jetpack_options_whitelist',
183 + function ( $options ) {
184 + $options[] = 'jetpack_subscriptions_subscribe_post_end_enabled';
185 + $options[] = 'jetpack_subscriptions_subscribe_navigation_enabled';
186 +
187 + return $options;
188 + }
189 + );
190 +
191 + // If called via REST API, we need to register later in the lifecycle
192 + if ( ( new Host() )->is_wpcom_platform() && ! Request::is_frontend() ) {
193 + add_action(
194 + 'restapi_theme_init',
195 + function () {
196 + Jetpack_Subscription_Site::init()->handle_subscribe_block_placements();
197 + }
198 + );
199 + } else {
200 + Jetpack_Subscription_Site::init()->handle_subscribe_block_placements();
201 + }
161 202 }
162 203 add_action( 'init', __NAMESPACE__ . '\register_block', 9 );
163 204
164 205 /**
@@ -186,8 +227,37 @@
186 227 );
187 228 }
188 229
189 230 /**
231 + * Add a meta to prevent publication on firehose, ES AI or Reader
232 + *
233 + * @param int $post_id Post id being saved.
234 + * @param \WP_Post $post Post being saved.
235 + * @return void
236 + */
237 +function add_paywalled_content_post_meta( int $post_id, \WP_Post $post ) {
238 + if ( $post->post_type !== 'post' ) {
239 + return;
240 + }
241 +
242 + $access_level = get_post_meta( $post_id, META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS, true );
243 +
244 + $is_paywalled = false;
245 + switch ( $access_level ) {
246 + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS:
247 + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS:
248 + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS:
249 + $is_paywalled = true;
250 + }
251 + if ( $is_paywalled ) {
252 + update_post_meta( $post_id, META_NAME_CONTAINS_PAYWALLED_CONTENT, $is_paywalled );
253 + }
254 + if ( ! $is_paywalled ) {
255 + delete_post_meta( $post_id, META_NAME_CONTAINS_PAYWALLED_CONTENT );
256 + }
257 +}
258 +
259 +/**
190 260 * Displays the newsletter access level.
191 261 *
192 262 * @param string $column_id The ID of the column to display.
193 263 * @param int $post_id The current post ID.
@@ -224,11 +294,11 @@
224 294 echo '<style id="jetpack-newsletter-newsletter-access-column"> table.fixed .column-newsletter_access { width: 10%; } </style>';
225 295 }
226 296
227 297 /**
228 - * Determine the amount of folks currently subscribed to the blog, splitted out in email_subscribers & social_followers & paid_subscribers
298 + * Determine the amount of folks currently subscribed to the blog, splitted out in total_subscribers, email_subscribers, social_followers & paid_subscribers.
229 299 *
230 - * @return array containing ['value' => ['email_subscribers' => 0, 'paid_subscribers' => 0, 'social_followers' => 0]]
300 + * @return array containing ['value' => ['total_subscribers' => 0, 'email_subscribers' => 0, 'paid_subscribers' => 0, 'social_followers' => 0]]
231 301 */
232 302 function fetch_subscriber_counts() {
233 303 $subs_count = 0;
234 304 if ( is_wpcom() ) {
@@ -246,9 +316,10 @@
246 316 $subs_count = array(
247 317 'status' => 'failed',
248 318 'code' => $xml->getErrorCode(),
249 319 'message' => $xml->getErrorMessage(),
250 - 'value' => ( isset( $subs_count['value'] ) ) ? $subs_count['value'] : array(
320 + 'value' => $subs_count['value'] ?? array(
321 + 'total_subscribers' => 0,
251 322 'email_subscribers' => 0,
252 323 'social_followers' => 0,
253 324 'paid_subscribers' => 0,
254 325 ),
@@ -274,11 +345,11 @@
274 345 function get_subscriber_count( $include_social_followers ) {
275 346 $counts = fetch_subscriber_counts();
276 347
277 348 if ( $include_social_followers ) {
278 - $subscriber_count = $counts['value']['email_subscribers'] + $counts['value']['social_followers'];
349 + $subscriber_count = $counts['value']['total_subscribers'] + $counts['value']['social_followers'];
279 350 } else {
280 - $subscriber_count = $counts['value']['email_subscribers'];
351 + $subscriber_count = $counts['value']['total_subscribers'];
281 352 }
282 353 return $subscriber_count;
283 354 }
284 355
@@ -381,8 +452,24 @@
381 452 );
382 453 }
383 454
384 455 /**
456 + * Checks if block style is "button only"
457 + *
458 + * @param string $class_name Block attribute className; multiple names are spearated by space.
459 + *
460 + * @return bool
461 + */
462 +function is_button_only_style( $class_name ) {
463 + if ( empty( $class_name ) ) {
464 + return false;
465 + }
466 +
467 + $class_names = explode( ' ', $class_name );
468 + return in_array( 'is-style-button', $class_names, true );
469 +}
470 +
471 +/**
385 472 * Uses block attributes to generate an array containing the styles for various block elements.
386 473 * Based on Jetpack_Subscriptions_Widget::do_subscription_form() which the block was originally using.
387 474 *
388 475 * @param array $attributes Array containing the block attributes.
@@ -389,8 +476,10 @@
389 476 *
390 477 * @return array
391 478 */
392 479 function get_element_styles_from_attributes( $attributes ) {
480 + $is_button_only_style = is_button_only_style( get_attribute( $attributes, 'className', '' ) );
481 +
393 482 $button_background_style = ! has_attribute( $attributes, 'buttonBackgroundColor' ) && has_attribute( $attributes, 'customButtonGradient' )
394 483 ? get_attribute( $attributes, 'customButtonGradient' )
395 484 : get_attribute( $attributes, 'customButtonBackgroundColor' );
396 485
@@ -406,15 +495,15 @@
406 495 $submit_button_styles .= sprintf( 'color: %s;', get_attribute( $attributes, 'customTextColor' ) );
407 496 }
408 497
409 498 if ( has_attribute( $attributes, 'buttonWidth' ) ) {
410 - $submit_button_wrapper_styles .= sprintf( 'width: %s;', get_attribute( $attributes, 'buttonWidth' ) );
499 + $submit_button_wrapper_styles .= sprintf( 'width: %s;', get_attribute( $attributes, 'buttonWidth', DEFAULT_BUTTON_WIDTH ) );
411 500 $submit_button_wrapper_styles .= 'max-width: 100%;';
412 501
413 502 // Account for custom margins on inline forms.
414 503 $submit_button_styles .= true === get_attribute( $attributes, 'buttonOnNewLine' )
415 - ? sprintf( 'width: calc(100%% - %dpx);', get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ) )
416 - : 'width: 100%;';
504 + ? 'width: 100%;'
505 + : sprintf( 'width: calc(100%% - %dpx);', get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ) );
417 506 }
418 507
419 508 $font_size = get_attribute( $attributes, 'customFontSize', DEFAULT_FONTSIZE_VALUE );
420 509 $style = sprintf( 'font-size: %s%s;', $font_size, is_numeric( $font_size ) ? 'px' : '' );
@@ -427,14 +516,16 @@
427 516
428 517 $submit_button_styles .= $style;
429 518 $email_field_styles .= $style;
430 519
431 - $button_spacing = get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE );
432 - if ( true === get_attribute( $attributes, 'buttonOnNewLine' ) ) {
433 - $submit_button_styles .= sprintf( 'margin-top: %dpx;', $button_spacing );
434 - } else {
435 - $submit_button_styles .= 'margin: 0px; '; // Reset Safari's 2px default margin for buttons affecting input and button union
436 - $submit_button_styles .= sprintf( 'margin-left: %dpx;', $button_spacing );
520 + if ( ! $is_button_only_style ) {
521 + $button_spacing = get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE );
522 + if ( true === get_attribute( $attributes, 'buttonOnNewLine' ) ) {
523 + $submit_button_styles .= sprintf( 'margin-top: %dpx;', $button_spacing );
524 + } else {
525 + $submit_button_styles .= 'margin: 0; '; // Reset Safari's 2px default margin for buttons affecting input and button union
526 + $submit_button_styles .= sprintf( 'margin-left: %dpx;', $button_spacing );
527 + }
437 528 }
438 529
439 530 if ( has_attribute( $attributes, 'borderColor' ) ) {
440 531 $style = sprintf( 'border-color: %s;', get_attribute( $attributes, 'borderColor', '' ) );
@@ -456,9 +547,9 @@
456 547 $submit_button_styles .= $style;
457 548 $email_field_styles .= $style;
458 549 }
459 550
460 - if ( ! jetpack_is_frontend() ) {
551 + if ( ! Request::is_frontend() ) {
461 552 $background_color_style = get_attribute_color( 'buttonBackgroundColor', $attributes, '#113AF5' /* default lettre theme color */ );
462 553 $text_color_style = get_attribute_color( 'textColor', $attributes, '#FFFFFF' );
463 554 $submit_button_styles .= sprintf( ' background-color: %s; color: %s;', $background_color_style, $text_color_style );
464 555 }
@@ -543,8 +634,15 @@
543 634 return null;
544 635 }
545 636
546 637 /**
638 + * Is the Jetpack_Memberships class loaded.
639 + */
640 +function is_jetpack_memberships_loaded(): bool {
641 + return class_exists( '\Jetpack_Memberships' );
642 +}
643 +
644 +/**
547 645 * Subscriptions block render callback.
548 646 *
549 647 * @param array $attributes Array containing the block attributes.
550 648 *
@@ -551,13 +649,13 @@
551 649 * @return string
552 650 */
553 651 function render_block( $attributes ) {
554 652 // If the Subscriptions module is not active, don't render the block.
555 - if ( ! Jetpack::is_module_active( 'subscriptions' ) ) {
653 + if ( ! ( new Modules() )->is_active( 'subscriptions' ) ) {
556 654 return '';
557 655 }
558 656
559 - if ( class_exists( '\Jetpack_Memberships' ) ) {
657 + if ( is_jetpack_memberships_loaded() ) {
560 658 // We only want the sites that have newsletter feature enabled to be graced by this JavaScript.
561 659 Jetpack_Gutenberg::load_assets_as_required( __DIR__ );
562 660 } else {
563 661 Jetpack_Gutenberg::load_styles_as_required( FEATURE_NAME );
@@ -562,14 +660,21 @@
562 660 } else {
563 661 Jetpack_Gutenberg::load_styles_as_required( FEATURE_NAME );
564 662 }
565 663
664 + if ( ! class_exists( 'Jetpack_Subscriptions_Widget' ) ) {
665 + return '';
666 + }
667 +
668 + // Prefill the email field with the current user's email if they are logged in via Memberships premium content token
566 669 $subscribe_email = Jetpack_Memberships::get_current_user_email();
567 670
568 - /** This filter is documented in modules/contact-form/grunion-contact-form.php */
569 - if ( is_wpcom() || false !== apply_filters( 'jetpack_auto_fill_logged_in_user', false ) ) {
570 - $current_user = wp_get_current_user();
571 - $subscribe_email = ! empty( $current_user->user_email ) ? $current_user->user_email : '';
671 + // If no email, then prefill the email field with the current user's email if they are logged in
672 + if ( empty( $subscribe_email ) ) {
673 + $current_user = wp_get_current_user();
674 + if ( ! empty( $current_user->user_email ) ) {
675 + $subscribe_email = $current_user->user_email;
676 + }
572 677 }
573 678
574 679 // The block is using the Jetpack_Subscriptions_Widget backend, hence the need to increase the instance count.
575 680 ++Jetpack_Subscriptions_Widget::$instance_count;
@@ -584,36 +689,44 @@
584 689 // We want to disencourage including social count as it's misleading.
585 690 $include_social_followers = isset( $attributes['includeSocialFollowers'] ) ? (bool) get_attribute( $attributes, 'includeSocialFollowers' ) : true;
586 691
587 692 $data = array(
588 - 'widget_id' => Jetpack_Subscriptions_Widget::$instance_count,
589 - 'subscribe_email' => $subscribe_email,
590 - 'is_paid_subscriber' => get_attribute( $attributes, 'isPaidSubscriber', false ),
591 - 'wrapper_attributes' => get_block_wrapper_attributes(
693 + 'widget_id' => Jetpack_Subscriptions_Widget::$instance_count,
694 + 'subscribe_email' => $subscribe_email,
695 + 'is_paid_subscriber' => get_attribute( $attributes, 'isPaidSubscriber', false ),
696 + 'wrapper_attributes' => get_block_wrapper_attributes(
592 697 array(
593 698 'class' => $classes['block_wrapper'],
594 699 )
595 700 ),
596 - 'subscribe_placeholder' => get_attribute( $attributes, 'subscribePlaceholder', __( 'Type your email…', 'jetpack' ) ),
597 - 'submit_button_text' => get_attribute( $attributes, 'submitButtonText', __( 'Subscribe', 'jetpack' ) ),
598 - 'submit_button_text_subscribed' => get_attribute( $attributes, 'submitButtonTextSubscribed', __( 'Subscribed', 'jetpack' ) ),
599 - 'submit_button_text_upgrade' => get_attribute( $attributes, 'submitButtonTextUpgrade', __( 'Upgrade subscription', 'jetpack' ) ),
600 - 'success_message' => get_attribute(
701 + 'subscribe_placeholder' => get_attribute( $attributes, 'subscribePlaceholder', __( 'Type your email…', 'jetpack' ) ),
702 + 'submit_button_text' => get_attribute( $attributes, 'submitButtonText', __( 'Subscribe', 'jetpack' ) ),
703 + 'submit_button_text_subscribed' => get_attribute( $attributes, 'submitButtonTextSubscribed', __( 'Subscribed', 'jetpack' ) ),
704 + 'submit_button_text_upgrade' => get_attribute( $attributes, 'submitButtonTextUpgrade', __( 'Upgrade subscription', 'jetpack' ) ),
705 + 'success_message' => get_attribute(
601 706 $attributes,
602 707 'successMessage',
603 - esc_html__( "Success! An email was just sent to confirm your subscription. Please find the email now and click 'Confirm Follow' to start subscribing.", 'jetpack' )
708 + esc_html__( "Success! An email was just sent to confirm your subscription. Please find the email now and click 'Confirm' to start subscribing.", 'jetpack' )
604 709 ),
605 - 'show_subscribers_total' => (bool) get_attribute( $attributes, 'showSubscribersTotal' ),
606 - 'subscribers_total' => get_subscriber_count( $include_social_followers ),
607 - 'referer' => esc_url_raw(
710 + 'show_subscribers_total' => (bool) get_attribute( $attributes, 'showSubscribersTotal' ),
711 + 'subscribers_total' => get_attribute( $attributes, 'showSubscribersTotal' ) ? get_subscriber_count( $include_social_followers ) : 0,
712 + 'referer' => esc_url_raw(
608 713 ( is_ssl() ? 'https' : 'http' ) . '://' . ( isset( $_SERVER['HTTP_HOST'] ) ? wp_unslash( $_SERVER['HTTP_HOST'] ) : '' ) .
609 714 ( isset( $_SERVER['REQUEST_URI'] ) ? wp_unslash( $_SERVER['REQUEST_URI'] ) : '' )
610 715 ),
611 - 'source' => 'subscribe-block',
612 - 'app_source' => get_attribute( $attributes, 'appSource', null ),
716 + 'source' => 'subscribe-block',
717 + 'app_source' => get_attribute( $attributes, 'appSource', null ),
718 + 'class_name' => get_attribute( $attributes, 'className' ),
719 + 'selected_newsletter_categories' => get_attribute( $attributes, 'selectedNewsletterCategoryIds', array() ),
720 + 'preselected_newsletter_categories' => get_attribute( $attributes, 'preselectNewsletterCategories', false ),
613 721 );
614 722
615 - if ( ! jetpack_is_frontend() ) {
723 + // Only render the email version in non-frontend contexts.
724 + if ( is_feed() || wp_is_xml_request() ||
725 + ( defined( 'REST_REQUEST' ) && REST_REQUEST && ! wp_is_json_request() ) ||
726 + ( defined( 'REST_API_REQUEST' ) && REST_API_REQUEST ) ||
727 + ( defined( 'WP_CLI' ) && WP_CLI ) ||
728 + wp_is_jsonp_request() ) {
616 729 return render_for_email( $data, $styles );
617 730 }
618 731
619 732 return render_for_website( $data, $classes, $styles );
@@ -642,14 +755,15 @@
642 755 *
643 756 * @return string
644 757 */
645 758 function render_for_website( $data, $classes, $styles ) {
646 - $lang = get_locale();
647 - $blog_id = \Jetpack_Options::get_option( 'id' );
648 - $widget_id_suffix = Jetpack_Subscriptions_Widget::$instance_count > 1 ? '-' . Jetpack_Subscriptions_Widget::$instance_count : '';
649 - $form_id = 'subscribe-blog' . $widget_id_suffix;
650 - $form_url = 'https://wordpress.com/email-subscriptions';
651 - $post_access_level = get_post_access_level_for_current_post();
759 + $lang = get_locale();
760 + $blog_id = \Jetpack_Options::get_option( 'id' );
761 + $widget_id_suffix = Jetpack_Subscriptions_Widget::$instance_count > 1 ? '-' . Jetpack_Subscriptions_Widget::$instance_count : '';
762 + $form_id = 'subscribe-blog' . $widget_id_suffix;
763 + $form_url = 'https://wordpress.com/email-subscriptions';
764 + $post_access_level = get_post_access_level_for_current_post();
765 + $is_button_only_style = ! empty( $data['class_name'] ) ? is_button_only_style( $data['class_name'] ) : false;
652 766
653 767 // Post ID is used for pulling post-specific paid status, and returning to the right post after confirming subscription
654 768 $post_id = null;
655 769 if ( in_the_loop() ) {
@@ -659,12 +773,13 @@
659 773 } else {
660 774 $post_id = get_option( 'page_on_front' );
661 775 }
662 776
663 - $subscribe_field_id = apply_filters( 'subscribe_field_id', 'subscribe-field' . $widget_id_suffix, $data['widget_id'] );
664 - $tier_id = get_post_meta( $post_id, META_NAME_FOR_POST_TIER_ID_SETTINGS, true );
665 - $is_subscribed = Jetpack_Memberships::is_current_user_subscribed();
666 - $button_text = get_submit_button_text( $data );
777 + $subscribe_field_id = apply_filters( 'subscribe_field_id', 'subscribe-field' . $widget_id_suffix, $data['widget_id'] );
778 + $tier_id = get_post_meta( $post_id, META_NAME_FOR_POST_TIER_ID_SETTINGS, true );
779 + $is_subscribed = Jetpack_Memberships::is_current_user_subscribed();
780 + $button_text = get_submit_button_text( $data );
781 + $show_subscriber_count = $data['show_subscribers_total'] && $data['subscribers_total'] && ! $is_subscribed;
667 782
668 783 ob_start();
669 784
670 785 Jetpack_Subscriptions_Widget::render_widget_status_messages(
@@ -674,83 +789,16 @@
674 789 );
675 790 ?>
676 791 <div <?php echo wp_kses_data( $data['wrapper_attributes'] ); ?>>
677 792 <div class="wp-block-jetpack-subscriptions__container<?php echo ! $is_subscribed ? ' is-not-subscriber' : ''; ?>">
678 - <form
679 - action="<?php echo esc_url( $form_url ); ?>"
680 - method="post"
681 - accept-charset="utf-8"
682 - data-blog="<?php echo esc_attr( $blog_id ); ?>"
683 - data-post_access_level="<?php echo esc_attr( $post_access_level ); ?>"
684 - data-subscriber_email="<?php echo esc_attr( $data['subscribe_email'] ); ?>"
685 - id="<?php echo esc_attr( $form_id ); ?>"
686 - >
687 - <div class="wp-block-jetpack-subscriptions__form-elements">
688 - <?php if ( ! $is_subscribed ) : ?>
689 - <p id="subscribe-email">
690 - <label
691 - id="<?php echo esc_attr( $subscribe_field_id . '-label' ); ?>"
692 - for="<?php echo esc_attr( $subscribe_field_id ); ?>"
693 - class="screen-reader-text"
694 - >
695 - <?php echo esc_html( $data['subscribe_placeholder'] ); ?>
696 - </label>
697 - <?php
698 - printf(
699 - '<input
700 - required="required"
701 - type="email"
702 - name="email"
703 - %1$s
704 - style="%2$s"
705 - placeholder="%3$s"
706 - value="%4$s"
707 - id="%5$s"
708 - %6$s
709 - />',
710 - ( ! empty( $classes['email_field'] )
711 - ? 'class="' . esc_attr( $classes['email_field'] ) . '"'
712 - : ''
713 - ),
714 - ( ! empty( $styles['email_field'] )
715 - ? esc_attr( $styles['email_field'] )
716 - : 'width: 95%; padding: 1px 10px'
717 - ),
718 - esc_attr( $data['subscribe_placeholder'] ),
719 - esc_attr( $data['subscribe_email'] ),
720 - esc_attr( $subscribe_field_id ),
721 - ( ! empty( $data['subscribe_email'] )
722 - ? 'disabled title="' . esc_attr__( "You're logged in with this email", 'jetpack' ) . '"'
723 - : ''
724 - )
725 - );
726 - ?>
727 - </p>
793 + <?php if ( is_top_subscription() ) : ?>
794 + <p id="subscribe-submit" class="is-link"
795 + <?php if ( ! empty( $styles['submit_button_wrapper'] ) ) : ?>
796 + style="<?php echo esc_attr( $styles['submit_button_wrapper'] ); ?>"
728 797 <?php endif; ?>
729 - <p id="subscribe-submit"
730 - <?php if ( ! empty( $styles['submit_button_wrapper'] ) ) : ?>
731 - style="<?php echo esc_attr( $styles['submit_button_wrapper'] ); ?>"
732 - <?php endif; ?>
733 - >
734 - <input type="hidden" name="action" value="<?php echo is_top_subscription() ? 'subscribed' : 'subscribe'; ?>"/>
735 - <input type="hidden" name="blog_id" value="<?php echo (int) $blog_id; ?>"/>
736 - <input type="hidden" name="source" value="<?php echo esc_url( $data['referer'] ); ?>"/>
737 - <input type="hidden" name="sub-type" value="<?php echo esc_attr( $data['source'] ); ?>"/>
738 - <input type="hidden" name="app_source" value="<?php echo esc_attr( $data['app_source'] ); ?>"/>
739 - <input type="hidden" name="redirect_fragment" value="<?php echo esc_attr( $form_id ); ?>"/>
740 - <input type="hidden" name="lang" value="<?php echo esc_attr( $lang ); ?>"/>
741 - <?php
742 - wp_nonce_field( 'blogsub_subscribe_' . $blog_id );
743 -
744 - if ( ! empty( $post_id ) ) {
745 - echo '<input type="hidden" name="post_id" value="' . esc_attr( $post_id ) . '"/>';
746 - }
747 -
748 - if ( ! empty( $tier_id ) ) {
749 - echo '<input type="hidden" name="tier_id" value="' . esc_attr( $tier_id ) . '"/>';
750 - }
751 - ?>
752 - <button type="submit"
798 + >
799 + <a
800 + href="<?php echo esc_url( 'https://wordpress.com/reader/site/subscription/' . $blog_id ); ?>"
753 801 <?php if ( ! empty( $classes['submit_button'] ) ) : ?>
754 802 class="<?php echo esc_attr( $classes['submit_button'] ); ?>"
755 803 <?php endif; ?>
756 804 <?php if ( ! empty( $styles['submit_button'] ) ) : ?>
@@ -755,20 +803,110 @@
755 803 <?php endif; ?>
756 804 <?php if ( ! empty( $styles['submit_button'] ) ) : ?>
757 805 style="<?php echo esc_attr( $styles['submit_button'] ); ?>"
758 806 <?php endif; ?>
759 - name="jetpack_subscriptions_widget"
760 807 >
761 808 <?php echo sanitize_submit_text( $button_text ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
762 - </button>
763 - </p>
764 - </div>
765 - </form>
766 - <?php if ( $data['show_subscribers_total'] && $data['subscribers_total'] ) : ?>
809 + </a>
810 + </p>
811 + <?php else : ?>
812 + <form
813 + action="<?php echo esc_url( $form_url ); ?>"
814 + method="post"
815 + accept-charset="utf-8"
816 + data-blog="<?php echo esc_attr( $blog_id ); ?>"
817 + data-post_access_level="<?php echo esc_attr( $post_access_level ); ?>"
818 + data-subscriber_email="<?php echo esc_attr( $data['subscribe_email'] ); ?>"
819 + id="<?php echo esc_attr( $form_id ); ?>"
820 + >
821 + <div class="wp-block-jetpack-subscriptions__form-elements">
822 + <?php if ( ! $is_subscribed && ! $is_button_only_style ) : ?>
823 + <p id="subscribe-email">
824 + <label
825 + id="<?php echo esc_attr( $subscribe_field_id . '-label' ); ?>"
826 + for="<?php echo esc_attr( $subscribe_field_id ); ?>"
827 + class="screen-reader-text"
828 + >
829 + <?php echo esc_html( $data['subscribe_placeholder'] ); ?>
830 + </label>
831 + <?php
832 + printf(
833 + '<input
834 + required="required"
835 + type="email"
836 + name="email"
837 + autocomplete="email"
838 + %1$s
839 + style="%2$s"
840 + placeholder="%3$s"
841 + value="%4$s"
842 + id="%5$s"
843 + %6$s
844 + />',
845 + ( ! empty( $classes['email_field'] )
846 + ? 'class="' . esc_attr( $classes['email_field'] ) . '"'
847 + : ''
848 + ),
849 + ( ! empty( $styles['email_field'] )
850 + ? esc_attr( $styles['email_field'] )
851 + : 'width: 95%; padding: 1px 10px'
852 + ),
853 + esc_attr( $data['subscribe_placeholder'] ),
854 + esc_attr( $data['subscribe_email'] ),
855 + esc_attr( $subscribe_field_id ),
856 + ( ! empty( $data['subscribe_email'] )
857 + ? 'disabled title="' . esc_attr__( "You're logged in with this email", 'jetpack' ) . '"'
858 + : 'title="' . esc_attr__( 'Please fill in this field.', 'jetpack' ) . '"'
859 + )
860 + );
861 + ?>
862 + </p>
863 + <?php endif; ?>
864 + <p id="subscribe-submit"
865 + <?php if ( ! empty( $styles['submit_button_wrapper'] ) ) : ?>
866 + style="<?php echo esc_attr( $styles['submit_button_wrapper'] ); ?>"
867 + <?php endif; ?>
868 + >
869 + <input type="hidden" name="action" value="subscribe"/>
870 + <input type="hidden" name="blog_id" value="<?php echo (int) $blog_id; ?>"/>
871 + <input type="hidden" name="source" value="<?php echo esc_url( $data['referer'] ); ?>"/>
872 + <input type="hidden" name="sub-type" value="<?php echo esc_attr( $data['source'] ); ?>"/>
873 + <input type="hidden" name="app_source" value="<?php echo esc_attr( $data['app_source'] ); ?>"/>
874 + <input type="hidden" name="redirect_fragment" value="<?php echo esc_attr( $form_id ); ?>"/>
875 + <input type="hidden" name="lang" value="<?php echo esc_attr( $lang ); ?>"/>
876 + <?php
877 + wp_nonce_field( 'blogsub_subscribe_' . $blog_id );
878 +
879 + if ( ! empty( $post_id ) ) {
880 + echo '<input type="hidden" name="post_id" value="' . esc_attr( $post_id ) . '"/>';
881 + }
882 +
883 + if ( ! empty( $tier_id ) ) {
884 + echo '<input type="hidden" name="tier_id" value="' . esc_attr( $tier_id ) . '"/>';
885 + }
886 +
887 + if ( $data['preselected_newsletter_categories'] && ! empty( $data['selected_newsletter_categories'] ) ) {
888 + echo '<input type="hidden" name="selected_newsletter_categories" value="' . esc_attr( implode( ',', $data['selected_newsletter_categories'] ) ) . '"/>';
889 + }
890 + ?>
891 + <button type="submit"
892 + <?php if ( ! empty( $classes['submit_button'] ) ) : ?>
893 + class="<?php echo esc_attr( $classes['submit_button'] ); ?>"
894 + <?php endif; ?>
895 + <?php if ( ! empty( $styles['submit_button'] ) ) : ?>
896 + style="<?php echo esc_attr( $styles['submit_button'] ); ?>"
897 + <?php endif; ?>
898 + name="jetpack_subscriptions_widget"
899 + >
900 + <?php echo sanitize_submit_text( $button_text ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
901 + </button>
902 + </p>
903 + </div>
904 + </form>
905 + <?php endif; ?>
906 + <?php if ( $show_subscriber_count ) : ?>
767 907 <div class="wp-block-jetpack-subscriptions__subscount">
768 - <?php
769 - echo esc_html( Jetpack_Memberships::get_join_others_text( $data['subscribers_total'] ) );
770 - ?>
908 + <?php echo esc_html( Jetpack_Memberships::get_join_others_text( $data['subscribers_total'] ) ); ?>
771 909 </div>
772 910 <?php endif; ?>
773 911 </div>
774 912 </div>
@@ -803,26 +941,56 @@
803 941 return $html;
804 942 }
805 943
806 944 /**
807 - * Filter excerpts looking for subscription data.
945 + * WooCommerce Email Editor render callback for the subscriptions block.
808 946 *
809 - * @param string $excerpt The extrapolated excerpt string.
810 - * @param \WP_Post $post The current post being processed (in `get_the_excerpt`).
947 + * @param string $block_content The block content.
948 + * @param array $parsed_block The parsed block data.
949 + * @param object $rendering_context The email rendering context.
811 950 *
812 - * @return mixed
951 + * @return string
813 952 */
814 -function jetpack_filter_excerpt_for_newsletter( $excerpt, $post = null ) {
815 - // The blogmagazine theme is overriding WP core `get_the_excerpt` filter and only passing the excerpt
816 - // TODO: Until this is fixed, return the excerpt without gating. See https://github.com/Automattic/jetpack/pull/28102#issuecomment-1369161116
817 - if ( $post && str_contains( $post->post_content, '<!-- wp:jetpack/subscriptions -->' ) ) {
818 - $excerpt .= sprintf(
819 - // translators: %s is the permalink url to the current post.
820 - __( "<p><a href='%s'>View post</a> to subscribe to site newsletter.</p>", 'jetpack' ),
821 - get_post_permalink()
822 - );
953 +function render_email( $block_content, array $parsed_block, $rendering_context ) {
954 + if ( ! isset( $parsed_block['attrs'] ) || ! is_array( $parsed_block['attrs'] ) || ! function_exists( '\Automattic\Jetpack\Extensions\Button\render_email' ) || ! class_exists( '\Automattic\WooCommerce\EmailEditor\Integrations\Core\Renderer\Blocks\Button' ) ) {
955 + return '';
823 956 }
824 - return $excerpt;
957 +
958 + // Map subscription block attributes to button block attributes
959 + $button_attributes = array(
960 + 'text' => ! empty( $parsed_block['attrs']['submitButtonText'] ) ? sanitize_text_field( $parsed_block['attrs']['submitButtonText'] ) : __( 'Subscribe', 'jetpack' ),
961 + 'url' => get_post_permalink(),
962 + 'element' => 'a',
963 + // Map background colors
964 + 'backgroundColor' => $parsed_block['attrs']['buttonBackgroundColor'] ?? null,
965 + 'customBackgroundColor' => $parsed_block['attrs']['customButtonBackgroundColor'] ?? null,
966 + // Map text colors
967 + 'textColor' => $parsed_block['attrs']['textColor'] ?? null,
968 + 'customTextColor' => $parsed_block['attrs']['customTextColor'] ?? null,
969 + // Map borders
970 + 'borderRadius' => $parsed_block['attrs']['borderRadius'] ?? 0,
971 + 'borderWeight' => $parsed_block['attrs']['borderWeight'] ?? 1,
972 + 'borderColor' => $parsed_block['attrs']['borderColor'] ?? null,
973 + 'customBorderColor' => $parsed_block['attrs']['customBorderColor'] ?? null,
974 + // Map typography
975 + 'fontSize' => $parsed_block['attrs']['fontSize'] ?? null,
976 + 'customFontSize' => $parsed_block['attrs']['customFontSize'] ?? null,
977 + // Map spacing
978 + 'padding' => $parsed_block['attrs']['padding'] ?? null,
979 + );
980 +
981 + // Create a mock button block structure
982 + $button_parsed_block = array(
983 + 'attrs' => $button_attributes,
984 + 'email_attrs' => $parsed_block['email_attrs'] ?? array(),
985 + );
986 +
987 + // Call the Jetpack button's email rendering
988 + return \Automattic\Jetpack\Extensions\Button\render_email(
989 + $block_content,
990 + $button_parsed_block,
991 + $rendering_context
992 + );
825 993 }
826 994
827 995 /**
828 996 * Gate access to posts
@@ -847,9 +1015,9 @@
847 1015 }
848 1016 return $the_content;
849 1017 }
850 1018
851 - $paywalled_content = get_paywall_content( $post_access_level ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
1019 + $paywalled_content = get_paywall_content();
852 1020
853 1021 if ( has_block( \Automattic\Jetpack\Extensions\Paywall\BLOCK_NAME ) ) {
854 1022 if ( strpos( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML ) ) {
855 1023 return strstr( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML, true ) . $paywalled_content;
@@ -928,12 +1096,11 @@
928 1096
929 1097 /**
930 1098 * Returns paywall content blocks
931 1099 *
932 - * @param string $post_access_level The newsletter access level.
933 1100 * @return string
934 1101 */
935 -function get_paywall_content( $post_access_level ) {
1102 +function get_paywall_content() {
936 1103 if ( Jetpack_Memberships::user_is_pending_subscriber() ) {
937 1104 return get_paywall_blocks_subscribe_pending();
938 1105 }
939 1106 if ( doing_filter( 'get_the_excerpt' ) ) {
@@ -938,9 +1105,9 @@
938 1105 }
939 1106 if ( doing_filter( 'get_the_excerpt' ) ) {
940 1107 return '';
941 1108 }
942 - return get_paywall_blocks( $post_access_level );
1109 + return get_paywall_blocks();
943 1110 }
944 1111
945 1112 /**
946 1113 * Returns the current URL.
@@ -1022,22 +1189,22 @@
1022 1189
1023 1190 /**
1024 1191 * Returns paywall content blocks if user is not authenticated
1025 1192 *
1026 - * @param string $newsletter_access_level The newsletter access level.
1027 1193 * @return string
1028 1194 */
1029 -function get_paywall_blocks( $newsletter_access_level ) {
1195 +function get_paywall_blocks() {
1030 1196 $custom_paywall = apply_filters( 'jetpack_custom_paywall_blocks', false );
1031 1197 if ( ! empty( $custom_paywall ) ) {
1032 1198 return $custom_paywall;
1033 1199 }
1034 - if ( ! jetpack_is_frontend() ) { // emails
1200 +
1201 + if ( ! Request::is_frontend() ) { // emails
1035 1202 return get_paywall_simple();
1036 1203 }
1204 +
1037 1205 require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
1038 - // Only display paid texts when Stripe is connected and the post is marked for paid subscribers
1039 - $is_paid_post = $newsletter_access_level === 'paid_subscribers' && Jetpack_Memberships::has_connected_account();
1206 + $is_paid_post = is_paid_post();
1040 1207 $is_paid_subscriber = Jetpack_Memberships::user_is_paid_subscriber();
1041 1208
1042 1209 $access_heading = $is_paid_subscriber
1043 1210 ? esc_html__( 'Upgrade to continue reading', 'jetpack' )
@@ -1044,50 +1211,42 @@
1044 1211 : esc_html__( 'Subscribe to continue reading', 'jetpack' );
1045 1212
1046 1213 $subscribe_text = $is_paid_post
1047 1214 // translators: %s is the name of the site.
1048 - ? $is_paid_subscriber
1049 - ? esc_html__( 'Upgrade to get access to the rest of this post and other exclusive content.', 'jetpack' )
1050 - : esc_html__( 'Become a paid subscriber to get access to the rest of this post and other exclusive content.', 'jetpack' )
1215 + ? (
1216 + $is_paid_subscriber
1217 + ? esc_html__( 'Upgrade to get access to the rest of this post and other exclusive content.', 'jetpack' )
1218 + : esc_html__( 'Become a paid subscriber to get access to the rest of this post and other exclusive content.', 'jetpack' )
1219 + )
1051 1220 // translators: %s is the name of the site.
1052 1221 : esc_html__( 'Subscribe to get access to the rest of this post and other subscriber-only content.', 'jetpack' );
1053 1222
1054 - $sign_in = '';
1055 - $switch_accounts = '';
1223 + $login_block = '';
1056 1224
1057 - if ( ( new Host() )->is_wpcom_simple() ) {
1058 - // On WPCOM we will redirect directly to the current page
1059 - $redirect_url = get_current_url();
1060 - } else {
1061 - // On self-hosted we will save and hide the token
1062 - $redirect_url = get_site_url() . '/wp-json/jetpack/v4/subscribers/auth';
1063 - $redirect_url = add_query_arg( 'redirect_url', get_current_url(), $redirect_url );
1064 - }
1065 -
1066 - $sign_in_link = add_query_arg(
1067 - array(
1068 - 'site_id' => intval( \Jetpack_Options::get_option( 'id' ) ),
1069 - 'redirect_url' => rawurlencode( $redirect_url ),
1070 - ),
1071 - 'https://subscribe.wordpress.com/memberships/jwt/'
1072 - );
1073 1225 if ( is_user_auth() ) {
1074 1226 if ( ( new Host() )->is_wpcom_simple() ) {
1075 - $switch_accounts_link = wp_logout_url( $sign_in_link );
1076 - $switch_accounts = '<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"}}} -->
1077 -<p class="has-text-align-center" style="font-size:14px"><a href="' . $switch_accounts_link . '">' . __( 'Switch Accounts', 'jetpack' ) . '</a></p>
1227 + // We cannot use wpcom_logmein_redirect_url since it returns redirect URL when user is already logged in.
1228 + $login_link = add_query_arg(
1229 + array(
1230 + 'redirect_to' => rawurlencode( get_current_url() ),
1231 + 'blog_id' => get_current_blog_id(),
1232 + ),
1233 + 'https://wordpress.com/log-in/link'
1234 + );
1235 + $switch_accounts_link = wp_logout_url( $login_link );
1236 + $login_block = '<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"}}} -->
1237 +<p class="has-text-align-center" style="font-size:14px">
1238 + <a href="' . $switch_accounts_link . '">' . __( 'Switch accounts', 'jetpack' ) . '</a>
1239 +</p>
1078 1240 <!-- /wp:paragraph -->';
1079 -
1080 1241 }
1081 1242 } else {
1082 - if ( ( new Host() )->is_wpcom_simple() ) {
1083 - // custom domain
1084 - $sign_in_link = wpcom_logmein_redirect_url( get_current_url(), false, null, 'link', get_current_blog_id() );
1085 - }
1086 - $access_question = get_paywall_access_question( $newsletter_access_level );
1087 - $sign_in = '<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"}}} -->
1088 -<p class="has-text-align-center" style="font-size:14px"><a href="' . $sign_in_link . '">' . $access_question . '</a></p>
1089 -<!-- /wp:paragraph -->';
1243 + $access_question = $is_paid_post ? esc_html__( 'Already a paid subscriber?', 'jetpack' ) : esc_html__( 'Already a subscriber?', 'jetpack' );
1244 + $login_block = '<!-- wp:group {"style":{"typography":{"fontSize":"14px"}},"layout":{"type":"flex","justifyContent":"center"}} -->
1245 +<div class="wp-block-group" style="font-size:14px">
1246 + <!-- wp:jetpack/subscriber-login {"logInLabel":"' . $access_question . '"} /-->
1247 +</div>
1248 +<!-- /wp:group -->';
1090 1249 }
1091 1250
1092 1251 $lock_svg = plugins_url( 'images/lock-paywall.svg', JETPACK__PLUGIN_FILE );
1093 1252
@@ -1106,10 +1265,9 @@
1106 1265 <p class="has-text-align-center" style="margin-top:10px;margin-bottom:10px;font-size:14px">' . $subscribe_text . '</p>
1107 1266 <!-- /wp:paragraph -->
1108 1267
1109 1268 <!-- wp:jetpack/subscriptions {"borderRadius":50,"borderColor":"primary","className":"is-style-compact","isPaidSubscriber":' . ( $is_paid_subscriber ? 'true' : 'false' ) . '} /-->
1110 -' . $sign_in . '
1111 -' . $switch_accounts . '
1269 +' . $login_block . '
1112 1270 </div>
1113 1271 <!-- /wp:group -->
1114 1272 ';
1115 1273 }
@@ -1114,33 +1272,8 @@
1114 1272 ';
1115 1273 }
1116 1274
1117 1275 /**
1118 - * Returns Get Access question for the paywall
1119 - *
1120 - * @param string $post_access_level The newsletter access level.
1121 - * @return string.
1122 - */
1123 -function get_paywall_access_question( $post_access_level ) {
1124 - switch ( $post_access_level ) {
1125 - case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS:
1126 - case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS:
1127 - $tier = Jetpack_Memberships::get_post_tier();
1128 - if ( $tier !== null ) {
1129 - return sprintf(
1130 - // translators: Placeholder is the tier name
1131 - __( 'Already a higher-tier paid subscriber?', 'jetpack' ),
1132 - esc_html( $tier->post_title )
1133 - );
1134 - } else {
1135 - return esc_html__( 'Already a paid subscriber?', 'jetpack' );
1136 - }
1137 - default:
1138 - return esc_html__( 'Already a subscriber?', 'jetpack' );
1139 - }
1140 -}
1141 -
1142 -/**
1143 1276 * Returns true if user is auth for subscriptions check, otherwise returns false.
1144 1277 *
1145 1278 * @return bool
1146 1279 */
@@ -1160,8 +1293,36 @@
1160 1293 return false;
1161 1294 }
1162 1295
1163 1296 /**
1297 + * Returns `true` if the post is a paid post.
1298 + */
1299 +function is_paid_post(): bool {
1300 + require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
1301 +
1302 + // Make sure Stripe is connected and the post is marked for paid subscribers.
1303 + if ( Jetpack_Memberships::has_connected_account() && is_jetpack_token_subscription_service_loaded() ) {
1304 + return Jetpack_Memberships::get_post_access_level() === Jetpack_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS;
1305 + }
1306 +
1307 + return false;
1308 +}
1309 +
1310 +/**
1311 + * Returns true if the post is a subscribers post.
1312 + */
1313 +function is_subscribers_post(): bool {
1314 + require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
1315 +
1316 + // Make sure Stripe is connected and the post is marked for paid subscribers.
1317 + if ( Jetpack_Memberships::has_connected_account() && is_jetpack_token_subscription_service_loaded() ) {
1318 + return Jetpack_Memberships::get_post_access_level() === Jetpack_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS;
1319 + }
1320 +
1321 + return false;
1322 +}
1323 +
1324 +/**
1164 1325 * Returns paywall content blocks when email confirmation is pending
1165 1326 *
1166 1327 * @return string
1167 1328 */
@@ -1167,12 +1328,14 @@
1167 1328 */
1168 1329 function get_paywall_blocks_subscribe_pending() {
1169 1330 $subscribe_email = Jetpack_Memberships::get_current_user_email();
1170 1331
1171 - /** This filter is documented in modules/contact-form/grunion-contact-form.php */
1332 + /** This filter is documented in \Automattic\Jetpack\Forms\ContactForm\Contact_Form */
1172 1333 if ( is_wpcom() || false !== apply_filters( 'jetpack_auto_fill_logged_in_user', false ) ) {
1173 - $current_user = wp_get_current_user();
1174 - $subscribe_email = ! empty( $current_user->user_email ) ? $current_user->user_email : '';
1334 + $current_user = wp_get_current_user();
1335 + if ( ! empty( $current_user->user_email ) ) {
1336 + $subscribe_email = $current_user->user_email;
1337 + }
1175 1338 }
1176 1339
1177 1340 $access_heading = esc_html__( 'Confirm your subscription to continue reading', 'jetpack' );
1178 1341
@@ -1200,22 +1363,37 @@
1200 1363 ';
1201 1364 }
1202 1365
1203 1366 /**
1204 - * Return content for non frontend views like emails.
1205 - *
1206 - * @return string
1367 + * Return content for non frontend views like Reader, emails.
1207 1368 */
1208 -function get_paywall_simple() {
1209 - $access_heading = esc_html__( "You're currently a free subscriber. Upgrade your subscription to get access to the rest of this post and other paid-subscriber only content.", 'jetpack' );
1369 +function get_paywall_simple(): string {
1370 + $is_paid_post = is_paid_post();
1371 + $is_subscribers_post = is_subscribers_post();
1372 + $is_subscriber = is_jetpack_memberships_loaded() && Jetpack_Memberships::is_current_user_subscribed();
1373 + $paywall_heading = esc_html__( 'Subscribe to keep reading', 'jetpack' );
1210 1374
1211 - $subscribe_text = esc_html__( 'Upgrade subscription', 'jetpack' );
1375 + if ( $is_subscribers_post && ! $is_subscriber ) {
1376 + $paywall_description = esc_html__( "It's a subscribers only post. Subscribe to get access to the rest of this post and other subscriber-only content.", 'jetpack' );
1377 + $paywall_action_btn = esc_html__( 'Subscribe', 'jetpack' );
1378 + } elseif ( $is_paid_post && $is_subscriber ) {
1379 + $paywall_description = esc_html__( "You're currently a free subscriber. Upgrade your subscription to get access to the rest of this post and other paid-subscriber only content.", 'jetpack' );
1380 + $paywall_action_btn = esc_html__( 'Upgrade subscription', 'jetpack' );
1381 + } else {
1382 + // - For paid post when the user is not a subscriber.
1383 + // - Default for all other cases.
1384 + $paywall_description = esc_html__( 'Become a paid subscriber to get access to the rest of this post and other exclusive content.', 'jetpack' );
1385 + $paywall_action_btn = esc_html__( 'Subscribe', 'jetpack' );
1386 + }
1212 1387
1213 1388 return '
1214 1389 <!-- wp:columns -->
1215 -<div class="wp-block-columns" style="display: inline-block; width: 90%">
1390 +<div class="wp-block-columns jetpack-paywall-simple" style="display: inline-block; width: 90%">
1216 1391 <!-- wp:column -->
1217 1392 <div class="wp-block-column" style="background-color: #F6F7F7; padding: 32px; 24px;">
1393 + <!-- wp:heading -->
1394 + <h2 class="has-text-align-center" style="margin: 0 0 12px; font-weight: 600;">' . $paywall_heading . '</h2>
1395 + <!-- /wp:heading -->
1218 1396 <!-- wp:paragraph -->
1219 1397 <p class="has-text-align-center"
1220 1398 style="text-align: center;
1221 1399 color: #50575E;
@@ -1222,21 +1400,20 @@
1222 1400 font-weight: 400;
1223 1401 font-size: 16px;
1224 1402 font-family: \'SF Pro Text\', sans-serif;
1225 1403 line-height: 28.8px;">
1226 - ' . $access_heading . '
1404 + ' . $paywall_description . '
1227 1405 </p>
1228 1406 <!-- /wp:paragraph -->
1229 -
1230 1407 <!-- wp:buttons -->
1231 1408 <div class="wp-block-buttons" style="text-align: center;">
1232 1409 <!-- wp:button -->
1233 - <div class="wp-block-button" style="display: inline-block; margin: 10px 0;">
1410 + <div class="wp-block-button" style="display: inline-block; margin: 10px 0; border-style: none; padding: 0;">
1234 1411 <a href="' . esc_url( get_post_permalink() ) . '" class="wp-block-button__link wp-element-button"
1235 1412 data-wpcom-track data-tracks-link-desc="paywall-email-click"
1236 1413 style="display: inline-block;
1237 - padding: 15px 20px;
1238 - background-color: #0675C4;
1414 + padding: 12px 15px;
1415 + background-color: #3858e9;
1239 1416 color: #FFFFFF;
1240 1417 text-decoration: none;
1241 1418 border-radius: 5px;
1242 1419 font-family: \'SF Pro Display\', sans-serif;
@@ -1241,9 +1418,9 @@
1241 1418 border-radius: 5px;
1242 1419 font-family: \'SF Pro Display\', sans-serif;
1243 1420 font-weight: 500;
1244 1421 font-size: 16px;
1245 - text-align: center;">' . $subscribe_text . '</a>
1422 + text-align: center;">' . $paywall_action_btn . '</a>
1246 1423 </div>
1247 1424 <!-- /wp:button -->
1248 1425 </div>
1249 1426 <!-- /wp:buttons -->