← All changes | modules/landing-pages/module.php +79 -77 4.1.0-dev2 → 3.7.5 View file →

		@@ -1,14 +1,16 @@
1	1	<?php
2	2	namespace Elementor\Modules\LandingPages;
3	3
	4	+use Elementor\Core\Admin\Menu\Admin_Menu_Manager;
	5	+use Elementor\Core\Admin\Menu\Main as MainMenu;
4	6	use Elementor\Core\Base\Module as BaseModule;
5	7	use Elementor\Core\Documents_Manager;
6	8	use Elementor\Core\Experiments\Manager as Experiments_Manager;
7	9	use Elementor\Modules\LandingPages\Documents\Landing_Page;
8		-use Elementor\Modules\LandingPages\AdminMenuItems\Editor_One_Landing_Pages_Menu;
	10	+use Elementor\Modules\LandingPages\AdminMenuItems\Landing_Pages_Menu_Item;
	11	+use Elementor\Modules\LandingPages\AdminMenuItems\Landing_Pages_Empty_View_Menu_Item;
9	12	use Elementor\Modules\LandingPages\Module as Landing_Pages_Module;
10		-use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider;
11	13	use Elementor\Plugin;
12	14	use Elementor\TemplateLibrary\Source_Local;
13	15
14	16	if ( ! defined( 'ABSPATH' ) ) {
		@@ -19,11 +21,10 @@
19	21
20	22	const DOCUMENT_TYPE = 'landing-page';
21	23	const CPT = 'e-landing-page';
22	24	const ADMIN_PAGE_SLUG = 'edit.php?post_type=' . self::CPT;
23		- const ACTIVATION_KEY = 'elementor_landing_pages_activation';
24	25
25		- private $has_pages = null;
	26	+ private $posts;
26	27	private $trashed_posts;
27	28	private $new_lp_url;
28	29	private $permalink_structure;
29	30
		@@ -31,55 +32,31 @@
31	32	return 'landing-pages';
32	33	}
33	34
34	35	/**
35		- * Register Experimental Feature
	36	+ * Get Experimental Data
36	37	*
37	38	* Implementation of this method makes the module an experiment.
38	39	*
39		- * @since 3.28.0
	40	+ * @since 3.1.0
	41	+ *
	42	+ * @return array
40	43	*/
41		- private function register_experiment() {
42		- Plugin::$instance->experiments->add_feature( [
	44	+ public static function get_experimental_data() {
	45	+ return [
43	46	'name' => 'landing-pages',
44	47	'title' => esc_html__( 'Landing Pages', 'elementor' ),
45	48	'description' => esc_html__( 'Adds a new Elementor content type that allows creating beautiful landing pages instantly in a streamlined workflow.', 'elementor' ),
46		- 'release_status' => Experiments_Manager::RELEASE_STATUS_BETA,
	49	+ 'release_status' => Experiments_Manager::RELEASE_STATUS_STABLE,
47	50	'default' => Experiments_Manager::STATE_ACTIVE,
48	51	'new_site' => [
49		- 'default_inactive' => true,
50		- 'minimum_installation_version' => '3.22.0',
	52	+ 'default_active' => true,
	53	+ 'minimum_installation_version' => '3.1.0-beta',
51	54	],
52		- 'deprecated' => true,
53		- ] );
	55	+ ];
54	56	}
55	57
56	58	/**
57		- * Should activate landing pages
58		- *
59		- * Checks whether the Landing Pages should be activated.
60		- *
61		- * If the activation key set to `1` in wp_options, the Landing Pages feature should be active. Otherwise not.
62		- * This is a backwards compatibility for websites that had Landing Pages, therefore couldn't be deactivated.
63		- * When deleting posts in Landing Pages CPT, Elementor checks again whether this feature should be activated.
64		- *
65		- * @since 3.31.0
66		- */
67		- private function should_activate_landing_pages() {
68		- if ( '1' === get_option( self::ACTIVATION_KEY ) ) {
69		- return true;
70		- }
71		-
72		- if ( $this->has_landing_pages() ) {
73		- update_option( self::ACTIVATION_KEY, '1' );
74		- return true;
75		- }
76		-
77		- update_option( self::ACTIVATION_KEY, '0' );
78		- return false;
79		- }
80		-
81		- /**
82	59	* Get Trashed Landing Pages Posts
83	60	*
84	61	* Returns the posts property of a WP_Query run for Landing Pages with post_status of 'trash'.
85	62	*
		@@ -106,13 +83,23 @@
106	83
107	84	return $this->trashed_posts;
108	85	}
109	86
110		- private function has_landing_pages() {
111		- if ( null !== $this->has_pages ) {
112		- return $this->has_pages;
	87	+ /**
	88	+ * Get Landing Pages Posts
	89	+ *
	90	+ * Returns the posts property of a WP_Query run for posts with the Landing Pages CPT.
	91	+ *
	92	+ * @since 3.1.0
	93	+ *
	94	+ * @return array posts
	95	+ */
	96	+ private function get_landing_page_posts() {
	97	+ if ( $this->posts ) {
	98	+ return $this->posts;
113	99	}
114	100
	101	+ // `'posts_per_page' => 1` is because this is only used as an indicator to whether there are any landing pages.
115	102	$posts_query = new \WP_Query( [
116	103	'no_found_rows' => true,
117	104	'post_type' => self::CPT,
118	105	'post_status' => 'any',
		@@ -120,11 +107,11 @@
120	107	'meta_key' => '_elementor_template_type',
121	108	'meta_value' => self::DOCUMENT_TYPE,
122	109	] );
123	110
124		- $this->has_pages = $posts_query->post_count > 0;
	111	+ $this->posts = $posts_query->posts;
125	112
126		- return $this->has_pages;
	113	+ return $this->posts;
127	114	}
128	115
129	116	/**
130	117	* Is Elementor Landing Page.
		@@ -133,9 +120,9 @@
133	120	*
134	121	* @since 3.1.0
135	122	* @access public
136	123	*
137		- * @param \WP_Post $post Post Object.
	124	+ * @param \WP_Post $post Post Object
138	125	*
139	126	* @return bool Whether the post was built with Elementor.
140	127	*/
141	128	public function is_elementor_landing_page( $post ) {
		@@ -141,10 +128,14 @@
141	128	public function is_elementor_landing_page( $post ) {
142	129	return self::CPT === $post->post_type;
143	130	}
144	131
145		- public function get_menu_args() {
146		- if ( $this->has_landing_pages() ) {
	132	+ private function get_menu_args() {
	133	+ $posts = $this->get_landing_page_posts();
	134	+
	135	+ // If there are no Landing Pages, show the "Create Your First Landing Page" page.
	136	+ // If there are, show the pages table.
	137	+ if ( ! empty( $posts ) ) {
147	138	$menu_slug = self::ADMIN_PAGE_SLUG;
148	139	$function = null;
149	140	} else {
150	141	$menu_slug = self::CPT;
		@@ -156,13 +147,41 @@
156	147	'function' => $function,
157	148	];
158	149	}
159	150
160		- private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ): void {
161		- $menu_data_provider->register_menu( new Editor_One_Landing_Pages_Menu( $this ) );
	151	+ private function register_admin_menu( MainMenu $menu ) {
	152	+ $landing_pages_title = esc_html__( 'Landing Pages', 'elementor' );
	153	+
	154	+ $menu_args = array_merge( $this->get_menu_args(), [
	155	+ 'page_title' => $landing_pages_title,
	156	+ 'menu_title' => $landing_pages_title,
	157	+ 'index' => 20,
	158	+ ] );
	159	+
	160	+ $menu->add_submenu( $menu_args );
162	161	}
163	162
164	163	/**
	164	+ * Add Submenu Page
	165	+ *
	166	+ * Adds the 'Landing Pages' submenu item to the 'Templates' menu item.
	167	+ *
	168	+ * @since 3.1.0
	169	+ */
	170	+ private function register_admin_menu_legacy( Admin_Menu_Manager $admin_menu ) {
	171	+ $menu_args = $this->get_menu_args();
	172	+
	173	+ $slug = $menu_args['menu_slug'];
	174	+ $function = $menu_args['function'];
	175	+
	176	+ if ( is_callable( $function ) ) {
	177	+ $admin_menu->register( $slug, new Landing_Pages_Empty_View_Menu_Item( $function ) );
	178	+ } else {
	179	+ $admin_menu->register( $slug, new Landing_Pages_Menu_Item() );
	180	+ }
	181	+ }
	182	+
	183	+ /**
165	184	* Get 'Add New' Landing Page URL
166	185	*
167	186	* Retrieves the custom URL for the admin dashboard's 'Add New' button in the Landing Pages admin screen. This URL
168	187	* creates a new Landing Pages and directly opens the Elementor Editor with the Template Library modal open on the
		@@ -202,9 +221,9 @@
202	221	<div class="e-trashed-items">
203	222	<?php
204	223	printf(
205	224	/* translators: %1$s Link open tag, %2$s: Link close tag. */
206		- esc_html__( 'Or view %1$sTrashed Items%2$s', 'elementor' ),
	225	+ esc_html__( 'Or view %1$sTrashed Items%1$s', 'elementor' ),
207	226	'<a href="' . esc_url( admin_url( 'edit.php?post_status=trash&post_type=' . self::CPT ) ) . '">',
208	227	'</a>'
209	228	);
210	229	?>
		@@ -245,9 +264,9 @@
245	264	'urls' => [
246	265	'addNewLandingPageUrl' => $this->get_add_new_landing_page_url(),
247	266	],
248	267	'landingPages' => [
249		- 'landingPagesHasPages' => $this->has_landing_pages(),
	268	+ 'landingPagesHasPages' => [] !== $this->get_landing_page_posts(),
250	269	'isLandingPageAdminEdit' => $this->is_landing_page_admin_edit(),
251	270	],
252	271	];
253	272
		@@ -311,9 +330,9 @@
311	330	return $post_link;
312	331	}
313	332
314	333	// Any slug prefixes need to be removed from the post link.
315		- return trailingslashit( get_home_url() ) . trailingslashit( $post->post_name );
	334	+ return get_home_url() . '/' . $post->post_name . '/';
316	335	}
317	336
318	337	/**
319	338	* Adjust Landing Page Query
		@@ -421,18 +440,8 @@
421	440	return false;
422	441	}
423	442
424	443	public function __construct() {
425		- if ( ! $this->should_activate_landing_pages() ) {
426		- return;
427		- }
428		-
429		- $this->register_experiment();
430		-
431		- if ( ! Plugin::$instance->experiments->is_feature_active( 'landing-pages' ) ) {
432		- return;
433		- }
434		-
435	444	$this->permalink_structure = get_option( 'permalink_structure' );
436	445
437	446	$this->register_landing_page_cpt();
438	447
		@@ -461,20 +470,18 @@
461	470	add_action( 'elementor/documents/register', function( Documents_Manager $documents_manager ) {
462	471	$documents_manager->register_document_type( self::DOCUMENT_TYPE, Landing_Page::get_class_full_name() );
463	472	} );
464	473
465		- add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
466		- $this->register_editor_one_menu( $menu_data_provider );
467		- } );
	474	+ if ( Plugin::$instance->experiments->is_feature_active( 'admin_menu_rearrangement' ) ) {
	475	+ add_action( 'elementor/admin/menu_registered/elementor', function( MainMenu $menu ) {
	476	+ $this->register_admin_menu( $menu );
	477	+ } );
	478	+ } else {
	479	+ add_action( 'elementor/admin/menu/register', function( Admin_Menu_Manager $admin_menu ) {
	480	+ $this->register_admin_menu_legacy( $admin_menu );
	481	+ }, Source_Local::ADMIN_MENU_PRIORITY + 20 );
	482	+ }
468	483
469		- add_filter( 'elementor/editor-one/menu/elementor_post_types', function ( array $elementor_post_types ): array {
470		- $elementor_post_types[ static::CPT ] = [
471		- 'menu_slug' => 'elementor-editor-templates',
472		- 'child_slug' => 'edit.php?post_type=' . static::CPT,
473		- ];
474		- return $elementor_post_types;
475		- } );
476		-
477	484	// Add the custom 'Add New' link for Landing Pages into Elementor's admin config.
478	485	add_action( 'elementor/admin/localize_settings', function( array $settings ) {
479	486	return $this->admin_localize_settings( $settings );
480	487	} );
		@@ -482,13 +489,8 @@
482	489	add_filter( 'elementor/template_library/sources/local/register_taxonomy_cpts', function( array $cpts ) {
483	490	$cpts[] = self::CPT;
484	491
485	492	return $cpts;
486		- } );
487		-
488		- // When deleting posts in Landing Page CPT, force Elementor to check again whether this feature should be activated.
489		- add_action( 'deleted_post_' . self::CPT, function () {
490		- delete_option( self::ACTIVATION_KEY );
491	493	} );
492	494
493	495	// In the Landing Pages Admin Table page - Overwrite Template type column header title.
494	496	add_action( 'manage_' . Landing_Pages_Module::CPT . '_posts_columns', function( $posts_columns ) {