| @@ -5,9 +5,14 @@ | ||
| 5 | 5 | * phpcs:disable Generic.Files.OneObjectStructurePerFile.MultipleFound |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | use Automattic\Jetpack\Device_Detection\User_Agent_Info; |
| 9 | +use Automattic\Jetpack\Post_Media\Images; | |
| 9 | 10 | |
| 11 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 12 | + exit( 0 ); | |
| 13 | +} | |
| 14 | + | |
| 10 | 15 | /** |
| 11 | 16 | * Base class for sharing sources. |
| 12 | 17 | * See individual sharing classes below for the implementation of this class. |
| 13 | 18 | */ |
| @@ -26,8 +31,15 @@ | ||
| 26 | 31 | */ |
| 27 | 32 | public $smart; |
| 28 | 33 | |
| 29 | 34 | /** |
| 35 | + * Service short name. | |
| 36 | + * | |
| 37 | + * @var string | |
| 38 | + */ | |
| 39 | + public $shortname; | |
| 40 | + | |
| 41 | + /** | |
| 30 | 42 | * Should the sharing link open in a new tab. |
| 31 | 43 | * |
| 32 | 44 | * @var bool |
| 33 | 45 | */ |
| @@ -35,9 +47,9 @@ | ||
| 35 | 47 | |
| 36 | 48 | /** |
| 37 | 49 | * Sharing unique ID. |
| 38 | 50 | * |
| 39 | - * @var int | |
| 51 | + * @var string | |
| 40 | 52 | */ |
| 41 | 53 | protected $id; |
| 42 | 54 | |
| 43 | 55 | /** |
| @@ -42,10 +54,10 @@ | ||
| 42 | 54 | |
| 43 | 55 | /** |
| 44 | 56 | * Constructor. |
| 45 | 57 | * |
| 46 | - * @param int $id Sharing source ID. | |
| 47 | - * @param array $settings Sharing settings. | |
| 58 | + * @param string $id Sharing source ID. | |
| 59 | + * @param array $settings Sharing settings. | |
| 48 | 60 | */ |
| 49 | 61 | public function __construct( $id, array $settings ) { |
| 50 | 62 | $this->id = $id; |
| 51 | 63 | /** |
| @@ -90,9 +102,9 @@ | ||
| 90 | 102 | |
| 91 | 103 | /** |
| 92 | 104 | * Get unique sharing ID. |
| 93 | 105 | * |
| 94 | - * @return int | |
| 106 | + * @return string | |
| 95 | 107 | */ |
| 96 | 108 | public function get_id() { |
| 97 | 109 | return $this->id; |
| 98 | 110 | } |
| @@ -99,9 +111,9 @@ | ||
| 99 | 111 | |
| 100 | 112 | /** |
| 101 | 113 | * Get unique sharing ID. Similar to get_id(). |
| 102 | 114 | * |
| 103 | - * @return int | |
| 115 | + * @return string | |
| 104 | 116 | */ |
| 105 | 117 | public function get_class() { |
| 106 | 118 | return $this->id; |
| 107 | 119 | } |
| @@ -147,9 +159,9 @@ | ||
| 147 | 159 | * @param string $post->post_title Post Title. |
| 148 | 160 | * @param int $post_id Post ID. |
| 149 | 161 | * @param int $this->id Sharing ID. |
| 150 | 162 | */ |
| 151 | - $title = apply_filters( 'sharing_title', $post->post_title, $post_id, $this->id ); | |
| 163 | + $title = apply_filters( 'sharing_title', $post->post_title ?? '', $post_id, $this->id ); | |
| 152 | 164 | |
| 153 | 165 | return html_entity_decode( wp_kses( $title, '' ), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ); |
| 154 | 166 | } |
| 155 | 167 | |
| @@ -206,9 +218,9 @@ | ||
| 206 | 218 | * Get the HTML markup to display a sharing link. |
| 207 | 219 | * |
| 208 | 220 | * @param string $url Post URL to share. |
| 209 | 221 | * @param string $text Sharing display text. |
| 210 | - * @param string $title The title for the link. | |
| 222 | + * @param string $accessible_name Accessible name for the link. | |
| 211 | 223 | * @param string $query Additional query arguments to add to the link. They should be in 'foo=bar&baz=1' format. |
| 212 | 224 | * @param bool|string $id Sharing ID to include in the data-shared attribute. |
| 213 | 225 | * @param array $data_attributes The keys are used as additional attribute names with 'data-' prefix. |
| 214 | 226 | * The values are used as the attribute values. |
| @@ -214,9 +226,9 @@ | ||
| 214 | 226 | * The values are used as the attribute values. |
| 215 | 227 | * |
| 216 | 228 | * @return string The HTML for the link. |
| 217 | 229 | */ |
| 218 | - public function get_link( $url, $text, $title, $query = '', $id = false, $data_attributes = array() ) { | |
| 230 | + public function get_link( $url, $text, $accessible_name = '', $query = '', $id = false, $data_attributes = array() ) { | |
| 219 | 231 | $args = func_get_args(); |
| 220 | 232 | $klasses = array( 'share-' . $this->get_class(), 'sd-button' ); |
| 221 | 233 | |
| 222 | 234 | if ( 'icon' === $this->button_style || 'icon-text' === $this->button_style ) { |
| @@ -223,14 +235,13 @@ | ||
| 223 | 235 | $klasses[] = 'share-icon'; |
| 224 | 236 | } |
| 225 | 237 | |
| 226 | 238 | if ( 'icon' === $this->button_style ) { |
| 227 | - $text = $title; | |
| 228 | 239 | $klasses[] = 'no-text'; |
| 240 | + } | |
| 229 | 241 | |
| 230 | - if ( true === $this->open_link_in_new ) { | |
| 231 | - $text .= __( ' (Opens in new window)', 'jetpack' ); | |
| 232 | - } | |
| 242 | + if ( true === $this->open_link_in_new ) { | |
| 243 | + $accessible_name .= __( ' (Opens in new window)', 'jetpack' ); | |
| 233 | 244 | } |
| 234 | 245 | |
| 235 | 246 | /** |
| 236 | 247 | * Filter the sharing display ID. |
| @@ -291,8 +302,9 @@ | ||
| 291 | 302 | $url .= '&' . $query; |
| 292 | 303 | } |
| 293 | 304 | } |
| 294 | 305 | |
| 306 | + // @phan-suppress-next-line PhanSuspiciousValueComparison | |
| 295 | 307 | if ( 'text' === $this->button_style ) { |
| 296 | 308 | $klasses[] = 'no-icon'; |
| 297 | 309 | } |
| 298 | 310 | |
| @@ -314,8 +326,9 @@ | ||
| 314 | 326 | * |
| 315 | 327 | * @module sharedaddy |
| 316 | 328 | * |
| 317 | 329 | * @since 3.4.0 |
| 330 | + * @deprecated 14.6 Use jetpack_sharing_accessible_name instead. | |
| 318 | 331 | * |
| 319 | 332 | * @param string $title Sharing service title. |
| 320 | 333 | * @param object $this Sharing service properties. |
| 321 | 334 | * @param string|false $id Sharing ID. |
| @@ -320,10 +333,24 @@ | ||
| 320 | 333 | * @param object $this Sharing service properties. |
| 321 | 334 | * @param string|false $id Sharing ID. |
| 322 | 335 | * @param array $args Array of sharing service options. |
| 323 | 336 | */ |
| 324 | - $title = apply_filters( 'jetpack_sharing_display_title', $title, $this, $id, $args ); | |
| 337 | + $accessible_name = apply_filters_deprecated( 'jetpack_sharing_display_title', array( $accessible_name, $this, $id, $args ), '14.6', 'jetpack_sharing_accessible_name' ); | |
| 338 | + | |
| 325 | 339 | /** |
| 340 | + * Filter the sharing accessible name. | |
| 341 | + * | |
| 342 | + * @module sharedaddy | |
| 343 | + * | |
| 344 | + * @since 14.6 | |
| 345 | + * | |
| 346 | + * @param string $accessible_name Sharing service accessible name. | |
| 347 | + * @param object $this Sharing service properties. | |
| 348 | + * @param string|false $id Sharing ID. | |
| 349 | + * @param array $args Array of sharing service options. | |
| 350 | + */ | |
| 351 | + $accessible_name = apply_filters( 'jetpack_sharing_accessible_name', $accessible_name, $this, $id, $args ); | |
| 352 | + /** | |
| 326 | 353 | * Filter the sharing display text. |
| 327 | 354 | * |
| 328 | 355 | * @module sharedaddy |
| 329 | 356 | * |
| @@ -350,13 +377,21 @@ | ||
| 350 | 377 | * @param array $args Array of sharing service options. |
| 351 | 378 | */ |
| 352 | 379 | $data_attributes = apply_filters( 'jetpack_sharing_data_attributes', (array) $data_attributes, $this, $id, $args ); |
| 353 | 380 | |
| 381 | + $id_attr = $id ? esc_attr( $id ) : ''; | |
| 354 | 382 | $encoded_data_attributes = ''; |
| 355 | 383 | if ( ! empty( $data_attributes ) ) { |
| 384 | + // Check for aria-labelledby first, and separate this out. | |
| 385 | + if ( isset( $data_attributes['aria-labelledby'] ) ) { | |
| 386 | + $id_attr = $data_attributes['aria-labelledby']; | |
| 387 | + unset( $data_attributes['aria-labelledby'] ); | |
| 388 | + } | |
| 389 | + | |
| 356 | 390 | $encoded_data_attributes = implode( |
| 357 | 391 | ' ', |
| 358 | 392 | array_map( |
| 393 | + /** Filter for formatting attributes */ | |
| 359 | 394 | function ( $data_key, $data_value ) { |
| 360 | 395 | return sprintf( |
| 361 | 396 | 'data-%s="%s"', |
| 362 | 397 | esc_attr( str_replace( array( ' ', '"' ), '', $data_key ) ), |
| @@ -368,19 +403,34 @@ | ||
| 368 | 403 | ) |
| 369 | 404 | ); |
| 370 | 405 | } |
| 371 | 406 | |
| 407 | + $rel_attr = ( true === $this->open_link_in_new ) ? 'noopener noreferrer' : ''; | |
| 408 | + $target_attr = ( true === $this->open_link_in_new ) ? 'target="_blank"' : ''; | |
| 409 | + | |
| 410 | + $classes = implode( ' ', $klasses ); | |
| 411 | + | |
| 372 | 412 | return sprintf( |
| 373 | - '<a rel="nofollow%s" data-shared="%s" class="%s" href="%s"%s title="%s" %s><span%s>%s</span></a>', | |
| 374 | - ( true === $this->open_link_in_new ) ? ' noopener noreferrer' : '', | |
| 375 | - ( $id ? esc_attr( $id ) : '' ), | |
| 376 | - implode( ' ', $klasses ), | |
| 377 | - $url, | |
| 378 | - ( true === $this->open_link_in_new ) ? ' target="_blank"' : '', | |
| 379 | - $title, | |
| 413 | + '<a rel="nofollow %s" | |
| 414 | + data-shared="%s" | |
| 415 | + class="%s" | |
| 416 | + href="%s" | |
| 417 | + %s | |
| 418 | + aria-labelledby="%s" | |
| 419 | + %s> | |
| 420 | + <span id="%s" hidden>%s</span> | |
| 421 | + <span>%s</span> | |
| 422 | + </a>', | |
| 423 | + $rel_attr, | |
| 424 | + $id_attr, | |
| 425 | + esc_attr( $classes ), | |
| 426 | + esc_url( $url ), | |
| 427 | + $target_attr, | |
| 428 | + $id_attr, | |
| 380 | 429 | $encoded_data_attributes, |
| 381 | - ( 'icon' === $this->button_style ) ? '></span><span class="sharing-screen-reader-text"' : '', | |
| 382 | - $text | |
| 430 | + $id_attr, | |
| 431 | + esc_html( $accessible_name ), | |
| 432 | + esc_html( $text ) | |
| 383 | 433 | ); |
| 384 | 434 | } |
| 385 | 435 | |
| 386 | 436 | /** |
| @@ -458,9 +508,9 @@ | ||
| 458 | 508 | protected function build_amp_markup( $attrs = array() ) { |
| 459 | 509 | |
| 460 | 510 | $title = sprintf( |
| 461 | 511 | /* translators: placeholder is a service name, such as "Twitter" or "Facebook". */ |
| 462 | - __( 'Click to share on %s', 'jetpack' ), | |
| 512 | + __( 'Share on %s', 'jetpack' ), | |
| 463 | 513 | $this->get_name() |
| 464 | 514 | ); |
| 465 | 515 | |
| 466 | 516 | $attrs = array_merge( |
| @@ -550,9 +600,9 @@ | ||
| 550 | 600 | */ |
| 551 | 601 | public function get_total( $post = false ) { |
| 552 | 602 | global $wpdb, $blog_id; |
| 553 | 603 | |
| 554 | - $name = strtolower( $this->get_id() ); | |
| 604 | + $name = strtolower( (string) $this->get_id() ); | |
| 555 | 605 | |
| 556 | 606 | if ( $post === false ) { |
| 557 | 607 | // get total number of shares for service |
| 558 | 608 | return (int) $wpdb->get_var( $wpdb->prepare( 'SELECT SUM( count ) FROM sharing_stats WHERE blog_id = %d AND share_service = %s', $blog_id, $name ) ); |
| @@ -570,9 +620,9 @@ | ||
| 570 | 620 | public function get_posts_total() { |
| 571 | 621 | global $wpdb, $blog_id; |
| 572 | 622 | |
| 573 | 623 | $totals = array(); |
| 574 | - $name = strtolower( $this->get_id() ); | |
| 624 | + $name = strtolower( (string) $this->get_id() ); | |
| 575 | 625 | |
| 576 | 626 | $my_data = $wpdb->get_results( $wpdb->prepare( 'SELECT post_id as id, SUM( count ) as total FROM sharing_stats WHERE blog_id = %d AND share_service = %s GROUP BY post_id ORDER BY count DESC ', $blog_id, $name ) ); |
| 577 | 627 | |
| 578 | 628 | if ( ! empty( $my_data ) ) { |
| @@ -616,8 +666,9 @@ | ||
| 616 | 666 | /** |
| 617 | 667 | * Redirect to an external social network site to finish sharing. |
| 618 | 668 | * |
| 619 | 669 | * @param string $url Sharing URL for a given service. |
| 670 | + * @return never | |
| 620 | 671 | */ |
| 621 | 672 | public function redirect_request( $url ) { |
| 622 | 673 | wp_redirect( $url ); // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect -- We allow external redirects here; we define them ourselves. |
| 623 | 674 | |
| @@ -622,14 +673,26 @@ | ||
| 622 | 673 | wp_redirect( $url ); // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect -- We allow external redirects here; we define them ourselves. |
| 623 | 674 | |
| 624 | 675 | // We set up this custom header to indicate to search engines not to index this page. |
| 625 | 676 | header( 'X-Robots-Tag: noindex, nofollow' ); |
| 626 | - die(); | |
| 677 | + die( 0 ); | |
| 627 | 678 | } |
| 628 | 679 | |
| 629 | 680 | /** |
| 630 | - * Add extra JavaScript to a sharing service. | |
| 681 | + * Register a sharing service's popup window features with the front-end script. | |
| 631 | 682 | * |
| 683 | + * Services that open their share link in a popup publish the window features | |
| 684 | + * they need in `window.WPCOM_sharing_popups`. A single delegated click handler | |
| 685 | + * in sharing.js reads them and opens the popup, so no per-service handler is | |
| 686 | + * emitted. | |
| 687 | + * | |
| 688 | + * $name has to be the same slug that appears in the share link's `share-<name>` | |
| 689 | + * class, since that class is all the handler has to look the features back up | |
| 690 | + * with. Every caller passes $this->shortname, which works because get_link() | |
| 691 | + * builds the class from get_class() and the built-in services register under | |
| 692 | + * the slug they declare as their shortname. Share_Custom is the exception: its | |
| 693 | + * class and shortname do not round-trip, but it does not register a popup. | |
| 694 | + * | |
| 632 | 695 | * @param string $name Sharing service name. |
| 633 | 696 | * @param array $params Array of sharing options. |
| 634 | 697 | * |
| 635 | 698 | * @return void |
| @@ -654,41 +717,13 @@ | ||
| 654 | 717 | |
| 655 | 718 | // Add JS after sharing-js has been enqueued. |
| 656 | 719 | wp_add_inline_script( |
| 657 | 720 | 'sharing-js', |
| 658 | - "var windowOpen; | |
| 659 | - ( function () { | |
| 660 | - function matches( el, sel ) { | |
| 661 | - return !! ( | |
| 662 | - el.matches && el.matches( sel ) || | |
| 663 | - el.msMatchesSelector && el.msMatchesSelector( sel ) | |
| 664 | - ); | |
| 665 | - } | |
| 666 | - | |
| 667 | - document.body.addEventListener( 'click', function ( event ) { | |
| 668 | - if ( ! event.target ) { | |
| 669 | - return; | |
| 670 | - } | |
| 671 | - | |
| 672 | - var el; | |
| 673 | - if ( matches( event.target, 'a.share-$name' ) ) { | |
| 674 | - el = event.target; | |
| 675 | - } else if ( event.target.parentNode && matches( event.target.parentNode, 'a.share-$name' ) ) { | |
| 676 | - el = event.target.parentNode; | |
| 677 | - } | |
| 678 | - | |
| 679 | - if ( el ) { | |
| 680 | - event.preventDefault(); | |
| 681 | - | |
| 682 | - // If there's another sharing window open, close it. | |
| 683 | - if ( typeof windowOpen !== 'undefined' ) { | |
| 684 | - windowOpen.close(); | |
| 685 | - } | |
| 686 | - windowOpen = window.open( el.getAttribute( 'href' ), 'wpcom$name', '$opts' ); | |
| 687 | - return false; | |
| 688 | - } | |
| 689 | - } ); | |
| 690 | - } )();" | |
| 721 | + sprintf( | |
| 722 | + "window.WPCOM_sharing_popups = window.WPCOM_sharing_popups || {};\nwindow.WPCOM_sharing_popups[ %s ] = %s;", | |
| 723 | + wp_json_encode( (string) $name, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ), | |
| 724 | + wp_json_encode( $opts, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ) | |
| 725 | + ) | |
| 691 | 726 | ); |
| 692 | 727 | } |
| 693 | 728 | } |
| 694 | 729 | |
| @@ -719,9 +754,9 @@ | ||
| 719 | 754 | |
| 720 | 755 | /** |
| 721 | 756 | * Sharing unique ID. |
| 722 | 757 | * |
| 723 | - * @var int | |
| 758 | + * @var string | |
| 724 | 759 | */ |
| 725 | 760 | protected $id; |
| 726 | 761 | |
| 727 | 762 | /** |
| @@ -733,10 +768,10 @@ | ||
| 733 | 768 | |
| 734 | 769 | /** |
| 735 | 770 | * Constructor. |
| 736 | 771 | * |
| 737 | - * @param int $id Sharing source ID. | |
| 738 | - * @param array $settings Sharing settings. | |
| 772 | + * @param string $id Sharing source ID. | |
| 773 | + * @param array $settings Sharing settings. | |
| 739 | 774 | */ |
| 740 | 775 | final public function __construct( $id, array $settings ) { |
| 741 | 776 | $this->id = $id; |
| 742 | 777 | |
| @@ -908,10 +943,10 @@ | ||
| 908 | 943 | |
| 909 | 944 | /** |
| 910 | 945 | * Constructor. |
| 911 | 946 | * |
| 912 | - * @param int $id Sharing source ID. | |
| 913 | - * @param array $settings Sharing settings. | |
| 947 | + * @param string $id Sharing source ID. | |
| 948 | + * @param array $settings Sharing settings. | |
| 914 | 949 | */ |
| 915 | 950 | public function __construct( $id, array $settings ) { |
| 916 | 951 | parent::__construct( $id, $settings ); |
| 917 | 952 | |
| @@ -950,9 +985,9 @@ | ||
| 950 | 985 | * |
| 951 | 986 | * @param WP_Post $post Post object. |
| 952 | 987 | * @param array $post_data Array of information about the post we're sharing. |
| 953 | 988 | * |
| 954 | - * @return void | |
| 989 | + * @return never | |
| 955 | 990 | */ |
| 956 | 991 | public function process_request( $post, array $post_data ) { |
| 957 | 992 | $is_ajax = false; |
| 958 | 993 | if ( |
| @@ -972,15 +1007,14 @@ | ||
| 972 | 1007 | parent::process_request( $post, $post_data ); |
| 973 | 1008 | } |
| 974 | 1009 | |
| 975 | 1010 | if ( $is_ajax ) { |
| 976 | - wp_send_json_success(); | |
| 1011 | + // @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- It takes null, but its phpdoc only says int. | |
| 1012 | + wp_send_json_success( null, null, JSON_UNESCAPED_SLASHES ); | |
| 977 | 1013 | } else { |
| 978 | 1014 | wp_safe_redirect( get_permalink( $post->ID ) . '?shared=email&msg=fail' ); |
| 979 | - exit; | |
| 1015 | + exit( 0 ); | |
| 980 | 1016 | } |
| 981 | - | |
| 982 | - wp_die(); | |
| 983 | 1017 | } |
| 984 | 1018 | |
| 985 | 1019 | /** |
| 986 | 1020 | * Get the markup of the sharing button. |
| @@ -1005,8 +1039,9 @@ | ||
| 1005 | 1039 | 'jetpack' |
| 1006 | 1040 | ), |
| 1007 | 1041 | 'email-share-nonce' => wp_create_nonce( $this->get_email_share_nonce_action( $post ) ), |
| 1008 | 1042 | 'email-share-track-url' => $tracking_url, |
| 1043 | + 'aria-labelledby' => 'sharing-email-' . $post->ID, | |
| 1009 | 1044 | ); |
| 1010 | 1045 | |
| 1011 | 1046 | $post_title = $this->get_share_title( $post->ID ); |
| 1012 | 1047 | $post_url = $this->get_share_url( $post->ID ); |
| @@ -1025,9 +1060,9 @@ | ||
| 1025 | 1060 | |
| 1026 | 1061 | return $this->get_link( |
| 1027 | 1062 | 'mailto:', |
| 1028 | 1063 | _x( 'Email', 'share to', 'jetpack' ), |
| 1029 | - __( 'Click to email a link to a friend', 'jetpack' ), | |
| 1064 | + __( 'Email a link to a friend', 'jetpack' ), | |
| 1030 | 1065 | $mailto_query, |
| 1031 | 1066 | false, |
| 1032 | 1067 | $data_attributes |
| 1033 | 1068 | ); |
| @@ -1048,9 +1083,10 @@ | ||
| 1048 | 1083 | } |
| 1049 | 1084 | } |
| 1050 | 1085 | |
| 1051 | 1086 | /** |
| 1052 | - * Twitter sharing button. | |
| 1087 | + * Legacy Twitter sharing button. | |
| 1088 | + * Share_X is the new Twitter sharing button. | |
| 1053 | 1089 | */ |
| 1054 | 1090 | class Share_Twitter extends Sharing_Source { |
| 1055 | 1091 | /** |
| 1056 | 1092 | * Service short name. |
| @@ -1063,9 +1099,9 @@ | ||
| 1063 | 1099 | * Service icon font code. |
| 1064 | 1100 | * |
| 1065 | 1101 | * @var string |
| 1066 | 1102 | */ |
| 1067 | - public $icon = '\f202'; | |
| 1103 | + public $icon = '\f10e'; | |
| 1068 | 1104 | |
| 1069 | 1105 | /** |
| 1070 | 1106 | * Length of a URL on Twitter. |
| 1071 | 1107 | * 'https://dev.twitter.com/rest/reference/get/help/configuration' |
| @@ -1077,10 +1113,10 @@ | ||
| 1077 | 1113 | |
| 1078 | 1114 | /** |
| 1079 | 1115 | * Constructor. |
| 1080 | 1116 | * |
| 1081 | - * @param int $id Sharing source ID. | |
| 1082 | - * @param array $settings Sharing settings. | |
| 1117 | + * @param string $id Sharing source ID. | |
| 1118 | + * @param array $settings Sharing settings. | |
| 1083 | 1119 | */ |
| 1084 | 1120 | public function __construct( $id, array $settings ) { |
| 1085 | 1121 | parent::__construct( $id, $settings ); |
| 1086 | 1122 | |
| @@ -1096,9 +1132,9 @@ | ||
| 1096 | 1132 | * |
| 1097 | 1133 | * @return string |
| 1098 | 1134 | */ |
| 1099 | 1135 | public function get_name() { |
| 1100 | - return __( 'Twitter', 'jetpack' ); | |
| 1136 | + return __( 'X', 'jetpack' ); | |
| 1101 | 1137 | } |
| 1102 | 1138 | |
| 1103 | 1139 | /** |
| 1104 | 1140 | * Determine the Twitter 'via' value for a post. |
| @@ -1235,9 +1271,9 @@ | ||
| 1235 | 1271 | apply_filters( 'jetpack_register_post_for_share_counts', true, $post->ID, 'twitter' ) |
| 1236 | 1272 | ) { |
| 1237 | 1273 | sharing_register_post_for_share_counts( $post->ID ); |
| 1238 | 1274 | } |
| 1239 | - return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Twitter', 'share to', 'jetpack' ), __( 'Click to share on Twitter', 'jetpack' ), 'share=twitter', 'sharing-twitter-' . $post->ID ); | |
| 1275 | + return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'X', 'share to', 'jetpack' ), __( 'Share on X', 'jetpack' ), 'share=twitter', 'sharing-twitter-' . $post->ID ); | |
| 1240 | 1276 | } |
| 1241 | 1277 | } |
| 1242 | 1278 | |
| 1243 | 1279 | /** |
| @@ -1287,9 +1323,9 @@ | ||
| 1287 | 1323 | |
| 1288 | 1324 | $url = $post_link; |
| 1289 | 1325 | $twitter_url = add_query_arg( |
| 1290 | 1326 | rawurlencode_deep( array_filter( compact( 'via', 'related', 'text', 'url' ) ) ), |
| 1291 | - 'https://twitter.com/intent/tweet' | |
| 1327 | + 'https://x.com/intent/tweet' | |
| 1292 | 1328 | ); |
| 1293 | 1329 | |
| 1294 | 1330 | parent::redirect_request( $twitter_url ); |
| 1295 | 1331 | } |
| @@ -1348,10 +1384,10 @@ | ||
| 1348 | 1384 | |
| 1349 | 1385 | /** |
| 1350 | 1386 | * Constructor. |
| 1351 | 1387 | * |
| 1352 | - * @param int $id Sharing source ID. | |
| 1353 | - * @param array $settings Sharing settings. | |
| 1388 | + * @param string $id Sharing source ID. | |
| 1389 | + * @param array $settings Sharing settings. | |
| 1354 | 1390 | */ |
| 1355 | 1391 | public function __construct( $id, array $settings ) { |
| 1356 | 1392 | parent::__construct( $id, $settings ); |
| 1357 | 1393 | |
| @@ -1414,9 +1450,9 @@ | ||
| 1414 | 1450 | } |
| 1415 | 1451 | return $this->get_link( |
| 1416 | 1452 | $this->get_process_request_url( $post->ID ), |
| 1417 | 1453 | _x( 'X', 'share to', 'jetpack' ), |
| 1418 | - __( 'Click to share on X', 'jetpack' ), | |
| 1454 | + __( 'Share on X', 'jetpack' ), | |
| 1419 | 1455 | 'share=x', |
| 1420 | 1456 | 'sharing-x-' . $post->ID |
| 1421 | 1457 | ); |
| 1422 | 1458 | } |
| @@ -1595,10 +1631,11 @@ | ||
| 1595 | 1631 | public function get_display( $post ) { |
| 1596 | 1632 | return $this->get_link( |
| 1597 | 1633 | $this->get_process_request_url( $post->ID ), |
| 1598 | 1634 | _x( 'Reddit', 'share to', 'jetpack' ), |
| 1599 | - __( 'Click to share on Reddit', 'jetpack' ), | |
| 1600 | - 'share=reddit' | |
| 1635 | + __( 'Share on Reddit', 'jetpack' ), | |
| 1636 | + 'share=reddit', | |
| 1637 | + 'sharing-reddit-' . $post->ID | |
| 1601 | 1638 | ); |
| 1602 | 1639 | } |
| 1603 | 1640 | |
| 1604 | 1641 | /** |
| @@ -1652,10 +1689,10 @@ | ||
| 1652 | 1689 | |
| 1653 | 1690 | /** |
| 1654 | 1691 | * Constructor. |
| 1655 | 1692 | * |
| 1656 | - * @param int $id Sharing source ID. | |
| 1657 | - * @param array $settings Sharing settings. | |
| 1693 | + * @param string $id Sharing source ID. | |
| 1694 | + * @param array $settings Sharing settings. | |
| 1658 | 1695 | */ |
| 1659 | 1696 | public function __construct( $id, array $settings ) { |
| 1660 | 1697 | parent::__construct( $id, $settings ); |
| 1661 | 1698 | |
| @@ -1697,9 +1734,9 @@ | ||
| 1697 | 1734 | if ( $this->smart ) { |
| 1698 | 1735 | $share_url = $this->get_share_url( $post->ID ); |
| 1699 | 1736 | $display .= sprintf( '<div class="linkedin_button"><script type="in/share" data-url="%s" data-counter="right"></script></div>', esc_url( $share_url ) ); |
| 1700 | 1737 | } else { |
| 1701 | - $display = $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'LinkedIn', 'share to', 'jetpack' ), __( 'Click to share on LinkedIn', 'jetpack' ), 'share=linkedin', 'sharing-linkedin-' . $post->ID ); | |
| 1738 | + $display = $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'LinkedIn', 'share to', 'jetpack' ), __( 'Share on LinkedIn', 'jetpack' ), 'share=linkedin', 'sharing-linkedin-' . $post->ID ); | |
| 1702 | 1739 | } |
| 1703 | 1740 | |
| 1704 | 1741 | /** This filter is already documented in modules/sharedaddy/sharing-sources.php */ |
| 1705 | 1742 | if ( apply_filters( 'jetpack_register_post_for_share_counts', true, $post->ID, 'linkedin' ) ) { |
| @@ -1720,15 +1757,13 @@ | ||
| 1720 | 1757 | public function process_request( $post, array $post_data ) { |
| 1721 | 1758 | |
| 1722 | 1759 | $post_link = $this->get_share_url( $post->ID ); |
| 1723 | 1760 | |
| 1724 | - // Using the same URL as the official button, which is *not* LinkedIn's documented sharing link | |
| 1725 | - // https://www.linkedin.com/cws/share?url={url}&token=&isFramed=false | |
| 1726 | 1761 | $linkedin_url = add_query_arg( |
| 1727 | 1762 | array( |
| 1728 | 1763 | 'url' => rawurlencode( $post_link ), |
| 1729 | 1764 | ), |
| 1730 | - 'https://www.linkedin.com/cws/share?token=&isFramed=false' | |
| 1765 | + 'https://www.linkedin.com/sharing/share-offsite/' | |
| 1731 | 1766 | ); |
| 1732 | 1767 | |
| 1733 | 1768 | // Record stats |
| 1734 | 1769 | parent::process_request( $post, $post_data ); |
| @@ -1817,10 +1852,10 @@ | ||
| 1817 | 1852 | |
| 1818 | 1853 | /** |
| 1819 | 1854 | * Constructor. |
| 1820 | 1855 | * |
| 1821 | - * @param int $id Sharing source ID. | |
| 1822 | - * @param array $settings Sharing settings. | |
| 1856 | + * @param string $id Sharing source ID. | |
| 1857 | + * @param array $settings Sharing settings. | |
| 1823 | 1858 | */ |
| 1824 | 1859 | public function __construct( $id, array $settings ) { |
| 1825 | 1860 | parent::__construct( $id, $settings ); |
| 1826 | 1861 | |
| @@ -1924,9 +1959,9 @@ | ||
| 1924 | 1959 | /** This filter is already documented in modules/sharedaddy/sharing-sources.php */ |
| 1925 | 1960 | if ( apply_filters( 'jetpack_register_post_for_share_counts', true, $post->ID, 'facebook' ) ) { |
| 1926 | 1961 | sharing_register_post_for_share_counts( $post->ID ); |
| 1927 | 1962 | } |
| 1928 | - return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Facebook', 'share to', 'jetpack' ), __( 'Click to share on Facebook', 'jetpack' ), 'share=facebook', 'sharing-facebook-' . $post->ID ); | |
| 1963 | + return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Facebook', 'share to', 'jetpack' ), __( 'Share on Facebook', 'jetpack' ), 'share=facebook', 'sharing-facebook-' . $post->ID ); | |
| 1929 | 1964 | } |
| 1930 | 1965 | |
| 1931 | 1966 | /** |
| 1932 | 1967 | * AMP display for Facebook. |
| @@ -1950,9 +1985,9 @@ | ||
| 1950 | 1985 | * |
| 1951 | 1986 | * @return void |
| 1952 | 1987 | */ |
| 1953 | 1988 | public function process_request( $post, array $post_data ) { |
| 1954 | - $fb_url = $this->http() . '://www.facebook.com/sharer.php?u=' . rawurlencode( $this->get_share_url( $post->ID ) ) . '&t=' . rawurlencode( $this->get_share_title( $post->ID ) ); | |
| 1989 | + $fb_url = 'https://www.facebook.com/sharer/sharer.php?u=' . rawurlencode( $this->get_share_url( $post->ID ) ) . '&t=' . rawurlencode( $this->get_share_title( $post->ID ) ); | |
| 1955 | 1990 | |
| 1956 | 1991 | // Record stats |
| 1957 | 1992 | parent::process_request( $post, $post_data ); |
| 1958 | 1993 | |
| @@ -2017,10 +2052,10 @@ | ||
| 2017 | 2052 | |
| 2018 | 2053 | /** |
| 2019 | 2054 | * Constructor. |
| 2020 | 2055 | * |
| 2021 | - * @param int $id Sharing source ID. | |
| 2022 | - * @param array $settings Sharing settings. | |
| 2056 | + * @param string $id Sharing source ID. | |
| 2057 | + * @param array $settings Sharing settings. | |
| 2023 | 2058 | */ |
| 2024 | 2059 | public function __construct( $id, array $settings ) { |
| 2025 | 2060 | parent::__construct( $id, $settings ); |
| 2026 | 2061 | |
| @@ -2047,9 +2082,9 @@ | ||
| 2047 | 2082 | * |
| 2048 | 2083 | * @return string |
| 2049 | 2084 | */ |
| 2050 | 2085 | public function get_display( $post ) { |
| 2051 | - return $this->get_link( $this->get_process_request_url( $post->ID ) . ( ( is_single() || is_page() ) ? '#print' : '' ), _x( 'Print', 'share to', 'jetpack' ), __( 'Click to print', 'jetpack' ) ); | |
| 2086 | + return $this->get_link( $this->get_process_request_url( $post->ID ) . ( ( is_single() || is_page() ) ? '#print' : '' ), _x( 'Print', 'share to', 'jetpack' ), __( 'Print', 'jetpack' ), 'share=print', 'sharing-print-' . $post->ID ); | |
| 2052 | 2087 | } |
| 2053 | 2088 | |
| 2054 | 2089 | /** |
| 2055 | 2090 | * AMP display for Print. |
| @@ -2085,10 +2120,10 @@ | ||
| 2085 | 2120 | |
| 2086 | 2121 | /** |
| 2087 | 2122 | * Constructor. |
| 2088 | 2123 | * |
| 2089 | - * @param int $id Sharing source ID. | |
| 2090 | - * @param array $settings Sharing settings. | |
| 2124 | + * @param string $id Sharing source ID. | |
| 2125 | + * @param array $settings Sharing settings. | |
| 2091 | 2126 | */ |
| 2092 | 2127 | public function __construct( $id, array $settings ) { |
| 2093 | 2128 | parent::__construct( $id, $settings ); |
| 2094 | 2129 | |
| @@ -2138,9 +2173,9 @@ | ||
| 2138 | 2173 | } |
| 2139 | 2174 | |
| 2140 | 2175 | if ( empty( $blogs ) ) { |
| 2141 | 2176 | wp_safe_redirect( get_permalink( $post->ID ) ); |
| 2142 | - die(); | |
| 2177 | + die( 0 ); | |
| 2143 | 2178 | } |
| 2144 | 2179 | |
| 2145 | 2180 | $blog = current( $blogs ); |
| 2146 | 2181 | |
| @@ -2167,9 +2202,9 @@ | ||
| 2167 | 2202 | * |
| 2168 | 2203 | * @return string |
| 2169 | 2204 | */ |
| 2170 | 2205 | public function get_display( $post ) { |
| 2171 | - return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Press This', 'share to', 'jetpack' ), __( 'Click to Press This!', 'jetpack' ), 'share=press-this' ); | |
| 2206 | + return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Press This', 'share to', 'jetpack' ), __( 'Press This!', 'jetpack' ), 'share=press-this', 'sharing-press-this-' . $post->ID ); | |
| 2172 | 2207 | } |
| 2173 | 2208 | |
| 2174 | 2209 | /** |
| 2175 | 2210 | * No AMP display for PressThis. |
| @@ -2231,10 +2266,10 @@ | ||
| 2231 | 2266 | |
| 2232 | 2267 | /** |
| 2233 | 2268 | * Constructor. |
| 2234 | 2269 | * |
| 2235 | - * @param int $id Sharing source ID. | |
| 2236 | - * @param array $settings Sharing settings. | |
| 2270 | + * @param string $id Sharing source ID. | |
| 2271 | + * @param array $settings Sharing settings. | |
| 2237 | 2272 | */ |
| 2238 | 2273 | public function __construct( $id, array $settings ) { |
| 2239 | 2274 | parent::__construct( $id, $settings ); |
| 2240 | 2275 | |
| @@ -2286,14 +2321,18 @@ | ||
| 2286 | 2321 | $this->get_process_request_url( $post->ID ), |
| 2287 | 2322 | esc_html( $this->name ), |
| 2288 | 2323 | sprintf( |
| 2289 | 2324 | /* Translators: placeholder is the name of a social network. */ |
| 2290 | - __( 'Click to share on %s', 'jetpack' ), | |
| 2325 | + __( 'Share on %s', 'jetpack' ), | |
| 2291 | 2326 | esc_attr( $this->name ) |
| 2292 | 2327 | ), |
| 2293 | - 'share=' . $this->id | |
| 2328 | + 'share=' . $this->id, | |
| 2329 | + 'sharing-custom-' . $post->ID | |
| 2294 | 2330 | ); |
| 2295 | - return str_replace( '<span>', '<span style="' . esc_attr( 'background-image:url("' . addcslashes( esc_url_raw( $this->icon ), '"' ) . '");' ) . '">', $str ); | |
| 2331 | + | |
| 2332 | + $style = 'background-image:url("' . addcslashes( esc_url_raw( $this->icon ), '"' ) . '");'; | |
| 2333 | + $class = ( 'icon' === $this->button_style ) ? ' class="custom-sharing-span"' : ''; | |
| 2334 | + return str_replace( '<span>', '<span' . $class . ' style="' . esc_attr( $style ) . '">', $str ); | |
| 2296 | 2335 | } |
| 2297 | 2336 | |
| 2298 | 2337 | /** |
| 2299 | 2338 | * No AMP display for custom elements. |
| @@ -2313,9 +2352,9 @@ | ||
| 2313 | 2352 | * @return void |
| 2314 | 2353 | */ |
| 2315 | 2354 | public function process_request( $post, array $post_data ) { |
| 2316 | 2355 | $url = str_replace( '&', '&', $this->url ); |
| 2317 | - $url = str_replace( '%post_id%', rawurlencode( $post->ID ), $url ); | |
| 2356 | + $url = str_replace( '%post_id%', rawurlencode( (string) $post->ID ), $url ); | |
| 2318 | 2357 | $url = str_replace( '%post_url%', rawurlencode( $this->get_share_url( $post->ID ) ), $url ); |
| 2319 | 2358 | $url = str_replace( '%post_full_url%', rawurlencode( get_permalink( $post->ID ) ), $url ); |
| 2320 | 2359 | $url = str_replace( '%post_title%', rawurlencode( $this->get_share_title( $post->ID ) ), $url ); |
| 2321 | 2360 | $url = str_replace( '%home_url%', rawurlencode( home_url() ), $url ); |
| @@ -2500,10 +2539,10 @@ | ||
| 2500 | 2539 | |
| 2501 | 2540 | /** |
| 2502 | 2541 | * Constructor. |
| 2503 | 2542 | * |
| 2504 | - * @param int $id Sharing source ID. | |
| 2505 | - * @param array $settings Sharing settings. | |
| 2543 | + * @param string $id Sharing source ID. | |
| 2544 | + * @param array $settings Sharing settings. | |
| 2506 | 2545 | */ |
| 2507 | 2546 | public function __construct( $id, array $settings ) { |
| 2508 | 2547 | parent::__construct( $id, $settings ); |
| 2509 | 2548 | if ( 'official' === $this->button_style ) { |
| @@ -2542,9 +2581,9 @@ | ||
| 2542 | 2581 | * If we are not looking at a single post, content from other posts can appear on the page and Tumblr will pick that up. |
| 2543 | 2582 | * In this case, we want Tumblr to focus on our current post, so we will limit the post type to link, where we can give Tumblr a link to our post. |
| 2544 | 2583 | */ |
| 2545 | 2584 | if ( ! is_single() ) { |
| 2546 | - $posttype = 'data-posttype="link"'; | |
| 2585 | + $posttype = ' data-posttype="link"'; // Leading space separates it from the preceding title attribute. | |
| 2547 | 2586 | } else { |
| 2548 | 2587 | $posttype = ''; |
| 2549 | 2588 | } |
| 2550 | 2589 | |
| @@ -2549,18 +2588,19 @@ | ||
| 2549 | 2588 | } |
| 2550 | 2589 | |
| 2551 | 2590 | // Documentation: https://www.tumblr.com/docs/en/share_button |
| 2552 | 2591 | return sprintf( |
| 2553 | - '<a class="tumblr-share-button" target="%1$s" href="%2$s" data-title="%3$s" data-content="%4$s" title="%5$s"%6$s>%5$s</a>', | |
| 2592 | + '<a class="tumblr-share-button" target="%1$s" href="%2$s" data-title="%3$s" data-content="%4$s" title="%5$s"%6$s>%7$s</a>', | |
| 2554 | 2593 | $target, |
| 2555 | 2594 | 'https://www.tumblr.com/share', |
| 2556 | - $this->get_share_title( $post->ID ), | |
| 2557 | - $this->get_share_url( $post->ID ), | |
| 2558 | - __( 'Share on Tumblr', 'jetpack' ), | |
| 2559 | - $posttype | |
| 2595 | + esc_attr( $this->get_share_title( $post->ID ) ), | |
| 2596 | + esc_url( $this->get_share_url( $post->ID ) ), | |
| 2597 | + esc_attr__( 'Share on Tumblr', 'jetpack' ), | |
| 2598 | + $posttype, | |
| 2599 | + esc_html__( 'Share on Tumblr', 'jetpack' ) | |
| 2560 | 2600 | ); |
| 2561 | 2601 | } else { |
| 2562 | - return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Tumblr', 'share to', 'jetpack' ), __( 'Click to share on Tumblr', 'jetpack' ), 'share=tumblr' ); | |
| 2602 | + return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Tumblr', 'share to', 'jetpack' ), __( 'Share on Tumblr', 'jetpack' ), 'share=tumblr', 'sharing-tumblr-' . $post->ID ); | |
| 2563 | 2603 | } |
| 2564 | 2604 | } |
| 2565 | 2605 | |
| 2566 | 2606 | /** |
| @@ -2623,10 +2663,10 @@ | ||
| 2623 | 2663 | |
| 2624 | 2664 | /** |
| 2625 | 2665 | * Constructor. |
| 2626 | 2666 | * |
| 2627 | - * @param int $id Sharing source ID. | |
| 2628 | - * @param array $settings Sharing settings. | |
| 2667 | + * @param string $id Sharing source ID. | |
| 2668 | + * @param array $settings Sharing settings. | |
| 2629 | 2669 | */ |
| 2630 | 2670 | public function __construct( $id, array $settings ) { |
| 2631 | 2671 | parent::__construct( $id, $settings ); |
| 2632 | 2672 | if ( 'official' === $this->button_style ) { |
| @@ -2652,13 +2692,11 @@ | ||
| 2652 | 2692 | * |
| 2653 | 2693 | * @return string |
| 2654 | 2694 | */ |
| 2655 | 2695 | public function get_image( $post ) { |
| 2656 | - if ( class_exists( 'Jetpack_PostImages' ) ) { | |
| 2657 | - $image = Jetpack_PostImages::get_image( $post->ID, array( 'fallback_to_avatars' => true ) ); | |
| 2658 | - if ( ! empty( $image ) ) { | |
| 2659 | - return $image['src']; | |
| 2660 | - } | |
| 2696 | + $image = Images::get_image( $post->ID, array( 'fallback_to_avatars' => true ) ); | |
| 2697 | + if ( ! empty( $image ) ) { | |
| 2698 | + return $image['src']; | |
| 2661 | 2699 | } |
| 2662 | 2700 | |
| 2663 | 2701 | /** |
| 2664 | 2702 | * Filters the default image used by the Pinterest Pin It share button. |
| @@ -2679,9 +2717,9 @@ | ||
| 2679 | 2717 | * |
| 2680 | 2718 | * @return string |
| 2681 | 2719 | */ |
| 2682 | 2720 | public function get_external_url( $post ) { |
| 2683 | - $url = 'https://www.pinterest.com/pin/create/button/?url=' . rawurlencode( $this->get_share_url( $post->ID ) ) . '&media=' . rawurlencode( $this->get_image( $post ) ) . '&description=' . rawurlencode( $post->post_title ); | |
| 2721 | + $url = 'https://www.pinterest.com/pin/create/link/?url=' . rawurlencode( $this->get_share_url( $post->ID ) ) . '&media=' . rawurlencode( $this->get_image( $post ) ) . '&description=' . rawurlencode( $post->post_title ); | |
| 2684 | 2722 | |
| 2685 | 2723 | /** |
| 2686 | 2724 | * Filters the Pinterest share URL used in sharing button output. |
| 2687 | 2725 | * |
| @@ -2730,9 +2768,9 @@ | ||
| 2730 | 2768 | esc_url( $this->get_external_url( $post ) ), |
| 2731 | 2769 | esc_attr( $this->get_widget_type() ) |
| 2732 | 2770 | ); |
| 2733 | 2771 | } else { |
| 2734 | - $display = $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Pinterest', 'share to', 'jetpack' ), __( 'Click to share on Pinterest', 'jetpack' ), 'share=pinterest', 'sharing-pinterest-' . $post->ID ); | |
| 2772 | + $display = $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Pinterest', 'share to', 'jetpack' ), __( 'Share on Pinterest', 'jetpack' ), 'share=pinterest', 'sharing-pinterest-' . $post->ID ); | |
| 2735 | 2773 | } |
| 2736 | 2774 | |
| 2737 | 2775 | /** This filter is already documented in modules/sharedaddy/sharing-sources.php */ |
| 2738 | 2776 | if ( apply_filters( 'jetpack_register_post_for_share_counts', true, $post->ID, 'linkedin' ) ) { |
| @@ -2758,9 +2796,9 @@ | ||
| 2758 | 2796 | $pinterest_url = esc_url_raw( $this->get_external_url( $post ) ); |
| 2759 | 2797 | parent::redirect_request( $pinterest_url ); |
| 2760 | 2798 | } else { |
| 2761 | 2799 | echo '// share count bumped'; |
| 2762 | - die(); | |
| 2800 | + die( 0 ); | |
| 2763 | 2801 | } |
| 2764 | 2802 | } |
| 2765 | 2803 | |
| 2766 | 2804 | /** |
| @@ -2854,143 +2892,8 @@ | ||
| 2854 | 2892 | } |
| 2855 | 2893 | } |
| 2856 | 2894 | |
| 2857 | 2895 | /** |
| 2858 | - * Pocket sharing service. | |
| 2859 | - */ | |
| 2860 | -class Share_Pocket extends Sharing_Source { | |
| 2861 | - /** | |
| 2862 | - * Service short name. | |
| 2863 | - * | |
| 2864 | - * @var string | |
| 2865 | - */ | |
| 2866 | - public $shortname = 'pocket'; | |
| 2867 | - | |
| 2868 | - /** | |
| 2869 | - * Service icon font code. | |
| 2870 | - * | |
| 2871 | - * @var string | |
| 2872 | - */ | |
| 2873 | - public $icon = '\f224'; | |
| 2874 | - | |
| 2875 | - /** | |
| 2876 | - * Constructor. | |
| 2877 | - * | |
| 2878 | - * @param int $id Sharing source ID. | |
| 2879 | - * @param array $settings Sharing settings. | |
| 2880 | - */ | |
| 2881 | - public function __construct( $id, array $settings ) { | |
| 2882 | - parent::__construct( $id, $settings ); | |
| 2883 | - | |
| 2884 | - if ( 'official' === $this->button_style ) { | |
| 2885 | - $this->smart = true; | |
| 2886 | - } else { | |
| 2887 | - $this->smart = false; | |
| 2888 | - } | |
| 2889 | - } | |
| 2890 | - | |
| 2891 | - /** | |
| 2892 | - * Service name. | |
| 2893 | - * | |
| 2894 | - * @return string | |
| 2895 | - */ | |
| 2896 | - public function get_name() { | |
| 2897 | - return __( 'Pocket', 'jetpack' ); | |
| 2898 | - } | |
| 2899 | - | |
| 2900 | - /** | |
| 2901 | - * Process sharing request. Add actions that need to happen when sharing here. | |
| 2902 | - * | |
| 2903 | - * @param WP_Post $post Post object. | |
| 2904 | - * @param array $post_data Array of information about the post we're sharing. | |
| 2905 | - * | |
| 2906 | - * @return void | |
| 2907 | - */ | |
| 2908 | - public function process_request( $post, array $post_data ) { | |
| 2909 | - // Record stats | |
| 2910 | - parent::process_request( $post, $post_data ); | |
| 2911 | - | |
| 2912 | - $pocket_url = esc_url_raw( 'https://getpocket.com/save/?url=' . rawurlencode( $this->get_share_url( $post->ID ) ) . '&title=' . rawurlencode( $this->get_share_title( $post->ID ) ) ); | |
| 2913 | - | |
| 2914 | - parent::redirect_request( $pocket_url ); | |
| 2915 | - } | |
| 2916 | - | |
| 2917 | - /** | |
| 2918 | - * Get the markup of the sharing button. | |
| 2919 | - * | |
| 2920 | - * @param WP_Post $post Post object. | |
| 2921 | - * | |
| 2922 | - * @return string | |
| 2923 | - */ | |
| 2924 | - public function get_display( $post ) { | |
| 2925 | - if ( $this->smart ) { | |
| 2926 | - $post_count = 'horizontal'; | |
| 2927 | - | |
| 2928 | - $button = ''; | |
| 2929 | - $button .= '<div class="pocket_button">'; | |
| 2930 | - $button .= sprintf( '<a href="https://getpocket.com/save" class="pocket-btn" data-lang="%s" data-save-url="%s" data-pocket-count="%s" >%s</a>', 'en', esc_attr( $this->get_share_url( $post->ID ) ), $post_count, esc_attr__( 'Pocket', 'jetpack' ) ); | |
| 2931 | - $button .= '</div>'; | |
| 2932 | - | |
| 2933 | - return $button; | |
| 2934 | - } else { | |
| 2935 | - return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Pocket', 'share to', 'jetpack' ), __( 'Click to share on Pocket', 'jetpack' ), 'share=pocket' ); | |
| 2936 | - } | |
| 2937 | - } | |
| 2938 | - | |
| 2939 | - /** | |
| 2940 | - * AMP display for Pocket. | |
| 2941 | - * | |
| 2942 | - * @param \WP_Post $post The current post being viewed. | |
| 2943 | - */ | |
| 2944 | - public function get_amp_display( $post ) { | |
| 2945 | - $attrs = array( | |
| 2946 | - 'data-share-endpoint' => esc_url_raw( 'https://getpocket.com/save/?url=' . rawurlencode( $this->get_share_url( $post->ID ) ) . '&title=' . rawurlencode( $this->get_share_title( $post->ID ) ) ), | |
| 2947 | - ); | |
| 2948 | - | |
| 2949 | - return $this->build_amp_markup( $attrs ); | |
| 2950 | - } | |
| 2951 | - | |
| 2952 | - /** | |
| 2953 | - * Add content specific to a service in the footer. | |
| 2954 | - */ | |
| 2955 | - public function display_footer() { | |
| 2956 | - if ( $this->smart ) : | |
| 2957 | - ?> | |
| 2958 | - <script> | |
| 2959 | - ( function () { | |
| 2960 | - var currentScript = document.currentScript; | |
| 2961 | - | |
| 2962 | - // Don't use Pocket's default JS as it we need to force init new Pocket share buttons loaded via JS. | |
| 2963 | - function jetpack_sharing_pocket_init() { | |
| 2964 | - var script = document.createElement( 'script' ); | |
| 2965 | - var prev = currentScript || document.getElementsByTagName( 'script' )[ 0 ]; | |
| 2966 | - script.setAttribute( 'async', true ); | |
| 2967 | - script.setAttribute( 'src', 'https://widgets.getpocket.com/v1/j/btn.js?v=1' ); | |
| 2968 | - prev.parentNode.insertBefore( script, prev ); | |
| 2969 | - } | |
| 2970 | - | |
| 2971 | - if ( document.readyState === 'loading' ) { | |
| 2972 | - document.addEventListener( 'DOMContentLoaded', jetpack_sharing_pocket_init ); | |
| 2973 | - } else { | |
| 2974 | - jetpack_sharing_pocket_init(); | |
| 2975 | - } | |
| 2976 | - document.body.addEventListener( 'is.post-load', jetpack_sharing_pocket_init ); | |
| 2977 | - } )(); | |
| 2978 | - </script> | |
| 2979 | - <?php | |
| 2980 | - else : | |
| 2981 | - $this->js_dialog( | |
| 2982 | - $this->shortname, | |
| 2983 | - array( | |
| 2984 | - 'width' => 450, | |
| 2985 | - 'height' => 450, | |
| 2986 | - ) | |
| 2987 | - ); | |
| 2988 | - endif; | |
| 2989 | - } | |
| 2990 | -} | |
| 2991 | - | |
| 2992 | -/** | |
| 2993 | 2896 | * Telegram sharing service. |
| 2994 | 2897 | */ |
| 2995 | 2898 | class Share_Telegram extends Sharing_Source { |
| 2996 | 2899 | /** |
| @@ -3002,10 +2905,10 @@ | ||
| 3002 | 2905 | |
| 3003 | 2906 | /** |
| 3004 | 2907 | * Constructor. |
| 3005 | 2908 | * |
| 3006 | - * @param int $id Sharing source ID. | |
| 3007 | - * @param array $settings Sharing settings. | |
| 2909 | + * @param string $id Sharing source ID. | |
| 2910 | + * @param array $settings Sharing settings. | |
| 3008 | 2911 | */ |
| 3009 | 2912 | public function __construct( $id, array $settings ) { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found |
| 3010 | 2913 | parent::__construct( $id, $settings ); |
| 3011 | 2914 | } |
| @@ -3043,9 +2946,9 @@ | ||
| 3043 | 2946 | * |
| 3044 | 2947 | * @return string |
| 3045 | 2948 | */ |
| 3046 | 2949 | public function get_display( $post ) { |
| 3047 | - return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Telegram', 'share to', 'jetpack' ), __( 'Click to share on Telegram', 'jetpack' ), 'share=telegram' ); | |
| 2950 | + return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Telegram', 'share to', 'jetpack' ), __( 'Share on Telegram', 'jetpack' ), 'share=telegram', 'sharing-telegram-' . $post->ID ); | |
| 3048 | 2951 | } |
| 3049 | 2952 | |
| 3050 | 2953 | /** |
| 3051 | 2954 | * AMP display for Telegram. |
| @@ -3087,10 +2990,10 @@ | ||
| 3087 | 2990 | |
| 3088 | 2991 | /** |
| 3089 | 2992 | * Constructor. |
| 3090 | 2993 | * |
| 3091 | - * @param int $id Sharing source ID. | |
| 3092 | - * @param array $settings Sharing settings. | |
| 2994 | + * @param string $id Sharing source ID. | |
| 2995 | + * @param array $settings Sharing settings. | |
| 3093 | 2996 | */ |
| 3094 | 2997 | public function __construct( $id, array $settings ) { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found |
| 3095 | 2998 | parent::__construct( $id, $settings ); |
| 3096 | 2999 | } |
| @@ -3111,9 +3014,9 @@ | ||
| 3111 | 3014 | * |
| 3112 | 3015 | * @return string |
| 3113 | 3016 | */ |
| 3114 | 3017 | public function get_display( $post ) { |
| 3115 | - return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'WhatsApp', 'share to', 'jetpack' ), __( 'Click to share on WhatsApp', 'jetpack' ), 'share=jetpack-whatsapp' ); | |
| 3018 | + return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'WhatsApp', 'share to', 'jetpack' ), __( 'Share on WhatsApp', 'jetpack' ), 'share=jetpack-whatsapp', 'sharing-whatsapp-' . $post->ID ); | |
| 3116 | 3019 | } |
| 3117 | 3020 | |
| 3118 | 3021 | /** |
| 3119 | 3022 | * AMP display for Whatsapp. |
| @@ -3153,29 +3056,8 @@ | ||
| 3153 | 3056 | } |
| 3154 | 3057 | } |
| 3155 | 3058 | |
| 3156 | 3059 | /** |
| 3157 | - * Skype sharing service. | |
| 3158 | - */ | |
| 3159 | -class Share_Skype extends Deprecated_Sharing_Source { | |
| 3160 | - /** | |
| 3161 | - * Service short name. | |
| 3162 | - * | |
| 3163 | - * @var string | |
| 3164 | - */ | |
| 3165 | - public $shortname = 'skype'; | |
| 3166 | - | |
| 3167 | - /** | |
| 3168 | - * Service name. | |
| 3169 | - * | |
| 3170 | - * @return string | |
| 3171 | - */ | |
| 3172 | - public function get_name() { | |
| 3173 | - return __( 'Skype', 'jetpack' ); | |
| 3174 | - } | |
| 3175 | -} | |
| 3176 | - | |
| 3177 | -/** | |
| 3178 | 3060 | * Mastodon sharing service. |
| 3179 | 3061 | */ |
| 3180 | 3062 | class Share_Mastodon extends Sharing_Source { |
| 3181 | 3063 | /** |
| @@ -3211,9 +3093,9 @@ | ||
| 3211 | 3093 | public function get_display( $post ) { |
| 3212 | 3094 | return $this->get_link( |
| 3213 | 3095 | $this->get_process_request_url( $post->ID ), |
| 3214 | 3096 | _x( 'Mastodon', 'share to', 'jetpack' ), |
| 3215 | - __( 'Click to share on Mastodon', 'jetpack' ), | |
| 3097 | + __( 'Share on Mastodon', 'jetpack' ), | |
| 3216 | 3098 | 'share=mastodon', |
| 3217 | 3099 | 'sharing-mastodon-' . $post->ID |
| 3218 | 3100 | ); |
| 3219 | 3101 | } |
| @@ -3323,9 +3205,9 @@ | ||
| 3323 | 3205 | public function get_display( $post ) { |
| 3324 | 3206 | return $this->get_link( |
| 3325 | 3207 | $this->get_process_request_url( $post->ID ), |
| 3326 | 3208 | _x( 'Nextdoor', 'share to', 'jetpack' ), |
| 3327 | - __( 'Click to share on Nextdoor', 'jetpack' ), | |
| 3209 | + __( 'Share on Nextdoor', 'jetpack' ), | |
| 3328 | 3210 | 'share=nextdoor', |
| 3329 | 3211 | 'sharing-nextdoor-' . $post->ID |
| 3330 | 3212 | ); |
| 3331 | 3213 | } |
| @@ -3345,6 +3227,146 @@ | ||
| 3345 | 3227 | $url = 'https://nextdoor.com/sharekit/?source=jetpack&body='; |
| 3346 | 3228 | $url .= rawurlencode( $this->get_share_title( $post->ID ) . ' ' . $this->get_share_url( $post->ID ) ); |
| 3347 | 3229 | |
| 3348 | 3230 | parent::redirect_request( $url ); |
| 3231 | + } | |
| 3232 | +} | |
| 3233 | + | |
| 3234 | +/** | |
| 3235 | + * Threads sharing service. | |
| 3236 | + */ | |
| 3237 | +class Share_Threads extends Sharing_Source { | |
| 3238 | + /** | |
| 3239 | + * Service short name. | |
| 3240 | + * | |
| 3241 | + * @var string | |
| 3242 | + */ | |
| 3243 | + public $shortname = 'threads'; | |
| 3244 | + | |
| 3245 | + /** | |
| 3246 | + * Service icon font code. | |
| 3247 | + * | |
| 3248 | + * @var string | |
| 3249 | + */ | |
| 3250 | + public $icon = '\f10d'; | |
| 3251 | + | |
| 3252 | + /** | |
| 3253 | + * Service name. | |
| 3254 | + * | |
| 3255 | + * @return string | |
| 3256 | + */ | |
| 3257 | + public function get_name() { | |
| 3258 | + return __( 'Threads', 'jetpack' ); | |
| 3259 | + } | |
| 3260 | + | |
| 3261 | + /** | |
| 3262 | + * Get the markup of the sharing button. | |
| 3263 | + * | |
| 3264 | + * @param WP_Post $post Post object. | |
| 3265 | + * | |
| 3266 | + * @return string | |
| 3267 | + */ | |
| 3268 | + public function get_display( $post ) { | |
| 3269 | + return $this->get_link( | |
| 3270 | + $this->get_process_request_url( $post->ID ), | |
| 3271 | + _x( 'Threads', 'share to', 'jetpack' ), | |
| 3272 | + __( 'Share on Threads', 'jetpack' ), | |
| 3273 | + 'share=threads', | |
| 3274 | + 'sharing-threads-' . $post->ID | |
| 3275 | + ); | |
| 3276 | + } | |
| 3277 | + | |
| 3278 | + /** | |
| 3279 | + * Process sharing request. Add actions that need to happen when sharing here. | |
| 3280 | + * | |
| 3281 | + * @param WP_Post $post Post object. | |
| 3282 | + * @param array $post_data Array of information about the post we're sharing. | |
| 3283 | + * | |
| 3284 | + * @return void | |
| 3285 | + */ | |
| 3286 | + public function process_request( $post, array $post_data ) { | |
| 3287 | + // Record stats | |
| 3288 | + parent::process_request( $post, $post_data ); | |
| 3289 | + | |
| 3290 | + $url = 'https://threads.net/intent/post?text='; | |
| 3291 | + $url .= rawurlencode( $this->get_share_title( $post->ID ) . ' ' . $this->get_share_url( $post->ID ) ); | |
| 3292 | + | |
| 3293 | + parent::redirect_request( $url ); | |
| 3294 | + } | |
| 3295 | + | |
| 3296 | + /** | |
| 3297 | + * Add content specific to a service in the footer. | |
| 3298 | + */ | |
| 3299 | + public function display_footer() { | |
| 3300 | + $this->js_dialog( $this->shortname ); | |
| 3301 | + } | |
| 3302 | +} | |
| 3303 | + | |
| 3304 | +/** | |
| 3305 | + * Bluesky sharing service. | |
| 3306 | + */ | |
| 3307 | +class Share_Bluesky extends Sharing_Source { | |
| 3308 | + /** | |
| 3309 | + * Service short name. | |
| 3310 | + * | |
| 3311 | + * @var string | |
| 3312 | + */ | |
| 3313 | + public $shortname = 'bluesky'; | |
| 3314 | + | |
| 3315 | + /** | |
| 3316 | + * Service icon font code. | |
| 3317 | + * | |
| 3318 | + * @var string | |
| 3319 | + */ | |
| 3320 | + public $icon = '\f10f'; | |
| 3321 | + | |
| 3322 | + /** | |
| 3323 | + * Service name. | |
| 3324 | + * | |
| 3325 | + * @return string | |
| 3326 | + */ | |
| 3327 | + public function get_name() { | |
| 3328 | + return __( 'Bluesky', 'jetpack' ); | |
| 3329 | + } | |
| 3330 | + | |
| 3331 | + /** | |
| 3332 | + * Get the markup of the sharing button. | |
| 3333 | + * | |
| 3334 | + * @param WP_Post $post Post object. | |
| 3335 | + * | |
| 3336 | + * @return string | |
| 3337 | + */ | |
| 3338 | + public function get_display( $post ) { | |
| 3339 | + return $this->get_link( | |
| 3340 | + $this->get_process_request_url( $post->ID ), | |
| 3341 | + _x( 'Bluesky', 'share to', 'jetpack' ), | |
| 3342 | + __( 'Share on Bluesky', 'jetpack' ), | |
| 3343 | + 'share=bluesky', | |
| 3344 | + 'sharing-bluesky-' . $post->ID | |
| 3345 | + ); | |
| 3346 | + } | |
| 3347 | + | |
| 3348 | + /** | |
| 3349 | + * Process sharing request. Add actions that need to happen when sharing here. | |
| 3350 | + * | |
| 3351 | + * @param WP_Post $post Post object. | |
| 3352 | + * @param array $post_data Array of information about the post we're sharing. | |
| 3353 | + * | |
| 3354 | + * @return void | |
| 3355 | + */ | |
| 3356 | + public function process_request( $post, array $post_data ) { | |
| 3357 | + // Record stats | |
| 3358 | + parent::process_request( $post, $post_data ); | |
| 3359 | + | |
| 3360 | + $url = 'https://bsky.app/intent/compose?text='; | |
| 3361 | + $url .= rawurlencode( $this->get_share_title( $post->ID ) . ' ' . $this->get_share_url( $post->ID ) ); | |
| 3362 | + | |
| 3363 | + parent::redirect_request( $url ); | |
| 3364 | + } | |
| 3365 | + | |
| 3366 | + /** | |
| 3367 | + * Add content specific to a service in the footer. | |
| 3368 | + */ | |
| 3369 | + public function display_footer() { | |
| 3370 | + $this->js_dialog( $this->shortname ); | |
| 3349 | 3371 | } |
| 3350 | 3372 | } |
