← All changes | core/common/modules/events-manager/module.php +13 -47 4.1.0-dev3 → 3.35.7 View file →

		@@ -3,11 +3,9 @@
3	3	namespace Elementor\Core\Common\Modules\EventsManager;
4	4
5	5	use Elementor\Core\Base\Module as BaseModule;
6	6	use Elementor\Core\Common\Modules\Connect\Apps\Base_App;
7		-use Elementor\Core\Common\Modules\Connect\Apps\Common_App;
8	7	use Elementor\Core\Experiments\Manager as Experiments_Manager;
9		-use Elementor\Includes\EditorAssetsAPI;
10	8	use Elementor\Utils;
11	9	use Elementor\Plugin;
12	10	use Elementor\Tracker;
13	11
		@@ -30,35 +28,15 @@
30	28	Tracker::is_allow_track() &&
31	29	! Tracker::has_terms_changed( '2025-07-07' ) &&
32	30	Plugin::$instance->experiments->is_feature_active( self::EXPERIMENT_NAME );
33	31
	32	+ $session_replays = [];
34	33	$is_flags_enabled = false;
35		- $session_recording_events = [];
36	34
37	35	if ( $can_send_events ) {
38	36	$mixpanel_config = self::get_remote_mixpanel_config();
39		- $has_config = EditorAssetsAPI::has_valid_nested_array( $mixpanel_config, [ 0 ] );
40		-
41		- if ( $has_config ) {
42		- $is_flags_enabled = (bool) ( $mixpanel_config[0]['flags'] ?? false );
43		-
44		- $session_replays = $mixpanel_config[0]['sessionReplays'] ?? [];
45		- $is_session_replays_enabled = (bool) ( $session_replays['enabled'] ?? false );
46		- $raw_events = $session_replays['events'] ?? null;
47		- $events_map = is_array( $raw_events ) ? $raw_events : [];
48		-
49		- if ( $is_session_replays_enabled ) {
50		- $session_recording_events = array_values( array_filter(
51		- self::get_session_recording_events(),
52		- function ( $pair ) use ( $events_map ) {
53		- if ( ! isset( $pair['start'] ) ) {
54		- return false;
55		- }
56		- return (bool) ( $events_map[ $pair['start'] ] ?? false );
57		- }
58		- ) );
59		- }
60		- }
	37	+ $session_replays = $mixpanel_config[0]['sessionReplays'] ?? [];
	38	+ $is_flags_enabled = $mixpanel_config[0]['flags'] ?? false;
61	39	}
62	40
63	41	$settings = [
64	42	'can_send_events' => $can_send_events,
		@@ -70,11 +48,11 @@
70	48	'site_key' => get_option( Base_App::OPTION_CONNECT_SITE_KEY ),
71	49	'subscription_id' => self::get_subscription_id(),
72	50	'subscription' => self::get_subscription(),
73	51	'token' => ELEMENTOR_EDITOR_EVENTS_MIXPANEL_TOKEN,
	52	+ 'session_replays' => $session_replays,
74	53	'flags_enabled' => $is_flags_enabled,
75		- 'user_id' => self::get_user_id(),
76		- 'session_recording_events' => $session_recording_events,
	54	+ 'isEditorOneActive' => Plugin::$instance->experiments->is_feature_active( 'e_editor_one' ),
77	55	];
78	56
79	57	return $settings;
80	58	}
		@@ -113,31 +91,19 @@
113	91	return json_decode( $license_data['value'], true );
114	92	}
115	93
116	94	private static function get_remote_mixpanel_config() {
117		- $editor_assets_api = new EditorAssetsAPI( [
118		- EditorAssetsAPI::ASSETS_DATA_URL => static::REMOTE_MIXPANEL_CONFIG_URL,
119		- EditorAssetsAPI::ASSETS_DATA_TRANSIENT_KEY => '_elementor_mixpanel_config',
120		- EditorAssetsAPI::ASSETS_DATA_KEY => 'mixpanel',
121		- ] );
	95	+ $data = wp_remote_get( static::REMOTE_MIXPANEL_CONFIG_URL );
122	96
123		- return $editor_assets_api->get_assets_data();
124		- }
	97	+ if ( is_wp_error( $data ) ) {
	98	+ return [];
	99	+ }
125	100
126		- private static function get_session_recording_events(): array {
127		- return [
128		- // Each entry defines a recording window: recording starts when 'start' fires
129		- // and stops when 'end' fires. 'end' is optional — omit or set to null to record indefinitely.
130		- [ 'start' => 'editor_loaded' ],
131		- ];
132		- }
	101	+ $data = json_decode( wp_remote_retrieve_body( $data ), true );
133	102
134		- private static function get_user_id() {
135		- $user_common_data = get_user_option( Common_App::OPTION_CONNECT_COMMON_DATA_KEY );
136		-
137		- if ( ! is_array( $user_common_data ) ) {
138		- return null;
	103	+ if ( empty( $data['mixpanel'] ) || ! is_array( $data['mixpanel'] ) ) {
	104	+ return [];
139	105	}
140	106
141		- return Common_App::get_connect_user_id_from_access_token( $user_common_data['access_token'] ?? null );
	107	+ return $data['mixpanel'];
142	108	}
143	109	}