← All changes | modules/global-classes/global-class-post.php +140 -29 4.1.0-dev2 → 4.2.3 View file →

		@@ -3,8 +3,11 @@
3	3	namespace Elementor\Modules\GlobalClasses;
4	4
5	5	use Elementor\Modules\AtomicWidgets\PropTypeMigrations\Migrations_Orchestrator;
6	6	use Elementor\Modules\GlobalClasses\Concerns\Has_Preview_Context;
	7	+use Elementor\Plugin;
	8	+use Elementor\Core\Kits\Documents\Kit;
	9	+use Elementor\Modules\GlobalClasses\Utils\Global_Class_Data_Normalizer;
7	10	use WP_Post;
8	11
9	12	if ( ! defined( 'ABSPATH' ) ) {
10	13	exit; // Exit if accessed directly.
		@@ -16,8 +19,9 @@
16	19	const META_KEY_VERSION = '_elementor_version';
17	20	const META_KEY_ID = '_elementor_global_class_id';
18	21	const META_KEY_DATA = '_elementor_global_class_data';
19	22	const META_KEY_DATA_PREVIEW = '_elementor_global_class_data_preview';
	23	+ const META_KEY_EDITED = '_elementor_global_class_edited';
20	24
21	25	protected array $context_keys = [
22	26	'data' => [
23	27	'frontend' => self::META_KEY_DATA,
		@@ -31,9 +35,9 @@
31	35	$this->post = $post;
32	36	}
33	37
34	38	public static function from_post( WP_Post $post, bool $is_preview = false ): self {
35		- return ( new self( $post ) )->set_preview( $is_preview );
	39	+ return ( new static( $post ) )->set_preview( $is_preview );
36	40	}
37	41
38	42	public static function from_post_id( int $post_id, bool $is_preview = false ): ?self {
39	43	$post = get_post( $post_id );
		@@ -41,25 +45,25 @@
41	45	if ( ! $post || Global_Class_Post_Type::CPT !== $post->post_type ) {
42	46	return null;
43	47	}
44	48
45		- return ( new self( $post ) )->set_preview( $is_preview );
	49	+ return ( new static( $post ) )->set_preview( $is_preview );
46	50	}
47	51
48		- public static function find_by_class_id( string $class_id, bool $is_preview = false ): ?self {
49		- $posts = get_posts( [
50		- 'post_type' => Global_Class_Post_Type::CPT,
51		- 'post_status' => 'publish',
52		- 'posts_per_page' => 1,
53		- 'meta_key' => self::META_KEY_ID,
54		- 'meta_value' => $class_id,
55		- ] );
	52	+ public static function find_by_class_id( string $class_id, bool $is_preview = false, ?Kit $kit = null ): ?self {
	53	+ $kit = $kit ?? Plugin::$instance->kits_manager->get_active_kit();
56	54
57		- if ( empty( $posts ) ) {
	55	+ if ( ! $kit ) {
58	56	return null;
59	57	}
60	58
61		- return ( new self( $posts[0] ) )->set_preview( $is_preview );
	59	+ $post_id = Global_Classes_Post_IDs::make( $kit )->get_post_id( $class_id );
	60	+
	61	+ if ( ! $post_id ) {
	62	+ return null;
	63	+ }
	64	+
	65	+ return self::from_post_id( $post_id, $is_preview );
62	66	}
63	67
64	68	public function get_post_id(): int {
65	69	return $this->post->ID;
		@@ -78,12 +82,8 @@
78	82	public function get_label(): string {
79	83	return $this->post->post_title;
80	84	}
81	85
82		- public function get_order(): int {
83		- return (int) $this->post->menu_order;
84		- }
85		-
86	86	public function get_data( bool $skip_migration = false ): array {
87	87	$data = $this->get_context_data();
88	88	$meta_key = $this->get_context_key( 'data' );
89	89
		@@ -120,22 +120,59 @@
120	120
121	121	public function to_array( bool $skip_migration = false ): array {
122	122	$data = $this->get_data( $skip_migration );
123	123
124		- $result = [
125		- 'id' => $this->get_class_id(),
126		- 'label' => $this->get_label(),
127		- 'type' => $data['type'] ?? 'class',
128		- 'variants' => $data['variants'] ?? [],
129		- ];
	124	+ $class_id = $this->get_class_id();
130	125
131		- if ( array_key_exists( 'sync_to_v3', $data ) ) {
132		- $result['sync_to_v3'] = (bool) $data['sync_to_v3'];
	126	+ return Global_Class_Data_Normalizer::normalize_style(
	127	+ $class_id,
	128	+ array_merge( $data, [ 'label' => $this->get_label() ] )
	129	+ );
	130	+ }
	131	+
	132	+ public function was_edited(): bool {
	133	+ $last_edited = $this->get_last_edited_timestamp();
	134	+ $creation = $this->get_creation_timestamp();
	135	+
	136	+ return $last_edited > $creation;
	137	+ }
	138	+
	139	+ public function has_edit_timestamp(): bool {
	140	+ return $this->get_last_edited_timestamp() > 0;
	141	+ }
	142	+
	143	+ private function get_creation_timestamp(): int {
	144	+ $dt = get_post_datetime( $this->post, 'date', 'gmt' );
	145	+
	146	+ if ( $dt ) {
	147	+ return (int) $dt->format( 'U' );
133	148	}
134	149
135		- return $result;
	150	+ return (int) strtotime( (string) $this->post->post_date );
136	151	}
137	152
	153	+ private function get_last_edited_timestamp(): int {
	154	+ $raw = get_post_meta( $this->post->ID, self::META_KEY_EDITED, true );
	155	+
	156	+ if ( self::is_timestamp( $raw ) ) {
	157	+ return (int) $raw;
	158	+ }
	159	+
	160	+ return 0;
	161	+ }
	162	+
	163	+ private static function is_timestamp( $value ): bool {
	164	+ if ( ! is_numeric( $value ) ) {
	165	+ return false;
	166	+ }
	167	+
	168	+ return (int) $value > 0;
	169	+ }
	170	+
	171	+ protected function get_current_timestamp(): int {
	172	+ return (int) time();
	173	+ }
	174	+
138	175	public function update_label( string $label ): bool {
139	176	$result = wp_update_post( [
140	177	'ID' => $this->post->ID,
141	178	'post_title' => $label,
		@@ -140,8 +177,12 @@
140	177	'ID' => $this->post->ID,
141	178	'post_title' => $label,
142	179	] );
143	180
	181	+ if ( ! is_wp_error( $result ) && ! $this->is_preview() ) {
	182	+ update_post_meta( $this->post->ID, self::META_KEY_EDITED, $this->get_current_timestamp() );
	183	+ }
	184	+
144	185	return ! is_wp_error( $result );
145	186	}
146	187
147	188	private function get_context_data(): array {
		@@ -155,8 +196,20 @@
155	196
156	197	return is_array( $data ) ? $data : [];
157	198	}
158	199
	200	+ private function get_preview_data(): array {
	201	+ $data = get_post_meta( $this->post->ID, self::META_KEY_DATA_PREVIEW, true );
	202	+
	203	+ return is_array( $data ) ? $data : [];
	204	+ }
	205	+
	206	+ private function get_version(): string {
	207	+ $version = get_post_meta( $this->post->ID, self::META_KEY_VERSION, true );
	208	+
	209	+ return is_string( $version ) ? $version : '';
	210	+ }
	211	+
159	212	public function update_data(
160	213	array $data,
161	214	string $version = ELEMENTOR_VERSION
162	215	): bool {
		@@ -169,8 +222,12 @@
169	222	}
170	223
171	224	update_post_meta( $this->post->ID, self::META_KEY_VERSION, $version );
172	225
	226	+ if ( ! $this->is_preview() ) {
	227	+ update_post_meta( $this->post->ID, self::META_KEY_EDITED, $this->get_current_timestamp() );
	228	+ }
	229	+
173	230	return false !== $result;
174	231	}
175	232
176	233	public static function create(
		@@ -176,9 +233,9 @@
176	233	public static function create(
177	234	string $class_id,
178	235	string $label,
179	236	array $data,
180		- int $order = 0,
	237	+ ?Kit $kit = null,
181	238	string $version = ELEMENTOR_VERSION
182	239	): ?self {
183	240	$post_id = wp_insert_post( [
184	241	'post_type' => Global_Class_Post_Type::CPT,
		@@ -183,9 +240,8 @@
183	240	$post_id = wp_insert_post( [
184	241	'post_type' => Global_Class_Post_Type::CPT,
185	242	'post_title' => $label,
186	243	'post_status' => 'publish',
187		- 'menu_order' => $order,
188	244	] );
189	245
190	246	if ( is_wp_error( $post_id ) || ! $post_id ) {
191	247	return null;
		@@ -190,13 +246,27 @@
190	246	if ( is_wp_error( $post_id ) || ! $post_id ) {
191	247	return null;
192	248	}
193	249
	250	+ $normalized_data = Global_Class_Data_Normalizer::normalize_style_fields( $data );
	251	+
194	252	update_post_meta( $post_id, self::META_KEY_ID, $class_id );
195		- update_post_meta( $post_id, self::META_KEY_DATA, $data );
	253	+ update_post_meta( $post_id, self::META_KEY_DATA, $normalized_data );
196	254	update_post_meta( $post_id, self::META_KEY_VERSION, $version );
197	255
198		- return self::from_post_id( $post_id );
	256	+ $kit = $kit ?? Plugin::$instance->kits_manager->get_active_kit();
	257	+
	258	+ if ( $kit ) {
	259	+ Global_Classes_Post_IDs::make( $kit )->set( $class_id, (int) $post_id );
	260	+ }
	261	+
	262	+ $instance = self::from_post_id( $post_id );
	263	+
	264	+ if ( $instance ) {
	265	+ update_post_meta( $post_id, self::META_KEY_EDITED, $instance->get_creation_timestamp() );
	266	+ }
	267	+
	268	+ return $instance;
199	269	}
200	270
201	271	public function delete(): bool {
202	272	$result = wp_delete_post( $this->post->ID, true );
		@@ -201,6 +271,47 @@
201	271	public function delete(): bool {
202	272	$result = wp_delete_post( $this->post->ID, true );
203	273
204	274	return false !== $result;
	275	+ }
	276	+
	277	+ public static function clone_to_other_kit( string $style_id, Kit $source_kit, Kit $target_kit ): ?Global_Class_Post {
	278	+ $source_post = self::find_by_class_id( $style_id, false, $source_kit );
	279	+
	280	+ if ( ! $source_post ) {
	281	+ return null;
	282	+ }
	283	+
	284	+ $new_post_id = wp_insert_post( [
	285	+ 'post_type' => Global_Class_Post_Type::CPT,
	286	+ 'post_title' => $source_post->get_label(),
	287	+ 'post_status' => 'publish',
	288	+ ] );
	289	+
	290	+ if ( is_wp_error( $new_post_id ) || ! $new_post_id ) {
	291	+ return null;
	292	+ }
	293	+
	294	+ update_post_meta( $new_post_id, self::META_KEY_ID, $style_id );
	295	+ update_post_meta( $new_post_id, self::META_KEY_VERSION, $source_post->get_version() );
	296	+
	297	+ $frontend_data = $source_post->get_frontend_data();
	298	+ $preview_data = $source_post->get_preview_data();
	299	+ $last_edited_timestamp = get_post_meta( $source_post->get_post_id(), self::META_KEY_EDITED, true );
	300	+
	301	+ if ( ! empty( $frontend_data ) ) {
	302	+ update_post_meta( $new_post_id, self::META_KEY_DATA, $frontend_data );
	303	+ }
	304	+
	305	+ if ( ! empty( $preview_data ) ) {
	306	+ update_post_meta( $new_post_id, self::META_KEY_DATA_PREVIEW, $preview_data );
	307	+ }
	308	+
	309	+ if ( $last_edited_timestamp ) {
	310	+ update_post_meta( $new_post_id, self::META_KEY_EDITED, $last_edited_timestamp );
	311	+ }
	312	+
	313	+ Global_Classes_Post_IDs::make( $target_kit )->set( $style_id, (int) $new_post_id );
	314	+
	315	+ return self::from_post_id( $new_post_id );
205	316	}
206	317	}