← All changes | classes/Visualizer/Module/Setup.php +67 -18 3.1.1 → 3.3.4 View file →

		@@ -44,10 +44,11 @@
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', null, 10, 3 );
	48	+ $this->_addFilter( 'visualizer_schedule_refresh_chart', 'refresh_db_for_chart', 10, 3 );
49	49
	50	+ $this->_addAction( 'activated_plugin', 'onActivation' );
50	51	$this->_addAction( 'init', 'setupCustomPostTypes' );
51	52	$this->_addAction( 'plugins_loaded', 'loadTextDomain' );
52	53	$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
53	54	$this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
		@@ -145,8 +146,27 @@
145	146	wp_schedule_event( strtotime( 'midnight' ) - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS, 'hourly', 'visualizer_schedule_refresh_db' );
146	147	}
147	148
148	149	/**
	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	+ 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' ) );
	162	+ }
	163	+ exit();
	164	+ }
	165	+ }
	166	+
	167	+
	168	+ /**
149	169	* Deactivate the plugin
150	170	*/
151	171	public function deactivate() {
152	172	wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
		@@ -152,14 +172,13 @@
152	172	wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
153	173	}
154	174
155	175	/**
156		- * Refresh the specific chart from the db. This is mostly for charts that have 0 refresh time i.e. live data.
	176	+ * Refresh the specific chart from the db.
157	177	*
158	178	* @param WP_Post $chart The chart object.
159	179	* @param int $chart_id The chart id.
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.
	180	+ * @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.
162	181	*
163	182	* @access public
164	183	*/
165	184	public function refresh_db_for_chart( $chart, $chart_id, $force = false ) {
		@@ -170,29 +189,58 @@
170	189	if ( ! $chart ) {
171	190	$chart = get_post( $chart_id );
172	191	}
173	192
174		- // check if its a live-data chart or a cached-data chart.
175		- if ( ! $force ) {
176		- $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
177		- if ( ! empty( $hours ) ) {
178		- // cached, bail!
179		- return $chart;
180		- }
	193	+ if ( ! $chart ) {
	194	+ return $chart;
181	195	}
182	196
183	197	// check if the source is correct.
184	198	$source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true );
185		- if ( $source !== 'Visualizer_Source_Query_Params' ) {
186		- return $chart;
	199	+ $load_series = false;
	200	+ switch ( $source ) {
	201	+ case 'Visualizer_Source_Query':
	202	+ // check if its a live-data chart or a cached-data chart.
	203	+ if ( ! $force ) {
	204	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	205	+ if ( ! empty( $hours ) ) {
	206	+ // cached, bail!
	207	+ return $chart;
	208	+ }
	209	+ }
	210	+
	211	+ $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
	212	+ $source = new Visualizer_Source_Query( $params );
	213	+ $source->fetch( false );
	214	+ $load_series = true;
	215	+ break;
	216	+ case 'Visualizer_Source_Json':
	217	+ // check if its a live-data chart or a cached-data chart.
	218	+ if ( ! $force ) {
	219	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true );
	220	+ if ( ! empty( $hours ) ) {
	221	+ // cached, bail!
	222	+ return $chart;
	223	+ }
	224	+ }
	225	+
	226	+ $url = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL, true );
	227	+ $root = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT, true );
	228	+ $paging = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING, true );
	229	+ $series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
	230	+ $source = new Visualizer_Source_Json( array( 'url' => $url, 'root' => $root, 'paging' => $paging ) );
	231	+ $source->refresh( $series );
	232	+ break;
	233	+ default:
	234	+ return $chart;
187	235	}
188	236
189		- $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
190		- $source = new Visualizer_Source_Query( $params );
191		- $source->fetch( false );
192	237	$error = $source->get_error();
193	238	if ( empty( $error ) ) {
194		- update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	239	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
	240	+ if ( $load_series ) {
	241	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	242	+ }
195	243
196	244	wp_update_post(
197	245	array(
198	246	'ID' => $chart_id,
		@@ -229,9 +277,10 @@
229	277	if ( $time > $now ) {
230	278	continue;
231	279	}
232	280
233		- $this->refresh_db_for_chart( null, $chart_id, false );
	281	+ // if the time is nigh, we force an update.
	282	+ $this->refresh_db_for_chart( null, $chart_id, true );
234	283	$hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
235	284	$new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
236	285	}
237	286	update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules );