← All changes
|
extensions/blocks/subscriptions/subscriptions.php
+653
-403
12.6.4
→
16.3-a.7
View file →
| @@ -7,18 +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 | -use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Token_Subscription_Service; | |
| 13 | -use Automattic\Jetpack\Status; | |
| 11 | +use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Abstract_Token_Subscription_Service; | |
| 12 | +use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Jetpack_Token_Subscription_Service; | |
| 13 | +use Automattic\Jetpack\Modules; | |
| 14 | 14 | use Automattic\Jetpack\Status\Host; |
| 15 | -use Jetpack; | |
| 15 | +use Automattic\Jetpack\Status\Request; | |
| 16 | 16 | use Jetpack_Gutenberg; |
| 17 | 17 | use Jetpack_Memberships; |
| 18 | 18 | use Jetpack_Subscriptions_Widget; |
| 19 | 19 | |
| 20 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 21 | + exit( 0 ); | |
| 22 | +} | |
| 23 | + | |
| 24 | +require_once __DIR__ . '/class-jetpack-subscription-site.php'; | |
| 20 | 25 | require_once __DIR__ . '/constants.php'; |
| 26 | +require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php'; | |
| 21 | 27 | |
| 22 | 28 | /** |
| 23 | 29 | * These block defaults should match ./constants.js |
| 24 | 30 | */ |
| @@ -26,8 +32,9 @@ | ||
| 26 | 32 | const DEFAULT_BORDER_WEIGHT_VALUE = 1; |
| 27 | 33 | const DEFAULT_FONTSIZE_VALUE = '16px'; |
| 28 | 34 | const DEFAULT_PADDING_VALUE = 15; |
| 29 | 35 | const DEFAULT_SPACING_VALUE = 10; |
| 36 | +const DEFAULT_BUTTON_WIDTH = 'auto'; | |
| 30 | 37 | |
| 31 | 38 | /** |
| 32 | 39 | * Registers the block for use in Gutenberg |
| 33 | 40 | * This is done via an action so that we can disable |
| @@ -41,17 +48,24 @@ | ||
| 41 | 48 | \WPForTeams\is_wpforteams_site( get_current_blog_id() ) ) { |
| 42 | 49 | return; |
| 43 | 50 | } |
| 44 | 51 | |
| 45 | - if ( | |
| 46 | - ( defined( 'IS_WPCOM' ) && IS_WPCOM ) | |
| 47 | - || ( ( new Connection_Manager( 'jetpack' ) )->has_connected_owner() && ! ( new Status() )->is_offline_mode() ) | |
| 48 | - ) { | |
| 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() ) { | |
| 49 | 62 | Blocks::jetpack_register_block( |
| 50 | - BLOCK_NAME, | |
| 63 | + __DIR__, | |
| 51 | 64 | array( |
| 52 | - 'render_callback' => __NAMESPACE__ . '\render_block', | |
| 53 | - 'supports' => array( | |
| 65 | + 'render_callback' => __NAMESPACE__ . '\render_block', | |
| 66 | + 'render_email_callback' => __NAMESPACE__ . '\render_email', | |
| 67 | + 'supports' => array( | |
| 54 | 68 | 'spacing' => array( |
| 55 | 69 | 'margin' => true, |
| 56 | 70 | 'padding' => true, |
| 57 | 71 | ), |
| @@ -60,31 +74,40 @@ | ||
| 60 | 74 | ) |
| 61 | 75 | ); |
| 62 | 76 | } |
| 63 | 77 | |
| 64 | - /* | |
| 65 | - * If the Subscriptions module is not active, | |
| 66 | - * do not make any further changes on the site. | |
| 67 | - */ | |
| 68 | - if ( ! Jetpack::is_module_active( 'subscriptions' ) ) { | |
| 69 | - return; | |
| 70 | - } | |
| 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 | + ); | |
| 71 | 98 | |
| 72 | - /** | |
| 73 | - * Do not proceed if the newsletter feature is not enabled | |
| 74 | - * or if the 'Jetpack_Memberships' class does not exists. | |
| 75 | - */ | |
| 76 | - if ( ! class_exists( '\Jetpack_Memberships' ) ) { | |
| 77 | - return; | |
| 78 | - } | |
| 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 ); | |
| 79 | 101 | |
| 80 | 102 | register_post_meta( |
| 81 | 103 | 'post', |
| 82 | - META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS, | |
| 104 | + META_NAME_FOR_POST_DONT_EMAIL_TO_SUBS, | |
| 83 | 105 | array( |
| 106 | + 'default' => $dont_email_default, | |
| 84 | 107 | 'show_in_rest' => true, |
| 85 | 108 | 'single' => true, |
| 86 | - 'type' => 'string', | |
| 109 | + 'type' => 'boolean', | |
| 87 | 110 | 'auth_callback' => function () { |
| 88 | 111 | return wp_get_current_user()->has_cap( 'edit_posts' ); |
| 89 | 112 | }, |
| 90 | 113 | ) |
| @@ -89,13 +112,48 @@ | ||
| 89 | 112 | }, |
| 90 | 113 | ) |
| 91 | 114 | ); |
| 92 | 115 | |
| 116 | + register_post_meta( | |
| 117 | + 'post', | |
| 118 | + META_NAME_FOR_POST_TIER_ID_SETTINGS, | |
| 119 | + array( | |
| 120 | + 'show_in_rest' => true, | |
| 121 | + 'single' => true, | |
| 122 | + 'type' => 'integer', | |
| 123 | + 'auth_callback' => function () { | |
| 124 | + return wp_get_current_user()->has_cap( 'edit_posts' ); | |
| 125 | + }, | |
| 126 | + ) | |
| 127 | + ); | |
| 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 | + | |
| 93 | 142 | // This ensures Jetpack will sync this post meta to WPCOM. |
| 94 | 143 | add_filter( |
| 95 | 144 | 'jetpack_sync_post_meta_whitelist', |
| 96 | 145 | function ( $allowed_meta ) { |
| 97 | - 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 | + ); | |
| 98 | 156 | } |
| 99 | 157 | ); |
| 100 | 158 | |
| 101 | 159 | // Hide the content – Priority 8 makes it run before do_blocks gets called for the content |
| @@ -107,14 +165,41 @@ | ||
| 107 | 165 | |
| 108 | 166 | // Hide existing comments |
| 109 | 167 | add_filter( 'get_comment', __NAMESPACE__ . '\maybe_gate_existing_comments' ); |
| 110 | 168 | |
| 111 | - // Gate the excerpt for a post | |
| 112 | - 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 | + } | |
| 113 | 176 | |
| 114 | - // Add a 'Newsletter access' column to the Edit posts page | |
| 115 | - add_action( 'manage_post_posts_columns', __NAMESPACE__ . '\register_newsletter_access_column' ); | |
| 116 | - 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 | + } | |
| 117 | 202 | } |
| 118 | 203 | add_action( 'init', __NAMESPACE__ . '\register_block', 9 ); |
| 119 | 204 | |
| 120 | 205 | /** |
| @@ -132,15 +217,10 @@ | ||
| 132 | 217 | * @param array $columns An array of column names. |
| 133 | 218 | * @return array An array of column names. |
| 134 | 219 | */ |
| 135 | 220 | function register_newsletter_access_column( $columns ) { |
| 136 | - if ( ! Jetpack_Memberships::has_configured_plans_jetpack_recurring_payments( 'newsletter' ) ) { | |
| 137 | - // We only display the "NL access" column if we have published one paid-newsletter | |
| 138 | - return $columns; | |
| 139 | - } | |
| 140 | - | |
| 141 | 221 | $position = array_search( 'title', array_keys( $columns ), true ); |
| 142 | - $new_column = array( NEWSLETTER_COLUMN_ID => '<span>' . __( 'Newsletter', 'jetpack' ) . '</span>' ); | |
| 222 | + $new_column = array( NEWSLETTER_COLUMN_ID => __( 'Newsletter', 'jetpack' ) ); | |
| 143 | 223 | return array_merge( |
| 144 | 224 | array_slice( $columns, 0, $position + 1, true ), |
| 145 | 225 | $new_column, |
| 146 | 226 | array_slice( $columns, $position, null, true ) |
| @@ -147,8 +227,38 @@ | ||
| 147 | 227 | ); |
| 148 | 228 | } |
| 149 | 229 | |
| 150 | 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 | + // A Paywall block gates the post whatever the stored access level; see Jetpack_Memberships::get_post_access_level(). | |
| 245 | + $is_paywalled = has_block( \Automattic\Jetpack\Extensions\Paywall\BLOCK_NAME, $post ); | |
| 246 | + switch ( $access_level ) { | |
| 247 | + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS: | |
| 248 | + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS: | |
| 249 | + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS: | |
| 250 | + $is_paywalled = true; | |
| 251 | + } | |
| 252 | + if ( $is_paywalled ) { | |
| 253 | + update_post_meta( $post_id, META_NAME_CONTAINS_PAYWALLED_CONTENT, $is_paywalled ); | |
| 254 | + } | |
| 255 | + if ( ! $is_paywalled ) { | |
| 256 | + delete_post_meta( $post_id, META_NAME_CONTAINS_PAYWALLED_CONTENT ); | |
| 257 | + } | |
| 258 | +} | |
| 259 | + | |
| 260 | +/** | |
| 151 | 261 | * Displays the newsletter access level. |
| 152 | 262 | * |
| 153 | 263 | * @param string $column_id The ID of the column to display. |
| 154 | 264 | * @param int $post_id The current post ID. |
| @@ -157,18 +267,21 @@ | ||
| 157 | 267 | if ( NEWSLETTER_COLUMN_ID !== $column_id ) { |
| 158 | 268 | return; |
| 159 | 269 | } |
| 160 | 270 | |
| 161 | - $access_level = get_post_meta( $post_id, META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS, true ); | |
| 271 | + $access_level = Jetpack_Memberships::get_post_access_level( $post_id ); | |
| 162 | 272 | |
| 163 | 273 | switch ( $access_level ) { |
| 164 | - case Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS: | |
| 274 | + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS: | |
| 275 | + echo esc_html__( 'Paid Subscribers (all plans)', 'jetpack' ); | |
| 276 | + break; | |
| 277 | + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS: | |
| 165 | 278 | echo esc_html__( 'Paid Subscribers', 'jetpack' ); |
| 166 | 279 | break; |
| 167 | - case Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS: | |
| 280 | + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS: | |
| 168 | 281 | echo esc_html__( 'Subscribers', 'jetpack' ); |
| 169 | 282 | break; |
| 170 | - case Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY: | |
| 283 | + case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY: | |
| 171 | 284 | echo esc_html__( 'Everybody', 'jetpack' ); |
| 172 | 285 | break; |
| 173 | 286 | default: |
| 174 | 287 | echo ''; |
| @@ -175,11 +288,18 @@ | ||
| 175 | 288 | } |
| 176 | 289 | } |
| 177 | 290 | |
| 178 | 291 | /** |
| 179 | - * Determine the amount of folks currently subscribed to the blog, splitted out in email_subscribers & social_followers & paid_subscribers | |
| 292 | + * Adds the Newsletter column styles | |
| 293 | + */ | |
| 294 | +function newsletter_access_column_styles() { | |
| 295 | + echo '<style id="jetpack-newsletter-newsletter-access-column"> table.fixed .column-newsletter_access { width: 10%; } </style>'; | |
| 296 | +} | |
| 297 | + | |
| 298 | +/** | |
| 299 | + * Determine the amount of folks currently subscribed to the blog, splitted out in total_subscribers, email_subscribers, social_followers & paid_subscribers. | |
| 180 | 300 | * |
| 181 | - * @return array containing ['value' => ['email_subscribers' => 0, 'paid_subscribers' => 0, 'social_followers' => 0]] | |
| 301 | + * @return array containing ['value' => ['total_subscribers' => 0, 'email_subscribers' => 0, 'paid_subscribers' => 0, 'social_followers' => 0]] | |
| 182 | 302 | */ |
| 183 | 303 | function fetch_subscriber_counts() { |
| 184 | 304 | $subs_count = 0; |
| 185 | 305 | if ( is_wpcom() ) { |
| @@ -197,9 +317,10 @@ | ||
| 197 | 317 | $subs_count = array( |
| 198 | 318 | 'status' => 'failed', |
| 199 | 319 | 'code' => $xml->getErrorCode(), |
| 200 | 320 | 'message' => $xml->getErrorMessage(), |
| 201 | - 'value' => ( isset( $subs_count['value'] ) ) ? $subs_count['value'] : array( | |
| 321 | + 'value' => $subs_count['value'] ?? array( | |
| 322 | + 'total_subscribers' => 0, | |
| 202 | 323 | 'email_subscribers' => 0, |
| 203 | 324 | 'social_followers' => 0, |
| 204 | 325 | 'paid_subscribers' => 0, |
| 205 | 326 | ), |
| @@ -225,58 +346,16 @@ | ||
| 225 | 346 | function get_subscriber_count( $include_social_followers ) { |
| 226 | 347 | $counts = fetch_subscriber_counts(); |
| 227 | 348 | |
| 228 | 349 | if ( $include_social_followers ) { |
| 229 | - $subscriber_count = $counts['value']['email_subscribers'] + $counts['value']['social_followers']; | |
| 350 | + $subscriber_count = $counts['value']['total_subscribers'] + $counts['value']['social_followers']; | |
| 230 | 351 | } else { |
| 231 | - $subscriber_count = $counts['value']['email_subscribers']; | |
| 352 | + $subscriber_count = $counts['value']['total_subscribers']; | |
| 232 | 353 | } |
| 233 | 354 | return $subscriber_count; |
| 234 | 355 | } |
| 235 | 356 | |
| 236 | 357 | /** |
| 237 | - * Returns the newsletter categories from the .com API or the Jetpack XML-RPC API. | |
| 238 | - * | |
| 239 | - * @return array containing [ 'enabled' => true|false, 'newsletter_categories' => array ] | |
| 240 | - */ | |
| 241 | -function fetch_newsletter_categories() { | |
| 242 | - $categories = array(); | |
| 243 | - | |
| 244 | - if ( is_wpcom() ) { | |
| 245 | - $categories = \wpcom_fetch_newsletter_categories(); | |
| 246 | - } else { | |
| 247 | - $xml = new \Jetpack_IXR_Client(); | |
| 248 | - $xml->query( 'jetpack.fetchNewsletterCategories' ); | |
| 249 | - | |
| 250 | - if ( ! $xml->isError() ) { | |
| 251 | - $categories = $xml->getResponse(); | |
| 252 | - } | |
| 253 | - } | |
| 254 | - | |
| 255 | - return $categories; | |
| 256 | -} | |
| 257 | - | |
| 258 | -/** | |
| 259 | - * Returns the newsletter categories if the feature is enabled, otherwise returns an empty array. | |
| 260 | - * | |
| 261 | - * @return array | |
| 262 | - */ | |
| 263 | -function get_newsletter_categories() { | |
| 264 | - $response = fetch_newsletter_categories(); | |
| 265 | - | |
| 266 | - if ( | |
| 267 | - isset( $response['enabled'] ) | |
| 268 | - && (bool) $response['enabled'] | |
| 269 | - && isset( $response['newsletter_categories'] ) | |
| 270 | - && is_array( $response['newsletter_categories'] ) | |
| 271 | - ) { | |
| 272 | - return $response['newsletter_categories']; | |
| 273 | - } | |
| 274 | - | |
| 275 | - return array(); | |
| 276 | -} | |
| 277 | - | |
| 278 | -/** | |
| 279 | 358 | * Returns true if the block attributes contain a value for the given key. |
| 280 | 359 | * |
| 281 | 360 | * @param array $attributes Array containing the block attributes. |
| 282 | 361 | * @param string $key Block attribute key. |
| @@ -374,8 +453,24 @@ | ||
| 374 | 453 | ); |
| 375 | 454 | } |
| 376 | 455 | |
| 377 | 456 | /** |
| 457 | + * Checks if block style is "button only" | |
| 458 | + * | |
| 459 | + * @param string $class_name Block attribute className; multiple names are spearated by space. | |
| 460 | + * | |
| 461 | + * @return bool | |
| 462 | + */ | |
| 463 | +function is_button_only_style( $class_name ) { | |
| 464 | + if ( empty( $class_name ) ) { | |
| 465 | + return false; | |
| 466 | + } | |
| 467 | + | |
| 468 | + $class_names = explode( ' ', $class_name ); | |
| 469 | + return in_array( 'is-style-button', $class_names, true ); | |
| 470 | +} | |
| 471 | + | |
| 472 | +/** | |
| 378 | 473 | * Uses block attributes to generate an array containing the styles for various block elements. |
| 379 | 474 | * Based on Jetpack_Subscriptions_Widget::do_subscription_form() which the block was originally using. |
| 380 | 475 | * |
| 381 | 476 | * @param array $attributes Array containing the block attributes. |
| @@ -382,8 +477,10 @@ | ||
| 382 | 477 | * |
| 383 | 478 | * @return array |
| 384 | 479 | */ |
| 385 | 480 | function get_element_styles_from_attributes( $attributes ) { |
| 481 | + $is_button_only_style = is_button_only_style( get_attribute( $attributes, 'className', '' ) ); | |
| 482 | + | |
| 386 | 483 | $button_background_style = ! has_attribute( $attributes, 'buttonBackgroundColor' ) && has_attribute( $attributes, 'customButtonGradient' ) |
| 387 | 484 | ? get_attribute( $attributes, 'customButtonGradient' ) |
| 388 | 485 | : get_attribute( $attributes, 'customButtonBackgroundColor' ); |
| 389 | 486 | |
| @@ -399,15 +496,15 @@ | ||
| 399 | 496 | $submit_button_styles .= sprintf( 'color: %s;', get_attribute( $attributes, 'customTextColor' ) ); |
| 400 | 497 | } |
| 401 | 498 | |
| 402 | 499 | if ( has_attribute( $attributes, 'buttonWidth' ) ) { |
| 403 | - $submit_button_wrapper_styles .= sprintf( 'width: %s;', get_attribute( $attributes, 'buttonWidth' ) ); | |
| 500 | + $submit_button_wrapper_styles .= sprintf( 'width: %s;', get_attribute( $attributes, 'buttonWidth', DEFAULT_BUTTON_WIDTH ) ); | |
| 404 | 501 | $submit_button_wrapper_styles .= 'max-width: 100%;'; |
| 405 | 502 | |
| 406 | 503 | // Account for custom margins on inline forms. |
| 407 | 504 | $submit_button_styles .= true === get_attribute( $attributes, 'buttonOnNewLine' ) |
| 408 | - ? sprintf( 'width: calc(100%% - %dpx);', get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ) ) | |
| 409 | - : 'width: 100%;'; | |
| 505 | + ? 'width: 100%;' | |
| 506 | + : sprintf( 'width: calc(100%% - %dpx);', get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ) ); | |
| 410 | 507 | } |
| 411 | 508 | |
| 412 | 509 | $font_size = get_attribute( $attributes, 'customFontSize', DEFAULT_FONTSIZE_VALUE ); |
| 413 | 510 | $style = sprintf( 'font-size: %s%s;', $font_size, is_numeric( $font_size ) ? 'px' : '' ); |
| @@ -420,14 +517,16 @@ | ||
| 420 | 517 | |
| 421 | 518 | $submit_button_styles .= $style; |
| 422 | 519 | $email_field_styles .= $style; |
| 423 | 520 | |
| 424 | - $button_spacing = get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ); | |
| 425 | - if ( true === get_attribute( $attributes, 'buttonOnNewLine' ) ) { | |
| 426 | - $submit_button_styles .= sprintf( 'margin-top: %dpx;', $button_spacing ); | |
| 427 | - } else { | |
| 428 | - $submit_button_styles .= 'margin: 0px; '; // Reset Safari's 2px default margin for buttons affecting input and button union | |
| 429 | - $submit_button_styles .= sprintf( 'margin-left: %dpx;', $button_spacing ); | |
| 521 | + if ( ! $is_button_only_style ) { | |
| 522 | + $button_spacing = get_attribute( $attributes, 'spacing', DEFAULT_SPACING_VALUE ); | |
| 523 | + if ( true === get_attribute( $attributes, 'buttonOnNewLine' ) ) { | |
| 524 | + $submit_button_styles .= sprintf( 'margin-top: %dpx;', $button_spacing ); | |
| 525 | + } else { | |
| 526 | + $submit_button_styles .= 'margin: 0; '; // Reset Safari's 2px default margin for buttons affecting input and button union | |
| 527 | + $submit_button_styles .= sprintf( 'margin-left: %dpx;', $button_spacing ); | |
| 528 | + } | |
| 430 | 529 | } |
| 431 | 530 | |
| 432 | 531 | if ( has_attribute( $attributes, 'borderColor' ) ) { |
| 433 | 532 | $style = sprintf( 'border-color: %s;', get_attribute( $attributes, 'borderColor', '' ) ); |
| @@ -442,10 +541,8 @@ | ||
| 442 | 541 | $style = sprintf( 'border-width: %dpx;', get_attribute( $attributes, 'borderWeight', DEFAULT_BORDER_WEIGHT_VALUE ) ); |
| 443 | 542 | $submit_button_styles .= $style; |
| 444 | 543 | $email_field_styles .= $style; |
| 445 | 544 | |
| 446 | - $categories_styles = sprintf( '--subscribe-block-border-radius: %dpx;', get_attribute( $attributes, 'borderRadius', DEFAULT_BORDER_RADIUS_VALUE ) ); | |
| 447 | - | |
| 448 | 545 | if ( has_attribute( $attributes, 'customBorderColor' ) ) { |
| 449 | 546 | $style = sprintf( 'border-color: %s; border-style: solid;', get_attribute( $attributes, 'customBorderColor' ) ); |
| 450 | 547 | |
| 451 | 548 | $submit_button_styles .= $style; |
| @@ -451,9 +548,9 @@ | ||
| 451 | 548 | $submit_button_styles .= $style; |
| 452 | 549 | $email_field_styles .= $style; |
| 453 | 550 | } |
| 454 | 551 | |
| 455 | - if ( ! jetpack_is_frontend() ) { | |
| 552 | + if ( ! Request::is_frontend() ) { | |
| 456 | 553 | $background_color_style = get_attribute_color( 'buttonBackgroundColor', $attributes, '#113AF5' /* default lettre theme color */ ); |
| 457 | 554 | $text_color_style = get_attribute_color( 'textColor', $attributes, '#FFFFFF' ); |
| 458 | 555 | $submit_button_styles .= sprintf( ' background-color: %s; color: %s;', $background_color_style, $text_color_style ); |
| 459 | 556 | } |
| @@ -461,9 +558,8 @@ | ||
| 461 | 558 | return array( |
| 462 | 559 | 'email_field' => $email_field_styles, |
| 463 | 560 | 'submit_button' => $submit_button_styles, |
| 464 | 561 | 'submit_button_wrapper' => $submit_button_wrapper_styles, |
| 465 | - 'categories' => $categories_styles, | |
| 466 | 562 | ); |
| 467 | 563 | } |
| 468 | 564 | |
| 469 | 565 | /** |
| @@ -539,8 +635,15 @@ | ||
| 539 | 635 | return null; |
| 540 | 636 | } |
| 541 | 637 | |
| 542 | 638 | /** |
| 639 | + * Is the Jetpack_Memberships class loaded. | |
| 640 | + */ | |
| 641 | +function is_jetpack_memberships_loaded(): bool { | |
| 642 | + return class_exists( '\Jetpack_Memberships' ); | |
| 643 | +} | |
| 644 | + | |
| 645 | +/** | |
| 543 | 646 | * Subscriptions block render callback. |
| 544 | 647 | * |
| 545 | 648 | * @param array $attributes Array containing the block attributes. |
| 546 | 649 | * |
| @@ -547,28 +650,32 @@ | ||
| 547 | 650 | * @return string |
| 548 | 651 | */ |
| 549 | 652 | function render_block( $attributes ) { |
| 550 | 653 | // If the Subscriptions module is not active, don't render the block. |
| 551 | - if ( ! Jetpack::is_module_active( 'subscriptions' ) ) { | |
| 654 | + if ( ! ( new Modules() )->is_active( 'subscriptions' ) ) { | |
| 552 | 655 | return ''; |
| 553 | 656 | } |
| 554 | 657 | |
| 555 | - if ( class_exists( '\Jetpack_Memberships' ) ) { | |
| 556 | - // We only want the sites that have newsletter feature enabled to be graced by this JavaScript and thickbox. | |
| 557 | - Jetpack_Gutenberg::load_assets_as_required( FEATURE_NAME, array( 'thickbox' ) ); | |
| 558 | - if ( ! wp_style_is( 'enqueued' ) ) { | |
| 559 | - wp_enqueue_style( 'thickbox' ); | |
| 560 | - } | |
| 658 | + if ( is_jetpack_memberships_loaded() ) { | |
| 659 | + // We only want the sites that have newsletter feature enabled to be graced by this JavaScript. | |
| 660 | + Jetpack_Gutenberg::load_assets_as_required( __DIR__ ); | |
| 561 | 661 | } else { |
| 562 | 662 | Jetpack_Gutenberg::load_styles_as_required( FEATURE_NAME ); |
| 563 | 663 | } |
| 564 | 664 | |
| 565 | - $subscribe_email = ''; | |
| 665 | + if ( ! class_exists( 'Jetpack_Subscriptions_Widget' ) ) { | |
| 666 | + return ''; | |
| 667 | + } | |
| 566 | 668 | |
| 567 | - /** This filter is documented in modules/contact-form/grunion-contact-form.php */ | |
| 568 | - if ( is_wpcom() || false !== apply_filters( 'jetpack_auto_fill_logged_in_user', false ) ) { | |
| 569 | - $current_user = wp_get_current_user(); | |
| 570 | - $subscribe_email = ! empty( $current_user->user_email ) ? $current_user->user_email : ''; | |
| 669 | + // Prefill the email field with the current user's email if they are logged in via Memberships premium content token | |
| 670 | + $subscribe_email = Jetpack_Memberships::get_current_user_email(); | |
| 671 | + | |
| 672 | + // If no email, then prefill the email field with the current user's email if they are logged in | |
| 673 | + if ( empty( $subscribe_email ) ) { | |
| 674 | + $current_user = wp_get_current_user(); | |
| 675 | + if ( ! empty( $current_user->user_email ) ) { | |
| 676 | + $subscribe_email = $current_user->user_email; | |
| 677 | + } | |
| 571 | 678 | } |
| 572 | 679 | |
| 573 | 680 | // The block is using the Jetpack_Subscriptions_Widget backend, hence the need to increase the instance count. |
| 574 | 681 | ++Jetpack_Subscriptions_Widget::$instance_count; |
| @@ -575,44 +682,56 @@ | ||
| 575 | 682 | |
| 576 | 683 | $classes = get_element_class_names_from_attributes( $attributes ); |
| 577 | 684 | $styles = get_element_styles_from_attributes( $attributes ); |
| 578 | 685 | |
| 686 | + // The default value was previously "true" in block.json. We don't want to rely setting "default" in block.json to falsy, | |
| 687 | + // because it would change the setting for previously saved blocks. Block editor doesn't store default values in attributes at all. | |
| 688 | + // Hence users without this set will still get social counts included in the subscriber counter. | |
| 689 | + // Lowering the subscriber count on their behalf with code change would be controversial. | |
| 690 | + // We want to disencourage including social count as it's misleading. | |
| 579 | 691 | $include_social_followers = isset( $attributes['includeSocialFollowers'] ) ? (bool) get_attribute( $attributes, 'includeSocialFollowers' ) : true; |
| 580 | 692 | |
| 581 | 693 | $data = array( |
| 582 | - 'widget_id' => Jetpack_Subscriptions_Widget::$instance_count, | |
| 583 | - 'subscribe_email' => $subscribe_email, | |
| 584 | - | |
| 585 | - 'wrapper_attributes' => get_block_wrapper_attributes( | |
| 694 | + 'widget_id' => Jetpack_Subscriptions_Widget::$instance_count, | |
| 695 | + 'subscribe_email' => $subscribe_email, | |
| 696 | + 'is_paid_subscriber' => get_attribute( $attributes, 'isPaidSubscriber', false ), | |
| 697 | + 'wrapper_attributes' => get_block_wrapper_attributes( | |
| 586 | 698 | array( |
| 587 | 699 | 'class' => $classes['block_wrapper'], |
| 588 | 700 | ) |
| 589 | 701 | ), |
| 590 | - 'subscribe_placeholder' => get_attribute( $attributes, 'subscribePlaceholder', esc_html__( 'Type your email…', 'jetpack' ) ), | |
| 591 | - 'submit_button_text' => get_attribute( $attributes, 'submitButtonText', esc_html__( 'Subscribe', 'jetpack' ) ), | |
| 592 | - 'success_message' => get_attribute( | |
| 702 | + 'subscribe_placeholder' => get_attribute( $attributes, 'subscribePlaceholder', __( 'Type your email…', 'jetpack' ) ), | |
| 703 | + 'submit_button_text' => get_attribute( $attributes, 'submitButtonText', __( 'Subscribe', 'jetpack' ) ), | |
| 704 | + 'submit_button_text_subscribed' => get_attribute( $attributes, 'submitButtonTextSubscribed', __( 'Subscribed', 'jetpack' ) ), | |
| 705 | + 'submit_button_text_upgrade' => get_attribute( $attributes, 'submitButtonTextUpgrade', __( 'Upgrade subscription', 'jetpack' ) ), | |
| 706 | + 'success_message' => get_attribute( | |
| 593 | 707 | $attributes, |
| 594 | 708 | 'successMessage', |
| 595 | - 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' ) | |
| 709 | + esc_html__( "Success! An email was just sent to confirm your subscription. Please find the email now and click 'Confirm' to start subscribing.", 'jetpack' ) | |
| 596 | 710 | ), |
| 597 | - 'show_subscribers_total' => (bool) get_attribute( $attributes, 'showSubscribersTotal' ), | |
| 598 | - 'subscribers_total' => get_subscriber_count( $include_social_followers ), | |
| 599 | - 'referer' => esc_url_raw( | |
| 711 | + 'show_subscribers_total' => (bool) get_attribute( $attributes, 'showSubscribersTotal' ), | |
| 712 | + 'subscribers_total' => get_attribute( $attributes, 'showSubscribersTotal' ) ? get_subscriber_count( $include_social_followers ) : 0, | |
| 713 | + 'referer' => esc_url_raw( | |
| 600 | 714 | ( is_ssl() ? 'https' : 'http' ) . '://' . ( isset( $_SERVER['HTTP_HOST'] ) ? wp_unslash( $_SERVER['HTTP_HOST'] ) : '' ) . |
| 601 | 715 | ( isset( $_SERVER['REQUEST_URI'] ) ? wp_unslash( $_SERVER['REQUEST_URI'] ) : '' ) |
| 602 | 716 | ), |
| 603 | - 'source' => 'subscribe-block', | |
| 604 | - 'newsletter_categories' => get_newsletter_categories(), | |
| 717 | + 'source' => 'subscribe-block', | |
| 718 | + 'app_source' => get_attribute( $attributes, 'appSource', null ), | |
| 719 | + 'class_name' => get_attribute( $attributes, 'className' ), | |
| 720 | + 'selected_newsletter_categories' => get_attribute( $attributes, 'selectedNewsletterCategoryIds', array() ), | |
| 721 | + 'preselected_newsletter_categories' => get_attribute( $attributes, 'preselectNewsletterCategories', false ), | |
| 605 | 722 | ); |
| 606 | 723 | |
| 607 | - if ( ! jetpack_is_frontend() ) { | |
| 724 | + // Only render the email version in non-frontend contexts. | |
| 725 | + if ( is_feed() || wp_is_xml_request() || | |
| 726 | + ( defined( 'REST_REQUEST' ) && REST_REQUEST && ! wp_is_json_request() ) || | |
| 727 | + ( defined( 'REST_API_REQUEST' ) && REST_API_REQUEST ) || | |
| 728 | + ( defined( 'WP_CLI' ) && WP_CLI ) || | |
| 729 | + wp_is_jsonp_request() ) { | |
| 608 | 730 | return render_for_email( $data, $styles ); |
| 609 | 731 | } |
| 610 | - if ( is_wpcom() ) { | |
| 611 | - return render_wpcom_subscribe_form( $data, $classes, $styles ); | |
| 612 | - } | |
| 613 | 732 | |
| 614 | - return render_jetpack_subscribe_form( $data, $classes, $styles ); | |
| 733 | + return render_for_website( $data, $classes, $styles ); | |
| 615 | 734 | } |
| 616 | 735 | |
| 617 | 736 | /** |
| 618 | 737 | * Get the post access level for the current post. Defaults to 'everybody' if the query is not for a single post |
| @@ -621,9 +740,9 @@ | ||
| 621 | 740 | */ |
| 622 | 741 | function get_post_access_level_for_current_post() { |
| 623 | 742 | if ( ! is_singular() ) { |
| 624 | 743 | // There is no "actual" current post. |
| 625 | - return Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY; | |
| 744 | + return Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY; | |
| 626 | 745 | } |
| 627 | 746 | |
| 628 | 747 | return Jetpack_Memberships::get_post_access_level(); |
| 629 | 748 | } |
| @@ -628,45 +747,10 @@ | ||
| 628 | 747 | return Jetpack_Memberships::get_post_access_level(); |
| 629 | 748 | } |
| 630 | 749 | |
| 631 | 750 | /** |
| 632 | - * Renders the newsletter categories in checkbox form. | |
| 751 | + * Renders the subscriptions block at the site. | |
| 633 | 752 | * |
| 634 | - * This function outputs a div containing labels and checkboxes for each newsletter category. | |
| 635 | - * Each checkbox represents a category, allowing users to select multiple newsletter categories. | |
| 636 | - * | |
| 637 | - * @param array $newsletter_categories An array of newsletter categories where each category is an associative array | |
| 638 | - * with keys 'id' and 'name' representing the category's ID and display name, respectively. | |
| 639 | - * @param array $styles An associative array of style settings. Default is an empty array. | |
| 640 | - * | |
| 641 | - * @return void Outputs HTML directly. | |
| 642 | - */ | |
| 643 | -function render_newsletter_categories( $newsletter_categories, $styles = array() ) { | |
| 644 | - if ( count( $newsletter_categories ) ) : | |
| 645 | - ?> | |
| 646 | - <div | |
| 647 | - class="wp-block-jetpack-subscriptions__newsletter-categories" | |
| 648 | - style="<?php echo esc_attr( $styles['categories'] ); ?>" | |
| 649 | - > | |
| 650 | - <?php foreach ( $newsletter_categories as $category ) : ?> | |
| 651 | - <label class="wp-block-jetpack-subscriptions__newsletter-category"> | |
| 652 | - <input type="checkbox" value="<?php echo esc_html( $category['id'] ); ?>" /> | |
| 653 | - <div> | |
| 654 | - <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"> | |
| 655 | - <path fill-rule="evenodd" clip-rule="evenodd" d="M14.9406 6.6485L8.94211 14.7159L5.1785 11.9174L5.92436 10.9143L8.68487 12.9669L13.9375 5.90264L14.9406 6.6485Z" fill="#1D39EB"/> | |
| 656 | - </svg> | |
| 657 | - <?php echo esc_html( $category['name'] ); ?> | |
| 658 | - </div> | |
| 659 | - </label> | |
| 660 | - <?php endforeach; ?> | |
| 661 | - </div> | |
| 662 | - <?php | |
| 663 | - endif; | |
| 664 | -} | |
| 665 | - | |
| 666 | -/** | |
| 667 | - * Renders the WP.com version of the subscriptions block. | |
| 668 | - * | |
| 669 | 753 | * @param array $data Array containing block view data. |
| 670 | 754 | * @param array $classes Array containing the classes for different block elements. |
| 671 | 755 | * @param array $styles Array containing the styles for different block elements. |
| 672 | 756 | * |
| @@ -671,14 +755,33 @@ | ||
| 671 | 755 | * @param array $styles Array containing the styles for different block elements. |
| 672 | 756 | * |
| 673 | 757 | * @return string |
| 674 | 758 | */ |
| 675 | -function render_wpcom_subscribe_form( $data, $classes, $styles ) { | |
| 676 | - global $current_blog; | |
| 759 | +function render_for_website( $data, $classes, $styles ) { | |
| 760 | + $lang = get_locale(); | |
| 761 | + $blog_id = \Jetpack_Options::get_option( 'id' ); | |
| 762 | + $widget_id_suffix = Jetpack_Subscriptions_Widget::$instance_count > 1 ? '-' . Jetpack_Subscriptions_Widget::$instance_count : ''; | |
| 763 | + $form_id = 'subscribe-blog' . $widget_id_suffix; | |
| 764 | + $form_url = 'https://wordpress.com/email-subscriptions'; | |
| 765 | + $post_access_level = get_post_access_level_for_current_post(); | |
| 766 | + $is_button_only_style = ! empty( $data['class_name'] ) ? is_button_only_style( $data['class_name'] ) : false; | |
| 677 | 767 | |
| 678 | - $form_id = 'subscribe-blog' . ( Jetpack_Subscriptions_Widget::$instance_count > 1 ? '-' . Jetpack_Subscriptions_Widget::$instance_count : '' ); | |
| 679 | - $url = defined( 'SUBSCRIBE_BLOG_URL' ) ? SUBSCRIBE_BLOG_URL : ''; | |
| 768 | + // Post ID is used for pulling post-specific paid status, and returning to the right post after confirming subscription | |
| 769 | + $post_id = null; | |
| 770 | + if ( in_the_loop() ) { | |
| 771 | + $post_id = get_the_ID(); | |
| 772 | + } elseif ( is_singular( 'post' ) || is_page() ) { | |
| 773 | + $post_id = get_queried_object_id(); | |
| 774 | + } else { | |
| 775 | + $post_id = get_option( 'page_on_front' ); | |
| 776 | + } | |
| 680 | 777 | |
| 778 | + $subscribe_field_id = apply_filters( 'subscribe_field_id', 'subscribe-field' . $widget_id_suffix, $data['widget_id'] ); | |
| 779 | + $tier_id = get_post_meta( $post_id, META_NAME_FOR_POST_TIER_ID_SETTINGS, true ); | |
| 780 | + $is_subscribed = Jetpack_Memberships::is_current_user_subscribed(); | |
| 781 | + $button_text = get_submit_button_text( $data ); | |
| 782 | + $show_subscriber_count = $data['show_subscribers_total'] && $data['subscribers_total'] && ! $is_subscribed; | |
| 783 | + | |
| 681 | 784 | ob_start(); |
| 682 | 785 | |
| 683 | 786 | Jetpack_Subscriptions_Widget::render_widget_status_messages( |
| 684 | 787 | array( |
| @@ -684,84 +787,19 @@ | ||
| 684 | 787 | array( |
| 685 | 788 | 'success_message' => $data['success_message'], |
| 686 | 789 | ) |
| 687 | 790 | ); |
| 688 | - | |
| 689 | - $post_access_level = get_post_access_level_for_current_post(); | |
| 690 | - | |
| 691 | - $newsletter_categories = $data['newsletter_categories']; | |
| 692 | - | |
| 693 | 791 | ?> |
| 694 | 792 | <div <?php echo wp_kses_data( $data['wrapper_attributes'] ); ?>> |
| 695 | - <div class="wp-block-jetpack-subscriptions__container"> | |
| 696 | - | |
| 697 | - <form | |
| 698 | - action="<?php echo esc_url( $url ); ?>" | |
| 699 | - method="post" | |
| 700 | - accept-charset="utf-8" | |
| 701 | - data-blog="<?php echo esc_attr( get_current_blog_id() ); ?>" | |
| 702 | - data-post_access_level="<?php echo esc_attr( $post_access_level ); ?>" | |
| 703 | - id="<?php echo esc_attr( $form_id ); ?>" | |
| 704 | - > | |
| 705 | - | |
| 706 | - <?php render_newsletter_categories( $newsletter_categories, $styles ); ?> | |
| 707 | - | |
| 708 | - <div class="wp-block-jetpack-subscriptions__form-elements"> | |
| 709 | - <?php | |
| 710 | - $email_field_id = 'subscribe-field'; | |
| 711 | - $email_field_id .= Jetpack_Subscriptions_Widget::$instance_count > 1 | |
| 712 | - ? '-' . Jetpack_Subscriptions_Widget::$instance_count | |
| 713 | - : ''; | |
| 714 | - $label_field_id = $email_field_id . '-label'; | |
| 715 | - ?> | |
| 716 | - <p id="subscribe-email"> | |
| 717 | - <label | |
| 718 | - id="<?php echo esc_attr( $label_field_id ); ?>" | |
| 719 | - for="<?php echo esc_attr( $email_field_id ); ?>" | |
| 720 | - class="screen-reader-text" | |
| 721 | - > | |
| 722 | - <?php echo esc_html( $data['subscribe_placeholder'] ); ?> | |
| 723 | - </label> | |
| 724 | - | |
| 725 | - <?php | |
| 726 | - printf( | |
| 727 | - '<input | |
| 728 | - required="required" | |
| 729 | - type="email" | |
| 730 | - name="email" | |
| 731 | - %1$s | |
| 732 | - style="%2$s" | |
| 733 | - placeholder="%3$s" | |
| 734 | - value="%4$s" | |
| 735 | - id="%5$s" | |
| 736 | - />', | |
| 737 | - ( ! empty( $classes['email_field'] ) | |
| 738 | - ? 'class="' . esc_attr( $classes['email_field'] ) . '"' | |
| 739 | - : '' | |
| 740 | - ), | |
| 741 | - ( ! empty( $styles['email_field'] ) | |
| 742 | - ? esc_attr( $styles['email_field'] ) | |
| 743 | - : 'width: 95%; padding: 1px 10px' | |
| 744 | - ), | |
| 745 | - esc_attr( $data['subscribe_placeholder'] ), | |
| 746 | - esc_attr( $data['subscribe_email'] ), | |
| 747 | - esc_attr( $email_field_id ) | |
| 748 | - ); | |
| 749 | - ?> | |
| 750 | - </p> | |
| 751 | - | |
| 752 | - <p id="subscribe-submit" | |
| 753 | - <?php if ( ! empty( $styles['submit_button_wrapper'] ) ) : ?> | |
| 754 | - style="<?php echo esc_attr( $styles['submit_button_wrapper'] ); ?>" | |
| 755 | - <?php endif; ?> | |
| 756 | - > | |
| 757 | - <input type="hidden" name="action" value="subscribe"/> | |
| 758 | - <input type="hidden" name="blog_id" value="<?php echo (int) $current_blog->blog_id; ?>"/> | |
| 759 | - <input type="hidden" name="source" value="<?php echo esc_url( $data['referer'] ); ?>"/> | |
| 760 | - <input type="hidden" name="sub-type" value="<?php echo esc_attr( $data['source'] ); ?>"/> | |
| 761 | - <input type="hidden" name="redirect_fragment" value="<?php echo esc_attr( $form_id ); ?>"/> | |
| 762 | - <?php wp_nonce_field( 'blogsub_subscribe_' . $current_blog->blog_id, '_wpnonce', false ); ?> | |
| 763 | - <button type="submit" | |
| 793 | + <div class="wp-block-jetpack-subscriptions__container<?php echo ! $is_subscribed ? ' is-not-subscriber' : ''; ?>"> | |
| 794 | + <?php if ( is_top_subscription() ) : ?> | |
| 795 | + <p id="subscribe-submit" class="is-link" | |
| 796 | + <?php if ( ! empty( $styles['submit_button_wrapper'] ) ) : ?> | |
| 797 | + style="<?php echo esc_attr( $styles['submit_button_wrapper'] ); ?>" | |
| 798 | + <?php endif; ?> | |
| 799 | + > | |
| 800 | + <a | |
| 801 | + href="<?php echo esc_url( 'https://wordpress.com/reader/site/subscription/' . $blog_id ); ?>" | |
| 764 | 802 | <?php if ( ! empty( $classes['submit_button'] ) ) : ?> |
| 765 | 803 | class="<?php echo esc_attr( $classes['submit_button'] ); ?>" |
| 766 | 804 | <?php endif; ?> |
| 767 | 805 | <?php if ( ! empty( $styles['submit_button'] ) ) : ?> |
| @@ -767,93 +805,64 @@ | ||
| 767 | 805 | <?php if ( ! empty( $styles['submit_button'] ) ) : ?> |
| 768 | 806 | style="<?php echo esc_attr( $styles['submit_button'] ); ?>" |
| 769 | 807 | <?php endif; ?> |
| 770 | 808 | > |
| 771 | - <?php | |
| 772 | - echo wp_kses( | |
| 773 | - html_entity_decode( $data['submit_button_text'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ), | |
| 774 | - Jetpack_Subscriptions_Widget::$allowed_html_tags_for_submit_button | |
| 775 | - ); | |
| 776 | - ?> | |
| 777 | - </button> | |
| 778 | - </p> | |
| 779 | - </div> | |
| 780 | - </form> | |
| 781 | - <?php if ( $data['show_subscribers_total'] && $data['subscribers_total'] ) : ?> | |
| 782 | - <div class="wp-block-jetpack-subscriptions__subscount"> | |
| 783 | - <?php | |
| 784 | - /* translators: %s: number of folks following the blog */ | |
| 785 | - echo esc_html( sprintf( _n( 'Join %s other follower', 'Join %s other followers', $data['subscribers_total'], 'jetpack' ), number_format_i18n( $data['subscribers_total'] ) ) ); | |
| 786 | - ?> | |
| 787 | - </div> | |
| 788 | - <?php endif; ?> | |
| 789 | - </div> | |
| 790 | - </div> | |
| 791 | - <?php | |
| 792 | - | |
| 793 | - return ob_get_clean(); | |
| 794 | -} | |
| 795 | - | |
| 796 | -/** | |
| 797 | - * Renders the Jetpack version of the subscriptions block. | |
| 798 | - * | |
| 799 | - * @param array $data Array containing block view data. | |
| 800 | - * @param array $classes Array containing the classes for different block elements. | |
| 801 | - * @param array $styles Array containing the styles for different block elements. | |
| 802 | - * | |
| 803 | - * @return string | |
| 804 | - */ | |
| 805 | -function render_jetpack_subscribe_form( $data, $classes, $styles ) { | |
| 806 | - $form_id = sprintf( 'subscribe-blog-%s', $data['widget_id'] ); | |
| 807 | - $subscribe_field_id = apply_filters( 'subscribe_field_id', 'subscribe-field', $data['widget_id'] ); | |
| 808 | - ob_start(); | |
| 809 | - | |
| 810 | - Jetpack_Subscriptions_Widget::render_widget_status_messages( | |
| 811 | - array( | |
| 812 | - 'success_message' => $data['success_message'], | |
| 813 | - ) | |
| 814 | - ); | |
| 815 | - | |
| 816 | - $blog_id = \Jetpack_Options::get_option( 'id' ); | |
| 817 | - $post_access_level = get_post_access_level_for_current_post(); | |
| 818 | - | |
| 819 | - $newsletter_categories = $data['newsletter_categories']; | |
| 820 | - | |
| 821 | - ?> | |
| 822 | - <div <?php echo wp_kses_data( $data['wrapper_attributes'] ); ?>> | |
| 823 | - <div class="jetpack_subscription_widget"> | |
| 824 | - <div class="wp-block-jetpack-subscriptions__container"> | |
| 825 | - | |
| 809 | + <?php echo sanitize_submit_text( $button_text ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 810 | + </a> | |
| 811 | + </p> | |
| 812 | + <?php else : ?> | |
| 826 | 813 | <form |
| 827 | - action="#" | |
| 814 | + action="<?php echo esc_url( $form_url ); ?>" | |
| 828 | 815 | method="post" |
| 829 | 816 | accept-charset="utf-8" |
| 830 | 817 | data-blog="<?php echo esc_attr( $blog_id ); ?>" |
| 831 | 818 | data-post_access_level="<?php echo esc_attr( $post_access_level ); ?>" |
| 819 | + data-subscriber_email="<?php echo esc_attr( $data['subscribe_email'] ); ?>" | |
| 832 | 820 | id="<?php echo esc_attr( $form_id ); ?>" |
| 833 | 821 | > |
| 834 | - <?php render_newsletter_categories( $newsletter_categories, $styles ); ?> | |
| 835 | 822 | <div class="wp-block-jetpack-subscriptions__form-elements"> |
| 823 | + <?php if ( ! $is_subscribed && ! $is_button_only_style ) : ?> | |
| 836 | 824 | <p id="subscribe-email"> |
| 837 | - <label id="jetpack-subscribe-label" | |
| 825 | + <label | |
| 826 | + id="<?php echo esc_attr( $subscribe_field_id . '-label' ); ?>" | |
| 827 | + for="<?php echo esc_attr( $subscribe_field_id ); ?>" | |
| 838 | 828 | class="screen-reader-text" |
| 839 | - for="<?php echo esc_attr( $subscribe_field_id . '-' . $data['widget_id'] ); ?>"> | |
| 829 | + > | |
| 840 | 830 | <?php echo esc_html( $data['subscribe_placeholder'] ); ?> |
| 841 | 831 | </label> |
| 842 | - <input type="email" name="email" required="required" | |
| 843 | - <?php if ( ! empty( $classes['email_field'] ) ) : ?> | |
| 844 | - class="<?php echo esc_attr( $classes['email_field'] ); ?> required" | |
| 845 | - <?php endif; ?> | |
| 846 | - <?php if ( ! empty( $styles['email_field'] ) ) : ?> | |
| 847 | - style="<?php echo esc_attr( $styles['email_field'] ); ?>" | |
| 848 | - <?php endif; ?> | |
| 849 | - value="<?php echo esc_attr( $data['subscribe_email'] ); ?>" | |
| 850 | - id="<?php echo esc_attr( $subscribe_field_id . '-' . $data['widget_id'] ); ?>" | |
| 851 | - placeholder="<?php echo esc_attr( $data['subscribe_placeholder'] ); ?>" | |
| 852 | - /> | |
| 832 | + <?php | |
| 833 | + printf( | |
| 834 | + '<input | |
| 835 | + required="required" | |
| 836 | + type="email" | |
| 837 | + name="email" | |
| 838 | + autocomplete="email" | |
| 839 | + %1$s | |
| 840 | + style="%2$s" | |
| 841 | + placeholder="%3$s" | |
| 842 | + value="%4$s" | |
| 843 | + id="%5$s" | |
| 844 | + %6$s | |
| 845 | + />', | |
| 846 | + ( ! empty( $classes['email_field'] ) | |
| 847 | + ? 'class="' . esc_attr( $classes['email_field'] ) . '"' | |
| 848 | + : '' | |
| 849 | + ), | |
| 850 | + ( ! empty( $styles['email_field'] ) | |
| 851 | + ? esc_attr( $styles['email_field'] ) | |
| 852 | + : 'width: 95%; padding: 1px 10px' | |
| 853 | + ), | |
| 854 | + esc_attr( $data['subscribe_placeholder'] ), | |
| 855 | + esc_attr( $data['subscribe_email'] ), | |
| 856 | + esc_attr( $subscribe_field_id ), | |
| 857 | + ( ! empty( $data['subscribe_email'] ) | |
| 858 | + ? 'disabled title="' . esc_attr__( "You're logged in with this email", 'jetpack' ) . '"' | |
| 859 | + : 'title="' . esc_attr__( 'Please fill in this field.', 'jetpack' ) . '"' | |
| 860 | + ) | |
| 861 | + ); | |
| 862 | + ?> | |
| 853 | 863 | </p> |
| 854 | - | |
| 855 | - | |
| 864 | + <?php endif; ?> | |
| 856 | 865 | <p id="subscribe-submit" |
| 857 | 866 | <?php if ( ! empty( $styles['submit_button_wrapper'] ) ) : ?> |
| 858 | 867 | style="<?php echo esc_attr( $styles['submit_button_wrapper'] ); ?>" |
| 859 | 868 | <?php endif; ?> |
| @@ -861,13 +870,25 @@ | ||
| 861 | 870 | <input type="hidden" name="action" value="subscribe"/> |
| 862 | 871 | <input type="hidden" name="blog_id" value="<?php echo (int) $blog_id; ?>"/> |
| 863 | 872 | <input type="hidden" name="source" value="<?php echo esc_url( $data['referer'] ); ?>"/> |
| 864 | 873 | <input type="hidden" name="sub-type" value="<?php echo esc_attr( $data['source'] ); ?>"/> |
| 874 | + <input type="hidden" name="app_source" value="<?php echo esc_attr( $data['app_source'] ); ?>"/> | |
| 865 | 875 | <input type="hidden" name="redirect_fragment" value="<?php echo esc_attr( $form_id ); ?>"/> |
| 876 | + <input type="hidden" name="lang" value="<?php echo esc_attr( $lang ); ?>"/> | |
| 866 | 877 | <?php |
| 867 | - if ( is_user_logged_in() ) { | |
| 868 | - wp_nonce_field( 'blogsub_subscribe_' . get_current_blog_id(), '_wpnonce', false ); | |
| 878 | + wp_nonce_field( 'blogsub_subscribe_' . $blog_id ); | |
| 879 | + | |
| 880 | + if ( ! empty( $post_id ) ) { | |
| 881 | + echo '<input type="hidden" name="post_id" value="' . esc_attr( $post_id ) . '"/>'; | |
| 869 | 882 | } |
| 883 | + | |
| 884 | + if ( ! empty( $tier_id ) ) { | |
| 885 | + echo '<input type="hidden" name="tier_id" value="' . esc_attr( $tier_id ) . '"/>'; | |
| 886 | + } | |
| 887 | + | |
| 888 | + if ( $data['preselected_newsletter_categories'] && ! empty( $data['selected_newsletter_categories'] ) ) { | |
| 889 | + echo '<input type="hidden" name="selected_newsletter_categories" value="' . esc_attr( implode( ',', $data['selected_newsletter_categories'] ) ) . '"/>'; | |
| 890 | + } | |
| 870 | 891 | ?> |
| 871 | 892 | <button type="submit" |
| 872 | 893 | <?php if ( ! empty( $classes['submit_button'] ) ) : ?> |
| 873 | 894 | class="<?php echo esc_attr( $classes['submit_button'] ); ?>" |
| @@ -876,31 +897,22 @@ | ||
| 876 | 897 | style="<?php echo esc_attr( $styles['submit_button'] ); ?>" |
| 877 | 898 | <?php endif; ?> |
| 878 | 899 | name="jetpack_subscriptions_widget" |
| 879 | 900 | > |
| 880 | - <?php | |
| 881 | - echo wp_kses( | |
| 882 | - html_entity_decode( $data['submit_button_text'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ), | |
| 883 | - Jetpack_Subscriptions_Widget::$allowed_html_tags_for_submit_button | |
| 884 | - ); | |
| 885 | - ?> | |
| 901 | + <?php echo sanitize_submit_text( $button_text ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 886 | 902 | </button> |
| 887 | 903 | </p> |
| 888 | 904 | </div> |
| 889 | 905 | </form> |
| 890 | - | |
| 891 | - <?php if ( $data['show_subscribers_total'] && $data['subscribers_total'] ) : ?> | |
| 892 | - <div class="wp-block-jetpack-subscriptions__subscount"> | |
| 893 | - <?php | |
| 894 | - echo esc_html( Jetpack_Memberships::get_join_others_text( $data['subscribers_total'] ) ); | |
| 895 | - ?> | |
| 896 | - </div> | |
| 897 | - <?php endif; ?> | |
| 898 | - </div> | |
| 906 | + <?php endif; ?> | |
| 907 | + <?php if ( $show_subscriber_count ) : ?> | |
| 908 | + <div class="wp-block-jetpack-subscriptions__subscount"> | |
| 909 | + <?php echo esc_html( Jetpack_Memberships::get_join_others_text( $data['subscribers_total'] ) ); ?> | |
| 910 | + </div> | |
| 911 | + <?php endif; ?> | |
| 899 | 912 | </div> |
| 900 | 913 | </div> |
| 901 | 914 | <?php |
| 902 | - | |
| 903 | 915 | return ob_get_clean(); |
| 904 | 916 | } |
| 905 | 917 | |
| 906 | 918 | /** |
| @@ -912,12 +924,9 @@ | ||
| 912 | 924 | * @return string |
| 913 | 925 | */ |
| 914 | 926 | function render_for_email( $data, $styles ) { |
| 915 | 927 | $submit_button_wrapper_style = ! empty( $styles['submit_button_wrapper'] ) ? 'style="' . esc_attr( $styles['submit_button_wrapper'] ) . '"' : ''; |
| 916 | - $button_text = wp_kses( | |
| 917 | - html_entity_decode( $data['submit_button_text'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ), | |
| 918 | - Jetpack_Subscriptions_Widget::$allowed_html_tags_for_submit_button | |
| 919 | - ); | |
| 928 | + $button_text = get_submit_button_text( $data ); | |
| 920 | 929 | |
| 921 | 930 | $html = '<div ' . wp_kses_data( $data['wrapper_attributes'] ) . '> |
| 922 | 931 | <div> |
| 923 | 932 | <div> |
| @@ -922,9 +931,9 @@ | ||
| 922 | 931 | <div> |
| 923 | 932 | <div> |
| 924 | 933 | <div> |
| 925 | 934 | <p ' . $submit_button_wrapper_style . '> |
| 926 | - <a href="' . esc_url( get_post_permalink() ) . '" style="text-decoration: none; ' . esc_attr( $styles['submit_button'] ) . '">' . $button_text . '</a> | |
| 935 | + <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> | |
| 927 | 936 | </p> |
| 928 | 937 | </div> |
| 929 | 938 | </div> |
| 930 | 939 | </div> |
| @@ -933,26 +942,56 @@ | ||
| 933 | 942 | return $html; |
| 934 | 943 | } |
| 935 | 944 | |
| 936 | 945 | /** |
| 937 | - * Filter excerpts looking for subscription data. | |
| 946 | + * WooCommerce Email Editor render callback for the subscriptions block. | |
| 938 | 947 | * |
| 939 | - * @param string $excerpt The extrapolated excerpt string. | |
| 940 | - * @param \WP_Post $post The current post being processed (in `get_the_excerpt`). | |
| 948 | + * @param string $block_content The block content. | |
| 949 | + * @param array $parsed_block The parsed block data. | |
| 950 | + * @param object $rendering_context The email rendering context. | |
| 941 | 951 | * |
| 942 | - * @return mixed | |
| 952 | + * @return string | |
| 943 | 953 | */ |
| 944 | -function jetpack_filter_excerpt_for_newsletter( $excerpt, $post = null ) { | |
| 945 | - // The blogmagazine theme is overriding WP core `get_the_excerpt` filter and only passing the excerpt | |
| 946 | - // TODO: Until this is fixed, return the excerpt without gating. See https://github.com/Automattic/jetpack/pull/28102#issuecomment-1369161116 | |
| 947 | - if ( $post && false !== strpos( $post->post_content, '<!-- wp:jetpack/subscriptions -->' ) ) { | |
| 948 | - $excerpt .= sprintf( | |
| 949 | - // translators: %s is the permalink url to the current post. | |
| 950 | - __( "<p><a href='%s'>View post</a> to subscribe to site newsletter.</p>", 'jetpack' ), | |
| 951 | - get_post_permalink() | |
| 952 | - ); | |
| 954 | +function render_email( $block_content, array $parsed_block, $rendering_context ) { | |
| 955 | + 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' ) ) { | |
| 956 | + return ''; | |
| 953 | 957 | } |
| 954 | - return $excerpt; | |
| 958 | + | |
| 959 | + // Map subscription block attributes to button block attributes | |
| 960 | + $button_attributes = array( | |
| 961 | + 'text' => ! empty( $parsed_block['attrs']['submitButtonText'] ) ? sanitize_text_field( $parsed_block['attrs']['submitButtonText'] ) : __( 'Subscribe', 'jetpack' ), | |
| 962 | + 'url' => get_post_permalink(), | |
| 963 | + 'element' => 'a', | |
| 964 | + // Map background colors | |
| 965 | + 'backgroundColor' => $parsed_block['attrs']['buttonBackgroundColor'] ?? null, | |
| 966 | + 'customBackgroundColor' => $parsed_block['attrs']['customButtonBackgroundColor'] ?? null, | |
| 967 | + // Map text colors | |
| 968 | + 'textColor' => $parsed_block['attrs']['textColor'] ?? null, | |
| 969 | + 'customTextColor' => $parsed_block['attrs']['customTextColor'] ?? null, | |
| 970 | + // Map borders | |
| 971 | + 'borderRadius' => $parsed_block['attrs']['borderRadius'] ?? 0, | |
| 972 | + 'borderWeight' => $parsed_block['attrs']['borderWeight'] ?? 1, | |
| 973 | + 'borderColor' => $parsed_block['attrs']['borderColor'] ?? null, | |
| 974 | + 'customBorderColor' => $parsed_block['attrs']['customBorderColor'] ?? null, | |
| 975 | + // Map typography | |
| 976 | + 'fontSize' => $parsed_block['attrs']['fontSize'] ?? null, | |
| 977 | + 'customFontSize' => $parsed_block['attrs']['customFontSize'] ?? null, | |
| 978 | + // Map spacing | |
| 979 | + 'padding' => $parsed_block['attrs']['padding'] ?? null, | |
| 980 | + ); | |
| 981 | + | |
| 982 | + // Create a mock button block structure | |
| 983 | + $button_parsed_block = array( | |
| 984 | + 'attrs' => $button_attributes, | |
| 985 | + 'email_attrs' => $parsed_block['email_attrs'] ?? array(), | |
| 986 | + ); | |
| 987 | + | |
| 988 | + // Call the Jetpack button's email rendering | |
| 989 | + return \Automattic\Jetpack\Extensions\Button\render_email( | |
| 990 | + $block_content, | |
| 991 | + $button_parsed_block, | |
| 992 | + $rendering_context | |
| 993 | + ); | |
| 955 | 994 | } |
| 956 | 995 | |
| 957 | 996 | /** |
| 958 | 997 | * Gate access to posts |
| @@ -963,16 +1002,24 @@ | ||
| 963 | 1002 | */ |
| 964 | 1003 | function add_paywall( $the_content ) { |
| 965 | 1004 | require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php'; |
| 966 | 1005 | |
| 1006 | + $post_access_level = Jetpack_Memberships::get_post_access_level(); | |
| 1007 | + | |
| 967 | 1008 | if ( Jetpack_Memberships::user_can_view_post() ) { |
| 1009 | + if ( $post_access_level !== Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY ) { | |
| 1010 | + do_action( | |
| 1011 | + 'earn_track_paywalled_post_view', | |
| 1012 | + array( | |
| 1013 | + 'post_id' => get_the_ID(), | |
| 1014 | + ) | |
| 1015 | + ); | |
| 1016 | + } | |
| 968 | 1017 | return $the_content; |
| 969 | 1018 | } |
| 970 | 1019 | |
| 971 | - $post_access_level = Jetpack_Memberships::get_post_access_level(); | |
| 1020 | + $paywalled_content = get_paywall_content(); | |
| 972 | 1021 | |
| 973 | - $paywalled_content = get_paywall_content( $post_access_level, isset( $_GET['subscribe'] ) && 'success' === $_GET['subscribe'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 974 | - | |
| 975 | 1022 | if ( has_block( \Automattic\Jetpack\Extensions\Paywall\BLOCK_NAME ) ) { |
| 976 | 1023 | if ( strpos( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML ) ) { |
| 977 | 1024 | return strstr( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML, true ) . $paywalled_content; |
| 978 | 1025 | } |
| @@ -1022,63 +1069,192 @@ | ||
| 1022 | 1069 | return ''; |
| 1023 | 1070 | } |
| 1024 | 1071 | |
| 1025 | 1072 | /** |
| 1073 | + * Is the Jetpack_Token_Subscription_Service class loaded | |
| 1074 | + * | |
| 1075 | + * @return bool | |
| 1076 | + */ | |
| 1077 | +function is_jetpack_token_subscription_service_loaded(): bool { | |
| 1078 | + return class_exists( 'Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Jetpack_Token_Subscription_Service' ); | |
| 1079 | +} | |
| 1080 | + | |
| 1081 | +/** | |
| 1082 | + * Adds support for WP Super cache and Boost cache | |
| 1083 | + */ | |
| 1084 | +function maybe_prevent_super_cache_caching() { | |
| 1085 | + // Prevents cached page to be served if the Membership cookie is present | |
| 1086 | + if ( is_jetpack_token_subscription_service_loaded() ) { | |
| 1087 | + do_action( 'wpsc_add_cookie', Jetpack_Token_Subscription_Service::JWT_AUTH_TOKEN_COOKIE_NAME ); | |
| 1088 | + } | |
| 1089 | + | |
| 1090 | + if ( is_user_auth() ) { | |
| 1091 | + // Do not cache the page if user is auth with Membership token | |
| 1092 | + if ( ! defined( 'DONOTCACHEPAGE' ) ) { | |
| 1093 | + define( 'DONOTCACHEPAGE', true ); | |
| 1094 | + } | |
| 1095 | + } | |
| 1096 | +} | |
| 1097 | + | |
| 1098 | +/** | |
| 1026 | 1099 | * Returns paywall content blocks |
| 1027 | 1100 | * |
| 1028 | - * @param string $post_access_level The newsletter access level. | |
| 1029 | - * @param string $email_confirmation_pending True if the current user needs to validate their email. | |
| 1030 | 1101 | * @return string |
| 1031 | 1102 | */ |
| 1032 | -function get_paywall_content( $post_access_level, $email_confirmation_pending = false ) { | |
| 1033 | - if ( $email_confirmation_pending ) { | |
| 1103 | +function get_paywall_content() { | |
| 1104 | + if ( Jetpack_Memberships::user_is_pending_subscriber() ) { | |
| 1034 | 1105 | return get_paywall_blocks_subscribe_pending(); |
| 1035 | 1106 | } |
| 1036 | - if ( ! jetpack_is_frontend() ) { // emails | |
| 1037 | - return get_paywall_simple(); | |
| 1038 | - } | |
| 1039 | 1107 | if ( doing_filter( 'get_the_excerpt' ) ) { |
| 1040 | 1108 | return ''; |
| 1041 | 1109 | } |
| 1042 | - return get_paywall_blocks( $post_access_level ); | |
| 1110 | + return get_paywall_blocks(); | |
| 1043 | 1111 | } |
| 1044 | 1112 | |
| 1045 | 1113 | /** |
| 1114 | + * Returns the current URL. | |
| 1115 | + * | |
| 1116 | + * TODO: Copied from https://github.com/Automattic/jetpack/blob/bb885061dc3ee7a80a78a5f0116ab3fcebfddb09/projects/packages/boost-core/src/lib/class-url.php#L39 | |
| 1117 | + * TODO: Move to a shared package | |
| 1118 | + * | |
| 1119 | + * @return string | |
| 1120 | + */ | |
| 1121 | +function get_current_url() { | |
| 1122 | + // Fallback to the site URL if we're unable to determine the URL from $_SERVER global. | |
| 1123 | + $current_url = site_url(); | |
| 1124 | + | |
| 1125 | + if ( isset( $_SERVER ) && is_array( $_SERVER ) ) { | |
| 1126 | + // phpcs:disable WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Sanitization happens at the end | |
| 1127 | + $scheme = isset( $_SERVER['HTTPS'] ) && 'on' === $_SERVER['HTTPS'] ? 'https' : 'http'; | |
| 1128 | + $host = ! empty( $_SERVER['HTTP_HOST'] ) ? wp_unslash( $_SERVER['HTTP_HOST'] ) : null; | |
| 1129 | + $path = ! empty( $_SERVER['REQUEST_URI'] ) ? wp_unslash( $_SERVER['REQUEST_URI'] ) : ''; | |
| 1130 | + | |
| 1131 | + // Support for local plugin development and testing using ngrok. | |
| 1132 | + if ( ! empty( $_SERVER['HTTP_X_ORIGINAL_HOST'] ) && str_contains( $_SERVER['HTTP_X_ORIGINAL_HOST'], 'ngrok.io' ) ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput -- This is validating. | |
| 1133 | + $host = wp_unslash( $_SERVER['HTTP_X_ORIGINAL_HOST'] ); | |
| 1134 | + } | |
| 1135 | + // phpcs:enable WordPress.Security.ValidatedSanitizedInput.InputNotSanitized | |
| 1136 | + | |
| 1137 | + if ( $host ) { | |
| 1138 | + $current_url = esc_url_raw( sprintf( '%s://%s%s', $scheme, $host, $path ) ); | |
| 1139 | + } | |
| 1140 | + } | |
| 1141 | + | |
| 1142 | + return $current_url; | |
| 1143 | +} | |
| 1144 | + | |
| 1145 | +/** | |
| 1146 | + * Get the submit button text based on the subscription status. | |
| 1147 | + * | |
| 1148 | + * @param array $data Array containing block view data. | |
| 1149 | + * | |
| 1150 | + * @return string | |
| 1151 | + */ | |
| 1152 | +function get_submit_button_text( $data ) { | |
| 1153 | + if ( ! Jetpack_Memberships::is_current_user_subscribed() ) { | |
| 1154 | + return $data['submit_button_text']; | |
| 1155 | + } | |
| 1156 | + if ( ! Jetpack_Memberships::user_can_view_post() ) { | |
| 1157 | + return $data['submit_button_text_upgrade']; | |
| 1158 | + } | |
| 1159 | + return '✓ ' . $data['submit_button_text_subscribed']; | |
| 1160 | +} | |
| 1161 | + | |
| 1162 | +/** | |
| 1163 | + * Returns true if there are no more tiers to upgrade to. | |
| 1164 | + * | |
| 1165 | + * @return boolean | |
| 1166 | + */ | |
| 1167 | +function is_top_subscription() { | |
| 1168 | + if ( ! Jetpack_Memberships::is_current_user_subscribed() ) { | |
| 1169 | + return false; | |
| 1170 | + } | |
| 1171 | + if ( ! Jetpack_Memberships::user_can_view_post() ) { | |
| 1172 | + return false; | |
| 1173 | + } | |
| 1174 | + return true; | |
| 1175 | +} | |
| 1176 | + | |
| 1177 | +/** | |
| 1178 | + * Sanitize the submit button text. | |
| 1179 | + * | |
| 1180 | + * @param string $text String containing the submit button text. | |
| 1181 | + * | |
| 1182 | + * @return string | |
| 1183 | + */ | |
| 1184 | +function sanitize_submit_text( $text ) { | |
| 1185 | + return wp_kses( | |
| 1186 | + html_entity_decode( $text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ), | |
| 1187 | + Jetpack_Subscriptions_Widget::$allowed_html_tags_for_submit_button | |
| 1188 | + ); | |
| 1189 | +} | |
| 1190 | + | |
| 1191 | +/** | |
| 1046 | 1192 | * Returns paywall content blocks if user is not authenticated |
| 1047 | 1193 | * |
| 1048 | - * @param string $newsletter_access_level The newsletter access level. | |
| 1049 | 1194 | * @return string |
| 1050 | 1195 | */ |
| 1051 | -function get_paywall_blocks( $newsletter_access_level ) { | |
| 1196 | +function get_paywall_blocks() { | |
| 1197 | + $custom_paywall = apply_filters( 'jetpack_custom_paywall_blocks', false ); | |
| 1198 | + if ( ! empty( $custom_paywall ) ) { | |
| 1199 | + return $custom_paywall; | |
| 1200 | + } | |
| 1201 | + | |
| 1202 | + if ( ! Request::is_frontend() ) { // emails | |
| 1203 | + return get_paywall_simple(); | |
| 1204 | + } | |
| 1205 | + | |
| 1052 | 1206 | require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php'; |
| 1053 | - // Only display paid texts when Stripe is connected and the post is marked for paid subscribers | |
| 1054 | - $is_paid_post = $newsletter_access_level === 'paid_subscribers' && Jetpack_Memberships::has_connected_account(); | |
| 1207 | + $is_paid_post = is_paid_post(); | |
| 1208 | + $is_paid_subscriber = Jetpack_Memberships::user_is_paid_subscriber(); | |
| 1055 | 1209 | |
| 1056 | - $access_heading = esc_html__( 'Subscribe to continue reading', 'jetpack' ); | |
| 1210 | + $access_heading = $is_paid_subscriber | |
| 1211 | + ? esc_html__( 'Upgrade to continue reading', 'jetpack' ) | |
| 1212 | + : esc_html__( 'Subscribe to continue reading', 'jetpack' ); | |
| 1057 | 1213 | |
| 1058 | 1214 | $subscribe_text = $is_paid_post |
| 1059 | 1215 | // translators: %s is the name of the site. |
| 1060 | - ? esc_html__( 'Become a paid subscriber to get access to the rest of this post and other exclusive content.', 'jetpack' ) | |
| 1216 | + ? ( | |
| 1217 | + $is_paid_subscriber | |
| 1218 | + ? esc_html__( 'Upgrade to get access to the rest of this post and other exclusive content.', 'jetpack' ) | |
| 1219 | + : esc_html__( 'Become a paid subscriber to get access to the rest of this post and other exclusive content.', 'jetpack' ) | |
| 1220 | + ) | |
| 1061 | 1221 | // translators: %s is the name of the site. |
| 1062 | 1222 | : esc_html__( 'Subscribe to get access to the rest of this post and other subscriber-only content.', 'jetpack' ); |
| 1063 | 1223 | |
| 1064 | - $access_question = $is_paid_post | |
| 1065 | - ? __( 'Already a paid subscriber?', 'jetpack' ) | |
| 1066 | - : __( 'Already a subscriber?', 'jetpack' ); | |
| 1224 | + $login_block = ''; | |
| 1067 | 1225 | |
| 1068 | - $sign_in = ''; | |
| 1069 | - if ( ! is_user_logged_in() && ( new Host() )->is_wpcom_simple() ) { | |
| 1070 | - $sign_in_link = add_query_arg( 'redirect_to', rawurlencode( get_post_permalink() ), 'https://wordpress.com/log-in/link' ); | |
| 1071 | - $sign_in = '<!-- wp:paragraph {"align":"center", "typography":{"fontSize":"14px","fontWeight":"400";"color":"#646970"}} --> | |
| 1072 | -<p class="has-text-align-center" style="font-size:14px;font-weight:400;color:#646970">' . esc_html( $access_question ) . ' <a href="' . $sign_in_link . '" class="jetpack-subscriber-paywall-login" style="font-size:14px;font-weight:400;color:#646970">' . esc_html__( 'Log in', 'jetpack' ) . '</a></p> | |
| 1226 | + if ( is_user_auth() ) { | |
| 1227 | + if ( ( new Host() )->is_wpcom_simple() ) { | |
| 1228 | + // We cannot use wpcom_logmein_redirect_url since it returns redirect URL when user is already logged in. | |
| 1229 | + $login_link = add_query_arg( | |
| 1230 | + array( | |
| 1231 | + 'redirect_to' => rawurlencode( get_current_url() ), | |
| 1232 | + 'blog_id' => get_current_blog_id(), | |
| 1233 | + ), | |
| 1234 | + 'https://wordpress.com/log-in/link' | |
| 1235 | + ); | |
| 1236 | + $switch_accounts_link = wp_logout_url( $login_link ); | |
| 1237 | + $login_block = '<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"}}} --> | |
| 1238 | +<p class="has-text-align-center" style="font-size:14px"> | |
| 1239 | + <a href="' . $switch_accounts_link . '">' . __( 'Switch accounts', 'jetpack' ) . '</a> | |
| 1240 | +</p> | |
| 1073 | 1241 | <!-- /wp:paragraph -->'; |
| 1242 | + } | |
| 1243 | + } else { | |
| 1244 | + $access_question = $is_paid_post ? esc_html__( 'Already a paid subscriber?', 'jetpack' ) : esc_html__( 'Already a subscriber?', 'jetpack' ); | |
| 1245 | + $login_block = '<!-- wp:group {"style":{"typography":{"fontSize":"14px"}},"layout":{"type":"flex","justifyContent":"center"}} --> | |
| 1246 | +<div class="wp-block-group" style="font-size:14px"> | |
| 1247 | + <!-- wp:jetpack/subscriber-login {"logInLabel":"' . $access_question . '"} /--> | |
| 1248 | +</div> | |
| 1249 | +<!-- /wp:group -->'; | |
| 1074 | 1250 | } |
| 1075 | 1251 | |
| 1076 | 1252 | $lock_svg = plugins_url( 'images/lock-paywall.svg', JETPACK__PLUGIN_FILE ); |
| 1077 | 1253 | |
| 1078 | 1254 | return ' |
| 1079 | -<!-- 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"}} --> | |
| 1080 | -<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"> | |
| 1255 | +<!-- 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"}} --> | |
| 1256 | +<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"> | |
| 1081 | 1257 | <!-- wp:image {"align":"center","width":24,"height":24,"sizeSlug":"large","linkDestination":"none"} --> |
| 1082 | 1258 | <figure class="wp-block-image aligncenter size-large is-resized"><img src="' . $lock_svg . '" alt="" width="24" height="24"/></figure> |
| 1083 | 1259 | <!-- /wp:image --> |
| 1084 | 1260 | |
| @@ -1089,10 +1265,10 @@ | ||
| 1089 | 1265 | <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"14px"},"spacing":{"margin":{"top":"10px","bottom":"10px"}}}} --> |
| 1090 | 1266 | <p class="has-text-align-center" style="margin-top:10px;margin-bottom:10px;font-size:14px">' . $subscribe_text . '</p> |
| 1091 | 1267 | <!-- /wp:paragraph --> |
| 1092 | 1268 | |
| 1093 | -<!-- wp:jetpack/subscriptions {"borderRadius":50,"borderColor":"primary","className":"is-style-compact"} /--> | |
| 1094 | -' . $sign_in . ' | |
| 1269 | +<!-- wp:jetpack/subscriptions {"borderRadius":50,"borderColor":"primary","className":"is-style-compact","isPaidSubscriber":' . ( $is_paid_subscriber ? 'true' : 'false' ) . '} /--> | |
| 1270 | +' . $login_block . ' | |
| 1095 | 1271 | </div> |
| 1096 | 1272 | <!-- /wp:group --> |
| 1097 | 1273 | '; |
| 1098 | 1274 | } |
| @@ -1097,22 +1273,82 @@ | ||
| 1097 | 1273 | '; |
| 1098 | 1274 | } |
| 1099 | 1275 | |
| 1100 | 1276 | /** |
| 1277 | + * Returns true if user is auth for subscriptions check, otherwise returns false. | |
| 1278 | + * | |
| 1279 | + * @return bool | |
| 1280 | + */ | |
| 1281 | +function is_user_auth(): bool { | |
| 1282 | + if ( ( new Host() )->is_wpcom_simple() && is_user_logged_in() ) { | |
| 1283 | + return true; | |
| 1284 | + } | |
| 1285 | + if ( current_user_can( 'manage_options' ) ) { | |
| 1286 | + return true; | |
| 1287 | + } | |
| 1288 | + | |
| 1289 | + if ( is_jetpack_token_subscription_service_loaded() ) { | |
| 1290 | + if ( Jetpack_Token_Subscription_Service::has_token_from_cookie() ) { | |
| 1291 | + return true; | |
| 1292 | + } | |
| 1293 | + } | |
| 1294 | + return false; | |
| 1295 | +} | |
| 1296 | + | |
| 1297 | +/** | |
| 1298 | + * Returns `true` if the post is a paid post. | |
| 1299 | + */ | |
| 1300 | +function is_paid_post(): bool { | |
| 1301 | + require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php'; | |
| 1302 | + | |
| 1303 | + // Make sure Stripe is connected and the post is marked for paid subscribers. | |
| 1304 | + if ( Jetpack_Memberships::has_connected_account() && is_jetpack_token_subscription_service_loaded() ) { | |
| 1305 | + return Jetpack_Memberships::get_post_access_level() === Jetpack_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS; | |
| 1306 | + } | |
| 1307 | + | |
| 1308 | + return false; | |
| 1309 | +} | |
| 1310 | + | |
| 1311 | +/** | |
| 1312 | + * Returns true if the post is a subscribers post. | |
| 1313 | + */ | |
| 1314 | +function is_subscribers_post(): bool { | |
| 1315 | + require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php'; | |
| 1316 | + | |
| 1317 | + // Make sure Stripe is connected and the post is marked for paid subscribers. | |
| 1318 | + if ( Jetpack_Memberships::has_connected_account() && is_jetpack_token_subscription_service_loaded() ) { | |
| 1319 | + return Jetpack_Memberships::get_post_access_level() === Jetpack_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS; | |
| 1320 | + } | |
| 1321 | + | |
| 1322 | + return false; | |
| 1323 | +} | |
| 1324 | + | |
| 1325 | +/** | |
| 1101 | 1326 | * Returns paywall content blocks when email confirmation is pending |
| 1102 | 1327 | * |
| 1103 | 1328 | * @return string |
| 1104 | 1329 | */ |
| 1105 | 1330 | function get_paywall_blocks_subscribe_pending() { |
| 1106 | - $access_heading = esc_html__( 'Verify your email and continue reading', 'jetpack' ); | |
| 1331 | + $subscribe_email = Jetpack_Memberships::get_current_user_email(); | |
| 1107 | 1332 | |
| 1108 | - $subscribe_text = esc_html__( 'Please check your inbox to confirm your subscription.', 'jetpack' ); | |
| 1333 | + /** This filter is documented in \Automattic\Jetpack\Forms\ContactForm\Contact_Form */ | |
| 1334 | + if ( is_wpcom() || false !== apply_filters( 'jetpack_auto_fill_logged_in_user', false ) ) { | |
| 1335 | + $current_user = wp_get_current_user(); | |
| 1336 | + if ( ! empty( $current_user->user_email ) ) { | |
| 1337 | + $subscribe_email = $current_user->user_email; | |
| 1338 | + } | |
| 1339 | + } | |
| 1109 | 1340 | |
| 1341 | + $access_heading = esc_html__( 'Confirm your subscription to continue reading', 'jetpack' ); | |
| 1342 | + | |
| 1343 | + /* translators: %s: email address */ | |
| 1344 | + $subscribe_text = sprintf( esc_html__( 'Head to your inbox and confirm your email address %s.', 'jetpack' ), $subscribe_email ); | |
| 1345 | + | |
| 1110 | 1346 | $lock_svg = plugins_url( 'images/lock-paywall.svg', JETPACK__PLUGIN_FILE ); |
| 1111 | 1347 | |
| 1112 | 1348 | return ' |
| 1113 | -<!-- 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"}} --> | |
| 1114 | -<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"> | |
| 1349 | +<!-- 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"}} --> | |
| 1350 | +<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"> | |
| 1115 | 1351 | <!-- wp:image {"align":"center","width":24,"height":24,"sizeSlug":"large","linkDestination":"none"} --> |
| 1116 | 1352 | <figure class="wp-block-image aligncenter size-large is-resized"><img src="' . $lock_svg . '" alt="" width="24" height="24"/></figure> |
| 1117 | 1353 | <!-- /wp:image --> |
| 1118 | 1354 | |
| @@ -1128,22 +1364,37 @@ | ||
| 1128 | 1364 | '; |
| 1129 | 1365 | } |
| 1130 | 1366 | |
| 1131 | 1367 | /** |
| 1132 | - * Return content for non frontend views like emails. | |
| 1133 | - * | |
| 1134 | - * @return string | |
| 1368 | + * Return content for non frontend views like Reader, emails. | |
| 1135 | 1369 | */ |
| 1136 | -function get_paywall_simple() { | |
| 1137 | - $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' ); | |
| 1370 | +function get_paywall_simple(): string { | |
| 1371 | + $is_paid_post = is_paid_post(); | |
| 1372 | + $is_subscribers_post = is_subscribers_post(); | |
| 1373 | + $is_subscriber = is_jetpack_memberships_loaded() && Jetpack_Memberships::is_current_user_subscribed(); | |
| 1374 | + $paywall_heading = esc_html__( 'Subscribe to keep reading', 'jetpack' ); | |
| 1138 | 1375 | |
| 1139 | - $subscribe_text = esc_html__( 'Upgrade subscription', 'jetpack' ); | |
| 1376 | + if ( $is_subscribers_post && ! $is_subscriber ) { | |
| 1377 | + $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' ); | |
| 1378 | + $paywall_action_btn = esc_html__( 'Subscribe', 'jetpack' ); | |
| 1379 | + } elseif ( $is_paid_post && $is_subscriber ) { | |
| 1380 | + $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' ); | |
| 1381 | + $paywall_action_btn = esc_html__( 'Upgrade subscription', 'jetpack' ); | |
| 1382 | + } else { | |
| 1383 | + // - For paid post when the user is not a subscriber. | |
| 1384 | + // - Default for all other cases. | |
| 1385 | + $paywall_description = esc_html__( 'Become a paid subscriber to get access to the rest of this post and other exclusive content.', 'jetpack' ); | |
| 1386 | + $paywall_action_btn = esc_html__( 'Subscribe', 'jetpack' ); | |
| 1387 | + } | |
| 1140 | 1388 | |
| 1141 | 1389 | return ' |
| 1142 | 1390 | <!-- wp:columns --> |
| 1143 | -<div class="wp-block-columns" style="display: inline-block; width: 90%"> | |
| 1391 | +<div class="wp-block-columns jetpack-paywall-simple" style="display: inline-block; width: 90%"> | |
| 1144 | 1392 | <!-- wp:column --> |
| 1145 | 1393 | <div class="wp-block-column" style="background-color: #F6F7F7; padding: 32px; 24px;"> |
| 1394 | + <!-- wp:heading --> | |
| 1395 | + <h2 class="has-text-align-center" style="margin: 0 0 12px; font-weight: 600;">' . $paywall_heading . '</h2> | |
| 1396 | + <!-- /wp:heading --> | |
| 1146 | 1397 | <!-- wp:paragraph --> |
| 1147 | 1398 | <p class="has-text-align-center" |
| 1148 | 1399 | style="text-align: center; |
| 1149 | 1400 | color: #50575E; |
| @@ -1150,21 +1401,20 @@ | ||
| 1150 | 1401 | font-weight: 400; |
| 1151 | 1402 | font-size: 16px; |
| 1152 | 1403 | font-family: \'SF Pro Text\', sans-serif; |
| 1153 | 1404 | line-height: 28.8px;"> |
| 1154 | - ' . $access_heading . ' | |
| 1405 | + ' . $paywall_description . ' | |
| 1155 | 1406 | </p> |
| 1156 | 1407 | <!-- /wp:paragraph --> |
| 1157 | - | |
| 1158 | 1408 | <!-- wp:buttons --> |
| 1159 | 1409 | <div class="wp-block-buttons" style="text-align: center;"> |
| 1160 | 1410 | <!-- wp:button --> |
| 1161 | - <div class="wp-block-button" style="display: inline-block; margin: 10px 0;"> | |
| 1411 | + <div class="wp-block-button" style="display: inline-block; margin: 10px 0; border-style: none; padding: 0;"> | |
| 1162 | 1412 | <a href="' . esc_url( get_post_permalink() ) . '" class="wp-block-button__link wp-element-button" |
| 1163 | 1413 | data-wpcom-track data-tracks-link-desc="paywall-email-click" |
| 1164 | 1414 | style="display: inline-block; |
| 1165 | - padding: 15px 20px; | |
| 1166 | - background-color: #0675C4; | |
| 1415 | + padding: 12px 15px; | |
| 1416 | + background-color: #3858e9; | |
| 1167 | 1417 | color: #FFFFFF; |
| 1168 | 1418 | text-decoration: none; |
| 1169 | 1419 | border-radius: 5px; |
| 1170 | 1420 | font-family: \'SF Pro Display\', sans-serif; |
| @@ -1169,9 +1419,9 @@ | ||
| 1169 | 1419 | border-radius: 5px; |
| 1170 | 1420 | font-family: \'SF Pro Display\', sans-serif; |
| 1171 | 1421 | font-weight: 500; |
| 1172 | 1422 | font-size: 16px; |
| 1173 | - text-align: center;">' . $subscribe_text . '</a> | |
| 1423 | + text-align: center;">' . $paywall_action_btn . '</a> | |
| 1174 | 1424 | </div> |
| 1175 | 1425 | <!-- /wp:button --> |
| 1176 | 1426 | </div> |
| 1177 | 1427 | <!-- /wp:buttons --> |