← All changes | modules/landing-pages/module.php +59 -93 4.3.0-beta3 → 3.5.0-dev9 View file →

		@@ -4,13 +4,12 @@
4	4	use Elementor\Core\Base\Module as BaseModule;
5	5	use Elementor\Core\Documents_Manager;
6	6	use Elementor\Core\Experiments\Manager as Experiments_Manager;
7	7	use Elementor\Modules\LandingPages\Documents\Landing_Page;
8		-use Elementor\Modules\LandingPages\AdminMenuItems\Editor_One_Landing_Pages_Menu;
9	8	use Elementor\Modules\LandingPages\Module as Landing_Pages_Module;
10		-use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider;
11	9	use Elementor\Plugin;
12	10	use Elementor\TemplateLibrary\Source_Local;
	11	+use Elementor\Utils;
13	12
14	13	if ( ! defined( 'ABSPATH' ) ) {
15	14	exit; // Exit if accessed directly.
16	15	}
		@@ -19,11 +18,10 @@
19	18
20	19	const DOCUMENT_TYPE = 'landing-page';
21	20	const CPT = 'e-landing-page';
22	21	const ADMIN_PAGE_SLUG = 'edit.php?post_type=' . self::CPT;
23		- const ACTIVATION_KEY = 'elementor_landing_pages_activation';
24	22
25		- private $has_pages = null;
	23	+ private $posts;
26	24	private $trashed_posts;
27	25	private $new_lp_url;
28	26	private $permalink_structure;
29	27
		@@ -31,55 +29,27 @@
31	29	return 'landing-pages';
32	30	}
33	31
34	32	/**
35		- * Register Experimental Feature
	33	+ * Get Experimental Data
36	34	*
37	35	* Implementation of this method makes the module an experiment.
38	36	*
39		- * @since 3.28.0
	37	+ * @since 3.1.0
	38	+ *
	39	+ * @return array
40	40	*/
41		- private function register_experiment() {
42		- Plugin::$instance->experiments->add_feature( [
	41	+ public static function get_experimental_data() {
	42	+ return [
43	43	'name' => 'landing-pages',
44	44	'title' => esc_html__( 'Landing Pages', 'elementor' ),
45	45	'description' => esc_html__( 'Adds a new Elementor content type that allows creating beautiful landing pages instantly in a streamlined workflow.', 'elementor' ),
46	46	'release_status' => Experiments_Manager::RELEASE_STATUS_BETA,
47	47	'default' => Experiments_Manager::STATE_ACTIVE,
48		- 'new_site' => [
49		- 'default_inactive' => true,
50		- 'minimum_installation_version' => '3.22.0',
51		- ],
52		- 'deprecated' => true,
53		- ] );
	48	+ ];
54	49	}
55	50
56	51	/**
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	52	* Get Trashed Landing Pages Posts
83	53	*
84	54	* Returns the posts property of a WP_Query run for Landing Pages with post_status of 'trash'.
85	55	*
		@@ -106,13 +76,23 @@
106	76
107	77	return $this->trashed_posts;
108	78	}
109	79
110		- private function has_landing_pages() {
111		- if ( null !== $this->has_pages ) {
112		- return $this->has_pages;
	80	+ /**
	81	+ * Get Landing Pages Posts
	82	+ *
	83	+ * Returns the posts property of a WP_Query run for posts with the Landing Pages CPT.
	84	+ *
	85	+ * @since 3.1.0
	86	+ *
	87	+ * @return array posts
	88	+ */
	89	+ private function get_landing_page_posts() {
	90	+ if ( $this->posts ) {
	91	+ return $this->posts;
113	92	}
114	93
	94	+ // `'posts_per_page' => 1` is because this is only used as an indicator to whether there are any landing pages.
115	95	$posts_query = new \WP_Query( [
116	96	'no_found_rows' => true,
117	97	'post_type' => self::CPT,
118	98	'post_status' => 'any',
		@@ -120,11 +100,11 @@
120	100	'meta_key' => '_elementor_template_type',
121	101	'meta_value' => self::DOCUMENT_TYPE,
122	102	] );
123	103
124		- $this->has_pages = $posts_query->post_count > 0;
	104	+ $this->posts = $posts_query->posts;
125	105
126		- return $this->has_pages;
	106	+ return $this->posts;
127	107	}
128	108
129	109	/**
130	110	* Is Elementor Landing Page.
		@@ -133,9 +113,9 @@
133	113	*
134	114	* @since 3.1.0
135	115	* @access public
136	116	*
137		- * @param \WP_Post $post Post Object.
	117	+ * @param \WP_Post $post Post Object
138	118	*
139	119	* @return bool Whether the post was built with Elementor.
140	120	*/
141	121	public function is_elementor_landing_page( $post ) {
		@@ -141,25 +121,38 @@
141	121	public function is_elementor_landing_page( $post ) {
142	122	return self::CPT === $post->post_type;
143	123	}
144	124
145		- public function get_menu_args() {
146		- if ( $this->has_landing_pages() ) {
147		- $menu_slug = self::ADMIN_PAGE_SLUG;
148		- $function = null;
	125	+ /**
	126	+ * Add Submenu Page
	127	+ *
	128	+ * Adds the 'Landing Pages' submenu item to the 'Templates' menu item.
	129	+ *
	130	+ * @since 3.1.0
	131	+ */
	132	+ private function add_submenu_page() {
	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 ) ) {
	138	+ $landing_page_menu_slug = self::ADMIN_PAGE_SLUG;
	139	+ $landing_page_menu_callback = null;
149	140	} else {
150		- $menu_slug = self::CPT;
151		- $function = [ $this, 'print_empty_landing_pages_page' ];
	141	+ $landing_page_menu_slug = self::CPT;
	142	+ $landing_page_menu_callback = [ $this, 'print_empty_landing_pages_page' ];
152	143	}
153	144
154		- return [
155		- 'menu_slug' => $menu_slug,
156		- 'function' => $function,
157		- ];
158		- }
	145	+ $landing_pages_title = esc_html__( 'Landing Pages', 'elementor' );
159	146
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 ) );
	147	+ add_submenu_page(
	148	+ Source_Local::ADMIN_MENU_SLUG,
	149	+ $landing_pages_title,
	150	+ $landing_pages_title,
	151	+ 'manage_options',
	152	+ $landing_page_menu_slug,
	153	+ $landing_page_menu_callback
	154	+ );
162	155	}
163	156
164	157	/**
165	158	* Get 'Add New' Landing Page URL
		@@ -173,9 +166,9 @@
173	166	* @return string
174	167	*/
175	168	private function get_add_new_landing_page_url() {
176	169	if ( ! $this->new_lp_url ) {
177		- $this->new_lp_url = Plugin::$instance->documents->get_create_new_post_url( self::CPT, self::DOCUMENT_TYPE ) . '#library';
	170	+ $this->new_lp_url = Utils::get_create_new_post_url( self::CPT, self::DOCUMENT_TYPE ) . '#library';
178	171	}
179	172	return $this->new_lp_url;
180	173	}
181	174
		@@ -202,9 +195,9 @@
202	195	<div class="e-trashed-items">
203	196	<?php
204	197	printf(
205	198	/* translators: %1$s Link open tag, %2$s: Link close tag. */
206		- esc_html__( 'Or view %1$sTrashed Items%2$s', 'elementor' ),
	199	+ esc_html__( 'Or view %1$sTrashed Items%1$s', 'elementor' ),
207	200	'<a href="' . esc_url( admin_url( 'edit.php?post_status=trash&post_type=' . self::CPT ) ) . '">',
208	201	'</a>'
209	202	);
210	203	?>
		@@ -245,9 +238,9 @@
245	238	'urls' => [
246	239	'addNewLandingPageUrl' => $this->get_add_new_landing_page_url(),
247	240	],
248	241	'landingPages' => [
249		- 'landingPagesHasPages' => $this->has_landing_pages(),
	242	+ 'landingPagesHasPages' => [] !== $this->get_landing_page_posts(),
250	243	'isLandingPageAdminEdit' => $this->is_landing_page_admin_edit(),
251	244	],
252	245	];
253	246
		@@ -311,9 +304,9 @@
311	304	return $post_link;
312	305	}
313	306
314	307	// Any slug prefixes need to be removed from the post link.
315		- return trailingslashit( get_home_url() ) . trailingslashit( $post->post_name );
	308	+ return get_home_url() . '/' . $post->post_name . '/';
316	309	}
317	310
318	311	/**
319	312	* Adjust Landing Page Query
		@@ -354,13 +347,9 @@
354	347	} elseif ( ! empty( $query->query['pagename'] ) && false === strpos( $query->query['pagename'], '/' ) ) {
355	348	$query->set( 'post_type', $query_post_types );
356	349
357	350	// We also need to set the name query var since redirect_guess_404_permalink() relies on it.
358		- add_filter( 'pre_redirect_guess_404_permalink', function( $value ) use ( $query ) {
359		- set_query_var( 'name', $query->query['pagename'] );
360		-
361		- return $value;
362		- } );
	351	+ $query->set( 'name', $query->query['pagename'] );
363	352	}
364	353	}
365	354
366	355	/**
		@@ -421,18 +410,8 @@
421	410	return false;
422	411	}
423	412
424	413	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	414	$this->permalink_structure = get_option( 'permalink_structure' );
436	415
437	416	$this->register_landing_page_cpt();
438	417
		@@ -461,20 +440,12 @@
461	440	add_action( 'elementor/documents/register', function( Documents_Manager $documents_manager ) {
462	441	$documents_manager->register_document_type( self::DOCUMENT_TYPE, Landing_Page::get_class_full_name() );
463	442	} );
464	443
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		- } );
	444	+ add_action( 'admin_menu', function() {
	445	+ $this->add_submenu_page();
	446	+ }, 30 );
468	447
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	448	// Add the custom 'Add New' link for Landing Pages into Elementor's admin config.
478	449	add_action( 'elementor/admin/localize_settings', function( array $settings ) {
479	450	return $this->admin_localize_settings( $settings );
480	451	} );
		@@ -482,13 +453,8 @@
482	453	add_filter( 'elementor/template_library/sources/local/register_taxonomy_cpts', function( array $cpts ) {
483	454	$cpts[] = self::CPT;
484	455
485	456	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	457	} );
492	458
493	459	// In the Landing Pages Admin Table page - Overwrite Template type column header title.
494	460	add_action( 'manage_' . Landing_Pages_Module::CPT . '_posts_columns', function( $posts_columns ) {