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