← All changes | app/modules/import-export/module.php +93 -237 4.1.5 → 3.16.0-dev2 View file →

		@@ -11,12 +11,11 @@
11	11	use Elementor\Plugin;
12	12	use Elementor\Tools;
13	13	use Elementor\Utils as ElementorUtils;
14	14	use Elementor\App\Modules\ImportExport\Utils as ImportExportUtils;
15		-use Elementor\Modules\CloudKitLibrary\Module as CloudKitLibrary;
16	15
17	16	if ( ! defined( 'ABSPATH' ) ) {
18		- exit; // Exit if accessed directly.
	17	+ exit; // Exit if accessed directly
19	18	}
20	19
21	20	/**
22	21	* Import Export Module
		@@ -37,10 +36,8 @@
37	36	const REFERRER_KIT_LIBRARY = 'kit-library';
38	37
39	38	const REFERRER_LOCAL = 'local';
40	39
41		- const REFERRER_CLOUD = 'cloud';
42		-
43	40	const PLUGIN_PERMISSIONS_ERROR_KEY = 'plugin-installation-permissions-error';
44	41
45	42	const KIT_LIBRARY_ERROR_KEY = 'invalid-kit-library-zip-error';
46	43
		@@ -45,12 +42,8 @@
45	42	const KIT_LIBRARY_ERROR_KEY = 'invalid-kit-library-zip-error';
46	43
47	44	const NO_WRITE_PERMISSIONS_KEY = 'no-write-permissions';
48	45
49		- const THIRD_PARTY_ERROR = 'third-party-error';
50		-
51		- const DOMDOCUMENT_MISSING = 'domdocument-missing';
52		-
53	46	const OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS = 'elementor_import_sessions';
54	47
55	48	const OPTION_KEY_ELEMENTOR_REVERT_SESSIONS = 'elementor_revert_sessions';
56	49
		@@ -57,10 +50,8 @@
57	50	const META_KEY_ELEMENTOR_IMPORT_SESSION_ID = '_elementor_import_session_id';
58	51
59	52	const META_KEY_ELEMENTOR_EDIT_MODE = '_elementor_edit_mode';
60	53	const IMPORT_PLUGINS_ACTION = 'import-plugins';
61		- const EXPORT_SOURCE_CLOUD = 'cloud';
62		- const EXPORT_SOURCE_FILE = 'file';
63	54
64	55	/**
65	56	* Assigning the export process to a property, so we can use the process from outside the class.
66	57	*
		@@ -117,12 +108,12 @@
117	108	* Register the import/export tab in elementor tools.
118	109	*/
119	110	public function register_settings_tab( Tools $tools ) {
120	111	$tools->add_tab( 'import-export-kit', [
121		- 'label' => esc_html__( 'Website Templates', 'elementor' ),
	112	+ 'label' => esc_html__( 'Import / Export Kit', 'elementor' ),
122	113	'sections' => [
123	114	'intro' => [
124		- 'label' => esc_html__( 'Website Templates', 'elementor' ),
	115	+ 'label' => esc_html__( 'Template Kits', 'elementor' ),
125	116	'callback' => function() {
126	117	$this->render_import_export_tab_content();
127	118	},
128	119	'fields' => [],
		@@ -134,39 +125,44 @@
134	125	/**
135	126	* Render the import/export tab content.
136	127	*/
137	128	private function render_import_export_tab_content() {
138		- $is_cloud_kits_available = CloudKitLibrary::get_app()->check_eligibility()['is_eligible'];
	129	+ $intro_text_link = sprintf( '<a href="https://go.elementor.com/wp-dash-import-export-general/" target="_blank">%s</a>', esc_html__( 'Learn more', 'elementor' ) );
139	130
	131	+ $intro_text = sprintf(
	132	+ /* translators: 1: New line break, 2: Learn More link. */
	133	+ __( 'Design sites faster with a template kit that contains some or all components of a complete site, like templates, content & site settings.%1$sYou can import a kit and apply it to your site, or export the elements from this site to be used anywhere else. %2$s', 'elementor' ),
	134	+ '<br>',
	135	+ $intro_text_link
	136	+ );
	137	+
140	138	$content_data = [
141	139	'export' => [
142		- 'title' => esc_html__( 'Export this website', 'elementor' ),
	140	+ 'title' => esc_html__( 'Export a Template Kit', 'elementor' ),
143	141	'button' => [
144	142	'url' => Plugin::$instance->app->get_base_url() . '#/export',
145		- 'text' => esc_html__( 'Export', 'elementor' ),
146		- 'id' => 'elementor-import-export__export',
	143	+ 'text' => esc_html__( 'Start Export', 'elementor' ),
147	144	],
148		- 'description' => esc_html__( 'You can download this website as a .zip file, or upload it to the library.', 'elementor' ),
	145	+ 'description' => esc_html__( 'Bundle your whole site - or just some of its elements - to be used for another website.', 'elementor' ),
	146	+ 'link' => [
	147	+ 'url' => 'https://go.elementor.com/wp-dash-import-export-export-flow/',
	148	+ 'text' => esc_html__( 'Learn More', 'elementor' ),
	149	+ ],
149	150	],
150	151	'import' => [
151		- 'title' => esc_html__( 'Import website templates', 'elementor' ),
	152	+ 'title' => esc_html__( 'Import a Template Kit', 'elementor' ),
152	153	'button' => [
153	154	'url' => Plugin::$instance->app->get_base_url() . '#/import',
154		- 'text' => esc_html__( 'Import', 'elementor' ),
155		- 'id' => 'elementor-import-export__import',
	155	+ 'text' => esc_html__( 'Start Import', 'elementor' ),
156	156	],
157		- 'description' => esc_html__( 'You can import design and settings from a .zip file or choose from the library.', 'elementor' ),
	157	+ 'description' => esc_html__( 'Apply the design and settings of another site to this one.', 'elementor' ),
	158	+ 'link' => [
	159	+ 'url' => 'https://go.elementor.com/wp-dash-import-export-import-flow/',
	160	+ 'text' => esc_html__( 'Learn More', 'elementor' ),
	161	+ ],
158	162	],
159	163	];
160	164
161		- if ( $is_cloud_kits_available ) {
162		- $content_data['import']['button_secondary'] = [
163		- 'url' => Plugin::$instance->app->get_base_url() . '#/kit-library/cloud',
164		- 'text' => esc_html__( 'Import from library', 'elementor' ),
165		- 'id' => 'elementor-import-export__import_from_library',
166		- ];
167		- }
168		-
169	165	$last_imported_kit = $this->revert->get_last_import_session();
170	166	$penultimate_imported_kit = $this->revert->get_penultimate_import_session();
171	167
172	168	$user_date_format = get_option( 'date_format' );
		@@ -177,9 +173,8 @@
177	173
178	174	if ( $should_show_revert_section ) {
179	175	if ( ! empty( $penultimate_imported_kit ) ) {
180	176	$revert_text = sprintf(
181		- /* translators: 1: Last imported kit title, 2: Last imported kit date, 3: Line break <br>, 4: Penultimate imported kit title, 5: Penultimate imported kit date. */
182	177	esc_html__( 'Remove all the content and site settings that came with "%1$s" on %2$s %3$s and revert to the site setting that came with "%4$s" on %5$s.', 'elementor' ),
183	178	! empty( $last_imported_kit['kit_title'] ) ? $last_imported_kit['kit_title'] : esc_html__( 'imported kit', 'elementor' ),
184	179	gmdate( $date_format, $last_imported_kit['start_timestamp'] ),
185	180	'<br>',
		@@ -187,9 +182,8 @@
187	182	gmdate( $date_format, $penultimate_imported_kit['start_timestamp'] )
188	183	);
189	184	} else {
190	185	$revert_text = sprintf(
191		- /* translators: 1: Last imported kit title, 2: Last imported kit date, 3: Line break <br>. */
192	186	esc_html__( 'Remove all the content and site settings that came with "%1$s" on %2$s.%3$s Your original site settings will be restored.', 'elementor' ),
193	187	! empty( $last_imported_kit['kit_title'] ) ? $last_imported_kit['kit_title'] : esc_html__( 'imported kit', 'elementor' ),
194	188	gmdate( $date_format, $last_imported_kit['start_timestamp'] ),
195	189	'<br>'
		@@ -198,22 +192,23 @@
198	192	}
199	193	?>
200	194
201	195	<div class="tab-import-export-kit__content">
202		- <p class="tab-import-export-kit__info">
203		- <?php
204		- printf(
205		- '%1$s <a href="https://go.elementor.com/wp-dash-import-export-general/" target="_blank">%2$s</a>',
206		- esc_html__( 'Here’s where you can export this website as a .zip file, upload it to the cloud, or start the process of applying an existing template to your site.', 'elementor' ),
207		- esc_html__( 'Learn more', 'elementor' ),
208		- );
209		- ?>
210		- </p>
	196	+ <p class="tab-import-export-kit__info"><?php ElementorUtils::print_unescaped_internal_string( $intro_text ); ?></p>
211	197
212	198	<div class="tab-import-export-kit__wrapper">
213		- <?php foreach ( $content_data as $data ) {
214		- $this->print_item_content( $data );
215		- } ?>
	199	+ <?php foreach ( $content_data as $data ) { ?>
	200	+ <div class="tab-import-export-kit__container">
	201	+ <div class="tab-import-export-kit__box">
	202	+ <h2><?php ElementorUtils::print_unescaped_internal_string( $data['title'] ); ?></h2>
	203	+ <a href="<?php ElementorUtils::print_unescaped_internal_string( $data['button']['url'] ); ?>" class="elementor-button e-primary">
	204	+ <?php ElementorUtils::print_unescaped_internal_string( $data['button']['text'] ); ?>
	205	+ </a>
	206	+ </div>
	207	+ <p><?php ElementorUtils::print_unescaped_internal_string( $data['description'] ); ?></p>
	208	+ <a href="<?php ElementorUtils::print_unescaped_internal_string( $data['link']['url'] ); ?>" target="_blank"><?php ElementorUtils::print_unescaped_internal_string( $data['link']['text'] ); ?></a>
	209	+ </div>
	210	+ <?php } ?>
216	211	</div>
217	212
218	213	<?php
219	214	if ( $should_show_revert_section ) {
		@@ -225,9 +220,9 @@
225	220	];
226	221	?>
227	222	<div class="tab-import-export-kit__revert">
228	223	<h2>
229		- <?php echo esc_html__( 'Remove the most recent Website Template', 'elementor' ); ?>
	224	+ <?php ElementorUtils::print_unescaped_internal_string( esc_html__( 'Remove the most recent Kit', 'elementor' ) ); ?>
230	225	</h2>
231	226	<p class="tab-import-export-kit__info">
232	227	<?php ElementorUtils::print_unescaped_internal_string( $revert_text ); ?>
233	228	</p>
		@@ -232,9 +227,9 @@
232	227	<?php ElementorUtils::print_unescaped_internal_string( $revert_text ); ?>
233	228	</p>
234	229	<?php $this->render_last_kit_thumbnail( $last_imported_kit ); ?>
235	230	<a <?php ElementorUtils::print_html_attributes( $link_attributes ); ?> >
236		- <?php echo esc_html__( 'Remove Website Template', 'elementor' ); ?>
	231	+ <?php ElementorUtils::print_unescaped_internal_string( esc_html__( 'Remove Kit', 'elementor' ) ); ?>
237	232	</a>
238	233	</div>
239	234	<?php } ?>
240	235	</div>
		@@ -240,33 +235,8 @@
240	235	</div>
241	236	<?php
242	237	}
243	238
244		- private function print_item_content( $data ) {
245		- ?>
246		- <div class="tab-import-export-kit__container">
247		- <div class="tab-import-export-kit__box">
248		- <h2><?php ElementorUtils::print_unescaped_internal_string( $data['title'] ); ?></h2>
249		- </div>
250		- <p class="description"><?php ElementorUtils::print_unescaped_internal_string( $data['description'] ); ?></p>
251		-
252		- <?php if ( ! empty( $data['link'] ) ) : ?>
253		- <a href="<?php ElementorUtils::print_unescaped_internal_string( $data['link']['url'] ); ?>" target="_blank"><?php ElementorUtils::print_unescaped_internal_string( $data['link']['text'] ); ?></a>
254		- <?php endif; ?>
255		- <div class="tab-import-export-kit__box action-buttons">
256		- <?php if ( ! empty( $data['button_secondary'] ) ) : ?>
257		- <a href="<?php ElementorUtils::print_unescaped_internal_string( $data['button_secondary']['url'] ); ?>" class="elementor-button e-btn-txt e-btn-txt-border">
258		- <?php ElementorUtils::print_unescaped_internal_string( $data['button_secondary']['text'] ); ?>
259		- </a>
260		- <?php endif; ?>
261		- <a <?php ElementorUtils::print_html_attributes( [ 'id' => $data['button']['id'] ] ); ?> href="<?php ElementorUtils::print_unescaped_internal_string( $data['button']['url'] ); ?>" class="elementor-button e-primary">
262		- <?php ElementorUtils::print_unescaped_internal_string( $data['button']['text'] ); ?>
263		- </a>
264		- </div>
265		- </div>
266		- <?php
267		- }
268		-
269	239	private function get_revert_href(): string {
270	240	$admin_post_url = admin_url( 'admin-post.php?action=elementor_revert_kit' );
271	241	$nonced_admin_post_url = wp_nonce_url( $admin_post_url, 'elementor_revert_kit' );
272	242	return $this->maybe_add_referrer_param( $nonced_admin_post_url );
		@@ -326,19 +296,15 @@
326	296	* so it will be available to use in different places such as: WP_Cli, Pro, etc.
327	297	*
328	298	* @param string $file Path to the file.
329	299	* @param string $referrer Referrer of the file 'local' or 'kit-library'.
330		- * @param string $kit_id
331	300	* @return array
332		- * @throws \Exception If export validation fails or processing errors occur.
	301	+ * @throws \Exception
333	302	*/
334		- public function upload_kit( $file, $referrer, $kit_id = null ) {
	303	+ public function upload_kit( $file, $referrer ) {
335	304	$this->ensure_writing_permissions();
336	305
337		- $this->import = new Import( $file, [
338		- 'referrer' => $referrer,
339		- 'id' => $kit_id,
340		- ] );
	306	+ $this->import = new Import( $file, [ 'referrer' => $referrer ] );
341	307
342	308	return [
343	309	'session' => $this->import->get_session_id(),
344	310	'manifest' => $this->import->get_manifest(),
		@@ -356,22 +322,20 @@
356	322	* Assigning the Import process to the 'import' property,
357	323	* so it will be available to use in different places such as: WP_Cli, Pro, etc.
358	324	*
359	325	* @param string $path Path to the file or session_id.
360		- * @param array $settings Settings the import use to determine which content to import.
361		- * (e.g: include, selected_plugins, selected_cpt, selected_override_conditions, etc.)
362		- * @param bool $split_to_chunks Determine if the import process should be split into chunks.
	326	+ * @param array $settings Settings the import use to determine which content to import.
	327	+ * (e.g: include, selected_plugins, selected_cpt, selected_override_conditions, etc.)
	328	+ * @param bool $split_to_chunks Determine if the import process should be split into chunks.
363	329	* @return array
364		- * @throws \Exception If export configuration is invalid or processing fails.
	330	+ * @throws \Exception
365	331	*/
366	332	public function import_kit( string $path, array $settings, bool $split_to_chunks = false ): array {
367	333	$this->ensure_writing_permissions();
368		- $this->ensure_DOMDocument_exists();
369	334
370	335	$this->import = new Import( $path, $settings );
371	336	$this->import->register_default_runners();
372	337
373		- remove_filter( 'elementor/document/save/data', [ Plugin::$instance->modules_manager->get_modules( 'content-sanitizer' ), 'sanitize_content' ] );
374	338	do_action( 'elementor/import-export/import-kit', $this->import );
375	339
376	340	if ( $split_to_chunks ) {
377	341	$this->import->init_import_session( true );
		@@ -393,9 +357,9 @@
393	357	*
394	358	* @return array Two types of response.
395	359	* 1. The status and the runner name.
396	360	* 2. The imported data. (Only if the runner is the last one in the import process)
397		- * @throws \Exception If import configuration is invalid or processing fails.
	361	+ * @throws \Exception
398	362	*/
399	363	public function import_kit_by_runner( string $session_id, string $runner_name ): array {
400	364	// Check session_id
401	365	$this->import = Import::from_session( $session_id );
		@@ -418,9 +382,9 @@
418	382	*
419	383	* @param array $settings Settings the export use to determine which content to export.
420	384	* (e.g: include, kit_info, selected_plugins, selected_cpt, etc.)
421	385	* @return array
422		- * @throws \Exception If import/export process fails or validation errors occur.
	386	+ * @throws \Exception
423	387	*/
424	388	public function export_kit( array $settings ) {
425	389	$this->ensure_writing_permissions();
426	390
		@@ -474,13 +438,11 @@
474	438	add_action( 'admin_post_elementor_revert_kit', [ $this, 'handle_revert_last_imported_kit' ] );
475	439
476	440	add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
477	441
478		- if ( ! Plugin::$instance->experiments->is_feature_active( 'import-export-customization' ) ) {
479		- $page_id = Tools::PAGE_ID;
	442	+ $page_id = Tools::PAGE_ID;
480	443
481		- add_action( "elementor/admin/after_create_settings/{$page_id}", [ $this, 'register_settings_tab' ] );
482		- }
	444	+ add_action( "elementor/admin/after_create_settings/{$page_id}", [ $this, 'register_settings_tab' ] );
483	445
484	446	// TODO 18/04/2023 : This needs to be moved to the runner itself after https://elementor.atlassian.net/browse/HTS-434 is done.
485	447	if ( self::IMPORT_PLUGINS_ACTION === ElementorUtils::get_super_global_value( $_SERVER, 'HTTP_X_ELEMENTOR_ACTION' ) ) {
486	448	add_filter( 'woocommerce_create_pages', [ $this, 'empty_pages' ], 10, 0 );
		@@ -485,20 +447,8 @@
485	447	if ( self::IMPORT_PLUGINS_ACTION === ElementorUtils::get_super_global_value( $_SERVER, 'HTTP_X_ELEMENTOR_ACTION' ) ) {
486	448	add_filter( 'woocommerce_create_pages', [ $this, 'empty_pages' ], 10, 0 );
487	449	}
488	450	// TODO ^^^
489		-
490		- add_filter( 'elementor/import/kit/result', function( $result ) {
491		- if ( ! empty( $result['file_url'] ) ) {
492		- return [
493		- 'file_name' => $this->get_remote_kit_zip( $result['file_url'] ),
494		- 'referrer' => static::REFERRER_KIT_LIBRARY,
495		- 'file_url' => $result['file_url'],
496		- ];
497		- }
498		-
499		- return $result;
500		- } );
501	451	}
502	452
503	453	/**
504	454	* Prevent the creation of the default WooCommerce pages (Cart, Checkout, etc.)
		@@ -503,9 +453,8 @@
503	453	/**
504	454	* Prevent the creation of the default WooCommerce pages (Cart, Checkout, etc.)
505	455	*
506	456	* TODO 18/04/2023 : This needs to be moved to the runner itself after https://elementor.atlassian.net/browse/HTS-434 is done.
507		- *
508	457	* @return array
509	458	*/
510	459	public function empty_pages(): array {
511	460	return [];
		@@ -523,14 +472,14 @@
523	472	$permissions = $server->get_paths_permissions( $paths_to_check );
524	473
525	474	// WP Content dir has to be exists and writable.
526	475	if ( ! $permissions[ Server::KEY_PATH_WP_CONTENT_DIR ]['write'] ) {
527		- throw new \Error( self::NO_WRITE_PERMISSIONS_KEY ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
	476	+ throw new \Error( self::NO_WRITE_PERMISSIONS_KEY );
528	477	}
529	478
530	479	// WP Uploads dir has to be exists and writable.
531	480	if ( ! $permissions[ Server::KEY_PATH_UPLOADS_DIR ]['write'] ) {
532		- throw new \Error( self::NO_WRITE_PERMISSIONS_KEY ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
	481	+ throw new \Error( self::NO_WRITE_PERMISSIONS_KEY );
533	482	}
534	483
535	484	// Elementor uploads dir permissions is divided to 2 cases:
536	485	// 1. If the dir exists, it has to be writable.
		@@ -535,18 +484,12 @@
535	484	// Elementor uploads dir permissions is divided to 2 cases:
536	485	// 1. If the dir exists, it has to be writable.
537	486	// 2. If the dir doesn't exist, the parent dir has to be writable (wp uploads dir), so we can create it.
538	487	if ( $permissions[ Server::KEY_PATH_ELEMENTOR_UPLOADS_DIR ]['exists'] && ! $permissions[ Server::KEY_PATH_ELEMENTOR_UPLOADS_DIR ]['write'] ) {
539		- throw new \Error( self::NO_WRITE_PERMISSIONS_KEY ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
	488	+ throw new \Error( self::NO_WRITE_PERMISSIONS_KEY );
540	489	}
541	490	}
542	491
543		- private function ensure_DOMDocument_exists() {
544		- if ( ! class_exists( 'DOMDocument' ) ) {
545		- throw new \Error( self::DOMDOCUMENT_MISSING ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
546		- }
547		- }
548		-
549	492	/**
550	493	* Enqueue admin scripts
551	494	*/
552	495	public function enqueue_scripts() {
		@@ -605,13 +548,8 @@
605	548	'meta' => [
606	549	'trace' => $e->getTraceAsString(),
607	550	],
608	551	] );
609		-
610		- if ( isset( $this->import ) && $this->is_third_party_class( $e->getTrace()[0]['class'] ) ) {
611		- wp_send_json_error( self::THIRD_PARTY_ERROR, 500 );
612		- }
613		-
614	552	wp_send_json_error( $e->getMessage(), 500 );
615	553	}
616	554	}
617	555
		@@ -616,10 +554,8 @@
616	554	}
617	555
618	556	/**
619	557	* Handle upload kit ajax request.
620		- *
621		- * @throws \Error If operation validation fails or processing errors occur.
622	558	*/
623	559	private function handle_upload_kit() {
624	560	// PHPCS - A URL that should contain special chars (auth headers information).
625	561	$file_url = isset( $_POST['e_import_file'] )
		@@ -626,15 +562,10 @@
626	562	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
627	563	? wp_unslash( $_POST['e_import_file'] )
628	564	: '';
629	565
630		- // PHPCS - Already validated in caller function
631		- $kit_id = ElementorUtils::get_super_global_value( $_POST, 'kit_id' ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
632		- $source = ElementorUtils::get_super_global_value( $_POST, 'source' ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
633		-
634		- $is_import_from_library = ! empty( $file_url );
635		-
636		- if ( $is_import_from_library ) {
	566	+ // Import from kit library
	567	+ if ( ! empty( $file_url ) ) {
637	568	if (
638	569	! wp_verify_nonce( ElementorUtils::get_super_global_value( $_POST, 'e_kit_library_nonce' ), 'kit-library-import' )
639	570	) {
640	571	throw new \Error( 'Invalid kit library nonce.' );
		@@ -640,59 +571,57 @@
640	571	throw new \Error( 'Invalid kit library nonce.' );
641	572	}
642	573
643	574	if ( ! filter_var( $file_url, FILTER_VALIDATE_URL ) || 0 !== strpos( $file_url, 'http' ) ) {
644		- throw new \Error( static::KIT_LIBRARY_ERROR_KEY ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
	575	+ throw new \Error( static::KIT_LIBRARY_ERROR_KEY );
645	576	}
646	577
647		- $import_result = apply_filters( 'elementor/import/kit/result', [ 'file_url' => $file_url ] );
648		- } elseif ( ! empty( $source ) ) {
649		- $import_result = apply_filters( 'elementor/import/kit/result/' . $source, [
650		- 'kit_id' => $kit_id,
651		- 'source' => $source,
652		- ] );
	578	+ $remote_zip_request = wp_remote_get( $file_url );
	579	+
	580	+ if ( is_wp_error( $remote_zip_request ) ) {
	581	+ Plugin::$instance->logger->get_logger()->error( $remote_zip_request->get_error_message() );
	582	+ throw new \Error( static::KIT_LIBRARY_ERROR_KEY );
	583	+ }
	584	+
	585	+ if ( 200 !== $remote_zip_request['response']['code'] ) {
	586	+ Plugin::$instance->logger->get_logger()->error( $remote_zip_request['response']['message'] );
	587	+ throw new \Error( static::KIT_LIBRARY_ERROR_KEY );
	588	+ }
	589	+
	590	+ $file_name = Plugin::$instance->uploads_manager->create_temp_file( $remote_zip_request['body'], 'kit.zip' );
	591	+ $referrer = static::REFERRER_KIT_LIBRARY;
653	592	} else {
654		- $import_result = [
655		- 'file_name' => ElementorUtils::get_super_global_value( $_FILES, 'e_import_file' )['tmp_name'],
656		- 'referrer' => static::REFERRER_LOCAL,
657		- ];
	593	+ // PHPCS - Already validated in caller function.
	594	+ $file_name = ElementorUtils::get_super_global_value( $_FILES, 'e_import_file' )['tmp_name'];
	595	+ $referrer = static::REFERRER_LOCAL;
658	596	}
659	597
660	598	Plugin::$instance->logger->get_logger()->info( 'Uploading Kit: ', [
661	599	'meta' => [
662		- 'kit_id' => $kit_id,
663		- 'referrer' => $import_result['referrer'],
	600	+ 'kit_id' => ElementorUtils::get_super_global_value( $_POST, 'kit_id' ),
	601	+ 'referrer' => $referrer,
664	602	],
665	603	] );
666	604
667		- if ( is_wp_error( $import_result ) ) {
668		- wp_send_json_error( $import_result->get_error_message() );
669		- }
	605	+ $uploaded_kit = $this->upload_kit( $file_name, $referrer );
670	606
671		- $uploaded_kit = $this->upload_kit( $import_result['file_name'], $import_result['referrer'], $kit_id );
672		-
673	607	$session_dir = $uploaded_kit['session'];
674	608	$manifest = $uploaded_kit['manifest'];
675	609	$conflicts = $uploaded_kit['conflicts'];
676	610
677		- if ( $is_import_from_library || ! empty( $source ) ) {
678		- Plugin::$instance->uploads_manager->remove_file_or_dir( dirname( $import_result['file_name'] ) );
	611	+ if ( ! empty( $file_url ) ) {
	612	+ Plugin::$instance->uploads_manager->remove_file_or_dir( dirname( $file_name ) );
679	613	}
680	614
681	615	if ( isset( $manifest['plugins'] ) && ! current_user_can( 'install_plugins' ) ) {
682		- throw new \Error( static::PLUGIN_PERMISSIONS_ERROR_KEY ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
	616	+ throw new \Error( static::PLUGIN_PERMISSIONS_ERROR_KEY );
683	617	}
684	618
685	619	$result = [
686	620	'session' => $session_dir,
687	621	'manifest' => $manifest,
688		- 'file_url' => $import_result['file_url'],
689	622	];
690	623
691		- if ( ! empty( $import_result['kit'] ) ) {
692		- $result['uploaded_kit'] = $import_result['kit'];
693		- }
694		-
695	624	if ( ! empty( $conflicts ) ) {
696	625	$result['conflicts'] = $conflicts;
697	626	} else {
698	627	// Moved into the IE process \Elementor\App\Modules\ImportExport\Processes\Import::get_default_settings_conflicts
		@@ -702,24 +631,8 @@
702	631
703	632	wp_send_json_success( $result );
704	633	}
705	634
706		- protected function get_remote_kit_zip( $url ) {
707		- $remote_zip_request = wp_safe_remote_get( $url );
708		-
709		- if ( is_wp_error( $remote_zip_request ) ) {
710		- Plugin::$instance->logger->get_logger()->error( $remote_zip_request->get_error_message() );
711		- throw new \Error( static::KIT_LIBRARY_ERROR_KEY ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
712		- }
713		-
714		- if ( 200 !== $remote_zip_request['response']['code'] ) {
715		- Plugin::$instance->logger->get_logger()->error( $remote_zip_request['response']['message'] );
716		- throw new \Error( static::KIT_LIBRARY_ERROR_KEY ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
717		- }
718		-
719		- return Plugin::$instance->uploads_manager->create_temp_file( $remote_zip_request['body'], 'kit.zip' );
720		- }
721		-
722	635	/**
723	636	* Handle import kit ajax request.
724	637	*/
725	638	private function handle_import_kit() {
		@@ -731,14 +644,8 @@
731	644
732	645	// get_settings_config() added manually because the frontend Ajax request doesn't trigger the get_init_settings().
733	646	$import['configData'] = $this->get_config_data();
734	647
735		- Plugin::$instance->logger->get_logger()->info(
736		- sprintf( 'Selected import runners: %1$s',
737		- implode( ', ', $import['runners'] )
738		- )
739		- );
740		-
741	648	wp_send_json_success( $import );
742	649	}
743	650
744	651	/**
		@@ -754,36 +661,20 @@
754	661
755	662	// get_settings_config() added manually because the frontend Ajax request doesn't trigger the get_init_settings().
756	663	$import['configData'] = $this->get_config_data();
757	664
758		- if ( ! empty( $import['status'] ) ) {
759		- Plugin::$instance->logger->get_logger()->info(
760		- sprintf( 'Import runner completed: %1$s %2$s',
761		- $import['runner'],
762		- ( 'success' === $import['status'] ? '✓' : '✗' )
763		- )
764		- );
765		- }
766		-
767		- do_action( 'elementor/import-export/import-kit/runner/after-run', $import );
768		-
769	665	wp_send_json_success( $import );
770	666	}
771	667
772	668	/**
773	669	* Handle export kit ajax request.
774		- *
775		- * @throws \Error If cleanup process fails or file system errors occur.
776	670	*/
777	671	private function handle_export_kit() {
778	672	// PHPCS - Already validated in caller function
779	673	$settings = json_decode( ElementorUtils::get_super_global_value( $_POST, 'data' ), true ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
780		- $source = $settings['kitInfo']['source'];
781		-
782	674	$export = $this->export_kit( $settings );
783	675
784	676	$file_name = $export['file_name'];
785		- $file_size = filesize( $file_name );
786	677	$file = ElementorUtils::file_get_contents( $file_name );
787	678
788	679	if ( ! $file ) {
789	680	throw new \Error( 'Could not read the exported file.' );
		@@ -790,25 +681,13 @@
790	681	}
791	682
792	683	Plugin::$instance->uploads_manager->remove_file_or_dir( dirname( $file_name ) );
793	684
794		- $result = apply_filters(
795		- 'elementor/export/kit/export-result',
796		- [
797		- 'manifest' => $export['manifest'],
798		- 'file' => base64_encode( $file ),
799		- ],
800		- $source,
801		- $export,
802		- $settings,
803		- $file,
804		- $file_size,
805		- );
	685	+ $result = [
	686	+ 'manifest' => $export['manifest'],
	687	+ 'file' => base64_encode( $file ),
	688	+ ];
806	689
807		- if ( is_wp_error( $result ) ) {
808		- wp_send_json_error( $result );
809		- }
810		-
811	690	wp_send_json_success( $result );
812	691	}
813	692
814	693	/**
		@@ -828,9 +707,8 @@
828	707	'recentlyEditedElementorPageUrl' => $this->get_recently_edited_elementor_page_url(),
829	708	'tools_url' => Tools::get_url(),
830	709	'importSessions' => Revert::get_import_sessions(),
831	710	'lastImportedSession' => $this->revert->get_last_import_session(),
832		- 'kitPreviewNonce' => wp_create_nonce( 'kit_thumbnail' ),
833	711	];
834	712	}
835	713
836	714	/**
		@@ -855,10 +733,10 @@
855	733	foreach ( $post_types as $post_type ) {
856	734	$post_type_object = get_post_type_object( $post_type );
857	735
858	736	$summary_titles['content'][ $post_type ] = [
859		- 'single' => $post_type_object->labels->singular_name ?? '',
860		- 'plural' => $post_type_object->label ?? '',
	737	+ 'single' => $post_type_object->labels->singular_name,
	738	+ 'plural' => $post_type_object->label,
861	739	];
862	740	}
863	741
864	742	$custom_post_types = ImportExportUtils::get_registered_cpt_names();
		@@ -868,16 +746,16 @@
868	746	$custom_post_types_object = get_post_type_object( $custom_post_type );
869	747	// CPT data appears in two arrays:
870	748	// 1. content object: in order to show the export summary when completed in getLabel function
871	749	$summary_titles['content'][ $custom_post_type ] = [
872		- 'single' => $custom_post_types_object->labels->singular_name ?? '',
873		- 'plural' => $custom_post_types_object->label ?? '',
	750	+ 'single' => $custom_post_types_object->labels->singular_name,
	751	+ 'plural' => $custom_post_types_object->label,
874	752	];
875	753
876	754	// 2. customPostTypes object: in order to actually export the data
877	755	$summary_titles['content']['customPostTypes'][ $custom_post_type ] = [
878		- 'single' => $custom_post_types_object->labels->singular_name ?? '',
879		- 'plural' => $custom_post_types_object->label ?? '',
	756	+ 'single' => $custom_post_types_object->labels->singular_name,
	757	+ 'plural' => $custom_post_types_object->label,
880	758	];
881	759	}
882	760	}
883	761
		@@ -895,11 +773,11 @@
895	773	return false;
896	774	}
897	775
898	776	// TODO: BC - remove in the future
899		- // The 'templates' runner was in core and moved to the Pro plugin. (Part of it still exits in the Core for BC)
900		- // The runner that is in the core version is missing the revert functionality,
901		- // therefore we shouldn't display the revert section if the import process done with the core version.
	777	+ // The 'templates' runner was in core and moved to the Pro plugin. (Part of it still exits in the Core for BC)
	778	+ // The runner that is in the core version is missing the revert functionality,
	779	+ // therefore we shouldn't display the revert section if the import process done with the core version.
902	780	$is_import_templates_ran = isset( $last_imported_kit['runners']['templates'] );
903	781	if ( $this->has_pro() && $is_import_templates_ran ) {
904	782	$has_imported_templates = ! empty( $last_imported_kit['runners']['templates'] );
905	783
		@@ -972,28 +850,6 @@
972	850	private function get_elementor_editor_page_url( $page_id ) {
973	851	$document = $this->get_elementor_document( $page_id );
974	852
975	853	return $document ? $document->get_edit_url() : '';
976		- }
977		-
978		- /**
979		- * @param string $class_name
980		- *
981		- * @return bool
982		- */
983		- public function is_third_party_class( $class_name ) {
984		- $allowed_classes = [
985		- 'Elementor\\',
986		- 'ElementorPro\\',
987		- 'WP_',
988		- 'wp_',
989		- ];
990		-
991		- foreach ( $allowed_classes as $allowed_class ) {
992		- if ( str_starts_with( $class_name, $allowed_class ) ) {
993		- return false;
994		- }
995		- }
996		-
997		- return true;
998	854	}
999	855	}