← All changes | core/kits/manager.php +27 -173 4.2.2 → 3.2.0 View file →

		@@ -1,14 +1,13 @@
1	1	<?php
2	2	namespace Elementor\Core\Kits;
3	3
4		-use Elementor\Core\Base\Document;
5	4	use Elementor\Core\Kits\Controls\Repeater;
6	5	use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
7	6	use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
8	7	use Elementor\Plugin;
9	8	use Elementor\Core\Files\CSS\Post as Post_CSS;
10		-use Elementor\Core\Files\CSS\Post_Preview;
	9	+use Elementor\Core\Files\CSS\Post_Preview as Post_Preview;
11	10	use Elementor\Core\Documents_Manager;
12	11	use Elementor\Core\Kits\Documents\Kit;
13	12	use Elementor\TemplateLibrary\Source_Local;
14	13	use Elementor\Utils;
		@@ -20,69 +19,36 @@
20	19	class Manager {
21	20
22	21	const OPTION_ACTIVE = 'elementor_active_kit';
23	22
24		- const OPTION_PREVIOUS = 'elementor_previous_kit';
25		-
26	23	const E_HASH_COMMAND_OPEN_SITE_SETTINGS = 'e:run:panel/global/open';
27	24
28		- private $should_skip_trash_kit_confirmation = false;
29		-
30	25	public function get_active_id() {
31		- return get_option( self::OPTION_ACTIVE );
32		- }
	26	+ $id = get_option( self::OPTION_ACTIVE );
33	27
34		- public function get_previous_id() {
35		- return get_option( self::OPTION_PREVIOUS );
36		- }
	28	+ $kit_document = Plugin::$instance->documents->get( $id );
37	29
38		- public function get_kit( $kit_id ) {
39		- $kit = Plugin::$instance->documents->get( $kit_id );
40		-
41		- if ( ! $this->is_valid_kit( $kit ) ) {
42		- return $this->get_empty_kit_instance();
	30	+ if ( ! $kit_document || ! $kit_document instanceof Kit || 'trash' === $kit_document->get_main_post()->post_status ) {
	31	+ $id = $this->create_default();
	32	+ update_option( self::OPTION_ACTIVE, $id );
43	33	}
44	34
45		- return $kit;
	35	+ return $id;
46	36	}
47	37
48	38	public function get_active_kit() {
49		- return $this->get_kit( $this->get_active_id() );
	39	+ $id = $this->get_active_id();
	40	+
	41	+ return Plugin::$instance->documents->get( $id );
50	42	}
51	43
52	44	public function get_active_kit_for_frontend() {
53		- $kit = Plugin::$instance->documents->get_doc_for_frontend( $this->get_active_id() );
	45	+ $id = $this->get_active_id();
54	46
55		- if ( ! $this->is_valid_kit( $kit ) ) {
56		- return $this->get_empty_kit_instance();
57		- }
58		-
59		- return $kit;
	47	+ return Plugin::$instance->documents->get_doc_for_frontend( $id );
60	48	}
61	49
62	50	/**
63		- * @param $kit
64		- *
65		- * @return bool
66		- */
67		- private function is_valid_kit( $kit ) {
68		- return $kit && $kit instanceof Kit && 'trash' !== $kit->get_main_post()->post_status;
69		- }
70		-
71		- /**
72		- * Returns an empty kit for situation when there is no kit in the site.
73		- *
74		- * @return Kit
75		- * @throws \Exception If the kit instance cannot be created.
76		- */
77		- private function get_empty_kit_instance() {
78		- return new Kit( [
79		- 'settings' => [],
80		- 'post_id' => 0,
81		- ] );
82		- }
83		-
84		- /**
85	51	* Checks if specific post is a kit.
86	52	*
87	53	* @param $post_id
88	54	*
		@@ -127,118 +93,16 @@
127	93	$kit_data['post_type'] = Source_Local::CPT;
128	94
129	95	$kit = Plugin::$instance->documents->create( 'kit', $kit_data, $kit_meta_data );
130	96
131		- if ( isset( $kit_data['settings'] ) ) {
132		- $kit->save( [ 'settings' => $kit_data['settings'] ] );
133		- }
134		-
135	97	return $kit->get_id();
136	98	}
137	99
138		- public function create_new_kit( $kit_name = '', $settings = [], $active = true ) {
139		- $kit_name = $kit_name ? $kit_name : esc_html__( 'Custom', 'elementor' );
140		-
141		- $current_kit = $this->get_active_kit();
142		-
143		- $kit_meta_data = $this->get_meta_to_preserve( $current_kit );
144		-
145		- $id = $this->create( [
146		- 'post_title' => $kit_name,
147		- 'settings' => $settings,
148		- ], $kit_meta_data );
149		-
150		- if ( $active ) {
151		- update_option( self::OPTION_PREVIOUS, $this->get_active_id() );
152		- update_option( self::OPTION_ACTIVE, $id );
153		- }
154		-
155		- do_action( 'elementor/kit/after_new_kit_created', [
156		- 'new_kit_id' => $id,
157		- 'previous_kit_id' => $current_kit->get_post()->ID,
158		- ] );
159		-
160		- return $id;
	100	+ private function create_default() {
	101	+ return $this->create( [ 'post_title' => __( 'Default Kit', 'elementor' ) ] );
161	102	}
162	103
163		- private function get_meta_to_preserve( Kit $current_kit ): array {
164		- $meta_keys_to_preserve = apply_filters( 'elementor/kit/meta_to_preserve_on_kit_import', [] );
165		-
166		- $kit_meta_data = [];
167		-
168		- foreach ( $meta_keys_to_preserve as $meta_key ) {
169		- $value = $current_kit->get_meta( $meta_key );
170		-
171		- if ( ! empty( $value ) ) {
172		- $kit_meta_data[ $meta_key ] = $value;
173		- }
174		- }
175		-
176		- return $kit_meta_data;
177		- }
178		-
179		- public function create_default() {
180		- return $this->create( [
181		- 'post_title' => esc_html__( 'Default Kit', 'elementor' ),
182		- ] );
183		- }
184		-
185	104	/**
186		- * Create a default kit if needed.
187		- *
188		- * This action runs on activation hook, all the Plugin components do not exists and
189		- * the Document manager and Kits manager instances cannot be used.
190		- *
191		- * @return int|void|\WP_Error
192		- */
193		- public static function create_default_kit() {
194		- if ( get_option( self::OPTION_ACTIVE ) ) {
195		- return;
196		- }
197		-
198		- $id = wp_insert_post( [
199		- 'post_title' => esc_html__( 'Default Kit', 'elementor' ),
200		- 'post_type' => Source_Local::CPT,
201		- 'post_status' => 'publish',
202		- 'meta_input' => [
203		- '_elementor_edit_mode' => 'builder',
204		- Document::TYPE_META_KEY => 'kit',
205		- ],
206		- ] );
207		-
208		- update_option( self::OPTION_ACTIVE, $id );
209		-
210		- return $id;
211		- }
212		-
213		- /**
214		- * @param $imported_kit_id int The id of the imported kit that should be deleted.
215		- * @param $active_kit_id int The id of the kit that should set as 'active_kit' after the deletion.
216		- * @param $previous_kit_id int The id of the kit that should set as 'previous_kit' after the deletion.
217		- * @return void
218		- */
219		- public function revert( int $imported_kit_id, int $active_kit_id, int $previous_kit_id ) {
220		- // If the kit that should set as active is not a valid kit then abort the revert.
221		- if ( ! $this->is_kit( $active_kit_id ) ) {
222		- return;
223		- }
224		-
225		- // This a hacky solution to avoid from the revert process to be interrupted by the `trash_kit_confirmation`.
226		- $this->should_skip_trash_kit_confirmation = true;
227		-
228		- $kit = $this->get_kit( $imported_kit_id );
229		- $kit->force_delete();
230		-
231		- $this->should_skip_trash_kit_confirmation = false;
232		-
233		- update_option( self::OPTION_ACTIVE, $active_kit_id );
234		-
235		- if ( $this->is_kit( $previous_kit_id ) ) {
236		- update_option( self::OPTION_PREVIOUS, $previous_kit_id );
237		- }
238		- }
239		-
240		- /**
241	105	* @param Documents_Manager $documents_manager
242	106	*/
243	107	public function register_document( $documents_manager ) {
244	108	$documents_manager->register_document_type( 'kit', Kit::get_class_full_name() );
		@@ -301,9 +165,9 @@
301	165	$is_kit_preview = is_preview() && isset( $_GET['preview_id'] ) && $active_kit->get_main_id() === (int) $_GET['preview_id'];
302	166
303	167	if ( $is_kit_preview ) {
304	168	$kit = Plugin::$instance->documents->get_doc_or_auto_save( $active_kit->get_main_id(), get_current_user_id() );
305		- } elseif ( null !== $active_kit->get_main_post() && 'publish' === $active_kit->get_main_post()->post_status ) {
	169	+ } elseif ( 'publish' === $active_kit->get_main_post()->post_status ) {
306	170	$kit = $active_kit;
307	171	}
308	172
309	173	return $kit;
		@@ -324,9 +188,9 @@
324	188	* Map Scheme To Global
325	189	*
326	190	* Convert a given scheme value to its corresponding default global value
327	191	*
328		- * @param string $type 'color'/'typography'.
	192	+ * @param string $type 'color'/'typography'
329	193	* @param $value
330	194	* @return mixed
331	195	*/
332	196	private function map_scheme_to_global( $type, $value ) {
		@@ -359,9 +223,9 @@
359	223	* @access public
360	224	*/
361	225	public function convert_scheme_to_global( $scheme ) {
362	226	if ( isset( $scheme['type'] ) && isset( $scheme['value'] ) ) {
363		- // _deprecated_argument( $args['scheme'], '3.0.0', 'Schemes are now deprecated - use $args[\'global\'] instead.' );
	227	+ //_deprecated_argument( $args['scheme'], '3.0.0', 'Schemes are now deprecated - use $args[\'global\'] instead.' );
364	228	return $this->map_scheme_to_global( $scheme['type'], $scheme['value'] );
365	229	}
366	230
367	231	// Typography control 'scheme' properties usually only include the string with the typography value ('1'-'4').
		@@ -370,9 +234,9 @@
370	234
371	235	public function register_controls() {
372	236	$controls_manager = Plugin::$instance->controls_manager;
373	237
374		- $controls_manager->register( new Repeater() );
	238	+ $controls_manager->register_control( Repeater::CONTROL_TYPE, new Repeater() );
375	239	}
376	240
377	241	public function is_custom_colors_enabled() {
378	242	return ! get_option( 'elementor_disable_color_schemes' );
		@@ -398,16 +262,12 @@
398	262
399	263	/**
400	264	* Send a confirm message before move a kit to trash, or if delete permanently not for trash.
401	265	*
402		- * @param $post_id
403		- * @param bool $is_permanently_delete
	266	+ * @param $post_id
	267	+ * @param false $is_permanently_delete
404	268	*/
405	269	private function before_delete_kit( $post_id, $is_permanently_delete = false ) {
406		- if ( $this->should_skip_trash_kit_confirmation ) {
407		- return;
408		- }
409		-
410	270	$document = Plugin::$instance->documents->get( $post_id );
411	271
412	272	if (
413	273	! $document ||
		@@ -422,10 +282,11 @@
422	282	require __DIR__ . '/views/trash-kit-confirmation.php';
423	283
424	284	$confirmation_content = ob_get_clean();
425	285
426		- // PHPCS - the content does not contain user input value.
427		- wp_die( new \WP_Error( 'cant_delete_kit', $confirmation_content ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	286	+ wp_die(
	287	+ new \WP_Error( 'cant_delete_kit', $confirmation_content )
	288	+ );
428	289	}
429	290
430	291	/**
431	292	* Add 'Edit with elementor -> Site Settings' in admin bar.
		@@ -448,20 +309,13 @@
448	309	}
449	310	}
450	311
451	312	if ( $document ) {
452		- $document_edit_url = add_query_arg(
453		- [
454		- 'active-document' => $this->get_active_id(),
455		- ],
456		- $document->get_edit_url()
457		- );
458		-
459	313	$admin_bar_config['elementor_edit_page']['children'][] = [
460	314	'id' => 'elementor_site_settings',
461		- 'title' => esc_html__( 'Site Settings', 'elementor' ),
462		- 'sub_title' => esc_html__( 'Site', 'elementor' ),
463		- 'href' => $document_edit_url,
	315	+ 'title' => __( 'Site Settings', 'elementor' ),
	316	+ 'sub_title' => __( 'Site', 'elementor' ),
	317	+ 'href' => $document->get_edit_url() . '#' . self::E_HASH_COMMAND_OPEN_SITE_SETTINGS,
464	318	'class' => 'elementor-site-settings',
465	319	'parent_class' => 'elementor-second-section',
466	320	];
467	321	}
		@@ -474,9 +328,9 @@
474	328	add_filter( 'elementor/editor/localize_settings', [ $this, 'localize_settings' ] );
475	329	add_filter( 'elementor/editor/footer', [ $this, 'render_panel_html' ] );
476	330	add_action( 'elementor/frontend/after_enqueue_styles', [ $this, 'frontend_before_enqueue_styles' ], 0 );
477	331	add_action( 'elementor/preview/enqueue_styles', [ $this, 'preview_enqueue_styles' ], 0 );
478		- add_action( 'elementor/controls/register', [ $this, 'register_controls' ] );
	332	+ add_action( 'elementor/controls/controls_registered', [ $this, 'register_controls' ] );
479	333
480	334	add_action( 'wp_trash_post', function ( $post_id ) {
481	335	$this->before_delete_kit( $post_id );
482	336	} );