← All changes
|
vendor/codeinwp/themeisle-sdk/src/Modules/Notification.php
+6
-35
3.10.0
→
3.7.7
View file →
| @@ -268,12 +268,11 @@ | ||
| 268 | 268 | ], |
| 269 | 269 | ], |
| 270 | 270 | ]; |
| 271 | 271 | $notification_details = wp_parse_args( $notification_details, $default ); |
| 272 | - global $pagenow; | |
| 273 | - $notification_details['ctas']['cancel']['link'] = wp_nonce_url( add_query_arg( [ 'nid' => $notification_details['id'] ], admin_url( $pagenow ) ), $notification_details['id'], 'tsdk_dismiss_nonce' ); | |
| 274 | - $notification_html = '<div class="notice notice-success is-dismissible themeisle-sdk-notice" data-notification-id="' . esc_attr( $notification_details['id'] ) . '" id="' . esc_attr( $notification_details['id'] ) . '-notification"> <div class="themeisle-sdk-notification-box">'; | |
| 275 | 272 | |
| 273 | + $notification_html = '<div class="notice notice-success is-dismissible themeisle-sdk-notice" data-notification-id="' . esc_attr( $notification_details['id'] ) . '" id="' . esc_attr( $notification_details['id'] ) . '-notification"> <div class="themeisle-sdk-notification-box">'; | |
| 274 | + | |
| 276 | 275 | if ( ! empty( $notification_details['heading'] ) ) { |
| 277 | 276 | $notification_html .= sprintf( '<h4>%s</h4>', wp_kses_post( $notification_details['heading'] ) ); |
| 278 | 277 | } |
| 279 | 278 | if ( ! empty( $notification_details['message'] ) ) { |
| @@ -343,13 +342,11 @@ | ||
| 343 | 342 | { |
| 344 | 343 | 'nonce': '<?php echo esc_attr( wp_create_nonce( (string) __CLASS__ ) ); ?>', |
| 345 | 344 | 'action': 'themeisle_sdk_dismiss_notice', |
| 346 | 345 | 'id': notification_id, |
| 347 | - 'confirm': confirm, | |
| 348 | - }, | |
| 349 | - ).fail(function() { | |
| 350 | - location.href = encodeURI(link.attr('href')); | |
| 351 | - }); | |
| 346 | + 'confirm': confirm | |
| 347 | + } | |
| 348 | + ); | |
| 352 | 349 | if (confirm === 'yes') { |
| 353 | 350 | $(this).trigger('themeisle-sdk:confirmed'); |
| 354 | 351 | } else { |
| 355 | 352 | $(this).trigger('themeisle-sdk:canceled'); |
| @@ -354,9 +351,9 @@ | ||
| 354 | 351 | } else { |
| 355 | 352 | $(this).trigger('themeisle-sdk:canceled'); |
| 356 | 353 | } |
| 357 | 354 | container.hide(); |
| 358 | - if (confirm === 'no' || link.attr('href') === '#') { | |
| 355 | + if (link.attr('href') === '#') { | |
| 359 | 356 | return false; |
| 360 | 357 | } |
| 361 | 358 | }); |
| 362 | 359 | }); |
| @@ -385,33 +382,8 @@ | ||
| 385 | 382 | update_option( $id, $confirm ); |
| 386 | 383 | do_action( $id . '_process_confirm', $confirm ); |
| 387 | 384 | wp_send_json( [] ); |
| 388 | 385 | } |
| 389 | - /** | |
| 390 | - * Dismiss the notification. | |
| 391 | - */ | |
| 392 | - public static function dismiss_get() { | |
| 393 | - $is_nonce_dismiss = sanitize_text_field( isset( $_GET['tsdk_dismiss_nonce'] ) ? $_GET['tsdk_dismiss_nonce'] : '' ); | |
| 394 | - if ( strlen( $is_nonce_dismiss ) < 5 ) { | |
| 395 | - return; | |
| 396 | - } | |
| 397 | - $id = sanitize_text_field( isset( $_GET['nid'] ) ? $_GET['nid'] : '' ); | |
| 398 | - if ( empty( $id ) ) { | |
| 399 | - return; | |
| 400 | - } | |
| 401 | - $nonce = wp_verify_nonce( sanitize_text_field( $_GET['tsdk_dismiss_nonce'] ), $id ); | |
| 402 | - if ( $nonce !== 1 ) { | |
| 403 | - return; | |
| 404 | - } | |
| 405 | - $ids = wp_list_pluck( self::$notifications, 'id' ); | |
| 406 | - if ( ! in_array( $id, $ids, true ) ) { | |
| 407 | - return; | |
| 408 | - } | |
| 409 | - $confirm = 'no'; | |
| 410 | - self::set_last_active_notification_timestamp(); | |
| 411 | - update_option( $id, $confirm ); | |
| 412 | - do_action( $id . '_process_confirm', $confirm ); | |
| 413 | - } | |
| 414 | 386 | |
| 415 | 387 | /** |
| 416 | 388 | * Check if we should load the notification module. |
| 417 | 389 | * |
| @@ -483,9 +455,8 @@ | ||
| 483 | 455 | ); |
| 484 | 456 | self::$notifications = $notifications; |
| 485 | 457 | add_action( 'admin_notices', array( __CLASS__, 'show_notification' ) ); |
| 486 | 458 | add_action( 'wp_ajax_themeisle_sdk_dismiss_notice', array( __CLASS__, 'dismiss' ) ); |
| 487 | - add_action( 'admin_head', array( __CLASS__, 'dismiss_get' ) ); | |
| 488 | 459 | add_action( 'admin_head', array( __CLASS__, 'setup_notifications' ) ); |
| 489 | 460 | |
| 490 | 461 | return $this; |
| 491 | 462 | } |