| @@ -6,14 +6,18 @@ | ||
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | require __DIR__ . '/base.php'; |
| 9 | 9 | use Automattic\Jetpack\Connection\Tokens; |
| 10 | +use Automattic\Jetpack\Status\Host; | |
| 10 | 11 | |
| 12 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 13 | + exit( 0 ); | |
| 14 | +} | |
| 15 | + | |
| 11 | 16 | /** |
| 12 | 17 | * Main Comments class |
| 13 | 18 | * |
| 14 | 19 | * @package automattic/jetpack |
| 15 | - * @version 1.4 | |
| 16 | 20 | * @since 1.4 |
| 17 | 21 | */ |
| 18 | 22 | class Jetpack_Comments extends Highlander_Comments_Base { |
| 19 | 23 | |
| @@ -58,9 +62,9 @@ | ||
| 58 | 62 | |
| 59 | 63 | /** |
| 60 | 64 | * Main constructor for Comments |
| 61 | 65 | * |
| 62 | - * @since JetpackComments (1.4) | |
| 66 | + * @since 1.4 | |
| 63 | 67 | */ |
| 64 | 68 | public function __construct() { |
| 65 | 69 | parent::__construct(); |
| 66 | 70 | |
| @@ -84,9 +88,9 @@ | ||
| 84 | 88 | */ |
| 85 | 89 | public function set_default_color_theme_based_on_theme_settings() { |
| 86 | 90 | if ( function_exists( 'twentyeleven_get_theme_options' ) ) { |
| 87 | 91 | $theme_options = twentyeleven_get_theme_options(); |
| 88 | - $theme_color_scheme = isset( $theme_options['color_scheme'] ) ? $theme_options['color_scheme'] : 'transparent'; | |
| 92 | + $theme_color_scheme = $theme_options['color_scheme'] ?? 'transparent'; | |
| 89 | 93 | } else { |
| 90 | 94 | $theme_color_scheme = get_theme_mod( 'color_scheme', 'transparent' ); |
| 91 | 95 | } |
| 92 | 96 | // Default for $theme_color_scheme is 'transparent' just so it doesn't match 'light' or 'dark'. |
| @@ -105,9 +109,9 @@ | ||
| 105 | 109 | * Set any global variables or class variables |
| 106 | 110 | * |
| 107 | 111 | * This is primarily defining the comment form sources. |
| 108 | 112 | * |
| 109 | - * @since JetpackComments (1.4) | |
| 113 | + * @since 1.4 | |
| 110 | 114 | */ |
| 111 | 115 | protected function setup_globals() { |
| 112 | 116 | parent::setup_globals(); |
| 113 | 117 | |
| @@ -115,19 +119,35 @@ | ||
| 115 | 119 | $this->id_sources = array( |
| 116 | 120 | 'guest', |
| 117 | 121 | 'jetpack', |
| 118 | 122 | 'wordpress', |
| 119 | - 'twitter', | |
| 120 | 123 | 'facebook', |
| 121 | 124 | ); |
| 122 | 125 | } |
| 123 | 126 | |
| 124 | 127 | /** |
| 128 | + * Whether the rebuilt Jetpack Comments form has taken over from this one. | |
| 129 | + * | |
| 130 | + * Guarded because this file and the jetpack-comments package can land in | |
| 131 | + * either order on a staged deploy. | |
| 132 | + * | |
| 133 | + * @return bool | |
| 134 | + */ | |
| 135 | + private static function new_comments_enabled() { | |
| 136 | + return class_exists( '\Automattic\Jetpack\Comments\Comments' ) | |
| 137 | + && \Automattic\Jetpack\Comments\Comments::is_enabled(); | |
| 138 | + } | |
| 139 | + | |
| 140 | + /** | |
| 125 | 141 | * Setup actions for methods in this class |
| 126 | 142 | * |
| 127 | - * @since JetpackComments (1.4) | |
| 143 | + * @since 1.4 | |
| 128 | 144 | */ |
| 129 | 145 | protected function setup_actions() { |
| 146 | + if ( self::new_comments_enabled() ) { | |
| 147 | + return; | |
| 148 | + } | |
| 149 | + | |
| 130 | 150 | parent::setup_actions(); |
| 131 | 151 | |
| 132 | 152 | // Selfishly remove everything from the existing comment form. |
| 133 | 153 | remove_all_actions( 'comment_form_before' ); |
| @@ -132,8 +152,9 @@ | ||
| 132 | 152 | // Selfishly remove everything from the existing comment form. |
| 133 | 153 | remove_all_actions( 'comment_form_before' ); |
| 134 | 154 | |
| 135 | 155 | // Selfishly add only our actions back to the comment form. |
| 156 | + add_action( 'comment_form_before', array( $this, 'manage_post_cookie' ) ); | |
| 136 | 157 | add_action( 'comment_form_before', array( $this, 'comment_form_before' ) ); |
| 137 | 158 | add_action( 'comment_form_after', array( $this, 'comment_form_after' ), 1 ); // Set very early since we remove everything outputed before our action. |
| 138 | 159 | |
| 139 | 160 | // Before a comment is posted. |
| @@ -148,19 +169,75 @@ | ||
| 148 | 169 | * |
| 149 | 170 | * @since 1.6.2 |
| 150 | 171 | */ |
| 151 | 172 | protected function setup_filters() { |
| 173 | + if ( self::new_comments_enabled() ) { | |
| 174 | + return; | |
| 175 | + } | |
| 176 | + | |
| 152 | 177 | parent::setup_filters(); |
| 153 | 178 | |
| 154 | 179 | add_filter( 'comment_post_redirect', array( $this, 'capture_comment_post_redirect_to_reload_parent_frame' ), 100 ); |
| 180 | + add_filter( 'comment_duplicate_trigger', array( $this, 'capture_comment_duplicate_trigger' ), 100 ); | |
| 155 | 181 | add_filter( 'get_avatar', array( $this, 'get_avatar' ), 10, 4 ); |
| 182 | + // Fix comment reply link when `comment_registration` is required. | |
| 183 | + add_filter( 'comment_reply_link', array( $this, 'comment_reply_link' ), 10, 4 ); | |
| 156 | 184 | } |
| 157 | 185 | |
| 158 | 186 | /** |
| 159 | - * Get the comment avatar from Gravatar, Twitter, or Facebook | |
| 187 | + * In order for comments to work properly for password-protected posts we need to set `wp-postpass` cookie to SameSite none. | |
| 188 | + */ | |
| 189 | + public function manage_post_cookie() { | |
| 190 | + if ( headers_sent() ) { | |
| 191 | + return; | |
| 192 | + } | |
| 193 | + | |
| 194 | + $postpass_cookie_key = 'wp-postpass_' . COOKIEHASH; | |
| 195 | + | |
| 196 | + if ( empty( $_COOKIE[ $postpass_cookie_key ] ) ) { | |
| 197 | + return; | |
| 198 | + } | |
| 199 | + | |
| 200 | + $postpass_cookie_value = sanitize_text_field( wp_unslash( $_COOKIE[ $postpass_cookie_key ] ) ); | |
| 201 | + | |
| 202 | + if ( empty( $_COOKIE['verbum-wp-postpass'] ) || ( $_COOKIE['verbum-wp-postpass'] !== $postpass_cookie_value ) ) { | |
| 203 | + $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS ); | |
| 204 | + | |
| 205 | + setcookie( | |
| 206 | + $postpass_cookie_key, | |
| 207 | + $postpass_cookie_value, | |
| 208 | + array( | |
| 209 | + 'expires' => $expire, | |
| 210 | + 'samesite' => 'None', | |
| 211 | + 'path' => '/', | |
| 212 | + 'domain' => COOKIE_DOMAIN, | |
| 213 | + 'secure' => is_ssl(), | |
| 214 | + 'httponly' => false, // phpcs:ignore Jetpack.Functions.SetCookie.FoundNonHTTPOnlyFalse -- @todo Can this be set true? | |
| 215 | + ) | |
| 216 | + ); | |
| 217 | + | |
| 218 | + setcookie( | |
| 219 | + 'verbum-wp-postpass', | |
| 220 | + $postpass_cookie_value, | |
| 221 | + array( | |
| 222 | + 'expires' => $expire, | |
| 223 | + 'samesite' => 'None', | |
| 224 | + 'path' => '/', | |
| 225 | + 'domain' => COOKIE_DOMAIN, | |
| 226 | + 'secure' => is_ssl(), | |
| 227 | + 'httponly' => false, // phpcs:ignore Jetpack.Functions.SetCookie.FoundNonHTTPOnlyFalse -- @todo Can this be set true? | |
| 228 | + ) | |
| 229 | + ); | |
| 230 | + } | |
| 231 | + } | |
| 232 | + | |
| 233 | + /** | |
| 234 | + * Get the comment avatar from Gravatar or Twitter/Facebook. | |
| 160 | 235 | * |
| 161 | - * @since JetpackComments (1.4) | |
| 236 | + * Leaving the Twitter reference for legacy comments even though support is no longer offered. | |
| 162 | 237 | * |
| 238 | + * @since 1.4 | |
| 239 | + * | |
| 163 | 240 | * @param string $avatar Current avatar URL. |
| 164 | 241 | * @param string $comment Comment for the avatar. |
| 165 | 242 | * @param int $size Size of the avatar. |
| 166 | 243 | * |
| @@ -171,9 +248,9 @@ | ||
| 171 | 248 | // it's not a comment - bail. |
| 172 | 249 | return $avatar; |
| 173 | 250 | } |
| 174 | 251 | |
| 175 | - // Detect whether it's a Facebook or Twitter avatar. | |
| 252 | + // Detect whether it's a Facebook avatar. | |
| 176 | 253 | $foreign_avatar = get_comment_meta( $comment->comment_ID, 'hc_avatar', true ); |
| 177 | 254 | $foreign_avatar_hostname = wp_parse_url( $foreign_avatar, PHP_URL_HOST ); |
| 178 | 255 | if ( ! $foreign_avatar_hostname || |
| 179 | 256 | ! preg_match( '/\.?(graph\.facebook\.com|twimg\.com)$/', $foreign_avatar_hostname ) ) { |
| @@ -179,13 +256,72 @@ | ||
| 179 | 256 | ! preg_match( '/\.?(graph\.facebook\.com|twimg\.com)$/', $foreign_avatar_hostname ) ) { |
| 180 | 257 | return $avatar; |
| 181 | 258 | } |
| 182 | 259 | |
| 183 | - // Return the Facebook or Twitter avatar. | |
| 184 | - return preg_replace( '#src=([\'"])[^\'"]+\\1#', 'src=\\1' . esc_url( set_url_scheme( $this->photon_avatar( $foreign_avatar, $size ), 'https' ) ) . '\\1', $avatar ); | |
| 260 | + // Insert the escaped URL through a callback: a preg_replace() replacement string would expand a | |
| 261 | + // `$1` inside it into the captured quote, breaking out of the src attribute (stored-XSS vector). | |
| 262 | + $photon_url = esc_url( set_url_scheme( $this->photon_avatar( $foreign_avatar, $size ), 'https' ) ); | |
| 263 | + return preg_replace_callback( | |
| 264 | + '#src=([\'"])[^\'"]+\\1#', | |
| 265 | + static function ( $matches ) use ( $photon_url ) { | |
| 266 | + return 'src=' . $matches[1] . $photon_url . $matches[1]; | |
| 267 | + }, | |
| 268 | + $avatar | |
| 269 | + ); | |
| 185 | 270 | } |
| 186 | 271 | |
| 187 | 272 | /** |
| 273 | + * Set comment reply link. | |
| 274 | + * This is to fix the reply link when comment registration is required. | |
| 275 | + * | |
| 276 | + * @param string $reply_link The HTML markup for the comment reply link. | |
| 277 | + * @param array $args An array of arguments overriding the defaults. | |
| 278 | + * @param WP_Comment $comment The object of the comment being replied. | |
| 279 | + * @param WP_Post $post The WP_Post object. | |
| 280 | + * | |
| 281 | + * @return string New reply link. | |
| 282 | + */ | |
| 283 | + public function comment_reply_link( $reply_link, $args, $comment, $post ) { | |
| 284 | + // This is only necessary if comment_registration is required to post comments | |
| 285 | + if ( ! get_option( 'comment_registration' ) ) { | |
| 286 | + return $reply_link; | |
| 287 | + } | |
| 288 | + | |
| 289 | + $respond_id = esc_attr( $args['respond_id'] ); | |
| 290 | + $add_below = esc_attr( $args['add_below'] ); | |
| 291 | + /* This is to accommodate some themes that add an SVG to the Reply link like twenty-seventeen. */ | |
| 292 | + $reply_text = wp_kses( | |
| 293 | + $args['reply_text'], | |
| 294 | + array( | |
| 295 | + 'svg' => array( | |
| 296 | + 'class' => true, | |
| 297 | + 'aria-hidden' => true, | |
| 298 | + 'aria-labelledby' => true, | |
| 299 | + 'role' => true, | |
| 300 | + 'xmlns' => true, | |
| 301 | + 'width' => true, | |
| 302 | + 'height' => true, | |
| 303 | + 'viewbox' => true, | |
| 304 | + ), | |
| 305 | + 'use' => array( | |
| 306 | + 'href' => true, | |
| 307 | + 'xlink:href' => true, | |
| 308 | + ), | |
| 309 | + ) | |
| 310 | + ); | |
| 311 | + $before_link = wp_kses( $args['before'], wp_kses_allowed_html( 'post' ) ); | |
| 312 | + $after_link = wp_kses( $args['after'], wp_kses_allowed_html( 'post' ) ); | |
| 313 | + | |
| 314 | + $reply_url = esc_url( add_query_arg( 'replytocom', $comment->comment_ID . '#' . $respond_id ) ); | |
| 315 | + | |
| 316 | + return <<<HTML | |
| 317 | + $before_link | |
| 318 | + <a class="comment-reply-link" href="$reply_url" onclick="return addComment.moveForm( '$add_below-$comment->comment_ID', '$comment->comment_ID', '$respond_id', '$post->ID' )">$reply_text</a> | |
| 319 | + $after_link | |
| 320 | +HTML; | |
| 321 | + } | |
| 322 | + | |
| 323 | + /** | |
| 188 | 324 | * Get the site's blog token. |
| 189 | 325 | * This can be used to bypass Comments entirely if Jetpack is not properly connected. |
| 190 | 326 | * |
| 191 | 327 | * @since 11.2 |
| @@ -208,9 +344,9 @@ | ||
| 208 | 344 | * Start capturing the core comment_form() output |
| 209 | 345 | * |
| 210 | 346 | * Comment form output will only be captured if comments are enabled - we return otherwise. |
| 211 | 347 | * |
| 212 | - * @since JetpackComments (1.4) | |
| 348 | + * @since 1.4 | |
| 213 | 349 | */ |
| 214 | 350 | public function comment_form_before() { |
| 215 | 351 | /** |
| 216 | 352 | * Filters the setting that determines if Jetpack comments should be enabled for |
| @@ -240,9 +376,9 @@ | ||
| 240 | 376 | /** |
| 241 | 377 | * Noop the default comment form output, get some options, and output our |
| 242 | 378 | * tricked out totally radical comment form. |
| 243 | 379 | * |
| 244 | - * @since JetpackComments (1.4) | |
| 380 | + * @since 1.4 | |
| 245 | 381 | */ |
| 246 | 382 | public function comment_form_after() { |
| 247 | 383 | /** This filter is documented in modules/comments/comments.php */ |
| 248 | 384 | if ( ! apply_filters( 'jetpack_comment_form_enabled_for_' . get_post_type(), true ) ) { |
| @@ -257,32 +393,8 @@ | ||
| 257 | 393 | |
| 258 | 394 | // Throw it all out and drop in our replacement. |
| 259 | 395 | ob_end_clean(); |
| 260 | 396 | |
| 261 | - // If users are required to be logged in, and they're not, then we don't need to do anything else. | |
| 262 | - if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) { | |
| 263 | - /** | |
| 264 | - * Changes the log in to comment prompt. | |
| 265 | - * | |
| 266 | - * @module comments | |
| 267 | - * | |
| 268 | - * @since 1.4.0 | |
| 269 | - * | |
| 270 | - * @param string $var Default is "You must log in to post a comment." | |
| 271 | - */ | |
| 272 | - echo '<p class="must-log-in">' . wp_kses_post( | |
| 273 | - sprintf( | |
| 274 | - apply_filters( | |
| 275 | - 'jetpack_must_log_in_to_comment', | |
| 276 | - /* translators: %s is the wp-login URL for the site */ | |
| 277 | - __( 'You must <a href="%s">log in</a> to post a comment.', 'jetpack' ) | |
| 278 | - ), | |
| 279 | - wp_login_url( get_permalink() . '#respond' ) | |
| 280 | - ) | |
| 281 | - ) . '</p>'; | |
| 282 | - return; | |
| 283 | - } | |
| 284 | - | |
| 285 | 397 | if ( in_array( 'subscriptions', Jetpack::get_active_modules(), true ) ) { |
| 286 | 398 | $stb_enabled = get_option( 'stb_enabled', 1 ); |
| 287 | 399 | $stb_enabled = empty( $stb_enabled ) ? 0 : 1; |
| 288 | 400 | |
| @@ -320,8 +432,9 @@ | ||
| 320 | 432 | ), |
| 321 | 433 | 'color_scheme' => get_option( 'jetpack_comment_form_color_scheme', $this->default_color_scheme ), |
| 322 | 434 | 'lang' => get_locale(), |
| 323 | 435 | 'jetpack_version' => JETPACK__VERSION, |
| 436 | + 'iframe_unique_id' => wp_unique_id(), | |
| 324 | 437 | ); |
| 325 | 438 | |
| 326 | 439 | // Extra parameters for logged in user. |
| 327 | 440 | if ( is_user_logged_in() ) { |
| @@ -337,8 +450,10 @@ | ||
| 337 | 450 | } else { |
| 338 | 451 | $commenter = wp_get_current_commenter(); |
| 339 | 452 | $params['show_cookie_consent'] = (int) has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ); |
| 340 | 453 | $params['has_cookie_consent'] = (int) ! empty( $commenter['comment_author_email'] ); |
| 454 | + // Jetpack_Memberships for logged out users only checks for the wp-jp-premium-content-session cookie | |
| 455 | + $params['is_current_user_subscribed'] = class_exists( '\Jetpack_Memberships' ) ? (int) Jetpack_Memberships::is_current_user_subscribed() : 0; | |
| 341 | 456 | } |
| 342 | 457 | |
| 343 | 458 | list( $token_key ) = explode( '.', $blog_token->secret, 2 ); |
| 344 | 459 | // Prophylactic check: anything else should never happen. |
| @@ -471,9 +586,9 @@ | ||
| 471 | 586 | * Add some JS to wp_footer to watch for hierarchical reply parent change |
| 472 | 587 | * |
| 473 | 588 | * If AMP is enabled, we don't make any changes. |
| 474 | 589 | * |
| 475 | - * @since JetpackComments (1.4) | |
| 590 | + * @since 1.4 | |
| 476 | 591 | */ |
| 477 | 592 | public function watch_comment_parent() { |
| 478 | 593 | if ( class_exists( Jetpack_AMP_Support::class ) && Jetpack_AMP_Support::is_amp_request() ) { |
| 479 | 594 | // @todo Implement AMP support. |
| @@ -478,106 +593,75 @@ | ||
| 478 | 593 | if ( class_exists( Jetpack_AMP_Support::class ) && Jetpack_AMP_Support::is_amp_request() ) { |
| 479 | 594 | // @todo Implement AMP support. |
| 480 | 595 | return; |
| 481 | 596 | } |
| 482 | - | |
| 483 | - $url_origin = 'https://jetpack.wordpress.com'; | |
| 484 | 597 | ?> |
| 485 | - | |
| 486 | - <!--[if IE]> | |
| 487 | 598 | <script type="text/javascript"> |
| 488 | - if ( 0 === window.location.hash.indexOf( '#comment-' ) ) { | |
| 489 | - // window.location.reload() doesn't respect the Hash in IE | |
| 490 | - window.location.hash = window.location.hash; | |
| 491 | - } | |
| 492 | - </script> | |
| 493 | - <![endif]--> | |
| 494 | - <script type="text/javascript"> | |
| 495 | 599 | (function () { |
| 496 | - var comm_par_el = document.getElementById( 'comment_parent' ), | |
| 497 | - comm_par = ( comm_par_el && comm_par_el.value ) ? comm_par_el.value : '', | |
| 498 | - frame = document.getElementById( 'jetpack_remote_comment' ), | |
| 499 | - tellFrameNewParent; | |
| 500 | - | |
| 501 | - tellFrameNewParent = function () { | |
| 502 | - if ( comm_par ) { | |
| 503 | - frame.src = "<?php echo esc_url_raw( $this->signed_url ); ?>" + '&replytocom=' + parseInt( comm_par, 10 ).toString(); | |
| 504 | - } else { | |
| 505 | - frame.src = "<?php echo esc_url_raw( $this->signed_url ); ?>"; | |
| 506 | - } | |
| 507 | - }; | |
| 508 | - | |
| 600 | + const iframe = document.getElementById( 'jetpack_remote_comment' ); | |
| 509 | 601 | <?php if ( get_option( 'thread_comments' ) && get_option( 'thread_comments_depth' ) ) : ?> |
| 602 | + const watchReply = function() { | |
| 603 | + // Check addComment._Jetpack_moveForm to make sure we don't monkey-patch twice. | |
| 604 | + if ( 'undefined' !== typeof addComment && ! addComment._Jetpack_moveForm ) { | |
| 605 | + // Cache the Core function. | |
| 606 | + addComment._Jetpack_moveForm = addComment.moveForm; | |
| 607 | + const commentParent = document.getElementById( 'comment_parent' ); | |
| 608 | + const cancel = document.getElementById( 'cancel-comment-reply-link' ); | |
| 510 | 609 | |
| 511 | - if ( 'undefined' !== typeof addComment ) { | |
| 512 | - addComment._Jetpack_moveForm = addComment.moveForm; | |
| 610 | + function tellFrameNewParent ( commentParentValue ) { | |
| 611 | + const url = new URL( iframe.src ); | |
| 612 | + if ( commentParentValue ) { | |
| 613 | + url.searchParams.set( 'replytocom', commentParentValue ) | |
| 614 | + } else { | |
| 615 | + url.searchParams.delete( 'replytocom' ); | |
| 616 | + } | |
| 617 | + if( iframe.src !== url.href ) { | |
| 618 | + iframe.src = url.href; | |
| 619 | + } | |
| 620 | + }; | |
| 513 | 621 | |
| 514 | - addComment.moveForm = function ( commId, parentId, respondId, postId ) { | |
| 515 | - var returnValue = addComment._Jetpack_moveForm( commId, parentId, respondId, postId ), | |
| 516 | - cancelClick, cancel; | |
| 622 | + cancel.addEventListener( 'click', function () { | |
| 623 | + tellFrameNewParent( false ); | |
| 624 | + } ); | |
| 517 | 625 | |
| 518 | - if ( false === returnValue ) { | |
| 519 | - cancel = document.getElementById( 'cancel-comment-reply-link' ); | |
| 520 | - cancelClick = cancel.onclick; | |
| 521 | - cancel.onclick = function () { | |
| 522 | - var cancelReturn = cancelClick.call( this ); | |
| 523 | - if ( false !== cancelReturn ) { | |
| 524 | - return cancelReturn; | |
| 525 | - } | |
| 626 | + addComment.moveForm = function ( _, parentId ) { | |
| 627 | + tellFrameNewParent( parentId ); | |
| 628 | + return addComment._Jetpack_moveForm.apply( null, arguments ); | |
| 629 | + }; | |
| 630 | + } | |
| 631 | + } | |
| 632 | + document.addEventListener( 'DOMContentLoaded', watchReply ); | |
| 633 | + // In WP 6.4+, the script is loaded asynchronously, so we need to wait for it to load before we monkey-patch the functions it introduces. | |
| 634 | + document.querySelector('#comment-reply-js')?.addEventListener( 'load', watchReply ); | |
| 526 | 635 | |
| 527 | - if ( ! comm_par ) { | |
| 528 | - return cancelReturn; | |
| 529 | - } | |
| 636 | + <?php endif; ?> | |
| 637 | + | |
| 638 | + const commentIframes = document.getElementsByClassName('jetpack_remote_comment'); | |
| 530 | 639 | |
| 531 | - comm_par = 0; | |
| 640 | + window.addEventListener('message', function(event) { | |
| 641 | + if (event.origin !== 'https://jetpack.wordpress.com') { | |
| 642 | + return; | |
| 643 | + } | |
| 532 | 644 | |
| 533 | - tellFrameNewParent(); | |
| 645 | + if (!event?.data?.iframeUniqueId && !event?.data?.height) { | |
| 646 | + return; | |
| 647 | + } | |
| 534 | 648 | |
| 535 | - return cancelReturn; | |
| 536 | - }; | |
| 537 | - } | |
| 649 | + const eventDataUniqueId = event.data.iframeUniqueId; | |
| 538 | 650 | |
| 539 | - if ( comm_par == parentId ) { | |
| 540 | - return returnValue; | |
| 651 | + // Change height for the matching comment iframe | |
| 652 | + for (let i = 0; i < commentIframes.length; i++) { | |
| 653 | + const iframe = commentIframes[i]; | |
| 654 | + const url = new URL(iframe.src); | |
| 655 | + const iframeUniqueIdParam = url.searchParams.get('iframe_unique_id'); | |
| 656 | + if (iframeUniqueIdParam == event.data.iframeUniqueId) { | |
| 657 | + iframe.style.height = event.data.height + 'px'; | |
| 658 | + return; | |
| 541 | 659 | } |
| 542 | - | |
| 543 | - comm_par = parentId; | |
| 544 | - | |
| 545 | - tellFrameNewParent(); | |
| 546 | - | |
| 547 | - return returnValue; | |
| 548 | - }; | |
| 549 | - } | |
| 550 | - | |
| 551 | - <?php endif; ?> | |
| 552 | - | |
| 553 | - // Do the post message bit after the dom has loaded. | |
| 554 | - document.addEventListener( 'DOMContentLoaded', function () { | |
| 555 | - var iframe_url = <?php echo wp_json_encode( esc_url_raw( $url_origin ) ); ?>; | |
| 556 | - if ( window.postMessage ) { | |
| 557 | - if ( document.addEventListener ) { | |
| 558 | - window.addEventListener( 'message', function ( event ) { | |
| 559 | - var origin = event.origin.replace( /^http:\/\//i, 'https://' ); | |
| 560 | - if ( iframe_url.replace( /^http:\/\//i, 'https://' ) !== origin ) { | |
| 561 | - return; | |
| 562 | - } | |
| 563 | - frame.style.height = event.data + 'px'; | |
| 564 | - }); | |
| 565 | - } else if ( document.attachEvent ) { | |
| 566 | - window.attachEvent( 'message', function ( event ) { | |
| 567 | - var origin = event.origin.replace( /^http:\/\//i, 'https://' ); | |
| 568 | - if ( iframe_url.replace( /^http:\/\//i, 'https://' ) !== origin ) { | |
| 569 | - return; | |
| 570 | - } | |
| 571 | - frame.style.height = event.data + 'px'; | |
| 572 | - }); | |
| 573 | - } | |
| 574 | 660 | } |
| 575 | - }) | |
| 576 | - | |
| 661 | + }); | |
| 577 | 662 | })(); |
| 578 | 663 | </script> |
| 579 | - | |
| 580 | 664 | <?php |
| 581 | 665 | } |
| 582 | 666 | |
| 583 | 667 | /** |
| @@ -585,25 +669,27 @@ | ||
| 585 | 669 | * |
| 586 | 670 | * If the Jetpack token is missing we return nothing, |
| 587 | 671 | * and if the token is unknown or invalid, or comments not allowed, an error is returned. |
| 588 | 672 | * |
| 589 | - * @since JetpackComments (1.4) | |
| 673 | + * @since 1.4 | |
| 590 | 674 | */ |
| 591 | 675 | public function pre_comment_on_post() { |
| 592 | 676 | $post_array = stripslashes_deep( $_POST ); |
| 593 | 677 | |
| 594 | 678 | // Bail if missing the Jetpack token. |
| 595 | - if ( ! isset( $post_array['sig'] ) || ! isset( $post_array['token_key'] ) ) { | |
| 679 | + if ( ! isset( $post_array['sig'] ) || ! isset( $post_array['token_key'] ) || ! is_string( $post_array['sig'] ) || ! is_string( $post_array['token_key'] ) ) { | |
| 596 | 680 | unset( $_POST['hc_post_as'] ); |
| 597 | - | |
| 598 | 681 | return; |
| 599 | 682 | } |
| 600 | 683 | |
| 601 | 684 | if ( empty( $post_array['jetpack_comments_nonce'] ) || ! wp_verify_nonce( $post_array['jetpack_comments_nonce'], "jetpack_comments_nonce-{$post_array['comment_post_ID']}" ) ) { |
| 602 | - wp_die( esc_html__( 'Nonce verification failed.', 'jetpack' ), 400 ); | |
| 685 | + if ( ! isset( $_GET['only_once'] ) ) { | |
| 686 | + self::retry_submit_comment_form_locally(); | |
| 687 | + } | |
| 688 | + wp_die( esc_html__( 'Nonce verification failed.', 'jetpack' ), 400 ); | |
| 603 | 689 | } |
| 604 | 690 | |
| 605 | - if ( false !== strpos( $post_array['hc_avatar'], '.gravatar.com' ) ) { | |
| 691 | + if ( isset( $post_array['hc_avatar'] ) && is_string( $post_array['hc_avatar'] ) && str_contains( $post_array['hc_avatar'], '.gravatar.com' ) ) { | |
| 606 | 692 | $post_array['hc_avatar'] = htmlentities( $post_array['hc_avatar'], ENT_COMPAT ); |
| 607 | 693 | } |
| 608 | 694 | |
| 609 | 695 | $blog_token = ( new Tokens() )->get_access_token( false, $post_array['token_key'] ); |
| @@ -628,8 +714,67 @@ | ||
| 628 | 714 | wp_die( esc_html__( 'Comments are not allowed.', 'jetpack' ), 403 ); |
| 629 | 715 | } |
| 630 | 716 | } |
| 631 | 717 | |
| 718 | + /** | |
| 719 | + * Handle Jetpack Comments POST requests: process the comment form, then client-side POST the results to the self-hosted blog | |
| 720 | + * | |
| 721 | + * This function exists because when we submit the form via the jetpack.wordpress.com iframe | |
| 722 | + * in Chrome the request comes in to Jetpack but for some reason the request doesn't have access to cookies yet. | |
| 723 | + * By submitting the form again locally with the same data the process works as expected. | |
| 724 | + * | |
| 725 | + * @return never | |
| 726 | + */ | |
| 727 | + public function retry_submit_comment_form_locally() { | |
| 728 | + // We are not doing any validation here since all the validation will be done again by pre_comment_on_post(). | |
| 729 | + // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 730 | + $comment_data = stripslashes_deep( $_POST ); | |
| 731 | + ?> | |
| 732 | + <!DOCTYPE html> | |
| 733 | + <html> | |
| 734 | + <head> | |
| 735 | + <meta charset="utf-8"> | |
| 736 | + <title><?php echo esc_html__( 'Submitting Comment', 'jetpack' ); ?></title> | |
| 737 | + <style type="text/css"> | |
| 738 | + body { | |
| 739 | + display: table; | |
| 740 | + width: 100%; | |
| 741 | + height: 60%; | |
| 742 | + position: absolute; | |
| 743 | + top: 0; | |
| 744 | + left: 0; | |
| 745 | + overflow: hidden; | |
| 746 | + color: #333; | |
| 747 | + } | |
| 748 | + .jetpack-comment-spinner { | |
| 749 | + display: table-cell; | |
| 750 | + vertical-align: middle; | |
| 751 | + text-align: center; | |
| 752 | + } | |
| 753 | + </style> | |
| 754 | + </head> | |
| 755 | + <body> | |
| 756 | + <div class="jetpack-comment-spinner"> | |
| 757 | + <?php | |
| 758 | + require_once JETPACK__PLUGIN_DIR . '_inc/lib/class-jetpack-spinner.php'; | |
| 759 | + echo Jetpack_Spinner::render( 28 ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static SVG markup. | |
| 760 | + ?> | |
| 761 | + </div> | |
| 762 | + <form id="jetpack-remote-comment-post-form" action="<?php echo esc_url( get_site_url() ); ?>/wp-comments-post.php?for=jetpack&only_once=true" method="POST"> | |
| 763 | + <?php foreach ( $comment_data as $key => $val ) : ?> | |
| 764 | + <input type="hidden" name="<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( $val ); ?>" /> | |
| 765 | + <?php endforeach; ?> | |
| 766 | + </form> | |
| 767 | + | |
| 768 | + <script type="text/javascript"> | |
| 769 | + document.getElementById("jetpack-remote-comment-post-form").submit(); | |
| 770 | + </script> | |
| 771 | + </body> | |
| 772 | + </html> | |
| 773 | + <?php | |
| 774 | + exit( 0 ); | |
| 775 | + } | |
| 776 | + | |
| 632 | 777 | /** Capabilities **********************************************************/ |
| 633 | 778 | |
| 634 | 779 | /** |
| 635 | 780 | * Add some additional comment meta after comment is saved about what |
| @@ -634,42 +779,56 @@ | ||
| 634 | 779 | /** |
| 635 | 780 | * Add some additional comment meta after comment is saved about what |
| 636 | 781 | * service the comment is from, the avatar, user_id, etc... |
| 637 | 782 | * |
| 638 | - * @since JetpackComments (1.4) | |
| 783 | + * @since 1.4 | |
| 639 | 784 | * |
| 640 | 785 | * @param int $comment_id The comment ID. |
| 641 | 786 | */ |
| 642 | 787 | public function add_comment_meta( $comment_id ) { |
| 788 | + // phpcs:disable WordPress.Security.NonceVerification.Missing -- The hc_* fields are authenticated by the HMAC check below. | |
| 789 | + $post_array = stripslashes_deep( $_POST ); | |
| 790 | + | |
| 791 | + // The hc_* identity fields are only trustworthy on a signed request. pre_comment_on_post() checks | |
| 792 | + // that, but only on wp-comments-post.php, so re-check here for any other producer that reaches | |
| 793 | + // comment_post (e.g. Carousel's unauthenticated post_attachment_comment endpoint). | |
| 794 | + if ( ! isset( $post_array['sig'] ) || ! isset( $post_array['token_key'] ) || ! is_string( $post_array['sig'] ) || ! is_string( $post_array['token_key'] ) ) { | |
| 795 | + return; | |
| 796 | + } | |
| 797 | + if ( isset( $post_array['hc_avatar'] ) && is_string( $post_array['hc_avatar'] ) && str_contains( $post_array['hc_avatar'], '.gravatar.com' ) ) { | |
| 798 | + $post_array['hc_avatar'] = htmlentities( $post_array['hc_avatar'], ENT_COMPAT ); | |
| 799 | + } | |
| 800 | + $blog_token = ( new Tokens() )->get_access_token( false, $post_array['token_key'] ); | |
| 801 | + if ( ! $blog_token || is_wp_error( $blog_token ) ) { | |
| 802 | + return; | |
| 803 | + } | |
| 804 | + $check = self::sign_remote_comment_parameters( $post_array, $blog_token->secret ); | |
| 805 | + if ( is_wp_error( $check ) || ! hash_equals( $check, $post_array['sig'] ) ) { | |
| 806 | + return; | |
| 807 | + } | |
| 808 | + | |
| 643 | 809 | $comment_meta = array(); |
| 644 | 810 | |
| 645 | - // phpcs:disable WordPress.Security.NonceVerification.Missing | |
| 646 | 811 | switch ( $this->is_highlander_comment_post() ) { |
| 647 | 812 | case 'facebook': |
| 648 | 813 | $comment_meta['hc_post_as'] = 'facebook'; |
| 649 | - $comment_meta['hc_avatar'] = isset( $_POST['hc_avatar'] ) ? filter_var( wp_unslash( $_POST['hc_avatar'] ) ) : null; | |
| 650 | - $comment_meta['hc_foreign_user_id'] = isset( $_POST['hc_userid'] ) ? filter_var( wp_unslash( $_POST['hc_userid'] ) ) : null; | |
| 814 | + $comment_meta['hc_avatar'] = isset( $_POST['hc_avatar'] ) ? esc_url_raw( wp_unslash( $_POST['hc_avatar'] ) ) : null; | |
| 815 | + $comment_meta['hc_foreign_user_id'] = isset( $_POST['hc_userid'] ) ? sanitize_text_field( wp_unslash( $_POST['hc_userid'] ) ) : null; | |
| 651 | 816 | break; |
| 652 | 817 | |
| 653 | - case 'twitter': | |
| 654 | - $comment_meta['hc_post_as'] = 'twitter'; | |
| 655 | - $comment_meta['hc_avatar'] = isset( $_POST['hc_avatar'] ) ? filter_var( wp_unslash( $_POST['hc_avatar'] ) ) : null; | |
| 656 | - $comment_meta['hc_foreign_user_id'] = isset( $_POST['hc_userid'] ) ? filter_var( wp_unslash( $_POST['hc_userid'] ) ) : null; | |
| 657 | - break; | |
| 658 | - | |
| 659 | 818 | // phpcs:ignore WordPress.WP.CapitalPDangit |
| 660 | 819 | case 'wordpress': |
| 661 | 820 | // phpcs:ignore WordPress.WP.CapitalPDangit |
| 662 | 821 | $comment_meta['hc_post_as'] = 'wordpress'; |
| 663 | - $comment_meta['hc_avatar'] = isset( $_POST['hc_avatar'] ) ? filter_var( wp_unslash( $_POST['hc_avatar'] ) ) : null; | |
| 664 | - $comment_meta['hc_foreign_user_id'] = isset( $_POST['hc_userid'] ) ? filter_var( wp_unslash( $_POST['hc_userid'] ) ) : null; | |
| 665 | - $comment_meta['hc_wpcom_id_sig'] = isset( $_POST['hc_wpcom_id_sig'] ) ? filter_var( wp_unslash( $_POST['hc_wpcom_id_sig'] ) ) : null; // since 1.9. | |
| 822 | + $comment_meta['hc_avatar'] = isset( $_POST['hc_avatar'] ) ? esc_url_raw( wp_unslash( $_POST['hc_avatar'] ) ) : null; | |
| 823 | + $comment_meta['hc_foreign_user_id'] = isset( $_POST['hc_userid'] ) ? sanitize_text_field( wp_unslash( $_POST['hc_userid'] ) ) : null; | |
| 824 | + $comment_meta['hc_wpcom_id_sig'] = isset( $_POST['hc_wpcom_id_sig'] ) ? sanitize_text_field( wp_unslash( $_POST['hc_wpcom_id_sig'] ) ) : null; // since 1.9. | |
| 666 | 825 | break; |
| 667 | 826 | |
| 668 | 827 | case 'jetpack': |
| 669 | 828 | $comment_meta['hc_post_as'] = 'jetpack'; |
| 670 | - $comment_meta['hc_avatar'] = isset( $_POST['hc_avatar'] ) ? filter_var( wp_unslash( $_POST['hc_avatar'] ) ) : null; | |
| 671 | - $comment_meta['hc_foreign_user_id'] = isset( $_POST['hc_userid'] ) ? filter_var( wp_unslash( $_POST['hc_userid'] ) ) : null; | |
| 829 | + $comment_meta['hc_avatar'] = isset( $_POST['hc_avatar'] ) ? esc_url_raw( wp_unslash( $_POST['hc_avatar'] ) ) : null; | |
| 830 | + $comment_meta['hc_foreign_user_id'] = isset( $_POST['hc_userid'] ) ? sanitize_text_field( wp_unslash( $_POST['hc_userid'] ) ) : null; | |
| 672 | 831 | break; |
| 673 | 832 | |
| 674 | 833 | } |
| 675 | 834 | // phpcs:enable WordPress.Security.NonceVerification.Missing |
| @@ -685,8 +844,163 @@ | ||
| 685 | 844 | } |
| 686 | 845 | } |
| 687 | 846 | |
| 688 | 847 | /** |
| 848 | + * Should show the subscription modal | |
| 849 | + * | |
| 850 | + * @return boolean | |
| 851 | + */ | |
| 852 | + public function should_show_subscription_modal() { | |
| 853 | + | |
| 854 | + // Not allow it to run on self-hosted or simple sites | |
| 855 | + if ( ! ( new Host() )->is_wpcom_platform() || ( new Host() )->is_wpcom_simple() ) { | |
| 856 | + return false; | |
| 857 | + } | |
| 858 | + | |
| 859 | + // phpcs:disable WordPress.Security.NonceVerification.Missing | |
| 860 | + $is_current_user_subscribed = isset( $_POST['is_current_user_subscribed'] ) ? filter_var( wp_unslash( $_POST['is_current_user_subscribed'] ) ) : null; | |
| 861 | + | |
| 862 | + // Atomic sites with jetpack_verbum_subscription_modal option enabled | |
| 863 | + $modal_enabled = ( new Host() )->is_woa_site() && get_option( 'jetpack_verbum_subscription_modal', true ); | |
| 864 | + | |
| 865 | + return $modal_enabled && ! $is_current_user_subscribed; | |
| 866 | + } | |
| 867 | + | |
| 868 | + /** | |
| 869 | + * Get the data to send as an event to the parent window on subscription modal | |
| 870 | + * | |
| 871 | + * @param string $url url to redirect to. | |
| 872 | + * | |
| 873 | + * @return array | |
| 874 | + */ | |
| 875 | + public function get_subscription_modal_data_to_parent( $url ) { | |
| 876 | + // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 877 | + $current_user_email = isset( $_POST['email'] ) ? filter_var( wp_unslash( $_POST['email'] ) ) : null; | |
| 878 | + // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 879 | + $post_id = isset( $_POST['comment_post_ID'] ) ? filter_var( wp_unslash( $_POST['comment_post_ID'] ) ) : null; | |
| 880 | + return array( | |
| 881 | + 'url' => $url, | |
| 882 | + 'email' => $current_user_email, | |
| 883 | + 'blog_id' => esc_attr( \Jetpack_Options::get_option( 'id' ) ), | |
| 884 | + 'post_id' => esc_attr( $post_id ), | |
| 885 | + 'lang' => esc_attr( get_locale() ), | |
| 886 | + 'is_logged_in' => isset( $_POST['hc_userid'] ), | |
| 887 | + ); | |
| 888 | + } | |
| 889 | + | |
| 890 | + /** | |
| 891 | + * Track the hidden event for the subscription modal | |
| 892 | + */ | |
| 893 | + public function subscription_modal_status_track_event() { | |
| 894 | + $tracking_event = 'hidden_disabled'; | |
| 895 | + // Not allow it to run on self-hosted or simple sites | |
| 896 | + if ( ! ( new Host() )->is_wpcom_platform() || ( new Host() )->is_wpcom_simple() ) { | |
| 897 | + $tracking_event = 'hidden_self_hosted'; | |
| 898 | + } | |
| 899 | + | |
| 900 | + // phpcs:disable WordPress.Security.NonceVerification.Missing | |
| 901 | + $is_current_user_subscribed = isset( $_POST['is_current_user_subscribed'] ) ? filter_var( wp_unslash( $_POST['is_current_user_subscribed'] ) ) : null; | |
| 902 | + | |
| 903 | + if ( $is_current_user_subscribed ) { | |
| 904 | + $tracking_event = 'hidden_already_subscribed'; | |
| 905 | + } | |
| 906 | + | |
| 907 | + $jetpack = Jetpack::init(); | |
| 908 | + // $jetpack->stat automatically prepends the stat group with 'jetpack-' | |
| 909 | + $jetpack->stat( 'subscribe-modal-comm', $tracking_event ); | |
| 910 | + $jetpack->do_stats( 'server_side' ); | |
| 911 | + } | |
| 912 | + | |
| 913 | + /** | |
| 914 | + * Catch the duplicated comment error and show a custom error page | |
| 915 | + * | |
| 916 | + * @return never | |
| 917 | + */ | |
| 918 | + public function capture_comment_duplicate_trigger() { | |
| 919 | + if ( ! isset( $_GET['for'] ) || 'jetpack' !== $_GET['for'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 920 | + exit( 0 ); | |
| 921 | + } | |
| 922 | + | |
| 923 | + ?> | |
| 924 | + <!DOCTYPE html> | |
| 925 | + <html <?php language_attributes(); ?>> | |
| 926 | + <!--<![endif]--> | |
| 927 | + <head> | |
| 928 | + <meta charset="<?php bloginfo( 'charset' ); ?>" /> | |
| 929 | + <title> | |
| 930 | + <?php | |
| 931 | + wp_kses_post( | |
| 932 | + printf( | |
| 933 | + /* translators: %s is replaced by an ellipsis */ | |
| 934 | + __( 'Submitting Comment%s', 'jetpack' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 935 | + '…' | |
| 936 | + ) | |
| 937 | + ); | |
| 938 | + ?> | |
| 939 | + </title> | |
| 940 | + <style type="text/css"> | |
| 941 | + body { | |
| 942 | + display: table; | |
| 943 | + width: 100%; | |
| 944 | + height: 60%; | |
| 945 | + position: absolute; | |
| 946 | + top: 0; | |
| 947 | + left: 0; | |
| 948 | + overflow: hidden; | |
| 949 | + color: #333; | |
| 950 | + padding-top: 3%; | |
| 951 | + } | |
| 952 | + div { | |
| 953 | + text-align: left; | |
| 954 | + margin: 0; | |
| 955 | + padding: 0; | |
| 956 | + display: table-cell; | |
| 957 | + vertical-align: top; | |
| 958 | + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif; | |
| 959 | + font-weight: normal; | |
| 960 | + } | |
| 961 | + | |
| 962 | + h3 { | |
| 963 | + margin: 0; | |
| 964 | + padding-bottom: 3%; | |
| 965 | + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif; | |
| 966 | + font-weight: normal; | |
| 967 | + } | |
| 968 | + a { | |
| 969 | + text-decoration: underline; | |
| 970 | + color: #333 !important; | |
| 971 | + } | |
| 972 | + </style> | |
| 973 | + </head> | |
| 974 | + <body> | |
| 975 | + <div> | |
| 976 | + <h3> | |
| 977 | + <?php | |
| 978 | + esc_html_e( 'Duplicate comment detected; it looks as though you’ve already said that!', 'jetpack' ); | |
| 979 | + ?> | |
| 980 | + </h3> | |
| 981 | + <a href="javascript:backToComments()"><?php esc_html_e( '« Back', 'jetpack' ); ?></a> | |
| 982 | + </div> | |
| 983 | + <script type="text/javascript"> | |
| 984 | + function backToComments() { | |
| 985 | + const test = regexp => { | |
| 986 | + return regexp.test(navigator.userAgent); | |
| 987 | + }; | |
| 988 | + if (test(/chrome|chromium|crios|safari|edg/i)) { | |
| 989 | + history.go(-2); | |
| 990 | + return; | |
| 991 | + } | |
| 992 | + history.back(); | |
| 993 | + } | |
| 994 | + </script> | |
| 995 | + | |
| 996 | + </body> | |
| 997 | + </html> | |
| 998 | + <?php | |
| 999 | + exit( 0 ); | |
| 1000 | + } | |
| 1001 | + | |
| 1002 | + /** | |
| 689 | 1003 | * POST the submitted comment to the iframe |
| 690 | 1004 | * |
| 691 | 1005 | * @param string $url The comment URL origin. |
| 692 | 1006 | */ |
| @@ -693,8 +1007,15 @@ | ||
| 693 | 1007 | public function capture_comment_post_redirect_to_reload_parent_frame( $url ) { |
| 694 | 1008 | if ( ! isset( $_GET['for'] ) || 'jetpack' !== $_GET['for'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended |
| 695 | 1009 | return $url; |
| 696 | 1010 | } |
| 1011 | + | |
| 1012 | + $should_show_subscription_modal = $this->should_show_subscription_modal(); | |
| 1013 | + | |
| 1014 | + // Track event when not showing the subscription modal | |
| 1015 | + if ( ! $should_show_subscription_modal ) { | |
| 1016 | + $this->subscription_modal_status_track_event(); | |
| 1017 | + } | |
| 697 | 1018 | ?> |
| 698 | 1019 | <!DOCTYPE html> |
| 699 | 1020 | <html <?php language_attributes(); ?>> |
| 700 | 1021 | <!--<![endif]--> |
| @@ -720,16 +1041,17 @@ | ||
| 720 | 1041 | top: 0; |
| 721 | 1042 | left: 0; |
| 722 | 1043 | overflow: hidden; |
| 723 | 1044 | color: #333; |
| 1045 | + padding-top: 3%; | |
| 724 | 1046 | } |
| 725 | 1047 | |
| 726 | - h1 { | |
| 1048 | + h3 { | |
| 727 | 1049 | text-align: center; |
| 728 | 1050 | margin: 0; |
| 729 | 1051 | padding: 0; |
| 730 | 1052 | display: table-cell; |
| 731 | - vertical-align: middle; | |
| 1053 | + vertical-align: top; | |
| 732 | 1054 | font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif; |
| 733 | 1055 | font-weight: normal; |
| 734 | 1056 | } |
| 735 | 1057 | |
| @@ -736,9 +1058,9 @@ | ||
| 736 | 1058 | .hidden { |
| 737 | 1059 | opacity: 0; |
| 738 | 1060 | } |
| 739 | 1061 | |
| 740 | - h1 span { | |
| 1062 | + h3 span { | |
| 741 | 1063 | -moz-transition-property: opacity; |
| 742 | 1064 | -moz-transition-duration: 1s; |
| 743 | 1065 | -moz-transition-timing-function: ease-in-out; |
| 744 | 1066 | |
| @@ -760,9 +1082,10 @@ | ||
| 760 | 1082 | } |
| 761 | 1083 | </style> |
| 762 | 1084 | </head> |
| 763 | 1085 | <body> |
| 764 | - <h1> | |
| 1086 | + <?php if ( ! $should_show_subscription_modal ) { ?> | |
| 1087 | + <h3> | |
| 765 | 1088 | <?php |
| 766 | 1089 | wp_kses_post( |
| 767 | 1090 | printf( |
| 768 | 1091 | /* translators: %s is replaced by HTML markup to include an ellipsis */ |
| @@ -770,16 +1093,16 @@ | ||
| 770 | 1093 | '<span id="ellipsis" class="hidden">…</span>' |
| 771 | 1094 | ) |
| 772 | 1095 | ); |
| 773 | 1096 | ?> |
| 774 | - </h1> | |
| 1097 | + </h3> | |
| 775 | 1098 | <script type="text/javascript"> |
| 776 | 1099 | try { |
| 777 | - window.parent.location = <?php echo wp_json_encode( $url ); ?>; | |
| 778 | - window.parent.location.reload(true); | |
| 1100 | + window.parent.location.href = <?php echo wp_json_encode( $url, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?>; | |
| 1101 | + window.parent.location.reload( true ); | |
| 779 | 1102 | } catch (e) { |
| 780 | - window.location = <?php echo wp_json_encode( $url ); ?>; | |
| 781 | - window.location.reload(true); | |
| 1103 | + window.location.href = <?php echo wp_json_encode( $url, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?>; | |
| 1104 | + window.location.reload( true ); | |
| 782 | 1105 | } |
| 783 | 1106 | ellipsis = document.getElementById('ellipsis'); |
| 784 | 1107 | |
| 785 | 1108 | function toggleEllipsis() { |
| @@ -787,12 +1110,33 @@ | ||
| 787 | 1110 | } |
| 788 | 1111 | |
| 789 | 1112 | setInterval(toggleEllipsis, 1200); |
| 790 | 1113 | </script> |
| 1114 | + <?php } else { ?> | |
| 1115 | + <h3> | |
| 1116 | + <?php | |
| 1117 | + wp_kses_post( | |
| 1118 | + print __( 'Comment sent', 'jetpack' ) // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 1119 | + ); | |
| 1120 | + ?> | |
| 1121 | + </h3> | |
| 1122 | + <script type="text/javascript"> | |
| 1123 | + if ( window.parent && window.parent !== window ) { | |
| 1124 | + | |
| 1125 | + window.parent.postMessage( | |
| 1126 | + { | |
| 1127 | + type: 'subscriptionModalShow', | |
| 1128 | + data: <?php echo wp_json_encode( $this->get_subscription_modal_data_to_parent( $url ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ); ?>, | |
| 1129 | + }, | |
| 1130 | + window.location.origin | |
| 1131 | + ); | |
| 1132 | + } | |
| 1133 | + </script> | |
| 1134 | + <?php } ?> | |
| 791 | 1135 | </body> |
| 792 | 1136 | </html> |
| 793 | 1137 | <?php |
| 794 | - exit; | |
| 1138 | + exit( 0 ); | |
| 795 | 1139 | } |
| 796 | 1140 | } |
| 797 | 1141 | |
| 798 | 1142 | Jetpack_Comments::init(); |
