| @@ -2,24 +2,15 @@ | ||
| 2 | 2 | namespace Elementor\TemplateLibrary; |
| 3 | 3 | |
| 4 | 4 | use Elementor\Core\Base\Document; |
| 5 | 5 | use Elementor\Core\Editor\Editor; |
| 6 | -use Elementor\Core\Utils\Collection; | |
| 6 | +use Elementor\Core\Files\File_Types\Zip; | |
| 7 | 7 | use Elementor\DB; |
| 8 | 8 | use Elementor\Core\Settings\Manager as SettingsManager; |
| 9 | -use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Add_New_Template_Menu_Item; | |
| 10 | -use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Saved_Templates_Menu_Item; | |
| 11 | -use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Templates_Categories_Menu_Item; | |
| 9 | +use Elementor\Core\Settings\Page\Model; | |
| 12 | 10 | use Elementor\Modules\Library\Documents\Library_Document; |
| 13 | 11 | use Elementor\Plugin; |
| 14 | 12 | use Elementor\Utils; |
| 15 | -use Elementor\User; | |
| 16 | -use Elementor\Core\Isolation\Wordpress_Adapter; | |
| 17 | -use Elementor\Core\Isolation\Wordpress_Adapter_Interface; | |
| 18 | -use Elementor\Core\Isolation\Elementor_Adapter_Interface; | |
| 19 | -use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider; | |
| 20 | -use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Editor_One_Saved_Templates_Menu; | |
| 21 | -use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Editor_One_Templates_Menu; | |
| 22 | 13 | |
| 23 | 14 | if ( ! defined( 'ABSPATH' ) ) { |
| 24 | 15 | exit; // Exit if accessed directly. |
| 25 | 16 | } |
| @@ -50,10 +41,9 @@ | ||
| 50 | 41 | const TAXONOMY_CATEGORY_SLUG = 'elementor_library_category'; |
| 51 | 42 | |
| 52 | 43 | /** |
| 53 | 44 | * Elementor template-library meta key. |
| 54 | - * | |
| 55 | - * @deprecated 2.3.0 Use `Elementor\Core\Base\Document::TYPE_META_KEY` const instead. | |
| 45 | + * @deprecated 2.3.0 Use \Elementor\Core\Base\Document::TYPE_META_KEY instead | |
| 56 | 46 | */ |
| 57 | 47 | const TYPE_META_KEY = '_elementor_template_type'; |
| 58 | 48 | |
| 59 | 49 | /** |
| @@ -67,10 +57,8 @@ | ||
| 67 | 57 | const BULK_EXPORT_ACTION = 'elementor_export_multiple_templates'; |
| 68 | 58 | |
| 69 | 59 | const ADMIN_MENU_SLUG = 'edit.php?post_type=elementor_library'; |
| 70 | 60 | |
| 71 | - const ADMIN_MENU_PRIORITY = 10; | |
| 72 | - | |
| 73 | 61 | const ADMIN_SCREEN_ID = 'edit-elementor_library'; |
| 74 | 62 | |
| 75 | 63 | /** |
| 76 | 64 | * Template types. |
| @@ -95,18 +83,8 @@ | ||
| 95 | 83 | */ |
| 96 | 84 | private $post_type_object; |
| 97 | 85 | |
| 98 | 86 | /** |
| 99 | - * @var Wordpress_Adapter_Interface | |
| 100 | - */ | |
| 101 | - protected $wordpress_adapter = null; | |
| 102 | - | |
| 103 | - /** | |
| 104 | - * @var Elementor_Adapter_Interface | |
| 105 | - */ | |
| 106 | - protected $elementor_adapter = null; | |
| 107 | - | |
| 108 | - /** | |
| 109 | 87 | * @since 2.3.0 |
| 110 | 88 | * @access public |
| 111 | 89 | * @static |
| 112 | 90 | * @return array |
| @@ -237,21 +215,21 @@ | ||
| 237 | 215 | * @access public |
| 238 | 216 | */ |
| 239 | 217 | public function register_data() { |
| 240 | 218 | $labels = [ |
| 241 | - 'name' => esc_html_x( 'My Templates', 'Template Library', 'elementor' ), | |
| 242 | - 'singular_name' => esc_html_x( 'Template', 'Template Library', 'elementor' ), | |
| 243 | - 'add_new' => esc_html__( 'Add New Template', 'elementor' ), | |
| 244 | - 'add_new_item' => esc_html__( 'Add New Template', 'elementor' ), | |
| 245 | - 'edit_item' => esc_html__( 'Edit Template', 'elementor' ), | |
| 246 | - 'new_item' => esc_html__( 'New Template', 'elementor' ), | |
| 247 | - 'all_items' => esc_html__( 'All Templates', 'elementor' ), | |
| 248 | - 'view_item' => esc_html__( 'View Template', 'elementor' ), | |
| 249 | - 'search_items' => esc_html__( 'Search Template', 'elementor' ), | |
| 250 | - 'not_found' => esc_html__( 'No Templates found', 'elementor' ), | |
| 251 | - 'not_found_in_trash' => esc_html__( 'No Templates found in Trash', 'elementor' ), | |
| 252 | - 'parent_item_colon' => esc_html__( 'Parent Template:', 'elementor' ), | |
| 253 | - 'menu_name' => esc_html_x( 'Templates', 'Template Library', 'elementor' ), | |
| 219 | + 'name' => _x( 'My Templates', 'Template Library', 'elementor' ), | |
| 220 | + 'singular_name' => _x( 'Template', 'Template Library', 'elementor' ), | |
| 221 | + 'add_new' => _x( 'Add New', 'Template Library', 'elementor' ), | |
| 222 | + 'add_new_item' => _x( 'Add New Template', 'Template Library', 'elementor' ), | |
| 223 | + 'edit_item' => _x( 'Edit Template', 'Template Library', 'elementor' ), | |
| 224 | + 'new_item' => _x( 'New Template', 'Template Library', 'elementor' ), | |
| 225 | + 'all_items' => _x( 'All Templates', 'Template Library', 'elementor' ), | |
| 226 | + 'view_item' => _x( 'View Template', 'Template Library', 'elementor' ), | |
| 227 | + 'search_items' => _x( 'Search Template', 'Template Library', 'elementor' ), | |
| 228 | + 'not_found' => _x( 'No Templates found', 'Template Library', 'elementor' ), | |
| 229 | + 'not_found_in_trash' => _x( 'No Templates found in Trash', 'Template Library', 'elementor' ), | |
| 230 | + 'parent_item_colon' => '', | |
| 231 | + 'menu_name' => _x( 'Templates', 'Template Library', 'elementor' ), | |
| 254 | 232 | ]; |
| 255 | 233 | |
| 256 | 234 | $args = [ |
| 257 | 235 | 'labels' => $labels, |
| @@ -263,14 +241,11 @@ | ||
| 263 | 241 | 'show_in_nav_menus' => false, |
| 264 | 242 | 'exclude_from_search' => true, |
| 265 | 243 | 'capability_type' => 'post', |
| 266 | 244 | 'hierarchical' => false, |
| 267 | - 'supports' => [ 'title', 'thumbnail', 'author', 'elementor', 'custom-fields' ], | |
| 268 | - 'show_in_rest' => true, | |
| 245 | + 'supports' => [ 'title', 'thumbnail', 'author', 'elementor' ], | |
| 269 | 246 | ]; |
| 270 | 247 | |
| 271 | - $this->avoid_rest_access_for_non_admins(); | |
| 272 | - | |
| 273 | 248 | /** |
| 274 | 249 | * Register template library post type args. |
| 275 | 250 | * |
| 276 | 251 | * Filters the post type arguments when registering elementor template library post type. |
| @@ -290,9 +265,9 @@ | ||
| 290 | 265 | 'show_admin_column' => true, |
| 291 | 266 | 'query_var' => is_admin(), |
| 292 | 267 | 'rewrite' => false, |
| 293 | 268 | 'public' => false, |
| 294 | - 'label' => esc_html_x( 'Type', 'Template Library', 'elementor' ), | |
| 269 | + 'label' => _x( 'Type', 'Template Library', 'elementor' ), | |
| 295 | 270 | ]; |
| 296 | 271 | |
| 297 | 272 | /** |
| 298 | 273 | * Register template library taxonomy args. |
| @@ -331,11 +306,11 @@ | ||
| 331 | 306 | 'query_var' => is_admin(), |
| 332 | 307 | 'rewrite' => false, |
| 333 | 308 | 'public' => false, |
| 334 | 309 | 'labels' => [ |
| 335 | - 'name' => esc_html_x( 'Categories', 'Template Library', 'elementor' ), | |
| 336 | - 'singular_name' => esc_html_x( 'Category', 'Template Library', 'elementor' ), | |
| 337 | - 'all_items' => esc_html_x( 'All Categories', 'Template Library', 'elementor' ), | |
| 310 | + 'name' => _x( 'Categories', 'Template Library', 'elementor' ), | |
| 311 | + 'singular_name' => _x( 'Category', 'Template Library', 'elementor' ), | |
| 312 | + 'all_items' => _x( 'All Categories', 'Template Library', 'elementor' ), | |
| 338 | 313 | ], |
| 339 | 314 | ]; |
| 340 | 315 | |
| 341 | 316 | /** |
| @@ -351,14 +326,58 @@ | ||
| 351 | 326 | |
| 352 | 327 | register_taxonomy( self::TAXONOMY_CATEGORY_SLUG, self::CPT, $args ); |
| 353 | 328 | } |
| 354 | 329 | |
| 330 | + /** | |
| 331 | + * Remove Add New item from admin menu. | |
| 332 | + * | |
| 333 | + * Fired by `admin_menu` action. | |
| 334 | + * | |
| 335 | + * @since 2.4.0 | |
| 336 | + * @access public | |
| 337 | + */ | |
| 338 | + public function admin_menu_reorder() { | |
| 339 | + global $submenu; | |
| 355 | 340 | |
| 356 | - private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ) { | |
| 357 | - $menu_data_provider->register_menu( new Editor_One_Templates_Menu() ); | |
| 358 | - $menu_data_provider->register_menu( new Editor_One_Saved_Templates_Menu() ); | |
| 341 | + if ( ! isset( $submenu[ self::ADMIN_MENU_SLUG ] ) ) { | |
| 342 | + return; | |
| 343 | + } | |
| 344 | + $library_submenu = &$submenu[ self::ADMIN_MENU_SLUG ]; | |
| 345 | + | |
| 346 | + // Remove 'All Templates' menu. | |
| 347 | + unset( $library_submenu[5] ); | |
| 348 | + | |
| 349 | + // If current use can 'Add New' - move the menu to end, and add the '#add_new' anchor. | |
| 350 | + if ( isset( $library_submenu[10][2] ) ) { | |
| 351 | + $library_submenu[700] = $library_submenu[10]; | |
| 352 | + unset( $library_submenu[10] ); | |
| 353 | + $library_submenu[700][2] = admin_url( self::ADMIN_MENU_SLUG . '#add_new' ); | |
| 354 | + } | |
| 355 | + | |
| 356 | + // Move the 'Categories' menu to end. | |
| 357 | + if ( isset( $library_submenu[15] ) ) { | |
| 358 | + $library_submenu[800] = $library_submenu[15]; | |
| 359 | + unset( $library_submenu[15] ); | |
| 360 | + } | |
| 361 | + | |
| 362 | + if ( $this->is_current_screen() ) { | |
| 363 | + $library_title = $this->get_library_title(); | |
| 364 | + | |
| 365 | + foreach ( $library_submenu as &$item ) { | |
| 366 | + if ( $library_title === $item[0] ) { | |
| 367 | + if ( ! isset( $item[4] ) ) { | |
| 368 | + $item[4] = ''; | |
| 369 | + } | |
| 370 | + $item[4] .= ' current'; | |
| 371 | + } | |
| 372 | + } | |
| 373 | + } | |
| 359 | 374 | } |
| 360 | 375 | |
| 376 | + public function admin_menu() { | |
| 377 | + add_submenu_page( self::ADMIN_MENU_SLUG, '', esc_html__( 'Saved Templates', 'elementor' ), Editor::EDITING_CAPABILITY, self::get_admin_url( true ) ); | |
| 378 | + } | |
| 379 | + | |
| 361 | 380 | public function admin_title( $admin_title, $title ) { |
| 362 | 381 | $library_title = $this->get_library_title(); |
| 363 | 382 | |
| 364 | 383 | if ( $library_title ) { |
| @@ -368,54 +387,15 @@ | ||
| 368 | 387 | return $admin_title; |
| 369 | 388 | } |
| 370 | 389 | |
| 371 | 390 | public function replace_admin_heading() { |
| 372 | - if ( ! $this->is_current_screen() ) { | |
| 373 | - return; | |
| 374 | - } | |
| 375 | - | |
| 376 | - global $post_type_object; | |
| 377 | - | |
| 378 | 391 | $library_title = $this->get_library_title(); |
| 379 | 392 | |
| 380 | 393 | if ( $library_title ) { |
| 394 | + global $post_type_object; | |
| 395 | + | |
| 381 | 396 | $post_type_object->labels->name = $library_title; |
| 382 | 397 | } |
| 383 | - | |
| 384 | - $labels = $this->get_current_template_labels(); | |
| 385 | - $template_singular = $labels['singular']; | |
| 386 | - $template_plural = $labels['plural']; | |
| 387 | - | |
| 388 | - if ( ! $template_plural && $library_title ) { | |
| 389 | - $template_plural = $library_title; | |
| 390 | - } | |
| 391 | - | |
| 392 | - if ( $template_singular ) { | |
| 393 | - $labels = $post_type_object->labels; | |
| 394 | - $labels->name = $template_plural; | |
| 395 | - $labels->singular_name = $template_singular; | |
| 396 | - /* translators: %s: Template label (plural). */ | |
| 397 | - $labels->all_items = sprintf( esc_html__( 'All %s', 'elementor' ), $template_plural ); | |
| 398 | - /* translators: %s: Template label (singular). */ | |
| 399 | - $labels->add_new = sprintf( esc_html__( 'Add New %s', 'elementor' ), $template_singular ); | |
| 400 | - $labels->add_new_item = $labels->add_new; | |
| 401 | - /* translators: %s: Template label (singular). */ | |
| 402 | - $labels->edit_item = sprintf( esc_html__( 'Edit %s', 'elementor' ), $template_singular ); | |
| 403 | - /* translators: %s: Template label (singular). */ | |
| 404 | - $labels->new_item = sprintf( esc_html__( 'New %s', 'elementor' ), $template_singular ); | |
| 405 | - /* translators: %s: Template label (singular). */ | |
| 406 | - $labels->view_item = sprintf( esc_html__( 'View %s', 'elementor' ), $template_singular ); | |
| 407 | - /* translators: %s: Template label (plural). */ | |
| 408 | - $labels->search_items = sprintf( esc_html__( 'Search %s', 'elementor' ), $template_plural ); | |
| 409 | - /* translators: %s: Template label (plural). */ | |
| 410 | - $labels->not_found = sprintf( esc_html__( 'No %s found', 'elementor' ), $template_plural ); | |
| 411 | - /* translators: %s: Template label (plural). */ | |
| 412 | - $labels->not_found_in_trash = sprintf( esc_html__( 'No %s found in Trash', 'elementor' ), $template_plural ); | |
| 413 | - /* translators: %s: Template label (singular). */ | |
| 414 | - $labels->parent_item_colon = sprintf( esc_html__( 'Parent %s:', 'elementor' ), $template_singular ); | |
| 415 | - $labels->menu_name = $template_plural; | |
| 416 | - $post_type_object->labels = $labels; | |
| 417 | - } | |
| 418 | 398 | } |
| 419 | 399 | |
| 420 | 400 | /** |
| 421 | 401 | * Get local templates. |
| @@ -486,29 +466,19 @@ | ||
| 486 | 466 | |
| 487 | 467 | $defaults = [ |
| 488 | 468 | 'title' => esc_html__( '(no title)', 'elementor' ), |
| 489 | 469 | 'page_settings' => [], |
| 470 | + 'status' => current_user_can( 'publish_posts' ) ? 'publish' : 'pending', | |
| 490 | 471 | ]; |
| 491 | 472 | |
| 492 | 473 | $template_data = wp_parse_args( $template_data, $defaults ); |
| 493 | - $template_data['status'] = current_user_can( 'publish_posts' ) ? 'publish' : 'pending'; | |
| 494 | 474 | |
| 495 | - // BC: Allow importing any template type when using CLI | |
| 496 | - // to support users that rely on this mechanism. | |
| 497 | - $should_check_template_type = ! $this->is_wp_cli(); | |
| 498 | - | |
| 499 | - if ( | |
| 500 | - $should_check_template_type && | |
| 501 | - ! $this->is_valid_template_type( $template_data['type'] ) | |
| 502 | - ) { | |
| 503 | - return new \WP_Error( 'invalid_template_type', esc_html__( 'Invalid template type.', 'elementor' ) ); | |
| 504 | - } | |
| 505 | - | |
| 506 | 475 | $document = Plugin::$instance->documents->create( |
| 507 | 476 | $template_data['type'], |
| 508 | 477 | [ |
| 509 | 478 | 'post_title' => $template_data['title'], |
| 510 | 479 | 'post_status' => $template_data['status'], |
| 480 | + 'post_type' => self::CPT, | |
| 511 | 481 | ] |
| 512 | 482 | ); |
| 513 | 483 | |
| 514 | 484 | if ( is_wp_error( $document ) ) { |
| @@ -555,35 +525,8 @@ | ||
| 555 | 525 | |
| 556 | 526 | return $template_id; |
| 557 | 527 | } |
| 558 | 528 | |
| 559 | - protected function is_valid_template_type( $type ) { | |
| 560 | - $document_class = Plugin::$instance->documents->get_document_type( $type, false ); | |
| 561 | - | |
| 562 | - if ( ! $document_class ) { | |
| 563 | - return false; | |
| 564 | - } | |
| 565 | - | |
| 566 | - $cpt = $document_class::get_property( 'cpt' ); | |
| 567 | - | |
| 568 | - if ( ! $cpt || ! is_array( $cpt ) || 1 !== count( $cpt ) ) { | |
| 569 | - return false; | |
| 570 | - } | |
| 571 | - | |
| 572 | - $is_valid_template_type = in_array( static::CPT, $cpt, true ); | |
| 573 | - | |
| 574 | - return apply_filters( | |
| 575 | - 'elementor/template_library/sources/local/is_valid_template_type', | |
| 576 | - $is_valid_template_type, | |
| 577 | - $cpt, | |
| 578 | - ); | |
| 579 | - } | |
| 580 | - | |
| 581 | - /** For testing purposes only, in order to be able to mock the `WP_CLI` constant. */ | |
| 582 | - protected function is_wp_cli() { | |
| 583 | - return Utils::is_wp_cli(); | |
| 584 | - } | |
| 585 | - | |
| 586 | 529 | /** |
| 587 | 530 | * Update local template. |
| 588 | 531 | * |
| 589 | 532 | * Update template on the database. |
| @@ -605,20 +548,12 @@ | ||
| 605 | 548 | if ( ! $document ) { |
| 606 | 549 | return new \WP_Error( 'save_error', esc_html__( 'Template not exist.', 'elementor' ) ); |
| 607 | 550 | } |
| 608 | 551 | |
| 609 | - $save_data = []; | |
| 552 | + $document->save( [ | |
| 553 | + 'elements' => $new_data['content'], | |
| 554 | + ] ); | |
| 610 | 555 | |
| 611 | - if ( isset( $new_data['title'] ) ) { | |
| 612 | - $save_data['post_title'] = $new_data['title']; | |
| 613 | - } | |
| 614 | - | |
| 615 | - if ( isset( $new_data['content'] ) ) { | |
| 616 | - $save_data['elements'] = $new_data['content']; | |
| 617 | - } | |
| 618 | - | |
| 619 | - $document->save( $save_data ); | |
| 620 | - | |
| 621 | 556 | /** |
| 622 | 557 | * After template library update. |
| 623 | 558 | * |
| 624 | 559 | * Fires after Elementor template library was updated. |
| @@ -715,22 +650,8 @@ | ||
| 715 | 650 | } |
| 716 | 651 | |
| 717 | 652 | if ( ! empty( $content ) ) { |
| 718 | 653 | $content = $this->replace_elements_ids( $content ); |
| 719 | - | |
| 720 | - /** | |
| 721 | - * Filters the template content data. | |
| 722 | - * | |
| 723 | - * This filter allows third-party plugins to modify template content | |
| 724 | - * when loaded via get_template_data(), making the behavior consistent | |
| 725 | - * with Frontend::get_builder_content(). | |
| 726 | - * | |
| 727 | - * @since 3.34.0 | |
| 728 | - * | |
| 729 | - * @param array $content The template content data. | |
| 730 | - * @param int $template_id The template ID. | |
| 731 | - */ | |
| 732 | - $content = apply_filters( 'elementor/frontend/builder_content_data', $content, $template_id ); | |
| 733 | 654 | } |
| 734 | 655 | } |
| 735 | 656 | |
| 736 | 657 | $data = [ |
| @@ -742,12 +663,8 @@ | ||
| 742 | 663 | |
| 743 | 664 | $data['page_settings'] = $page->get_data( 'settings' ); |
| 744 | 665 | } |
| 745 | 666 | |
| 746 | - if ( ! empty( $content ) ) { | |
| 747 | - $this->attach_global_styles_to_data( $data, $content, $template_id ); | |
| 748 | - } | |
| 749 | - | |
| 750 | 667 | return $data; |
| 751 | 668 | } |
| 752 | 669 | |
| 753 | 670 | /** |
| @@ -770,22 +687,8 @@ | ||
| 770 | 687 | |
| 771 | 688 | return wp_delete_post( $template_id, true ); |
| 772 | 689 | } |
| 773 | 690 | |
| 774 | - public function bulk_delete_items( array $template_ids ) { | |
| 775 | - foreach ( $template_ids as $template_id ) { | |
| 776 | - if ( ! current_user_can( $this->post_type_object->cap->delete_post, $template_id ) ) { | |
| 777 | - return new \WP_Error( 'template_error', esc_html__( 'Access denied.', 'elementor' ) ); | |
| 778 | - } | |
| 779 | - } | |
| 780 | - | |
| 781 | - foreach ( $template_ids as $template_id ) { | |
| 782 | - wp_delete_post( $template_id, true ); | |
| 783 | - } | |
| 784 | - | |
| 785 | - return true; | |
| 786 | - } | |
| 787 | - | |
| 788 | 691 | /** |
| 789 | 692 | * Export local template. |
| 790 | 693 | * |
| 791 | 694 | * Export template to a file. |
| @@ -797,14 +700,8 @@ | ||
| 797 | 700 | * |
| 798 | 701 | * @return \WP_Error WordPress error if template export failed. |
| 799 | 702 | */ |
| 800 | 703 | public function export_template( $template_id ) { |
| 801 | - $permissions_error = $this->validate_template_export_permissions( $template_id ); | |
| 802 | - | |
| 803 | - if ( is_wp_error( $permissions_error ) ) { | |
| 804 | - return $permissions_error; | |
| 805 | - } | |
| 806 | - | |
| 807 | 704 | $file_data = $this->prepare_template_export( $template_id ); |
| 808 | 705 | |
| 809 | 706 | if ( is_wp_error( $file_data ) ) { |
| 810 | 707 | return $file_data; |
| @@ -811,29 +708,18 @@ | ||
| 811 | 708 | } |
| 812 | 709 | |
| 813 | 710 | $this->send_file_headers( $file_data['name'], strlen( $file_data['content'] ) ); |
| 814 | 711 | |
| 815 | - $this->serve_file( $file_data['content'] ); | |
| 712 | + // Clear buffering just in case. | |
| 713 | + @ob_end_clean(); | |
| 816 | 714 | |
| 817 | - die; | |
| 818 | - } | |
| 715 | + flush(); | |
| 819 | 716 | |
| 820 | - private function validate_template_export_permissions( $template_id ) { | |
| 821 | - $post_id = intval( $template_id ); | |
| 822 | - if ( get_post_type( $post_id ) !== self::CPT ) { | |
| 823 | - return new \WP_Error( 'template_error', esc_html__( 'Invalid template type or template does not exist.', 'elementor' ) ); | |
| 824 | - } | |
| 717 | + // Output file contents. | |
| 718 | + // PHPCS - Export widget json | |
| 719 | + echo $file_data['content']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 825 | 720 | |
| 826 | - $post_status = get_post_status( $post_id ); | |
| 827 | - if ( 'private' === $post_status && ! current_user_can( 'read_private_posts', $post_id ) ) { | |
| 828 | - return new \WP_Error( 'template_error', esc_html__( 'You do not have permission to access this template.', 'elementor' ) ); | |
| 829 | - } | |
| 830 | - | |
| 831 | - if ( 'publish' !== $post_status && ! current_user_can( 'edit_post', $post_id ) ) { | |
| 832 | - return new \WP_Error( 'template_error', esc_html__( 'You do not have permission to export this template.', 'elementor' ) ); | |
| 833 | - } | |
| 834 | - | |
| 835 | - return null; | |
| 721 | + die; | |
| 836 | 722 | } |
| 837 | 723 | |
| 838 | 724 | /** |
| 839 | 725 | * Export multiple local templates. |
| @@ -901,12 +787,14 @@ | ||
| 901 | 787 | foreach ( $files as $file ) { |
| 902 | 788 | unlink( $file['path'] ); |
| 903 | 789 | } |
| 904 | 790 | |
| 905 | - $this->send_file_headers( $zip_archive_filename, $this->filesize( $zip_complete_path ) ); | |
| 791 | + $this->send_file_headers( $zip_archive_filename, filesize( $zip_complete_path ) ); | |
| 906 | 792 | |
| 907 | - $this->serve_zip( $zip_complete_path ); | |
| 793 | + @ob_end_flush(); | |
| 908 | 794 | |
| 795 | + @readfile( $zip_complete_path ); | |
| 796 | + | |
| 909 | 797 | unlink( $zip_complete_path ); |
| 910 | 798 | |
| 911 | 799 | die; |
| 912 | 800 | } |
| @@ -918,27 +806,26 @@ | ||
| 918 | 806 | * |
| 919 | 807 | * @since 1.0.0 |
| 920 | 808 | * @access public |
| 921 | 809 | * |
| 922 | - * @param string $name - The file name. | |
| 923 | - * @param string $path - The file path. | |
| 810 | + * @param string $name - The file name | |
| 811 | + * @param string $path - The file path | |
| 924 | 812 | * @return \WP_Error|array An array of items on success, 'WP_Error' on failure. |
| 925 | 813 | */ |
| 926 | - public function import_template( $name, $path, $import_mode = 'match_site' ) { | |
| 814 | + public function import_template( $name, $path ) { | |
| 927 | 815 | if ( empty( $path ) ) { |
| 928 | 816 | return new \WP_Error( 'file_error', 'Please upload a file to import' ); |
| 929 | 817 | } |
| 930 | 818 | |
| 931 | - // Set the Request's state as an Elementor upload request, in order to support unfiltered file uploads. | |
| 932 | - Plugin::$instance->uploads_manager->set_elementor_upload_state( true ); | |
| 933 | - | |
| 934 | 819 | $items = []; |
| 935 | 820 | |
| 936 | 821 | // If the import file is a Zip file with potentially multiple JSON files |
| 937 | 822 | if ( 'zip' === pathinfo( $name, PATHINFO_EXTENSION ) ) { |
| 938 | - $extracted_files = Plugin::$instance->uploads_manager->extract_and_validate_zip( $path, [ 'json' ] ); | |
| 823 | + $extracted_files = Plugin::$instance->uploads_manager->extract_and_validate_zip( $path ); | |
| 939 | 824 | |
| 940 | 825 | if ( is_wp_error( $extracted_files ) ) { |
| 826 | + // Remove the temporary zip file, since it's now not necessary. | |
| 827 | + Plugin::$instance->uploads_manager->remove_file_or_dir( $path ); | |
| 941 | 828 | // Delete the temporary extraction directory, since it's now not necessary. |
| 942 | 829 | Plugin::$instance->uploads_manager->remove_file_or_dir( $extracted_files['extraction_directory'] ); |
| 943 | 830 | |
| 944 | 831 | return $extracted_files; |
| @@ -944,18 +831,14 @@ | ||
| 944 | 831 | return $extracted_files; |
| 945 | 832 | } |
| 946 | 833 | |
| 947 | 834 | foreach ( $extracted_files['files'] as $file_path ) { |
| 948 | - // Skip macOS metadata files and folders | |
| 949 | - if ( false !== strpos( $file_path, '__MACOSX' ) || '.' === basename( $file_path )[0] ) { | |
| 950 | - continue; | |
| 951 | - } | |
| 835 | + $import_result = $this->import_single_template( $file_path ); | |
| 952 | 836 | |
| 953 | - $import_result = $this->import_single_template( $file_path, $import_mode ); | |
| 837 | + if ( is_wp_error( $import_result ) ) { | |
| 838 | + Plugin::$instance->uploads_manager->remove_file_or_dir( $import_result ); | |
| 954 | 839 | |
| 955 | - if ( is_wp_error( $import_result ) ) { | |
| 956 | - // Skip failed files | |
| 957 | - continue; | |
| 840 | + return $import_result; | |
| 958 | 841 | } |
| 959 | 842 | |
| 960 | 843 | $items[] = $import_result; |
| 961 | 844 | } |
| @@ -963,11 +846,13 @@ | ||
| 963 | 846 | // Delete the temporary extraction directory, since it's now not necessary. |
| 964 | 847 | Plugin::$instance->uploads_manager->remove_file_or_dir( $extracted_files['extraction_directory'] ); |
| 965 | 848 | } else { |
| 966 | 849 | // If the import file is a single JSON file |
| 967 | - $import_result = $this->import_single_template( $path, $import_mode ); | |
| 850 | + $import_result = $this->import_single_template( $path ); | |
| 968 | 851 | |
| 969 | 852 | if ( is_wp_error( $import_result ) ) { |
| 853 | + Plugin::$instance->uploads_manager->remove_file_or_dir( $import_result ); | |
| 854 | + | |
| 970 | 855 | return $import_result; |
| 971 | 856 | } |
| 972 | 857 | |
| 973 | 858 | $items[] = $import_result; |
| @@ -993,17 +878,9 @@ | ||
| 993 | 878 | */ |
| 994 | 879 | public function post_row_actions( $actions, \WP_Post $post ) { |
| 995 | 880 | if ( self::is_base_templates_screen() ) { |
| 996 | 881 | if ( $this->is_template_supports_export( $post->ID ) ) { |
| 997 | - $template_labels = $this->get_template_labels_by_type( self::get_template_type( $post->ID ) ); | |
| 998 | - $export_label = esc_html__( 'Export Template', 'elementor' ); | |
| 999 | - | |
| 1000 | - if ( $template_labels['singular'] ) { | |
| 1001 | - /* translators: %s: Template label (singular). */ | |
| 1002 | - $export_label = sprintf( esc_html__( 'Export %s', 'elementor' ), $template_labels['singular'] ); | |
| 1003 | - } | |
| 1004 | - | |
| 1005 | - $actions['export-template'] = sprintf( '<a href="%1$s">%2$s</a>', $this->get_export_link( $post->ID ), $export_label ); | |
| 882 | + $actions['export-template'] = sprintf( '<a href="%1$s">%2$s</a>', $this->get_export_link( $post->ID ), esc_html__( 'Export Template', 'elementor' ) ); | |
| 1006 | 883 | } |
| 1007 | 884 | } |
| 1008 | 885 | |
| 1009 | 886 | return $actions; |
| @@ -1021,36 +898,19 @@ | ||
| 1021 | 898 | * @since 1.0.0 |
| 1022 | 899 | * @access public |
| 1023 | 900 | */ |
| 1024 | 901 | public function admin_import_template_form() { |
| 1025 | - if ( ! self::is_base_templates_screen() || ! User::is_current_user_can_upload_json() ) { | |
| 902 | + if ( ! self::is_base_templates_screen() ) { | |
| 1026 | 903 | return; |
| 1027 | 904 | } |
| 1028 | 905 | |
| 1029 | 906 | /** @var \Elementor\Core\Common\Modules\Ajax\Module $ajax */ |
| 1030 | 907 | $ajax = Plugin::$instance->common->get_component( 'ajax' ); |
| 1031 | - $template_labels = $this->get_current_template_labels(); | |
| 1032 | - $import_label = esc_html__( 'Import Templates', 'elementor' ); | |
| 1033 | - $description = esc_html__( 'Choose an Elementor template JSON file or a .zip archive of Elementor templates, and add them to the list of templates available in your library.', 'elementor' ); | |
| 1034 | - | |
| 1035 | - if ( $template_labels['plural'] ) { | |
| 1036 | - /* translators: %s: Template label (plural). */ | |
| 1037 | - $import_label = sprintf( esc_html__( 'Import %s', 'elementor' ), $template_labels['plural'] ); | |
| 1038 | - } | |
| 1039 | - | |
| 1040 | - if ( $template_labels['singular'] && $template_labels['plural'] ) { | |
| 1041 | - $description = sprintf( | |
| 1042 | - /* translators: 1: Template label (singular). 2: Template label (plural). */ | |
| 1043 | - esc_html__( 'Choose an Elementor %1$s JSON file or a .zip archive of Elementor %2$s, and add them to the list of %2$s available in your library.', 'elementor' ), | |
| 1044 | - $template_labels['singular'], | |
| 1045 | - $template_labels['plural'] | |
| 1046 | - ); | |
| 1047 | - } | |
| 1048 | 908 | ?> |
| 1049 | 909 | <div id="elementor-hidden-area"> |
| 1050 | - <a id="elementor-import-template-trigger" class="page-title-action button button-secondary"><?php echo esc_html( $import_label ); ?></a> | |
| 910 | + <a id="elementor-import-template-trigger" class="page-title-action"><?php echo esc_html__( 'Import Templates', 'elementor' ); ?></a> | |
| 1051 | 911 | <div id="elementor-import-template-area"> |
| 1052 | - <div id="elementor-import-template-title"><?php echo esc_html( $description ); ?></div> | |
| 912 | + <div id="elementor-import-template-title"><?php echo esc_html__( 'Choose an Elementor template JSON file or a .zip archive of Elementor templates, and add them to the list of templates available in your library.', 'elementor' ); ?></div> | |
| 1053 | 913 | <form id="elementor-import-template-form" method="post" action="<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>" enctype="multipart/form-data"> |
| 1054 | 914 | <input type="hidden" name="action" value="elementor_library_direct_actions"> |
| 1055 | 915 | <input type="hidden" name="library_action" value="direct_import_template"> |
| 1056 | 916 | <input type="hidden" name="_nonce" value="<?php Utils::print_unescaped_internal_string( $ajax->create_nonce() ); ?>"> |
| @@ -1055,9 +915,9 @@ | ||
| 1055 | 915 | <input type="hidden" name="library_action" value="direct_import_template"> |
| 1056 | 916 | <input type="hidden" name="_nonce" value="<?php Utils::print_unescaped_internal_string( $ajax->create_nonce() ); ?>"> |
| 1057 | 917 | <fieldset id="elementor-import-template-form-inputs"> |
| 1058 | 918 | <input type="file" name="file" accept=".json,application/json,.zip,application/octet-stream,application/zip,application/x-zip,application/x-zip-compressed" required> |
| 1059 | - <input id="e-import-template-action" type="submit" class="button" value="<?php echo esc_attr__( 'Import Now', 'elementor' ); ?>"> | |
| 919 | + <input type="submit" class="button" value="<?php echo esc_attr__( 'Import Now', 'elementor' ); ?>"> | |
| 1060 | 920 | </fieldset> |
| 1061 | 921 | </form> |
| 1062 | 922 | </div> |
| 1063 | 923 | </div> |
| @@ -1081,27 +941,12 @@ | ||
| 1081 | 941 | die; |
| 1082 | 942 | } |
| 1083 | 943 | } |
| 1084 | 944 | |
| 1085 | - public function redirect_categories_page_to_saved_templates_page() { | |
| 1086 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 1087 | - $taxonomy = sanitize_key( wp_unslash( $_GET['taxonomy'] ?? '' ) ); | |
| 1088 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 1089 | - $post_type = sanitize_key( wp_unslash( $_GET['post_type'] ?? '' ) ); | |
| 1090 | - $is_categories_page = 'edit-tags.php' === $GLOBALS['pagenow'] | |
| 1091 | - && self::TAXONOMY_CATEGORY_SLUG === $taxonomy | |
| 1092 | - && self::CPT === $post_type; | |
| 1093 | - | |
| 1094 | - if ( $is_categories_page ) { | |
| 1095 | - wp_safe_redirect( admin_url( 'edit.php?post_type=' . self::CPT . '&tabs_group=library' ) ); | |
| 1096 | - die; | |
| 1097 | - } | |
| 1098 | - } | |
| 1099 | - | |
| 1100 | 945 | /** |
| 1101 | 946 | * Is template library supports export. |
| 1102 | 947 | * |
| 1103 | - * Whether the template library supports export. | |
| 948 | + * whether the template library supports export. | |
| 1104 | 949 | * |
| 1105 | 950 | * Template saved by the user locally on his site, support export by default |
| 1106 | 951 | * but this can be changed using a filter. |
| 1107 | 952 | * |
| @@ -1292,13 +1137,17 @@ | ||
| 1292 | 1137 | * |
| 1293 | 1138 | * @return array An updated array of available list table views. |
| 1294 | 1139 | */ |
| 1295 | 1140 | public function admin_print_tabs( $views ) { |
| 1296 | - //phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce is not required to retrieve the value. | |
| 1297 | - $current_type = Utils::get_super_global_value( $_REQUEST, self::TAXONOMY_TYPE_SLUG ) ?? ''; | |
| 1298 | - $active_class = $current_type ? '' : ' nav-tab-active'; | |
| 1141 | + $current_type = ''; | |
| 1142 | + $active_class = ' nav-tab-active'; | |
| 1299 | 1143 | $current_tabs_group = $this->get_current_tab_group(); |
| 1300 | 1144 | |
| 1145 | + if ( ! empty( $_REQUEST[ self::TAXONOMY_TYPE_SLUG ] ) ) { | |
| 1146 | + $current_type = $_REQUEST[ self::TAXONOMY_TYPE_SLUG ]; | |
| 1147 | + $active_class = ''; | |
| 1148 | + } | |
| 1149 | + | |
| 1301 | 1150 | $url_args = [ |
| 1302 | 1151 | 'post_type' => self::CPT, |
| 1303 | 1152 | 'tabs_group' => $current_tabs_group, |
| 1304 | 1153 | ]; |
| @@ -1360,9 +1209,9 @@ | ||
| 1360 | 1209 | * @since 2.0.0 |
| 1361 | 1210 | * @access public |
| 1362 | 1211 | * |
| 1363 | 1212 | * @param string $which The location of the extra table nav markup: 'top' or 'bottom'. |
| 1364 | - * @param array $args | |
| 1213 | + * @param array $args | |
| 1365 | 1214 | */ |
| 1366 | 1215 | public function maybe_render_blank_state( $which, array $args = [] ) { |
| 1367 | 1216 | global $post_type; |
| 1368 | 1217 | |
| @@ -1378,9 +1227,8 @@ | ||
| 1378 | 1227 | global $wp_list_table; |
| 1379 | 1228 | |
| 1380 | 1229 | $total_items = $wp_list_table->get_pagination_arg( 'total_items' ); |
| 1381 | 1230 | |
| 1382 | - //phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce is not required to retrieve the value. | |
| 1383 | 1231 | if ( ! empty( $total_items ) || ! empty( $_REQUEST['s'] ) ) { |
| 1384 | 1232 | return; |
| 1385 | 1233 | } |
| 1386 | 1234 | |
| @@ -1400,9 +1248,9 @@ | ||
| 1400 | 1248 | // TODO: This code maybe unreachable see if above `if ( empty( $document_types[ $current_type ] ) )`. |
| 1401 | 1249 | if ( empty( $current_type ) ) { |
| 1402 | 1250 | $counts = (array) wp_count_posts( self::CPT ); |
| 1403 | 1251 | unset( $counts['auto-draft'] ); |
| 1404 | - $count = array_sum( $counts ); | |
| 1252 | + $count = array_sum( $counts ); | |
| 1405 | 1253 | |
| 1406 | 1254 | if ( 0 < $count ) { |
| 1407 | 1255 | return; |
| 1408 | 1256 | } |
| @@ -1416,24 +1264,14 @@ | ||
| 1416 | 1264 | } |
| 1417 | 1265 | |
| 1418 | 1266 | private function render_blank_state( $current_type, array $args = [] ) { |
| 1419 | 1267 | $current_type_label = $this->get_template_label_by_type( $current_type ); |
| 1420 | - $type_labels = $this->get_template_labels_by_type( $current_type ); | |
| 1421 | - $description = esc_html__( 'Add templates and reuse them across your website. Easily export and import them to any other project, for an optimized workflow.', 'elementor' ); | |
| 1422 | - | |
| 1423 | - if ( $type_labels['plural'] ) { | |
| 1424 | - $description = sprintf( | |
| 1425 | - /* translators: %s: Template label (plural). */ | |
| 1426 | - esc_html__( 'Add %s and reuse them across your website. Easily export and import them to any other project, for an optimized workflow.', 'elementor' ), | |
| 1427 | - $type_labels['plural'] | |
| 1428 | - ); | |
| 1429 | - } | |
| 1430 | 1268 | $inline_style = '#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions, .wrap .subsubsub { display:none;}'; |
| 1431 | 1269 | |
| 1432 | 1270 | $args = wp_parse_args( $args, [ |
| 1433 | 1271 | 'additional_inline_style' => '', |
| 1434 | 1272 | 'href' => '', |
| 1435 | - 'description' => $description, | |
| 1273 | + 'description' => esc_html__( 'Add templates and reuse them across your website. Easily export and import them to any other project, for an optimized workflow.', 'elementor' ), | |
| 1436 | 1274 | ] ); |
| 1437 | 1275 | $inline_style .= $args['additional_inline_style']; |
| 1438 | 1276 | ?> |
| 1439 | 1277 | <style type="text/css"><?php Utils::print_unescaped_internal_string( $inline_style ); ?></style> |
| @@ -1453,24 +1291,24 @@ | ||
| 1453 | 1291 | * |
| 1454 | 1292 | * @since 3.1.0 |
| 1455 | 1293 | * @access public |
| 1456 | 1294 | * |
| 1457 | - * @param string $current_type_label The Entity title. | |
| 1458 | - * @param string $href The URL for the 'Add New' button. | |
| 1459 | - * @param string $description The sub title describing the Entity (Post Type, Taxonomy, etc.). | |
| 1295 | + * @param string $current_type_label The Entity title | |
| 1296 | + * @param string $href The URL for the 'Add New' button | |
| 1297 | + * @param string $description The sub title describing the Entity (Post Type, Taxonomy, etc.) | |
| 1460 | 1298 | */ |
| 1461 | 1299 | public function print_blank_state_template( $current_type_label, $href, $description ) { |
| 1462 | 1300 | ?> |
| 1463 | 1301 | <div class="elementor-blank_state"> |
| 1464 | 1302 | <i class="eicon-folder"></i> |
| 1465 | - <h3> | |
| 1303 | + <h2> | |
| 1466 | 1304 | <?php |
| 1467 | 1305 | /* translators: %s: Template type label. */ |
| 1468 | 1306 | printf( esc_html__( 'Create Your First %s', 'elementor' ), esc_html( $current_type_label ) ); |
| 1469 | 1307 | ?> |
| 1470 | - </h3> | |
| 1471 | - <p><?php echo wp_kses_post( $description ); ?></p> | |
| 1472 | - <a id="elementor-template-library-add-new" class="elementor-button e-primary" href="<?php echo esc_url( $href ); ?>"> | |
| 1308 | + </h2> | |
| 1309 | + <p><?php echo esc_html( $description ); ?></p> | |
| 1310 | + <a id="elementor-template-library-add-new" class="elementor-button elementor-button-success" href="<?php echo esc_url( $href ); ?>"> | |
| 1473 | 1311 | <?php |
| 1474 | 1312 | /* translators: %s: Template type label. */ |
| 1475 | 1313 | printf( esc_html__( 'Add New %s', 'elementor' ), esc_html( $current_type_label ) ); |
| 1476 | 1314 | ?> |
| @@ -1478,17 +1316,8 @@ | ||
| 1478 | 1316 | </div> |
| 1479 | 1317 | <?php |
| 1480 | 1318 | } |
| 1481 | 1319 | |
| 1482 | - /** | |
| 1483 | - * Add filter by category. | |
| 1484 | - * | |
| 1485 | - * In the templates library, add a filter by Elementor library category. | |
| 1486 | - * | |
| 1487 | - * @access public | |
| 1488 | - * | |
| 1489 | - * @param string $post_type The post type slug. | |
| 1490 | - */ | |
| 1491 | 1320 | public function add_filter_by_category( $post_type ) { |
| 1492 | 1321 | if ( self::CPT !== $post_type ) { |
| 1493 | 1322 | return; |
| 1494 | 1323 | } |
| @@ -1493,9 +1322,10 @@ | ||
| 1493 | 1322 | return; |
| 1494 | 1323 | } |
| 1495 | 1324 | |
| 1496 | 1325 | $all_items = get_taxonomy( self::TAXONOMY_CATEGORY_SLUG )->labels->all_items; |
| 1497 | - $dropdown_options = [ | |
| 1326 | + | |
| 1327 | + $dropdown_options = array( | |
| 1498 | 1328 | 'show_option_all' => $all_items, |
| 1499 | 1329 | 'show_option_none' => $all_items, |
| 1500 | 1330 | 'hide_empty' => 0, |
| 1501 | 1331 | 'hierarchical' => 1, |
| @@ -1503,17 +1333,11 @@ | ||
| 1503 | 1333 | 'orderby' => 'name', |
| 1504 | 1334 | 'value_field' => 'slug', |
| 1505 | 1335 | 'taxonomy' => self::TAXONOMY_CATEGORY_SLUG, |
| 1506 | 1336 | 'name' => self::TAXONOMY_CATEGORY_SLUG, |
| 1507 | - //phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce is not required to retrieve the value. | |
| 1508 | - 'selected' => Utils::get_super_global_value( $_GET, self::TAXONOMY_CATEGORY_SLUG ) ?? '', | |
| 1509 | - ]; | |
| 1510 | - | |
| 1511 | - printf( | |
| 1512 | - '<label class="screen-reader-text" for="%1$s">%2$s</label>', | |
| 1513 | - esc_attr( self::TAXONOMY_CATEGORY_SLUG ), | |
| 1514 | - esc_html_x( 'Filter by category', 'Template Library', 'elementor' ) | |
| 1337 | + 'selected' => empty( $_GET[ self::TAXONOMY_CATEGORY_SLUG ] ) ? '' : $_GET[ self::TAXONOMY_CATEGORY_SLUG ], | |
| 1515 | 1338 | ); |
| 1339 | + echo '<label class="screen-reader-text" for="cat">' . esc_html_x( 'Filter by category', 'Template Library', 'elementor' ) . '</label>'; | |
| 1516 | 1340 | wp_dropdown_categories( $dropdown_options ); |
| 1517 | 1341 | } |
| 1518 | 1342 | |
| 1519 | 1343 | /** |
| @@ -1528,26 +1352,48 @@ | ||
| 1528 | 1352 | * |
| 1529 | 1353 | * @return \WP_Error|int|array Local template array, or template ID, or |
| 1530 | 1354 | * `WP_Error`. |
| 1531 | 1355 | */ |
| 1532 | - private function import_single_template( $file_path, $import_mode = 'match_site' ) { | |
| 1533 | - $data = $this->prepare_import_template_data( $file_path, $import_mode ); | |
| 1356 | + private function import_single_template( $file_path ) { | |
| 1357 | + $data = json_decode( file_get_contents( $file_path ), true ); | |
| 1534 | 1358 | |
| 1535 | - if ( is_wp_error( $data ) ) { | |
| 1536 | - return $data; | |
| 1359 | + if ( empty( $data ) ) { | |
| 1360 | + return new \WP_Error( 'file_error', 'Invalid File' ); | |
| 1537 | 1361 | } |
| 1538 | 1362 | |
| 1539 | - if ( empty( $data ) ) { | |
| 1540 | - return new \WP_Error( 'file_error', 'Invalid File' ); | |
| 1363 | + $content = $data['content']; | |
| 1364 | + | |
| 1365 | + if ( ! is_array( $content ) ) { | |
| 1366 | + return new \WP_Error( 'file_error', 'Invalid Content In File' ); | |
| 1541 | 1367 | } |
| 1542 | 1368 | |
| 1369 | + $content = $this->process_export_import_content( $content, 'on_import' ); | |
| 1370 | + | |
| 1371 | + $page_settings = []; | |
| 1372 | + | |
| 1373 | + if ( ! empty( $data['page_settings'] ) ) { | |
| 1374 | + $page = new Model( [ | |
| 1375 | + 'id' => 0, | |
| 1376 | + 'settings' => $data['page_settings'], | |
| 1377 | + ] ); | |
| 1378 | + | |
| 1379 | + $page_settings_data = $this->process_element_export_import_content( $page, 'on_import' ); | |
| 1380 | + | |
| 1381 | + if ( ! empty( $page_settings_data['settings'] ) ) { | |
| 1382 | + $page_settings = $page_settings_data['settings']; | |
| 1383 | + } | |
| 1384 | + } | |
| 1385 | + | |
| 1543 | 1386 | $template_id = $this->save_item( [ |
| 1544 | - 'content' => $data['content'], | |
| 1387 | + 'content' => $content, | |
| 1545 | 1388 | 'title' => $data['title'], |
| 1546 | 1389 | 'type' => $data['type'], |
| 1547 | - 'page_settings' => $data['page_settings'], | |
| 1390 | + 'page_settings' => $page_settings, | |
| 1548 | 1391 | ] ); |
| 1549 | 1392 | |
| 1393 | + // Remove the temporary file, now that we're done with it. | |
| 1394 | + Plugin::$instance->uploads_manager->remove_file_or_dir( $file_path ); | |
| 1395 | + | |
| 1550 | 1396 | if ( is_wp_error( $template_id ) ) { |
| 1551 | 1397 | return $template_id; |
| 1552 | 1398 | } |
| 1553 | 1399 | |
| @@ -1574,23 +1420,16 @@ | ||
| 1574 | 1420 | if ( empty( $template_data['content'] ) ) { |
| 1575 | 1421 | return new \WP_Error( 'empty_template', 'The template is empty' ); |
| 1576 | 1422 | } |
| 1577 | 1423 | |
| 1578 | - $content = apply_filters( | |
| 1579 | - 'elementor/template_library/sources/local/export/elements', | |
| 1580 | - $template_data['content'] | |
| 1581 | - ); | |
| 1582 | - | |
| 1583 | 1424 | $export_data = [ |
| 1584 | - 'content' => $content, | |
| 1425 | + 'content' => $template_data['content'], | |
| 1585 | 1426 | 'page_settings' => $template_data['settings'], |
| 1586 | 1427 | 'version' => DB::DB_VERSION, |
| 1587 | - 'title' => $document->get_main_post()->post_title, | |
| 1428 | + 'title' => get_the_title( $template_id ), | |
| 1588 | 1429 | 'type' => self::get_template_type( $template_id ), |
| 1589 | 1430 | ]; |
| 1590 | 1431 | |
| 1591 | - $this->attach_global_styles_to_data( $export_data, $content, $template_id ); | |
| 1592 | - | |
| 1593 | 1432 | return [ |
| 1594 | 1433 | 'name' => 'elementor-' . $template_id . '-' . gmdate( 'Y-m-d' ) . '.json', |
| 1595 | 1434 | 'content' => wp_json_encode( $export_data ), |
| 1596 | 1435 | ]; |
| @@ -1596,8 +1435,28 @@ | ||
| 1596 | 1435 | ]; |
| 1597 | 1436 | } |
| 1598 | 1437 | |
| 1599 | 1438 | /** |
| 1439 | + * Send file headers. | |
| 1440 | + * | |
| 1441 | + * Set the file header when export template data to a file. | |
| 1442 | + * | |
| 1443 | + * @since 1.6.0 | |
| 1444 | + * @access private | |
| 1445 | + * | |
| 1446 | + * @param string $file_name File name. | |
| 1447 | + * @param int $file_size File size. | |
| 1448 | + */ | |
| 1449 | + private function send_file_headers( $file_name, $file_size ) { | |
| 1450 | + header( 'Content-Type: application/octet-stream' ); | |
| 1451 | + header( 'Content-Disposition: attachment; filename=' . $file_name ); | |
| 1452 | + header( 'Expires: 0' ); | |
| 1453 | + header( 'Cache-Control: must-revalidate' ); | |
| 1454 | + header( 'Pragma: public' ); | |
| 1455 | + header( 'Content-Length: ' . $file_size ); | |
| 1456 | + } | |
| 1457 | + | |
| 1458 | + /** | |
| 1600 | 1459 | * Get template label by type. |
| 1601 | 1460 | * |
| 1602 | 1461 | * Retrieve the template label for any given template type. |
| 1603 | 1462 | * |
| @@ -1631,68 +1490,8 @@ | ||
| 1631 | 1490 | |
| 1632 | 1491 | return $template_label; |
| 1633 | 1492 | } |
| 1634 | 1493 | |
| 1635 | - private function get_template_labels_by_type( $template_type ) { | |
| 1636 | - $labels = [ | |
| 1637 | - 'singular' => '', | |
| 1638 | - 'plural' => '', | |
| 1639 | - ]; | |
| 1640 | - | |
| 1641 | - if ( ! $template_type ) { | |
| 1642 | - return $labels; | |
| 1643 | - } | |
| 1644 | - | |
| 1645 | - $document_types = Plugin::instance()->documents->get_document_types(); | |
| 1646 | - | |
| 1647 | - if ( isset( $document_types[ $template_type ] ) ) { | |
| 1648 | - $doc_type = $document_types[ $template_type ]; | |
| 1649 | - $labels['singular'] = call_user_func( [ $doc_type, 'get_title' ] ); | |
| 1650 | - $labels['plural'] = call_user_func( [ $doc_type, 'get_plural_title' ] ); | |
| 1651 | - } else { | |
| 1652 | - $labels['singular'] = $this->get_template_label_by_type( $template_type ); | |
| 1653 | - } | |
| 1654 | - | |
| 1655 | - if ( ! $labels['plural'] ) { | |
| 1656 | - $labels['plural'] = $labels['singular']; | |
| 1657 | - } | |
| 1658 | - | |
| 1659 | - return $labels; | |
| 1660 | - } | |
| 1661 | - | |
| 1662 | - private function get_current_template_labels() { | |
| 1663 | - $labels = [ | |
| 1664 | - 'singular' => '', | |
| 1665 | - 'plural' => '', | |
| 1666 | - ]; | |
| 1667 | - | |
| 1668 | - $template_type = Utils::get_super_global_value( $_GET, self::TAXONOMY_TYPE_SLUG ); | |
| 1669 | - | |
| 1670 | - if ( $template_type ) { | |
| 1671 | - return $this->get_template_labels_by_type( $template_type ); | |
| 1672 | - } | |
| 1673 | - | |
| 1674 | - $current_tabs_group = $this->get_current_tab_group(); | |
| 1675 | - | |
| 1676 | - if ( $current_tabs_group ) { | |
| 1677 | - $doc_types = Plugin::$instance->documents->get_document_types( [ | |
| 1678 | - 'admin_tab_group' => $current_tabs_group, | |
| 1679 | - ], 'and' ); | |
| 1680 | - | |
| 1681 | - if ( 1 === count( $doc_types ) ) { | |
| 1682 | - $doc_type = reset( $doc_types ); | |
| 1683 | - $labels['singular'] = call_user_func( [ $doc_type, 'get_title' ] ); | |
| 1684 | - $labels['plural'] = call_user_func( [ $doc_type, 'get_plural_title' ] ); | |
| 1685 | - } | |
| 1686 | - } | |
| 1687 | - | |
| 1688 | - if ( ! $labels['plural'] ) { | |
| 1689 | - $labels['plural'] = $labels['singular']; | |
| 1690 | - } | |
| 1691 | - | |
| 1692 | - return $labels; | |
| 1693 | - } | |
| 1694 | - | |
| 1695 | 1494 | /** |
| 1696 | 1495 | * Filter template types in admin query. |
| 1697 | 1496 | * |
| 1698 | 1497 | * Update the template types in the main admin query. |
| @@ -1736,32 +1535,10 @@ | ||
| 1736 | 1535 | * @access private |
| 1737 | 1536 | */ |
| 1738 | 1537 | private function add_actions() { |
| 1739 | 1538 | if ( is_admin() ) { |
| 1740 | - add_action( 'admin_init', [ $this, 'redirect_categories_page_to_saved_templates_page' ] ); | |
| 1741 | - | |
| 1742 | - add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) { | |
| 1743 | - $this->register_editor_one_menu( $menu_data_provider ); | |
| 1744 | - } ); | |
| 1745 | - | |
| 1746 | - add_action( 'elementor/editor-one/menu/excluded_level4_slugs', function ( array $excluded_slugs ): array { | |
| 1747 | - $excluded_slugs[] = 'edit.php?post_type=elementor_library#add_new'; | |
| 1748 | - $excluded_slugs[] = 'edit-tags.php?taxonomy=elementor_library_category&post_type=elementor_library'; | |
| 1749 | - return $excluded_slugs; | |
| 1750 | - } ); | |
| 1751 | - | |
| 1752 | - add_filter( 'elementor/editor-one/menu/elementor_post_types', function ( array $elementor_post_types ): array { | |
| 1753 | - $elementor_post_types[ self::CPT ] = []; | |
| 1754 | - | |
| 1755 | - return $elementor_post_types; | |
| 1756 | - } ); | |
| 1757 | - | |
| 1758 | - add_filter( 'elementor/editor-one/admin-edit-post-types', function ( array $post_types ): array { | |
| 1759 | - $post_types[] = self::CPT; | |
| 1760 | - | |
| 1761 | - return $post_types; | |
| 1762 | - } ); | |
| 1763 | - | |
| 1539 | + add_action( 'admin_menu', [ $this, 'admin_menu' ] ); | |
| 1540 | + add_action( 'admin_menu', [ $this, 'admin_menu_reorder' ], 800 ); | |
| 1764 | 1541 | add_filter( 'admin_title', [ $this, 'admin_title' ], 10, 2 ); |
| 1765 | 1542 | add_action( 'all_admin_notices', [ $this, 'replace_admin_heading' ] ); |
| 1766 | 1543 | add_filter( 'post_row_actions', [ $this, 'post_row_actions' ], 10, 2 ); |
| 1767 | 1544 | add_action( 'admin_footer', [ $this, 'admin_import_template_form' ] ); |
| @@ -1787,10 +1564,8 @@ | ||
| 1787 | 1564 | // Show blank state. |
| 1788 | 1565 | add_action( 'manage_posts_extra_tablenav', [ $this, 'maybe_render_blank_state' ] ); |
| 1789 | 1566 | } |
| 1790 | 1567 | |
| 1791 | - add_action( 'elementor/document/after_save', [ $this, 'on_template_update' ], 10, 2 ); | |
| 1792 | - | |
| 1793 | 1568 | add_action( 'template_redirect', [ $this, 'block_template_frontend' ] ); |
| 1794 | 1569 | |
| 1795 | 1570 | // Remove elementor library templates from WP Sitemap |
| 1796 | 1571 | add_filter( |
| @@ -1800,17 +1575,8 @@ | ||
| 1800 | 1575 | } |
| 1801 | 1576 | ); |
| 1802 | 1577 | } |
| 1803 | 1578 | |
| 1804 | - public function on_template_update( \Elementor\Core\Base\Document $document, array $data ) { | |
| 1805 | - if ( ! empty( $data['post_title'] ) ) { | |
| 1806 | - wp_update_post( [ | |
| 1807 | - 'ID' => $document->get_main_id(), | |
| 1808 | - 'post_title' => $data['post_title'], | |
| 1809 | - ] ); | |
| 1810 | - } | |
| 1811 | - } | |
| 1812 | - | |
| 1813 | 1579 | /** |
| 1814 | 1580 | * @since 2.0.6 |
| 1815 | 1581 | * @access public |
| 1816 | 1582 | */ |
| @@ -1841,18 +1607,20 @@ | ||
| 1841 | 1607 | |
| 1842 | 1608 | return $posts_columns; |
| 1843 | 1609 | } |
| 1844 | 1610 | |
| 1845 | - public function get_current_tab_group() { | |
| 1846 | - $current_tabs_group = Utils::get_super_global_value( $_GET, 'tabs_group' ) ?? ''; | |
| 1847 | - $type_slug = Utils::get_super_global_value( $_GET, self::TAXONOMY_TYPE_SLUG ); | |
| 1611 | + public function get_current_tab_group( $default = '' ) { | |
| 1612 | + $current_tabs_group = $default; | |
| 1848 | 1613 | |
| 1849 | - if ( $type_slug ) { | |
| 1850 | - $doc_type = Plugin::$instance->documents->get_document_type( $type_slug, '' ); | |
| 1614 | + if ( ! empty( $_REQUEST[ self::TAXONOMY_TYPE_SLUG ] ) ) { | |
| 1615 | + $doc_type = Plugin::$instance->documents->get_document_type( $_REQUEST[ self::TAXONOMY_TYPE_SLUG ], '' ); | |
| 1851 | 1616 | if ( $doc_type ) { |
| 1852 | 1617 | $current_tabs_group = $doc_type::get_property( 'admin_tab_group' ); |
| 1853 | 1618 | } |
| 1619 | + } elseif ( ! empty( $_REQUEST['tabs_group'] ) ) { | |
| 1620 | + $current_tabs_group = $_REQUEST['tabs_group']; | |
| 1854 | 1621 | } |
| 1622 | + | |
| 1855 | 1623 | return $current_tabs_group; |
| 1856 | 1624 | } |
| 1857 | 1625 | |
| 1858 | 1626 | private function get_library_title() { |
| @@ -1893,35 +1661,8 @@ | ||
| 1893 | 1661 | |
| 1894 | 1662 | return $post_types; |
| 1895 | 1663 | } |
| 1896 | 1664 | |
| 1897 | - private function avoid_rest_access_for_non_admins(): void { | |
| 1898 | - add_filter( 'rest_pre_dispatch', function ( $value, \WP_REST_Server $server, \WP_REST_Request $request ) { | |
| 1899 | - if ( strpos( $request->get_route(), self::CPT ) !== false ) { | |
| 1900 | - if ( ! current_user_can( 'manage_options' ) ) { | |
| 1901 | - return new \WP_Error( 'rest_forbidden', esc_html__( 'Sorry, you are not allowed to do that.', 'elementor' ), [ 'status' => rest_authorization_required_code() ] ); | |
| 1902 | - } | |
| 1903 | - } | |
| 1904 | - | |
| 1905 | - return $value; | |
| 1906 | - }, 10, 3 ); | |
| 1907 | - } | |
| 1908 | - | |
| 1909 | - public function save_bulk_items( array $args = [] ) { | |
| 1910 | - $items = []; | |
| 1911 | - | |
| 1912 | - foreach ( $args as $item ) { | |
| 1913 | - $items[] = $this->save_item( [ | |
| 1914 | - 'content' => $item['content'], | |
| 1915 | - 'title' => $item['title'], | |
| 1916 | - 'type' => $item['type'], | |
| 1917 | - 'page_settings' => $item['page_settings'], | |
| 1918 | - ] ); | |
| 1919 | - } | |
| 1920 | - | |
| 1921 | - return $items; | |
| 1922 | - } | |
| 1923 | - | |
| 1924 | 1665 | /** |
| 1925 | 1666 | * Template library local source constructor. |
| 1926 | 1667 | * |
| 1927 | 1668 | * Initializing the template library local source base by registering custom |
| @@ -1933,87 +1674,6 @@ | ||
| 1933 | 1674 | public function __construct() { |
| 1934 | 1675 | parent::__construct(); |
| 1935 | 1676 | |
| 1936 | 1677 | $this->add_actions(); |
| 1937 | - } | |
| 1938 | - | |
| 1939 | - public function format_args_for_bulk_action( $args ) { | |
| 1940 | - $bulk_args = []; | |
| 1941 | - | |
| 1942 | - foreach ( $args['from_template_id'] as $from_template_id ) { | |
| 1943 | - if ( ! $this->is_allowed_to_read_template( [ | |
| 1944 | - 'template_id' => $from_template_id, | |
| 1945 | - ] ) ) { | |
| 1946 | - continue; | |
| 1947 | - } | |
| 1948 | - | |
| 1949 | - $document = Plugin::$instance->documents->get( $from_template_id ); | |
| 1950 | - | |
| 1951 | - if ( ! $document ) { | |
| 1952 | - continue; | |
| 1953 | - } | |
| 1954 | - | |
| 1955 | - $page = SettingsManager::get_settings_managers( 'page' )->get_model( $from_template_id ); | |
| 1956 | - | |
| 1957 | - $bulk_args[] = array_merge( | |
| 1958 | - $args, | |
| 1959 | - [ | |
| 1960 | - 'title' => $document->get_post()->post_title, | |
| 1961 | - 'type' => $document::get_type(), | |
| 1962 | - 'content' => $document->get_elements_data(), | |
| 1963 | - 'page_settings' => $page->get_data( 'settings' ), | |
| 1964 | - ] | |
| 1965 | - ); | |
| 1966 | - } | |
| 1967 | - | |
| 1968 | - return $bulk_args; | |
| 1969 | - } | |
| 1970 | - | |
| 1971 | - public function format_args_for_single_action( $args ) { | |
| 1972 | - if ( ! $this->is_allowed_to_read_template( [ | |
| 1973 | - 'template_id' => $args['from_template_id'], | |
| 1974 | - ] ) ) { | |
| 1975 | - return new \WP_Error( | |
| 1976 | - 'template_error', | |
| 1977 | - esc_html__( 'You do not have permission to access this template.', 'elementor' ) | |
| 1978 | - ); | |
| 1979 | - } | |
| 1980 | - | |
| 1981 | - $document = Plugin::$instance->documents->get( $args['from_template_id'] ); | |
| 1982 | - | |
| 1983 | - if ( ! $document ) { | |
| 1984 | - return new \WP_Error( 'template_error', 'Document not found.' ); | |
| 1985 | - } | |
| 1986 | - | |
| 1987 | - $args['content'] = $document->get_elements_data(); | |
| 1988 | - | |
| 1989 | - $page = SettingsManager::get_settings_managers( 'page' )->get_model( $args['from_template_id'] ); | |
| 1990 | - $args['page_settings'] = $page->get_data( 'settings' ); | |
| 1991 | - | |
| 1992 | - return $args; | |
| 1993 | - } | |
| 1994 | - | |
| 1995 | - public function is_allowed_to_read_template( array $args ): bool { | |
| 1996 | - if ( null === $this->wordpress_adapter ) { | |
| 1997 | - $this->set_wordpress_adapter( new WordPress_Adapter() ); | |
| 1998 | - } | |
| 1999 | - | |
| 2000 | - $post_id = intval( $args['template_id'] ); | |
| 2001 | - $post_status = $this->wordpress_adapter->get_post_status( $post_id ); | |
| 2002 | - | |
| 2003 | - if ( 'publish' === $post_status && ! post_password_required( $post_id ) ) { | |
| 2004 | - return true; | |
| 2005 | - } | |
| 2006 | - | |
| 2007 | - $can_read_template = $this->wordpress_adapter->current_user_can( 'edit_post', $post_id ); | |
| 2008 | - | |
| 2009 | - return apply_filters( 'elementor/template-library/is_allowed_to_read_template', $can_read_template, $args ); | |
| 2010 | - } | |
| 2011 | - | |
| 2012 | - public function set_wordpress_adapter( Wordpress_Adapter_Interface $wordpress_adapter ) { | |
| 2013 | - $this->wordpress_adapter = $wordpress_adapter; | |
| 2014 | - } | |
| 2015 | - | |
| 2016 | - public function set_elementor_adapter( Elementor_Adapter_Interface $elementor_adapter ): void { | |
| 2017 | - $this->elementor_adapter = $elementor_adapter; | |
| 2018 | 1678 | } |
| 2019 | 1679 | } |
