← All changes | classes/Visualizer/Module/Chart.php +286 -31 3.0.5 → 3.1.1 View file →

		@@ -56,16 +56,19 @@
56	56	$this->_addAjaxAction( Visualizer_Plugin::ACTION_CREATE_CHART, 'renderChartPages' );
57	57	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' );
58	58	$this->_addAjaxAction( Visualizer_Plugin::ACTION_UPLOAD_DATA, 'uploadData' );
59	59	$this->_addAjaxAction( Visualizer_Plugin::ACTION_CLONE_CHART, 'cloneChart' );
60		- // Added by Ash/Upwork
61	60	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
62		- // Added by Ash/Upwork
	61	+
	62	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_FETCH_DB_DATA, 'getQueryData' );
	63	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_DB_QUERY, 'saveQuery' );
63	64	}
64	65
65	66	/**
66	67	* Fetches charts from database.
67	68	*
	69	+ * This method is also called from the media pop-up (classic editor: create a post and add chart from insert content).
	70	+ *
68	71	* @since 1.0.0
69	72	*
70	73	* @access public
71	74	*/
		@@ -73,9 +76,12 @@
73	76	$query_args = array(
74	77	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
75	78	'posts_per_page' => 9,
76	79	'paged' => filter_input(
77		- INPUT_GET, 'page', FILTER_VALIDATE_INT, array(
	80	+ INPUT_GET,
	81	+ 'page',
	82	+ FILTER_VALIDATE_INT,
	83	+ array(
78	84	'options' => array(
79	85	'min_range' => 1,
80	86	'default' => 1,
81	87	),
		@@ -82,8 +88,13 @@
82	88	)
83	89	),
84	90	);
85	91	$filter = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
	92	+ if ( empty( $filter ) ) {
	93	+ // 'filter' is from the modal from the add media button.
	94	+ $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
	95	+ }
	96	+
86	97	if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
87	98	$query_args['meta_query'] = array(
88	99	array(
89	100	'key' => Visualizer_Plugin::CF_CHART_TYPE,
		@@ -97,8 +108,18 @@
97	108	while ( $query->have_posts() ) {
98	109	$chart = $query->next_post();
99	110	$chart_data = $this->_getChartArray( $chart );
100	111	$chart_data['id'] = $chart->ID;
	112	+ $chart_data['library'] = $this->load_chart_type( $chart->ID );
	113	+ $css = '';
	114	+ $settings = $chart_data['settings'];
	115	+ $arguments = $this->get_inline_custom_css( 'visualizer-chart-' . $chart->ID, $settings );
	116	+ if ( ! empty( $arguments ) ) {
	117	+ $css = $arguments[0];
	118	+ $settings = $arguments[1];
	119	+ }
	120	+ $chart_data['settings'] = $settings;
	121	+ $chart_data['css'] = $css;
101	122	$charts[] = $chart_data;
102	123	}
103	124	self::_sendResponse(
104	125	array(
		@@ -126,14 +147,30 @@
126	147	}
127	148	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
128	149	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
129	150	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
	151	+ $library = $this->load_chart_type( $chart->ID );
130	152
	153	+ $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
	154	+ $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
	155	+ if ( ! empty( $atts['settings'] ) ) {
	156	+ $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
	157	+ }
	158	+
	159	+ $css = '';
	160	+ $arguments = $this->get_inline_custom_css( 'visualizer-' . $chart->ID, $settings );
	161	+ if ( ! empty( $arguments ) ) {
	162	+ $css = $arguments[0];
	163	+ $settings = $arguments[1];
	164	+ }
	165	+
131	166	return array(
132	167	'type' => $type,
133	168	'series' => $series,
134		- 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ),
	169	+ 'settings' => $settings,
135	170	'data' => $data,
	171	+ 'library' => $library,
	172	+ 'css' => $css,
136	173	);
137	174	}
138	175
139	176	/**
		@@ -167,9 +204,12 @@
167	204	$nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
168	205	$capable = current_user_can( 'delete_posts' );
169	206	if ( $nonce && $capable ) {
170	207	$chart_id = filter_input(
171		- $input_method, 'chart', FILTER_VALIDATE_INT, array(
	208	+ $input_method,
	209	+ 'chart',
	210	+ FILTER_VALIDATE_INT,
	211	+ array(
172	212	'options' => array(
173	213	'min_range' => 1,
174	214	),
175	215	)
		@@ -205,9 +245,9 @@
205	245	defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
206	246	// check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
207	247	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
208	248	if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
209		- $default_type = 'line';
	249	+ $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
210	250	$source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
211	251	$source->fetch();
212	252	$chart_id = wp_insert_post(
213	253	array(
		@@ -223,9 +263,11 @@
223	263	add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
224	264	add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
225	265	add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
226	266	add_post_meta(
227		- $chart_id, Visualizer_Plugin::CF_SETTINGS, array(
	267	+ $chart_id,
	268	+ Visualizer_Plugin::CF_SETTINGS,
	269	+ array(
228	270	'focusTarget' => 'datum',
229	271	)
230	272	);
231	273	do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
		@@ -232,8 +274,11 @@
232	274	}
233	275	wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
234	276	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
235	277	}
	278	+
	279	+ $this->load_chart_type( $chart_id );
	280	+
236	281	// enqueue and register scripts and styles
237	282	wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
238	283	wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
239	284
		@@ -238,22 +283,25 @@
238	283	wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
239	284
240	285	wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
241	286	wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
242		- wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
243		- wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
	287	+ wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
244	288	wp_register_script(
245		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
246		- 'google-jsapi-old',
247		- 'google-jsapi-new',
248		- 'visualizer-frame',
249		- ), Visualizer_Plugin::VERSION, true
	289	+ 'visualizer-render',
	290	+ VISUALIZER_ABSURL . 'js/render-facade.js',
	291	+ apply_filters( 'visualizer_assets_render', array( 'visualizer-frame', 'visualizer-customization' ), false ),
	292	+ Visualizer_Plugin::VERSION,
	293	+ true
250	294	);
251	295	wp_register_script(
252		- 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array(
	296	+ 'visualizer-preview',
	297	+ VISUALIZER_ABSURL . 'js/preview.js',
	298	+ array(
253	299	'wp-color-picker',
254	300	'visualizer-render',
255		- ), Visualizer_Plugin::VERSION, true
	301	+ ),
	302	+ Visualizer_Plugin::VERSION,
	303	+ true
256	304	);
257	305	// added by Ash/Upwork
258	306	if ( VISUALIZER_PRO ) {
259	307	global $Visualizer_Pro;
		@@ -261,11 +309,27 @@
261	309	}
262	310	// dispatch pages
263	311	$this->_chart = get_post( $chart_id );
264	312	$tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
	313	+
	314	+ // skip chart type pages only for existing charts.
	315	+ if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status && ( ! empty( $_GET['tab'] ) && 'visualizer' === $_GET['tab'] ) ) {
	316	+ $tab = 'settings';
	317	+ }
	318	+
	319	+ if ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) {
	320	+ // if the cancel button is clicked.
	321	+ $this->undoRevisions( $chart_id, true );
	322	+ } elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
	323	+ // if the save button is clicked.
	324	+ $this->undoRevisions( $chart_id, false );
	325	+ } else {
	326	+ // if the edit button is clicked.
	327	+ $this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart );
	328	+ }
	329	+
265	330	switch ( $tab ) {
266	331	case 'settings':
267		- // changed by Ash/Upwork
268	332	$this->_handleDataAndSettingsPage();
269	333	break;
270	334	case 'type': // fall through.
271	335	case 'visualizer': // fall through.
		@@ -278,8 +342,62 @@
278	342	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
279	343	}
280	344
281	345	/**
	346	+ * Load code editor assets.
	347	+ */
	348	+ private function loadCodeEditorAssets() {
	349	+ global $wp_version;
	350	+
	351	+ if ( ! VISUALIZER_PRO ) {
	352	+ return;
	353	+ }
	354	+
	355	+ $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping();
	356	+
	357	+ // data tables assets.
	358	+ wp_register_script( 'visualizer-datatables', '//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
	359	+ wp_register_style( 'visualizer-datatables', '//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css', array(), Visualizer_Plugin::VERSION );
	360	+ wp_register_style( 'visualizer-datatables-ui', '//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css', array( 'visualizer-datatables' ), Visualizer_Plugin::VERSION );
	361	+
	362	+ wp_enqueue_script( 'visualizer-datatables' );
	363	+ wp_enqueue_style( 'visualizer-datatables-ui' );
	364	+
	365	+ if ( version_compare( $wp_version, '4.9.0', '<' ) ) {
	366	+ // code mirror assets.
	367	+ wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
	368	+ wp_register_script( 'visualizer-codemirror-placeholder', '//codemirror.net/addon/display/placeholder.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
	369	+ wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
	370	+ wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
	371	+ wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
	372	+ wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
	373	+ wp_register_script( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.js', array( 'visualizer-codemirror-sql', 'visualizer-codemirror-sql-hint', 'visualizer-codemirror-placeholder', 'visualizer-codemirror-matchbrackets', 'visualizer-codemirror-closebrackets' ), Visualizer_Plugin::VERSION );
	374	+ wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION );
	375	+ wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
	376	+
	377	+ wp_enqueue_script( 'visualizer-codemirror-hint' );
	378	+ wp_enqueue_style( 'visualizer-codemirror-hint' );
	379	+ } else {
	380	+ wp_enqueue_code_editor(
	381	+ array(
	382	+ 'type' => 'sql',
	383	+ 'codemirror' => array(
	384	+ 'autofocus' => true,
	385	+ 'lineWrapping' => true,
	386	+ 'dragDrop' => false,
	387	+ 'matchBrackets' => true,
	388	+ 'autoCloseBrackets' => true,
	389	+ 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ),
	390	+ 'hintOptions' => array( 'tables' => $table_col_mapping ),
	391	+ ),
	392	+ )
	393	+ );
	394	+ }
	395	+
	396	+ return $table_col_mapping;
	397	+ }
	398	+
	399	+ /**
282	400	* Handle data and settings page
283	401	*/
284	402	private function _handleDataAndSettingsPage() {
285	403	if ( isset( $_POST['map_api_key'] ) ) {
		@@ -287,11 +405,18 @@
287	405	}
288	406	if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
289	407	if ( $this->_chart->post_status == 'auto-draft' ) {
290	408	$this->_chart->post_status = 'publish';
	409	+
	410	+ // ensure that a revision is not created. If a revision is created it will have the proper data and the parent of the revision will have default data.
	411	+ // we do not want any difference in data so disable revisions temporarily.
	412	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
291	413	wp_update_post( $this->_chart->to_array() );
292	414	}
293		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
	415	+ // save meta data only when it is NOT being canceled.
	416	+ if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
	417	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
	418	+ }
294	419	$render = new Visualizer_Render_Page_Send();
295	420	$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
296	421	wp_iframe( array( $render, 'render' ) );
297	422
		@@ -311,15 +436,20 @@
311	436	$sidebar->__data = $data['data'];
312	437	}
313	438	}
314	439	unset( $data['settings']['width'], $data['settings']['height'] );
315		- wp_enqueue_style( 'visualizer-frame' );
316	440	wp_enqueue_style( 'wp-color-picker' );
317	441	wp_enqueue_style( 'visualizer-frame' );
318	442	wp_enqueue_script( 'visualizer-preview' );
	443	+ wp_enqueue_script( 'visualizer-chosen' );
319	444	wp_enqueue_script( 'visualizer-render' );
	445	+
	446	+ $table_col_mapping = $this->loadCodeEditorAssets();
	447	+
320	448	wp_localize_script(
321		- 'visualizer-render', 'visualizer', array(
	449	+ 'visualizer-render',
	450	+ 'visualizer',
	451	+ array(
322	452	'l10n' => array(
323	453	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
324	454	'loading' => esc_html__( 'Loading...', 'visualizer' ),
325	455	),
		@@ -324,29 +454,43 @@
324	454	'loading' => esc_html__( 'Loading...', 'visualizer' ),
325	455	),
326	456	'charts' => array(
327	457	'canvas' => $data,
	458	+ 'id' => $this->_chart->ID,
328	459	),
	460	+ 'language' => $this->get_language(),
329	461	'map_api_key' => get_option( 'visualizer-map-api-key' ),
330		- 'ajax' => array(
	462	+ 'ajax' => array(
331	463	'url' => admin_url( 'admin-ajax.php' ),
332	464	'nonces' => array(
333	465	'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
	466	+ 'db_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION ),
334	467	),
335	468	'actions' => array(
336	469	'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
	470	+ 'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA,
337	471	),
338	472	),
	473	+ 'db_query' => array(
	474	+ 'tables' => $table_col_mapping,
	475	+ ),
	476	+ 'is_pro' => VISUALIZER_PRO,
	477	+ 'page_type' => 'chart',
339	478	)
340	479	);
	480	+
341	481	$render = new Visualizer_Render_Page_Data();
342	482	$render->chart = $this->_chart;
343	483	$render->type = $data['type'];
	484	+ $render->custom_css = $data['css'];
344	485	$render->sidebar = $sidebar;
345	486	if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
346	487	$render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
347	488	? esc_html__( 'Save Chart', 'visualizer' )
348	489	: esc_html__( 'Create Chart', 'visualizer' );
	490	+ if ( filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART ) {
	491	+ $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
	492	+ }
349	493	} else {
350	494	$render->button = esc_attr__( 'Insert Chart', 'visualizer' );
351	495	}
352	496	if ( VISUALIZER_PRO ) {
		@@ -414,20 +558,32 @@
414	558	*
415	559	* @access public
416	560	*/
417	561	public function uploadData() {
	562	+ // if this is being called internally from pro and VISUALIZER_DO_NOT_DIE is set.
	563	+ // otherwise, assume this is a normal web request.
	564	+ $can_die = ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE );
	565	+
418	566	// validate nonce
419		- // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
420	567	if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {
	568	+ if ( ! $can_die ) {
	569	+ return;
	570	+ }
421	571	status_header( 403 );
422	572	exit;
423	573	}
	574	+
424	575	// check chart, if chart exists
	576	+ // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
425	577	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
426	578	if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
	579	+ if ( ! $can_die ) {
	580	+ return;
	581	+ }
427	582	status_header( 400 );
428	583	exit;
429	584	}
	585	+
430	586	if ( ! isset( $_POST['vz-import-time'] ) ) {
431	587	apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
432	588	}
433	589
		@@ -433,8 +589,12 @@
433	589
434	590	if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
435	591	// delete the filters in case this chart is being uploaded from other data sources
436	592	delete_post_meta( $chart_id, 'visualizer-filter-config' );
	593	+
	594	+ // delete "import from db" specific parameters.
	595	+ delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
	596	+ delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
437	597	}
438	598
439	599	$source = null;
440	600	$render = new Visualizer_Render_Page_Update();
		@@ -444,22 +604,34 @@
444	604	apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
445	605	}
446	606	} elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
447	607	$source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
448		- // Added by Ash/Upwork
449	608	} elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
450	609	$source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '' );
451		- // Added by Ash/Upwork
452	610	} else {
453	611	$render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
454	612	}
455	613	if ( $source ) {
456	614	if ( $source->fetch() ) {
457		- $chart->post_content = $source->getData();
	615	+ $content = $source->getData();
	616	+ $populate = true;
	617	+ if ( is_string( $content ) && is_array( unserialize( $content ) ) ) {
	618	+ $json = unserialize( $content );
	619	+ // if source exists, so should data. if source exists but data is blank, do not populate the chart.
	620	+ // if we populate the data even if it is empty, the chart will show "Table has no columns".
	621	+ if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) {
	622	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Not populating chart data as source exists (%s) but data is empty!', $json['source'] ), 'warn', __FILE__, __LINE__ );
	623	+ $populate = false;
	624	+ }
	625	+ }
	626	+ if ( $populate ) {
	627	+ $chart->post_content = $content;
	628	+ }
458	629	wp_update_post( $chart->to_array() );
459	630	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
460	631	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
461	632	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
	633	+ $render->id = $chart->ID;
462	634	$render->data = json_encode( $source->getRawData() );
463	635	$render->series = json_encode( $source->getSeries() );
464	636	} else {
465	637	$render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
		@@ -465,11 +637,12 @@
465	637	$render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
466	638	}
467	639	}
468	640	$render->render();
469		- if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
470		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	641	+ if ( ! $can_die ) {
	642	+ return;
471	643	}
	644	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
472	645	}
473	646
474	647	/**
475	648	* Clones the chart.
		@@ -483,9 +656,12 @@
483	656	$nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
484	657	$capable = current_user_can( 'edit_posts' );
485	658	if ( $nonce && $capable ) {
486	659	$chart_id = filter_input(
487		- INPUT_GET, 'chart', FILTER_VALIDATE_INT, array(
	660	+ INPUT_GET,
	661	+ 'chart',
	662	+ FILTER_VALIDATE_INT,
	663	+ array(
488	664	'options' => array(
489	665	'min_range' => 1,
490	666	),
491	667	)
		@@ -515,9 +691,10 @@
515	691	$redirect = add_query_arg(
516	692	array(
517	693	'page' => 'visualizer',
518	694	'type' => filter_input( INPUT_GET, 'type' ),
519		- ), admin_url( 'upload.php' )
	695	+ ),
	696	+ admin_url( 'upload.php' )
520	697	);
521	698	}
522	699	}
523	700	wp_redirect( $redirect );
		@@ -535,9 +712,11 @@
535	712	check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' );
536	713	$capable = current_user_can( 'edit_posts' );
537	714	if ( $capable ) {
538	715	$chart_id = isset( $_GET['chart'] ) ? filter_var(
539		- $_GET['chart'], FILTER_VALIDATE_INT, array(
	716	+ $_GET['chart'],
	717	+ FILTER_VALIDATE_INT,
	718	+ array(
540	719	'options' => array(
541	720	'min_range' => 1,
542	721	),
543	722	)
		@@ -568,9 +747,11 @@
568	747	unset( $data['settings']['width'], $data['settings']['height'] );
569	748	wp_enqueue_style( 'visualizer-frame' );
570	749	wp_enqueue_script( 'visualizer-render' );
571	750	wp_localize_script(
572		- 'visualizer-render', 'visualizer', array(
	751	+ 'visualizer-render',
	752	+ 'visualizer',
	753	+ array(
573	754	'l10n' => array(
574	755	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
575	756	'loading' => esc_html__( 'Loading...', 'visualizer' ),
576	757	),
		@@ -586,6 +767,80 @@
586	767	}
587	768	// Added by Ash/Upwork
588	769	$this->_addAction( 'admin_head', 'renderFlattrScript' );
589	770	wp_iframe( array( $render, 'render' ) );
	771	+ }
	772	+
	773	+ /**
	774	+ * Returns the data for the query.
	775	+ *
	776	+ * @access public
	777	+ */
	778	+ public function getQueryData() {
	779	+ check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
	780	+
	781	+ $params = wp_parse_args( $_POST['params'] );
	782	+ $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
	783	+ $html = $source->fetch( true );
	784	+ $error = '';
	785	+ if ( empty( $html ) ) {
	786	+ $error = $source->get_error();
	787	+ wp_send_json_error( array( 'msg' => $error ) );
	788	+ }
	789	+ wp_send_json_success( array( 'table' => $html ) );
	790	+ }
	791	+
	792	+ /**
	793	+ * Saves the query and the schedule.
	794	+ *
	795	+ * @access public
	796	+ */
	797	+ public function saveQuery() {
	798	+ check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION, 'security' );
	799	+
	800	+ $chart_id = filter_input(
	801	+ INPUT_GET,
	802	+ 'chart',
	803	+ FILTER_VALIDATE_INT,
	804	+ array(
	805	+ 'options' => array(
	806	+ 'min_range' => 1,
	807	+ ),
	808	+ )
	809	+ );
	810	+
	811	+ $render = new Visualizer_Render_Page_Update();
	812	+ if ( $chart_id ) {
	813	+ $params = wp_parse_args( $_POST['params'] );
	814	+ $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
	815	+ $source->fetch( false );
	816	+ $error = $source->get_error();
	817	+ if ( empty( $error ) ) {
	818	+ $hours = $_POST['refresh'];
	819	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) );
	820	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
	821	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	822	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours );
	823	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
	824	+
	825	+ $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
	826	+ $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
	827	+ update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules );
	828	+
	829	+ wp_update_post(
	830	+ array(
	831	+ 'ID' => $chart_id,
	832	+ 'post_content' => $source->getData(),
	833	+ )
	834	+ );
	835	+ $render->data = json_encode( $source->getRawData() );
	836	+ $render->series = json_encode( $source->getSeries() );
	837	+ } else {
	838	+ $render->message = $error;
	839	+ }
	840	+ }
	841	+ $render->render();
	842	+ if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
	843	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	844	+ }
590	845	}
591	846	}