| @@ -1,35 +1,22 @@ | ||
| 1 | 1 | <?php |
| 2 | -/** | |
| 3 | - * Jetpack's Sharing feature, nee Sharedaddy. | |
| 4 | - * The most super duper sharing tool on the interwebs. | |
| 5 | - * | |
| 6 | - * @package automattic/jetpack | |
| 7 | - */ | |
| 2 | +/* | |
| 3 | +Plugin Name: Sharedaddy | |
| 4 | +Description: The most super duper sharing tool on the interwebs. | |
| 5 | +Version: 0.3.1 | |
| 6 | +Author: Automattic, Inc. | |
| 7 | +Author URI: http://automattic.com/ | |
| 8 | +Plugin URI: http://en.blog.wordpress.com/2010/08/24/more-ways-to-share/ | |
| 9 | +*/ | |
| 8 | 10 | |
| 9 | -// Set up Sharing in wp-admin. | |
| 10 | -require_once plugin_dir_path( __FILE__ ) . 'sharing.php'; | |
| 11 | +require_once plugin_dir_path( __FILE__ ).'sharing.php'; | |
| 11 | 12 | |
| 12 | -/** | |
| 13 | - * Send an email via the Email sharing button. | |
| 14 | - * | |
| 15 | - * @param array $data Array of information about the shared message. | |
| 16 | - * | |
| 17 | - * @return void | |
| 18 | - * | |
| 19 | - * @deprecated 11.0 | |
| 20 | - */ | |
| 21 | 13 | function sharing_email_send_post( $data ) { |
| 22 | 14 | |
| 23 | 15 | $content = sharing_email_send_post_content( $data ); |
| 24 | 16 | // Borrowed from wp_mail(); |
| 25 | - | |
| 26 | - if ( empty( $_SERVER['SERVER_NAME'] ) ) { | |
| 27 | - return; | |
| 28 | - } | |
| 29 | - | |
| 30 | - $sitename = strtolower( sanitize_text_field( wp_unslash( $_SERVER['SERVER_NAME'] ) ) ); | |
| 31 | - if ( substr( $sitename, 0, 4 ) === 'www.' ) { | |
| 17 | + $sitename = strtolower( $_SERVER['SERVER_NAME'] ); | |
| 18 | + if ( substr( $sitename, 0, 4 ) == 'www.' ) { | |
| 32 | 19 | $sitename = substr( $sitename, 4 ); |
| 33 | 20 | } |
| 34 | 21 | |
| 35 | 22 | /** This filter is documented in core/src/wp-includes/pluggable.php */ |
| @@ -35,9 +22,9 @@ | ||
| 35 | 22 | /** This filter is documented in core/src/wp-includes/pluggable.php */ |
| 36 | 23 | $from_email = apply_filters( 'wp_mail_from', 'wordpress@' . $sitename ); |
| 37 | 24 | |
| 38 | 25 | if ( ! empty( $data['name'] ) ) { |
| 39 | - $s_name = (string) $data['name']; | |
| 26 | + $s_name = (string) $data['name']; | |
| 40 | 27 | $name_needs_encoding_regex = |
| 41 | 28 | '/[' . |
| 42 | 29 | // SpamAssasin's list of characters which "need MIME" encoding |
| 43 | 30 | '\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff' . |
| @@ -45,9 +32,9 @@ | ||
| 45 | 32 | '<\r\n' . |
| 46 | 33 | ']/'; |
| 47 | 34 | |
| 48 | 35 | $needs_encoding = |
| 49 | - // If it contains any blocked chars. | |
| 36 | + // If it contains any blacklisted chars, | |
| 50 | 37 | preg_match( $name_needs_encoding_regex, $s_name ) || |
| 51 | 38 | // Or if we can't use `mb_convert_encoding` |
| 52 | 39 | ! function_exists( 'mb_convert_encoding' ) || |
| 53 | 40 | // Or if it's not already ASCII |
| @@ -53,13 +40,12 @@ | ||
| 53 | 40 | // Or if it's not already ASCII |
| 54 | 41 | mb_convert_encoding( $data['name'], 'ASCII' ) !== $s_name; |
| 55 | 42 | |
| 56 | 43 | if ( $needs_encoding ) { |
| 57 | - $data['name'] = sprintf( '=?UTF-8?B?%s?=', base64_encode( $data['name'] ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode | |
| 44 | + $data['name'] = sprintf( '=?UTF-8?B?%s?=', base64_encode( $data['name'] ) ); | |
| 58 | 45 | } |
| 59 | 46 | } |
| 60 | 47 | |
| 61 | - $headers = array(); | |
| 62 | 48 | $headers[] = sprintf( 'From: %1$s <%2$s>', $data['name'], $from_email ); |
| 63 | 49 | $headers[] = sprintf( 'Reply-To: %1$s <%2$s>', $data['name'], $data['source'] ); |
| 64 | 50 | |
| 65 | 51 | // Make sure to pass the title through the normal sharing filters. |
| @@ -78,80 +64,46 @@ | ||
| 78 | 64 | |
| 79 | 65 | wp_mail( $data['target'], $subject, $content, $headers ); |
| 80 | 66 | } |
| 81 | 67 | |
| 82 | -/** | |
| 83 | - * Checks for spam using Akismet if available. | |
| 84 | - * Return $data as it if email about to be send out is not spam. | |
| 85 | - * | |
| 86 | - * @param array $data Array of information about the shared message. | |
| 87 | - * | |
| 88 | - * @return array $data | |
| 89 | - * | |
| 90 | - * @deprecated 11.0 | |
| 91 | - */ | |
| 68 | + | |
| 69 | +/* Checks for spam using akismet if available. */ | |
| 70 | +/* Return $data as it if email about to be send out is not spam. */ | |
| 92 | 71 | function sharing_email_check_for_spam_via_akismet( $data ) { |
| 93 | 72 | |
| 94 | - if ( ! Jetpack::is_akismet_active() ) { | |
| 73 | + if ( ! Jetpack::is_akismet_active() ) | |
| 95 | 74 | return $data; |
| 96 | - } | |
| 97 | 75 | |
| 98 | 76 | // Prepare the body_request for akismet |
| 99 | 77 | $body_request = array( |
| 100 | - 'blog' => get_option( 'home' ), | |
| 101 | - 'permalink' => $data['sharing_source']->get_share_url( $data['post']->ID ), | |
| 102 | - 'comment_type' => 'share', | |
| 103 | - 'comment_author' => $data['name'], | |
| 104 | - 'comment_author_email' => $data['source'], | |
| 105 | - 'comment_content' => sharing_email_send_post_content( $data ), | |
| 106 | - 'user_agent' => ( isset( $_SERVER['HTTP_USER_AGENT'] ) | |
| 107 | - ? filter_var( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ) | |
| 108 | - : null | |
| 109 | - ), | |
| 110 | - ); | |
| 78 | + 'blog' => get_option( 'home' ), | |
| 79 | + 'permalink' => $data['sharing_source']->get_share_url( $data['post']->ID ), | |
| 80 | + 'comment_type' => 'share', | |
| 81 | + 'comment_author' => $data['name'], | |
| 82 | + 'comment_author_email' => $data['source'], | |
| 83 | + 'comment_content' => sharing_email_send_post_content( $data ), | |
| 84 | + 'user_agent' => ( isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : null ), | |
| 85 | + ); | |
| 111 | 86 | |
| 112 | 87 | if ( method_exists( 'Akismet', 'http_post' ) ) { |
| 113 | - $body_request['user_ip'] = Akismet::get_ip_address(); | |
| 114 | - $response = Akismet::http_post( build_query( $body_request ), 'comment-check' ); | |
| 88 | + $body_request['user_ip'] = Akismet::get_ip_address(); | |
| 89 | + $response = Akismet::http_post( build_query( $body_request ), 'comment-check' ); | |
| 115 | 90 | } else { |
| 116 | 91 | global $akismet_api_host, $akismet_api_port; |
| 117 | - $body_request['user_ip'] = ( isset( $_SERVER['REMOTE_ADDR'] ) | |
| 118 | - ? filter_var( wp_unslash( $_SERVER['REMOTE_ADDR'] ) ) | |
| 119 | - : null | |
| 120 | - ); | |
| 121 | - $response = akismet_http_post( build_query( $body_request ), $akismet_api_host, '/1.1/comment-check', $akismet_api_port ); | |
| 92 | + $body_request['user_ip'] = ( isset( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : null ); | |
| 93 | + $response = akismet_http_post( build_query( $body_request ), $akismet_api_host, '/1.1/comment-check', $akismet_api_port ); | |
| 122 | 94 | } |
| 123 | 95 | |
| 124 | - /* | |
| 125 | - * The Response is spam lets not send the email. | |
| 126 | - * 'true' is spam | |
| 127 | - */ | |
| 128 | - if ( | |
| 129 | - ! empty( $response ) | |
| 130 | - && isset( $response[1] ) | |
| 131 | - && 'true' == trim( $response[1] ) // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual -- response comes from the Akismet API. | |
| 132 | - ) { | |
| 96 | + // The Response is spam lets not send the email. | |
| 97 | + if ( ! empty( $response ) && isset( $response[1] ) && 'true' == trim( $response[1] ) ) { // 'true' is spam | |
| 133 | 98 | return false; // don't send the email |
| 134 | 99 | } |
| 135 | 100 | return $data; |
| 136 | 101 | } |
| 137 | 102 | |
| 138 | -/** | |
| 139 | - * Content of the emails sent to the target email address. | |
| 140 | - * | |
| 141 | - * @param array $data Array of information about the shared message. | |
| 142 | - * | |
| 143 | - * @return string $content | |
| 144 | - * | |
| 145 | - * @deprecated 11.0 | |
| 146 | - */ | |
| 147 | 103 | function sharing_email_send_post_content( $data ) { |
| 148 | - $content = sprintf( | |
| 149 | - /* translators: included in email when post is shared via email. First item is sender's name. Second is sender's email address. */ | |
| 150 | - __( '%1$s (%2$s) thinks you may be interested in the following post:', 'jetpack' ), | |
| 151 | - $data['name'], | |
| 152 | - $data['source'] | |
| 153 | - ); | |
| 104 | + /* translators: included in email when post is shared via email. First item is sender's name. Second is sender's email address. */ | |
| 105 | + $content = sprintf( __( '%1$s (%2$s) thinks you may be interested in the following post:', 'jetpack' ), $data['name'], $data['source'] ); | |
| 154 | 106 | $content .= "\n\n"; |
| 155 | 107 | // Make sure to pass the title and URL through the normal sharing filters. |
| 156 | 108 | $content .= $data['sharing_source']->get_share_title( $data['post']->ID ) . "\n"; |
| 157 | 109 | $content .= $data['sharing_source']->get_share_url( $data['post']->ID ) . "\n"; |
| @@ -157,13 +109,8 @@ | ||
| 157 | 109 | $content .= $data['sharing_source']->get_share_url( $data['post']->ID ) . "\n"; |
| 158 | 110 | return $content; |
| 159 | 111 | } |
| 160 | 112 | |
| 161 | -/** | |
| 162 | - * Add a meta box to the post editing screen for sharing. | |
| 163 | - * | |
| 164 | - * @return void | |
| 165 | - */ | |
| 166 | 113 | function sharing_add_meta_box() { |
| 167 | 114 | global $post; |
| 168 | 115 | if ( empty( $post ) ) { // If a current post is not defined, such as when editing a comment. |
| 169 | 116 | return; |
| @@ -194,21 +141,15 @@ | ||
| 194 | 141 | * @param string $var Sharing Meta Box title. Default is "Sharing". |
| 195 | 142 | */ |
| 196 | 143 | $title = apply_filters( 'sharing_meta_box_title', __( 'Sharing', 'jetpack' ) ); |
| 197 | 144 | if ( $post->ID !== get_option( 'page_for_posts' ) ) { |
| 198 | - foreach ( $post_types as $post_type ) { | |
| 199 | - add_meta_box( 'sharing_meta', $title, 'sharing_meta_box_content', $post_type, 'side', 'default', array( '__back_compat_meta_box' => true ) ); | |
| 145 | + foreach( $post_types as $post_type ) { | |
| 146 | + add_meta_box( 'sharing_meta', $title, 'sharing_meta_box_content', $post_type, 'side', 'default' ); | |
| 200 | 147 | } |
| 201 | 148 | } |
| 202 | 149 | } |
| 203 | 150 | |
| 204 | -/** | |
| 205 | - * Content of the meta box. | |
| 206 | - * | |
| 207 | - * @param WP_Post $post The post to share. | |
| 208 | - * | |
| 209 | - * @return void | |
| 210 | - */ | |
| 151 | + | |
| 211 | 152 | function sharing_meta_box_content( $post ) { |
| 212 | 153 | /** |
| 213 | 154 | * Fires before the sharing meta box content. |
| 214 | 155 | * |
| @@ -223,10 +164,10 @@ | ||
| 223 | 164 | $disabled = get_post_meta( $post->ID, 'sharing_disabled', true ); ?> |
| 224 | 165 | |
| 225 | 166 | <p> |
| 226 | 167 | <label for="enable_post_sharing"> |
| 227 | - <input type="checkbox" name="enable_post_sharing" id="enable_post_sharing" value="1" <?php checked( ! $disabled ); ?>> | |
| 228 | - <?php esc_html_e( 'Show sharing buttons.', 'jetpack' ); ?> | |
| 168 | + <input type="checkbox" name="enable_post_sharing" id="enable_post_sharing" value="1" <?php checked( !$disabled ); ?>> | |
| 169 | + <?php _e( 'Show sharing buttons.' , 'jetpack'); ?> | |
| 229 | 170 | </label> |
| 230 | 171 | <input type="hidden" name="sharing_status_hidden" value="1" /> |
| 231 | 172 | </p> |
| 232 | 173 | |
| @@ -238,217 +179,96 @@ | ||
| 238 | 179 | * |
| 239 | 180 | * @since 2.2.0 |
| 240 | 181 | * |
| 241 | 182 | * @param WP_Post $post The post to share. |
| 242 | - */ | |
| 183 | + */ | |
| 243 | 184 | do_action( 'end_sharing_meta_box_content', $post ); |
| 244 | 185 | } |
| 245 | 186 | |
| 246 | -/** | |
| 247 | - * Save new sharing status in post meta in the meta box. | |
| 248 | - * | |
| 249 | - * @param int $post_id Post ID. | |
| 250 | - * | |
| 251 | - * @return int | |
| 252 | - */ | |
| 253 | 187 | function sharing_meta_box_save( $post_id ) { |
| 254 | - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) { | |
| 188 | + if ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) | |
| 255 | 189 | return $post_id; |
| 256 | - } | |
| 257 | 190 | |
| 258 | - if ( ! isset( $_POST['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Core takes care of the validation. | |
| 259 | - return $post_id; | |
| 260 | - } | |
| 261 | - | |
| 262 | - $post_type_object = get_post_type_object( sanitize_key( $_POST['post_type'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Core takes care of the validation. | |
| 263 | - | |
| 264 | - // Record sharing disable. | |
| 265 | - if ( | |
| 266 | - $post_type_object->public | |
| 267 | - && current_user_can( 'edit_post', $post_id ) | |
| 268 | - && isset( $_POST['sharing_status_hidden'] ) // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Core takes care of the validation. | |
| 269 | - ) { | |
| 270 | - if ( ! isset( $_POST['enable_post_sharing'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Core takes care of the validation. | |
| 271 | - update_post_meta( $post_id, 'sharing_disabled', 1 ); | |
| 272 | - } else { | |
| 273 | - delete_post_meta( $post_id, 'sharing_disabled' ); | |
| 191 | + // Record sharing disable | |
| 192 | + if ( isset( $_POST['post_type'] ) && ( $post_type_object = get_post_type_object( $_POST['post_type'] ) ) && $post_type_object->public ) { | |
| 193 | + if ( current_user_can( 'edit_post', $post_id ) ) { | |
| 194 | + if ( isset( $_POST['sharing_status_hidden'] ) ) { | |
| 195 | + if ( !isset( $_POST['enable_post_sharing'] ) ) { | |
| 196 | + update_post_meta( $post_id, 'sharing_disabled', 1 ); | |
| 197 | + } else { | |
| 198 | + delete_post_meta( $post_id, 'sharing_disabled' ); | |
| 199 | + } | |
| 200 | + } | |
| 274 | 201 | } |
| 275 | 202 | } |
| 276 | 203 | |
| 277 | - return $post_id; | |
| 204 | + return $post_id; | |
| 278 | 205 | } |
| 279 | 206 | |
| 280 | -/** | |
| 281 | - * If Sharing is disabled, disable the meta box. | |
| 282 | - * | |
| 283 | - * @param bool $protected Whether the key is considered protected. | |
| 284 | - * @param string $meta_key Metadata key. | |
| 285 | - * | |
| 286 | - * @return bool | |
| 287 | - */ | |
| 288 | -function sharing_meta_box_protected( $protected, $meta_key ) { | |
| 289 | - if ( 'sharing_disabled' === $meta_key ) { | |
| 207 | +function sharing_meta_box_protected( $protected, $meta_key, $meta_type ) { | |
| 208 | + if ( 'sharing_disabled' == $meta_key ) | |
| 290 | 209 | $protected = true; |
| 291 | - } | |
| 292 | 210 | |
| 293 | 211 | return $protected; |
| 294 | 212 | } |
| 295 | -add_filter( 'is_protected_meta', 'sharing_meta_box_protected', 10, 2 ); | |
| 296 | 213 | |
| 297 | -/** | |
| 298 | - * Add link to sharing settings in the Plugins screen. | |
| 299 | - * | |
| 300 | - * @param array $links An array of plugin action links. | |
| 301 | - * | |
| 302 | - * @return array | |
| 303 | - */ | |
| 214 | +add_filter( 'is_protected_meta', 'sharing_meta_box_protected', 10, 3 ); | |
| 215 | + | |
| 304 | 216 | function sharing_plugin_settings( $links ) { |
| 305 | - $settings_link = '<a href="options-general.php?page=sharing.php">' . __( 'Settings', 'jetpack' ) . '</a>'; | |
| 217 | + $settings_link = '<a href="options-general.php?page=sharing.php">'.__( 'Settings', 'jetpack' ).'</a>'; | |
| 306 | 218 | array_unshift( $links, $settings_link ); |
| 307 | 219 | return $links; |
| 308 | 220 | } |
| 309 | 221 | |
| 310 | -/** | |
| 311 | - * Add links to settings and support in the plugin row. | |
| 312 | - * | |
| 313 | - * @param array $links An array of the plugin's metadata, including the version, author, author URI, and plugin URI. | |
| 314 | - * @param string $file Path to the plugin file relative to the plugins directory. | |
| 315 | - * | |
| 316 | - * @return array | |
| 317 | - */ | |
| 318 | -function sharing_add_plugin_settings( $links, $file ) { | |
| 319 | - if ( $file === basename( __DIR__ ) . '/' . basename( __FILE__ ) ) { | |
| 222 | +function sharing_add_plugin_settings($links, $file) { | |
| 223 | + if ( $file == basename( dirname( __FILE__ ) ).'/'.basename( __FILE__ ) ) { | |
| 320 | 224 | $links[] = '<a href="options-general.php?page=sharing.php">' . __( 'Settings', 'jetpack' ) . '</a>'; |
| 321 | - $links[] = '<a href="https://support.wordpress.com/sharing/" rel="noopener noreferrer" target="_blank">' . __( 'Support', 'jetpack' ) . '</a>'; | |
| 225 | + $links[] = '<a href="http://support.wordpress.com/sharing/" rel="noopener noreferrer" target="_blank">' . __( 'Support', 'jetpack' ) . '</a>'; | |
| 322 | 226 | } |
| 323 | 227 | |
| 324 | 228 | return $links; |
| 325 | 229 | } |
| 326 | 230 | |
| 327 | -/** | |
| 328 | - * Disable sharing on the frontend if disabled in the admin. | |
| 329 | - * | |
| 330 | - * @return void | |
| 331 | - */ | |
| 332 | 231 | function sharing_init() { |
| 333 | 232 | if ( Jetpack_Options::get_option_and_ensure_autoload( 'sharedaddy_disable_resources', '0' ) ) { |
| 334 | - add_filter( 'sharing_js', '__return_false' ); | |
| 233 | + add_filter( 'sharing_js', 'sharing_disable_js' ); | |
| 335 | 234 | remove_action( 'wp_head', 'sharing_add_header', 1 ); |
| 336 | 235 | } |
| 337 | 236 | } |
| 338 | 237 | |
| 339 | -/** | |
| 340 | - * Add settings to disable CSS and JS normally enqueued by our feature. | |
| 341 | - * | |
| 342 | - * @return void | |
| 343 | - */ | |
| 238 | +function sharing_disable_js() { | |
| 239 | + return false; | |
| 240 | +} | |
| 241 | + | |
| 344 | 242 | function sharing_global_resources() { |
| 345 | 243 | $disable = get_option( 'sharedaddy_disable_resources' ); |
| 346 | - ?> | |
| 244 | +?> | |
| 347 | 245 | <tr valign="top"> |
| 348 | - <th scope="row"><label for="disable_css"><?php esc_html_e( 'Disable CSS and JS', 'jetpack' ); ?></label></th> | |
| 246 | + <th scope="row"><label for="disable_css"><?php _e( 'Disable CSS and JS', 'jetpack' ); ?></label></th> | |
| 349 | 247 | <td> |
| 350 | - <?php | |
| 351 | - printf( | |
| 352 | - '<input id="disable_css" type="checkbox" name="disable_resources"%1$s /> <small><em>%2$s</em></small>', | |
| 353 | - ( 1 == $disable ) ? ' checked="checked"' : '', // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual | |
| 354 | - esc_html__( 'Advanced. If this option is checked, you must include these files in your theme manually for the sharing links to work.', 'jetpack' ) | |
| 355 | - ); | |
| 356 | - ?> | |
| 248 | + <input id="disable_css" type="checkbox" name="disable_resources" <?php if ( $disable == 1 ) echo ' checked="checked"'; ?>/> <small><em><?php _e( 'Advanced. If this option is checked, you must include these files in your theme manually for the sharing links to work.', 'jetpack' ); ?></em></small> | |
| 357 | 249 | </td> |
| 358 | 250 | </tr> |
| 359 | - <?php | |
| 251 | +<?php | |
| 360 | 252 | } |
| 361 | 253 | |
| 362 | -/** | |
| 363 | - * Save settings to disable CSS and JS normally enqueued by our feature. | |
| 364 | - * | |
| 365 | - * @return void | |
| 366 | - */ | |
| 367 | 254 | function sharing_global_resources_save() { |
| 368 | - update_option( 'sharedaddy_disable_resources', isset( $_POST['disable_resources'] ) ? 1 : 0 ); // phpcs:ignore WordPress.Security.NonceVerification.Missing -- nonce handling is handled for all elements at once. | |
| 255 | + update_option( 'sharedaddy_disable_resources', isset( $_POST['disable_resources'] ) ? 1 : 0 ); | |
| 369 | 256 | } |
| 370 | 257 | |
| 371 | -/** | |
| 372 | - * Returns the Recaptcha site/public key. | |
| 373 | - * | |
| 374 | - * Supports legacy RECAPTCHA_PUBLIC_KEY or RECAPTCHA_SITE_KEY. | |
| 375 | - * | |
| 376 | - * @return string | |
| 377 | - * | |
| 378 | - * @deprecated 11.0 | |
| 379 | - */ | |
| 380 | -function sharing_recaptcha_site_key() { | |
| 381 | - if ( ! defined( 'RECAPTCHA_PUBLIC_KEY' ) && ! defined( 'RECAPTCHA_SITE_KEY' ) ) { | |
| 382 | - return ''; | |
| 383 | - } | |
| 384 | - | |
| 385 | - if ( defined( 'RECAPTCHA_PUBLIC_KEY' ) && ! defined( 'RECAPTCHA_SITE_KEY' ) ) { | |
| 386 | - define( 'RECAPTCHA_SITE_KEY', RECAPTCHA_PUBLIC_KEY ); | |
| 387 | - } | |
| 388 | - | |
| 389 | - return RECAPTCHA_SITE_KEY; | |
| 390 | -} | |
| 391 | - | |
| 392 | -/** | |
| 393 | - * Returns the Recaptcha private/secret key. | |
| 394 | - * | |
| 395 | - * Supports legacy RECAPTCHA_PRIVATE_KEY or RECAPTCHA_SECRET_KEY. | |
| 396 | - * | |
| 397 | - * @return string | |
| 398 | - * | |
| 399 | - * @deprecated 11.0 | |
| 400 | - */ | |
| 401 | -function sharing_recaptcha_secret_key() { | |
| 402 | - if ( ! defined( 'RECAPTCHA_PRIVATE_KEY' ) && ! defined( 'RECAPTCHA_SECRET_KEY' ) ) { | |
| 403 | - return ''; | |
| 404 | - } | |
| 405 | - | |
| 406 | - if ( defined( 'RECAPTCHA_PRIVATE_KEY' ) && ! defined( 'RECAPTCHA_SECRET_KEY' ) ) { | |
| 407 | - define( 'RECAPTCHA_SECRET_KEY', RECAPTCHA_PRIVATE_KEY ); | |
| 408 | - } | |
| 409 | - | |
| 410 | - return RECAPTCHA_SECRET_KEY; | |
| 411 | -} | |
| 412 | - | |
| 413 | -/** | |
| 414 | - * Contents of a reCAPTCHA box. | |
| 415 | - * | |
| 416 | - * @return void | |
| 417 | - * | |
| 418 | - * @deprecated 11.0 | |
| 419 | - */ | |
| 420 | 258 | function sharing_email_dialog() { |
| 421 | 259 | require_once plugin_dir_path( __FILE__ ) . 'recaptcha.php'; |
| 422 | 260 | |
| 423 | - $recaptcha = new Jetpack_ReCaptcha( | |
| 424 | - sharing_recaptcha_site_key(), | |
| 425 | - sharing_recaptcha_secret_key(), | |
| 426 | - array( 'script_lazy' => true ) | |
| 427 | - ); | |
| 428 | - echo $recaptcha->get_recaptcha_html(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- escaped in method. | |
| 261 | + $recaptcha = new Jetpack_ReCaptcha( RECAPTCHA_PUBLIC_KEY, RECAPTCHA_PRIVATE_KEY ); | |
| 262 | + echo $recaptcha->get_recaptcha_html(); // xss ok | |
| 429 | 263 | } |
| 430 | 264 | |
| 431 | -/** | |
| 432 | - * Short-circuit the email sharing button based on the results of reCAPTCHA. | |
| 433 | - * | |
| 434 | - * @param bool $true Should we check if the message isn't spam. | |
| 435 | - * @param object $post Post information. | |
| 436 | - * @param array $data Information about the shared message. | |
| 437 | - * | |
| 438 | - * @deprecated 11.0 | |
| 439 | - */ | |
| 440 | -function sharing_email_check( $true, $post, $data ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable | |
| 265 | +function sharing_email_check( $true, $post, $data ) { | |
| 441 | 266 | require_once plugin_dir_path( __FILE__ ) . 'recaptcha.php'; |
| 442 | 267 | |
| 443 | - $recaptcha = new Jetpack_ReCaptcha( sharing_recaptcha_site_key(), sharing_recaptcha_secret_key(), array( 'script_lazy' => true ) ); | |
| 444 | - $response = ! empty( $_POST['g-recaptcha-response'] ) // phpcs:ignore WordPress.Security.NonceVerification.Missing -- we do not change anything on the site based on that. | |
| 445 | - ? filter_var( wp_unslash( $_POST['g-recaptcha-response'] ) ) // phpcs:ignore WordPress.Security.NonceVerification.Missing -- we do not change anything on the site based on that. | |
| 446 | - : ''; | |
| 447 | - $remote_addr = ! empty( $_SERVER['REMOTE_ADDR'] ) | |
| 448 | - ? filter_var( wp_unslash( $_SERVER['REMOTE_ADDR'] ) ) | |
| 449 | - : ''; | |
| 450 | - $result = $recaptcha->verify( $response, $remote_addr ); | |
| 268 | + $recaptcha = new Jetpack_ReCaptcha( RECAPTCHA_PUBLIC_KEY, RECAPTCHA_PRIVATE_KEY ); | |
| 269 | + $response = ! empty( $_POST['g-recaptcha-response'] ) ? $_POST['g-recaptcha-response'] : ''; | |
| 270 | + $result = $recaptcha->verify( $response, $_SERVER['REMOTE_ADDR'] ); | |
| 451 | 271 | |
| 452 | 272 | return ( true === $result ); |
| 453 | 273 | } |
| 454 | 274 | |
| @@ -454,9 +274,15 @@ | ||
| 454 | 274 | |
| 455 | 275 | add_action( 'init', 'sharing_init' ); |
| 456 | 276 | add_action( 'add_meta_boxes', 'sharing_add_meta_box' ); |
| 457 | 277 | add_action( 'save_post', 'sharing_meta_box_save' ); |
| 458 | -add_action( 'edit_attachment', 'sharing_meta_box_save' ); | |
| 278 | +add_action( 'sharing_email_send_post', 'sharing_email_send_post' ); | |
| 279 | +add_filter( 'sharing_email_can_send', 'sharing_email_check_for_spam_via_akismet' ); | |
| 459 | 280 | add_action( 'sharing_global_options', 'sharing_global_resources', 30 ); |
| 460 | 281 | add_action( 'sharing_admin_update', 'sharing_global_resources_save' ); |
| 461 | -add_action( 'plugin_action_links_' . basename( __DIR__ ) . '/' . basename( __FILE__ ), 'sharing_plugin_settings', 10, 4 ); | |
| 282 | +add_action( 'plugin_action_links_'.basename( dirname( __FILE__ ) ).'/'.basename( __FILE__ ), 'sharing_plugin_settings', 10, 4 ); | |
| 462 | 283 | add_filter( 'plugin_row_meta', 'sharing_add_plugin_settings', 10, 2 ); |
| 284 | + | |
| 285 | +if ( defined( 'RECAPTCHA_PUBLIC_KEY' ) && defined( 'RECAPTCHA_PRIVATE_KEY' ) ) { | |
| 286 | + add_action( 'sharing_email_dialog', 'sharing_email_dialog' ); | |
| 287 | + add_filter( 'sharing_email_check', 'sharing_email_check', 10, 3 ); | |
| 288 | +} | |
