← All changes | includes/plugin.php +68 -59 4.1.0-dev2 → 3.8.1 View file →

		@@ -1,6 +1,5 @@
1	1	<?php
2		-
3	2	namespace Elementor;
4	3
5	4	use Elementor\Core\Admin\Menu\Admin_Menu_Manager;
6	5	use Elementor\Core\Wp_Api;
		@@ -14,10 +13,12 @@
14	13	use Elementor\Core\Editor\Editor;
15	14	use Elementor\Core\Files\Manager as Files_Manager;
16	15	use Elementor\Core\Files\Assets\Manager as Assets_Manager;
17	16	use Elementor\Core\Modules_Manager;
	17	+use Elementor\Core\Schemes\Manager as Schemes_Manager;
18	18	use Elementor\Core\Settings\Manager as Settings_Manager;
19	19	use Elementor\Core\Settings\Page\Manager as Page_Settings_Manager;
	20	+use Elementor\Core\Upgrade\Elementor_3_Re_Migrate_Globals;
20	21	use Elementor\Modules\History\Revisions_Manager;
21	22	use Elementor\Core\DynamicTags\Manager as Dynamic_Tags_Manager;
22	23	use Elementor\Core\Logger\Manager as Log_Manager;
23	24	use Elementor\Core\Page_Assets\Loader as Assets_Loader;
		@@ -23,10 +24,10 @@
23	24	use Elementor\Core\Page_Assets\Loader as Assets_Loader;
24	25	use Elementor\Modules\System_Info\Module as System_Info_Module;
25	26	use Elementor\Data\Manager as Data_Manager;
26	27	use Elementor\Data\V2\Manager as Data_Manager_V2;
27		-use Elementor\Core\Files\Uploads_Manager;
28		-use WP_REST_Request;
	28	+use Elementor\Core\Common\Modules\DevTools\Module as Dev_Tools;
	29	+use Elementor\Core\Files\Uploads_Manager as Uploads_Manager;
29	30
30	31	if ( ! defined( 'ABSPATH' ) ) {
31	32	exit;
32	33	}
		@@ -39,16 +40,10 @@
39	40	*
40	41	* @since 1.0.0
41	42	*/
42	43	class Plugin {
43		-
44	44	const ELEMENTOR_DEFAULT_POST_TYPES = [ 'page', 'post' ];
45	45
46		- private const SANITIZABLE_META_KEYS = [
47		- '_elementor_data',
48		- '_elementor_page_settings',
49		- ];
50		-
51	46	/**
52	47	* Instance.
53	48	*
54	49	* Holds the plugin instance.
		@@ -99,8 +94,20 @@
99	94	*/
100	95	public $documents;
101	96
102	97	/**
	98	+ * Schemes manager.
	99	+ *
	100	+ * Holds the plugin schemes manager.
	101	+ *
	102	+ * @since 1.0.0
	103	+ * @access public
	104	+ *
	105	+ * @var Schemes_Manager
	106	+ */
	107	+ public $schemes_manager;
	108	+
	109	+ /**
103	110	* Elements manager.
104	111	*
105	112	* Holds the plugin elements manager.
106	113	*
		@@ -430,8 +437,19 @@
430	437	*/
431	438	public $logger;
432	439
433	440	/**
	441	+ * Dev tools.
	442	+ *
	443	+ * Holds the plugin dev tools.
	444	+ *
	445	+ * @access private
	446	+ *
	447	+ * @var Dev_Tools
	448	+ */
	449	+ private $dev_tools;
	450	+
	451	+ /**
434	452	* Upgrade manager.
435	453	*
436	454	* Holds the plugin upgrade manager.
437	455	*
		@@ -562,13 +580,10 @@
562	580	* @access public
563	581	* @since 1.0.0
564	582	*/
565	583	public function __clone() {
566		- _doing_it_wrong(
567		- __FUNCTION__,
568		- sprintf( 'Cloning instances of the singleton "%s" class is forbidden.', get_class( $this ) ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
569		- '1.0.0'
570		- );
	584	+ // Cloning instances of the class is forbidden.
	585	+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Something went wrong.', 'elementor' ), '1.0.0' );
571	586	}
572	587
573	588	/**
574	589	* Wakeup.
		@@ -578,13 +593,10 @@
578	593	* @access public
579	594	* @since 1.0.0
580	595	*/
581	596	public function __wakeup() {
582		- _doing_it_wrong(
583		- __FUNCTION__,
584		- sprintf( 'Unserializing instances of the singleton "%s" class is forbidden.', get_class( $this ) ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
585		- '1.0.0'
586		- );
	597	+ // Unserializing instances of the class is forbidden.
	598	+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Something went wrong.', 'elementor' ), '1.0.0' );
587	599	}
588	600
589	601	/**
590	602	* Instance.
		@@ -694,8 +706,9 @@
694	706	$this->db = new DB();
695	707	$this->controls_manager = new Controls_Manager();
696	708	$this->documents = new Documents_Manager();
697	709	$this->kits_manager = new Kits_Manager();
	710	+ $this->schemes_manager = new Schemes_Manager();
698	711	$this->elements_manager = new Elements_Manager();
699	712	$this->widgets_manager = new Widgets_Manager();
700	713	$this->skins_manager = new Skins_Manager();
701	714	$this->files_manager = new Files_Manager();
		@@ -721,9 +734,8 @@
721	734	$this->admin_menu_manager = new Admin_Menu_Manager();
722	735	$this->admin_menu_manager->register_actions();
723	736
724	737	User::init();
725		- User_Data::init();
726	738	Api::init();
727	739	Tracker::init();
728	740
729	741	$this->upgrade = new Core\Upgrade\Manager();
		@@ -735,8 +747,9 @@
735	747	$this->heartbeat = new Heartbeat();
736	748	$this->wordpress_widgets_manager = new WordPress_Widgets_Manager();
737	749	$this->admin = new Admin();
738	750	$this->beta_testers = new Beta_Testers();
	751	+ new Elementor_3_Re_Migrate_Globals();
739	752	}
740	753	}
741	754
742	755	/**
		@@ -749,8 +762,38 @@
749	762	$this->common->init_components();
750	763	}
751	764
752	765	/**
	766	+ * Get Legacy Mode
	767	+ *
	768	+ * @since 3.0.0
	769	+ * @deprecated 3.1.0 Use `Plugin::$instance->experiments->is_feature_active()` instead
	770	+ *
	771	+ * @param string $mode_name Optional. Default is null
	772	+ *
	773	+ * @return bool|bool[]
	774	+ */
	775	+ public function get_legacy_mode( $mode_name = null ) {
	776	+ self::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation
	777	+ ->deprecated_function( __METHOD__, '3.1.0', 'Plugin::$instance->experiments->is_feature_active()' );
	778	+
	779	+ $legacy_mode = [
	780	+ 'elementWrappers' => ! self::$instance->experiments->is_feature_active( 'e_dom_optimization' ),
	781	+ ];
	782	+
	783	+ if ( ! $mode_name ) {
	784	+ return $legacy_mode;
	785	+ }
	786	+
	787	+ if ( isset( $legacy_mode[ $mode_name ] ) ) {
	788	+ return $legacy_mode[ $mode_name ];
	789	+ }
	790	+
	791	+ // If there is no legacy mode with the given mode name;
	792	+ return false;
	793	+ }
	794	+
	795	+ /**
753	796	* Add custom post type support.
754	797	*
755	798	* Register Elementor support for all the supported post types defined by
756	799	* the user in the admin screen and saved as `elementor_cpt_support` option
		@@ -784,16 +827,16 @@
784	827	Autoloader::run();
785	828	}
786	829
787	830	/**
788		- * Magic getter for accessing certain properties.
	831	+ * Plugin Magic Getter
789	832	*
790	833	* @since 3.1.0
791	834	* @access public
792	835	*
793		- * @param string $property The property name.
794		- * @return mixed The property value or null if not found.
795		- * @throws \Exception If trying to access a private property.
	836	+ * @param $property
	837	+ * @return mixed
	838	+ * @throws \Exception
796	839	*/
797	840	public function __get( $property ) {
798	841	if ( 'posts_css_manager' === $property ) {
799	842	self::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_argument( 'Plugin::$instance->posts_css_manager', '2.7.0', 'Plugin::$instance->files_manager' );
		@@ -805,9 +848,9 @@
805	848	return Data_Manager::instance();
806	849	}
807	850
808	851	if ( property_exists( $this, $property ) ) {
809		- throw new \Exception( 'Cannot access private property.' );
	852	+ throw new \Exception( 'Cannot access private property' );
810	853	}
811	854
812	855	return null;
813	856	}
		@@ -830,46 +873,12 @@
830	873	Compatibility::register_actions();
831	874
832	875	add_action( 'init', [ $this, 'init' ], 0 );
833	876	add_action( 'rest_api_init', [ $this, 'on_rest_api_init' ], 9 );
834		- add_filter( 'rest_pre_insert_post', [ $this, 'sanitize_post_data' ], 10, 2 );
835	877	}
836	878
837	879	final public static function get_title() {
838	880	return esc_html__( 'Elementor', 'elementor' );
839		- }
840		-
841		- public function sanitize_post_data( $post, WP_REST_Request $request ) {
842		- if ( current_user_can( 'unfiltered_html' ) ) {
843		- return $post;
844		- }
845		-
846		- $meta = $request->get_param( 'meta' );
847		- if ( empty( $meta ) || ! is_array( $meta ) ) {
848		- return $post;
849		- }
850		-
851		- foreach ( self::SANITIZABLE_META_KEYS as $meta_key ) {
852		- $elementor_data = $meta[ $meta_key ] ?? null;
853		- if ( is_null( $elementor_data ) ) {
854		- continue;
855		- }
856		- if ( is_string( $elementor_data ) ) {
857		- $elementor_data = json_decode( $elementor_data, true );
858		- }
859		- if ( empty( $elementor_data ) ) {
860		- continue;
861		- }
862		-
863		- $elementor_data = map_deep($elementor_data, function ( $value ) {
864		- return is_bool( $value ) || is_null( $value ) ? $value : wp_kses_post( $value );
865		- });
866		-
867		- $meta[ $meta_key ] = wp_json_encode( $elementor_data );
868		- }
869		-
870		- $request->set_param( 'meta', $meta );
871		- return $post;
872	881	}
873	882	}
874	883
875	884	if ( ! defined( 'ELEMENTOR_TESTS' ) ) {