← All changes | includes/NotificationX.php +54 -6 3.2.13 → trunk View file →

		@@ -39,8 +39,18 @@
39	39	* @var NotificationX
40	40	*/
41	41	use GetInstance;
42	42	/**
	43	+ * Option flag recording that NotificationX has already gone through its
	44	+ * initial (first-ever) activation on this site.
	45	+ *
	46	+ * Set on the first activation and seeded for pre-existing installs by
	47	+ * Upgrader, so a re-activation is never mistaken for a first run.
	48	+ *
	49	+ * @since 3.3.0
	50	+ */
	51	+ const FIRST_ACTIVATION_OPTION = 'nx_first_activation';
	52	+ /**
43	53	* Settings
44	54	* @var Settings
45	55	*/
46	56	public $settings;
		@@ -96,8 +106,12 @@
96	106	} else {
97	107	add_action( 'elementor/loaded', [ ElementorManager::class, 'get_instance' ] );
98	108	}
99	109	EntriesMailReceiver::get_instance();
	110	+
	111	+ // MCP server (AI-assistant integration). Progressive enhancement:
	112	+ // loads only on a capable PHP runtime and stays off until enabled.
	113	+ \NotificationX\MCP\Bootstrap::init();
100	114	}
101	115	/**
102	116	* The Plugin Activator
103	117	* @return void
		@@ -104,20 +118,51 @@
104	118	*/
105	119	public function activator(){
106	120	// nx_activated
107	121	Database::get_instance()->Create_DB();
	122	+
	123	+ // A first-ever activation is the only moment the onboarding wizard may
	124	+ // be auto-launched; an abandoned wizard still counts as "already
	125	+ // activated", so re-activations never force it again.
	126	+ $is_first_activation = ! self::has_activated_before();
	127	+ if ( $is_first_activation ) {
	128	+ update_option( self::FIRST_ACTIVATION_OPTION, time(), 'no' );
	129	+ }
	130	+
108	131	if( ! static::$WP_CLI && current_user_can( 'delete_users' ) ) {
109		- set_transient( 'nx_activated', true, 30 );
	132	+ set_transient( 'nx_activated', $is_first_activation ? 'first' : 'again', 30 );
110	133	}
	134	+
	135	+ // Usage insights are normally wired up on `init`, which WordPress has
	136	+ // already fired by the time it activates a plugin — so the
	137	+ // register_activation_hook() callback registered inside the insights
	138	+ // constructor never runs and the tracking event is left unscheduled.
	139	+ // Build the instance and run its activation routine explicitly here so
	140	+ // data collection is live from activation onwards.
	141	+ Admin::get_instance()->plugin_usage_insights()->activate_this_plugin();
	142	+
111	143	Upgrader::get_instance()->clear_transient();
112	144	}
113	145
	146	+ /**
	147	+ * Whether NotificationX has already gone through its initial activation on
	148	+ * this site — i.e. it has been activated before, regardless of whether the
	149	+ * Setup Wizard was ever opened or completed.
	150	+ *
	151	+ * @since 3.3.0
	152	+ * @return bool
	153	+ */
	154	+ public static function has_activated_before() {
	155	+ return (bool) get_option( self::FIRST_ACTIVATION_OPTION, false );
	156	+ }
	157	+
114	158	public function maybe_redirect(){
115	159	if( static::$WP_CLI || wp_doing_ajax() ) {
116	160	return;
117	161	}
118	162	// Bail if no activation transient is set.
119		- if ( ! get_transient( 'nx_activated' ) ) {
	163	+ $activation = get_transient( 'nx_activated' );
	164	+ if ( ! $activation ) {
120	165	return;
121	166	}
122	167	// Delete the activation transient.
123	168	delete_transient( 'nx_activated' );
		@@ -122,12 +167,15 @@
122	167	// Delete the activation transient.
123	168	delete_transient( 'nx_activated' );
124	169
125	170	if ( ! is_multisite() ) {
126		- // First activation: launch the onboarding Setup Wizard, otherwise
127		- // fall back to the dashboard. The wizard marks itself completed on
128		- // finish/skip so this only fires once.
129		- $page = \NotificationX\Core\SetupWizard::is_completed() ? 'nx-dashboard' : 'nx-setup-wizard';
	171	+ // Only a genuine first-ever activation may launch the onboarding
	172	+ // Setup Wizard (and only while it has not been completed/skipped).
	173	+ // Every returning activation lands on the dashboard, as before.
	174	+ // Transients written by an older version hold `true`, which is
	175	+ // treated as a returning activation.
	176	+ $is_first_activation = ( 'first' === $activation );
	177	+ $page = ( $is_first_activation && ! \NotificationX\Core\SetupWizard::is_completed() ) ? 'nx-setup-wizard' : 'nx-dashboard';
130	178	wp_safe_redirect( add_query_arg( array(
131	179	'page' => $page
132	180	), admin_url( 'admin.php' ) ) );
133	181	}