← All changes | classes/Visualizer/Module/Setup.php +116 -25 3.1.3 → 3.4.2 View file →

		@@ -50,10 +50,12 @@
50	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', 'getChartCountsByTypeAndMeta' );
	54	+ $this->_addFilter( 'visualizer_get_chart_counts', 'getUsage', 10, 2 );
55	55
	56	+ // only for testing
	57	+ // $this->_addAction( 'admin_init', 'getUsage' );
56	58	}
57	59	/**
58	60	* Fetches the SDK logger data.
59	61	*
		@@ -61,36 +63,82 @@
61	63	*
62	64	* @access public
63	65	*/
64	66	public function getLoggerData( $data ) {
65		- return $this->getChartCountsByTypeAndMeta();
	67	+ return $this->getUsage( $data );
66	68	}
67	69
68	70	/**
69		- * Fetches the types of charts created and their counts.
	71	+ * Fetches the usage of charts.
70	72	*
	73	+ * @param array $data The default data that needs to be sent.
71	74	* @param array $meta_keys An array of name vs. meta keys - to return how many charts have these keys.
72		- * @access private
	75	+ *
	76	+ * @access public
73	77	*/
74		- public function getChartCountsByTypeAndMeta( $meta_keys = array() ) {
75		- $charts = array();
76		- $charts['chart_types'] = array();
77		- // the initial query arguments to fetch charts
	78	+ public function getUsage( $data, $meta_keys = array() ) {
	79	+ $charts = array( 'types' => array(), 'sources' => array(), 'library' => array(), 'permissions' => 0, 'manual_config' => 0, 'scheduled' => 0 );
78	80	$query_args = array(
79	81	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
80	82	'posts_per_page' => 300,
	83	+ 'post_status' => 'publish',
81	84	'fields' => 'ids',
82	85	'no_rows_found' => false,
83	86	'update_post_meta_cache' => false,
84	87	'update_post_term_cache' => false,
	88	+ );
85	89
	90	+ // default permissions.
	91	+ $default_perms = array(
	92	+ 'read' => 'all',
	93	+ 'read-specific' => null,
	94	+ 'edit' => 'roles',
	95	+ 'edit-specific' => array( 'administrator' ),
86	96	);
87	97
	98	+ // collect all schedules chart ids.
	99	+ $scheduled = array_merge(
	100	+ array_keys( get_option( Visualizer_Plugin::CF_CHART_SCHEDULE, array() ) ),
	101	+ array_keys( get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() ) )
	102	+ );
88	103	$query = new WP_Query( $query_args );
89	104	while ( $query->have_posts() ) {
90	105	$chart_id = $query->next_post();
91	106	$type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
92		- $charts['chart_types'][ $type ] = isset( $charts['chart_types'][ $type ] ) ? $charts['chart_types'][ $type ] + 1 : 1;
	107	+ $charts['types'][ $type ] = isset( $charts['types'][ $type ] ) ? $charts['types'][ $type ] + 1 : 1;
	108	+ $source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true );
	109	+ $charts['sources'][ $source ] = isset( $charts['sources'][ $source ] ) ? $charts['sources'][ $source ] + 1 : 1;
	110	+ $lib = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
	111	+ $charts['library'][ $lib ] = isset( $charts['library'][ $lib ] ) ? $charts['library'][ $lib ] + 1 : 1;
	112	+ $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
	113	+ if ( array_key_exists( 'manual', $settings ) && ! empty( $settings['manual'] ) ) {
	114	+ $charts['manual_config'] = $charts['manual_config'] + 1;
	115	+ }
	116	+
	117	+ // phpcs:ignore WordPress.PHP.StrictInArray.FoundNonStrictFalse
	118	+ if ( in_array( $chart_id, $scheduled, false ) ) {
	119	+ $charts['scheduled'] = $charts['scheduled'] + 1;
	120	+ }
	121	+
	122	+ if ( Visualizer_Module::is_pro() ) {
	123	+ $permissions = get_post_meta( $chart_id, Visualizer_PRO::CF_PERMISSIONS, true );
	124	+ if ( empty( $permissions ) ) {
	125	+ continue;
	126	+ }
	127	+ $permissions = $permissions['permissions'];
	128	+ $customized = false;
	129	+ foreach ( $default_perms as $key => $val ) {
	130	+ if ( ! is_array( $val ) && ! is_null( $val ) && isset( $permissions[ $key ] ) && $permissions[ $key ] !== $val ) {
	131	+ $customized = true;
	132	+ } elseif ( is_array( $val ) && ! is_null( $val ) && isset( $permissions[ $key ] ) && count( $permissions[ $key ] ) !== count( $val ) ) {
	133	+ $customized = true;
	134	+ }
	135	+ }
	136	+ if ( $customized ) {
	137	+ $charts['permissions'] = $charts['permissions'] + 1;
	138	+ }
	139	+ }
	140	+
93	141	if ( ! empty( $meta_keys ) ) {
94	142	foreach ( $meta_keys as $name => $key ) {
95	143	$data = get_post_meta( $chart_id, $key, true );
96	144	if ( ! empty( $data ) ) {
		@@ -100,8 +148,9 @@
100	148	}
101	149	}
102	150	}
103	151	}
	152	+
104	153	return $charts;
105	154	}
106	155
107	156	/**
		@@ -153,10 +202,14 @@
153	202	if ( defined( 'TI_UNIT_TESTING' ) ) {
154	203	return;
155	204	}
156	205
157		- if ( $plugin == VISUALIZER_BASENAME ) {
158		- wp_redirect( admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ) );
	206	+ if ( $plugin === VISUALIZER_BASENAME ) {
	207	+ if ( Visualizer_Module::numberOfCharts() > 0 ) {
	208	+ wp_redirect( admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ) );
	209	+ } else {
	210	+ wp_redirect( admin_url( 'admin.php?page=viz-support' ) );
	211	+ }
159	212	exit();
160	213	}
161	214	}
162	215
		@@ -191,28 +244,63 @@
191	244	}
192	245
193	246	// check if the source is correct.
194	247	$source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true );
195		- if ( $source !== 'Visualizer_Source_Query' ) {
196		- return $chart;
197		- }
	248	+ $load_series = false;
	249	+ switch ( $source ) {
	250	+ case 'Visualizer_Source_Query':
	251	+ // check if its a live-data chart or a cached-data chart.
	252	+ if ( ! $force ) {
	253	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	254	+ if ( ! empty( $hours ) ) {
	255	+ // cached, bail!
	256	+ return $chart;
	257	+ }
	258	+ }
198	259
199		- // check if its a live-data chart or a cached-data chart.
200		- if ( ! $force ) {
201		- $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
202		- if ( ! empty( $hours ) ) {
203		- // cached, bail!
	260	+ $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
	261	+ $source = new Visualizer_Source_Query( $params, $chart_id );
	262	+ $source->fetch( false );
	263	+ $load_series = true;
	264	+ break;
	265	+ case 'Visualizer_Source_Json':
	266	+ // check if its a live-data chart or a cached-data chart.
	267	+ if ( ! $force ) {
	268	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true );
	269	+ if ( ! empty( $hours ) ) {
	270	+ // cached, bail!
	271	+ return $chart;
	272	+ }
	273	+ }
	274	+
	275	+ $url = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL, true );
	276	+ $root = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT, true );
	277	+ $paging = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING, true );
	278	+ $series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
	279	+ $source = new Visualizer_Source_Json( array( 'url' => $url, 'root' => $root, 'paging' => $paging ) );
	280	+ $source->refresh( $series );
	281	+ break;
	282	+ case 'Visualizer_Source_Csv_Remote':
	283	+ // check if its a live-data chart or a cached-data chart.
	284	+ if ( ! $force ) {
	285	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
	286	+ if ( ! empty( $hours ) ) {
	287	+ // cached, bail!
	288	+ return $chart;
	289	+ }
	290	+ }
	291	+ do_action( 'visualizer_schedule_import' );
	292	+ return get_post( $chart_id );
	293	+ default:
204	294	return $chart;
205		- }
206	295	}
207	296
208		- $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
209		- $source = new Visualizer_Source_Query( $params );
210		- $source->fetch( false );
211		-
212	297	$error = $source->get_error();
213	298	if ( empty( $error ) ) {
214		- update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	299	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
	300	+ if ( $load_series ) {
	301	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	302	+ }
215	303
216	304	wp_update_post(
217	305	array(
218	306	'ID' => $chart_id,
		@@ -220,8 +308,11 @@
220	308	)
221	309	);
222	310
223	311	$chart = get_post( $chart_id );
	312	+ delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
	313	+ } else {
	314	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Error while updating chart: %s', $error ) );
224	315	}
225	316
226	317	return $chart;
227	318	}