| @@ -13,9 +13,8 @@ | ||
| 13 | 13 | use Elementor\Settings; |
| 14 | 14 | use Elementor\User; |
| 15 | 15 | use Elementor\Utils; |
| 16 | 16 | use Elementor\Core\Utils\Hints; |
| 17 | -use Elementor\Core\DocumentTypes\Page; | |
| 18 | 17 | |
| 19 | 18 | if ( ! defined( 'ABSPATH' ) ) { |
| 20 | 19 | exit; // Exit if accessed directly. |
| 21 | 20 | } |
| @@ -373,9 +372,9 @@ | ||
| 373 | 372 | array_unshift( $links, $settings_link ); |
| 374 | 373 | |
| 375 | 374 | $go_pro_text = esc_html__( 'Get Elementor Pro', 'elementor' ); |
| 376 | 375 | if ( Utils::is_sale_time() ) { |
| 377 | - $go_pro_text = esc_html__( 'Sale! Upgrade Now', 'elementor' ); | |
| 376 | + $go_pro_text = esc_html__( 'Discounted Upgrades Now!', 'elementor' ); | |
| 378 | 377 | } |
| 379 | 378 | |
| 380 | 379 | $links['go_pro'] = sprintf( '<a href="%1$s" target="_blank" class="elementor-plugins-gopro">%2$s</a>', 'https://go.elementor.com/go-pro-wp-plugins/', $go_pro_text ); |
| 381 | 380 | |
| @@ -508,9 +507,9 @@ | ||
| 508 | 507 | ?> |
| 509 | 508 | <div class="e-overview__header"> |
| 510 | 509 | <?php if ( $show_versions ) { ?> |
| 511 | 510 | <div class="e-overview__logo"> |
| 512 | - <div class="e-logo-wrapper"><i class="eicon-elementor-circle"></i></div> | |
| 511 | + <div class="e-logo-wrapper"><i class="eicon-elementor"></i></div> | |
| 513 | 512 | </div> |
| 514 | 513 | <div class="e-overview__versions"> |
| 515 | 514 | <span class="e-overview__version"><?php echo esc_html__( 'Elementor', 'elementor' ); ?> v<?php echo ELEMENTOR_VERSION; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span> |
| 516 | 515 | <?php |
| @@ -750,78 +749,8 @@ | ||
| 750 | 749 | |
| 751 | 750 | die; |
| 752 | 751 | } |
| 753 | 752 | |
| 754 | - public function admin_action_site_settings_redirect() { | |
| 755 | - check_admin_referer( 'elementor_action_site_settings_redirect' ); | |
| 756 | - | |
| 757 | - if ( ! current_user_can( 'edit_theme_options' ) ) { | |
| 758 | - wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'elementor' ) ); | |
| 759 | - } | |
| 760 | - | |
| 761 | - $active_tab = filter_input( INPUT_GET, 'active-tab', FILTER_SANITIZE_ENCODED ); | |
| 762 | - | |
| 763 | - $site_settings_url_config = Page::get_site_settings_url_config( $active_tab ); | |
| 764 | - | |
| 765 | - if ( empty( $site_settings_url_config['url'] ) ) { | |
| 766 | - wp_die( esc_html__( 'Unable to create or access Site Settings page.', 'elementor' ) ); | |
| 767 | - } | |
| 768 | - | |
| 769 | - wp_safe_redirect( $site_settings_url_config['url'] ); | |
| 770 | - | |
| 771 | - die; | |
| 772 | - } | |
| 773 | - | |
| 774 | - /** | |
| 775 | - * Admin action edit website. | |
| 776 | - * | |
| 777 | - * Redirects to the homepage edit URL if it exists and is built with Elementor, | |
| 778 | - * otherwise redirects to create a new page. | |
| 779 | - * | |
| 780 | - * Fired by `admin_action_elementor_edit_website` action. | |
| 781 | - * | |
| 782 | - * @since 3.x.x | |
| 783 | - * @access public | |
| 784 | - */ | |
| 785 | - public function admin_action_edit_website_redirect() { | |
| 786 | - check_admin_referer( 'elementor_action_edit_website' ); | |
| 787 | - | |
| 788 | - if ( ! User::is_current_user_can_edit_post_type( 'page' ) ) { | |
| 789 | - wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'elementor' ) ); | |
| 790 | - } | |
| 791 | - | |
| 792 | - $homepage_id = $this->get_homepage_id(); | |
| 793 | - $edit_url = $this->get_edit_website_url( $homepage_id ); | |
| 794 | - | |
| 795 | - wp_safe_redirect( $edit_url ); | |
| 796 | - | |
| 797 | - die; | |
| 798 | - } | |
| 799 | - | |
| 800 | - private function get_homepage_id(): ?int { | |
| 801 | - if ( get_option( 'show_on_front' ) !== 'page' ) { | |
| 802 | - return null; | |
| 803 | - } | |
| 804 | - | |
| 805 | - $homepage_id = get_option( 'page_on_front' ); | |
| 806 | - | |
| 807 | - return $homepage_id ? (int) $homepage_id : null; | |
| 808 | - } | |
| 809 | - | |
| 810 | - private function get_edit_website_url( ?int $homepage_id ): string { | |
| 811 | - if ( ! $homepage_id ) { | |
| 812 | - return Plugin::$instance->documents->get_create_new_post_url( 'page' ); | |
| 813 | - } | |
| 814 | - | |
| 815 | - $document = Plugin::$instance->documents->get( $homepage_id ); | |
| 816 | - | |
| 817 | - if ( ! $document || ! $document->is_built_with_elementor() ) { | |
| 818 | - return Plugin::$instance->documents->get_create_new_post_url( 'page' ); | |
| 819 | - } | |
| 820 | - | |
| 821 | - return $document->get_edit_url(); | |
| 822 | - } | |
| 823 | - | |
| 824 | 753 | private function get_allowed_fields_for_role() { |
| 825 | 754 | $allowed_fields = [ |
| 826 | 755 | 'post_title', |
| 827 | 756 | 'post_content', |
| @@ -1023,10 +952,8 @@ | ||
| 1023 | 952 | add_action( 'wp_dashboard_setup', [ $this, 'register_dashboard_widgets' ] ); |
| 1024 | 953 | |
| 1025 | 954 | // Admin Actions |
| 1026 | 955 | add_action( 'admin_action_elementor_new_post', [ $this, 'admin_action_new_post' ] ); |
| 1027 | - add_action( 'admin_action_elementor_site_settings_redirect', [ $this, 'admin_action_site_settings_redirect' ] ); | |
| 1028 | - add_action( 'admin_action_elementor_edit_website_redirect', [ $this, 'admin_action_edit_website_redirect' ] ); | |
| 1029 | 956 | |
| 1030 | 957 | add_action( 'current_screen', [ $this, 'init_new_template' ] ); |
| 1031 | 958 | add_action( 'current_screen', [ $this, 'init_floating_elements' ] ); |
| 1032 | 959 | add_action( 'current_screen', [ $this, 'init_beta_tester' ] ); |
| @@ -1105,11 +1032,9 @@ | ||
| 1105 | 1032 | } )->all(); |
| 1106 | 1033 | } |
| 1107 | 1034 | |
| 1108 | 1035 | private function maybe_enqueue_hints() { |
| 1109 | - $plugin_slug = 'image-optimization'; | |
| 1110 | - | |
| 1111 | - if ( ! Hints::should_display_hint( $plugin_slug ) ) { | |
| 1036 | + if ( ! Hints::should_display_hint( 'image-optimization' ) ) { | |
| 1112 | 1037 | return; |
| 1113 | 1038 | } |
| 1114 | 1039 | |
| 1115 | 1040 | wp_register_script( |
| @@ -1119,48 +1044,16 @@ | ||
| 1119 | 1044 | ELEMENTOR_VERSION, |
| 1120 | 1045 | true |
| 1121 | 1046 | ); |
| 1122 | 1047 | |
| 1123 | - $one_subscription = Hints::is_plugin_connected_to_one_subscription(); | |
| 1124 | - $is_installed = Hints::is_plugin_installed( $plugin_slug ); | |
| 1125 | - $is_active = Hints::is_plugin_active( $plugin_slug ); | |
| 1048 | + $content = sprintf("%1\$s <a class='e-btn-1' href='%2\$s' target='_blank'>%3\$s</a>!", | |
| 1049 | + __( 'Optimize your images to enhance site performance by using Image Optimizer.', 'elementor' ), | |
| 1050 | + Hints::get_plugin_action_url( 'image-optimization' ), | |
| 1051 | + ( Hints::is_plugin_installed( 'image-optimization' ) ? __( 'Activate', 'elementor' ) : __( 'Install', 'elementor' ) ) . ' ' . __( 'Image Optimizer', 'elementor' ) | |
| 1052 | + ); | |
| 1126 | 1053 | |
| 1127 | - if ( $is_active ) { | |
| 1128 | - return; | |
| 1129 | - } | |
| 1130 | - | |
| 1131 | - if ( $one_subscription ) { | |
| 1132 | - if ( ! $is_installed ) { | |
| 1133 | - $description = esc_html__( 'Automatically optimize images to improve site speed and performance. Included with your ONE subscription.', 'elementor' ); | |
| 1134 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 1135 | - $button_url = Hints::get_plugin_install_url( $plugin_slug ); | |
| 1136 | - } elseif ( ! $is_active ) { | |
| 1137 | - $description = esc_html__( 'Image Optimizer is installed and included in your ONE subscription. Activate it to optimize images and improve site performance.', 'elementor' ); | |
| 1138 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 1139 | - $button_url = Hints::get_plugin_activate_url( $plugin_slug ); | |
| 1140 | - } | |
| 1141 | - } else { | |
| 1142 | - $description = esc_html__( 'Optimize your images to enhance site performance by using Image Optimizer.', 'elementor' ); | |
| 1143 | - if ( ! $is_installed ) { | |
| 1144 | - $button_text = esc_html__( 'Install now', 'elementor' ); | |
| 1145 | - $button_url = Hints::get_plugin_install_url( $plugin_slug ); | |
| 1146 | - } elseif ( ! $is_active ) { | |
| 1147 | - $button_text = esc_html__( 'Activate now', 'elementor' ); | |
| 1148 | - $button_url = Hints::get_plugin_activate_url( $plugin_slug ); | |
| 1149 | - } | |
| 1150 | - } | |
| 1151 | - | |
| 1152 | 1054 | $dismissible = 'image_optimizer_hint'; |
| 1153 | 1055 | |
| 1154 | - $title = esc_html__( 'Speed up your website with Image Optimizer', 'elementor' ); | |
| 1155 | - $content = sprintf( | |
| 1156 | - "<strong>%1\$s</strong><br>%2\$s <a class='e-btn-1' href='%3\$s' target='_blank'>%4\$s</a>!", | |
| 1157 | - $title, | |
| 1158 | - $description, | |
| 1159 | - $button_url, | |
| 1160 | - $button_text | |
| 1161 | - ); | |
| 1162 | - | |
| 1163 | 1056 | wp_localize_script( 'media-hints', 'elementorAdminHints', [ |
| 1164 | 1057 | 'mediaHint' => [ |
| 1165 | 1058 | 'display' => true, |
| 1166 | 1059 | 'type' => 'info', |
| @@ -1166,13 +1059,13 @@ | ||
| 1166 | 1059 | 'type' => 'info', |
| 1167 | 1060 | 'content' => $content, |
| 1168 | 1061 | 'icon' => true, |
| 1169 | 1062 | 'dismissible' => $dismissible, |
| 1170 | - 'dismiss' => esc_attr__( 'Dismiss this notice.', 'elementor' ), | |
| 1063 | + 'dismiss' => __( 'Dismiss this notice.', 'elementor' ), | |
| 1171 | 1064 | 'button_event' => $dismissible, |
| 1172 | 1065 | 'button_data' => base64_encode( |
| 1173 | 1066 | wp_json_encode( [ |
| 1174 | - 'action_url' => $button_url, | |
| 1067 | + 'action_url' => Hints::get_plugin_action_url( 'image-optimization' ), | |
| 1175 | 1068 | ] ), |
| 1176 | 1069 | ), |
| 1177 | 1070 | ], |
| 1178 | 1071 | ] ); |
| @@ -1190,12 +1083,16 @@ | ||
| 1190 | 1083 | if ( ! current_user_can( 'install_plugins' ) ) { |
| 1191 | 1084 | return; |
| 1192 | 1085 | } |
| 1193 | 1086 | |
| 1087 | + if ( empty( $request['source'] ) ) { | |
| 1088 | + return; | |
| 1089 | + } | |
| 1090 | + | |
| 1194 | 1091 | $campaign_data = [ |
| 1195 | - 'campaign' => sanitize_key( $request['campaign'] ?? '' ), | |
| 1196 | - 'source' => sanitize_key( $request['source'] ?? '' ), | |
| 1197 | - 'medium' => sanitize_key( $request['medium'] ?? '' ), | |
| 1092 | + 'source' => sanitize_key( $request['source'] ), | |
| 1093 | + 'campaign' => 'ally-plg', | |
| 1094 | + 'medium' => 'wp-dash', | |
| 1198 | 1095 | ]; |
| 1199 | 1096 | |
| 1200 | 1097 | set_transient( 'elementor_ea11y_campaign', $campaign_data, 30 * DAY_IN_SECONDS ); |
| 1201 | 1098 | } |
| @@ -1204,12 +1101,16 @@ | ||
| 1204 | 1101 | if ( ! current_user_can( 'install_plugins' ) ) { |
| 1205 | 1102 | return; |
| 1206 | 1103 | } |
| 1207 | 1104 | |
| 1105 | + if ( empty( $request['source'] ) ) { | |
| 1106 | + return; | |
| 1107 | + } | |
| 1108 | + | |
| 1208 | 1109 | $campaign_data = [ |
| 1209 | - 'campaign' => sanitize_key( $request['campaign'] ?? '' ), | |
| 1210 | - 'source' => sanitize_key( $request['source'] ?? '' ), | |
| 1211 | - 'medium' => sanitize_key( $request['medium'] ?? '' ), | |
| 1110 | + 'source' => sanitize_key( $request['source'] ), | |
| 1111 | + 'campaign' => 'io-plg', | |
| 1112 | + 'medium' => 'wp-dash', | |
| 1212 | 1113 | ]; |
| 1213 | 1114 | |
| 1214 | 1115 | set_transient( 'elementor_image_optimization_campaign', $campaign_data, 30 * DAY_IN_SECONDS ); |
| 1215 | 1116 | } |
| @@ -1218,12 +1119,16 @@ | ||
| 1218 | 1119 | if ( ! current_user_can( 'install_plugins' ) ) { |
| 1219 | 1120 | return; |
| 1220 | 1121 | } |
| 1221 | 1122 | |
| 1123 | + if ( empty( $request['source'] ) ) { | |
| 1124 | + return; | |
| 1125 | + } | |
| 1126 | + | |
| 1222 | 1127 | $campaign_data = [ |
| 1223 | - 'campaign' => sanitize_key( $request['campaign'] ?? '' ), | |
| 1224 | - 'source' => sanitize_key( $request['source'] ?? '' ), | |
| 1225 | - 'medium' => sanitize_key( $request['medium'] ?? '' ), | |
| 1128 | + 'source' => sanitize_key( $request['source'] ), | |
| 1129 | + 'campaign' => 'sm-plg', | |
| 1130 | + 'medium' => 'wp-dash', | |
| 1226 | 1131 | ]; |
| 1227 | 1132 | |
| 1228 | 1133 | set_transient( 'elementor_site_mailer_campaign', $campaign_data, 30 * DAY_IN_SECONDS ); |
| 1229 | 1134 | } |