← All changes | core/editor/editor.php +535 -179 4.2.2 → 3.2.5 View file →

		@@ -1,15 +1,23 @@
1	1	<?php
2	2	namespace Elementor\Core\Editor;
3	3
	4	+use Elementor\Api;
	5	+use Elementor\Core\Breakpoints\Breakpoint;
4	6	use Elementor\Core\Breakpoints\Manager as Breakpoints_Manager;
5	7	use Elementor\Core\Common\Modules\Ajax\Module;
	8	+use Elementor\Core\Common\Modules\Ajax\Module as Ajax;
6	9	use Elementor\Core\Debug\Loading_Inspection_Manager;
7		-use Elementor\Core\Editor\Loader\Editor_Loader_Factory;
8		-use Elementor\Core\Editor\Loader\Editor_Loader_Interface;
	10	+use Elementor\Core\Files\Assets\Files_Upload_Handler;
	11	+use Elementor\Core\Schemes\Manager as Schemes_Manager;
9	12	use Elementor\Core\Settings\Manager as SettingsManager;
	13	+use Elementor\Icons_Manager;
10	14	use Elementor\Plugin;
	15	+use Elementor\Settings;
	16	+use Elementor\Shapes;
11	17	use Elementor\TemplateLibrary\Source_Local;
	18	+use Elementor\Tools;
	19	+use Elementor\User;
12	20	use Elementor\Utils;
13	21	use Elementor\Core\Editor\Data;
14	22
15	23	if ( ! defined( 'ABSPATH' ) ) {
		@@ -26,8 +34,14 @@
26	34	*/
27	35	class Editor {
28	36
29	37	/**
	38	+ * The nonce key for Elementor editor.
	39	+ * @deprecated 2.3.0
	40	+ */
	41	+ const EDITING_NONCE_KEY = 'elementor-editing';
	42	+
	43	+ /**
30	44	* User capability required to access Elementor editor.
31	45	*/
32	46	const EDITING_CAPABILITY = 'edit_posts';
33	47
		@@ -60,18 +74,8 @@
60	74	*/
61	75	public $notice_bar;
62	76
63	77	/**
64		- * @var Promotion
65		- */
66		- public $promotion;
67		-
68		- /**
69		- * @var Editor_Loader_Interface
70		- */
71		- private $loader;
72		-
73		- /**
74	78	* Init.
75	79	*
76	80	* Initialize Elementor editor. Registers all needed actions to run Elementor,
77	81	* removes conflicting actions etc.
		@@ -80,11 +84,11 @@
80	84	*
81	85	* @since 1.0.0
82	86	* @access public
83	87	*
84		- * @param bool $to_die Optional. Whether to die at the end. Default is `true`.
	88	+ * @param bool $die Optional. Whether to die at the end. Default is `true`.
85	89	*/
86		- public function init( $to_die = true ) {
	90	+ public function init( $die = true ) {
87	91	if ( empty( $_REQUEST['post'] ) ) {
88	92	return;
89	93	}
90	94
		@@ -116,10 +120,8 @@
116	120
117	121	// Send MIME Type header like WP admin-header.
118	122	@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
119	123
120		- self::send_document_isolation_policy_header();
121		-
122	124	add_filter( 'show_admin_bar', '__return_false' );
123	125
124	126	// Remove all WordPress actions
125	127	remove_all_actions( 'wp_head' );
		@@ -158,12 +160,12 @@
158	160	Utils::do_not_cache();
159	161
160	162	do_action( 'elementor/editor/init' );
161	163
162		- $this->get_loader()->print_root_template();
	164	+ $this->print_editor_template();
163	165
164	166	// From the action it's an empty string, from tests its `false`
165		- if ( false !== $to_die ) {
	167	+ if ( false !== $die ) {
166	168	die;
167	169	}
168	170	}
169	171
		@@ -199,9 +201,9 @@
199	201
200	202	$document = Plugin::$instance->documents->get( get_the_ID() );
201	203
202	204	if ( ! $document ) {
203		- wp_die( esc_html__( 'Document not found.', 'elementor' ) );
	205	+ wp_die( __( 'Document not found.', 'elementor' ) );
204	206	}
205	207
206	208	if ( ! $document->is_editable_by_current_user() || ! $document->is_built_with_elementor() ) {
207	209	return;
		@@ -309,10 +311,8 @@
309	311	return get_user_by( 'id', $locked_user );
310	312	}
311	313
312	314	/**
313		- * NOTICE: This method not in use, it's here for backward compatibility.
314		- *
315	315	* Print Editor Template.
316	316	*
317	317	* Include the wrapper template of the editor.
318	318	*
		@@ -335,14 +335,173 @@
335	335	remove_action( 'wp_enqueue_scripts', [ $this, __FUNCTION__ ], 999999 );
336	336
337	337	global $wp_styles, $wp_scripts;
338	338
	339	+ $plugin = Plugin::$instance;
	340	+
339	341	// Reset global variable
340	342	$wp_styles = new \WP_Styles(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
341	343	$wp_scripts = new \WP_Scripts(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
342	344
343		- $this->get_loader()->register_scripts();
	345	+ $suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || defined( 'ELEMENTOR_TESTS' ) && ELEMENTOR_TESTS ) ? '' : '.min';
344	346
	347	+ wp_register_script(
	348	+ 'elementor-editor-modules',
	349	+ ELEMENTOR_ASSETS_URL . 'js/editor-modules' . $suffix . '.js',
	350	+ [
	351	+ 'elementor-common-modules',
	352	+ ],
	353	+ ELEMENTOR_VERSION,
	354	+ true
	355	+ );
	356	+
	357	+ wp_register_script(
	358	+ 'elementor-editor-document',
	359	+ ELEMENTOR_ASSETS_URL . 'js/editor-document' . $suffix . '.js',
	360	+ [
	361	+ 'elementor-common-modules',
	362	+ ],
	363	+ ELEMENTOR_VERSION,
	364	+ true
	365	+ );
	366	+ // Hack for waypoint with editor mode.
	367	+ wp_register_script(
	368	+ 'elementor-waypoints',
	369	+ ELEMENTOR_ASSETS_URL . 'lib/waypoints/waypoints-for-editor.js',
	370	+ [
	371	+ 'jquery',
	372	+ ],
	373	+ '4.0.2',
	374	+ true
	375	+ );
	376	+
	377	+ wp_register_script(
	378	+ 'perfect-scrollbar',
	379	+ ELEMENTOR_ASSETS_URL . 'lib/perfect-scrollbar/js/perfect-scrollbar' . $suffix . '.js',
	380	+ [],
	381	+ '1.4.0',
	382	+ true
	383	+ );
	384	+
	385	+ wp_register_script(
	386	+ 'jquery-easing',
	387	+ ELEMENTOR_ASSETS_URL . 'lib/jquery-easing/jquery-easing' . $suffix . '.js',
	388	+ [
	389	+ 'jquery',
	390	+ ],
	391	+ '1.3.2',
	392	+ true
	393	+ );
	394	+
	395	+ wp_register_script(
	396	+ 'nprogress',
	397	+ ELEMENTOR_ASSETS_URL . 'lib/nprogress/nprogress' . $suffix . '.js',
	398	+ [],
	399	+ '0.2.0',
	400	+ true
	401	+ );
	402	+
	403	+ wp_register_script(
	404	+ 'tipsy',
	405	+ ELEMENTOR_ASSETS_URL . 'lib/tipsy/tipsy' . $suffix . '.js',
	406	+ [
	407	+ 'jquery',
	408	+ ],
	409	+ '1.0.0',
	410	+ true
	411	+ );
	412	+
	413	+ wp_register_script(
	414	+ 'jquery-elementor-select2',
	415	+ ELEMENTOR_ASSETS_URL . 'lib/e-select2/js/e-select2.full' . $suffix . '.js',
	416	+ [
	417	+ 'jquery',
	418	+ ],
	419	+ '4.0.6-rc.1',
	420	+ true
	421	+ );
	422	+
	423	+ wp_register_script(
	424	+ 'flatpickr',
	425	+ ELEMENTOR_ASSETS_URL . 'lib/flatpickr/flatpickr' . $suffix . '.js',
	426	+ [
	427	+ 'jquery',
	428	+ ],
	429	+ '1.12.0',
	430	+ true
	431	+ );
	432	+
	433	+ wp_register_script(
	434	+ 'ace',
	435	+ 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.5/ace.js',
	436	+ [],
	437	+ '1.2.5',
	438	+ true
	439	+ );
	440	+
	441	+ wp_register_script(
	442	+ 'ace-language-tools',
	443	+ 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.5/ext-language_tools.js',
	444	+ [
	445	+ 'ace',
	446	+ ],
	447	+ '1.2.5',
	448	+ true
	449	+ );
	450	+
	451	+ wp_register_script(
	452	+ 'jquery-hover-intent',
	453	+ ELEMENTOR_ASSETS_URL . 'lib/jquery-hover-intent/jquery-hover-intent' . $suffix . '.js',
	454	+ [],
	455	+ '1.0.0',
	456	+ true
	457	+ );
	458	+
	459	+ wp_register_script(
	460	+ 'nouislider',
	461	+ ELEMENTOR_ASSETS_URL . 'lib/nouislider/nouislider' . $suffix . '.js',
	462	+ [],
	463	+ '13.0.0',
	464	+ true
	465	+ );
	466	+
	467	+ wp_register_script(
	468	+ 'pickr',
	469	+ ELEMENTOR_ASSETS_URL . 'lib/pickr/pickr.min.js',
	470	+ [],
	471	+ '1.5.0',
	472	+ true
	473	+ );
	474	+
	475	+ wp_register_script(
	476	+ 'elementor-editor',
	477	+ ELEMENTOR_ASSETS_URL . 'js/editor' . $suffix . '.js',
	478	+ [
	479	+ 'elementor-common',
	480	+ 'elementor-editor-modules',
	481	+ 'elementor-editor-document',
	482	+ 'wp-auth-check',
	483	+ 'jquery-ui-sortable',
	484	+ 'jquery-ui-resizable',
	485	+ 'perfect-scrollbar',
	486	+ 'nprogress',
	487	+ 'tipsy',
	488	+ 'imagesloaded',
	489	+ 'heartbeat',
	490	+ 'jquery-elementor-select2',
	491	+ 'flatpickr',
	492	+ 'ace',
	493	+ 'ace-language-tools',
	494	+ 'jquery-hover-intent',
	495	+ 'nouislider',
	496	+ 'pickr',
	497	+ 'react',
	498	+ 'react-dom',
	499	+ ],
	500	+ ELEMENTOR_VERSION,
	501	+ true
	502	+ );
	503	+
345	504	/**
346	505	* Before editor enqueue scripts.
347	506	*
348	507	* Fires before Elementor editor scripts are enqueued.
		@@ -353,13 +512,111 @@
353	512
354	513	// Tweak for WP Admin menu icons
355	514	wp_print_styles( 'editor-buttons' );
356	515
357		- $this->get_loader()->enqueue_scripts();
	516	+ $settings = SettingsManager::get_settings_managers_config();
	517	+ // Moved to document since 2.9.0.
	518	+ unset( $settings['page'] );
358	519
359		- Plugin::$instance->controls_manager->enqueue_control_scripts();
	520	+ $document = Plugin::$instance->documents->get_doc_or_auto_save( $this->post_id );
	521	+ $kits_manager = Plugin::$instance->kits_manager;
360	522
	523	+ $page_title_selector = $kits_manager->get_current_settings( 'page_title_selector' );
	524	+
	525	+ $page_title_selector .= ', .elementor-page-title .elementor-heading-title';
	526	+
	527	+ $config = [
	528	+ 'initial_document' => $document->get_config(),
	529	+ 'version' => ELEMENTOR_VERSION,
	530	+ 'home_url' => home_url(),
	531	+ 'admin_settings_url' => admin_url( 'admin.php?page=' . Settings::PAGE_ID ),
	532	+ 'autosave_interval' => AUTOSAVE_INTERVAL,
	533	+ 'tabs' => $plugin->controls_manager->get_tabs(),
	534	+ 'controls' => $plugin->controls_manager->get_controls_data(),
	535	+ 'elements' => $plugin->elements_manager->get_element_types_config(),
	536	+ 'schemes' => [
	537	+ 'items' => $plugin->schemes_manager->get_registered_schemes_data(),
	538	+ 'enabled_schemes' => Schemes_Manager::get_enabled_schemes(),
	539	+ ],
	540	+ 'globals' => [
	541	+ 'defaults_enabled' => [
	542	+ 'colors' => $kits_manager->is_custom_colors_enabled(),
	543	+ 'typography' => $kits_manager->is_custom_typography_enabled(),
	544	+ ],
	545	+ ],
	546	+ 'icons' => [
	547	+ 'libraries' => Icons_Manager::get_icon_manager_tabs_config(),
	548	+ 'goProURL' => Utils::get_pro_link( 'https://elementor.com/pro/?utm_source=icon-library&utm_campaign=gopro&utm_medium=wp-dash' ),
	549	+ ],
	550	+ 'filesUpload' => [
	551	+ 'unfilteredFiles' => Files_Upload_Handler::is_enabled(),
	552	+ ],
	553	+ 'fa4_to_fa5_mapping_url' => ELEMENTOR_ASSETS_URL . 'lib/font-awesome/migration/mapping.js',
	554	+ 'default_schemes' => $plugin->schemes_manager->get_schemes_defaults(),
	555	+ 'settings' => $settings,
	556	+ 'system_schemes' => $plugin->schemes_manager->get_system_schemes(),
	557	+ 'wp_editor' => $this->get_wp_editor_config(),
	558	+ 'settings_page_link' => Settings::get_url(),
	559	+ 'tools_page_link' => Tools::get_url(),
	560	+ 'elementor_site' => 'https://go.elementor.com/about-elementor/',
	561	+ 'docs_elementor_site' => 'https://go.elementor.com/docs/',
	562	+ 'help_the_content_url' => 'https://go.elementor.com/the-content-missing/',
	563	+ 'help_flexbox_bc_url' => 'https://go.elementor.com/flexbox-layout-bc/',
	564	+ 'elementPromotionURL' => 'https://go.elementor.com/go-pro-%s',
	565	+ 'dynamicPromotionURL' => 'https://go.elementor.com/go-pro-dynamic-tag',
	566	+ 'additional_shapes' => Shapes::get_additional_shapes_for_config(),
	567	+ 'user' => [
	568	+ 'restrictions' => $plugin->role_manager->get_user_restrictions_array(),
	569	+ 'is_administrator' => current_user_can( 'manage_options' ),
	570	+ 'introduction' => User::get_introduction_meta(),
	571	+ ],
	572	+ 'preview' => [
	573	+ 'help_preview_error_url' => 'https://go.elementor.com/preview-not-loaded/',
	574	+ 'help_preview_http_error_url' => 'https://go.elementor.com/preview-not-loaded/#permissions',
	575	+ 'help_preview_http_error_500_url' => 'https://go.elementor.com/500-error/',
	576	+ 'debug_data' => Loading_Inspection_Manager::instance()->run_inspections(),
	577	+ ],
	578	+ 'locale' => get_locale(),
	579	+ 'rich_editing_enabled' => filter_var( get_user_meta( get_current_user_id(), 'rich_editing', true ), FILTER_VALIDATE_BOOLEAN ),
	580	+ 'page_title_selector' => $page_title_selector,
	581	+ 'tinymceHasCustomConfig' => class_exists( 'Tinymce_Advanced' ) || class_exists( 'Advanced_Editor_Tools' ),
	582	+ 'inlineEditing' => Plugin::$instance->widgets_manager->get_inline_editing_config(),
	583	+ 'dynamicTags' => Plugin::$instance->dynamic_tags->get_config(),
	584	+ 'ui' => [
	585	+ 'darkModeStylesheetURL' => ELEMENTOR_ASSETS_URL . 'css/editor-dark-mode' . $suffix . '.css',
	586	+ 'defaultGenericFonts' => $kits_manager->get_current_settings( 'default_generic_fonts' ),
	587	+ ],
	588	+ // Empty array for BC to avoid errors.
	589	+ 'i18n' => [],
	590	+ ];
	591	+
	592	+ if ( ! Utils::has_pro() && current_user_can( 'manage_options' ) ) {
	593	+ $config['promotionWidgets'] = Api::get_promotion_widgets();
	594	+ }
	595	+
	596	+ $this->bc_move_document_filters();
	597	+
361	598	/**
	599	+ * Localize editor settings.
	600	+ *
	601	+ * Filters the editor localized settings.
	602	+ *
	603	+ * @since 1.0.0
	604	+ *
	605	+ * @param array $config Editor configuration.
	606	+ * @param int $post_id The ID of the current post being edited.
	607	+ */
	608	+ $config = apply_filters( 'elementor/editor/localize_settings', $config );
	609	+
	610	+ Utils::print_js_config( 'elementor-editor', 'ElementorConfig', $config );
	611	+
	612	+ wp_enqueue_script( 'elementor-editor' );
	613	+
	614	+ wp_set_script_translations( 'elementor-editor', 'elementor' );
	615	+
	616	+ $plugin->controls_manager->enqueue_control_scripts();
	617	+
	618	+ /**
362	619	* After editor enqueue scripts.
363	620	*
364	621	* Fires after Elementor editor scripts are enqueued.
365	622	*
		@@ -385,13 +642,84 @@
385	642	* @since 1.0.0
386	643	*/
387	644	do_action( 'elementor/editor/before_enqueue_styles' );
388	645
389		- $this->get_loader()->register_styles();
390		- $this->get_loader()->enqueue_styles();
	646	+ $suffix = Utils::is_script_debug() ? '' : '.min';
391	647
392		- $this->enqueue_theme_ui_styles();
	648	+ $direction_suffix = is_rtl() ? '-rtl' : '';
393	649
	650	+ wp_register_style(
	651	+ 'font-awesome',
	652	+ ELEMENTOR_ASSETS_URL . 'lib/font-awesome/css/font-awesome' . $suffix . '.css',
	653	+ [],
	654	+ '4.7.0'
	655	+ );
	656	+
	657	+ wp_register_style(
	658	+ 'elementor-select2',
	659	+ ELEMENTOR_ASSETS_URL . 'lib/e-select2/css/e-select2' . $suffix . '.css',
	660	+ [],
	661	+ '4.0.6-rc.1'
	662	+ );
	663	+
	664	+ wp_register_style(
	665	+ 'google-font-roboto',
	666	+ 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700',
	667	+ [],
	668	+ ELEMENTOR_VERSION
	669	+ );
	670	+
	671	+ wp_register_style(
	672	+ 'flatpickr',
	673	+ ELEMENTOR_ASSETS_URL . 'lib/flatpickr/flatpickr' . $suffix . '.css',
	674	+ [],
	675	+ '1.12.0'
	676	+ );
	677	+
	678	+ wp_register_style(
	679	+ 'pickr',
	680	+ ELEMENTOR_ASSETS_URL . 'lib/pickr/themes/monolith.min.css',
	681	+ [],
	682	+ '1.5.0'
	683	+ );
	684	+
	685	+ wp_register_style(
	686	+ 'elementor-editor',
	687	+ ELEMENTOR_ASSETS_URL . 'css/editor' . $direction_suffix . $suffix . '.css',
	688	+ [
	689	+ 'elementor-common',
	690	+ 'elementor-select2',
	691	+ 'elementor-icons',
	692	+ 'wp-auth-check',
	693	+ 'google-font-roboto',
	694	+ 'flatpickr',
	695	+ 'pickr',
	696	+ ],
	697	+ ELEMENTOR_VERSION
	698	+ );
	699	+
	700	+ wp_enqueue_style( 'elementor-editor' );
	701	+
	702	+ $ui_theme = SettingsManager::get_settings_managers( 'editorPreferences' )->get_model()->get_settings( 'ui_theme' );
	703	+
	704	+ if ( 'light' !== $ui_theme ) {
	705	+ $ui_theme_media_queries = 'all';
	706	+
	707	+ if ( 'auto' === $ui_theme ) {
	708	+ $ui_theme_media_queries = '(prefers-color-scheme: dark)';
	709	+ }
	710	+
	711	+ wp_enqueue_style(
	712	+ 'elementor-editor-dark-mode',
	713	+ ELEMENTOR_ASSETS_URL . 'css/editor-dark-mode' . $suffix . '.css',
	714	+ [
	715	+ 'elementor-editor',
	716	+ ],
	717	+ ELEMENTOR_VERSION,
	718	+ $ui_theme_media_queries
	719	+ );
	720	+ }
	721	+
394	722	$breakpoints = Plugin::$instance->breakpoints->get_breakpoints();
395	723
396	724	// The two breakpoints under 'tablet' need to be checked for values.
397	725	if ( $breakpoints[ Breakpoints_Manager::BREAKPOINT_KEY_MOBILE ]->is_custom() || $breakpoints[ Breakpoints_Manager::BREAKPOINT_KEY_MOBILE_EXTRA ]->is_enabled() ) {
		@@ -410,44 +738,51 @@
410	738	*/
411	739	do_action( 'elementor/editor/after_enqueue_styles' );
412	740	}
413	741
414		- private function enqueue_theme_ui_styles() {
415		- $ui_theme_selected = SettingsManager::get_settings_managers( 'editorPreferences' )->get_model()->get_settings( 'ui_theme' );
	742	+ /**
	743	+ * Get WordPress editor config.
	744	+ *
	745	+ * Config the default WordPress editor with custom settings for Elementor use.
	746	+ *
	747	+ * @since 1.9.0
	748	+ * @access private
	749	+ */
	750	+ private function get_wp_editor_config() {
	751	+ // Remove all TinyMCE plugins.
	752	+ remove_all_filters( 'mce_buttons', 10 );
	753	+ remove_all_filters( 'mce_external_plugins', 10 );
416	754
417		- $ui_themes = [
418		- 'light',
419		- 'dark',
420		- ];
	755	+ if ( ! class_exists( '\_WP_Editors', false ) ) {
	756	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	757	+ }
421	758
422		- if ( 'auto' === $ui_theme_selected || ! in_array( $ui_theme_selected, $ui_themes, true ) ) {
423		- $ui_light_theme_media_queries = '(prefers-color-scheme: light)';
424		- $ui_dark_theme_media_queries = '(prefers-color-scheme: dark)';
425		- } else {
426		- $ui_light_theme_media_queries = 'none';
427		- $ui_dark_theme_media_queries = 'none';
	759	+ // WordPress 4.8 and higher
	760	+ if ( method_exists( '\_WP_Editors', 'print_tinymce_scripts' ) ) {
	761	+ \_WP_Editors::print_default_editor_scripts();
	762	+ \_WP_Editors::print_tinymce_scripts();
	763	+ }
	764	+ ob_start();
428	765
429		- if ( 'light' === $ui_theme_selected ) {
430		- $ui_light_theme_media_queries = 'all';
431		- } elseif ( 'dark' === $ui_theme_selected ) {
432		- $ui_dark_theme_media_queries = 'all';
433		- }
434		- }
	766	+ wp_editor(
	767	+ '%%EDITORCONTENT%%',
	768	+ 'elementorwpeditor',
	769	+ [
	770	+ 'editor_class' => 'elementor-wp-editor',
	771	+ 'editor_height' => 250,
	772	+ 'drag_drop_upload' => true,
	773	+ ]
	774	+ );
435	775
436		- $this->enqueue_theme_ui( 'light', $ui_light_theme_media_queries );
437		- $this->enqueue_theme_ui( 'dark', $ui_dark_theme_media_queries );
438		- }
	776	+ $config = ob_get_clean();
439	777
440		- private function enqueue_theme_ui( $ui_theme, $ui_theme_media_queries = 'all' ) {
441		- $suffix = Utils::is_script_debug() ? '' : '.min';
	778	+ // Don't call \_WP_Editors methods again
	779	+ remove_action( 'admin_print_footer_scripts', [ '_WP_Editors', 'editor_js' ], 50 );
	780	+ remove_action( 'admin_print_footer_scripts', [ '_WP_Editors', 'print_default_editor_scripts' ], 45 );
442	781
443		- wp_enqueue_style(
444		- 'e-theme-ui-' . $ui_theme,
445		- ELEMENTOR_ASSETS_URL . 'css/theme-' . $ui_theme . $suffix . '.css',
446		- [],
447		- ELEMENTOR_VERSION,
448		- $ui_theme_media_queries
449		- );
	782	+ \_WP_Editors::editor_js();
	783	+
	784	+ return $config;
450	785	}
451	786
452	787	/**
453	788	* Editor head trigger.
		@@ -471,8 +806,32 @@
471	806	do_action( 'elementor/editor/wp_head' );
472	807	}
473	808
474	809	/**
	810	+ * Add editor template.
	811	+ *
	812	+ * Registers new editor templates.
	813	+ *
	814	+ * @since 1.0.0
	815	+ * @deprecated 2.3.0 Use `Plugin::$instance->common->add_template()`
	816	+ * @access public
	817	+ *
	818	+ * @param string $template Can be either a link to template file or template
	819	+ * HTML content.
	820	+ * @param string $type Optional. Whether to handle the template as path
	821	+ * or text. Default is `path`.
	822	+ */
	823	+ public function add_editor_template( $template, $type = 'path' ) {
	824	+ _deprecated_function( __METHOD__, '2.3.0', 'Plugin::$instance->common->add_template()' );
	825	+
	826	+ $common = Plugin::$instance->common;
	827	+
	828	+ if ( $common ) {
	829	+ Plugin::$instance->common->add_template( $template, $type );
	830	+ }
	831	+ }
	832	+
	833	+ /**
475	834	* WP footer.
476	835	*
477	836	* Prints Elementor editor with all the editor templates, and render controls,
478	837	* widgets and content elements.
		@@ -488,11 +847,13 @@
488	847	$plugin->controls_manager->render_controls();
489	848	$plugin->widgets_manager->render_widgets_content();
490	849	$plugin->elements_manager->render_elements_content();
491	850
	851	+ $plugin->schemes_manager->print_schemes_templates();
	852	+
492	853	$plugin->dynamic_tags->print_templates();
493	854
494		- $this->get_loader()->register_additional_templates();
	855	+ $this->init_editor_templates();
495	856
496	857	/**
497	858	* Elementor editor footer.
498	859	*
		@@ -528,12 +889,11 @@
528	889	* @since 1.0.0
529	890	* @access public
530	891	*/
531	892	public function __construct() {
532		- Plugin::$instance->data_manager_v2->register_controller( new Data\Globals\Controller() );
	893	+ Plugin::$instance->data_manager->register_controller( Data\Globals\Controller::class );
533	894
534	895	$this->notice_bar = new Notice_Bar();
535		- $this->promotion = new Promotion();
536	896
537	897	add_action( 'admin_action_elementor', [ $this, 'init' ] );
538	898	add_action( 'template_redirect', [ $this, 'redirect_to_new_url' ] );
539	899
		@@ -539,89 +899,11 @@
539	899
540	900	// Handle autocomplete feature for URL control.
541	901	add_filter( 'wp_link_query_args', [ $this, 'filter_wp_link_query_args' ] );
542	902	add_filter( 'wp_link_query', [ $this, 'filter_wp_link_query' ] );
543		-
544		- add_filter( 'replace_editor', [ $this, 'filter_replace_editor' ], 10, 2 );
545	903	}
546	904
547	905	/**
548		- * Whether the Document-Isolation-Policy header should be sent on the
549		- * Elementor editor screen and the editor preview iframe.
550		- *
551		- * DIP places the document in its own agent cluster, which is the prerequisite
552		- * for cross-origin isolation features such as SharedArrayBuffer (required by
553		- * WordPress core's client-side media processing introduced in WP 7.1).
554		- *
555		- * Both the editor parent document and the preview iframe must send the same
556		- * DIP header so they join the same agent cluster and synchronous DOM access
557		- * between them (e.g. `iframe.contentWindow.elementorFrontend`) keeps working.
558		- *
559		- * The header is only honored by browsers on a secure context (HTTPS or
560		- * localhost) so the helper short-circuits on insecure origins to avoid
561		- * sending a header that the browser will ignore.
562		- *
563		- * @since 4.1.0
564		- *
565		- * @return bool
566		- */
567		- public static function should_use_document_isolation_policy() {
568		- if ( ! is_ssl() ) {
569		- $raw_host = isset( $_SERVER['HTTP_HOST'] ) ? sanitize_text_field( wp_unslash( $_SERVER['HTTP_HOST'] ) ) : '';
570		- $host = strtolower( (string) strtok( $raw_host, ':' ) );
571		-
572		- if ( 'localhost' !== $host && ! str_ends_with( $host, '.localhost' ) ) {
573		- return false;
574		- }
575		- }
576		-
577		- /**
578		- * Filters whether Elementor sends the Document-Isolation-Policy header
579		- * on the editor screen and preview iframe.
580		- *
581		- * @since 4.1.0
582		- *
583		- * @param bool $enabled Whether DIP is enabled. Defaults to true on a secure context.
584		- */
585		- return (bool) apply_filters( 'elementor/editor/use_document_isolation_policy', true );
586		- }
587		-
588		- /**
589		- * Send the Document-Isolation-Policy header for the current response.
590		- *
591		- * Safe to call from both the Elementor editor screen handler and the
592		- * preview iframe handler. No-op when {@see self::should_use_document_isolation_policy()}
593		- * returns false.
594		- *
595		- * @since 4.1.0
596		- */
597		- public static function send_document_isolation_policy_header() {
598		- if ( ! self::should_use_document_isolation_policy() || headers_sent() ) {
599		- return;
600		- }
601		-
602		- header( 'Document-Isolation-Policy: isolate-and-credentialless' );
603		- }
604		-
605		- /**
606		- * Signals to WordPress that Elementor is replacing the block editor on its own editor page,
607		- * so that block-editor-specific behaviour (e.g. WP 7.0 COOP/COEP isolation headers) is not
608		- * applied when the Elementor editor is active.
609		- *
610		- * @param bool $replace Whether the editor is being replaced.
611		- * @param \WP_Post $post The post being edited.
612		- *
613		- * @return bool
614		- */
615		- public function filter_replace_editor( $replace, $post ) {
616		- if ( isset( $_REQUEST['action'] ) && 'elementor' === $_REQUEST['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
617		- return true;
618		- }
619		-
620		- return $replace;
621		- }
622		-
623		- /**
624	906	* @since 2.2.0
625	907	* @access public
626	908	*/
627	909	public function filter_wp_link_query_args( $query ) {
		@@ -637,11 +919,9 @@
637	919	* @since 2.2.0
638	920	* @access public
639	921	*/
640	922	public function filter_wp_link_query( $results ) {
641		-
642		- // PHPCS - The user data is not used.
643		- if ( isset( $_POST['editor'] ) && 'elementor' === $_POST['editor'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	923	+ if ( isset( $_POST['editor'] ) && 'elementor' === $_POST['editor'] ) {
644	924	$post_type_object = get_post_type_object( 'post' );
645	925	$post_label = $post_type_object->labels->singular_name;
646	926
647	927	foreach ( $results as & $result ) {
		@@ -653,71 +933,147 @@
653	933
654	934	return $results;
655	935	}
656	936
657		- public function set_post_id( $post_id ) {
658		- $this->post_id = $post_id;
	937	+ /**
	938	+ * Create nonce.
	939	+ *
	940	+ * If the user has edit capabilities, it creates a cryptographic token to
	941	+ * give him access to Elementor editor.
	942	+ *
	943	+ * @since 1.8.1
	944	+ * @since 1.8.7 The `$post_type` parameter was introduces.
	945	+ * @deprecated 2.3.0 Use `Plugin::$instance->common->get_component( 'ajax' )->create_nonce()` instead
	946	+ * @access public
	947	+ *
	948	+ * @param string $post_type The post type to check capabilities.
	949	+ *
	950	+ * @return null|string The nonce token, or `null` if the user has no edit
	951	+ * capabilities.
	952	+ */
	953	+ public function create_nonce( $post_type ) {
	954	+ _deprecated_function( __METHOD__, '2.3.0', 'Plugin::$instance->common->get_component( \'ajax\' )->create_nonce()' );
	955	+
	956	+ /** @var Ajax $ajax */
	957	+ $ajax = Plugin::$instance->common->get_component( 'ajax' );
	958	+
	959	+ return $ajax->create_nonce();
659	960	}
660	961
661	962	/**
662		- * Get loader.
	963	+ * Verify nonce.
663	964	*
664		- * @return Editor_Loader_Interface
	965	+ * The user is given an amount of time to use the token, so therefore, since
	966	+ * the user ID and `$action` remain the same, the independent variable is
	967	+ * the time.
	968	+ *
	969	+ * @since 1.8.1
	970	+ * @deprecated 2.3.0
	971	+ * @access public
	972	+ *
	973	+ * @param string $nonce Nonce to verify.
	974	+ *
	975	+ * @return false|int If the nonce is invalid it returns `false`. If the
	976	+ * nonce is valid and generated between 0-12 hours ago it
	977	+ * returns `1`. If the nonce is valid and generated
	978	+ * between 12-24 hours ago it returns `2`.
665	979	*/
666		- private function get_loader() {
667		- if ( ! $this->loader ) {
668		- $this->loader = Editor_Loader_Factory::create();
	980	+ public function verify_nonce( $nonce ) {
	981	+ _deprecated_function( __METHOD__, '2.3.0', 'wp_verify_nonce()' );
669	982
670		- $this->loader->init();
671		- }
672		-
673		- return $this->loader;
	983	+ return wp_verify_nonce( $nonce );
674	984	}
675	985
676	986	/**
677		- * Get elements presets.
	987	+ * Verify request nonce.
678	988	*
679		- * @return array
	989	+ * Whether the request nonce verified or not.
	990	+ *
	991	+ * @since 1.8.1
	992	+ * @deprecated 2.3.0 Use `Plugin::$instance->common->get_component( 'ajax' )->verify_request_nonce()` instead
	993	+ * @access public
	994	+ *
	995	+ * @return bool True if request nonce verified, False otherwise.
680	996	*/
681		- public function get_elements_presets() {
682		- $element_types = Plugin::$instance->elements_manager->get_element_types();
683		- $presets = [];
	997	+ public function verify_request_nonce() {
	998	+ _deprecated_function( __METHOD__, '2.3.0', 'Plugin::$instance->common->get_component( \'ajax\' )->verify_request_nonce()' );
684	999
685		- foreach ( $element_types as $el_type => $element ) {
686		- $this->check_element_for_presets( $element, $el_type, $presets );
687		- }
	1000	+ /** @var Ajax $ajax */
	1001	+ $ajax = Plugin::$instance->common->get_component( 'ajax' );
688	1002
689		- return $presets;
	1003	+ return $ajax->verify_request_nonce();
690	1004	}
691	1005
692	1006	/**
693		- * @return void
	1007	+ * Verify ajax nonce.
	1008	+ *
	1009	+ * Verify request nonce and send a JSON request, if not verified returns an
	1010	+ * error.
	1011	+ *
	1012	+ * @since 1.9.0
	1013	+ * @deprecated 2.3.0
	1014	+ * @access public
694	1015	*/
695		- private function check_element_for_presets( $element, $el_type, &$presets ) {
696		- $element_presets = $element->get_panel_presets();
	1016	+ public function verify_ajax_nonce() {
	1017	+ _deprecated_function( __METHOD__, '2.3.0' );
697	1018
698		- if ( empty( $element_presets ) ) {
699		- return;
700		- }
	1019	+ /** @var Ajax $ajax */
	1020	+ $ajax = Plugin::$instance->common->get_component( 'ajax' );
701	1021
702		- foreach ( $element_presets as $key => $preset ) {
703		- $this->maybe_add_preset( $el_type, $preset, $key, $presets );
	1022	+ if ( ! $ajax->verify_request_nonce() ) {
	1023	+ wp_send_json_error( new \WP_Error( 'token_expired', 'Nonce token expired.' ) );
704	1024	}
705	1025	}
706	1026
707	1027	/**
708		- * @return void
	1028	+ * Init editor templates.
	1029	+ *
	1030	+ * Initialize default elementor templates used in the editor panel.
	1031	+ *
	1032	+ * @since 1.7.0
	1033	+ * @access private
709	1034	*/
710		- private function maybe_add_preset( $el_type, $preset, $key, &$presets ) {
711		- if ( $this->is_valid_preset( $el_type, $preset ) ) {
712		- $presets[ $key ] = $preset;
	1035	+ private function init_editor_templates() {
	1036	+ $template_names = [
	1037	+ 'global',
	1038	+ 'panel',
	1039	+ 'panel-elements',
	1040	+ 'repeater',
	1041	+ 'templates',
	1042	+ 'navigator',
	1043	+ 'hotkeys',
	1044	+ 'responsive-bar',
	1045	+ ];
	1046	+
	1047	+ foreach ( $template_names as $template_name ) {
	1048	+ Plugin::$instance->common->add_template( ELEMENTOR_PATH . "includes/editor-templates/$template_name.php" );
713	1049	}
714	1050	}
715	1051
716		- /**
717		- * @return boolean
718		- */
719		- private function is_valid_preset( $el_type, $preset ) {
720		- return isset( $preset['replacements']['custom']['originalWidget'] )
721		- && $el_type === $preset['replacements']['custom']['originalWidget'];
	1052	+ private function bc_move_document_filters() {
	1053	+ global $wp_filter;
	1054	+
	1055	+ $old_tag = 'elementor/editor/localize_settings';
	1056	+ $new_tag = 'elementor/document/config';
	1057	+
	1058	+ if ( ! has_filter( $old_tag ) ) {
	1059	+ return;
	1060	+ }
	1061	+
	1062	+ foreach ( $wp_filter[ $old_tag ] as $priority => $filters ) {
	1063	+ foreach ( $filters as $filter_id => $filter_args ) {
	1064	+ if ( 2 === $filter_args['accepted_args'] ) {
	1065	+ remove_filter( $old_tag, $filter_id, $priority );
	1066	+
	1067	+ add_filter( $new_tag, $filter_args['function'], $priority, 2 );
	1068	+
	1069	+ // TODO: Hard deprecation
	1070	+ // _deprecated_hook( '`' . $old_tag . ` is no longer using post_id', '2.9.0', $new_tag' );
	1071	+ }
	1072	+ }
	1073	+ }
	1074	+ }
	1075	+
	1076	+ public function set_post_id( $post_id ) {
	1077	+ $this->post_id = $post_id;
722	1078	}
723	1079	}