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 +524 -277 12.9.5 → 16.3-a.5 View file →
@@ -7,20 +7,24 @@
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 -use function Automattic\Jetpack\Extensions\Premium_Content\subscription_service;
21 19
20 +if ( ! defined( 'ABSPATH' ) ) {
21 + exit( 0 );
22 +}
23 +
24 +require_once __DIR__ . '/class-jetpack-subscription-site.php';
22 25 require_once __DIR__ . '/constants.php';
26 +require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php';
23 27
24 28 /**
25 29 * These block defaults should match ./constants.js
26 30 */
@@ -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 )
@@ -104,13 +125,35 @@
104 125 },
105 126 )
106 127 );
107 128
129 + register_post_meta(
130 + 'post',
131 + META_NAME_CONTAINS_PAYWALLED_CONTENT,
132 + array(
133 + 'show_in_rest' => true,
134 + 'single' => true,
135 + 'type' => 'boolean',
136 + 'auth_callback' => function () {
137 + return wp_get_current_user()->has_cap( 'edit_posts' );
138 + },
139 + )
140 + );
141 +
108 142 // This ensures Jetpack will sync this post meta to WPCOM.
109 143 add_filter(
110 144 'jetpack_sync_post_meta_whitelist',
111 145 function ( $allowed_meta ) {
112 - return array_merge( $allowed_meta, array( META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS ) );
146 + return array_merge(
147 + $allowed_meta,
148 + array(
149 + META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS,
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,
154 + )
155 + );
113 156 }
114 157 );
115 158
116 159 // Hide the content – Priority 8 makes it run before do_blocks gets called for the content
@@ -122,14 +165,41 @@
122 165
123 166 // Hide existing comments
124 167 add_filter( 'get_comment', __NAMESPACE__ . '\maybe_gate_existing_comments' );
125 168
126 - // Gate the excerpt for a post
127 - 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 + }
128 176
129 - // Add a 'Newsletter access' column to the Edit posts page
130 - add_action( 'manage_post_posts_columns', __NAMESPACE__ . '\register_newsletter_access_column' );
131 - 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 + }
132 202 }
133 203 add_action( 'init', __NAMESPACE__ . '\register_block', 9 );
134 204
135 205 /**
@@ -147,15 +217,10 @@
147 217 * @param array $columns An array of column names.
148 218 * @return array An array of column names.
149 219 */
150 220 function register_newsletter_access_column( $columns ) {
151 - if ( ! Jetpack_Memberships::has_configured_plans_jetpack_recurring_payments( 'newsletter' ) ) {
152 - // We only display the "NL access" column if we have published one paid-newsletter
153 - return $columns;
154 - }
155 -
156 221 $position = array_search( 'title', array_keys( $columns ), true );
157 - $new_column = array( NEWSLETTER_COLUMN_ID => '<span>' . __( 'Newsletter', 'jetpack' ) . '</span>' );
222 + $new_column = array( NEWSLETTER_COLUMN_ID => __( 'Newsletter', 'jetpack' ) );
158 223 return array_merge(
159 224 array_slice( $columns, 0, $position + 1, true ),
160 225 $new_column,
161 226 array_slice( $columns, $position, null, true )
@@ -162,8 +227,37 @@
162 227 );
163 228 }
164 229
165 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 +/**
166 260 * Displays the newsletter access level.
167 261 *
168 262 * @param string $column_id The ID of the column to display.
169 263 * @param int $post_id The current post ID.
@@ -193,11 +287,18 @@
193 287 }
194 288 }
195 289
196 290 /**
197 - * 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.
198 299 *
199 - * @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]]
200 301 */
201 302 function fetch_subscriber_counts() {
202 303 $subs_count = 0;
203 304 if ( is_wpcom() ) {
@@ -215,9 +316,10 @@
215 316 $subs_count = array(
216 317 'status' => 'failed',
217 318 'code' => $xml->getErrorCode(),
218 319 'message' => $xml->getErrorMessage(),
219 - 'value' => ( isset( $subs_count['value'] ) ) ? $subs_count['value'] : array(
320 + 'value' => $subs_count['value'] ?? array(
321 + 'total_subscribers' => 0,
220 322 'email_subscribers' => 0,
221 323 'social_followers' => 0,
222 324 'paid_subscribers' => 0,
223 325 ),
@@ -243,11 +345,11 @@
243 345 function get_subscriber_count( $include_social_followers ) {
244 346 $counts = fetch_subscriber_counts();
245 347
246 348 if ( $include_social_followers ) {
247 - $subscriber_count = $counts['value']['email_subscribers'] + $counts['value']['social_followers'];
349 + $subscriber_count = $counts['value']['total_subscribers'] + $counts['value']['social_followers'];
248 350 } else {
249 - $subscriber_count = $counts['value']['email_subscribers'];
351 + $subscriber_count = $counts['value']['total_subscribers'];
250 352 }
251 353 return $subscriber_count;
252 354 }
253 355
@@ -350,8 +452,24 @@
350 452 );
351 453 }
352 454
353 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 +/**
354 472 * Uses block attributes to generate an array containing the styles for various block elements.
355 473 * Based on Jetpack_Subscriptions_Widget::do_subscription_form() which the block was originally using.
356 474 *
357 475 * @param array $attributes Array containing the block attributes.
@@ -358,8 +476,10 @@
358 476 *
359 477 * @return array
360 478 */
361 479 function get_element_styles_from_attributes( $attributes ) {
480 + $is_button_only_style = is_button_only_style( get_attribute( $attributes, 'className', '' ) );
481 +
362 482 $button_background_style = ! has_attribute( $attributes, 'buttonBackgroundColor' ) && has_attribute( $attributes, 'customButtonGradient' )
363 483 ? get_attribute( $attributes, 'customButtonGradient' )
364 484 : get_attribute( $attributes, 'customButtonBackgroundColor' );
365 485
@@ -375,15 +495,15 @@
375 495 $submit_button_styles .= sprintf( 'color: %s;', get_attribute( $attributes, 'customTextColor' ) );
376 496 }
377 497
378 498 if ( has_attribute( $attributes, 'buttonWidth' ) ) {
379 - $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 ) );
380 500 $submit_button_wrapper_styles .= 'max-width: 100%;';
381 501
382 502 // Account for custom margins on inline forms.
383 503 $submit_button_styles .= true === get_attribute( $attributes, 'buttonOnNewLine' )
384 - ? sprintf( 'width: calc(100%% - %dpx);', get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ) )
385 - : 'width: 100%;';
504 + ? 'width: 100%;'
505 + : sprintf( 'width: calc(100%% - %dpx);', get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ) );
386 506 }
387 507
388 508 $font_size = get_attribute( $attributes, 'customFontSize', DEFAULT_FONTSIZE_VALUE );
389 509 $style = sprintf( 'font-size: %s%s;', $font_size, is_numeric( $font_size ) ? 'px' : '' );
@@ -396,14 +516,16 @@
396 516
397 517 $submit_button_styles .= $style;
398 518 $email_field_styles .= $style;
399 519
400 - $button_spacing = get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE );
401 - if ( true === get_attribute( $attributes, 'buttonOnNewLine' ) ) {
402 - $submit_button_styles .= sprintf( 'margin-top: %dpx;', $button_spacing );
403 - } else {
404 - $submit_button_styles .= 'margin: 0px; '; // Reset Safari's 2px default margin for buttons affecting input and button union
405 - $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 + }
406 528 }
407 529
408 530 if ( has_attribute( $attributes, 'borderColor' ) ) {
409 531 $style = sprintf( 'border-color: %s;', get_attribute( $attributes, 'borderColor', '' ) );
@@ -425,9 +547,9 @@
425 547 $submit_button_styles .= $style;
426 548 $email_field_styles .= $style;
427 549 }
428 550
429 - if ( ! jetpack_is_frontend() ) {
551 + if ( ! Request::is_frontend() ) {
430 552 $background_color_style = get_attribute_color( 'buttonBackgroundColor', $attributes, '#113AF5' /* default lettre theme color */ );
431 553 $text_color_style = get_attribute_color( 'textColor', $attributes, '#FFFFFF' );
432 554 $submit_button_styles .= sprintf( ' background-color: %s; color: %s;', $background_color_style, $text_color_style );
433 555 }
@@ -512,8 +634,15 @@
512 634 return null;
513 635 }
514 636
515 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 +/**
516 645 * Subscriptions block render callback.
517 646 *
518 647 * @param array $attributes Array containing the block attributes.
519 648 *
@@ -520,28 +649,32 @@
520 649 * @return string
521 650 */
522 651 function render_block( $attributes ) {
523 652 // If the Subscriptions module is not active, don't render the block.
524 - if ( ! Jetpack::is_module_active( 'subscriptions' ) ) {
653 + if ( ! ( new Modules() )->is_active( 'subscriptions' ) ) {
525 654 return '';
526 655 }
527 656
528 - if ( class_exists( '\Jetpack_Memberships' ) ) {
529 - // We only want the sites that have newsletter feature enabled to be graced by this JavaScript and thickbox.
530 - Jetpack_Gutenberg::load_assets_as_required( __DIR__, array( 'thickbox' ) );
531 - if ( ! wp_style_is( 'enqueued' ) ) {
532 - wp_enqueue_style( 'thickbox' );
533 - }
657 + if ( is_jetpack_memberships_loaded() ) {
658 + // We only want the sites that have newsletter feature enabled to be graced by this JavaScript.
659 + Jetpack_Gutenberg::load_assets_as_required( __DIR__ );
534 660 } else {
535 661 Jetpack_Gutenberg::load_styles_as_required( FEATURE_NAME );
536 662 }
537 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
538 669 $subscribe_email = Jetpack_Memberships::get_current_user_email();
539 670
540 - /** This filter is documented in modules/contact-form/grunion-contact-form.php */
541 - if ( is_wpcom() || false !== apply_filters( 'jetpack_auto_fill_logged_in_user', false ) ) {
542 - $current_user = wp_get_current_user();
543 - $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 + }
544 677 }
545 678
546 679 // The block is using the Jetpack_Subscriptions_Widget backend, hence the need to increase the instance count.
547 680 ++Jetpack_Subscriptions_Widget::$instance_count;
@@ -548,38 +681,52 @@
548 681
549 682 $classes = get_element_class_names_from_attributes( $attributes );
550 683 $styles = get_element_styles_from_attributes( $attributes );
551 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.
552 690 $include_social_followers = isset( $attributes['includeSocialFollowers'] ) ? (bool) get_attribute( $attributes, 'includeSocialFollowers' ) : true;
553 691
554 692 $data = array(
555 - 'widget_id' => Jetpack_Subscriptions_Widget::$instance_count,
556 - 'subscribe_email' => $subscribe_email,
557 - 'is_paid_subscriber' => get_attribute( $attributes, 'isPaidSubscriber', false ),
558 - '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(
559 697 array(
560 698 'class' => $classes['block_wrapper'],
561 699 )
562 700 ),
563 - 'subscribe_placeholder' => get_attribute( $attributes, 'subscribePlaceholder', __( 'Type your email…', 'jetpack' ) ),
564 - 'submit_button_text' => get_attribute( $attributes, 'submitButtonText', __( 'Subscribe', 'jetpack' ) ),
565 - 'submit_button_text_subscribed' => get_attribute( $attributes, 'submitButtonTextSubscribed', __( 'Subscribed', 'jetpack' ) ),
566 - 'submit_button_text_upgrade' => get_attribute( $attributes, 'submitButtonTextUpgrade', __( 'Upgrade subscription', 'jetpack' ) ),
567 - '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(
568 706 $attributes,
569 707 'successMessage',
570 - 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' )
571 709 ),
572 - 'show_subscribers_total' => (bool) get_attribute( $attributes, 'showSubscribersTotal' ),
573 - 'subscribers_total' => get_subscriber_count( $include_social_followers ),
574 - '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(
575 713 ( is_ssl() ? 'https' : 'http' ) . '://' . ( isset( $_SERVER['HTTP_HOST'] ) ? wp_unslash( $_SERVER['HTTP_HOST'] ) : '' ) .
576 714 ( isset( $_SERVER['REQUEST_URI'] ) ? wp_unslash( $_SERVER['REQUEST_URI'] ) : '' )
577 715 ),
578 - '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 ),
579 721 );
580 722
581 - 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() ) {
582 729 return render_for_email( $data, $styles );
583 730 }
584 731
585 732 return render_for_website( $data, $classes, $styles );
@@ -608,13 +755,15 @@
608 755 *
609 756 * @return string
610 757 */
611 758 function render_for_website( $data, $classes, $styles ) {
612 - $blog_id = \Jetpack_Options::get_option( 'id' );
613 - $widget_id_suffix = Jetpack_Subscriptions_Widget::$instance_count > 1 ? '-' . Jetpack_Subscriptions_Widget::$instance_count : '';
614 - $form_id = 'subscribe-blog' . $widget_id_suffix;
615 - $form_url = 'https://wordpress.com/email-subscriptions';
616 - $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;
617 766
618 767 // Post ID is used for pulling post-specific paid status, and returning to the right post after confirming subscription
619 768 $post_id = null;
620 769 if ( in_the_loop() ) {
@@ -624,12 +773,13 @@
624 773 } else {
625 774 $post_id = get_option( 'page_on_front' );
626 775 }
627 776
628 - $subscribe_field_id = apply_filters( 'subscribe_field_id', 'subscribe-field' . $widget_id_suffix, $data['widget_id'] );
629 - $tier_id = get_post_meta( $post_id, META_NAME_FOR_POST_TIER_ID_SETTINGS, true );
630 - $is_subscribed = Jetpack_Memberships::is_current_user_subscribed();
631 - $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;
632 782
633 783 ob_start();
634 784
635 785 Jetpack_Subscriptions_Widget::render_widget_status_messages(
@@ -639,76 +789,16 @@
639 789 );
640 790 ?>
641 791 <div <?php echo wp_kses_data( $data['wrapper_attributes'] ); ?>>
642 792 <div class="wp-block-jetpack-subscriptions__container<?php echo ! $is_subscribed ? ' is-not-subscriber' : ''; ?>">
643 - <form
644 - action="<?php echo esc_url( $form_url ); ?>"
645 - method="post"
646 - accept-charset="utf-8"
647 - data-blog="<?php echo esc_attr( $blog_id ); ?>"
648 - data-post_access_level="<?php echo esc_attr( $post_access_level ); ?>"
649 - data-subscriber_email="<?php echo esc_attr( $data['subscribe_email'] ); ?>"
650 - id="<?php echo esc_attr( $form_id ); ?>"
651 - >
652 - <div class="wp-block-jetpack-subscriptions__form-elements">
653 - <?php if ( ! $is_subscribed ) : ?>
654 - <p id="subscribe-email">
655 - <label
656 - id="<?php echo esc_attr( $subscribe_field_id . '-label' ); ?>"
657 - for="<?php echo esc_attr( $subscribe_field_id ); ?>"
658 - class="screen-reader-text"
659 - >
660 - <?php echo esc_html( $data['subscribe_placeholder'] ); ?>
661 - </label>
662 - <?php
663 - printf(
664 - '<input
665 - required="required"
666 - type="email"
667 - name="email"
668 - %1$s
669 - style="%2$s"
670 - placeholder="%3$s"
671 - value="%4$s"
672 - id="%5$s"
673 - />',
674 - ( ! empty( $classes['email_field'] )
675 - ? 'class="' . esc_attr( $classes['email_field'] ) . '"'
676 - : ''
677 - ),
678 - ( ! empty( $styles['email_field'] )
679 - ? esc_attr( $styles['email_field'] )
680 - : 'width: 95%; padding: 1px 10px'
681 - ),
682 - esc_attr( $data['subscribe_placeholder'] ),
683 - esc_attr( $data['subscribe_email'] ),
684 - esc_attr( $subscribe_field_id )
685 - );
686 - ?>
687 - </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'] ); ?>"
688 797 <?php endif; ?>
689 - <p id="subscribe-submit"
690 - <?php if ( ! empty( $styles['submit_button_wrapper'] ) ) : ?>
691 - style="<?php echo esc_attr( $styles['submit_button_wrapper'] ); ?>"
692 - <?php endif; ?>
693 - >
694 - <input type="hidden" name="action" value="<?php echo is_top_subscription() ? 'subscribed' : 'subscribe'; ?>"/>
695 - <input type="hidden" name="blog_id" value="<?php echo (int) $blog_id; ?>"/>
696 - <input type="hidden" name="source" value="<?php echo esc_url( $data['referer'] ); ?>"/>
697 - <input type="hidden" name="sub-type" value="<?php echo esc_attr( $data['source'] ); ?>"/>
698 - <input type="hidden" name="redirect_fragment" value="<?php echo esc_attr( $form_id ); ?>"/>
699 - <?php
700 - wp_nonce_field( 'blogsub_subscribe_' . $blog_id );
701 -
702 - if ( ! empty( $post_id ) ) {
703 - echo '<input type="hidden" name="post_id" value="' . esc_attr( $post_id ) . '"/>';
704 - }
705 -
706 - if ( ! empty( $tier_id ) ) {
707 - echo '<input type="hidden" name="tier_id" value="' . esc_attr( $tier_id ) . '"/>';
708 - }
709 - ?>
710 - <button type="submit"
798 + >
799 + <a
800 + href="<?php echo esc_url( 'https://wordpress.com/reader/site/subscription/' . $blog_id ); ?>"
711 801 <?php if ( ! empty( $classes['submit_button'] ) ) : ?>
712 802 class="<?php echo esc_attr( $classes['submit_button'] ); ?>"
713 803 <?php endif; ?>
714 804 <?php if ( ! empty( $styles['submit_button'] ) ) : ?>
@@ -713,20 +803,110 @@
713 803 <?php endif; ?>
714 804 <?php if ( ! empty( $styles['submit_button'] ) ) : ?>
715 805 style="<?php echo esc_attr( $styles['submit_button'] ); ?>"
716 806 <?php endif; ?>
717 - name="jetpack_subscriptions_widget"
718 807 >
719 808 <?php echo sanitize_submit_text( $button_text ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
720 - </button>
721 - </p>
722 - </div>
723 - </form>
724 - <?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 ) : ?>
725 907 <div class="wp-block-jetpack-subscriptions__subscount">
726 - <?php
727 - echo esc_html( Jetpack_Memberships::get_join_others_text( $data['subscribers_total'] ) );
728 - ?>
908 + <?php echo esc_html( Jetpack_Memberships::get_join_others_text( $data['subscribers_total'] ) ); ?>
729 909 </div>
730 910 <?php endif; ?>
731 911 </div>
732 912 </div>
@@ -750,9 +930,9 @@
750 930 <div>
751 931 <div>
752 932 <div>
753 933 <p ' . $submit_button_wrapper_style . '>
754 - <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>
755 935 </p>
756 936 </div>
757 937 </div>
758 938 </div>
@@ -761,26 +941,56 @@
761 941 return $html;
762 942 }
763 943
764 944 /**
765 - * Filter excerpts looking for subscription data.
945 + * WooCommerce Email Editor render callback for the subscriptions block.
766 946 *
767 - * @param string $excerpt The extrapolated excerpt string.
768 - * @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.
769 950 *
770 - * @return mixed
951 + * @return string
771 952 */
772 -function jetpack_filter_excerpt_for_newsletter( $excerpt, $post = null ) {
773 - // The blogmagazine theme is overriding WP core `get_the_excerpt` filter and only passing the excerpt
774 - // TODO: Until this is fixed, return the excerpt without gating. See https://github.com/Automattic/jetpack/pull/28102#issuecomment-1369161116
775 - if ( $post && str_contains( $post->post_content, '<!-- wp:jetpack/subscriptions -->' ) ) {
776 - $excerpt .= sprintf(
777 - // translators: %s is the permalink url to the current post.
778 - __( "<p><a href='%s'>View post</a> to subscribe to site newsletter.</p>", 'jetpack' ),
779 - get_post_permalink()
780 - );
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 '';
781 956 }
782 - 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 + );
783 993 }
784 994
785 995 /**
786 996 * Gate access to posts
@@ -805,17 +1015,10 @@
805 1015 }
806 1016 return $the_content;
807 1017 }
808 1018
809 - require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php';
810 - $token_service = subscription_service();
811 - $token = $token_service->get_and_set_token_from_request();
812 - $payload = $token_service->decode_token( $token );
813 - $is_valid_token = ! empty( $payload );
814 - $email_confirmation_pending = $is_valid_token && isset( $payload['blog_sub'] ) && $payload['blog_sub'] === 'pending';
1019 + $paywalled_content = get_paywall_content();
815 1020
816 - $paywalled_content = get_paywall_content( $post_access_level, $email_confirmation_pending ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
817 -
818 1021 if ( has_block( \Automattic\Jetpack\Extensions\Paywall\BLOCK_NAME ) ) {
819 1022 if ( strpos( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML ) ) {
820 1023 return strstr( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML, true ) . $paywalled_content;
821 1024 }
@@ -865,22 +1068,46 @@
865 1068 return '';
866 1069 }
867 1070
868 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 +/**
869 1098 * Returns paywall content blocks
870 1099 *
871 - * @param string $post_access_level The newsletter access level.
872 - * @param string $email_confirmation_pending True if the current user needs to validate their email.
873 1100 * @return string
874 1101 */
875 -function get_paywall_content( $post_access_level, $email_confirmation_pending = false ) {
876 - if ( $email_confirmation_pending ) {
1102 +function get_paywall_content() {
1103 + if ( Jetpack_Memberships::user_is_pending_subscriber() ) {
877 1104 return get_paywall_blocks_subscribe_pending();
878 1105 }
879 1106 if ( doing_filter( 'get_the_excerpt' ) ) {
880 1107 return '';
881 1108 }
882 - return get_paywall_blocks( $post_access_level );
1109 + return get_paywall_blocks();
883 1110 }
884 1111
885 1112 /**
886 1113 * Returns the current URL.
@@ -962,22 +1189,22 @@
962 1189
963 1190 /**
964 1191 * Returns paywall content blocks if user is not authenticated
965 1192 *
966 - * @param string $newsletter_access_level The newsletter access level.
967 1193 * @return string
968 1194 */
969 -function get_paywall_blocks( $newsletter_access_level ) {
1195 +function get_paywall_blocks() {
970 1196 $custom_paywall = apply_filters( 'jetpack_custom_paywall_blocks', false );
971 1197 if ( ! empty( $custom_paywall ) ) {
972 1198 return $custom_paywall;
973 1199 }
974 - if ( ! jetpack_is_frontend() ) { // emails
1200 +
1201 + if ( ! Request::is_frontend() ) { // emails
975 1202 return get_paywall_simple();
976 1203 }
1204 +
977 1205 require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
978 - // Only display paid texts when Stripe is connected and the post is marked for paid subscribers
979 - $is_paid_post = $newsletter_access_level === 'paid_subscribers' && Jetpack_Memberships::has_connected_account();
1206 + $is_paid_post = is_paid_post();
980 1207 $is_paid_subscriber = Jetpack_Memberships::user_is_paid_subscriber();
981 1208
982 1209 $access_heading = $is_paid_subscriber
983 1210 ? esc_html__( 'Upgrade to continue reading', 'jetpack' )
@@ -984,50 +1211,42 @@
984 1211 : esc_html__( 'Subscribe to continue reading', 'jetpack' );
985 1212
986 1213 $subscribe_text = $is_paid_post
987 1214 // translators: %s is the name of the site.
988 - ? $is_paid_subscriber
989 - ? esc_html__( 'Upgrade to get access to the rest of this post and other exclusive content.', 'jetpack' )
990 - : 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 + )
991 1220 // translators: %s is the name of the site.
992 1221 : esc_html__( 'Subscribe to get access to the rest of this post and other subscriber-only content.', 'jetpack' );
993 1222
994 - $sign_in = '';
995 - $switch_accounts = '';
1223 + $login_block = '';
996 1224
997 - if ( ( new Host() )->is_wpcom_simple() ) {
998 - // On WPCOM we will redirect directly to the current page
999 - $redirect_url = get_current_url();
1000 - } else {
1001 - // On self-hosted we will save and hide the token
1002 - $redirect_url = get_site_url() . '/wp-json/jetpack/v4/subscribers/auth';
1003 - $redirect_url = add_query_arg( 'redirect_url', get_current_url(), $redirect_url );
1004 - }
1005 -
1006 - $sign_in_link = add_query_arg(
1007 - array(
1008 - 'site_id' => intval( \Jetpack_Options::get_option( 'id' ) ),
1009 - 'redirect_url' => rawurlencode( $redirect_url ),
1010 - ),
1011 - 'https://subscribe.wordpress.com/memberships/jwt'
1012 - );
1013 1225 if ( is_user_auth() ) {
1014 1226 if ( ( new Host() )->is_wpcom_simple() ) {
1015 - $switch_accounts_link = wp_logout_url( $sign_in_link );
1016 - $switch_accounts = '<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"}}} -->
1017 -<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>
1018 1240 <!-- /wp:paragraph -->';
1019 -
1020 1241 }
1021 1242 } else {
1022 - if ( ( new Host() )->is_wpcom_simple() ) {
1023 - // custom domain
1024 - $sign_in_link = wpcom_logmein_redirect_url( get_current_url(), false, null, 'link', get_current_blog_id() );
1025 - }
1026 - $access_question = get_paywall_access_question( $newsletter_access_level );
1027 - $sign_in = '<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"}}} -->
1028 -<p class="has-text-align-center" style="font-size:14px"><a href="' . $sign_in_link . '">' . $access_question . '</a></p>
1029 -<!-- /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 -->';
1030 1249 }
1031 1250
1032 1251 $lock_svg = plugins_url( 'images/lock-paywall.svg', JETPACK__PLUGIN_FILE );
1033 1252
@@ -1046,10 +1265,9 @@
1046 1265 <p class="has-text-align-center" style="margin-top:10px;margin-bottom:10px;font-size:14px">' . $subscribe_text . '</p>
1047 1266 <!-- /wp:paragraph -->
1048 1267
1049 1268 <!-- wp:jetpack/subscriptions {"borderRadius":50,"borderColor":"primary","className":"is-style-compact","isPaidSubscriber":' . ( $is_paid_subscriber ? 'true' : 'false' ) . '} /-->
1050 -' . $sign_in . '
1051 -' . $switch_accounts . '
1269 +' . $login_block . '
1052 1270 </div>
1053 1271 <!-- /wp:group -->
1054 1272 ';
1055 1273 }
@@ -1054,38 +1272,13 @@
1054 1272 ';
1055 1273 }
1056 1274
1057 1275 /**
1058 - * Returns Get Access question for the paywall
1059 - *
1060 - * @param string $post_access_level The newsletter access level.
1061 - * @return string.
1062 - */
1063 -function get_paywall_access_question( $post_access_level ) {
1064 - switch ( $post_access_level ) {
1065 - case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS:
1066 - case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS:
1067 - $tier = Jetpack_Memberships::get_post_tier();
1068 - if ( $tier !== null ) {
1069 - return sprintf(
1070 - // translators: Placeholder is the tier name
1071 - __( 'Already a higher-tier paid subscriber?', 'jetpack' ),
1072 - esc_html( $tier->post_title )
1073 - );
1074 - } else {
1075 - return esc_html__( 'Already a paid subscriber?', 'jetpack' );
1076 - }
1077 - default:
1078 - return esc_html__( 'Already a subscriber?', 'jetpack' );
1079 - }
1080 -}
1081 -
1082 -/**
1083 1276 * Returns true if user is auth for subscriptions check, otherwise returns false.
1084 1277 *
1085 - * @return boolean
1278 + * @return bool
1086 1279 */
1087 -function is_user_auth() {
1280 +function is_user_auth(): bool {
1088 1281 if ( ( new Host() )->is_wpcom_simple() && is_user_logged_in() ) {
1089 1282 return true;
1090 1283 }
1091 1284 if ( current_user_can( 'manage_options' ) ) {
@@ -1090,9 +1283,10 @@
1090 1283 }
1091 1284 if ( current_user_can( 'manage_options' ) ) {
1092 1285 return true;
1093 1286 }
1094 - if ( class_exists( 'Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Jetpack_Token_Subscription_Service' ) ) {
1287 +
1288 + if ( is_jetpack_token_subscription_service_loaded() ) {
1095 1289 if ( Jetpack_Token_Subscription_Service::has_token_from_cookie() ) {
1096 1290 return true;
1097 1291 }
1098 1292 }
@@ -1099,22 +1293,61 @@
1099 1293 return false;
1100 1294 }
1101 1295
1102 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 +/**
1103 1325 * Returns paywall content blocks when email confirmation is pending
1104 1326 *
1105 1327 * @return string
1106 1328 */
1107 1329 function get_paywall_blocks_subscribe_pending() {
1108 - $access_heading = esc_html__( 'Verify your email to continue reading', 'jetpack' );
1330 + $subscribe_email = Jetpack_Memberships::get_current_user_email();
1109 1331
1110 - $subscribe_text = esc_html__( 'Please check your inbox to confirm your subscription.', 'jetpack' );
1332 + /** This filter is documented in \Automattic\Jetpack\Forms\ContactForm\Contact_Form */
1333 + if ( is_wpcom() || false !== apply_filters( 'jetpack_auto_fill_logged_in_user', false ) ) {
1334 + $current_user = wp_get_current_user();
1335 + if ( ! empty( $current_user->user_email ) ) {
1336 + $subscribe_email = $current_user->user_email;
1337 + }
1338 + }
1111 1339
1340 + $access_heading = esc_html__( 'Confirm your subscription to continue reading', 'jetpack' );
1341 +
1342 + /* translators: %s: email address */
1343 + $subscribe_text = sprintf( esc_html__( 'Head to your inbox and confirm your email address %s.', 'jetpack' ), $subscribe_email );
1344 +
1112 1345 $lock_svg = plugins_url( 'images/lock-paywall.svg', JETPACK__PLUGIN_FILE );
1113 1346
1114 1347 return '
1115 -<!-- 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"}} -->
1116 -<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">
1117 1350 <!-- wp:image {"align":"center","width":24,"height":24,"sizeSlug":"large","linkDestination":"none"} -->
1118 1351 <figure class="wp-block-image aligncenter size-large is-resized"><img src="' . $lock_svg . '" alt="" width="24" height="24"/></figure>
1119 1352 <!-- /wp:image -->
1120 1353
@@ -1130,22 +1363,37 @@
1130 1363 ';
1131 1364 }
1132 1365
1133 1366 /**
1134 - * Return content for non frontend views like emails.
1135 - *
1136 - * @return string
1367 + * Return content for non frontend views like Reader, emails.
1137 1368 */
1138 -function get_paywall_simple() {
1139 - $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' );
1140 1374
1141 - $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 + }
1142 1387
1143 1388 return '
1144 1389 <!-- wp:columns -->
1145 -<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%">
1146 1391 <!-- wp:column -->
1147 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 -->
1148 1396 <!-- wp:paragraph -->
1149 1397 <p class="has-text-align-center"
1150 1398 style="text-align: center;
1151 1399 color: #50575E;
@@ -1152,21 +1400,20 @@
1152 1400 font-weight: 400;
1153 1401 font-size: 16px;
1154 1402 font-family: \'SF Pro Text\', sans-serif;
1155 1403 line-height: 28.8px;">
1156 - ' . $access_heading . '
1404 + ' . $paywall_description . '
1157 1405 </p>
1158 1406 <!-- /wp:paragraph -->
1159 -
1160 1407 <!-- wp:buttons -->
1161 1408 <div class="wp-block-buttons" style="text-align: center;">
1162 1409 <!-- wp:button -->
1163 - <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;">
1164 1411 <a href="' . esc_url( get_post_permalink() ) . '" class="wp-block-button__link wp-element-button"
1165 1412 data-wpcom-track data-tracks-link-desc="paywall-email-click"
1166 1413 style="display: inline-block;
1167 - padding: 15px 20px;
1168 - background-color: #0675C4;
1414 + padding: 12px 15px;
1415 + background-color: #3858e9;
1169 1416 color: #FFFFFF;
1170 1417 text-decoration: none;
1171 1418 border-radius: 5px;
1172 1419 font-family: \'SF Pro Display\', sans-serif;
@@ -1171,9 +1418,9 @@
1171 1418 border-radius: 5px;
1172 1419 font-family: \'SF Pro Display\', sans-serif;
1173 1420 font-weight: 500;
1174 1421 font-size: 16px;
1175 - text-align: center;">' . $subscribe_text . '</a>
1422 + text-align: center;">' . $paywall_action_btn . '</a>
1176 1423 </div>
1177 1424 <!-- /wp:button -->
1178 1425 </div>
1179 1426 <!-- /wp:buttons -->