← All changes
|
includes/template-library/sources/local.php
+94
-195
4.1.0
→
3.34.0-beta1
View file →
| @@ -1,12 +1,14 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | namespace Elementor\TemplateLibrary; |
| 3 | 3 | |
| 4 | +use Elementor\Core\Admin\Menu\Admin_Menu_Manager; | |
| 4 | 5 | use Elementor\Core\Base\Document; |
| 5 | 6 | use Elementor\Core\Editor\Editor; |
| 6 | 7 | use Elementor\Core\Utils\Collection; |
| 7 | 8 | use Elementor\DB; |
| 8 | 9 | use Elementor\Core\Settings\Manager as SettingsManager; |
| 10 | +use Elementor\Core\Settings\Page\Model; | |
| 9 | 11 | use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Add_New_Template_Menu_Item; |
| 10 | 12 | use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Saved_Templates_Menu_Item; |
| 11 | 13 | use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Templates_Categories_Menu_Item; |
| 12 | 14 | use Elementor\Modules\Library\Documents\Library_Document; |
| @@ -16,11 +18,8 @@ | ||
| 16 | 18 | use Elementor\Core\Isolation\Wordpress_Adapter; |
| 17 | 19 | use Elementor\Core\Isolation\Wordpress_Adapter_Interface; |
| 18 | 20 | use Elementor\Core\Isolation\Elementor_Adapter; |
| 19 | 21 | use Elementor\Core\Isolation\Elementor_Adapter_Interface; |
| 20 | -use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider; | |
| 21 | -use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Editor_One_Saved_Templates_Menu; | |
| 22 | -use Elementor\Includes\TemplateLibrary\Sources\AdminMenuItems\Editor_One_Templates_Menu; | |
| 23 | 22 | |
| 24 | 23 | if ( ! defined( 'ABSPATH' ) ) { |
| 25 | 24 | exit; // Exit if accessed directly. |
| 26 | 25 | } |
| @@ -352,14 +351,79 @@ | ||
| 352 | 351 | |
| 353 | 352 | register_taxonomy( self::TAXONOMY_CATEGORY_SLUG, self::CPT, $args ); |
| 354 | 353 | } |
| 355 | 354 | |
| 355 | + /** | |
| 356 | + * Remove Add New item from admin menu. | |
| 357 | + * | |
| 358 | + * Fired by `admin_menu` action. | |
| 359 | + * | |
| 360 | + * @since 2.4.0 | |
| 361 | + * @access public | |
| 362 | + */ | |
| 363 | + private function admin_menu_reorder( Admin_Menu_Manager $admin_menu ) { | |
| 364 | + global $submenu; | |
| 356 | 365 | |
| 357 | - private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ) { | |
| 358 | - $menu_data_provider->register_menu( new Editor_One_Templates_Menu() ); | |
| 359 | - $menu_data_provider->register_menu( new Editor_One_Saved_Templates_Menu() ); | |
| 366 | + if ( ! isset( $submenu[ static::ADMIN_MENU_SLUG ] ) ) { | |
| 367 | + return; | |
| 368 | + } | |
| 369 | + | |
| 370 | + remove_submenu_page( static::ADMIN_MENU_SLUG, static::ADMIN_MENU_SLUG ); | |
| 371 | + | |
| 372 | + $add_new_slug = 'post-new.php?post_type=' . static::CPT; | |
| 373 | + $category_slug = 'edit-tags.php?taxonomy=' . static::TAXONOMY_CATEGORY_SLUG . '&post_type=' . static::CPT; | |
| 374 | + | |
| 375 | + $library_submenu = new Collection( $submenu[ static::ADMIN_MENU_SLUG ] ); | |
| 376 | + | |
| 377 | + $add_new_item = $library_submenu->find( function ( $item ) use ( $add_new_slug ) { | |
| 378 | + return $add_new_slug === $item[2]; | |
| 379 | + } ); | |
| 380 | + | |
| 381 | + $categories_item = $library_submenu->find( function ( $item ) use ( $category_slug ) { | |
| 382 | + return $category_slug === $item[2]; | |
| 383 | + } ); | |
| 384 | + | |
| 385 | + if ( $add_new_item ) { | |
| 386 | + remove_submenu_page( static::ADMIN_MENU_SLUG, $add_new_slug ); | |
| 387 | + | |
| 388 | + $admin_menu->register( admin_url( static::ADMIN_MENU_SLUG . '#add_new' ), new Add_New_Template_Menu_Item() ); | |
| 389 | + } | |
| 390 | + | |
| 391 | + if ( $categories_item ) { | |
| 392 | + remove_submenu_page( static::ADMIN_MENU_SLUG, $category_slug ); | |
| 393 | + | |
| 394 | + $admin_menu->register( $category_slug, new Templates_Categories_Menu_Item() ); | |
| 395 | + } | |
| 360 | 396 | } |
| 361 | 397 | |
| 398 | + /** | |
| 399 | + * Add a `current` CSS class to the `Saved Templates` submenu page when it's active. | |
| 400 | + * It should work by default, but since we interfere with WordPress' builtin CPT menus it doesn't work properly. | |
| 401 | + * | |
| 402 | + * @return void | |
| 403 | + */ | |
| 404 | + private function admin_menu_set_current() { | |
| 405 | + global $submenu; | |
| 406 | + | |
| 407 | + if ( $this->is_current_screen() ) { | |
| 408 | + $library_submenu = &$submenu[ static::ADMIN_MENU_SLUG ]; | |
| 409 | + $library_title = $this->get_library_title(); | |
| 410 | + | |
| 411 | + foreach ( $library_submenu as &$item ) { | |
| 412 | + if ( $library_title === $item[0] ) { | |
| 413 | + if ( ! isset( $item[4] ) ) { | |
| 414 | + $item[4] = ''; | |
| 415 | + } | |
| 416 | + $item[4] .= ' current'; | |
| 417 | + } | |
| 418 | + } | |
| 419 | + } | |
| 420 | + } | |
| 421 | + | |
| 422 | + private function register_admin_menu( Admin_Menu_Manager $admin_menu ) { | |
| 423 | + $admin_menu->register( static::get_admin_url( true ), new Saved_Templates_Menu_Item() ); | |
| 424 | + } | |
| 425 | + | |
| 362 | 426 | public function admin_title( $admin_title, $title ) { |
| 363 | 427 | $library_title = $this->get_library_title(); |
| 364 | 428 | |
| 365 | 429 | if ( $library_title ) { |
| @@ -369,54 +433,15 @@ | ||
| 369 | 433 | return $admin_title; |
| 370 | 434 | } |
| 371 | 435 | |
| 372 | 436 | public function replace_admin_heading() { |
| 373 | - if ( ! $this->is_current_screen() ) { | |
| 374 | - return; | |
| 375 | - } | |
| 376 | - | |
| 377 | - global $post_type_object; | |
| 378 | - | |
| 379 | 437 | $library_title = $this->get_library_title(); |
| 380 | 438 | |
| 381 | 439 | if ( $library_title ) { |
| 440 | + global $post_type_object; | |
| 441 | + | |
| 382 | 442 | $post_type_object->labels->name = $library_title; |
| 383 | 443 | } |
| 384 | - | |
| 385 | - $labels = $this->get_current_template_labels(); | |
| 386 | - $template_singular = $labels['singular']; | |
| 387 | - $template_plural = $labels['plural']; | |
| 388 | - | |
| 389 | - if ( ! $template_plural && $library_title ) { | |
| 390 | - $template_plural = $library_title; | |
| 391 | - } | |
| 392 | - | |
| 393 | - if ( $template_singular ) { | |
| 394 | - $labels = $post_type_object->labels; | |
| 395 | - $labels->name = $template_plural; | |
| 396 | - $labels->singular_name = $template_singular; | |
| 397 | - /* translators: %s: Template label (plural). */ | |
| 398 | - $labels->all_items = sprintf( esc_html__( 'All %s', 'elementor' ), $template_plural ); | |
| 399 | - /* translators: %s: Template label (singular). */ | |
| 400 | - $labels->add_new = sprintf( esc_html__( 'Add New %s', 'elementor' ), $template_singular ); | |
| 401 | - $labels->add_new_item = $labels->add_new; | |
| 402 | - /* translators: %s: Template label (singular). */ | |
| 403 | - $labels->edit_item = sprintf( esc_html__( 'Edit %s', 'elementor' ), $template_singular ); | |
| 404 | - /* translators: %s: Template label (singular). */ | |
| 405 | - $labels->new_item = sprintf( esc_html__( 'New %s', 'elementor' ), $template_singular ); | |
| 406 | - /* translators: %s: Template label (singular). */ | |
| 407 | - $labels->view_item = sprintf( esc_html__( 'View %s', 'elementor' ), $template_singular ); | |
| 408 | - /* translators: %s: Template label (plural). */ | |
| 409 | - $labels->search_items = sprintf( esc_html__( 'Search %s', 'elementor' ), $template_plural ); | |
| 410 | - /* translators: %s: Template label (plural). */ | |
| 411 | - $labels->not_found = sprintf( esc_html__( 'No %s found', 'elementor' ), $template_plural ); | |
| 412 | - /* translators: %s: Template label (plural). */ | |
| 413 | - $labels->not_found_in_trash = sprintf( esc_html__( 'No %s found in Trash', 'elementor' ), $template_plural ); | |
| 414 | - /* translators: %s: Template label (singular). */ | |
| 415 | - $labels->parent_item_colon = sprintf( esc_html__( 'Parent %s:', 'elementor' ), $template_singular ); | |
| 416 | - $labels->menu_name = $template_plural; | |
| 417 | - $post_type_object->labels = $labels; | |
| 418 | - } | |
| 419 | 444 | } |
| 420 | 445 | |
| 421 | 446 | /** |
| 422 | 447 | * Get local templates. |
| @@ -743,12 +768,8 @@ | ||
| 743 | 768 | |
| 744 | 769 | $data['page_settings'] = $page->get_data( 'settings' ); |
| 745 | 770 | } |
| 746 | 771 | |
| 747 | - if ( ! empty( $content ) ) { | |
| 748 | - $this->attach_global_styles_to_data( $data, $content, $template_id ); | |
| 749 | - } | |
| 750 | - | |
| 751 | 772 | return $data; |
| 752 | 773 | } |
| 753 | 774 | |
| 754 | 775 | /** |
| @@ -923,9 +944,9 @@ | ||
| 923 | 944 | * @param string $name - The file name. |
| 924 | 945 | * @param string $path - The file path. |
| 925 | 946 | * @return \WP_Error|array An array of items on success, 'WP_Error' on failure. |
| 926 | 947 | */ |
| 927 | - public function import_template( $name, $path, $import_mode = 'match_site' ) { | |
| 948 | + public function import_template( $name, $path ) { | |
| 928 | 949 | if ( empty( $path ) ) { |
| 929 | 950 | return new \WP_Error( 'file_error', 'Please upload a file to import' ); |
| 930 | 951 | } |
| 931 | 952 | |
| @@ -950,9 +971,9 @@ | ||
| 950 | 971 | if ( false !== strpos( $file_path, '__MACOSX' ) || '.' === basename( $file_path )[0] ) { |
| 951 | 972 | continue; |
| 952 | 973 | } |
| 953 | 974 | |
| 954 | - $import_result = $this->import_single_template( $file_path, $import_mode ); | |
| 975 | + $import_result = $this->import_single_template( $file_path ); | |
| 955 | 976 | |
| 956 | 977 | if ( is_wp_error( $import_result ) ) { |
| 957 | 978 | // Skip failed files |
| 958 | 979 | continue; |
| @@ -964,9 +985,9 @@ | ||
| 964 | 985 | // Delete the temporary extraction directory, since it's now not necessary. |
| 965 | 986 | Plugin::$instance->uploads_manager->remove_file_or_dir( $extracted_files['extraction_directory'] ); |
| 966 | 987 | } else { |
| 967 | 988 | // If the import file is a single JSON file |
| 968 | - $import_result = $this->import_single_template( $path, $import_mode ); | |
| 989 | + $import_result = $this->import_single_template( $path ); | |
| 969 | 990 | |
| 970 | 991 | if ( is_wp_error( $import_result ) ) { |
| 971 | 992 | return $import_result; |
| 972 | 993 | } |
| @@ -994,17 +1015,9 @@ | ||
| 994 | 1015 | */ |
| 995 | 1016 | public function post_row_actions( $actions, \WP_Post $post ) { |
| 996 | 1017 | if ( self::is_base_templates_screen() ) { |
| 997 | 1018 | if ( $this->is_template_supports_export( $post->ID ) ) { |
| 998 | - $template_labels = $this->get_template_labels_by_type( self::get_template_type( $post->ID ) ); | |
| 999 | - $export_label = esc_html__( 'Export Template', 'elementor' ); | |
| 1000 | - | |
| 1001 | - if ( $template_labels['singular'] ) { | |
| 1002 | - /* translators: %s: Template label (singular). */ | |
| 1003 | - $export_label = sprintf( esc_html__( 'Export %s', 'elementor' ), $template_labels['singular'] ); | |
| 1004 | - } | |
| 1005 | - | |
| 1006 | - $actions['export-template'] = sprintf( '<a href="%1$s">%2$s</a>', $this->get_export_link( $post->ID ), $export_label ); | |
| 1019 | + $actions['export-template'] = sprintf( '<a href="%1$s">%2$s</a>', $this->get_export_link( $post->ID ), esc_html__( 'Export Template', 'elementor' ) ); | |
| 1007 | 1020 | } |
| 1008 | 1021 | } |
| 1009 | 1022 | |
| 1010 | 1023 | return $actions; |
| @@ -1028,30 +1041,13 @@ | ||
| 1028 | 1041 | } |
| 1029 | 1042 | |
| 1030 | 1043 | /** @var \Elementor\Core\Common\Modules\Ajax\Module $ajax */ |
| 1031 | 1044 | $ajax = Plugin::$instance->common->get_component( 'ajax' ); |
| 1032 | - $template_labels = $this->get_current_template_labels(); | |
| 1033 | - $import_label = esc_html__( 'Import Templates', 'elementor' ); | |
| 1034 | - $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' ); | |
| 1035 | - | |
| 1036 | - if ( $template_labels['plural'] ) { | |
| 1037 | - /* translators: %s: Template label (plural). */ | |
| 1038 | - $import_label = sprintf( esc_html__( 'Import %s', 'elementor' ), $template_labels['plural'] ); | |
| 1039 | - } | |
| 1040 | - | |
| 1041 | - if ( $template_labels['singular'] && $template_labels['plural'] ) { | |
| 1042 | - $description = sprintf( | |
| 1043 | - /* translators: 1: Template label (singular). 2: Template label (plural). */ | |
| 1044 | - 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' ), | |
| 1045 | - $template_labels['singular'], | |
| 1046 | - $template_labels['plural'] | |
| 1047 | - ); | |
| 1048 | - } | |
| 1049 | 1045 | ?> |
| 1050 | 1046 | <div id="elementor-hidden-area"> |
| 1051 | - <a id="elementor-import-template-trigger" class="page-title-action button button-secondary"><?php echo esc_html( $import_label ); ?></a> | |
| 1047 | + <a id="elementor-import-template-trigger" class="page-title-action"><?php echo esc_html__( 'Import Templates', 'elementor' ); ?></a> | |
| 1052 | 1048 | <div id="elementor-import-template-area"> |
| 1053 | - <div id="elementor-import-template-title"><?php echo esc_html( $description ); ?></div> | |
| 1049 | + <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> | |
| 1054 | 1050 | <form id="elementor-import-template-form" method="post" action="<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>" enctype="multipart/form-data"> |
| 1055 | 1051 | <input type="hidden" name="action" value="elementor_library_direct_actions"> |
| 1056 | 1052 | <input type="hidden" name="library_action" value="direct_import_template"> |
| 1057 | 1053 | <input type="hidden" name="_nonce" value="<?php Utils::print_unescaped_internal_string( $ajax->create_nonce() ); ?>"> |
| @@ -1082,23 +1078,8 @@ | ||
| 1082 | 1078 | die; |
| 1083 | 1079 | } |
| 1084 | 1080 | } |
| 1085 | 1081 | |
| 1086 | - public function redirect_categories_page_to_saved_templates_page() { | |
| 1087 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 1088 | - $taxonomy = sanitize_key( wp_unslash( $_GET['taxonomy'] ?? '' ) ); | |
| 1089 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 1090 | - $post_type = sanitize_key( wp_unslash( $_GET['post_type'] ?? '' ) ); | |
| 1091 | - $is_categories_page = 'edit-tags.php' === $GLOBALS['pagenow'] | |
| 1092 | - && self::TAXONOMY_CATEGORY_SLUG === $taxonomy | |
| 1093 | - && self::CPT === $post_type; | |
| 1094 | - | |
| 1095 | - if ( $is_categories_page ) { | |
| 1096 | - wp_safe_redirect( admin_url( 'edit.php?post_type=' . self::CPT . '&tabs_group=library' ) ); | |
| 1097 | - die; | |
| 1098 | - } | |
| 1099 | - } | |
| 1100 | - | |
| 1101 | 1082 | /** |
| 1102 | 1083 | * Is template library supports export. |
| 1103 | 1084 | * |
| 1104 | 1085 | * Whether the template library supports export. |
| @@ -1417,24 +1398,14 @@ | ||
| 1417 | 1398 | } |
| 1418 | 1399 | |
| 1419 | 1400 | private function render_blank_state( $current_type, array $args = [] ) { |
| 1420 | 1401 | $current_type_label = $this->get_template_label_by_type( $current_type ); |
| 1421 | - $type_labels = $this->get_template_labels_by_type( $current_type ); | |
| 1422 | - $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' ); | |
| 1423 | - | |
| 1424 | - if ( $type_labels['plural'] ) { | |
| 1425 | - $description = sprintf( | |
| 1426 | - /* translators: %s: Template label (plural). */ | |
| 1427 | - esc_html__( 'Add %s and reuse them across your website. Easily export and import them to any other project, for an optimized workflow.', 'elementor' ), | |
| 1428 | - $type_labels['plural'] | |
| 1429 | - ); | |
| 1430 | - } | |
| 1431 | 1402 | $inline_style = '#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions, .wrap .subsubsub { display:none;}'; |
| 1432 | 1403 | |
| 1433 | 1404 | $args = wp_parse_args( $args, [ |
| 1434 | 1405 | 'additional_inline_style' => '', |
| 1435 | 1406 | 'href' => '', |
| 1436 | - 'description' => $description, | |
| 1407 | + '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' ), | |
| 1437 | 1408 | ] ); |
| 1438 | 1409 | $inline_style .= $args['additional_inline_style']; |
| 1439 | 1410 | ?> |
| 1440 | 1411 | <style type="text/css"><?php Utils::print_unescaped_internal_string( $inline_style ); ?></style> |
| @@ -1529,10 +1500,10 @@ | ||
| 1529 | 1500 | * |
| 1530 | 1501 | * @return \WP_Error|int|array Local template array, or template ID, or |
| 1531 | 1502 | * `WP_Error`. |
| 1532 | 1503 | */ |
| 1533 | - private function import_single_template( $file_path, $import_mode = 'match_site' ) { | |
| 1534 | - $data = $this->prepare_import_template_data( $file_path, $import_mode ); | |
| 1504 | + private function import_single_template( $file_path ) { | |
| 1505 | + $data = $this->prepare_import_template_data( $file_path ); | |
| 1535 | 1506 | |
| 1536 | 1507 | if ( is_wp_error( $data ) ) { |
| 1537 | 1508 | return $data; |
| 1538 | 1509 | } |
| @@ -1588,10 +1559,8 @@ | ||
| 1588 | 1559 | 'title' => $document->get_main_post()->post_title, |
| 1589 | 1560 | 'type' => self::get_template_type( $template_id ), |
| 1590 | 1561 | ]; |
| 1591 | 1562 | |
| 1592 | - $this->attach_global_styles_to_data( $export_data, $content, $template_id ); | |
| 1593 | - | |
| 1594 | 1563 | return [ |
| 1595 | 1564 | 'name' => 'elementor-' . $template_id . '-' . gmdate( 'Y-m-d' ) . '.json', |
| 1596 | 1565 | 'content' => wp_json_encode( $export_data ), |
| 1597 | 1566 | ]; |
| @@ -1632,68 +1601,8 @@ | ||
| 1632 | 1601 | |
| 1633 | 1602 | return $template_label; |
| 1634 | 1603 | } |
| 1635 | 1604 | |
| 1636 | - private function get_template_labels_by_type( $template_type ) { | |
| 1637 | - $labels = [ | |
| 1638 | - 'singular' => '', | |
| 1639 | - 'plural' => '', | |
| 1640 | - ]; | |
| 1641 | - | |
| 1642 | - if ( ! $template_type ) { | |
| 1643 | - return $labels; | |
| 1644 | - } | |
| 1645 | - | |
| 1646 | - $document_types = Plugin::instance()->documents->get_document_types(); | |
| 1647 | - | |
| 1648 | - if ( isset( $document_types[ $template_type ] ) ) { | |
| 1649 | - $doc_type = $document_types[ $template_type ]; | |
| 1650 | - $labels['singular'] = call_user_func( [ $doc_type, 'get_title' ] ); | |
| 1651 | - $labels['plural'] = call_user_func( [ $doc_type, 'get_plural_title' ] ); | |
| 1652 | - } else { | |
| 1653 | - $labels['singular'] = $this->get_template_label_by_type( $template_type ); | |
| 1654 | - } | |
| 1655 | - | |
| 1656 | - if ( ! $labels['plural'] ) { | |
| 1657 | - $labels['plural'] = $labels['singular']; | |
| 1658 | - } | |
| 1659 | - | |
| 1660 | - return $labels; | |
| 1661 | - } | |
| 1662 | - | |
| 1663 | - private function get_current_template_labels() { | |
| 1664 | - $labels = [ | |
| 1665 | - 'singular' => '', | |
| 1666 | - 'plural' => '', | |
| 1667 | - ]; | |
| 1668 | - | |
| 1669 | - $template_type = Utils::get_super_global_value( $_GET, self::TAXONOMY_TYPE_SLUG ); | |
| 1670 | - | |
| 1671 | - if ( $template_type ) { | |
| 1672 | - return $this->get_template_labels_by_type( $template_type ); | |
| 1673 | - } | |
| 1674 | - | |
| 1675 | - $current_tabs_group = $this->get_current_tab_group(); | |
| 1676 | - | |
| 1677 | - if ( $current_tabs_group ) { | |
| 1678 | - $doc_types = Plugin::$instance->documents->get_document_types( [ | |
| 1679 | - 'admin_tab_group' => $current_tabs_group, | |
| 1680 | - ], 'and' ); | |
| 1681 | - | |
| 1682 | - if ( 1 === count( $doc_types ) ) { | |
| 1683 | - $doc_type = reset( $doc_types ); | |
| 1684 | - $labels['singular'] = call_user_func( [ $doc_type, 'get_title' ] ); | |
| 1685 | - $labels['plural'] = call_user_func( [ $doc_type, 'get_plural_title' ] ); | |
| 1686 | - } | |
| 1687 | - } | |
| 1688 | - | |
| 1689 | - if ( ! $labels['plural'] ) { | |
| 1690 | - $labels['plural'] = $labels['singular']; | |
| 1691 | - } | |
| 1692 | - | |
| 1693 | - return $labels; | |
| 1694 | - } | |
| 1695 | - | |
| 1696 | 1605 | /** |
| 1697 | 1606 | * Filter template types in admin query. |
| 1698 | 1607 | * |
| 1699 | 1608 | * Update the template types in the main admin query. |
| @@ -1737,32 +1646,20 @@ | ||
| 1737 | 1646 | * @access private |
| 1738 | 1647 | */ |
| 1739 | 1648 | private function add_actions() { |
| 1740 | 1649 | if ( is_admin() ) { |
| 1741 | - add_action( 'admin_init', [ $this, 'redirect_categories_page_to_saved_templates_page' ] ); | |
| 1650 | + add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) { | |
| 1651 | + $this->register_admin_menu( $admin_menu ); | |
| 1652 | + }, static::ADMIN_MENU_PRIORITY ); | |
| 1742 | 1653 | |
| 1743 | - add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) { | |
| 1744 | - $this->register_editor_one_menu( $menu_data_provider ); | |
| 1745 | - } ); | |
| 1654 | + add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) { | |
| 1655 | + $this->admin_menu_reorder( $admin_menu ); | |
| 1656 | + }, 800 ); | |
| 1746 | 1657 | |
| 1747 | - add_action( 'elementor/editor-one/menu/excluded_level4_slugs', function ( array $excluded_slugs ): array { | |
| 1748 | - $excluded_slugs[] = 'edit.php?post_type=elementor_library#add_new'; | |
| 1749 | - $excluded_slugs[] = 'edit-tags.php?taxonomy=elementor_library_category&post_type=elementor_library'; | |
| 1750 | - return $excluded_slugs; | |
| 1658 | + add_action( 'elementor/admin/menu/after_register', function () { | |
| 1659 | + $this->admin_menu_set_current(); | |
| 1751 | 1660 | } ); |
| 1752 | 1661 | |
| 1753 | - add_filter( 'elementor/editor-one/menu/elementor_post_types', function ( array $elementor_post_types ): array { | |
| 1754 | - $elementor_post_types[ self::CPT ] = []; | |
| 1755 | - | |
| 1756 | - return $elementor_post_types; | |
| 1757 | - } ); | |
| 1758 | - | |
| 1759 | - add_filter( 'elementor/editor-one/admin-edit-post-types', function ( array $post_types ): array { | |
| 1760 | - $post_types[] = self::CPT; | |
| 1761 | - | |
| 1762 | - return $post_types; | |
| 1763 | - } ); | |
| 1764 | - | |
| 1765 | 1662 | add_filter( 'admin_title', [ $this, 'admin_title' ], 10, 2 ); |
| 1766 | 1663 | add_action( 'all_admin_notices', [ $this, 'replace_admin_heading' ] ); |
| 1767 | 1664 | add_filter( 'post_row_actions', [ $this, 'post_row_actions' ], 10, 2 ); |
| 1768 | 1665 | add_action( 'admin_footer', [ $this, 'admin_import_template_form' ] ); |
| @@ -1843,10 +1740,12 @@ | ||
| 1843 | 1740 | return $posts_columns; |
| 1844 | 1741 | } |
| 1845 | 1742 | |
| 1846 | 1743 | public function get_current_tab_group() { |
| 1847 | - $current_tabs_group = Utils::get_super_global_value( $_GET, 'tabs_group' ) ?? ''; | |
| 1848 | - $type_slug = Utils::get_super_global_value( $_GET, self::TAXONOMY_TYPE_SLUG ); | |
| 1744 | + //phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce verification is not required here. | |
| 1745 | + $current_tabs_group = Utils::get_super_global_value( $_REQUEST, 'tabs_group' ) ?? ''; | |
| 1746 | + //phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce verification is not required here. | |
| 1747 | + $type_slug = Utils::get_super_global_value( $_REQUEST, self::TAXONOMY_TYPE_SLUG ); | |
| 1849 | 1748 | |
| 1850 | 1749 | if ( $type_slug ) { |
| 1851 | 1750 | $doc_type = Plugin::$instance->documents->get_document_type( $type_slug, '' ); |
| 1852 | 1751 | if ( $doc_type ) { |
| @@ -2005,9 +1904,9 @@ | ||
| 2005 | 1904 | $post_id = intval( $args['template_id'] ); |
| 2006 | 1905 | $post_status = $this->wordpress_adapter->get_post_status( $post_id ); |
| 2007 | 1906 | $is_private_or_non_published = ( 'private' === $post_status && ! $this->wordpress_adapter->current_user_can( 'read_private_posts', $post_id ) ) || ( 'publish' !== $post_status ); |
| 2008 | 1907 | |
| 2009 | - $can_read_template = ! $is_private_or_non_published || $this->wordpress_adapter->current_user_can( 'edit_post', $post_id ); | |
| 1908 | + $can_read_template = $is_private_or_non_published || $this->wordpress_adapter->current_user_can( 'edit_post', $post_id ); | |
| 2010 | 1909 | |
| 2011 | 1910 | return apply_filters( 'elementor/template-library/is_allowed_to_read_template', $can_read_template, $args ); |
| 2012 | 1911 | } |
| 2013 | 1912 | |