← All changes | classes/Visualizer/Module/Setup.php +20 -106 4.0.3 → 3.10.8 View file →

		@@ -48,9 +48,8 @@
48	48	$this->_addFilter( 'visualizer_schedule_refresh_chart', 'refresh_db_for_chart', 10, 3 );
49	49
50	50	$this->_addAction( 'admin_init', 'adminInit' );
51	51	$this->_addAction( 'init', 'setupCustomPostTypes' );
52		- $this->_addFilter( 'cron_schedules', 'custom_cron_schedules' );
53	52	$this->_addAction( 'plugins_loaded', 'loadTextDomain' );
54	53	$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
55	54	$this->_addFilter( 'visualizer_get_chart_counts', 'getUsage', 10, 2 );
56	55
		@@ -122,9 +121,9 @@
122	121	$charts['scheduled'] = $charts['scheduled'] + 1;
123	122	}
124	123
125	124	if ( Visualizer_Module::is_pro() ) {
126		- $permissions = get_post_meta( $chart_id, Visualizer_Pro::CF_PERMISSIONS, true );
	125	+ $permissions = get_post_meta( $chart_id, Visualizer_PRO::CF_PERMISSIONS, true );
127	126	if ( empty( $permissions ) ) {
128	127	continue;
129	128	}
130	129	$permissions = $permissions['permissions'];
		@@ -208,12 +207,13 @@
208	207	/**
209	208	* Activates the plugin on a particular blog instance (supports multisite and single site).
210	209	*/
211	210	private function activate_on_site() {
212		- $this->schedule_refresh_db_action();
	211	+ wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
	212	+ wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, apply_filters( 'visualizer_chart_schedule_interval', 'hourly' ), 'visualizer_schedule_refresh_db' );
213	213	add_option( 'visualizer-activated', true );
214	214	$is_fresh_install = get_option( 'visualizer_fresh_install', false );
215		- if ( ! defined( 'TI_E2E_TESTING' ) && false === $is_fresh_install ) {
	215	+ if ( ! defined( 'TI_CYPRESS_TESTING' ) && false === $is_fresh_install ) {
216	216	update_option( 'visualizer_fresh_install', '1' );
217	217	}
218	218	}
219	219
		@@ -235,9 +235,9 @@
235	235	/**
236	236	* Deactivates the plugin on a particular blog instance (supports multisite and single site).
237	237	*/
238	238	private function deactivate_on_site() {
239		- $this->unschedule_refresh_db_action();
	239	+ wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
240	240	delete_option( 'visualizer-activated', true );
241	241	}
242	242
243	243	/**
		@@ -251,23 +251,12 @@
251	251	define( 'VISUALIZER_SURVEY', Visualizer_Module::is_pro() ? 'https://forms.gle/7Zo7FuZbvQ8DTvRi6' : 'https://forms.gle/muMtbcyvHn1aTvmJ7' );
252	252	// fire any upgrades necessary.
253	253	Visualizer_Module_Upgrade::upgrade();
254	254
255		- $activated_flag = get_option( 'visualizer-activated' );
256		- $fresh_install = get_option( 'visualizer_fresh_install', false );
257		- $is_pro = Visualizer_Module::is_pro();
258		- if ( $activated_flag ) {
259		- if ( function_exists( 'wp_doing_ajax' ) && wp_doing_ajax() ) {
260		- // Defer redirect until a normal admin request.
261		- return;
262		- }
263		- if ( wp_doing_cron() ) {
264		- // Defer redirect during cron requests.
265		- return;
266		- }
	255	+ if ( get_option( 'visualizer-activated' ) ) {
267	256	delete_option( 'visualizer-activated' );
268	257	if ( ! headers_sent() ) {
269		- if ( ! $is_pro && ! empty( $fresh_install ) ) {
	258	+ if ( ! Visualizer_Module::is_pro() && ! empty( get_option( 'visualizer_fresh_install', false ) ) ) {
270	259	$redirect_url = array(
271	260	'page' => 'visualizer-setup-wizard',
272	261	'tab' => '#step-1',
273	262	);
		@@ -291,11 +280,11 @@
291	280
292	281	/**
293	282	* Refresh the specific chart from the db.
294	283	*
295		- * @param WP_Post|null $chart The chart object.
296		- * @param int $chart_id The chart id.
297		- * @param bool $force If this is true, then the chart data will be force refreshed. If false, data will be refreshed only if the chart requests live data.
	284	+ * @param WP_Post $chart The chart object.
	285	+ * @param int $chart_id The chart id.
	286	+ * @param bool $force If this is true, then the chart data will be force refreshed. If false, data will be refreshed only if the chart requests live data.
298	287	*
299	288	* @access public
300	289	*/
301	290	public function refresh_db_for_chart( $chart, $chart_id, $force = false ) {
		@@ -401,19 +390,17 @@
401	390	return $chart;
402	391	}
403	392
404	393	/**
405		- * Refresh the Database chart type.
	394	+ * Refresh the db chart.
406	395	*
407	396	* @access public
408	397	*/
409	398	public function refreshDbChart() {
410		- // NOTE: This use a different key from normal schedule. Updated only by Database chart. Check `visualizer_schedule_import` action.
411		- $chart_schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
412		- if ( ! $chart_schedules ) {
	399	+ $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
	400	+ if ( ! $schedules ) {
413	401	return;
414	402	}
415		-
416	403	if ( ! defined( 'VISUALIZER_DO_NOT_DIE' ) ) {
417	404	// define this so that the ajax call does not die
418	405	// this means that if the new version of pro and the old version of free are installed, only the first chart will be updated
419	406	define( 'VISUALIZER_DO_NOT_DIE', true );
		@@ -419,33 +406,24 @@
419	406	define( 'VISUALIZER_DO_NOT_DIE', true );
420	407	}
421	408
422	409	$new_schedules = array();
423		- $current_time = time();
424		- foreach ( $chart_schedules as $chart_id => $scheduled_time ) {
425		-
426		- // Skip deleted charts.
427		- if ( false === get_post_status( $chart_id ) ) {
	410	+ $now = time();
	411	+ foreach ( $schedules as $chart_id => $time ) {
	412	+ $new_schedules[ $chart_id ] = $time;
	413	+ if ( $time > $now ) {
428	414	continue;
429	415	}
430	416
431		- $new_schedules[ $chart_id ] = $scheduled_time;
432		-
433		- // Should we do an update?
434		- if ( $scheduled_time > $current_time ) {
435		- continue;
436		- }
437		-
	417	+ // if the time is nigh, we force an update.
438	418	$this->refresh_db_for_chart( null, $chart_id, true );
439		-
440	419	// Clear existing chart cache.
441	420	$cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id;
442	421	if ( get_transient( $cache_key ) ) {
443	422	delete_transient( $cache_key );
444	423	}
445		-
446		- $scheduled_hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
447		- $new_schedules[ $chart_id ] = $current_time + $scheduled_hours * HOUR_IN_SECONDS;
	424	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	425	+ $new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
448	426	}
449	427	update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules );
450	428	}
451	429
		@@ -464,69 +442,5 @@
464	442	update_option( 'visualizer-new-user', ! empty( $charts ) ? 'no' : 'yes' );
465	443	}
466	444	}
467	445
468		- /**
469		- * Add custom cron schedules.
470		- *
471		- * @param array $schedules The current schedules options.
472		- * @return array The modified schedules options.
473		- */
474		- public function custom_cron_schedules( $schedules ) {
475		- $schedules['visualizer_ten_minutes'] = array(
476		- 'interval' => 600,
477		- 'display' => __( 'Every 10 minutes', 'visualizer' ),
478		- );
479		-
480		- return $schedules;
481		- }
482		-
483		- /**
484		- * Schedule the recurring DB refresh action.
485		- */
486		- private function schedule_refresh_db_action(): void {
487		- $hook = 'visualizer_schedule_refresh_db';
488		- $group = 'visualizer';
489		- $interval_key = apply_filters( 'visualizer_chart_schedule_interval', 'visualizer_ten_minutes' );
490		- $interval = $this->get_schedule_interval_seconds( $interval_key );
491		- $timestamp = strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
492		-
493		- if ( function_exists( 'as_next_scheduled_action' ) && function_exists( 'as_schedule_recurring_action' ) ) {
494		- $next = as_next_scheduled_action( $hook, array(), $group );
495		- if ( false === $next ) {
496		- as_schedule_recurring_action( $timestamp, $interval, $hook, array(), $group );
497		- }
498		- wp_clear_scheduled_hook( $hook );
499		- return;
500		- }
501		-
502		- wp_clear_scheduled_hook( $hook );
503		- wp_schedule_event( $timestamp, $interval_key, $hook );
504		- }
505		-
506		- /**
507		- * Unschedule the recurring DB refresh action.
508		- */
509		- private function unschedule_refresh_db_action(): void {
510		- $hook = 'visualizer_schedule_refresh_db';
511		- $group = 'visualizer';
512		- if ( function_exists( 'as_unschedule_all_actions' ) ) {
513		- as_unschedule_all_actions( $hook, array(), $group );
514		- }
515		- wp_clear_scheduled_hook( $hook );
516		- }
517		-
518		- /**
519		- * Resolve a cron schedule key to seconds.
520		- *
521		- * @param string $interval_key Cron schedule key.
522		- * @return int Interval in seconds.
523		- */
524		- private function get_schedule_interval_seconds( $interval_key ) {
525		- $schedules = wp_get_schedules();
526		- if ( isset( $schedules[ $interval_key ]['interval'] ) ) {
527		- return (int) $schedules[ $interval_key ]['interval'];
528		- }
529		-
530		- return 600;
531		- }
532	446	}