| @@ -1,8 +1,14 @@ | ||
| 1 | 1 | <?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName |
| 2 | 2 | |
| 3 | 3 | // phpcs:disable Universal.Files.SeparateFunctionsFromOO.Mixed -- TODO: Move classes to appropriately-named class files. |
| 4 | 4 | |
| 5 | +use Automattic\Jetpack\Assets; | |
| 6 | + | |
| 7 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 8 | + exit( 0 ); | |
| 9 | +} | |
| 10 | + | |
| 5 | 11 | /** |
| 6 | 12 | * Jetpack_Subscriptions_Widget main view class. |
| 7 | 13 | */ |
| 8 | 14 | class Jetpack_Subscriptions_Widget extends WP_Widget { |
| @@ -64,14 +70,16 @@ | ||
| 64 | 70 | $name, |
| 65 | 71 | $widget_ops |
| 66 | 72 | ); |
| 67 | 73 | |
| 68 | - if ( self::is_jetpack() && | |
| 69 | - ( | |
| 74 | + if ( | |
| 75 | + self::is_jetpack() | |
| 76 | + && ( | |
| 70 | 77 | is_active_widget( false, false, $this->id_base ) || |
| 71 | 78 | is_active_widget( false, false, 'monster' ) || |
| 72 | 79 | is_customize_preview() |
| 73 | 80 | ) |
| 81 | + && ! wp_is_block_theme() | |
| 74 | 82 | ) { |
| 75 | 83 | add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ) ); |
| 76 | 84 | } |
| 77 | 85 | |
| @@ -94,15 +102,28 @@ | ||
| 94 | 102 | * |
| 95 | 103 | * @since 4.5.0 |
| 96 | 104 | */ |
| 97 | 105 | public function enqueue_style() { |
| 98 | - wp_register_style( | |
| 106 | + $path = Assets::get_file_url_for_environment( | |
| 107 | + '_inc/build/subscriptions/subscriptions.min.css', | |
| 108 | + 'modules/subscriptions/subscriptions.css' | |
| 109 | + ); | |
| 110 | + | |
| 111 | + wp_enqueue_style( | |
| 99 | 112 | 'jetpack-subscriptions', |
| 100 | - plugins_url( 'subscriptions.css', __FILE__ ), | |
| 113 | + $path, | |
| 101 | 114 | array(), |
| 102 | 115 | JETPACK__VERSION |
| 103 | 116 | ); |
| 104 | - wp_enqueue_style( 'jetpack-subscriptions' ); | |
| 117 | + | |
| 118 | + // `wp_maybe_inline_styles()` requires a filesystem path, not a URL. | |
| 119 | + $style_path = JETPACK__PLUGIN_DIR . ( | |
| 120 | + /** This filter is documented in projects/plugins/jetpack/load-jetpack.php */ | |
| 121 | + apply_filters( 'jetpack_should_use_minified_assets', true ) | |
| 122 | + ? '_inc/build/subscriptions/subscriptions.min.css' | |
| 123 | + : 'modules/subscriptions/subscriptions.css' | |
| 124 | + ); | |
| 125 | + wp_style_add_data( 'jetpack-subscriptions', 'path', $style_path ); | |
| 105 | 126 | } |
| 106 | 127 | |
| 107 | 128 | /** |
| 108 | 129 | * Renders a full widget either within the context of WordPress widget, or in response to a shortcode. |
| @@ -113,8 +134,12 @@ | ||
| 113 | 134 | public function widget( $args, $instance ) { |
| 114 | 135 | if ( self::is_wpcom() && ! self::wpcom_has_status_message() && self::is_current_user_subscribed() ) { |
| 115 | 136 | return null; |
| 116 | 137 | } |
| 138 | + | |
| 139 | + // Enqueue styles. | |
| 140 | + self::enqueue_style(); | |
| 141 | + | |
| 117 | 142 | if ( self::is_jetpack() && |
| 118 | 143 | /** This filter is documented in \Automattic\Jetpack\Forms\ContactForm\Contact_Form */ |
| 119 | 144 | false === apply_filters( 'jetpack_auto_fill_logged_in_user', false ) |
| 120 | 145 | ) { |
| @@ -131,10 +156,10 @@ | ||
| 131 | 156 | $stats_action = self::is_jetpack() ? 'jetpack_subscriptions' : 'follow_blog'; |
| 132 | 157 | /** This action is documented in modules/widgets/gravatar-profile.php */ |
| 133 | 158 | do_action( 'jetpack_stats_extra', 'widget_view', $stats_action ); |
| 134 | 159 | |
| 135 | - $after_widget = isset( $args['after_widget'] ) ? $args['after_widget'] : ''; | |
| 136 | - $before_widget = isset( $args['before_widget'] ) ? $args['before_widget'] : ''; | |
| 160 | + $after_widget = $args['after_widget'] ?? ''; | |
| 161 | + $before_widget = $args['before_widget'] ?? ''; | |
| 137 | 162 | $instance = wp_parse_args( (array) $instance, static::defaults() ); |
| 138 | 163 | |
| 139 | 164 | echo $before_widget; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 140 | 165 | |
| @@ -156,10 +181,10 @@ | ||
| 156 | 181 | * @param array $instance The settings for the particular instance of the widget. |
| 157 | 182 | */ |
| 158 | 183 | public static function render_widget_title( $args, $instance ) { |
| 159 | 184 | $show_only_email_and_button = $instance['show_only_email_and_button']; |
| 160 | - $before_title = isset( $args['before_title'] ) ? $args['before_title'] : ''; | |
| 161 | - $after_title = isset( $args['after_title'] ) ? $args['after_title'] : ''; | |
| 185 | + $before_title = $args['before_title'] ?? ''; | |
| 186 | + $after_title = $args['after_title'] ?? ''; | |
| 162 | 187 | if ( self::is_wpcom() && ! $show_only_email_and_button ) { |
| 163 | 188 | if ( self::is_current_user_subscribed() ) { |
| 164 | 189 | if ( ! empty( $instance['title_following'] ) ) { |
| 165 | 190 | printf( |
| @@ -357,9 +382,9 @@ | ||
| 357 | 382 | $show_only_email_and_button = $instance['show_only_email_and_button']; |
| 358 | 383 | $show_subscribers_total = (bool) $instance['show_subscribers_total']; |
| 359 | 384 | $subscribers_total = self::fetch_subscriber_count(); |
| 360 | 385 | $subscribe_text = empty( $instance['show_only_email_and_button'] ) ? |
| 361 | - wp_kses_post( $instance['subscribe_text'] ) : | |
| 386 | + wp_kses_post( stripslashes( $instance['subscribe_text'] ) ) : | |
| 362 | 387 | false; |
| 363 | 388 | $referer = esc_url_raw( ( is_ssl() ? 'https' : 'http' ) . '://' . ( isset( $_SERVER['HTTP_HOST'] ) ? wp_unslash( $_SERVER['HTTP_HOST'] ) : '' ) . ( isset( $_SERVER['REQUEST_URI'] ) ? wp_unslash( $_SERVER['REQUEST_URI'] ) : '' ) ); |
| 364 | 389 | $source = 'widget'; |
| 365 | 390 | $widget_id = ! empty( $args['widget_id'] ) ? $args['widget_id'] : self::$instance_count; |
| @@ -365,12 +390,12 @@ | ||
| 365 | 390 | $widget_id = ! empty( $args['widget_id'] ) ? $args['widget_id'] : self::$instance_count; |
| 366 | 391 | $subscribe_button = ! empty( $instance['submit_button_text'] ) ? $instance['submit_button_text'] : $instance['subscribe_button']; |
| 367 | 392 | $subscribe_placeholder = isset( $instance['subscribe_placeholder'] ) ? stripslashes( $instance['subscribe_placeholder'] ) : ''; |
| 368 | 393 | $submit_button_classes = isset( $instance['submit_button_classes'] ) ? 'wp-block-button__link ' . $instance['submit_button_classes'] : 'wp-block-button__link'; |
| 369 | - $submit_button_styles = isset( $instance['submit_button_styles'] ) ? $instance['submit_button_styles'] : ''; | |
| 370 | - $submit_button_wrapper_styles = isset( $instance['submit_button_wrapper_styles'] ) ? $instance['submit_button_wrapper_styles'] : ''; | |
| 371 | - $email_field_classes = isset( $instance['email_field_classes'] ) ? $instance['email_field_classes'] : ''; | |
| 372 | - $email_field_styles = isset( $instance['email_field_styles'] ) ? $instance['email_field_styles'] : ''; | |
| 394 | + $submit_button_styles = $instance['submit_button_styles'] ?? ''; | |
| 395 | + $submit_button_wrapper_styles = $instance['submit_button_wrapper_styles'] ?? ''; | |
| 396 | + $email_field_classes = $instance['email_field_classes'] ?? ''; | |
| 397 | + $email_field_styles = $instance['email_field_styles'] ?? ''; | |
| 373 | 398 | |
| 374 | 399 | // We need to include those in case Jetpack blocks are disabled |
| 375 | 400 | require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php'; |
| 376 | 401 | require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php'; |
| @@ -416,8 +441,9 @@ | ||
| 416 | 441 | printf( |
| 417 | 442 | '<input |
| 418 | 443 | type="email" |
| 419 | 444 | name="email" |
| 445 | + autocomplete="email" | |
| 420 | 446 | %1$s |
| 421 | 447 | style="%2$s" |
| 422 | 448 | placeholder="%3$s" |
| 423 | 449 | value="" |
| @@ -510,9 +536,9 @@ | ||
| 510 | 536 | class="screen-reader-text" |
| 511 | 537 | for="<?php echo esc_attr( $subscribe_field_id . '-' . $widget_id ); ?>"> |
| 512 | 538 | <?php echo ! empty( $subscribe_placeholder ) ? esc_html( $subscribe_placeholder ) : esc_html__( 'Email Address:', 'jetpack' ); ?> |
| 513 | 539 | </label> |
| 514 | - <input type="email" name="email" required="required" | |
| 540 | + <input type="email" name="email" autocomplete="email" required="required" | |
| 515 | 541 | <?php if ( ! empty( $email_field_classes ) ) { ?> |
| 516 | 542 | class="<?php echo esc_attr( $email_field_classes ); ?> required" |
| 517 | 543 | <?php } ?> |
| 518 | 544 | <?php if ( ! empty( $email_field_styles ) ) { ?> |
| @@ -639,9 +665,9 @@ | ||
| 639 | 665 | $subs_count = array( |
| 640 | 666 | 'status' => 'failed', |
| 641 | 667 | 'code' => $xml->getErrorCode(), |
| 642 | 668 | 'message' => $xml->getErrorMessage(), |
| 643 | - 'value' => ( isset( $subs_count['value'] ) ) ? $subs_count['value'] : 0, | |
| 669 | + 'value' => $subs_count['value'] ?? 0, | |
| 644 | 670 | ); |
| 645 | 671 | } else { |
| 646 | 672 | $subs_count = array( |
| 647 | 673 | 'status' => 'success', |
| @@ -667,27 +693,28 @@ | ||
| 667 | 693 | * |
| 668 | 694 | * @return array |
| 669 | 695 | */ |
| 670 | 696 | public function update( $new_instance, $old_instance ) { |
| 671 | - $instance = $old_instance; | |
| 697 | + // Merge new values over old, then fill in any missing keys with defaults | |
| 698 | + $instance = wp_parse_args( (array) $new_instance, wp_parse_args( (array) $old_instance, static::defaults() ) ); | |
| 672 | 699 | |
| 673 | 700 | if ( self::is_jetpack() ) { |
| 674 | - $instance['title'] = wp_kses( stripslashes( $new_instance['title'] ), array() ); | |
| 675 | - $instance['subscribe_placeholder'] = wp_kses( stripslashes( $new_instance['subscribe_placeholder'] ), array() ); | |
| 676 | - $instance['subscribe_button'] = wp_kses( stripslashes( $new_instance['subscribe_button'] ), array() ); | |
| 677 | - $instance['success_message'] = wp_kses( stripslashes( $new_instance['success_message'] ), array() ); | |
| 701 | + $instance['title'] = wp_kses( stripslashes( $instance['title'] ), array() ); | |
| 702 | + $instance['subscribe_placeholder'] = wp_kses( stripslashes( $instance['subscribe_placeholder'] ), array() ); | |
| 703 | + $instance['subscribe_button'] = wp_kses( stripslashes( $instance['subscribe_button'] ), array() ); | |
| 704 | + $instance['success_message'] = wp_kses( stripslashes( $instance['success_message'] ), array() ); | |
| 678 | 705 | } |
| 679 | 706 | |
| 680 | 707 | if ( self::is_wpcom() ) { |
| 681 | - $instance['title'] = wp_strip_all_tags( stripslashes( $new_instance['title'] ) ); | |
| 682 | - $instance['title_following'] = wp_strip_all_tags( stripslashes( $new_instance['title_following'] ) ); | |
| 683 | - $instance['subscribe_logged_in'] = wp_filter_post_kses( stripslashes( $new_instance['subscribe_logged_in'] ) ); | |
| 684 | - $instance['subscribe_button'] = wp_strip_all_tags( stripslashes( $new_instance['subscribe_button'] ) ); | |
| 708 | + $instance['title'] = wp_strip_all_tags( stripslashes( $instance['title'] ) ); | |
| 709 | + $instance['title_following'] = isset( $instance['title_following'] ) ? wp_strip_all_tags( stripslashes( $instance['title_following'] ) ) : ''; | |
| 710 | + $instance['subscribe_logged_in'] = isset( $instance['subscribe_logged_in'] ) ? wp_filter_post_kses( stripslashes( $instance['subscribe_logged_in'] ) ) : ''; | |
| 711 | + $instance['subscribe_button'] = wp_strip_all_tags( stripslashes( $instance['subscribe_button'] ) ); | |
| 685 | 712 | } |
| 686 | 713 | |
| 687 | 714 | $instance['show_subscribers_total'] = isset( $new_instance['show_subscribers_total'] ) && $new_instance['show_subscribers_total']; |
| 688 | 715 | $instance['show_only_email_and_button'] = isset( $new_instance['show_only_email_and_button'] ) && $new_instance['show_only_email_and_button']; |
| 689 | - $instance['subscribe_text'] = wp_filter_post_kses( stripslashes( $new_instance['subscribe_text'] ) ); | |
| 716 | + $instance['subscribe_text'] = wp_filter_post_kses( stripslashes( $instance['subscribe_text'] ) ); | |
| 690 | 717 | |
| 691 | 718 | return $instance; |
| 692 | 719 | } |
| 693 | 720 | |
| @@ -715,8 +742,9 @@ | ||
| 715 | 742 | /** |
| 716 | 743 | * Renders the widget's options form in wp-admin. |
| 717 | 744 | * |
| 718 | 745 | * @param array $instance Widget instance. |
| 746 | + * @return string|void | |
| 719 | 747 | */ |
| 720 | 748 | public function form( $instance ) { |
| 721 | 749 | $instance = wp_parse_args( (array) $instance, static::defaults() ); |
| 722 | 750 | $show_subscribers_total = checked( $instance['show_subscribers_total'], true, false ); |
| @@ -721,26 +749,14 @@ | ||
| 721 | 749 | $instance = wp_parse_args( (array) $instance, static::defaults() ); |
| 722 | 750 | $show_subscribers_total = checked( $instance['show_subscribers_total'], true, false ); |
| 723 | 751 | |
| 724 | 752 | if ( self::is_wpcom() ) { |
| 725 | - $title = esc_attr( stripslashes( $instance['title'] ) ); | |
| 726 | - $title_following = esc_attr( stripslashes( $instance['title_following'] ) ); | |
| 727 | - $subscribe_text = esc_attr( stripslashes( $instance['subscribe_text'] ) ); | |
| 728 | - $subscribe_logged_in = esc_attr( stripslashes( $instance['subscribe_logged_in'] ) ); | |
| 729 | - $subscribe_button = esc_attr( stripslashes( $instance['subscribe_button'] ) ); | |
| 753 | + $title = ! empty( $instance['title'] ) ? esc_attr( stripslashes( $instance['title'] ) ) : ''; | |
| 754 | + $title_following = ! empty( $instance['title_following'] ) ? esc_attr( stripslashes( $instance['title_following'] ) ) : ''; | |
| 755 | + $subscribe_text = ! empty( $instance['subscribe_text'] ) ? esc_attr( stripslashes( $instance['subscribe_text'] ) ) : ''; | |
| 756 | + $subscribe_logged_in = ! empty( $instance['subscribe_logged_in'] ) ? esc_attr( stripslashes( $instance['subscribe_logged_in'] ) ) : ''; | |
| 757 | + $subscribe_button = ! empty( $instance['subscribe_button'] ) ? esc_attr( stripslashes( $instance['subscribe_button'] ) ) : ''; | |
| 730 | 758 | $subscribers_total = self::fetch_subscriber_count(); |
| 731 | - } | |
| 732 | - | |
| 733 | - if ( self::is_jetpack() ) { | |
| 734 | - $title = stripslashes( $instance['title'] ); | |
| 735 | - $subscribe_text = stripslashes( $instance['subscribe_text'] ); | |
| 736 | - $subscribe_placeholder = stripslashes( $instance['subscribe_placeholder'] ); | |
| 737 | - $subscribe_button = stripslashes( $instance['subscribe_button'] ); | |
| 738 | - $success_message = stripslashes( $instance['success_message'] ); | |
| 739 | - $subscribers_total = self::fetch_subscriber_count(); | |
| 740 | - } | |
| 741 | - | |
| 742 | - if ( self::is_wpcom() ) : | |
| 743 | 759 | ?> |
| 744 | 760 | <p> |
| 745 | 761 | <label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"> |
| 746 | 762 | <?php esc_html_e( 'Widget title for non-followers:', 'jetpack' ); ?> |
| @@ -792,11 +808,17 @@ | ||
| 792 | 808 | ?> |
| 793 | 809 | </label> |
| 794 | 810 | </p> |
| 795 | 811 | <?php |
| 796 | - endif; | |
| 812 | + } | |
| 797 | 813 | |
| 798 | - if ( self::is_jetpack() ) : | |
| 814 | + if ( self::is_jetpack() ) { | |
| 815 | + $title = ! empty( $instance['title'] ) ? stripslashes( $instance['title'] ) : ''; | |
| 816 | + $subscribe_text = ! empty( $instance['subscribe_text'] ) ? stripslashes( $instance['subscribe_text'] ) : ''; | |
| 817 | + $subscribe_placeholder = ! empty( $instance['subscribe_placeholder'] ) ? stripslashes( $instance['subscribe_placeholder'] ) : ''; | |
| 818 | + $subscribe_button = ! empty( $instance['subscribe_button'] ) ? stripslashes( $instance['subscribe_button'] ) : ''; | |
| 819 | + $success_message = ! empty( $instance['success_message'] ) ? stripslashes( $instance['success_message'] ) : ''; | |
| 820 | + $subscribers_total = self::fetch_subscriber_count(); | |
| 799 | 821 | ?> |
| 800 | 822 | <p> |
| 801 | 823 | <label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"> |
| 802 | 824 | <?php esc_html_e( 'Widget title:', 'jetpack' ); ?> |
| @@ -848,9 +870,9 @@ | ||
| 848 | 870 | ?> |
| 849 | 871 | </label> |
| 850 | 872 | </p> |
| 851 | 873 | <?php |
| 852 | - endif; | |
| 874 | + } | |
| 853 | 875 | } |
| 854 | 876 | } |
| 855 | 877 | |
| 856 | 878 | if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) { |
| @@ -890,14 +912,14 @@ | ||
| 890 | 912 | } else { |
| 891 | 913 | $instance['include_social_followers'] = false; |
| 892 | 914 | } |
| 893 | 915 | |
| 894 | - $show_only_email_and_button = isset( $instance['show_only_email_and_button'] ) ? $instance['show_only_email_and_button'] : false; | |
| 895 | - $submit_button_text = isset( $instance['submit_button_text'] ) ? $instance['submit_button_text'] : ''; | |
| 916 | + $show_only_email_and_button = $instance['show_only_email_and_button'] ?? false; | |
| 917 | + $submit_button_text = $instance['submit_button_text'] ?? ''; | |
| 896 | 918 | |
| 897 | 919 | // Build up a string with the submit button's classes and styles and set it on the instance. |
| 898 | - $submit_button_classes = isset( $instance['submit_button_classes'] ) ? $instance['submit_button_classes'] : ''; | |
| 899 | - $email_field_classes = isset( $instance['email_field_classes'] ) ? $instance['email_field_classes'] : ''; | |
| 920 | + $submit_button_classes = $instance['submit_button_classes'] ?? ''; | |
| 921 | + $email_field_classes = $instance['email_field_classes'] ?? ''; | |
| 900 | 922 | $style = ''; |
| 901 | 923 | $submit_button_styles = ''; |
| 902 | 924 | $submit_button_wrapper_styles = ''; |
| 903 | 925 | $email_field_styles = ''; |
| @@ -948,9 +970,9 @@ | ||
| 948 | 970 | } |
| 949 | 971 | if ( isset( $instance['button_on_newline'] ) && 'true' === $instance['button_on_newline'] ) { |
| 950 | 972 | $submit_button_styles .= 'margin-top: ' . $button_spacing . 'px; '; |
| 951 | 973 | } else { |
| 952 | - $submit_button_styles .= 'margin: 0px; '; // Reset Safari's 2px default margin for buttons affecting input and button union | |
| 974 | + $submit_button_styles .= 'margin: 0; '; // Reset Safari's 2px default margin for buttons affecting input and button union | |
| 953 | 975 | $submit_button_styles .= 'margin-left: ' . $button_spacing . 'px; '; |
| 954 | 976 | } |
| 955 | 977 | |
| 956 | 978 | if ( isset( $instance['custom_border_radius'] ) && 'undefined' !== $instance['custom_border_radius'] ) { |
