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 +496 -267 13.0.2 → 16.3-a.5 View file →
@@ -7,18 +7,22 @@
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 +
24 +require_once __DIR__ . '/class-jetpack-subscription-site.php';
21 25 require_once __DIR__ . '/constants.php';
22 26 require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php';
23 27
24 28 /**
@@ -28,8 +32,9 @@
28 32 const DEFAULT_BORDER_WEIGHT_VALUE = 1;
29 33 const DEFAULT_FONTSIZE_VALUE = '16px';
30 34 const DEFAULT_PADDING_VALUE = 15;
31 35 const DEFAULT_SPACING_VALUE = 10;
36 +const DEFAULT_BUTTON_WIDTH = 'auto';
32 37
33 38 /**
34 39 * Registers the block for use in Gutenberg
35 40 * This is done via an action so that we can disable
@@ -43,17 +48,24 @@
43 48 \WPForTeams\is_wpforteams_site( get_current_blog_id() ) ) {
44 49 return;
45 50 }
46 51
47 - if (
48 - ( defined( 'IS_WPCOM' ) && IS_WPCOM )
49 - || ( ( new Connection_Manager( 'jetpack' ) )->has_connected_owner() && ! ( new Status() )->is_offline_mode() )
50 - ) {
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() ) {
51 62 Blocks::jetpack_register_block(
52 63 __DIR__,
53 64 array(
54 - 'render_callback' => __NAMESPACE__ . '\render_block',
55 - 'supports' => array(
65 + 'render_callback' => __NAMESPACE__ . '\render_block',
66 + 'render_email_callback' => __NAMESPACE__ . '\render_email',
67 + 'supports' => array(
56 68 'spacing' => array(
57 69 'margin' => true,
58 70 'padding' => true,
59 71 ),
@@ -62,31 +74,40 @@
62 74 )
63 75 );
64 76 }
65 77
66 - /*
67 - * If the Subscriptions module is not active,
68 - * do not make any further changes on the site.
69 - */
70 - if ( ! Jetpack::is_module_active( 'subscriptions' ) ) {
71 - return;
72 - }
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 + );
73 98
74 - /**
75 - * Do not proceed if the newsletter feature is not enabled
76 - * or if the 'Jetpack_Memberships' class does not exists.
77 - */
78 - if ( ! class_exists( '\Jetpack_Memberships' ) ) {
79 - return;
80 - }
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 );
81 101
82 102 register_post_meta(
83 103 'post',
84 - META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS,
104 + META_NAME_FOR_POST_DONT_EMAIL_TO_SUBS,
85 105 array(
106 + 'default' => $dont_email_default,
86 107 'show_in_rest' => true,
87 108 'single' => true,
88 - 'type' => 'string',
109 + 'type' => 'boolean',
89 110 'auth_callback' => function () {
90 111 return wp_get_current_user()->has_cap( 'edit_posts' );
91 112 },
92 113 )
@@ -93,14 +114,13 @@
93 114 );
94 115
95 116 register_post_meta(
96 117 'post',
97 - META_NAME_FOR_POST_DONT_EMAIL_TO_SUBS,
118 + META_NAME_FOR_POST_TIER_ID_SETTINGS,
98 119 array(
99 - 'default' => false,
100 120 'show_in_rest' => true,
101 121 'single' => true,
102 - 'type' => 'boolean',
122 + 'type' => 'integer',
103 123 'auth_callback' => function () {
104 124 return wp_get_current_user()->has_cap( 'edit_posts' );
105 125 },
106 126 )
@@ -107,13 +127,13 @@
107 127 );
108 128
109 129 register_post_meta(
110 130 'post',
111 - META_NAME_FOR_POST_TIER_ID_SETTINGS,
131 + META_NAME_CONTAINS_PAYWALLED_CONTENT,
112 132 array(
113 133 'show_in_rest' => true,
114 134 'single' => true,
115 - 'type' => 'integer',
135 + 'type' => 'boolean',
116 136 'auth_callback' => function () {
117 137 return wp_get_current_user()->has_cap( 'edit_posts' );
118 138 },
119 139 )
@@ -127,8 +147,11 @@
127 147 $allowed_meta,
128 148 array(
129 149 META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS,
130 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,
131 154 )
132 155 );
133 156 }
134 157 );
@@ -142,14 +165,41 @@
142 165
143 166 // Hide existing comments
144 167 add_filter( 'get_comment', __NAMESPACE__ . '\maybe_gate_existing_comments' );
145 168
146 - // Gate the excerpt for a post
147 - add_filter( 'get_the_excerpt', __NAMESPACE__ . '\jetpack_filter_excerpt_for_newsletter', 10, 2 );
169 + // Add a 'Newsletter' column to the Edit posts page
170 + // We only display the "Newsletter" column if we have configured the paid newsletter plan
171 + if ( defined( 'WP_ADMIN' ) && WP_ADMIN && Jetpack_Memberships::has_configured_plans_jetpack_recurring_payments( 'newsletter' ) ) {
172 + add_action( 'manage_post_posts_columns', __NAMESPACE__ . '\register_newsletter_access_column' );
173 + add_action( 'manage_post_posts_custom_column', __NAMESPACE__ . '\render_newsletter_access_rows', 10, 2 );
174 + add_action( 'admin_head', __NAMESPACE__ . '\newsletter_access_column_styles' );
175 + }
148 176
149 - // Add a 'Newsletter access' column to the Edit posts page
150 - add_action( 'manage_post_posts_columns', __NAMESPACE__ . '\register_newsletter_access_column' );
151 - add_action( 'manage_post_posts_custom_column', __NAMESPACE__ . '\render_newsletter_access_rows', 10, 2 );
177 + add_action( 'init', __NAMESPACE__ . '\maybe_prevent_super_cache_caching' );
178 +
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 + }
152 202 }
153 203 add_action( 'init', __NAMESPACE__ . '\register_block', 9 );
154 204
155 205 /**
@@ -167,15 +217,10 @@
167 217 * @param array $columns An array of column names.
168 218 * @return array An array of column names.
169 219 */
170 220 function register_newsletter_access_column( $columns ) {
171 - if ( ! Jetpack_Memberships::has_configured_plans_jetpack_recurring_payments( 'newsletter' ) ) {
172 - // We only display the "NL access" column if we have published one paid-newsletter
173 - return $columns;
174 - }
175 -
176 221 $position = array_search( 'title', array_keys( $columns ), true );
177 - $new_column = array( NEWSLETTER_COLUMN_ID => '<span>' . __( 'Newsletter', 'jetpack' ) . '</span>' );
222 + $new_column = array( NEWSLETTER_COLUMN_ID => __( 'Newsletter', 'jetpack' ) );
178 223 return array_merge(
179 224 array_slice( $columns, 0, $position + 1, true ),
180 225 $new_column,
181 226 array_slice( $columns, $position, null, true )
@@ -182,8 +227,37 @@
182 227 );
183 228 }
184 229
185 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 +/**
186 260 * Displays the newsletter access level.
187 261 *
188 262 * @param string $column_id The ID of the column to display.
189 263 * @param int $post_id The current post ID.
@@ -213,11 +287,18 @@
213 287 }
214 288 }
215 289
216 290 /**
217 - * Determine the amount of folks currently subscribed to the blog, splitted out in email_subscribers & social_followers & paid_subscribers
291 + * Adds the Newsletter column styles
292 + */
293 +function newsletter_access_column_styles() {
294 + echo '<style id="jetpack-newsletter-newsletter-access-column"> table.fixed .column-newsletter_access { width: 10%; } </style>';
295 +}
296 +
297 +/**
298 + * Determine the amount of folks currently subscribed to the blog, splitted out in total_subscribers, email_subscribers, social_followers & paid_subscribers.
218 299 *
219 - * @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]]
220 301 */
221 302 function fetch_subscriber_counts() {
222 303 $subs_count = 0;
223 304 if ( is_wpcom() ) {
@@ -235,9 +316,10 @@
235 316 $subs_count = array(
236 317 'status' => 'failed',
237 318 'code' => $xml->getErrorCode(),
238 319 'message' => $xml->getErrorMessage(),
239 - 'value' => ( isset( $subs_count['value'] ) ) ? $subs_count['value'] : array(
320 + 'value' => $subs_count['value'] ?? array(
321 + 'total_subscribers' => 0,
240 322 'email_subscribers' => 0,
241 323 'social_followers' => 0,
242 324 'paid_subscribers' => 0,
243 325 ),
@@ -263,11 +345,11 @@
263 345 function get_subscriber_count( $include_social_followers ) {
264 346 $counts = fetch_subscriber_counts();
265 347
266 348 if ( $include_social_followers ) {
267 - $subscriber_count = $counts['value']['email_subscribers'] + $counts['value']['social_followers'];
349 + $subscriber_count = $counts['value']['total_subscribers'] + $counts['value']['social_followers'];
268 350 } else {
269 - $subscriber_count = $counts['value']['email_subscribers'];
351 + $subscriber_count = $counts['value']['total_subscribers'];
270 352 }
271 353 return $subscriber_count;
272 354 }
273 355
@@ -370,8 +452,24 @@
370 452 );
371 453 }
372 454
373 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 +/**
374 472 * Uses block attributes to generate an array containing the styles for various block elements.
375 473 * Based on Jetpack_Subscriptions_Widget::do_subscription_form() which the block was originally using.
376 474 *
377 475 * @param array $attributes Array containing the block attributes.
@@ -378,8 +476,10 @@
378 476 *
379 477 * @return array
380 478 */
381 479 function get_element_styles_from_attributes( $attributes ) {
480 + $is_button_only_style = is_button_only_style( get_attribute( $attributes, 'className', '' ) );
481 +
382 482 $button_background_style = ! has_attribute( $attributes, 'buttonBackgroundColor' ) && has_attribute( $attributes, 'customButtonGradient' )
383 483 ? get_attribute( $attributes, 'customButtonGradient' )
384 484 : get_attribute( $attributes, 'customButtonBackgroundColor' );
385 485
@@ -395,15 +495,15 @@
395 495 $submit_button_styles .= sprintf( 'color: %s;', get_attribute( $attributes, 'customTextColor' ) );
396 496 }
397 497
398 498 if ( has_attribute( $attributes, 'buttonWidth' ) ) {
399 - $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 ) );
400 500 $submit_button_wrapper_styles .= 'max-width: 100%;';
401 501
402 502 // Account for custom margins on inline forms.
403 503 $submit_button_styles .= true === get_attribute( $attributes, 'buttonOnNewLine' )
404 - ? sprintf( 'width: calc(100%% - %dpx);', get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ) )
405 - : 'width: 100%;';
504 + ? 'width: 100%;'
505 + : sprintf( 'width: calc(100%% - %dpx);', get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ) );
406 506 }
407 507
408 508 $font_size = get_attribute( $attributes, 'customFontSize', DEFAULT_FONTSIZE_VALUE );
409 509 $style = sprintf( 'font-size: %s%s;', $font_size, is_numeric( $font_size ) ? 'px' : '' );
@@ -416,14 +516,16 @@
416 516
417 517 $submit_button_styles .= $style;
418 518 $email_field_styles .= $style;
419 519
420 - $button_spacing = get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE );
421 - if ( true === get_attribute( $attributes, 'buttonOnNewLine' ) ) {
422 - $submit_button_styles .= sprintf( 'margin-top: %dpx;', $button_spacing );
423 - } else {
424 - $submit_button_styles .= 'margin: 0px; '; // Reset Safari's 2px default margin for buttons affecting input and button union
425 - $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 + }
426 528 }
427 529
428 530 if ( has_attribute( $attributes, 'borderColor' ) ) {
429 531 $style = sprintf( 'border-color: %s;', get_attribute( $attributes, 'borderColor', '' ) );
@@ -445,9 +547,9 @@
445 547 $submit_button_styles .= $style;
446 548 $email_field_styles .= $style;
447 549 }
448 550
449 - if ( ! jetpack_is_frontend() ) {
551 + if ( ! Request::is_frontend() ) {
450 552 $background_color_style = get_attribute_color( 'buttonBackgroundColor', $attributes, '#113AF5' /* default lettre theme color */ );
451 553 $text_color_style = get_attribute_color( 'textColor', $attributes, '#FFFFFF' );
452 554 $submit_button_styles .= sprintf( ' background-color: %s; color: %s;', $background_color_style, $text_color_style );
453 555 }
@@ -532,8 +634,15 @@
532 634 return null;
533 635 }
534 636
535 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 +/**
536 645 * Subscriptions block render callback.
537 646 *
538 647 * @param array $attributes Array containing the block attributes.
539 648 *
@@ -540,13 +649,13 @@
540 649 * @return string
541 650 */
542 651 function render_block( $attributes ) {
543 652 // If the Subscriptions module is not active, don't render the block.
544 - if ( ! Jetpack::is_module_active( 'subscriptions' ) ) {
653 + if ( ! ( new Modules() )->is_active( 'subscriptions' ) ) {
545 654 return '';
546 655 }
547 656
548 - if ( class_exists( '\Jetpack_Memberships' ) ) {
657 + if ( is_jetpack_memberships_loaded() ) {
549 658 // We only want the sites that have newsletter feature enabled to be graced by this JavaScript.
550 659 Jetpack_Gutenberg::load_assets_as_required( __DIR__ );
551 660 } else {
552 661 Jetpack_Gutenberg::load_styles_as_required( FEATURE_NAME );
@@ -551,14 +660,21 @@
551 660 } else {
552 661 Jetpack_Gutenberg::load_styles_as_required( FEATURE_NAME );
553 662 }
554 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
555 669 $subscribe_email = Jetpack_Memberships::get_current_user_email();
556 670
557 - /** This filter is documented in modules/contact-form/grunion-contact-form.php */
558 - if ( is_wpcom() || false !== apply_filters( 'jetpack_auto_fill_logged_in_user', false ) ) {
559 - $current_user = wp_get_current_user();
560 - $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 + }
561 677 }
562 678
563 679 // The block is using the Jetpack_Subscriptions_Widget backend, hence the need to increase the instance count.
564 680 ++Jetpack_Subscriptions_Widget::$instance_count;
@@ -565,38 +681,52 @@
565 681
566 682 $classes = get_element_class_names_from_attributes( $attributes );
567 683 $styles = get_element_styles_from_attributes( $attributes );
568 684
685 + // The default value was previously "true" in block.json. We don't want to rely setting "default" in block.json to falsy,
686 + // because it would change the setting for previously saved blocks. Block editor doesn't store default values in attributes at all.
687 + // Hence users without this set will still get social counts included in the subscriber counter.
688 + // Lowering the subscriber count on their behalf with code change would be controversial.
689 + // We want to disencourage including social count as it's misleading.
569 690 $include_social_followers = isset( $attributes['includeSocialFollowers'] ) ? (bool) get_attribute( $attributes, 'includeSocialFollowers' ) : true;
570 691
571 692 $data = array(
572 - 'widget_id' => Jetpack_Subscriptions_Widget::$instance_count,
573 - 'subscribe_email' => $subscribe_email,
574 - 'is_paid_subscriber' => get_attribute( $attributes, 'isPaidSubscriber', false ),
575 - '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(
576 697 array(
577 698 'class' => $classes['block_wrapper'],
578 699 )
579 700 ),
580 - 'subscribe_placeholder' => get_attribute( $attributes, 'subscribePlaceholder', __( 'Type your email…', 'jetpack' ) ),
581 - 'submit_button_text' => get_attribute( $attributes, 'submitButtonText', __( 'Subscribe', 'jetpack' ) ),
582 - 'submit_button_text_subscribed' => get_attribute( $attributes, 'submitButtonTextSubscribed', __( 'Subscribed', 'jetpack' ) ),
583 - 'submit_button_text_upgrade' => get_attribute( $attributes, 'submitButtonTextUpgrade', __( 'Upgrade subscription', 'jetpack' ) ),
584 - '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(
585 706 $attributes,
586 707 'successMessage',
587 - 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' )
588 709 ),
589 - 'show_subscribers_total' => (bool) get_attribute( $attributes, 'showSubscribersTotal' ),
590 - 'subscribers_total' => get_subscriber_count( $include_social_followers ),
591 - '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(
592 713 ( is_ssl() ? 'https' : 'http' ) . '://' . ( isset( $_SERVER['HTTP_HOST'] ) ? wp_unslash( $_SERVER['HTTP_HOST'] ) : '' ) .
593 714 ( isset( $_SERVER['REQUEST_URI'] ) ? wp_unslash( $_SERVER['REQUEST_URI'] ) : '' )
594 715 ),
595 - 'source' => 'subscribe-block',
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 ),
596 721 );
597 722
598 - 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() ) {
599 729 return render_for_email( $data, $styles );
600 730 }
601 731
602 732 return render_for_website( $data, $classes, $styles );
@@ -625,13 +755,15 @@
625 755 *
626 756 * @return string
627 757 */
628 758 function render_for_website( $data, $classes, $styles ) {
629 - $blog_id = \Jetpack_Options::get_option( 'id' );
630 - $widget_id_suffix = Jetpack_Subscriptions_Widget::$instance_count > 1 ? '-' . Jetpack_Subscriptions_Widget::$instance_count : '';
631 - $form_id = 'subscribe-blog' . $widget_id_suffix;
632 - $form_url = 'https://wordpress.com/email-subscriptions';
633 - $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;
634 766
635 767 // Post ID is used for pulling post-specific paid status, and returning to the right post after confirming subscription
636 768 $post_id = null;
637 769 if ( in_the_loop() ) {
@@ -641,12 +773,13 @@
641 773 } else {
642 774 $post_id = get_option( 'page_on_front' );
643 775 }
644 776
645 - $subscribe_field_id = apply_filters( 'subscribe_field_id', 'subscribe-field' . $widget_id_suffix, $data['widget_id'] );
646 - $tier_id = get_post_meta( $post_id, META_NAME_FOR_POST_TIER_ID_SETTINGS, true );
647 - $is_subscribed = Jetpack_Memberships::is_current_user_subscribed();
648 - $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;
649 782
650 783 ob_start();
651 784
652 785 Jetpack_Subscriptions_Widget::render_widget_status_messages(
@@ -656,76 +789,16 @@
656 789 );
657 790 ?>
658 791 <div <?php echo wp_kses_data( $data['wrapper_attributes'] ); ?>>
659 792 <div class="wp-block-jetpack-subscriptions__container<?php echo ! $is_subscribed ? ' is-not-subscriber' : ''; ?>">
660 - <form
661 - action="<?php echo esc_url( $form_url ); ?>"
662 - method="post"
663 - accept-charset="utf-8"
664 - data-blog="<?php echo esc_attr( $blog_id ); ?>"
665 - data-post_access_level="<?php echo esc_attr( $post_access_level ); ?>"
666 - data-subscriber_email="<?php echo esc_attr( $data['subscribe_email'] ); ?>"
667 - id="<?php echo esc_attr( $form_id ); ?>"
668 - >
669 - <div class="wp-block-jetpack-subscriptions__form-elements">
670 - <?php if ( ! $is_subscribed ) : ?>
671 - <p id="subscribe-email">
672 - <label
673 - id="<?php echo esc_attr( $subscribe_field_id . '-label' ); ?>"
674 - for="<?php echo esc_attr( $subscribe_field_id ); ?>"
675 - class="screen-reader-text"
676 - >
677 - <?php echo esc_html( $data['subscribe_placeholder'] ); ?>
678 - </label>
679 - <?php
680 - printf(
681 - '<input
682 - required="required"
683 - type="email"
684 - name="email"
685 - %1$s
686 - style="%2$s"
687 - placeholder="%3$s"
688 - value="%4$s"
689 - id="%5$s"
690 - />',
691 - ( ! empty( $classes['email_field'] )
692 - ? 'class="' . esc_attr( $classes['email_field'] ) . '"'
693 - : ''
694 - ),
695 - ( ! empty( $styles['email_field'] )
696 - ? esc_attr( $styles['email_field'] )
697 - : 'width: 95%; padding: 1px 10px'
698 - ),
699 - esc_attr( $data['subscribe_placeholder'] ),
700 - esc_attr( $data['subscribe_email'] ),
701 - esc_attr( $subscribe_field_id )
702 - );
703 - ?>
704 - </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'] ); ?>"
705 797 <?php endif; ?>
706 - <p id="subscribe-submit"
707 - <?php if ( ! empty( $styles['submit_button_wrapper'] ) ) : ?>
708 - style="<?php echo esc_attr( $styles['submit_button_wrapper'] ); ?>"
709 - <?php endif; ?>
710 - >
711 - <input type="hidden" name="action" value="<?php echo is_top_subscription() ? 'subscribed' : 'subscribe'; ?>"/>
712 - <input type="hidden" name="blog_id" value="<?php echo (int) $blog_id; ?>"/>
713 - <input type="hidden" name="source" value="<?php echo esc_url( $data['referer'] ); ?>"/>
714 - <input type="hidden" name="sub-type" value="<?php echo esc_attr( $data['source'] ); ?>"/>
715 - <input type="hidden" name="redirect_fragment" value="<?php echo esc_attr( $form_id ); ?>"/>
716 - <?php
717 - wp_nonce_field( 'blogsub_subscribe_' . $blog_id );
718 -
719 - if ( ! empty( $post_id ) ) {
720 - echo '<input type="hidden" name="post_id" value="' . esc_attr( $post_id ) . '"/>';
721 - }
722 -
723 - if ( ! empty( $tier_id ) ) {
724 - echo '<input type="hidden" name="tier_id" value="' . esc_attr( $tier_id ) . '"/>';
725 - }
726 - ?>
727 - <button type="submit"
798 + >
799 + <a
800 + href="<?php echo esc_url( 'https://wordpress.com/reader/site/subscription/' . $blog_id ); ?>"
728 801 <?php if ( ! empty( $classes['submit_button'] ) ) : ?>
729 802 class="<?php echo esc_attr( $classes['submit_button'] ); ?>"
730 803 <?php endif; ?>
731 804 <?php if ( ! empty( $styles['submit_button'] ) ) : ?>
@@ -730,20 +803,110 @@
730 803 <?php endif; ?>
731 804 <?php if ( ! empty( $styles['submit_button'] ) ) : ?>
732 805 style="<?php echo esc_attr( $styles['submit_button'] ); ?>"
733 806 <?php endif; ?>
734 - name="jetpack_subscriptions_widget"
735 807 >
736 808 <?php echo sanitize_submit_text( $button_text ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
737 - </button>
738 - </p>
739 - </div>
740 - </form>
741 - <?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 ) : ?>
742 907 <div class="wp-block-jetpack-subscriptions__subscount">
743 - <?php
744 - echo esc_html( Jetpack_Memberships::get_join_others_text( $data['subscribers_total'] ) );
745 - ?>
908 + <?php echo esc_html( Jetpack_Memberships::get_join_others_text( $data['subscribers_total'] ) ); ?>
746 909 </div>
747 910 <?php endif; ?>
748 911 </div>
749 912 </div>
@@ -767,9 +930,9 @@
767 930 <div>
768 931 <div>
769 932 <div>
770 933 <p ' . $submit_button_wrapper_style . '>
771 - <a href="' . esc_url( get_post_permalink() ) . '" style="text-decoration: none; ' . esc_attr( $styles['submit_button'] ) . '">' . sanitize_submit_text( $button_text ) . '</a>
934 + <a href="' . esc_url( get_post_permalink() ) . '" style="' . esc_attr( $styles['submit_button'] ) . ' text-decoration: none; white-space: nowrap; margin-left: 0">' . sanitize_submit_text( $button_text ) . '</a>
772 935 </p>
773 936 </div>
774 937 </div>
775 938 </div>
@@ -778,26 +941,56 @@
778 941 return $html;
779 942 }
780 943
781 944 /**
782 - * Filter excerpts looking for subscription data.
945 + * WooCommerce Email Editor render callback for the subscriptions block.
783 946 *
784 - * @param string $excerpt The extrapolated excerpt string.
785 - * @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.
786 950 *
787 - * @return mixed
951 + * @return string
788 952 */
789 -function jetpack_filter_excerpt_for_newsletter( $excerpt, $post = null ) {
790 - // The blogmagazine theme is overriding WP core `get_the_excerpt` filter and only passing the excerpt
791 - // TODO: Until this is fixed, return the excerpt without gating. See https://github.com/Automattic/jetpack/pull/28102#issuecomment-1369161116
792 - if ( $post && str_contains( $post->post_content, '<!-- wp:jetpack/subscriptions -->' ) ) {
793 - $excerpt .= sprintf(
794 - // translators: %s is the permalink url to the current post.
795 - __( "<p><a href='%s'>View post</a> to subscribe to site newsletter.</p>", 'jetpack' ),
796 - get_post_permalink()
797 - );
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 '';
798 956 }
799 - 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 + );
800 993 }
801 994
802 995 /**
803 996 * Gate access to posts
@@ -822,9 +1015,9 @@
822 1015 }
823 1016 return $the_content;
824 1017 }
825 1018
826 - $paywalled_content = get_paywall_content( $post_access_level ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
1019 + $paywalled_content = get_paywall_content();
827 1020
828 1021 if ( has_block( \Automattic\Jetpack\Extensions\Paywall\BLOCK_NAME ) ) {
829 1022 if ( strpos( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML ) ) {
830 1023 return strstr( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML, true ) . $paywalled_content;
@@ -875,14 +1068,39 @@
875 1068 return '';
876 1069 }
877 1070
878 1071 /**
1072 + * Is the Jetpack_Token_Subscription_Service class loaded
1073 + *
1074 + * @return bool
1075 + */
1076 +function is_jetpack_token_subscription_service_loaded(): bool {
1077 + return class_exists( 'Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Jetpack_Token_Subscription_Service' );
1078 +}
1079 +
1080 +/**
1081 + * Adds support for WP Super cache and Boost cache
1082 + */
1083 +function maybe_prevent_super_cache_caching() {
1084 + // Prevents cached page to be served if the Membership cookie is present
1085 + if ( is_jetpack_token_subscription_service_loaded() ) {
1086 + do_action( 'wpsc_add_cookie', Jetpack_Token_Subscription_Service::JWT_AUTH_TOKEN_COOKIE_NAME );
1087 + }
1088 +
1089 + if ( is_user_auth() ) {
1090 + // Do not cache the page if user is auth with Membership token
1091 + if ( ! defined( 'DONOTCACHEPAGE' ) ) {
1092 + define( 'DONOTCACHEPAGE', true );
1093 + }
1094 + }
1095 +}
1096 +
1097 +/**
879 1098 * Returns paywall content blocks
880 1099 *
881 - * @param string $post_access_level The newsletter access level.
882 1100 * @return string
883 1101 */
884 -function get_paywall_content( $post_access_level ) {
1102 +function get_paywall_content() {
885 1103 if ( Jetpack_Memberships::user_is_pending_subscriber() ) {
886 1104 return get_paywall_blocks_subscribe_pending();
887 1105 }
888 1106 if ( doing_filter( 'get_the_excerpt' ) ) {
@@ -887,9 +1105,9 @@
887 1105 }
888 1106 if ( doing_filter( 'get_the_excerpt' ) ) {
889 1107 return '';
890 1108 }
891 - return get_paywall_blocks( $post_access_level );
1109 + return get_paywall_blocks();
892 1110 }
893 1111
894 1112 /**
895 1113 * Returns the current URL.
@@ -971,22 +1189,22 @@
971 1189
972 1190 /**
973 1191 * Returns paywall content blocks if user is not authenticated
974 1192 *
975 - * @param string $newsletter_access_level The newsletter access level.
976 1193 * @return string
977 1194 */
978 -function get_paywall_blocks( $newsletter_access_level ) {
1195 +function get_paywall_blocks() {
979 1196 $custom_paywall = apply_filters( 'jetpack_custom_paywall_blocks', false );
980 1197 if ( ! empty( $custom_paywall ) ) {
981 1198 return $custom_paywall;
982 1199 }
983 - if ( ! jetpack_is_frontend() ) { // emails
1200 +
1201 + if ( ! Request::is_frontend() ) { // emails
984 1202 return get_paywall_simple();
985 1203 }
1204 +
986 1205 require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
987 - // Only display paid texts when Stripe is connected and the post is marked for paid subscribers
988 - $is_paid_post = $newsletter_access_level === 'paid_subscribers' && Jetpack_Memberships::has_connected_account();
1206 + $is_paid_post = is_paid_post();
989 1207 $is_paid_subscriber = Jetpack_Memberships::user_is_paid_subscriber();
990 1208
991 1209 $access_heading = $is_paid_subscriber
992 1210 ? esc_html__( 'Upgrade to continue reading', 'jetpack' )
@@ -993,50 +1211,42 @@
993 1211 : esc_html__( 'Subscribe to continue reading', 'jetpack' );
994 1212
995 1213 $subscribe_text = $is_paid_post
996 1214 // translators: %s is the name of the site.
997 - ? $is_paid_subscriber
998 - ? esc_html__( 'Upgrade to get access to the rest of this post and other exclusive content.', 'jetpack' )
999 - : 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 + )
1000 1220 // translators: %s is the name of the site.
1001 1221 : esc_html__( 'Subscribe to get access to the rest of this post and other subscriber-only content.', 'jetpack' );
1002 1222
1003 - $sign_in = '';
1004 - $switch_accounts = '';
1223 + $login_block = '';
1005 1224
1006 - if ( ( new Host() )->is_wpcom_simple() ) {
1007 - // On WPCOM we will redirect directly to the current page
1008 - $redirect_url = get_current_url();
1009 - } else {
1010 - // On self-hosted we will save and hide the token
1011 - $redirect_url = get_site_url() . '/wp-json/jetpack/v4/subscribers/auth';
1012 - $redirect_url = add_query_arg( 'redirect_url', get_current_url(), $redirect_url );
1013 - }
1014 -
1015 - $sign_in_link = add_query_arg(
1016 - array(
1017 - 'site_id' => intval( \Jetpack_Options::get_option( 'id' ) ),
1018 - 'redirect_url' => rawurlencode( $redirect_url ),
1019 - ),
1020 - 'https://subscribe.wordpress.com/memberships/jwt'
1021 - );
1022 1225 if ( is_user_auth() ) {
1023 1226 if ( ( new Host() )->is_wpcom_simple() ) {
1024 - $switch_accounts_link = wp_logout_url( $sign_in_link );
1025 - $switch_accounts = '<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"}}} -->
1026 -<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>
1027 1240 <!-- /wp:paragraph -->';
1028 -
1029 1241 }
1030 1242 } else {
1031 - if ( ( new Host() )->is_wpcom_simple() ) {
1032 - // custom domain
1033 - $sign_in_link = wpcom_logmein_redirect_url( get_current_url(), false, null, 'link', get_current_blog_id() );
1034 - }
1035 - $access_question = get_paywall_access_question( $newsletter_access_level );
1036 - $sign_in = '<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"}}} -->
1037 -<p class="has-text-align-center" style="font-size:14px"><a href="' . $sign_in_link . '">' . $access_question . '</a></p>
1038 -<!-- /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 -->';
1039 1249 }
1040 1250
1041 1251 $lock_svg = plugins_url( 'images/lock-paywall.svg', JETPACK__PLUGIN_FILE );
1042 1252
@@ -1055,10 +1265,9 @@
1055 1265 <p class="has-text-align-center" style="margin-top:10px;margin-bottom:10px;font-size:14px">' . $subscribe_text . '</p>
1056 1266 <!-- /wp:paragraph -->
1057 1267
1058 1268 <!-- wp:jetpack/subscriptions {"borderRadius":50,"borderColor":"primary","className":"is-style-compact","isPaidSubscriber":' . ( $is_paid_subscriber ? 'true' : 'false' ) . '} /-->
1059 -' . $sign_in . '
1060 -' . $switch_accounts . '
1269 +' . $login_block . '
1061 1270 </div>
1062 1271 <!-- /wp:group -->
1063 1272 ';
1064 1273 }
@@ -1063,38 +1272,13 @@
1063 1272 ';
1064 1273 }
1065 1274
1066 1275 /**
1067 - * Returns Get Access question for the paywall
1068 - *
1069 - * @param string $post_access_level The newsletter access level.
1070 - * @return string.
1071 - */
1072 -function get_paywall_access_question( $post_access_level ) {
1073 - switch ( $post_access_level ) {
1074 - case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS:
1075 - case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS:
1076 - $tier = Jetpack_Memberships::get_post_tier();
1077 - if ( $tier !== null ) {
1078 - return sprintf(
1079 - // translators: Placeholder is the tier name
1080 - __( 'Already a higher-tier paid subscriber?', 'jetpack' ),
1081 - esc_html( $tier->post_title )
1082 - );
1083 - } else {
1084 - return esc_html__( 'Already a paid subscriber?', 'jetpack' );
1085 - }
1086 - default:
1087 - return esc_html__( 'Already a subscriber?', 'jetpack' );
1088 - }
1089 -}
1090 -
1091 -/**
1092 1276 * Returns true if user is auth for subscriptions check, otherwise returns false.
1093 1277 *
1094 - * @return boolean
1278 + * @return bool
1095 1279 */
1096 -function is_user_auth() {
1280 +function is_user_auth(): bool {
1097 1281 if ( ( new Host() )->is_wpcom_simple() && is_user_logged_in() ) {
1098 1282 return true;
1099 1283 }
1100 1284 if ( current_user_can( 'manage_options' ) ) {
@@ -1099,9 +1283,10 @@
1099 1283 }
1100 1284 if ( current_user_can( 'manage_options' ) ) {
1101 1285 return true;
1102 1286 }
1103 - if ( class_exists( 'Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Jetpack_Token_Subscription_Service' ) ) {
1287 +
1288 + if ( is_jetpack_token_subscription_service_loaded() ) {
1104 1289 if ( Jetpack_Token_Subscription_Service::has_token_from_cookie() ) {
1105 1290 return true;
1106 1291 }
1107 1292 }
@@ -1108,8 +1293,36 @@
1108 1293 return false;
1109 1294 }
1110 1295
1111 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 +/**
1112 1325 * Returns paywall content blocks when email confirmation is pending
1113 1326 *
1114 1327 * @return string
1115 1328 */
@@ -1115,12 +1328,14 @@
1115 1328 */
1116 1329 function get_paywall_blocks_subscribe_pending() {
1117 1330 $subscribe_email = Jetpack_Memberships::get_current_user_email();
1118 1331
1119 - /** This filter is documented in modules/contact-form/grunion-contact-form.php */
1332 + /** This filter is documented in \Automattic\Jetpack\Forms\ContactForm\Contact_Form */
1120 1333 if ( is_wpcom() || false !== apply_filters( 'jetpack_auto_fill_logged_in_user', false ) ) {
1121 - $current_user = wp_get_current_user();
1122 - $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 + }
1123 1338 }
1124 1339
1125 1340 $access_heading = esc_html__( 'Confirm your subscription to continue reading', 'jetpack' );
1126 1341
@@ -1129,10 +1344,10 @@
1129 1344
1130 1345 $lock_svg = plugins_url( 'images/lock-paywall.svg', JETPACK__PLUGIN_FILE );
1131 1346
1132 1347 return '
1133 -<!-- wp:group {"style":{"border":{"width":"1px","radius":"4px"},"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70","left":"32px","right":"32px"}}},"borderColor":"primary","className":"jetpack-subscribe-paywall","layout":{"type":"constrained","contentSize":"400px"}} -->
1134 -<div class="wp-block-group jetpack-subscribe-paywall has-border-color has-primary-border-color" style="border-width:1px;border-radius:4px;padding-top:var(--wp--preset--spacing--70);padding-right:32px;padding-bottom:var(--wp--preset--spacing--70);padding-left:32px">
1348 +<!-- wp:group {"style":{"border":{"width":"1px","radius":"4px"},"spacing":{"padding":{"top":"32px","bottom":"32px","left":"32px","right":"32px"}}},"borderColor":"primary","className":"jetpack-subscribe-paywall","layout":{"type":"constrained","contentSize":"400px"}} -->
1349 +<div class="wp-block-group jetpack-subscribe-paywall has-border-color has-primary-border-color" style="border-width:1px;border-radius:4px;padding-top:32px;padding-right:32px;padding-bottom:32px;padding-left:32px">
1135 1350 <!-- wp:image {"align":"center","width":24,"height":24,"sizeSlug":"large","linkDestination":"none"} -->
1136 1351 <figure class="wp-block-image aligncenter size-large is-resized"><img src="' . $lock_svg . '" alt="" width="24" height="24"/></figure>
1137 1352 <!-- /wp:image -->
1138 1353
@@ -1148,22 +1363,37 @@
1148 1363 ';
1149 1364 }
1150 1365
1151 1366 /**
1152 - * Return content for non frontend views like emails.
1153 - *
1154 - * @return string
1367 + * Return content for non frontend views like Reader, emails.
1155 1368 */
1156 -function get_paywall_simple() {
1157 - $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' );
1158 1374
1159 - $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 + }
1160 1387
1161 1388 return '
1162 1389 <!-- wp:columns -->
1163 -<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%">
1164 1391 <!-- wp:column -->
1165 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 -->
1166 1396 <!-- wp:paragraph -->
1167 1397 <p class="has-text-align-center"
1168 1398 style="text-align: center;
1169 1399 color: #50575E;
@@ -1170,21 +1400,20 @@
1170 1400 font-weight: 400;
1171 1401 font-size: 16px;
1172 1402 font-family: \'SF Pro Text\', sans-serif;
1173 1403 line-height: 28.8px;">
1174 - ' . $access_heading . '
1404 + ' . $paywall_description . '
1175 1405 </p>
1176 1406 <!-- /wp:paragraph -->
1177 -
1178 1407 <!-- wp:buttons -->
1179 1408 <div class="wp-block-buttons" style="text-align: center;">
1180 1409 <!-- wp:button -->
1181 - <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;">
1182 1411 <a href="' . esc_url( get_post_permalink() ) . '" class="wp-block-button__link wp-element-button"
1183 1412 data-wpcom-track data-tracks-link-desc="paywall-email-click"
1184 1413 style="display: inline-block;
1185 - padding: 15px 20px;
1186 - background-color: #0675C4;
1414 + padding: 12px 15px;
1415 + background-color: #3858e9;
1187 1416 color: #FFFFFF;
1188 1417 text-decoration: none;
1189 1418 border-radius: 5px;
1190 1419 font-family: \'SF Pro Display\', sans-serif;
@@ -1189,9 +1418,9 @@
1189 1418 border-radius: 5px;
1190 1419 font-family: \'SF Pro Display\', sans-serif;
1191 1420 font-weight: 500;
1192 1421 font-size: 16px;
1193 - text-align: center;">' . $subscribe_text . '</a>
1422 + text-align: center;">' . $paywall_action_btn . '</a>
1194 1423 </div>
1195 1424 <!-- /wp:button -->
1196 1425 </div>
1197 1426 <!-- /wp:buttons -->