← All changes | core/admin/admin.php +35 -175 4.1.2 → 3.26.4 View file →

		@@ -2,20 +2,19 @@
2	2	namespace Elementor\Core\Admin;
3	3
4	4	use Elementor\Api;
5	5	use Elementor\Beta_Testers;
	6	+use Elementor\Core\Admin\Menu\Main as MainMenu;
6	7	use Elementor\App\Modules\Onboarding\Module as Onboarding_Module;
7	8	use Elementor\Core\Base\App;
8	9	use Elementor\Core\Upgrade\Manager as Upgrade_Manager;
9	10	use Elementor\Core\Utils\Assets_Config_Provider;
10	11	use Elementor\Core\Utils\Collection;
11		-use Elementor\Modules\FloatingButtons\Module as Floating_Buttons_Module;
12	12	use Elementor\Plugin;
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	}
		@@ -38,36 +37,8 @@
38	37	return 'admin';
39	38	}
40	39
41	40	/**
42		- * Check if current page is an Elementor admin page.
43		- *
44		- * @param \WP_Screen|null $current_screen Optional. Screen object to check. Defaults to current screen.
45		- *
46		- * @return bool Whether current page is an Elementor admin page.
47		- */
48		- public static function is_elementor_admin_page( $current_screen = null ) {
49		- if ( ! $current_screen ) {
50		- $current_screen = get_current_screen();
51		- }
52		-
53		- if ( ! $current_screen ) {
54		- return false;
55		- }
56		-
57		- $screen_id = $current_screen->id ?? '';
58		- $post_type = $current_screen->post_type ?? '';
59		-
60		- $is_elementor_screen = strpos( $screen_id, 'elementor' ) !== false
61		- || strpos( $screen_id, Floating_Buttons_Module::CPT_FLOATING_BUTTONS ) !== false;
62		-
63		- $is_elementor_post_type = strpos( $post_type, 'elementor' ) !== false
64		- || strpos( $post_type, Floating_Buttons_Module::CPT_FLOATING_BUTTONS ) !== false;
65		-
66		- return $is_elementor_screen || $is_elementor_post_type;
67		- }
68		-
69		- /**
70	41	* @since 2.2.0
71	42	* @access public
72	43	*/
73	44	public function maybe_redirect_to_getting_started() {
		@@ -195,11 +166,13 @@
195	166	* @since 1.0.0
196	167	* @access public
197	168	*/
198	169	public function enqueue_styles() {
	170	+ $direction_suffix = is_rtl() ? '-rtl' : '';
	171	+
199	172	wp_register_style(
200	173	'elementor-admin',
201		- $this->get_css_assets_url( 'admin' ),
	174	+ $this->get_css_assets_url( 'admin' . $direction_suffix ),
202	175	[
203	176	'elementor-common',
204	177	],
205	178	ELEMENTOR_VERSION
		@@ -373,9 +346,9 @@
373	346	array_unshift( $links, $settings_link );
374	347
375	348	$go_pro_text = esc_html__( 'Get Elementor Pro', 'elementor' );
376	349	if ( Utils::is_sale_time() ) {
377		- $go_pro_text = esc_html__( 'Sale! Upgrade Now', 'elementor' );
	350	+ $go_pro_text = esc_html__( 'Discounted Upgrades Now!', 'elementor' );
378	351	}
379	352
380	353	$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	354
		@@ -401,10 +374,10 @@
401	374	*/
402	375	public function plugin_row_meta( $plugin_meta, $plugin_file ) {
403	376	if ( ELEMENTOR_PLUGIN_BASE === $plugin_file ) {
404	377	$row_meta = [
405		- 'docs' => '<a href="https://go.elementor.com/docs-admin-plugins/" aria-label="' . esc_attr__( 'View Elementor Documentation', 'elementor' ) . '" target="_blank">' . esc_html__( 'Docs & FAQs', 'elementor' ) . '</a>',
406		- 'ideo' => '<a href="https://go.elementor.com/yt-admin-plugins/" aria-label="' . esc_attr__( 'View Elementor Video Tutorials', 'elementor' ) . '" target="_blank">' . esc_html__( 'Video Tutorials', 'elementor' ) . '</a>',
	378	+ 'docs' => '<a href="https://go.elementor.com/docs-admin-plugins/" aria-label="' . esc_attr( esc_html__( 'View Elementor Documentation', 'elementor' ) ) . '" target="_blank">' . esc_html__( 'Docs & FAQs', 'elementor' ) . '</a>',
	379	+ 'ideo' => '<a href="https://go.elementor.com/yt-admin-plugins/" aria-label="' . esc_attr( esc_html__( 'View Elementor Video Tutorials', 'elementor' ) ) . '" target="_blank">' . esc_html__( 'Video Tutorials', 'elementor' ) . '</a>',
407	380	];
408	381
409	382	$plugin_meta = array_merge( $plugin_meta, $row_meta );
410	383	}
		@@ -508,9 +481,9 @@
508	481	?>
509	482	<div class="e-overview__header">
510	483	<?php if ( $show_versions ) { ?>
511	484	<div class="e-overview__logo">
512		- <div class="e-logo-wrapper"><i class="eicon-elementor-circle"></i></div>
	485	+ <div class="e-logo-wrapper"><i class="eicon-elementor"></i></div>
513	486	</div>
514	487	<div class="e-overview__versions">
515	488	<span class="e-overview__version"><?php echo esc_html__( 'Elementor', 'elementor' ); ?> v<?php echo ELEMENTOR_VERSION; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span>
516	489	<?php
		@@ -537,9 +510,9 @@
537	510	* Displays the Elementor dashboard widget - recently edited section.
538	511	* Fired by `elementor_dashboard_overview_widget` function.
539	512	*
540	513	* @param array $args
541		- * @param bool $show_heading
	514	+ * @param bool $show_heading
542	515	*
543	516	* @return void
544	517	* @since 3.12.0
545	518	*/
		@@ -573,9 +546,9 @@
573	546	/**
574	547	* Displays the Elementor dashboard widget - news and updates section.
575	548	* Fired by `elementor_dashboard_overview_widget` function.
576	549	*
577		- * @param int $limit_feed
	550	+ * @param int $limit_feed
578	551	* @param bool $show_heading
579	552	*
580	553	* @return void
581	554	* @since 3.12.0
		@@ -745,83 +718,13 @@
745	718	if ( is_wp_error( $document ) ) {
746	719	wp_die( $document ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
747	720	}
748	721
749		- wp_safe_redirect( $document->get_edit_url() );
	722	+ wp_redirect( $document->get_edit_url() );
750	723
751	724	die;
752	725	}
753	726
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	727	private function get_allowed_fields_for_role() {
825	728	$allowed_fields = [
826	729	'post_title',
827	730	'post_content',
		@@ -864,9 +767,9 @@
864	767	Plugin::$instance->common->add_template( ELEMENTOR_PATH . 'includes/admin-templates/new-floating-elements.php' );
865	768	}
866	769
867	770	public function enqueue_new_floating_elements_scripts() {
868		- $suffix = Utils::is_script_debug() ? '' : '.min';
	771	+ $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
869	772
870	773	wp_enqueue_script(
871	774	'elementor-floating-elements-modal',
872	775	ELEMENTOR_ASSETS_URL . 'js/floating-elements-modal' . $suffix . '.js',
		@@ -881,9 +784,9 @@
881	784	/**
882	785	* @access public
883	786	*/
884	787	public function enqueue_new_template_scripts() {
885		- $suffix = Utils::is_script_debug() ? '' : '.min';
	788	+ $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
886	789
887	790	wp_enqueue_script(
888	791	'elementor-new-template',
889	792	ELEMENTOR_ASSETS_URL . 'js/new-template' . $suffix . '.js',
		@@ -906,9 +809,9 @@
906	809	/**
907	810	* @access public
908	811	*/
909	812	public function enqueue_beta_tester_scripts() {
910		- $suffix = Utils::is_script_debug() ? '' : '.min';
	813	+ $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
911	814
912	815	wp_enqueue_script(
913	816	'elementor-beta-tester',
914	817	ELEMENTOR_ASSETS_URL . 'js/beta-tester' . $suffix . '.js',
		@@ -1023,10 +926,8 @@
1023	926	add_action( 'wp_dashboard_setup', [ $this, 'register_dashboard_widgets' ] );
1024	927
1025	928	// Admin Actions
1026	929	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	930
1030	931	add_action( 'current_screen', [ $this, 'init_new_template' ] );
1031	932	add_action( 'current_screen', [ $this, 'init_floating_elements' ] );
1032	933	add_action( 'current_screen', [ $this, 'init_beta_tester' ] );
		@@ -1105,11 +1006,9 @@
1105	1006	} )->all();
1106	1007	}
1107	1008
1108	1009	private function maybe_enqueue_hints() {
1109		- $plugin_slug = 'image-optimization';
1110		-
1111		- if ( ! Hints::should_display_hint( $plugin_slug ) ) {
	1010	+ if ( ! Hints::should_display_hint( 'image-optimization' ) ) {
1112	1011	return;
1113	1012	}
1114	1013
1115	1014	wp_register_script(
		@@ -1119,48 +1018,16 @@
1119	1018	ELEMENTOR_VERSION,
1120	1019	true
1121	1020	);
1122	1021
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 );
	1022	+ $content = sprintf("%1\$s <a class='e-btn-1' href='%2\$s' target='_blank'>%3\$s</a>!",
	1023	+ __( 'Optimize your images to enhance site performance by using Image Optimizer.', 'elementor' ),
	1024	+ Hints::get_plugin_action_url( 'image-optimization' ),
	1025	+ ( Hints::is_plugin_installed( 'image-optimization' ) ? __( 'Activate', 'elementor' ) : __( 'Install', 'elementor' ) ) . ' ' . __( 'Image Optimizer', 'elementor' )
	1026	+ );
1126	1027
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	1028	$dismissible = 'image_optimizer_hint';
1153	1029
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	1030	wp_localize_script( 'media-hints', 'elementorAdminHints', [
1164	1031	'mediaHint' => [
1165	1032	'display' => true,
1166	1033	'type' => 'info',
		@@ -1166,13 +1033,13 @@
1166	1033	'type' => 'info',
1167	1034	'content' => $content,
1168	1035	'icon' => true,
1169	1036	'dismissible' => $dismissible,
1170		- 'dismiss' => esc_attr__( 'Dismiss this notice.', 'elementor' ),
	1037	+ 'dismiss' => __( 'Dismiss this notice.', 'elementor' ),
1171	1038	'button_event' => $dismissible,
1172	1039	'button_data' => base64_encode(
1173		- wp_json_encode( [
1174		- 'action_url' => $button_url,
	1040	+ json_encode( [
	1041	+ 'action_url' => Hints::get_plugin_action_url( 'image-optimization' ),
1175	1042	] ),
1176	1043	),
1177	1044	],
1178	1045	] );
		@@ -1182,34 +1049,23 @@
1182	1049
1183	1050	public function register_ajax_hints( $ajax_manager ) {
1184	1051	$ajax_manager->register_ajax_action( 'elementor_image_optimization_campaign', [ $this, 'ajax_set_image_optimization_campaign' ] );
1185	1052	$ajax_manager->register_ajax_action( 'elementor_core_site_mailer_campaign', [ $this, 'ajax_site_mailer_campaign' ] );
1186		- $ajax_manager->register_ajax_action( 'elementor_core_ally_campaign', [ $this, 'ajax_ally_campaign' ] );
1187	1053	}
1188	1054
1189		- public function ajax_ally_campaign( $request ) {
	1055	+ public function ajax_set_image_optimization_campaign( $request ) {
1190	1056	if ( ! current_user_can( 'install_plugins' ) ) {
1191	1057	return;
1192	1058	}
1193	1059
1194		- $campaign_data = [
1195		- 'campaign' => sanitize_key( $request['campaign'] ?? '' ),
1196		- 'source' => sanitize_key( $request['source'] ?? '' ),
1197		- 'medium' => sanitize_key( $request['medium'] ?? '' ),
1198		- ];
1199		-
1200		- set_transient( 'elementor_ea11y_campaign', $campaign_data, 30 * DAY_IN_SECONDS );
1201		- }
1202		-
1203		- public function ajax_set_image_optimization_campaign( $request ) {
1204		- if ( ! current_user_can( 'install_plugins' ) ) {
	1060	+ if ( empty( $request['source'] ) ) {
1205	1061	return;
1206	1062	}
1207	1063
1208	1064	$campaign_data = [
1209		- 'campaign' => sanitize_key( $request['campaign'] ?? '' ),
1210		- 'source' => sanitize_key( $request['source'] ?? '' ),
1211		- 'medium' => sanitize_key( $request['medium'] ?? '' ),
	1065	+ 'source' => sanitize_key( $request['source'] ),
	1066	+ 'campaign' => 'io-plg',
	1067	+ 'medium' => 'wp-dash',
1212	1068	];
1213	1069
1214	1070	set_transient( 'elementor_image_optimization_campaign', $campaign_data, 30 * DAY_IN_SECONDS );
1215	1071	}
		@@ -1218,12 +1074,16 @@
1218	1074	if ( ! current_user_can( 'install_plugins' ) ) {
1219	1075	return;
1220	1076	}
1221	1077
	1078	+ if ( empty( $request['source'] ) ) {
	1079	+ return;
	1080	+ }
	1081	+
1222	1082	$campaign_data = [
1223		- 'campaign' => sanitize_key( $request['campaign'] ?? '' ),
1224		- 'source' => sanitize_key( $request['source'] ?? '' ),
1225		- 'medium' => sanitize_key( $request['medium'] ?? '' ),
	1083	+ 'source' => sanitize_key( $request['source'] ),
	1084	+ 'campaign' => 'sm-plg',
	1085	+ 'medium' => 'wp-dash',
1226	1086	];
1227	1087
1228	1088	set_transient( 'elementor_site_mailer_campaign', $campaign_data, 30 * DAY_IN_SECONDS );
1229	1089	}