← All changes | classes/Visualizer/Module/Setup.php +63 -18 3.1.1 → 3.2.0 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,23 @@
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	+ wp_redirect( admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ) );
	159	+ exit();
	160	+ }
	161	+ }
	162	+
	163	+
	164	+ /**
149	165	* Deactivate the plugin
150	166	*/
151	167	public function deactivate() {
152	168	wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
		@@ -152,14 +168,13 @@
152	168	wp_clear_scheduled_hook( 'visualizer_schedule_refresh_db' );
153	169	}
154	170
155	171	/**
156		- * Refresh the specific chart from the db. This is mostly for charts that have 0 refresh time i.e. live data.
	172	+ * Refresh the specific chart from the db.
157	173	*
158	174	* @param WP_Post $chart The chart object.
159	175	* @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.
	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.
162	177	*
163	178	* @access public
164	179	*/
165	180	public function refresh_db_for_chart( $chart, $chart_id, $force = false ) {
		@@ -170,29 +185,58 @@
170	185	if ( ! $chart ) {
171	186	$chart = get_post( $chart_id );
172	187	}
173	188
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		- }
	189	+ if ( ! $chart ) {
	190	+ return $chart;
181	191	}
182	192
183	193	// check if the source is correct.
184	194	$source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true );
185		- if ( $source !== 'Visualizer_Source_Query_Params' ) {
186		- return $chart;
	195	+ $load_series = false;
	196	+ switch ( $source ) {
	197	+ case 'Visualizer_Source_Query':
	198	+ // check if its a live-data chart or a cached-data chart.
	199	+ if ( ! $force ) {
	200	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	201	+ if ( ! empty( $hours ) ) {
	202	+ // cached, bail!
	203	+ return $chart;
	204	+ }
	205	+ }
	206	+
	207	+ $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
	208	+ $source = new Visualizer_Source_Query( $params );
	209	+ $source->fetch( false );
	210	+ $load_series = true;
	211	+ break;
	212	+ case 'Visualizer_Source_Json':
	213	+ // check if its a live-data chart or a cached-data chart.
	214	+ if ( ! $force ) {
	215	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true );
	216	+ if ( ! empty( $hours ) ) {
	217	+ // cached, bail!
	218	+ return $chart;
	219	+ }
	220	+ }
	221	+
	222	+ $url = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL, true );
	223	+ $root = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT, true );
	224	+ $paging = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING, true );
	225	+ $series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
	226	+ $source = new Visualizer_Source_Json( array( 'url' => $url, 'root' => $root, 'paging' => $paging ) );
	227	+ $source->refresh( $series );
	228	+ break;
	229	+ default:
	230	+ return $chart;
187	231	}
188	232
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	233	$error = $source->get_error();
193	234	if ( empty( $error ) ) {
194		- update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	235	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
	236	+ if ( $load_series ) {
	237	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	238	+ }
195	239
196	240	wp_update_post(
197	241	array(
198	242	'ID' => $chart_id,
		@@ -229,9 +273,10 @@
229	273	if ( $time > $now ) {
230	274	continue;
231	275	}
232	276
233		- $this->refresh_db_for_chart( null, $chart_id, false );
	277	+ // if the time is nigh, we force an update.
	278	+ $this->refresh_db_for_chart( null, $chart_id, true );
234	279	$hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
235	280	$new_schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
236	281	}
237	282	update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $new_schedules );