← All changes | classes/Visualizer/Module/Setup.php +29 -186 3.10.15 → 3.3.2 View file →

		@@ -46,18 +46,14 @@
46	46	register_deactivation_hook( VISUALIZER_BASEFILE, array( $this, 'deactivate' ) );
47	47	$this->_addAction( 'visualizer_schedule_refresh_db', 'refreshDbChart' );
48	48	$this->_addFilter( 'visualizer_schedule_refresh_chart', 'refresh_db_for_chart', 10, 3 );
49	49
50		- $this->_addAction( 'admin_init', 'adminInit' );
	50	+ $this->_addAction( 'activated_plugin', 'onActivation' );
51	51	$this->_addAction( 'init', 'setupCustomPostTypes' );
52	52	$this->_addAction( 'plugins_loaded', 'loadTextDomain' );
53	53	$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
54		- $this->_addFilter( 'visualizer_get_chart_counts', 'getUsage', 10, 2 );
	54	+ $this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
55	55
56		- $this->_addAction( 'init', 'checkIsExistingUser' );
57		-
58		- // only for testing
59		- // $this->_addAction( 'admin_init', 'getUsage' );
60	56	}
61	57	/**
62	58	* Fetches the SDK logger data.
63	59	*
		@@ -65,82 +61,36 @@
65	61	*
66	62	* @access public
67	63	*/
68	64	public function getLoggerData( $data ) {
69		- return $this->getUsage( $data );
	65	+ return $this->getChartCountsByTypeAndMeta();
70	66	}
71	67
72	68	/**
73		- * Fetches the usage of charts.
	69	+ * Fetches the types of charts created and their counts.
74	70	*
75		- * @param array $data The default data that needs to be sent.
76	71	* @param array $meta_keys An array of name vs. meta keys - to return how many charts have these keys.
77		- *
78		- * @access public
	72	+ * @access private
79	73	*/
80		- public function getUsage( $data, $meta_keys = array() ) {
81		- $charts = array( 'types' => array(), 'sources' => array(), 'library' => array(), 'permissions' => 0, 'manual_config' => 0, 'scheduled' => 0 );
	74	+ public function getChartCountsByTypeAndMeta( $meta_keys = array() ) {
	75	+ $charts = array();
	76	+ $charts['chart_types'] = array();
	77	+ // the initial query arguments to fetch charts
82	78	$query_args = array(
83	79	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
84	80	'posts_per_page' => 300,
85		- 'post_status' => 'publish',
86	81	'fields' => 'ids',
87	82	'no_rows_found' => false,
88	83	'update_post_meta_cache' => false,
89	84	'update_post_term_cache' => false,
90		- );
91	85
92		- // default permissions.
93		- $default_perms = array(
94		- 'read' => 'all',
95		- 'read-specific' => null,
96		- 'edit' => 'roles',
97		- 'edit-specific' => array( 'administrator' ),
98	86	);
99	87
100		- // collect all schedules chart ids.
101		- $scheduled = array_merge(
102		- array_keys( get_option( Visualizer_Plugin::CF_CHART_SCHEDULE, array() ) ),
103		- array_keys( get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() ) )
104		- );
105	88	$query = new WP_Query( $query_args );
106	89	while ( $query->have_posts() ) {
107	90	$chart_id = $query->next_post();
108	91	$type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
109		- $charts['types'][ $type ] = isset( $charts['types'][ $type ] ) ? $charts['types'][ $type ] + 1 : 1;
110		- $source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true );
111		- $charts['sources'][ $source ] = isset( $charts['sources'][ $source ] ) ? $charts['sources'][ $source ] + 1 : 1;
112		- $lib = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
113		- $charts['library'][ $lib ] = isset( $charts['library'][ $lib ] ) ? $charts['library'][ $lib ] + 1 : 1;
114		- $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
115		- if ( array_key_exists( 'manual', $settings ) && ! empty( $settings['manual'] ) ) {
116		- $charts['manual_config'] = $charts['manual_config'] + 1;
117		- }
118		-
119		- // phpcs:ignore WordPress.PHP.StrictInArray.FoundNonStrictFalse
120		- if ( in_array( $chart_id, $scheduled, false ) ) {
121		- $charts['scheduled'] = $charts['scheduled'] + 1;
122		- }
123		-
124		- if ( Visualizer_Module::is_pro() ) {
125		- $permissions = get_post_meta( $chart_id, Visualizer_PRO::CF_PERMISSIONS, true );
126		- if ( empty( $permissions ) ) {
127		- continue;
128		- }
129		- $permissions = $permissions['permissions'];
130		- $customized = false;
131		- foreach ( $default_perms as $key => $val ) {
132		- if ( ! is_array( $val ) && ! is_null( $val ) && isset( $permissions[ $key ] ) && $permissions[ $key ] !== $val ) {
133		- $customized = true;
134		- } elseif ( is_array( $val ) && ! is_null( $val ) && isset( $permissions[ $key ] ) && count( $permissions[ $key ] ) !== count( $val ) ) {
135		- $customized = true;
136		- }
137		- }
138		- if ( $customized ) {
139		- $charts['permissions'] = $charts['permissions'] + 1;
140		- }
141		- }
142		-
	92	+ $charts['chart_types'][ $type ] = isset( $charts['chart_types'][ $type ] ) ? $charts['chart_types'][ $type ] + 1 : 1;
143	93	if ( ! empty( $meta_keys ) ) {
144	94	foreach ( $meta_keys as $name => $key ) {
145	95	$data = get_post_meta( $chart_id, $key, true );
146	96	if ( ! empty( $data ) ) {
		@@ -150,9 +100,8 @@
150	100	}
151	101	}
152	102	}
153	103	}
154		-
155	104	return $charts;
156	105	}
157	106
158	107	/**
		@@ -191,95 +140,40 @@
191	140
192	141	/**
193	142	* Activate the plugin
194	143	*/
195		- public function activate( $network_wide ) {
196		- if ( is_multisite() && $network_wide ) {
197		- foreach ( get_sites( array( 'fields' => 'ids' ) ) as $blog_id ) {
198		- switch_to_blog( $blog_id );
199		- $this->activate_on_site();
200		- restore_current_blog();
201		- }
202		- } else {
203		- $this->activate_on_site();
204		- }
	144	+ public function activate() {
	145	+ wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
	146	+ wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, 'hourly', 'visualizer_schedule_refresh_db' );
205	147	}
206	148
207	149	/**
208		- * Activates the plugin on a particular blog instance (supports multisite and single site).
	150	+ * On activation of the plugin
209	151	*/
210		- private function activate_on_site() {
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		- add_option( 'visualizer-activated', true );
214		- $is_fresh_install = get_option( 'visualizer_fresh_install', false );
215		- if ( ! defined( 'TI_CYPRESS_TESTING' ) && false === $is_fresh_install ) {
216		- update_option( 'visualizer_fresh_install', '1' );
	152	+ public function onActivation( $plugin ) {
	153	+ if ( defined( 'TI_UNIT_TESTING' ) ) {
	154	+ return;
217	155	}
218		- }
219	156
220		- /**
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();
	157	+ if ( $plugin === VISUALIZER_BASENAME ) {
	158	+ if ( Visualizer_Module::numberOfCharts() > 0 ) {
	159	+ wp_redirect( admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ) );
	160	+ } else {
	161	+ wp_redirect( admin_url( 'admin.php?page=viz-support' ) );
229	162	}
230		- } else {
231		- $this->deactivate_on_site();
	163	+ exit();
232	164	}
233	165	}
234	166
	167	+
235	168	/**
236		- * Deactivates the plugin on a particular blog instance (supports multisite and single site).
	169	+ * Deactivate the plugin
237	170	*/
238		- private function deactivate_on_site() {
	171	+ public function deactivate() {
239	172	wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
240		- delete_option( 'visualizer-activated', true );
241	173	}
242	174
243	175	/**
244		- * Check if plugin has been activated and then redirect to the correct page.
245		- */
246		- public function adminInit() {
247		- if ( defined( 'TI_UNIT_TESTING' ) ) {
248		- return;
249		- }
250		-
251		- define( 'VISUALIZER_SURVEY', Visualizer_Module::is_pro() ? 'https://forms.gle/7Zo7FuZbvQ8DTvRi6' : 'https://forms.gle/muMtbcyvHn1aTvmJ7' );
252		- // fire any upgrades necessary.
253		- Visualizer_Module_Upgrade::upgrade();
254		-
255		- if ( get_option( 'visualizer-activated' ) ) {
256		- delete_option( 'visualizer-activated' );
257		- if ( ! headers_sent() ) {
258		- if ( ! Visualizer_Module::is_pro() && ! empty( get_option( 'visualizer_fresh_install', false ) ) ) {
259		- $redirect_url = array(
260		- 'page' => 'visualizer-setup-wizard',
261		- 'tab' => '#step-1',
262		- );
263		- } else {
264		- $page_name = Visualizer_Module::numberOfCharts() > 0 ? Visualizer_Plugin::NAME : 'viz-support';
265		- $redirect_url = array(
266		- 'page' => $page_name,
267		- );
268		- }
269		- wp_safe_redirect(
270		- add_query_arg(
271		- $redirect_url,
272		- admin_url( 'admin.php' )
273		- )
274		- );
275		- exit();
276		- }
277		- }
278		- }
279		-
280		-
281		- /**
282	176	* Refresh the specific chart from the db.
283	177	*
284	178	* @param WP_Post $chart The chart object.
285	179	* @param int $chart_id The chart id.
		@@ -314,9 +208,9 @@
314	208	}
315	209	}
316	210
317	211	$params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
318		- $source = new Visualizer_Source_Query( $params, $chart_id );
	212	+ $source = new Visualizer_Source_Query( $params );
319	213	$source->fetch( false );
320	214	$load_series = true;
321	215	break;
322	216	case 'Visualizer_Source_Json':
		@@ -335,19 +229,8 @@
335	229	$series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
336	230	$source = new Visualizer_Source_Json( array( 'url' => $url, 'root' => $root, 'paging' => $paging ) );
337	231	$source->refresh( $series );
338	232	break;
339		- case 'Visualizer_Source_Csv_Remote':
340		- // check if its a live-data chart or a cached-data chart.
341		- if ( ! $force ) {
342		- $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
343		- if ( ! empty( $hours ) ) {
344		- // cached, bail!
345		- return $chart;
346		- }
347		- }
348		- do_action( 'visualizer_schedule_import' );
349		- return get_post( $chart_id );
350	233	default:
351	234	return $chart;
352	235	}
353	236
		@@ -352,40 +235,21 @@
352	235	}
353	236
354	237	$error = $source->get_error();
355	238	if ( empty( $error ) ) {
356		- $this->disableRevisionsTemporarily();
	239	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
357	240	if ( $load_series ) {
358	241	update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
359	242	}
360	243
361		- $allow_html = false;
362		- $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
363		- if ( isset( $settings['allowHtml'] ) && intval( $settings['allowHtml'] ) === 1 ) {
364		- $allow_html = true;
365		- }
366		-
367		- $allow_html = apply_filters( 'visualizer_allow_html_content', $allow_html, $chart_id, $chart );
368		-
369		- if ( $allow_html ) {
370		- kses_remove_filters();
371		- }
372		-
373	244	wp_update_post(
374	245	array(
375	246	'ID' => $chart_id,
376		- 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
	247	+ 'post_content' => $source->getData(),
377	248	)
378	249	);
379	250
380		- if ( $allow_html ) {
381		- kses_init_filters();
382		- }
383		-
384	251	$chart = get_post( $chart_id );
385		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
386		- } else {
387		- update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Error while updating chart: %s', $error ) );
388	252	}
389	253
390	254	return $chart;
391	255	}
		@@ -415,32 +279,11 @@
415	279	}
416	280
417	281	// if the time is nigh, we force an update.
418	282	$this->refresh_db_for_chart( null, $chart_id, true );
419		- // Clear existing chart cache.
420		- $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id;
421		- if ( get_transient( $cache_key ) ) {
422		- delete_transient( $cache_key );
423		- }
424	283	$hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
425	284	$new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
426	285	}
427	286	update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules );
428		- }
429		-
430		- /**
431		- * Save flag for existing users.
432		- */
433		- public function checkIsExistingUser() {
434		- $chart_exists = get_option( 'visualizer-new-user', '' );
435		- if ( '' === $chart_exists ) {
436		- $charts = get_posts(
437		- array(
438		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
439		- 'fields' => 'ids',
440		- )
441		- );
442		- update_option( 'visualizer-new-user', ! empty( $charts ) ? 'no' : 'yes' );
443		- }
444	287	}
445	288
446	289	}