| @@ -3,10 +3,8 @@ | ||
| 3 | 3 | |
| 4 | 4 | use Elementor\Api; |
| 5 | 5 | use Elementor\Core\Admin\UI\Components\Button; |
| 6 | 6 | use Elementor\Core\Base\Module; |
| 7 | -use Elementor\Core\Upgrade\Manager; | |
| 8 | -use Elementor\Core\Utils\Hints; | |
| 9 | 7 | use Elementor\Core\Utils\Promotions\Filtered_Promotions_Manager; |
| 10 | 8 | use Elementor\Plugin; |
| 11 | 9 | use Elementor\Settings; |
| 12 | 10 | use Elementor\Tracker; |
| @@ -20,13 +18,9 @@ | ||
| 20 | 18 | |
| 21 | 19 | class Admin_Notices extends Module { |
| 22 | 20 | |
| 23 | 21 | const DEFAULT_EXCLUDED_PAGES = [ 'plugins.php', 'plugin-install.php', 'plugin-editor.php' ]; |
| 24 | - const LOCAL_GOOGLE_FONTS_DISABLED_NOTICE_ID = 'local_google_fonts_disabled'; | |
| 25 | - const LOCAL_GOOGLE_FONTS_NOTICE_MIN_VERSION = '3.33.3'; | |
| 26 | 22 | |
| 27 | - const EXIT_EARLY_FOR_BACKWARD_COMPATIBILITY = false; | |
| 28 | - | |
| 29 | 23 | private $plain_notices = [ |
| 30 | 24 | 'api_notice', |
| 31 | 25 | 'api_upgrade_plugin', |
| 32 | 26 | 'tracker', |
| @@ -36,9 +30,8 @@ | ||
| 36 | 30 | 'experiment_promotion', |
| 37 | 31 | 'site_mailer_promotion', |
| 38 | 32 | 'plugin_image_optimization', |
| 39 | 33 | 'ally_pages_promotion', |
| 40 | - self::LOCAL_GOOGLE_FONTS_DISABLED_NOTICE_ID, | |
| 41 | 34 | ]; |
| 42 | 35 | |
| 43 | 36 | private $elementor_pages_count = null; |
| 44 | 37 | |
| @@ -98,9 +91,9 @@ | ||
| 98 | 91 | if ( ! current_user_can( 'update_plugins' ) ) { |
| 99 | 92 | return false; |
| 100 | 93 | } |
| 101 | 94 | |
| 102 | - if ( ! $this->is_elementor_admin_screen_with_system_info() ) { | |
| 95 | + if ( ! in_array( $this->current_screen_id, [ 'toplevel_page_elementor', 'edit-elementor_library', 'elementor_page_elementor-system-info', 'dashboard' ], true ) ) { | |
| 103 | 96 | return false; |
| 104 | 97 | } |
| 105 | 98 | |
| 106 | 99 | // Check for upgrades. |
| @@ -138,16 +131,16 @@ | ||
| 138 | 131 | $message = sprintf( |
| 139 | 132 | /* translators: 1: Details URL, 2: Accessibility text, 3: Version number, 4: Update URL, 5: Accessibility text. */ |
| 140 | 133 | __( 'There is a new version of Elementor Page Builder available. <a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">View version %3$s details</a> or <a href="%4$s" class="update-link" aria-label="%5$s">update now</a>.', 'elementor' ), |
| 141 | 134 | esc_url( $details_url ), |
| 142 | - sprintf( | |
| 135 | + esc_attr( sprintf( | |
| 143 | 136 | /* translators: %s: Elementor version. */ |
| 144 | - esc_attr__( 'View Elementor version %s details', 'elementor' ), | |
| 137 | + __( 'View Elementor version %s details', 'elementor' ), | |
| 145 | 138 | $new_version |
| 146 | - ), | |
| 139 | + ) ), | |
| 147 | 140 | $new_version, |
| 148 | 141 | esc_url( $upgrade_url ), |
| 149 | - esc_attr__( 'Update Now', 'elementor' ) | |
| 142 | + esc_attr( esc_html__( 'Update Now', 'elementor' ) ) | |
| 150 | 143 | ); |
| 151 | 144 | |
| 152 | 145 | $options = [ |
| 153 | 146 | 'title' => esc_html__( 'Update Notification', 'elementor' ), |
| @@ -174,9 +167,9 @@ | ||
| 174 | 167 | if ( ! current_user_can( 'manage_options' ) ) { |
| 175 | 168 | return false; |
| 176 | 169 | } |
| 177 | 170 | |
| 178 | - if ( ! $this->is_elementor_admin_screen_with_system_info() ) { | |
| 171 | + if ( ! in_array( $this->current_screen_id, [ 'toplevel_page_elementor', 'edit-elementor_library', 'elementor_page_elementor-system-info', 'dashboard' ], true ) ) { | |
| 179 | 172 | return false; |
| 180 | 173 | } |
| 181 | 174 | |
| 182 | 175 | $notice_id = 'admin_notice_api_' . $admin_notice['notice_id']; |
| @@ -396,10 +389,10 @@ | ||
| 396 | 389 | } |
| 397 | 390 | |
| 398 | 391 | $experiments = Plugin::$instance->experiments; |
| 399 | 392 | $is_all_performance_features_active = ( |
| 400 | - $experiments->is_feature_active( 'e_font_icon_svg' ) && | |
| 401 | - $experiments->is_feature_active( 'e_optimized_markup' ) | |
| 393 | + $experiments->is_feature_active( 'e_element_cache' ) && | |
| 394 | + $experiments->is_feature_active( 'e_font_icon_svg' ) | |
| 402 | 395 | ); |
| 403 | 396 | |
| 404 | 397 | if ( $is_all_performance_features_active ) { |
| 405 | 398 | return false; |
| @@ -434,87 +427,8 @@ | ||
| 434 | 427 | private function site_has_woocommerce() { |
| 435 | 428 | return class_exists( 'WooCommerce' ); |
| 436 | 429 | } |
| 437 | 430 | |
| 438 | - private function get_installed_form_plugin_name() { | |
| 439 | - static $detected_form_plugin = null; | |
| 440 | - | |
| 441 | - if ( null !== $detected_form_plugin ) { | |
| 442 | - return $detected_form_plugin; | |
| 443 | - } | |
| 444 | - | |
| 445 | - $form_plugins_constants_to_name_mapper = [ | |
| 446 | - 'WPFORMS_VERSION' => 'WPForms', | |
| 447 | - 'WPCF7_VERSION' => 'Contact Form 7', | |
| 448 | - ]; | |
| 449 | - | |
| 450 | - foreach ( $form_plugins_constants_to_name_mapper as $constant => $name ) { | |
| 451 | - if ( defined( $constant ) ) { | |
| 452 | - $detected_form_plugin = $name; | |
| 453 | - return $detected_form_plugin; | |
| 454 | - } | |
| 455 | - } | |
| 456 | - | |
| 457 | - $form_plugins_classes_to_name_mapper = [ | |
| 458 | - '\GFCommon' => 'Gravity Forms', | |
| 459 | - '\Ninja_Forms' => 'Ninja Forms', | |
| 460 | - ]; | |
| 461 | - | |
| 462 | - foreach ( $form_plugins_classes_to_name_mapper as $class => $name ) { | |
| 463 | - if ( class_exists( $class ) ) { | |
| 464 | - $detected_form_plugin = $name; | |
| 465 | - return $detected_form_plugin; | |
| 466 | - } | |
| 467 | - } | |
| 468 | - | |
| 469 | - $detected_form_plugin = false; | |
| 470 | - return $detected_form_plugin; | |
| 471 | - } | |
| 472 | - | |
| 473 | - private function notice_local_google_fonts_disabled() { | |
| 474 | - | |
| 475 | - if ( ! $this->is_elementor_page() && ! $this->is_elementor_admin_screen() ) { | |
| 476 | - return false; | |
| 477 | - } | |
| 478 | - | |
| 479 | - if ( ! Manager::had_install_prior_to( self::LOCAL_GOOGLE_FONTS_NOTICE_MIN_VERSION ) ) { | |
| 480 | - return false; | |
| 481 | - } | |
| 482 | - | |
| 483 | - if ( User::is_user_notice_viewed( self::LOCAL_GOOGLE_FONTS_DISABLED_NOTICE_ID ) ) { | |
| 484 | - return false; | |
| 485 | - } | |
| 486 | - | |
| 487 | - $is_local_gf_enabled = (bool) get_option( 'elementor_local_google_fonts', '0' ); | |
| 488 | - | |
| 489 | - if ( $is_local_gf_enabled ) { | |
| 490 | - return false; | |
| 491 | - } | |
| 492 | - | |
| 493 | - $options = [ | |
| 494 | - 'title' => esc_html__( 'Important: Local Google Fonts Settings in Elementor', 'elementor' ), | |
| 495 | - 'description' => esc_html__( 'Please note: The "Load Google Fonts Locally" feature has been disabled by default on all websites. To turn it back on, go to Elementor → Settings → Performance → Enable Load Google Fonts Locally.', 'elementor' ), | |
| 496 | - 'id' => self::LOCAL_GOOGLE_FONTS_DISABLED_NOTICE_ID, | |
| 497 | - 'type' => '', | |
| 498 | - 'button' => [ | |
| 499 | - 'text' => esc_html__( 'Take me there', 'elementor' ), | |
| 500 | - 'url' => '../wp-admin/admin.php?page=elementor-settings#tab-performance', | |
| 501 | - 'new_tab' => false, | |
| 502 | - 'type' => 'cta', | |
| 503 | - ], | |
| 504 | - 'button_secondary' => [ | |
| 505 | - 'text' => esc_html__( 'Learn more', 'elementor' ), | |
| 506 | - 'url' => 'https://go.elementor.com/wp-dash-google-fonts-locally-notice/', | |
| 507 | - 'new_tab' => true, | |
| 508 | - 'type' => 'cta', | |
| 509 | - ], | |
| 510 | - ]; | |
| 511 | - | |
| 512 | - $this->print_admin_notice( $options ); | |
| 513 | - | |
| 514 | - return true; | |
| 515 | - } | |
| 516 | - | |
| 517 | 431 | private function notice_ally_pages_promotion() { |
| 518 | 432 | global $pagenow; |
| 519 | 433 | $notice_id = 'ally_pages_promotion'; |
| 520 | 434 | |
| @@ -521,89 +435,38 @@ | ||
| 521 | 435 | if ( 'edit.php' !== $pagenow || empty( $_GET['post_type'] ) || 'page' !== $_GET['post_type'] ) { |
| 522 | 436 | return false; |
| 523 | 437 | } |
| 524 | 438 | |
| 525 | - if ( ! current_user_can( 'manage_options' ) ) { | |
| 439 | + if ( ! current_user_can( 'manage_options' ) || User::is_user_notice_viewed( $notice_id ) ) { | |
| 526 | 440 | return false; |
| 527 | 441 | } |
| 528 | 442 | |
| 529 | - if ( User::is_user_notice_viewed( $notice_id ) ) { | |
| 530 | - return false; | |
| 531 | - } | |
| 532 | - | |
| 443 | + $plugin_file_path = 'pojo-accessibility/pojo-accessibility.php'; | |
| 533 | 444 | $plugin_slug = 'pojo-accessibility'; |
| 534 | - $plugin_file_path = 'pojo-accessibility/pojo-accessibility.php'; | |
| 535 | 445 | |
| 536 | - $one_subscription = Hints::is_plugin_connected_to_one_subscription(); | |
| 537 | - $is_installed = Hints::is_plugin_installed( $plugin_slug ); | |
| 538 | - $is_active = Hints::is_plugin_active( $plugin_slug ); | |
| 539 | - | |
| 540 | - if ( $is_active ) { | |
| 446 | + $cta_data = $this->get_plugin_cta_data( $plugin_slug, $plugin_file_path ); | |
| 447 | + if ( empty( $cta_data ) ) { | |
| 541 | 448 | return false; |
| 542 | 449 | } |
| 543 | 450 | |
| 544 | - if ( $one_subscription ) { | |
| 545 | - $learn_more_url = 'https://go.elementor.com/acc-plg-learn-more-one'; | |
| 546 | - | |
| 547 | - if ( ! $is_installed ) { | |
| 548 | - $description = esc_html__( 'Make sure your site has an accessibility statement page. Install Ally, included in ONE, to create it in a few clicks.', 'elementor' ); | |
| 549 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 550 | - $button_url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 551 | - $campaign_data = [ | |
| 552 | - 'name' => 'elementor_ea11y_campaign', | |
| 553 | - 'campaign' => 'acc-statement-plg-pages-one-install', | |
| 554 | - 'source' => 'wp-pages-one-install', | |
| 555 | - 'medium' => 'wp-dash-one', | |
| 556 | - ]; | |
| 557 | - } elseif ( ! $is_active ) { | |
| 558 | - $description = esc_html__( 'Your ONE subscription includes Ally. Activate it to create your accessibility statement page quickly.', 'elementor' ); | |
| 559 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 560 | - $button_url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 561 | - $campaign_data = [ | |
| 562 | - 'name' => 'elementor_ea11y_campaign', | |
| 563 | - 'campaign' => 'acc-statement-plg-pages-one-activate', | |
| 564 | - 'source' => 'wp-pages-one-activate', | |
| 565 | - 'medium' => 'wp-dash-one', | |
| 566 | - ]; | |
| 567 | - } | |
| 568 | - } else { | |
| 569 | - $description = esc_html__( "Create a more inclusive site experience for all your visitors. With Ally, it's easy to add your statement page in just a few clicks.", 'elementor' ); | |
| 570 | - $learn_more_url = 'https://go.elementor.com/acc-plg-learn-more'; | |
| 571 | - | |
| 572 | - if ( ! $is_installed ) { | |
| 573 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 574 | - $button_url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 575 | - $campaign_data = [ | |
| 576 | - 'name' => 'elementor_ea11y_campaign', | |
| 577 | - 'campaign' => 'acc-statement-plg-pages-install', | |
| 578 | - 'source' => 'wp-pages-install', | |
| 579 | - 'medium' => 'wp-dash', | |
| 580 | - ]; | |
| 581 | - } elseif ( ! $is_active ) { | |
| 582 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 583 | - $button_url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 584 | - $campaign_data = [ | |
| 585 | - 'name' => 'elementor_ea11y_campaign', | |
| 586 | - 'campaign' => 'acc-statement-plg-pages-activate', | |
| 587 | - 'source' => 'wp-pages-activate', | |
| 588 | - 'medium' => 'wp-dash', | |
| 589 | - ]; | |
| 590 | - } | |
| 591 | - } | |
| 592 | - | |
| 593 | 451 | $options = [ |
| 594 | 452 | 'title' => esc_html__( 'Make sure your site has an accessibility statement page', 'elementor' ), |
| 595 | - 'description' => $description, | |
| 453 | + 'description' => esc_html__( 'Create a more inclusive site experience for all your visitors. With Ally, it\'s easy to add your statement page in just a few clicks.', 'elementor' ), | |
| 596 | 454 | 'id' => $notice_id, |
| 597 | 455 | 'type' => 'cta', |
| 598 | 456 | 'button' => [ |
| 599 | - 'text' => $button_text, | |
| 600 | - 'url' => self::add_plg_campaign_data( $button_url, $campaign_data ), | |
| 457 | + 'text' => $cta_data['text'], | |
| 458 | + 'url' => self::add_plg_campaign_data( $cta_data['url'], [ | |
| 459 | + 'name' => 'elementor_ea11y_campaign', | |
| 460 | + 'campaign' => 'acc-statement-plg-pages', | |
| 461 | + 'source' => 'wp-pages', | |
| 462 | + 'medium' => 'wp-dash', | |
| 463 | + ] ), | |
| 601 | 464 | 'type' => 'cta', |
| 602 | 465 | ], |
| 603 | 466 | 'button_secondary' => [ |
| 604 | 467 | 'text' => esc_html__( 'Learn more', 'elementor' ), |
| 605 | - 'url' => $learn_more_url, | |
| 468 | + 'url' => 'https://go.elementor.com/acc-plg-learn-more', | |
| 606 | 469 | 'new_tab' => true, |
| 607 | 470 | 'type' => 'cta', |
| 608 | 471 | ], |
| 609 | 472 | ]; |
| @@ -621,9 +484,9 @@ | ||
| 621 | 484 | if ( ! $has_forms && ! $has_woocommerce ) { |
| 622 | 485 | return false; |
| 623 | 486 | } |
| 624 | 487 | |
| 625 | - if ( ! $this->is_elementor_page() && ! $this->is_elementor_admin_screen() ) { | |
| 488 | + if ( ! $this->is_elementor_page() && ! in_array( $this->current_screen_id, [ 'toplevel_page_elementor', 'edit-elementor_library', 'dashboard' ], true ) ) { | |
| 626 | 489 | return false; |
| 627 | 490 | } |
| 628 | 491 | |
| 629 | 492 | if ( ( Utils::has_pro() && ! $has_woocommerce ) || ! current_user_can( 'install_plugins' ) || User::is_user_notice_viewed( $notice_id ) ) { |
| @@ -629,152 +492,40 @@ | ||
| 629 | 492 | if ( ( Utils::has_pro() && ! $has_woocommerce ) || ! current_user_can( 'install_plugins' ) || User::is_user_notice_viewed( $notice_id ) ) { |
| 630 | 493 | return false; |
| 631 | 494 | } |
| 632 | 495 | |
| 496 | + $plugin_file_path = 'site-mailer/site-mailer.php'; | |
| 633 | 497 | $plugin_slug = 'site-mailer'; |
| 634 | - $plugin_file_path = 'site-mailer/site-mailer.php'; | |
| 635 | 498 | |
| 636 | - $one_subscription = Hints::is_plugin_connected_to_one_subscription(); | |
| 637 | - $is_woocommerce = $this->should_render_woocommerce_hint( $has_forms, $has_woocommerce ); | |
| 638 | - $is_installed = Hints::is_plugin_installed( $plugin_slug ); | |
| 639 | - $is_active = Hints::is_plugin_active( $plugin_slug ); | |
| 640 | - | |
| 641 | - if ( $is_active ) { | |
| 499 | + $cta_data = $this->get_plugin_cta_data( $plugin_slug, $plugin_file_path ); | |
| 500 | + if ( empty( $cta_data ) ) { | |
| 642 | 501 | return false; |
| 643 | 502 | } |
| 644 | 503 | |
| 645 | - if ( $one_subscription ) { | |
| 646 | - if ( $is_woocommerce ) { | |
| 647 | - $title = esc_html__( 'Improve transactional email deliverability', 'elementor' ); | |
| 648 | - | |
| 649 | - if ( ! $is_installed ) { | |
| 650 | - $description = esc_html__( 'Use Site Mailer to ensure store emails like purchase confirmations and shipping updates reach the inbox every time. Included in your ONE subscription.', 'elementor' ); | |
| 651 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 652 | - $button_url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 653 | - $campaign_data = [ | |
| 654 | - 'name' => 'elementor_site_mailer_campaign', | |
| 655 | - 'campaign' => 'sm-plg-one', | |
| 656 | - 'source' => 'sm-core-woo-one-install', | |
| 657 | - 'medium' => 'wp-dash', | |
| 658 | - ]; | |
| 659 | - } elseif ( ! $is_active ) { | |
| 660 | - $description = esc_html__( 'Site Mailer is installed and included in your ONE subscription. Activate it to ensure store emails like purchase confirmations and shipping updates reach the inbox every time.', 'elementor' ); | |
| 661 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 662 | - $button_url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 663 | - $campaign_data = [ | |
| 664 | - 'name' => 'elementor_site_mailer_campaign', | |
| 665 | - 'campaign' => 'sm-plg-one', | |
| 666 | - 'source' => 'sm-core-woo-one-activate', | |
| 667 | - 'medium' => 'wp-dash', | |
| 668 | - ]; | |
| 669 | - } | |
| 670 | - } else { | |
| 671 | - $title = esc_html__( 'Keep your form emails out of the spam folder', 'elementor' ); | |
| 672 | - | |
| 673 | - if ( ! $is_installed ) { | |
| 674 | - $description = esc_html__( 'Use Site Mailer to ensure emails reach the inbox and track delivery with built-in logs. Included in your ONE subscription.', 'elementor' ); | |
| 675 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 676 | - $button_url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 677 | - $campaign_data = [ | |
| 678 | - 'name' => 'elementor_site_mailer_campaign', | |
| 679 | - 'campaign' => 'sm-plg-one', | |
| 680 | - 'source' => 'sm-core-form-one-install', | |
| 681 | - 'medium' => 'wp-dash', | |
| 682 | - ]; | |
| 683 | - } elseif ( ! $is_active ) { | |
| 684 | - $description = esc_html__( 'Use Site Mailer to ensure emails reach the inbox and track delivery with built-in logs. Site Mailer is included in your ONE subscription. Activate it to continue.', 'elementor' ); | |
| 685 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 686 | - $button_url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 687 | - $campaign_data = [ | |
| 688 | - 'name' => 'elementor_site_mailer_campaign', | |
| 689 | - 'campaign' => 'sm-plg-one', | |
| 690 | - 'source' => 'sm-core-form-one-activate', | |
| 691 | - 'medium' => 'wp-dash', | |
| 692 | - ]; | |
| 693 | - } | |
| 694 | - } | |
| 695 | - // phpcs:ignore Universal.ControlStructures.DisallowLonelyIf.Found | |
| 696 | - } else { | |
| 697 | - if ( $is_woocommerce ) { | |
| 698 | - $title = esc_html__( 'Improve Transactional Email Deliverability', 'elementor' ); | |
| 699 | - $description = esc_html__( "Use Elementor's Site Mailer to ensure your store emails like purchase confirmations, shipping updates and more are reliably delivered.", 'elementor' ); | |
| 700 | - | |
| 701 | - if ( ! $is_installed ) { | |
| 702 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 703 | - $button_url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 704 | - $campaign_data = [ | |
| 705 | - 'name' => 'elementor_site_mailer_campaign', | |
| 706 | - 'campaign' => 'sm-plg', | |
| 707 | - 'source' => 'sm-core-woo-install', | |
| 708 | - 'medium' => 'wp-dash', | |
| 709 | - ]; | |
| 710 | - } elseif ( ! $is_active ) { | |
| 711 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 712 | - $button_url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 713 | - $campaign_data = [ | |
| 714 | - 'name' => 'elementor_site_mailer_campaign', | |
| 715 | - 'campaign' => 'sm-plg', | |
| 716 | - 'source' => 'sm-core-woo-activate', | |
| 717 | - 'medium' => 'wp-dash', | |
| 718 | - ]; | |
| 719 | - } | |
| 720 | - } else { | |
| 721 | - $title = esc_html__( 'Ensure your form emails avoid the spam folder!', 'elementor' ); | |
| 722 | - $description = esc_html__( 'Use Site Mailer for improved email deliverability, detailed email logs, and an easy setup.', 'elementor' ); | |
| 723 | - | |
| 724 | - if ( ! $is_installed ) { | |
| 725 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 726 | - $button_url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 727 | - $campaign_data = [ | |
| 728 | - 'name' => 'elementor_site_mailer_campaign', | |
| 729 | - 'campaign' => 'sm-plg', | |
| 730 | - 'source' => 'sm-core-form-install', | |
| 731 | - 'medium' => 'wp-dash', | |
| 732 | - ]; | |
| 733 | - } elseif ( ! $is_active ) { | |
| 734 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 735 | - $button_url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 736 | - $campaign_data = [ | |
| 737 | - 'name' => 'elementor_site_mailer_campaign', | |
| 738 | - 'campaign' => 'sm-plg', | |
| 739 | - 'source' => 'sm-core-form-activate', | |
| 740 | - 'medium' => 'wp-dash', | |
| 741 | - ]; | |
| 742 | - } | |
| 743 | - } | |
| 744 | - } | |
| 745 | - | |
| 746 | - $learn_more_url = $one_subscription && $is_woocommerce | |
| 747 | - ? 'https://go.elementor.com/sm-woo-learn-more-one' | |
| 748 | - : 'https://go.elementor.com/sm-core-form/'; | |
| 749 | - | |
| 750 | 504 | $options = [ |
| 751 | - 'title' => $title, | |
| 752 | - 'description' => $description, | |
| 505 | + 'title' => esc_html__( 'Ensure your form emails avoid the spam folder!', 'elementor' ), | |
| 506 | + 'description' => esc_html__( 'Use Site Mailer for improved email deliverability, detailed email logs, and an easy setup.', 'elementor' ), | |
| 753 | 507 | 'id' => $notice_id, |
| 754 | 508 | 'type' => 'cta', |
| 755 | 509 | 'button' => [ |
| 756 | - 'text' => $button_text, | |
| 757 | - 'url' => self::add_plg_campaign_data( $button_url, $campaign_data ), | |
| 510 | + 'text' => $cta_data['text'], | |
| 511 | + 'url' => $cta_data['url'], | |
| 758 | 512 | 'type' => 'cta', |
| 759 | - 'data' => [ | |
| 760 | - 'campaign' => $campaign_data['campaign'], | |
| 761 | - 'source' => $campaign_data['source'], | |
| 762 | - 'medium' => $campaign_data['medium'], | |
| 763 | - ], | |
| 764 | 513 | ], |
| 765 | 514 | 'button_secondary' => [ |
| 766 | 515 | 'text' => esc_html__( 'Learn more', 'elementor' ), |
| 767 | - 'url' => $learn_more_url, | |
| 516 | + 'url' => 'https://go.elementor.com/sm-core-form/', | |
| 768 | 517 | 'new_tab' => true, |
| 769 | 518 | 'type' => 'cta', |
| 770 | 519 | ], |
| 771 | 520 | ]; |
| 772 | 521 | |
| 773 | - if ( $is_woocommerce ) { | |
| 522 | + if ( $this->should_render_woocommerce_hint( $has_forms, $has_woocommerce ) ) { | |
| 774 | 523 | // We include WP's default notice class so it will be properly handled by WP's js handler |
| 775 | 524 | // And add a new one to distinguish between the two types of notices |
| 776 | 525 | $options['classes'] = [ 'notice', 'e-notice', 'sm-notice-wc' ]; |
| 526 | + $options['title'] = esc_html__( 'Improve Transactional Email Deliverability', 'elementor' ); | |
| 527 | + $options['description'] = esc_html__( 'Use Elementor\'s Site Mailer to ensure your store emails like purchase confirmations, shipping updates and more are reliably delivered.', 'elementor' ); | |
| 777 | 528 | } |
| 778 | 529 | |
| 779 | 530 | $this->print_admin_notice( $options ); |
| 780 | 531 | |
| @@ -804,38 +555,19 @@ | ||
| 804 | 555 | private function is_elementor_page(): bool { |
| 805 | 556 | return 0 === strpos( $this->current_screen_id, 'elementor_page' ); |
| 806 | 557 | } |
| 807 | 558 | |
| 808 | - private function is_elementor_admin_screen(): bool { | |
| 809 | - return in_array( $this->current_screen_id, [ 'toplevel_page_elementor', 'edit-elementor_library' ], true ); | |
| 810 | - } | |
| 811 | - | |
| 812 | - private function is_elementor_admin_screen_with_system_info(): bool { | |
| 813 | - return in_array( $this->current_screen_id, [ 'toplevel_page_elementor', 'edit-elementor_library', 'elementor_page_elementor-system-info', 'dashboard' ], true ); | |
| 814 | - } | |
| 815 | - private function get_plugin_button_install_url( $plugin_slug ) { | |
| 816 | - return wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $plugin_slug ), 'install-plugin_' . $plugin_slug ); | |
| 817 | - } | |
| 818 | - | |
| 819 | - private function get_plugin_button_activate_url( $plugin_file_path ) { | |
| 820 | - return wp_nonce_url( 'plugins.php?action=activate&plugin=' . $plugin_file_path . '&plugin_status=all&paged=1&s', 'activate-plugin_' . $plugin_file_path ); | |
| 821 | - } | |
| 822 | - | |
| 823 | - private function get_plugin_button_connect_url( $plugin_settings_page ) { | |
| 824 | - return self_admin_url( $plugin_settings_page ); | |
| 825 | - } | |
| 826 | - | |
| 827 | 559 | private function get_plugin_cta_data( $plugin_slug, $plugin_file_path ) { |
| 828 | - if ( Hints::is_plugin_active( $plugin_slug ) ) { | |
| 560 | + if ( is_plugin_active( $plugin_file_path ) ) { | |
| 829 | 561 | return false; |
| 830 | 562 | } |
| 831 | 563 | |
| 832 | - if ( Hints::is_plugin_installed( $plugin_slug ) ) { | |
| 833 | - $url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 834 | - $cta_text = esc_html__( 'Activate now', 'elementor' ); | |
| 564 | + if ( $this->is_plugin_installed( $plugin_file_path ) ) { | |
| 565 | + $url = wp_nonce_url( 'plugins.php?action=activate&plugin=' . $plugin_file_path . '&plugin_status=all&paged=1&s', 'activate-plugin_' . $plugin_file_path ); | |
| 566 | + $cta_text = esc_html__( 'Activate Plugin', 'elementor' ); | |
| 835 | 567 | } else { |
| 836 | - $url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 837 | - $cta_text = esc_html__( 'Install now', 'elementor' ); | |
| 568 | + $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $plugin_slug ), 'install-plugin_' . $plugin_slug ); | |
| 569 | + $cta_text = esc_html__( 'Install Plugin', 'elementor' ); | |
| 838 | 570 | } |
| 839 | 571 | |
| 840 | 572 | return [ |
| 841 | 573 | 'url' => $url, |
| @@ -856,16 +588,12 @@ | ||
| 856 | 588 | if ( 'upload' !== $this->current_screen_id ) { |
| 857 | 589 | return false; |
| 858 | 590 | } |
| 859 | 591 | |
| 860 | - if ( ! current_user_can( 'manage_options' ) ) { | |
| 592 | + if ( ! current_user_can( 'manage_options' ) || User::is_user_notice_viewed( $notice_id ) ) { | |
| 861 | 593 | return false; |
| 862 | 594 | } |
| 863 | 595 | |
| 864 | - if ( User::is_user_notice_viewed( $notice_id ) ) { | |
| 865 | - return false; | |
| 866 | - } | |
| 867 | - | |
| 868 | 596 | $attachments = new \WP_Query( [ |
| 869 | 597 | 'post_type' => 'attachment', |
| 870 | 598 | 'post_status' => 'any', |
| 871 | 599 | 'fields' => 'ids', |
| @@ -874,79 +602,26 @@ | ||
| 874 | 602 | if ( 1 > $attachments->found_posts ) { |
| 875 | 603 | return false; |
| 876 | 604 | } |
| 877 | 605 | |
| 606 | + $plugin_file_path = 'image-optimization/image-optimization.php'; | |
| 878 | 607 | $plugin_slug = 'image-optimization'; |
| 879 | - $plugin_file_path = 'image-optimization/image-optimization.php'; | |
| 880 | 608 | |
| 881 | - $one_subscription = Hints::is_plugin_connected_to_one_subscription(); | |
| 882 | - $is_installed = Hints::is_plugin_installed( $plugin_slug ); | |
| 883 | - $is_active = Hints::is_plugin_active( $plugin_slug ); | |
| 609 | + $cta_data = $this->get_plugin_cta_data( $plugin_slug, $plugin_file_path ); | |
| 884 | 610 | |
| 885 | - if ( $is_active ) { | |
| 611 | + if ( empty( $cta_data ) ) { | |
| 886 | 612 | return false; |
| 887 | 613 | } |
| 888 | 614 | |
| 889 | - if ( $one_subscription ) { | |
| 890 | - if ( ! $is_installed ) { | |
| 891 | - $description = esc_html__( 'Automatically optimize images to improve site speed and performance. Included with your ONE subscription.', 'elementor' ); | |
| 892 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 893 | - $button_url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 894 | - $campaign_data = [ | |
| 895 | - 'name' => 'elementor_image_optimization_campaign', | |
| 896 | - 'campaign' => 'io-plg-one', | |
| 897 | - 'source' => 'io-wp-media-library-one-install', | |
| 898 | - 'medium' => 'wp-dash-one', | |
| 899 | - ]; | |
| 900 | - } elseif ( ! $is_active ) { | |
| 901 | - $description = esc_html__( 'Your ONE subscription includes Image Optimizer. Activate it to optimize images and improve site performance.', 'elementor' ); | |
| 902 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 903 | - $button_url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 904 | - $campaign_data = [ | |
| 905 | - 'name' => 'elementor_image_optimization_campaign', | |
| 906 | - 'campaign' => 'io-plg-one', | |
| 907 | - 'source' => 'io-wp-media-library-one-activate', | |
| 908 | - 'medium' => 'wp-dash-one', | |
| 909 | - ]; | |
| 910 | - } | |
| 911 | - } else { | |
| 912 | - $description = esc_html__( 'Automatically compress and optimize images, resize larger files, or convert to WebP. Optimize images individually, in bulk, or on upload.', 'elementor' ); | |
| 913 | - | |
| 914 | - if ( ! $is_installed ) { | |
| 915 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 916 | - $button_url = $this->get_plugin_button_install_url( $plugin_slug ); | |
| 917 | - $campaign_data = [ | |
| 918 | - 'name' => 'elementor_image_optimization_campaign', | |
| 919 | - 'campaign' => 'io-plg', | |
| 920 | - 'source' => 'io-wp-media-library-install', | |
| 921 | - 'medium' => 'wp-dash', | |
| 922 | - ]; | |
| 923 | - } elseif ( ! $is_active ) { | |
| 924 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 925 | - $button_url = $this->get_plugin_button_activate_url( $plugin_file_path ); | |
| 926 | - $campaign_data = [ | |
| 927 | - 'name' => 'elementor_image_optimization_campaign', | |
| 928 | - 'campaign' => 'io-plg', | |
| 929 | - 'source' => 'io-wp-media-library-activate', | |
| 930 | - 'medium' => 'wp-dash', | |
| 931 | - ]; | |
| 932 | - } | |
| 933 | - } | |
| 934 | - | |
| 935 | 615 | $options = [ |
| 936 | - 'title' => esc_html__( 'Speed up your website with Image Optimizer', 'elementor' ), | |
| 937 | - 'description' => $description, | |
| 616 | + 'title' => esc_html__( 'Speed up your website with Image Optimizer by Elementor', 'elementor' ), | |
| 617 | + 'description' => esc_html__( 'Automatically compress and optimize images, resize larger files, or convert to WebP. Optimize images individually, in bulk, or on upload.', 'elementor' ), | |
| 938 | 618 | 'id' => $notice_id, |
| 939 | 619 | 'type' => 'cta', |
| 940 | - 'button' => [ | |
| 941 | - 'text' => $button_text, | |
| 942 | - 'url' => self::add_plg_campaign_data( $button_url, $campaign_data ), | |
| 620 | + 'button_secondary' => [ | |
| 621 | + 'text' => $cta_data['text'], | |
| 622 | + 'url' => $cta_data['url'], | |
| 943 | 623 | 'type' => 'cta', |
| 944 | - 'data' => [ | |
| 945 | - 'campaign' => $campaign_data['campaign'], | |
| 946 | - 'source' => $campaign_data['source'], | |
| 947 | - 'medium' => $campaign_data['medium'], | |
| 948 | - ], | |
| 949 | 624 | ], |
| 950 | 625 | ]; |
| 951 | 626 | |
| 952 | 627 | $this->print_admin_notice( $options ); |
| @@ -953,8 +628,14 @@ | ||
| 953 | 628 | |
| 954 | 629 | return true; |
| 955 | 630 | } |
| 956 | 631 | |
| 632 | + private function is_plugin_installed( $file_path ): bool { | |
| 633 | + $installed_plugins = get_plugins(); | |
| 634 | + | |
| 635 | + return isset( $installed_plugins[ $file_path ] ); | |
| 636 | + } | |
| 637 | + | |
| 957 | 638 | public function print_admin_notice( array $options, $exclude_pages = self::DEFAULT_EXCLUDED_PAGES ) { |
| 958 | 639 | global $pagenow; |
| 959 | 640 | |
| 960 | 641 | if ( in_array( $pagenow, $exclude_pages, true ) ) { |
| @@ -967,9 +648,9 @@ | ||
| 967 | 648 | 'description' => '', |
| 968 | 649 | 'classes' => [ 'notice', 'e-notice' ], // We include WP's default notice class so it will be properly handled by WP's js handler |
| 969 | 650 | 'type' => '', |
| 970 | 651 | 'dismissible' => true, |
| 971 | - 'icon' => 'eicon-elementor-circle', | |
| 652 | + 'icon' => 'eicon-elementor', | |
| 972 | 653 | 'button' => [], |
| 973 | 654 | 'button_secondary' => [], |
| 974 | 655 | ]; |
| 975 | 656 | |
| @@ -982,12 +663,9 @@ | ||
| 982 | 663 | if ( $options['type'] ) { |
| 983 | 664 | $notice_classes[] = 'e-notice--' . $options['type']; |
| 984 | 665 | } |
| 985 | 666 | |
| 986 | - $wrapper_attributes = [ | |
| 987 | - 'role' => 'region', | |
| 988 | - 'aria-label' => esc_html__( 'Elementor notice', 'elementor' ), | |
| 989 | - ]; | |
| 667 | + $wrapper_attributes = []; | |
| 990 | 668 | |
| 991 | 669 | if ( $options['dismissible'] ) { |
| 992 | 670 | $label = esc_html__( 'Dismiss this notice.', 'elementor' ); |
| 993 | 671 | $notice_classes[] = 'e-notice--dismissible'; |
| @@ -1005,12 +683,8 @@ | ||
| 1005 | 683 | |
| 1006 | 684 | if ( $options['id'] ) { |
| 1007 | 685 | $wrapper_attributes['data-notice_id'] = $options['id']; |
| 1008 | 686 | } |
| 1009 | - | |
| 1010 | - if ( ! empty( $options['source'] ) ) { | |
| 1011 | - $wrapper_attributes['data-source'] = $options['source']; | |
| 1012 | - } | |
| 1013 | 687 | ?> |
| 1014 | 688 | <div <?php Utils::print_html_attributes( $wrapper_attributes ); ?>> |
| 1015 | 689 | <?php echo $dismiss_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> |
| 1016 | 690 | <div class="e-notice__aside"> |
| @@ -1027,9 +701,8 @@ | ||
| 1027 | 701 | |
| 1028 | 702 | <?php if ( ! empty( $options['button']['text'] ) || ! empty( $options['button_secondary']['text'] ) ) { ?> |
| 1029 | 703 | <div class="e-notice__actions"> |
| 1030 | 704 | <?php |
| 1031 | - $one_subscription = Hints::is_plugin_connected_to_one_subscription(); | |
| 1032 | 705 | foreach ( [ $options['button'], $options['button_secondary'] ] as $index => $button_settings ) { |
| 1033 | 706 | if ( empty( $button_settings['variant'] ) && $index ) { |
| 1034 | 707 | $button_settings['variant'] = 'outline'; |
| 1035 | 708 | } |
| @@ -1037,20 +710,8 @@ | ||
| 1037 | 710 | if ( empty( $button_settings['text'] ) ) { |
| 1038 | 711 | continue; |
| 1039 | 712 | } |
| 1040 | 713 | |
| 1041 | - if ( $one_subscription ) { | |
| 1042 | - if ( ! isset( $button_settings['classes'] ) ) { | |
| 1043 | - $button_settings['classes'] = []; | |
| 1044 | - } | |
| 1045 | - if ( ! is_array( $button_settings['classes'] ) ) { | |
| 1046 | - $button_settings['classes'] = [ $button_settings['classes'] ]; | |
| 1047 | - } | |
| 1048 | - // index 0 = button, index 1 = button_secondary | |
| 1049 | - $button_class = ( 0 === $index ) ? 'button-primary' : 'button-secondary'; | |
| 1050 | - $button_settings['classes'][] = $button_class; | |
| 1051 | - } | |
| 1052 | - | |
| 1053 | 714 | $button = new Button( $button_settings ); |
| 1054 | 715 | $button->print_button(); |
| 1055 | 716 | } ?> |
| 1056 | 717 | </div> |
| @@ -1118,9 +779,9 @@ | ||
| 1118 | 779 | |
| 1119 | 780 | set_transient( sanitize_key( $_GET['plg_campaign_name'] ), $campaign_data, 30 * DAY_IN_SECONDS ); |
| 1120 | 781 | } |
| 1121 | 782 | |
| 1122 | - public static function add_plg_campaign_data( $url, $campaign_data ) { | |
| 783 | + private static function add_plg_campaign_data( $url, $campaign_data ) { | |
| 1123 | 784 | |
| 1124 | 785 | foreach ( [ 'name', 'campaign' ] as $key ) { |
| 1125 | 786 | if ( empty( $campaign_data[ $key ] ) ) { |
| 1126 | 787 | return $url; |
| @@ -1142,9 +803,8 @@ | ||
| 1142 | 803 | */ |
| 1143 | 804 | public function __construct() { |
| 1144 | 805 | add_action( 'admin_notices', [ $this, 'admin_notices' ], 20 ); |
| 1145 | 806 | add_action( 'admin_action_install-plugin', [ $this, 'maybe_log_campaign' ] ); |
| 1146 | - add_action( 'admin_action_activate', [ $this, 'maybe_log_campaign' ] ); | |
| 1147 | 807 | } |
| 1148 | 808 | |
| 1149 | 809 | /** |
| 1150 | 810 | * Get module name. |
