← All changes | classes/Visualizer/Module/Setup.php +11 -32 3.1.3 → 3.1.1 View file →

		@@ -44,11 +44,10 @@
44	44
45	45	register_activation_hook( VISUALIZER_BASEFILE, array( $this, 'activate' ) );
46	46	register_deactivation_hook( VISUALIZER_BASEFILE, array( $this, 'deactivate' ) );
47	47	$this->_addAction( 'visualizer_schedule_refresh_db', 'refreshDbChart' );
48		- $this->_addFilter( 'visualizer_schedule_refresh_chart', 'refresh_db_for_chart', 10, 3 );
	48	+ $this->_addFilter( 'visualizer_schedule_refresh_chart', 'refresh_db_for_chart', null, 10, 3 );
49	49
50		- $this->_addAction( 'activated_plugin', 'onActivation' );
51	50	$this->_addAction( 'init', 'setupCustomPostTypes' );
52	51	$this->_addAction( 'plugins_loaded', 'loadTextDomain' );
53	52	$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
54	53	$this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
		@@ -146,23 +145,8 @@
146	145	wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, 'hourly', 'visualizer_schedule_refresh_db' );
147	146	}
148	147
149	148	/**
150		- * On activation of the plugin
151		- */
152		- public function onActivation( $plugin ) {
153		- if ( defined( 'TI_UNIT_TESTING' ) ) {
154		- return;
155		- }
156		-
157		- if ( $plugin == VISUALIZER_BASENAME ) {
158		- wp_redirect( admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ) );
159		- exit();
160		- }
161		- }
162		-
163		-
164		- /**
165	149	* Deactivate the plugin
166	150	*/
167	151	public function deactivate() {
168	152	wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
		@@ -168,13 +152,14 @@
168	152	wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
169	153	}
170	154
171	155	/**
172		- * Refresh the specific chart from the db.
	156	+ * Refresh the specific chart from the db. This is mostly for charts that have 0 refresh time i.e. live data.
173	157	*
174	158	* @param WP_Post $chart The chart object.
175	159	* @param int $chart_id The chart id.
176		- * @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.
	160	+ * @param bool $force If this is true, then the chart data will be refreshed no matter if the chart requests live data or cached data.
	161	+ * If false, data will be refreshed only if the chart requests live data.
177	162	*
178	163	* @access public
179	164	*/
180	165	public function refresh_db_for_chart( $chart, $chart_id, $force = false ) {
		@@ -185,18 +170,8 @@
185	170	if ( ! $chart ) {
186	171	$chart = get_post( $chart_id );
187	172	}
188	173
189		- if ( ! $chart ) {
190		- return $chart;
191		- }
192		-
193		- // check if the source is correct.
194		- $source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true );
195		- if ( $source !== 'Visualizer_Source_Query' ) {
196		- return $chart;
197		- }
198		-
199	174	// check if its a live-data chart or a cached-data chart.
200	175	if ( ! $force ) {
201	176	$hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
202	177	if ( ! empty( $hours ) ) {
		@@ -204,12 +179,17 @@
204	179	return $chart;
205	180	}
206	181	}
207	182
	183	+ // check if the source is correct.
	184	+ $source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true );
	185	+ if ( $source !== 'Visualizer_Source_Query_Params' ) {
	186	+ return $chart;
	187	+ }
	188	+
208	189	$params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
209	190	$source = new Visualizer_Source_Query( $params );
210	191	$source->fetch( false );
211		-
212	192	$error = $source->get_error();
213	193	if ( empty( $error ) ) {
214	194	update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
215	195
		@@ -249,10 +229,9 @@
249	229	if ( $time > $now ) {
250	230	continue;
251	231	}
252	232
253		- // if the time is nigh, we force an update.
254		- $this->refresh_db_for_chart( null, $chart_id, true );
	233	+ $this->refresh_db_for_chart( null, $chart_id, false );
255	234	$hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
256	235	$new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
257	236	}
258	237	update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules );