← All changes | classes/Visualizer/Module/Chart.php +275 -31 3.0.7 → 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	),
		@@ -102,8 +108,18 @@
102	108	while ( $query->have_posts() ) {
103	109	$chart = $query->next_post();
104	110	$chart_data = $this->_getChartArray( $chart );
105	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;
106	122	$charts[] = $chart_data;
107	123	}
108	124	self::_sendResponse(
109	125	array(
		@@ -131,14 +147,30 @@
131	147	}
132	148	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
133	149	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
134	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 );
135	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	+
136	166	return array(
137	167	'type' => $type,
138	168	'series' => $series,
139		- 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ),
	169	+ 'settings' => $settings,
140	170	'data' => $data,
	171	+ 'library' => $library,
	172	+ 'css' => $css,
141	173	);
142	174	}
143	175
144	176	/**
		@@ -172,9 +204,12 @@
172	204	$nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
173	205	$capable = current_user_can( 'delete_posts' );
174	206	if ( $nonce && $capable ) {
175	207	$chart_id = filter_input(
176		- $input_method, 'chart', FILTER_VALIDATE_INT, array(
	208	+ $input_method,
	209	+ 'chart',
	210	+ FILTER_VALIDATE_INT,
	211	+ array(
177	212	'options' => array(
178	213	'min_range' => 1,
179	214	),
180	215	)
		@@ -210,9 +245,9 @@
210	245	defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
211	246	// check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
212	247	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
213	248	if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
214		- $default_type = 'line';
	249	+ $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
215	250	$source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
216	251	$source->fetch();
217	252	$chart_id = wp_insert_post(
218	253	array(
		@@ -228,9 +263,11 @@
228	263	add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
229	264	add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
230	265	add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
231	266	add_post_meta(
232		- $chart_id, Visualizer_Plugin::CF_SETTINGS, array(
	267	+ $chart_id,
	268	+ Visualizer_Plugin::CF_SETTINGS,
	269	+ array(
233	270	'focusTarget' => 'datum',
234	271	)
235	272	);
236	273	do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
		@@ -237,8 +274,11 @@
237	274	}
238	275	wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
239	276	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
240	277	}
	278	+
	279	+ $this->load_chart_type( $chart_id );
	280	+
241	281	// enqueue and register scripts and styles
242	282	wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
243	283	wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
244	284
		@@ -243,22 +283,25 @@
243	283	wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
244	284
245	285	wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
246	286	wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
247		- wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
248		- 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 );
249	288	wp_register_script(
250		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
251		- 'google-jsapi-old',
252		- 'google-jsapi-new',
253		- 'visualizer-frame',
254		- ), 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
255	294	);
256	295	wp_register_script(
257		- 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array(
	296	+ 'visualizer-preview',
	297	+ VISUALIZER_ABSURL . 'js/preview.js',
	298	+ array(
258	299	'wp-color-picker',
259	300	'visualizer-render',
260		- ), Visualizer_Plugin::VERSION, true
	301	+ ),
	302	+ Visualizer_Plugin::VERSION,
	303	+ true
261	304	);
262	305	// added by Ash/Upwork
263	306	if ( VISUALIZER_PRO ) {
264	307	global $Visualizer_Pro;
		@@ -268,12 +311,23 @@
268	311	$this->_chart = get_post( $chart_id );
269	312	$tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
270	313
271	314	// skip chart type pages only for existing charts.
272		- if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status ) {
	315	+ if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status && ( ! empty( $_GET['tab'] ) && 'visualizer' === $_GET['tab'] ) ) {
273	316	$tab = 'settings';
274	317	}
275	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	+
276	330	switch ( $tab ) {
277	331	case 'settings':
278	332	$this->_handleDataAndSettingsPage();
279	333	break;
		@@ -288,8 +342,62 @@
288	342	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
289	343	}
290	344
291	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	+ /**
292	400	* Handle data and settings page
293	401	*/
294	402	private function _handleDataAndSettingsPage() {
295	403	if ( isset( $_POST['map_api_key'] ) ) {
		@@ -297,11 +405,18 @@
297	405	}
298	406	if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
299	407	if ( $this->_chart->post_status == 'auto-draft' ) {
300	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' );
301	413	wp_update_post( $this->_chart->to_array() );
302	414	}
303		- 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	+ }
304	419	$render = new Visualizer_Render_Page_Send();
305	420	$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
306	421	wp_iframe( array( $render, 'render' ) );
307	422
		@@ -321,15 +436,20 @@
321	436	$sidebar->__data = $data['data'];
322	437	}
323	438	}
324	439	unset( $data['settings']['width'], $data['settings']['height'] );
325		- wp_enqueue_style( 'visualizer-frame' );
326	440	wp_enqueue_style( 'wp-color-picker' );
327	441	wp_enqueue_style( 'visualizer-frame' );
328	442	wp_enqueue_script( 'visualizer-preview' );
	443	+ wp_enqueue_script( 'visualizer-chosen' );
329	444	wp_enqueue_script( 'visualizer-render' );
	445	+
	446	+ $table_col_mapping = $this->loadCodeEditorAssets();
	447	+
330	448	wp_localize_script(
331		- 'visualizer-render', 'visualizer', array(
	449	+ 'visualizer-render',
	450	+ 'visualizer',
	451	+ array(
332	452	'l10n' => array(
333	453	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
334	454	'loading' => esc_html__( 'Loading...', 'visualizer' ),
335	455	),
		@@ -334,30 +454,43 @@
334	454	'loading' => esc_html__( 'Loading...', 'visualizer' ),
335	455	),
336	456	'charts' => array(
337	457	'canvas' => $data,
	458	+ 'id' => $this->_chart->ID,
338	459	),
339	460	'language' => $this->get_language(),
340	461	'map_api_key' => get_option( 'visualizer-map-api-key' ),
341		- 'ajax' => array(
	462	+ 'ajax' => array(
342	463	'url' => admin_url( 'admin-ajax.php' ),
343	464	'nonces' => array(
344	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 ),
345	467	),
346	468	'actions' => array(
347	469	'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
	470	+ 'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA,
348	471	),
349	472	),
	473	+ 'db_query' => array(
	474	+ 'tables' => $table_col_mapping,
	475	+ ),
	476	+ 'is_pro' => VISUALIZER_PRO,
	477	+ 'page_type' => 'chart',
350	478	)
351	479	);
	480	+
352	481	$render = new Visualizer_Render_Page_Data();
353	482	$render->chart = $this->_chart;
354	483	$render->type = $data['type'];
	484	+ $render->custom_css = $data['css'];
355	485	$render->sidebar = $sidebar;
356	486	if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
357	487	$render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
358	488	? esc_html__( 'Save Chart', 'visualizer' )
359	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	+ }
360	493	} else {
361	494	$render->button = esc_attr__( 'Insert Chart', 'visualizer' );
362	495	}
363	496	if ( VISUALIZER_PRO ) {
		@@ -425,20 +558,32 @@
425	558	*
426	559	* @access public
427	560	*/
428	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	+
429	566	// validate nonce
430		- // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
431	567	if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {
	568	+ if ( ! $can_die ) {
	569	+ return;
	570	+ }
432	571	status_header( 403 );
433	572	exit;
434	573	}
	574	+
435	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
436	577	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
437	578	if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
	579	+ if ( ! $can_die ) {
	580	+ return;
	581	+ }
438	582	status_header( 400 );
439	583	exit;
440	584	}
	585	+
441	586	if ( ! isset( $_POST['vz-import-time'] ) ) {
442	587	apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
443	588	}
444	589
		@@ -444,8 +589,12 @@
444	589
445	590	if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
446	591	// delete the filters in case this chart is being uploaded from other data sources
447	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 );
448	597	}
449	598
450	599	$source = null;
451	600	$render = new Visualizer_Render_Page_Update();
		@@ -455,22 +604,34 @@
455	604	apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
456	605	}
457	606	} elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
458	607	$source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
459		- // Added by Ash/Upwork
460	608	} elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
461	609	$source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '' );
462		- // Added by Ash/Upwork
463	610	} else {
464	611	$render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
465	612	}
466	613	if ( $source ) {
467	614	if ( $source->fetch() ) {
468		- $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	+ }
469	629	wp_update_post( $chart->to_array() );
470	630	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
471	631	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
472	632	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
	633	+ $render->id = $chart->ID;
473	634	$render->data = json_encode( $source->getRawData() );
474	635	$render->series = json_encode( $source->getSeries() );
475	636	} else {
476	637	$render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
		@@ -476,11 +637,12 @@
476	637	$render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
477	638	}
478	639	}
479	640	$render->render();
480		- if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
481		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	641	+ if ( ! $can_die ) {
	642	+ return;
482	643	}
	644	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
483	645	}
484	646
485	647	/**
486	648	* Clones the chart.
		@@ -494,9 +656,12 @@
494	656	$nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
495	657	$capable = current_user_can( 'edit_posts' );
496	658	if ( $nonce && $capable ) {
497	659	$chart_id = filter_input(
498		- INPUT_GET, 'chart', FILTER_VALIDATE_INT, array(
	660	+ INPUT_GET,
	661	+ 'chart',
	662	+ FILTER_VALIDATE_INT,
	663	+ array(
499	664	'options' => array(
500	665	'min_range' => 1,
501	666	),
502	667	)
		@@ -526,9 +691,10 @@
526	691	$redirect = add_query_arg(
527	692	array(
528	693	'page' => 'visualizer',
529	694	'type' => filter_input( INPUT_GET, 'type' ),
530		- ), admin_url( 'upload.php' )
	695	+ ),
	696	+ admin_url( 'upload.php' )
531	697	);
532	698	}
533	699	}
534	700	wp_redirect( $redirect );
		@@ -546,9 +712,11 @@
546	712	check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' );
547	713	$capable = current_user_can( 'edit_posts' );
548	714	if ( $capable ) {
549	715	$chart_id = isset( $_GET['chart'] ) ? filter_var(
550		- $_GET['chart'], FILTER_VALIDATE_INT, array(
	716	+ $_GET['chart'],
	717	+ FILTER_VALIDATE_INT,
	718	+ array(
551	719	'options' => array(
552	720	'min_range' => 1,
553	721	),
554	722	)
		@@ -579,9 +747,11 @@
579	747	unset( $data['settings']['width'], $data['settings']['height'] );
580	748	wp_enqueue_style( 'visualizer-frame' );
581	749	wp_enqueue_script( 'visualizer-render' );
582	750	wp_localize_script(
583		- 'visualizer-render', 'visualizer', array(
	751	+ 'visualizer-render',
	752	+ 'visualizer',
	753	+ array(
584	754	'l10n' => array(
585	755	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
586	756	'loading' => esc_html__( 'Loading...', 'visualizer' ),
587	757	),
		@@ -597,6 +767,80 @@
597	767	}
598	768	// Added by Ash/Upwork
599	769	$this->_addAction( 'admin_head', 'renderFlattrScript' );
600	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	+ }
601	845	}
602	846	}