← All changes | classes/Visualizer/Module/Setup.php +28 -203 4.0.5 → 3.4.8 View file →

		@@ -48,15 +48,12 @@
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
57		- $this->_addAction( 'init', 'checkIsExistingUser' );
58		-
59	56	// only for testing
60	57	// $this->_addAction( 'admin_init', 'getUsage' );
61	58	}
62	59	/**
		@@ -122,9 +119,9 @@
122	119	$charts['scheduled'] = $charts['scheduled'] + 1;
123	120	}
124	121
125	122	if ( Visualizer_Module::is_pro() ) {
126		- $permissions = get_post_meta( $chart_id, Visualizer_Pro::CF_PERMISSIONS, true );
	123	+ $permissions = get_post_meta( $chart_id, Visualizer_PRO::CF_PERMISSIONS, true );
127	124	if ( empty( $permissions ) ) {
128	125	continue;
129	126	}
130	127	$permissions = $permissions['permissions'];
		@@ -192,56 +189,15 @@
192	189
193	190	/**
194	191	* Activate the plugin
195	192	*/
196		- public function activate( $network_wide ) {
197		- if ( is_multisite() && $network_wide ) {
198		- foreach ( get_sites( array( 'fields' => 'ids' ) ) as $blog_id ) {
199		- switch_to_blog( $blog_id );
200		- $this->activate_on_site();
201		- restore_current_blog();
202		- }
203		- } else {
204		- $this->activate_on_site();
205		- }
206		- }
207		-
208		- /**
209		- * Activates the plugin on a particular blog instance (supports multisite and single site).
210		- */
211		- private function activate_on_site() {
212		- $this->schedule_refresh_db_action();
	193	+ public function activate() {
	194	+ wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
	195	+ wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, 'hourly', 'visualizer_schedule_refresh_db' );
213	196	add_option( 'visualizer-activated', true );
214		- $is_fresh_install = get_option( 'visualizer_fresh_install', false );
215		- if ( ! defined( 'TI_E2E_TESTING' ) && false === $is_fresh_install ) {
216		- update_option( 'visualizer_fresh_install', '1' );
217		- }
218	197	}
219	198
220	199	/**
221		- * Deactivate the plugin
222		- */
223		- public function deactivate( $network_wide ) {
224		- if ( is_multisite() && $network_wide ) {
225		- foreach ( get_sites( array( 'fields' => 'ids' ) ) as $blog_id ) {
226		- switch_to_blog( $blog_id );
227		- $this->deactivate_on_site();
228		- restore_current_blog();
229		- }
230		- } else {
231		- $this->deactivate_on_site();
232		- }
233		- }
234		-
235		- /**
236		- * Deactivates the plugin on a particular blog instance (supports multisite and single site).
237		- */
238		- private function deactivate_on_site() {
239		- $this->unschedule_refresh_db_action();
240		- delete_option( 'visualizer-activated', true );
241		- }
242		-
243		- /**
244	200	* Check if plugin has been activated and then redirect to the correct page.
245	201	*/
246	202	public function adminInit() {
247	203	if ( defined( 'TI_UNIT_TESTING' ) ) {
		@@ -247,43 +203,16 @@
247	203	if ( defined( 'TI_UNIT_TESTING' ) ) {
248	204	return;
249	205	}
250	206
251		- define( 'VISUALIZER_SURVEY', Visualizer_Module::is_pro() ? 'https://forms.gle/7Zo7FuZbvQ8DTvRi6' : 'https://forms.gle/muMtbcyvHn1aTvmJ7' );
252	207	// fire any upgrades necessary.
253	208	Visualizer_Module_Upgrade::upgrade();
254	209
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		- }
	210	+ if ( get_option( 'visualizer-activated' ) ) {
267	211	delete_option( 'visualizer-activated' );
268	212	if ( ! headers_sent() ) {
269		- if ( ! $is_pro && ! empty( $fresh_install ) ) {
270		- $redirect_url = array(
271		- 'page' => 'visualizer-setup-wizard',
272		- 'tab' => '#step-1',
273		- );
274		- } else {
275		- $page_name = Visualizer_Module::numberOfCharts() > 0 ? Visualizer_Plugin::NAME : 'viz-support';
276		- $redirect_url = array(
277		- 'page' => $page_name,
278		- );
279		- }
280		- wp_safe_redirect(
281		- add_query_arg(
282		- $redirect_url,
283		- admin_url( 'admin.php' )
284		- )
285		- );
	213	+ $page_name = Visualizer_Module::numberOfCharts() > 0 ? Visualizer_Plugin::NAME : 'viz-support';
	214	+ wp_redirect( add_query_arg( 'page', $page_name, admin_url( 'admin.php' ) ) );
286	215	exit();
287	216	}
288	217	}
289	218	}
		@@ -289,13 +218,21 @@
289	218	}
290	219
291	220
292	221	/**
	222	+ * Deactivate the plugin
	223	+ */
	224	+ public function deactivate() {
	225	+ wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
	226	+ delete_option( 'visualizer-activated', true );
	227	+ }
	228	+
	229	+ /**
293	230	* Refresh the specific chart from the db.
294	231	*
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.
	232	+ * @param WP_Post $chart The chart object.
	233	+ * @param int $chart_id The chart id.
	234	+ * @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	235	*
299	236	* @access public
300	237	*/
301	238	public function refresh_db_for_chart( $chart, $chart_id, $force = false ) {
		@@ -368,20 +305,8 @@
368	305	if ( $load_series ) {
369	306	update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
370	307	}
371	308
372		- $allow_html = false;
373		- $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
374		- if ( isset( $settings['allowHtml'] ) && intval( $settings['allowHtml'] ) === 1 ) {
375		- $allow_html = true;
376		- }
377		-
378		- $allow_html = apply_filters( 'visualizer_allow_html_content', $allow_html, $chart_id, $chart );
379		-
380		- if ( $allow_html ) {
381		- kses_remove_filters();
382		- }
383		-
384	309	wp_update_post(
385	310	array(
386	311	'ID' => $chart_id,
387	312	'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
		@@ -387,12 +312,8 @@
387	312	'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
388	313	)
389	314	);
390	315
391		- if ( $allow_html ) {
392		- kses_init_filters();
393		- }
394		-
395	316	$chart = get_post( $chart_id );
396	317	delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
397	318	} else {
398	319	update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Error while updating chart: %s', $error ) );
		@@ -401,19 +322,17 @@
401	322	return $chart;
402	323	}
403	324
404	325	/**
405		- * Refresh the Database chart type.
	326	+ * Refresh the db chart.
406	327	*
407	328	* @access public
408	329	*/
409	330	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 ) {
	331	+ $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
	332	+ if ( ! $schedules ) {
413	333	return;
414	334	}
415		-
416	335	if ( ! defined( 'VISUALIZER_DO_NOT_DIE' ) ) {
417	336	// define this so that the ajax call does not die
418	337	// 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	338	define( 'VISUALIZER_DO_NOT_DIE', true );
		@@ -419,114 +338,20 @@
419	338	define( 'VISUALIZER_DO_NOT_DIE', true );
420	339	}
421	340
422	341	$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 ) ) {
	342	+ $now = time();
	343	+ foreach ( $schedules as $chart_id => $time ) {
	344	+ $new_schedules[ $chart_id ] = $time;
	345	+ if ( $time > $now ) {
428	346	continue;
429	347	}
430	348
431		- $new_schedules[ $chart_id ] = $scheduled_time;
432		-
433		- // Should we do an update?
434		- if ( $scheduled_time > $current_time ) {
435		- continue;
436		- }
437		-
	349	+ // if the time is nigh, we force an update.
438	350	$this->refresh_db_for_chart( null, $chart_id, true );
439		-
440		- // Clear existing chart cache.
441		- $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id;
442		- if ( get_transient( $cache_key ) ) {
443		- delete_transient( $cache_key );
444		- }
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;
	351	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	352	+ $new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
448	353	}
449	354	update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules );
450	355	}
451	356
452		- /**
453		- * Save flag for existing users.
454		- */
455		- public function checkIsExistingUser() {
456		- $chart_exists = get_option( 'visualizer-new-user', '' );
457		- if ( '' === $chart_exists ) {
458		- $charts = get_posts(
459		- array(
460		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
461		- 'fields' => 'ids',
462		- )
463		- );
464		- update_option( 'visualizer-new-user', ! empty( $charts ) ? 'no' : 'yes' );
465		- }
466		- }
467		-
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	357	}