← All changes | core/kits/manager.php +19 -88 4.0.7 → 3.3.0 View file →

		@@ -6,9 +6,9 @@
6	6	use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
7	7	use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
8	8	use Elementor\Plugin;
9	9	use Elementor\Core\Files\CSS\Post as Post_CSS;
10		-use Elementor\Core\Files\CSS\Post_Preview;
	10	+use Elementor\Core\Files\CSS\Post_Preview as Post_Preview;
11	11	use Elementor\Core\Documents_Manager;
12	12	use Elementor\Core\Kits\Documents\Kit;
13	13	use Elementor\TemplateLibrary\Source_Local;
14	14	use Elementor\Utils;
		@@ -20,25 +20,17 @@
20	20	class Manager {
21	21
22	22	const OPTION_ACTIVE = 'elementor_active_kit';
23	23
24		- const OPTION_PREVIOUS = 'elementor_previous_kit';
25		-
26	24	const E_HASH_COMMAND_OPEN_SITE_SETTINGS = 'e:run:panel/global/open';
27	25
28		- private $should_skip_trash_kit_confirmation = false;
29		-
30	26	public function get_active_id() {
31	27	return get_option( self::OPTION_ACTIVE );
32	28	}
33	29
34		- public function get_previous_id() {
35		- return get_option( self::OPTION_PREVIOUS );
36		- }
	30	+ public function get_active_kit() {
	31	+ $kit = Plugin::$instance->documents->get( $this->get_active_id() );
37	32
38		- public function get_kit( $kit_id ) {
39		- $kit = Plugin::$instance->documents->get( $kit_id );
40		-
41	33	if ( ! $this->is_valid_kit( $kit ) ) {
42	34	return $this->get_empty_kit_instance();
43	35	}
44	36
		@@ -44,12 +36,8 @@
44	36
45	37	return $kit;
46	38	}
47	39
48		- public function get_active_kit() {
49		- return $this->get_kit( $this->get_active_id() );
50		- }
51		-
52	40	public function get_active_kit_for_frontend() {
53	41	$kit = Plugin::$instance->documents->get_doc_for_frontend( $this->get_active_id() );
54	42
55	43	if ( ! $this->is_valid_kit( $kit ) ) {
		@@ -71,9 +59,9 @@
71	59	/**
72	60	* Returns an empty kit for situation when there is no kit in the site.
73	61	*
74	62	* @return Kit
75		- * @throws \Exception If the kit instance cannot be created.
	63	+ * @throws \Exception
76	64	*/
77	65	private function get_empty_kit_instance() {
78	66	return new Kit( [
79	67	'settings' => [],
		@@ -127,34 +115,14 @@
127	115	$kit_data['post_type'] = Source_Local::CPT;
128	116
129	117	$kit = Plugin::$instance->documents->create( 'kit', $kit_data, $kit_meta_data );
130	118
131		- if ( isset( $kit_data['settings'] ) ) {
132		- $kit->save( [ 'settings' => $kit_data['settings'] ] );
133		- }
134		-
135	119	return $kit->get_id();
136	120	}
137	121
138		- public function create_new_kit( $kit_name = '', $settings = [], $active = true ) {
139		- $kit_name = $kit_name ? $kit_name : esc_html__( 'Custom', 'elementor' );
140		-
141		- $id = $this->create( [
142		- 'post_title' => $kit_name,
143		- 'settings' => $settings,
144		- ] );
145		-
146		- if ( $active ) {
147		- update_option( self::OPTION_PREVIOUS, $this->get_active_id() );
148		- update_option( self::OPTION_ACTIVE, $id );
149		- }
150		-
151		- return $id;
152		- }
153		-
154	122	public function create_default() {
155	123	return $this->create( [
156		- 'post_title' => esc_html__( 'Default Kit', 'elementor' ),
	124	+ 'post_title' => __( 'Default Kit', 'elementor' ),
157	125	] );
158	126	}
159	127
160	128	/**
		@@ -170,9 +138,9 @@
170	138	return;
171	139	}
172	140
173	141	$id = wp_insert_post( [
174		- 'post_title' => esc_html__( 'Default Kit', 'elementor' ),
	142	+ 'post_title' => __( 'Default Kit', 'elementor' ),
175	143	'post_type' => Source_Local::CPT,
176	144	'post_status' => 'publish',
177	145	'meta_input' => [
178	146	'_elementor_edit_mode' => 'builder',
		@@ -185,35 +153,8 @@
185	153	return $id;
186	154	}
187	155
188	156	/**
189		- * @param $imported_kit_id int The id of the imported kit that should be deleted.
190		- * @param $active_kit_id int The id of the kit that should set as 'active_kit' after the deletion.
191		- * @param $previous_kit_id int The id of the kit that should set as 'previous_kit' after the deletion.
192		- * @return void
193		- */
194		- public function revert( int $imported_kit_id, int $active_kit_id, int $previous_kit_id ) {
195		- // If the kit that should set as active is not a valid kit then abort the revert.
196		- if ( ! $this->is_kit( $active_kit_id ) ) {
197		- return;
198		- }
199		-
200		- // This a hacky solution to avoid from the revert process to be interrupted by the `trash_kit_confirmation`.
201		- $this->should_skip_trash_kit_confirmation = true;
202		-
203		- $kit = $this->get_kit( $imported_kit_id );
204		- $kit->force_delete();
205		-
206		- $this->should_skip_trash_kit_confirmation = false;
207		-
208		- update_option( self::OPTION_ACTIVE, $active_kit_id );
209		-
210		- if ( $this->is_kit( $previous_kit_id ) ) {
211		- update_option( self::OPTION_PREVIOUS, $previous_kit_id );
212		- }
213		- }
214		-
215		- /**
216	157	* @param Documents_Manager $documents_manager
217	158	*/
218	159	public function register_document( $documents_manager ) {
219	160	$documents_manager->register_document_type( 'kit', Kit::get_class_full_name() );
		@@ -276,9 +217,9 @@
276	217	$is_kit_preview = is_preview() && isset( $_GET['preview_id'] ) && $active_kit->get_main_id() === (int) $_GET['preview_id'];
277	218
278	219	if ( $is_kit_preview ) {
279	220	$kit = Plugin::$instance->documents->get_doc_or_auto_save( $active_kit->get_main_id(), get_current_user_id() );
280		- } elseif ( null !== $active_kit->get_main_post() && 'publish' === $active_kit->get_main_post()->post_status ) {
	221	+ } elseif ( 'publish' === $active_kit->get_main_post()->post_status ) {
281	222	$kit = $active_kit;
282	223	}
283	224
284	225	return $kit;
		@@ -299,9 +240,9 @@
299	240	* Map Scheme To Global
300	241	*
301	242	* Convert a given scheme value to its corresponding default global value
302	243	*
303		- * @param string $type 'color'/'typography'.
	244	+ * @param string $type 'color'/'typography'
304	245	* @param $value
305	246	* @return mixed
306	247	*/
307	248	private function map_scheme_to_global( $type, $value ) {
		@@ -334,9 +275,9 @@
334	275	* @access public
335	276	*/
336	277	public function convert_scheme_to_global( $scheme ) {
337	278	if ( isset( $scheme['type'] ) && isset( $scheme['value'] ) ) {
338		- // _deprecated_argument( $args['scheme'], '3.0.0', 'Schemes are now deprecated - use $args[\'global\'] instead.' );
	279	+ //_deprecated_argument( $args['scheme'], '3.0.0', 'Schemes are now deprecated - use $args[\'global\'] instead.' );
339	280	return $this->map_scheme_to_global( $scheme['type'], $scheme['value'] );
340	281	}
341	282
342	283	// Typography control 'scheme' properties usually only include the string with the typography value ('1'-'4').
		@@ -345,9 +286,9 @@
345	286
346	287	public function register_controls() {
347	288	$controls_manager = Plugin::$instance->controls_manager;
348	289
349		- $controls_manager->register( new Repeater() );
	290	+ $controls_manager->register_control( Repeater::CONTROL_TYPE, new Repeater() );
350	291	}
351	292
352	293	public function is_custom_colors_enabled() {
353	294	return ! get_option( 'elementor_disable_color_schemes' );
		@@ -373,16 +314,12 @@
373	314
374	315	/**
375	316	* Send a confirm message before move a kit to trash, or if delete permanently not for trash.
376	317	*
377		- * @param $post_id
378		- * @param bool $is_permanently_delete
	318	+ * @param $post_id
	319	+ * @param false $is_permanently_delete
379	320	*/
380	321	private function before_delete_kit( $post_id, $is_permanently_delete = false ) {
381		- if ( $this->should_skip_trash_kit_confirmation ) {
382		- return;
383		- }
384		-
385	322	$document = Plugin::$instance->documents->get( $post_id );
386	323
387	324	if (
388	325	! $document ||
		@@ -397,10 +334,11 @@
397	334	require __DIR__ . '/views/trash-kit-confirmation.php';
398	335
399	336	$confirmation_content = ob_get_clean();
400	337
401		- // PHPCS - the content does not contain user input value.
402		- wp_die( new \WP_Error( 'cant_delete_kit', $confirmation_content ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	338	+ wp_die(
	339	+ new \WP_Error( 'cant_delete_kit', $confirmation_content )
	340	+ );
403	341	}
404	342
405	343	/**
406	344	* Add 'Edit with elementor -> Site Settings' in admin bar.
		@@ -423,20 +361,13 @@
423	361	}
424	362	}
425	363
426	364	if ( $document ) {
427		- $document_edit_url = add_query_arg(
428		- [
429		- 'active-document' => $this->get_active_id(),
430		- ],
431		- $document->get_edit_url()
432		- );
433		-
434	365	$admin_bar_config['elementor_edit_page']['children'][] = [
435	366	'id' => 'elementor_site_settings',
436		- 'title' => esc_html__( 'Site Settings', 'elementor' ),
437		- 'sub_title' => esc_html__( 'Site', 'elementor' ),
438		- 'href' => $document_edit_url,
	367	+ 'title' => __( 'Site Settings', 'elementor' ),
	368	+ 'sub_title' => __( 'Site', 'elementor' ),
	369	+ 'href' => $document->get_edit_url() . '#' . self::E_HASH_COMMAND_OPEN_SITE_SETTINGS,
439	370	'class' => 'elementor-site-settings',
440	371	'parent_class' => 'elementor-second-section',
441	372	];
442	373	}
		@@ -449,9 +380,9 @@
449	380	add_filter( 'elementor/editor/localize_settings', [ $this, 'localize_settings' ] );
450	381	add_filter( 'elementor/editor/footer', [ $this, 'render_panel_html' ] );
451	382	add_action( 'elementor/frontend/after_enqueue_styles', [ $this, 'frontend_before_enqueue_styles' ], 0 );
452	383	add_action( 'elementor/preview/enqueue_styles', [ $this, 'preview_enqueue_styles' ], 0 );
453		- add_action( 'elementor/controls/register', [ $this, 'register_controls' ] );
	384	+ add_action( 'elementor/controls/controls_registered', [ $this, 'register_controls' ] );
454	385
455	386	add_action( 'wp_trash_post', function ( $post_id ) {
456	387	$this->before_delete_kit( $post_id );
457	388	} );