← All changes | core/kits/manager.php +26 -217 4.1.0-dev3 → 3.1.2 View file →

		@@ -1,18 +1,16 @@
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		-use Elementor\Utils;
15	13
16	14	if ( ! defined( 'ABSPATH' ) ) {
17	15	exit; // Exit if accessed directly.
18	16	}
		@@ -20,69 +18,34 @@
20	18	class Manager {
21	19
22	20	const OPTION_ACTIVE = 'elementor_active_kit';
23	21
24		- const OPTION_PREVIOUS = 'elementor_previous_kit';
25		-
26		- const E_HASH_COMMAND_OPEN_SITE_SETTINGS = 'e:run:panel/global/open';
27		-
28		- private $should_skip_trash_kit_confirmation = false;
29		-
30	22	public function get_active_id() {
31		- return get_option( self::OPTION_ACTIVE );
32		- }
	23	+ $id = get_option( self::OPTION_ACTIVE );
33	24
34		- public function get_previous_id() {
35		- return get_option( self::OPTION_PREVIOUS );
36		- }
	25	+ $kit_document = Plugin::$instance->documents->get( $id );
37	26
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();
	27	+ if ( ! $kit_document || ! $kit_document instanceof Kit || 'trash' === $kit_document->get_main_post()->post_status ) {
	28	+ $id = $this->create_default();
	29	+ update_option( self::OPTION_ACTIVE, $id );
43	30	}
44	31
45		- return $kit;
	32	+ return $id;
46	33	}
47	34
48	35	public function get_active_kit() {
49		- return $this->get_kit( $this->get_active_id() );
	36	+ $id = $this->get_active_id();
	37	+
	38	+ return Plugin::$instance->documents->get( $id );
50	39	}
51	40
52	41	public function get_active_kit_for_frontend() {
53		- $kit = Plugin::$instance->documents->get_doc_for_frontend( $this->get_active_id() );
	42	+ $id = $this->get_active_id();
54	43
55		- if ( ! $this->is_valid_kit( $kit ) ) {
56		- return $this->get_empty_kit_instance();
57		- }
58		-
59		- return $kit;
	44	+ return Plugin::$instance->documents->get_doc_for_frontend( $id );
60	45	}
61	46
62	47	/**
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	48	* Checks if specific post is a kit.
86	49	*
87	50	* @param $post_id
88	51	*
		@@ -116,124 +79,19 @@
116	79
117	80	return $kit->get_settings( $setting );
118	81	}
119	82
120		- public function create( array $kit_data = [], array $kit_meta_data = [] ) {
121		- $default_kit_data = [
122		- 'post_status' => 'publish',
123		- ];
124		-
125		- $kit_data = array_merge( $default_kit_data, $kit_data );
126		-
127		- $kit_data['post_type'] = Source_Local::CPT;
128		-
129		- $kit = Plugin::$instance->documents->create( 'kit', $kit_data, $kit_meta_data );
130		-
131		- if ( isset( $kit_data['settings'] ) ) {
132		- $kit->save( [ 'settings' => $kit_data['settings'] ] );
133		- }
134		-
135		- return $kit->get_id();
136		- }
137		-
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		- return $id;
156		- }
157		-
158		- private function get_meta_to_preserve( Kit $current_kit ): array {
159		- $meta_keys_to_preserve = apply_filters( 'elementor/kit/meta_to_preserve_on_kit_import', [] );
160		-
161		- $kit_meta_data = [];
162		-
163		- foreach ( $meta_keys_to_preserve as $meta_key ) {
164		- $value = $current_kit->get_meta( $meta_key );
165		-
166		- if ( ! empty( $value ) ) {
167		- $kit_meta_data[ $meta_key ] = $value;
168		- }
169		- }
170		-
171		- return $kit_meta_data;
172		- }
173		-
174		- public function create_default() {
175		- return $this->create( [
176		- 'post_title' => esc_html__( 'Default Kit', 'elementor' ),
177		- ] );
178		- }
179		-
180		- /**
181		- * Create a default kit if needed.
182		- *
183		- * This action runs on activation hook, all the Plugin components do not exists and
184		- * the Document manager and Kits manager instances cannot be used.
185		- *
186		- * @return int|void|\WP_Error
187		- */
188		- public static function create_default_kit() {
189		- if ( get_option( self::OPTION_ACTIVE ) ) {
190		- return;
191		- }
192		-
193		- $id = wp_insert_post( [
194		- 'post_title' => esc_html__( 'Default Kit', 'elementor' ),
	83	+ private function create_default() {
	84	+ $kit = Plugin::$instance->documents->create( 'kit', [
195	85	'post_type' => Source_Local::CPT,
	86	+ 'post_title' => __( 'Default Kit', 'elementor' ),
196	87	'post_status' => 'publish',
197		- 'meta_input' => [
198		- '_elementor_edit_mode' => 'builder',
199		- Document::TYPE_META_KEY => 'kit',
200		- ],
201	88	] );
202	89
203		- update_option( self::OPTION_ACTIVE, $id );
204		-
205		- return $id;
	90	+ return $kit->get_id();
206	91	}
207	92
208	93	/**
209		- * @param $imported_kit_id int The id of the imported kit that should be deleted.
210		- * @param $active_kit_id int The id of the kit that should set as 'active_kit' after the deletion.
211		- * @param $previous_kit_id int The id of the kit that should set as 'previous_kit' after the deletion.
212		- * @return void
213		- */
214		- public function revert( int $imported_kit_id, int $active_kit_id, int $previous_kit_id ) {
215		- // If the kit that should set as active is not a valid kit then abort the revert.
216		- if ( ! $this->is_kit( $active_kit_id ) ) {
217		- return;
218		- }
219		-
220		- // This a hacky solution to avoid from the revert process to be interrupted by the `trash_kit_confirmation`.
221		- $this->should_skip_trash_kit_confirmation = true;
222		-
223		- $kit = $this->get_kit( $imported_kit_id );
224		- $kit->force_delete();
225		-
226		- $this->should_skip_trash_kit_confirmation = false;
227		-
228		- update_option( self::OPTION_ACTIVE, $active_kit_id );
229		-
230		- if ( $this->is_kit( $previous_kit_id ) ) {
231		- update_option( self::OPTION_PREVIOUS, $previous_kit_id );
232		- }
233		- }
234		-
235		- /**
236	94	* @param Documents_Manager $documents_manager
237	95	*/
238	96	public function register_document( $documents_manager ) {
239	97	$documents_manager->register_document_type( 'kit', Kit::get_class_full_name() );
		@@ -296,9 +154,9 @@
296	154	$is_kit_preview = is_preview() && isset( $_GET['preview_id'] ) && $active_kit->get_main_id() === (int) $_GET['preview_id'];
297	155
298	156	if ( $is_kit_preview ) {
299	157	$kit = Plugin::$instance->documents->get_doc_or_auto_save( $active_kit->get_main_id(), get_current_user_id() );
300		- } elseif ( null !== $active_kit->get_main_post() && 'publish' === $active_kit->get_main_post()->post_status ) {
	158	+ } elseif ( 'publish' === $active_kit->get_main_post()->post_status ) {
301	159	$kit = $active_kit;
302	160	}
303	161
304	162	return $kit;
		@@ -319,9 +177,9 @@
319	177	* Map Scheme To Global
320	178	*
321	179	* Convert a given scheme value to its corresponding default global value
322	180	*
323		- * @param string $type 'color'/'typography'.
	181	+ * @param string $type 'color'/'typography'
324	182	* @param $value
325	183	* @return mixed
326	184	*/
327	185	private function map_scheme_to_global( $type, $value ) {
		@@ -354,9 +212,9 @@
354	212	* @access public
355	213	*/
356	214	public function convert_scheme_to_global( $scheme ) {
357	215	if ( isset( $scheme['type'] ) && isset( $scheme['value'] ) ) {
358		- // _deprecated_argument( $args['scheme'], '3.0.0', 'Schemes are now deprecated - use $args[\'global\'] instead.' );
	216	+ //_deprecated_argument( $args['scheme'], '3.0.0', 'Schemes are now deprecated - use $args[\'global\'] instead.' );
359	217	return $this->map_scheme_to_global( $scheme['type'], $scheme['value'] );
360	218	}
361	219
362	220	// Typography control 'scheme' properties usually only include the string with the typography value ('1'-'4').
		@@ -365,9 +223,9 @@
365	223
366	224	public function register_controls() {
367	225	$controls_manager = Plugin::$instance->controls_manager;
368	226
369		- $controls_manager->register( new Repeater() );
	227	+ $controls_manager->register_control( Repeater::CONTROL_TYPE, new Repeater() );
370	228	}
371	229
372	230	public function is_custom_colors_enabled() {
373	231	return ! get_option( 'elementor_disable_color_schemes' );
		@@ -393,16 +251,12 @@
393	251
394	252	/**
395	253	* Send a confirm message before move a kit to trash, or if delete permanently not for trash.
396	254	*
397		- * @param $post_id
398		- * @param bool $is_permanently_delete
	255	+ * @param $post_id
	256	+ * @param false $is_permanently_delete
399	257	*/
400	258	private function before_delete_kit( $post_id, $is_permanently_delete = false ) {
401		- if ( $this->should_skip_trash_kit_confirmation ) {
402		- return;
403		- }
404		-
405	259	$document = Plugin::$instance->documents->get( $post_id );
406	260
407	261	if (
408	262	! $document ||
		@@ -417,54 +271,13 @@
417	271	require __DIR__ . '/views/trash-kit-confirmation.php';
418	272
419	273	$confirmation_content = ob_get_clean();
420	274
421		- // PHPCS - the content does not contain user input value.
422		- wp_die( new \WP_Error( 'cant_delete_kit', $confirmation_content ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	275	+ wp_die(
	276	+ new \WP_Error( 'cant_delete_kit', $confirmation_content )
	277	+ );
423	278	}
424	279
425		- /**
426		- * Add 'Edit with elementor -> Site Settings' in admin bar.
427		- *
428		- * @param [] $admin_bar_config
429		- *
430		- * @return array $admin_bar_config
431		- */
432		- private function add_menu_in_admin_bar( $admin_bar_config ) {
433		- $document = Plugin::$instance->documents->get( get_the_ID() );
434		-
435		- if ( ! $document || ! $document->is_built_with_elementor() ) {
436		- $recent_edited_post = Utils::get_recently_edited_posts_query( [
437		- 'posts_per_page' => 1,
438		- ] );
439		-
440		- if ( $recent_edited_post->post_count ) {
441		- $posts = $recent_edited_post->get_posts();
442		- $document = Plugin::$instance->documents->get( reset( $posts )->ID );
443		- }
444		- }
445		-
446		- if ( $document ) {
447		- $document_edit_url = add_query_arg(
448		- [
449		- 'active-document' => $this->get_active_id(),
450		- ],
451		- $document->get_edit_url()
452		- );
453		-
454		- $admin_bar_config['elementor_edit_page']['children'][] = [
455		- 'id' => 'elementor_site_settings',
456		- 'title' => esc_html__( 'Site Settings', 'elementor' ),
457		- 'sub_title' => esc_html__( 'Site', 'elementor' ),
458		- 'href' => $document_edit_url,
459		- 'class' => 'elementor-site-settings',
460		- 'parent_class' => 'elementor-second-section',
461		- ];
462		- }
463		-
464		- return $admin_bar_config;
465		- }
466		-
467	280	public function __construct() {
468	281	add_action( 'elementor/documents/register', [ $this, 'register_document' ] );
469	282	add_filter( 'elementor/editor/localize_settings', [ $this, 'localize_settings' ] );
470	283	add_filter( 'elementor/editor/footer', [ $this, 'render_panel_html' ] );
		@@ -469,9 +282,9 @@
469	282	add_filter( 'elementor/editor/localize_settings', [ $this, 'localize_settings' ] );
470	283	add_filter( 'elementor/editor/footer', [ $this, 'render_panel_html' ] );
471	284	add_action( 'elementor/frontend/after_enqueue_styles', [ $this, 'frontend_before_enqueue_styles' ], 0 );
472	285	add_action( 'elementor/preview/enqueue_styles', [ $this, 'preview_enqueue_styles' ], 0 );
473		- add_action( 'elementor/controls/register', [ $this, 'register_controls' ] );
	286	+ add_action( 'elementor/controls/controls_registered', [ $this, 'register_controls' ] );
474	287
475	288	add_action( 'wp_trash_post', function ( $post_id ) {
476	289	$this->before_delete_kit( $post_id );
477	290	} );
		@@ -490,10 +303,6 @@
490	303
491	304	add_action( 'wp_head', function() {
492	305	$this->add_body_class();
493	306	} );
494		-
495		- add_filter( 'elementor/frontend/admin_bar/settings', function ( $admin_bar_config ) {
496		- return $this->add_menu_in_admin_bar( $admin_bar_config );
497		- }, 9 /* Before site-editor (theme-builder) */ );
498	307	}
499	308	}