← All changes | classes/Visualizer/Gutenberg/Block.php +9 -30 3.10.12 → 3.7.9 View file →

		@@ -66,9 +66,9 @@
66	66	/**
67	67	* Enqueue front end and editor JavaScript and CSS
68	68	*/
69	69	public function enqueue_gutenberg_scripts() {
70		- global $wp_version, $pagenow;
	70	+ global $wp_version;
71	71
72	72	$blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.js';
73	73	$handsontableJS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.js';
74	74	$stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.css';
		@@ -89,9 +89,9 @@
89	89	}
90	90
91	91	// Enqueue the bundled block JS file
92	92	wp_enqueue_script( 'handsontable', $handsontableJS );
93		- wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment', 'lodash' ), $version, true );
	93	+ wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment' ), $version, true );
94	94
95	95	$type = 'community';
96	96
97	97	if ( Visualizer_Module::is_pro() ) {
		@@ -104,9 +104,9 @@
104	104	$table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( null, false );
105	105
106	106	$translation_array = array(
107	107	'isPro' => $type,
108		- 'proTeaser' => tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'blockupsell'),
	108	+ 'proTeaser' => Visualizer_Plugin::PRO_TEASER_URL,
109	109	'absurl' => VISUALIZER_ABSURL,
110	110	'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(),
111	111	'adminPage' => menu_page_url( 'visualizer', false ),
112	112	'sqlTable' => $table_col_mapping,
		@@ -111,9 +111,8 @@
111	111	'adminPage' => menu_page_url( 'visualizer', false ),
112	112	'sqlTable' => $table_col_mapping,
113	113	'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6,
114	114	'proFeaturesLocked' => Visualizer_Module_Admin::proFeaturesLocked(),
115		- 'isFullSiteEditor' => 'site-editor.php' === $pagenow,
116	115	);
117	116	wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array );
118	117
119	118	// Enqueue frontend and editor block styles
		@@ -351,11 +350,9 @@
351	350	$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );
352	351
353	352	// faetch and update settings
354	353	$data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true );
355		- if ( empty( $data['visualizer-settings']['pagination'] ) ) {
356		- $data['visualizer-settings']['pageSize'] = '';
357		- }
	354	+
358	355	// handle series filter hooks
359	356	$data['visualizer-series'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $post_id, Visualizer_Plugin::CF_SERIES, true ), $post_id, $data['visualizer-chart-type'] );
360	357
361	358	// handle settings filter hooks
		@@ -369,12 +366,8 @@
369	366	if ( in_array( $data['visualizer-chart-type'], array( 'tabular' ), true ) ) {
370	367	$data['visualizer-data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
371	368	}
372	369
373		- if ( ! isset( $data['visualizer-settings']['hAxis']['format'] ) ) {
374		- $data['visualizer-settings']['hAxis']['format'] = '';
375		- }
376		-
377	370	$data['visualizer-data-exploded'] = '';
378	371	// handle annotations for google charts
379	372	if ( 'GoogleCharts' === $library ) {
380	373	// this will contain the data of both axis.
		@@ -441,10 +434,10 @@
441	434	$json_root = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_ROOT, true );
442	435
443	436	$json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true );
444	437
445		- if ( ! empty( $import ) && $schedule >= 0 ) {
446		- $data['visualizer-chart-url'] = $import;
	438	+ if ( ! empty( $import ) && ! empty( $schedule ) ) {
	439	+ $data['visualizer-chart-url'] = $import;
447	440	$data['visualizer-chart-schedule'] = $schedule;
448	441	}
449	442
450	443	if ( ! empty( $db_schedule ) && ! empty( $db_query ) ) {
		@@ -597,9 +590,9 @@
597	590	update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] );
598	591	update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] );
599	592	update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] );
600	593
601		- if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] >= 0 ) {
	594	+ if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) {
602	595	$chart_url = esc_url_raw( $data['visualizer-chart-url'] );
603	596	$chart_schedule = intval( $data['visualizer-chart-schedule'] );
604	597	update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url );
605	598	apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $chart_url, $chart_schedule );
		@@ -620,18 +613,8 @@
620	613	} else {
621	614	delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE );
622	615	delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY );
623	616	}
624		-
625		- if ( 'Visualizer_Source_Csv_Remote' === $source_type ) {
626		- $schedule_url = $data['visualizer-chart-url'];
627		- $schedule_id = $data['visualizer-chart-schedule'];
628		- update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $schedule_url );
629		- update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_SCHEDULE, $schedule_id );
630		- } else {
631		- delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL );
632		- delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_SCHEDULE );
633		- }
634	617	}
635	618
636	619	if ( $source_type === 'Visualizer_Source_Json' ) {
637	620	$json_schedule = intval( $data['visualizer-json-schedule'] );
		@@ -766,14 +749,10 @@
766	749	if ( ! current_user_can( 'edit_posts' ) ) {
767	750	return false;
768	751	}
769	752
770		- $remote_data = false;
771		- if ( isset( $data['url'] ) && function_exists( 'wp_http_validate_url' ) ) {
772		- $remote_data = wp_http_validate_url( $data['url'] );
773		- }
774		- if ( false !== $remote_data && ! is_wp_error( $remote_data ) ) {
775		- $source = new Visualizer_Source_Csv_Remote( $remote_data );
	753	+ if ( $data['url'] && ! is_wp_error( $data['url'] ) && filter_var( $data['url'], FILTER_VALIDATE_URL ) ) {
	754	+ $source = new Visualizer_Source_Csv_Remote( $data['url'] );
776	755	if ( $source->fetch() ) {
777	756	$temp = $source->getData();
778	757	if ( is_string( $temp ) && is_array( unserialize( $temp ) ) ) {
779	758	$content['series'] = $source->getSeries();