← All changes | classes/Visualizer/Module/Chart.php +155 -709 4.0.5 → 3.2.0 View file →

		@@ -68,38 +68,11 @@
68	68	$this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE, 'setJsonSchedule' );
69	69
70	70	$this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
71	71
72		- $this->_addFilter( 'visualizer_get_sidebar', 'getSidebar', 10, 2 );
73	72	}
74	73
75	74	/**
76		- * Generates the HTML of the sidebar for the chart.
77		- *
78		- * @since ?
79		- *
80		- * @access public
81		- */
82		- public function getSidebar( $sidebar, $chart_id ) {
83		- $chart = get_post( $chart_id );
84		- $data = $this->_getChartArray( $chart );
85		- $sidebar = '';
86		- $sidebar_class = $this->load_chart_class_name( $chart_id );
87		- if ( class_exists( $sidebar_class, true ) ) {
88		- $sidebar = new $sidebar_class( $data['settings'] );
89		- $sidebar->__series = $data['series'];
90		- $sidebar->__data = $data['data'];
91		- } else {
92		- $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
93		- if ( $sidebar !== '' ) {
94		- $sidebar->__series = $data['series'];
95		- $sidebar->__data = $data['data'];
96		- }
97		- }
98		- return str_replace( "'", '"', $sidebar->__toString() );
99		- }
100		-
101		- /**
102	75	* Sets the schedule for how JSON-endpoint charts should be updated.
103	76	*
104	77	* @since ?
105	78	*
		@@ -133,30 +106,12 @@
133	106	),
134	107	)
135	108	);
136	109
137		- if ( Visualizer_Module::is_pro() ) {
138		- $is_woocommerce_report = filter_input(
139		- INPUT_POST,
140		- 'is_woocommerce_report',
141		- FILTER_VALIDATE_BOOLEAN
142		- );
143		-
144		- if ( $is_woocommerce_report ) {
145		- update_post_meta( $chart_id, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE, true );
146		- } else {
147		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE );
148		- }
149		- }
150		-
151	110	delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
152	111
153	112	if ( -1 < $time ) {
154	113	add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
155		- // Update schedules.
156		- $schedules = get_option( Visualizer_Plugin::CF_JSON_SCHEDULE, array() );
157		- $schedules[ $chart_id ] = time() + $time * HOUR_IN_SECONDS;
158		- update_option( Visualizer_Plugin::CF_JSON_SCHEDULE, $schedules );
159	114	}
160	115	wp_send_json_success();
161	116	}
162	117
		@@ -169,12 +124,8 @@
169	124	*/
170	125	public function getJsonRoots() {
171	126	check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION, 'security' );
172	127
173		- if ( ! current_user_can( 'edit_posts' ) ) {
174		- wp_send_json_error( array( 'msg' => esc_html__( 'You do not have permission to perform this action.', 'visualizer' ) ) );
175		- }
176		-
177	128	$params = wp_parse_args( $_POST['params'] );
178	129
179	130	$source = new Visualizer_Source_Json( $params );
180	131
		@@ -179,9 +130,9 @@
179	130	$source = new Visualizer_Source_Json( $params );
180	131
181	132	$roots = $source->fetchRoots();
182	133	if ( empty( $roots ) ) {
183		- wp_send_json_error( array( 'msg' => $source->get_error() ) );
	134	+ wp_send_json_error();
184	135	}
185	136
186	137	wp_send_json_success( array( 'url' => $params['url'], 'roots' => $roots ) );
187	138	}
		@@ -195,12 +146,8 @@
195	146	*/
196	147	public function getJsonData() {
197	148	check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION, 'security' );
198	149
199		- if ( ! current_user_can( 'edit_posts' ) ) {
200		- wp_send_json_error( array( 'msg' => esc_html__( 'You do not have permission to perform this action.', 'visualizer' ) ) );
201		- }
202		-
203	150	$params = wp_parse_args( $_POST['params'] );
204	151
205	152	$chart_id = $params['chart'];
206	153
		@@ -208,13 +155,12 @@
208	155	wp_die();
209	156	}
210	157
211	158	$source = new Visualizer_Source_Json( $params );
212		- $source->fetch();
213		- $data = $source->getRawData();
214	159
	160	+ $data = $source->parse();
215	161	if ( empty( $data ) ) {
216		- wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
	162	+ wp_send_json_error();
217	163	}
218	164
219	165	$data = Visualizer_Render_Layout::show( 'editor-table', $data, $chart_id, 'viz-json-table', false, false );
220	166	wp_send_json_success( array( 'table' => $data, 'root' => $params['root'], 'url' => $params['url'], 'paging' => $source->getPaginationElements() ) );
		@@ -239,12 +185,11 @@
239	185
240	186	$chart = get_post( $chart_id );
241	187
242	188	$source = new Visualizer_Source_Json( $params );
243		- update_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true );
244		- $source->fetchFromEditableTable();
	189	+ $source->fetch();
245	190
246		- $content = $source->getData( get_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
	191	+ $content = $source->getData();
247	192	$chart->post_content = $content;
248	193	wp_update_post( $chart->to_array() );
249	194	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
250	195	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
		@@ -250,62 +195,20 @@
250	195	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
251	196	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
252	197	update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_URL, $params['url'] );
253	198	update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_ROOT, $params['root'] );
254		-
255		- delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_HEADERS );
256		- $headers = array( 'method' => $params['method'] );
257		- if ( ! empty( $params['auth'] ) ) {
258		- $headers['auth'] = $params['auth'];
259		- } elseif ( ! empty( $params['username'] ) && ! empty( $params['password'] ) ) {
260		- $headers['auth'] = array( 'username' => $params['username'], 'password' => $params['password'] );
261		- }
262		-
263		- add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_HEADERS, $headers );
264		-
265	199	delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING );
266	200	if ( ! empty( $params['paging'] ) ) {
267	201	add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING, $params['paging'] );
268	202	}
269	203
270		- if ( Visualizer_Module::is_pro() ) {
271		- if ( ! empty( $params['vz_woo_source'] ) ) {
272		- update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_WOOCOMMERCE_SOURCE, $params['vz_woo_source'] );
273		- } else {
274		- delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_WOOCOMMERCE_SOURCE );
275		- }
276		- }
277		-
278		- $time = filter_input(
279		- INPUT_POST,
280		- 'time',
281		- FILTER_VALIDATE_INT,
282		- array(
283		- 'options' => array(
284		- 'min_range' => -1,
285		- ),
286		- )
287		- );
288		-
289		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
290		-
291		- if ( -1 < $time ) {
292		- add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
293		- }
294		-
295		- // delete other source specific parameters.
296		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
297		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
298		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_URL );
299		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE );
300		-
301	204	$render = new Visualizer_Render_Page_Update();
302	205	$render->id = $chart->ID;
303		- $render->data = json_encode( $source->getRawData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
	206	+ $render->data = json_encode( $source->getRawData() );
304	207	$render->series = json_encode( $source->getSeries() );
305	208	$render->render();
306	209
307		- ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
	210	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
308	211	}
309	212
310	213
311	214	/**
		@@ -381,19 +284,19 @@
381	284	* @since 1.0.0
382	285	*
383	286	* @access private
384	287	*
385		- * @param WP_Post|null $chart The chart object.
	288	+ * @param WP_Post $chart The chart object.
386	289	*
387	290	* @return array The array of chart data.
388	291	*/
389		- private function _getChartArray( $chart = null ) {
	292	+ private function _getChartArray( WP_Post $chart = null ) {
390	293	if ( is_null( $chart ) ) {
391	294	$chart = $this->_chart;
392	295	}
393	296	$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
394	297	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
395		- $data = self::get_chart_data( $chart, $type );
	298	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
396	299	$library = $this->load_chart_type( $chart->ID );
397	300
398	301	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
399	302	$settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
		@@ -409,13 +312,8 @@
409	312	}
410	313
411	314	$date_formats = Visualizer_Source::get_date_formats_if_exists( $series, $data );
412	315
413		- $code = '';
414		- if ( 'd3' === $library ) {
415		- $code = get_post_meta( $chart->ID, Visualizer_Module_AIBuilder::CF_D3_CODE, true );
416		- }
417		-
418	316	return array(
419	317	'type' => $type,
420	318	'series' => $series,
421	319	'settings' => $settings,
		@@ -420,9 +318,8 @@
420	318	'series' => $series,
421	319	'settings' => $settings,
422	320	'data' => $data,
423	321	'library' => $library,
424		- 'code' => $code,
425	322	'css' => $css,
426	323	'date_formats' => $date_formats,
427	324	);
428	325	}
		@@ -439,9 +336,9 @@
439	336	public static function _sendResponse( $results ) {
440	337	header( 'Content-type: application/json' );
441	338	nocache_headers();
442	339	echo json_encode( $results );
443		- ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
	340	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
444	341	}
445	342
446	343	/**
447	344	* Deletes a chart from database.
		@@ -473,22 +370,9 @@
473	370	$success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
474	371	}
475	372	}
476	373	if ( $success ) {
477		- global $sitepress;
478		- if ( Visualizer_Module::is_pro() && ( function_exists( 'icl_get_languages' ) && $sitepress instanceof \SitePress ) ) {
479		- $trid = $sitepress->get_element_trid( $chart_id, 'post_' . Visualizer_Plugin::CPT_VISUALIZER );
480		- $translations = $sitepress->get_element_translations( $trid );
481		- if ( ! empty( $translations ) ) {
482		- foreach ( $translations as $translated_post ) {
483		- wp_delete_post( $translated_post->element_id, true );
484		- }
485		- } else {
486		- wp_delete_post( $chart_id, true );
487		- }
488		- } else {
489		- wp_delete_post( $chart_id, true );
490		- }
	374	+ wp_delete_post( $chart_id, true );
491	375	}
492	376	if ( $is_post ) {
493	377	self::_sendResponse(
494	378	array(
		@@ -495,9 +379,9 @@
495	379	'success' => $success,
496	380	)
497	381	);
498	382	}
499		- wp_redirect( remove_query_arg( 'vaction', wp_get_referer() ) );
	383	+ wp_redirect( wp_get_referer() );
500	384	exit;
501	385	}
502	386
503	387	/**
		@@ -536,123 +420,51 @@
536	420	*
537	421	* @access public
538	422	*/
539	423	public function renderChartPages() {
540		- if ( ! current_user_can( 'edit_posts' ) ) {
541		- wp_die( __( 'You do not have permission to access this page.', 'visualizer' ) );
542		- }
543		-
544	424	defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
545		- if ( ! defined( 'ET_BUILDER_PRODUCT_VERSION' ) && function_exists( 'et_get_theme_version' ) ) {
546		- define( 'ET_BUILDER_PRODUCT_VERSION', et_get_theme_version() );
547		- }
548		- // Set current screen for the render chart.
549		- set_current_screen( 'visualizer_render_chart' );
550	425	// check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
551	426	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
552		- if ( ! empty( $_POST ) ) {
553		- $_POST = map_deep( $_POST, 'wp_strip_all_tags' );
554		- }
555		- $chart = $chart_id ? get_post( $chart_id ) : null;
556		- if ( ! $chart_id || ! $chart || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
557		- if ( empty( $_GET['lang'] ) || empty( $_GET['parent_chart_id'] ) ) {
558		- $this->deleteOldCharts();
559		- $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
560		- $chart_status = Visualizer_Module_Admin::checkChartStatus( $default_type );
561		- if ( ! $chart_status ) {
562		- $default_type = 'line';
563		- }
564		- $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
565		- $source->fetch();
566		- $chart_id = wp_insert_post(
	427	+ if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
	428	+ $this->deleteOldCharts();
	429	+ $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
	430	+ $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
	431	+ $source->fetch();
	432	+ $chart_id = wp_insert_post(
	433	+ array(
	434	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	435	+ 'post_title' => 'Visualization',
	436	+ 'post_author' => get_current_user_id(),
	437	+ 'post_status' => 'auto-draft',
	438	+ 'post_content' => $source->getData(),
	439	+ )
	440	+ );
	441	+ if ( $chart_id && ! is_wp_error( $chart_id ) ) {
	442	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
	443	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
	444	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
	445	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	446	+ add_post_meta(
	447	+ $chart_id,
	448	+ Visualizer_Plugin::CF_SETTINGS,
567	449	array(
568		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
569		- 'post_title' => 'Visualization',
570		- 'post_author' => get_current_user_id(),
571		- 'post_status' => 'auto-draft',
572		- 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
	450	+ 'focusTarget' => 'datum',
573	451	)
574	452	);
575		- if ( $chart_id && ! is_wp_error( $chart_id ) ) {
576		- add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
577		- add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
578		- add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
579		- add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
580		- add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
581		- add_post_meta(
582		- $chart_id,
583		- Visualizer_Plugin::CF_SETTINGS,
584		- array(
585		- 'focusTarget' => 'datum',
586		- )
587		- );
588		-
589		- do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
590		- }
591		- } else {
592		- $parent_chart_id = filter_var( $_GET['parent_chart_id'], FILTER_VALIDATE_INT );
593		- $success = false;
594		- if ( $parent_chart_id ) {
595		- $parent_chart = get_post( $parent_chart_id );
596		- $success = $parent_chart && $parent_chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
597		- }
598		- if ( $success ) {
599		- $new_chart_id = wp_insert_post(
600		- array(
601		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
602		- 'post_title' => 'Visualization',
603		- 'post_author' => get_current_user_id(),
604		- 'post_status' => $parent_chart->post_status,
605		- 'post_content' => $parent_chart->post_content,
606		- )
607		- );
608		-
609		- if ( is_wp_error( $new_chart_id ) ) {
610		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Error while cloning chart %d = %s', $parent_chart_id, print_r( $new_chart_id, true ) ), 'error', __FILE__, __LINE__ );
611		- } else {
612		- $post_meta = get_post_meta( $parent_chart_id );
613		- $chart_id = $new_chart_id;
614		- foreach ( $post_meta as $key => $value ) {
615		- if ( strpos( $key, 'visualizer-' ) !== false ) {
616		- add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
617		- }
618		- }
619		- }
620		- }
621	453	do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
622	454	}
623		- wp_redirect( esc_url_raw( add_query_arg( 'chart', (int) $chart_id ) ) );
624		-
625		- if ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) {
626		- wp_die();
627		- }
628		- exit();
	455	+ wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
	456	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
629	457	}
630	458
631		- $_POST['save_chart_image'] = isset( $_POST['save_chart_image'] ) && 'yes' === $_POST['save_chart_image'] ? true : false;
632		- $_POST['lazy_load_chart'] = isset( $_POST['lazy_load_chart'] ) && 'yes' === $_POST['lazy_load_chart'] ? true : false;
	459	+ $this->load_chart_type( $chart_id );
633	460
634		- if ( isset( $_POST['chart-img'] ) && ! empty( $_POST['chart-img'] ) ) {
635		- $attachment_id = $this->save_chart_image( $_POST['chart-img'], $chart_id, $_POST['save_chart_image'] );
636		- if ( $attachment_id ) {
637		- update_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, $attachment_id );
638		- }
639		- }
640		- $lib = $this->load_chart_type( $chart_id );
641		-
642		- // the alpha color picker (RGBA) is not supported by google.
643		- $color_picker_dep = 'wp-color-picker';
644		- if ( in_array( $lib, array( 'chartjs', 'datatables' ), true ) && ! wp_script_is( 'wp-color-picker-alpha', 'registered' ) ) {
645		- wp_register_script( 'wp-color-picker-alpha', VISUALIZER_ABSURL . 'js/lib/wp-color-picker-alpha.min.js', array( 'wp-color-picker' ), Visualizer_Plugin::VERSION );
646		- $color_picker_dep = 'wp-color-picker-alpha';
647		- }
648		-
649	461	// enqueue and register scripts and styles
650	462	wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
651	463	wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
652	464
653	465	wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
654		- wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion', 'jquery-ui-tabs' ), Visualizer_Plugin::VERSION, true );
	466	+ wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion' ), Visualizer_Plugin::VERSION, true );
655	467	wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
656	468	wp_register_script(
657	469	'visualizer-render',
658	470	VISUALIZER_ABSURL . 'js/render-facade.js',
		@@ -663,9 +475,9 @@
663	475	wp_register_script(
664	476	'visualizer-preview',
665	477	VISUALIZER_ABSURL . 'js/preview.js',
666	478	array(
667		- $color_picker_dep,
	479	+ 'wp-color-picker',
668	480	'visualizer-render',
669	481	),
670	482	Visualizer_Plugin::VERSION,
671	483	true
		@@ -671,11 +483,10 @@
671	483	true
672	484	);
673	485	wp_register_script( 'visualizer-editor-simple', VISUALIZER_ABSURL . 'js/simple-editor.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
674	486
675		- do_action( 'visualizer_add_scripts' );
676		-
677		- if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
	487	+ // added by Ash/Upwork
	488	+ if ( VISUALIZER_PRO ) {
678	489	global $Visualizer_Pro;
679	490	$Visualizer_Pro->_addScriptsAndStyles();
680	491	}
681	492
		@@ -691,9 +502,8 @@
691	502	if ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) {
692	503	// if the cancel button is clicked.
693	504	$this->undoRevisions( $chart_id, true );
694	505	} elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
695		- $this->handlePermissions();
696	506	// if the save button is clicked.
697	507	$this->undoRevisions( $chart_id, false );
698	508	} else {
699	509	// if the edit button is clicked.
		@@ -699,16 +509,8 @@
699	509	// if the edit button is clicked.
700	510	$this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart );
701	511	}
702	512
703		- // Clear existing chart cache.
704		- if ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
705		- $cache_key = Visualizer_Plugin::CF_CHART_CACHE . '_' . $chart_id;
706		- if ( get_transient( $cache_key ) ) {
707		- delete_transient( $cache_key );
708		- }
709		- }
710		-
711	513	switch ( $tab ) {
712	514	case 'settings':
713	515	$this->_handleDataAndSettingsPage();
714	516	break;
		@@ -716,34 +518,34 @@
716	518	case 'visualizer': // fall through.
717	519	$this->_handleTypesPage();
718	520	break;
719	521	default:
720		- // this should never happen.
	522	+ do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
721	523	break;
722	524	}
723		- ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
	525	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
724	526	}
725	527
726	528	/**
727	529	* Load code editor assets.
728	530	*/
729		- private function loadCodeEditorAssets( $chart_id ) {
	531	+ private function loadCodeEditorAssets() {
730	532	global $wp_version;
731	533
732	534	$wp_scripts = wp_scripts();
733	535
734	536	// data tables assets.
735		- wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
736		- wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION );
737		- wp_register_style( 'visualizer-jquery-ui', sprintf( '//code.jquery.com/ui/%s/themes/smoothness/jquery-ui.css', $wp_scripts->registered['jquery-ui-core']->ver ), array( 'visualizer-datatables' ), Visualizer_Plugin::VERSION );
	537	+ wp_register_script( 'visualizer-datatables', '//cdn.datatables.net/v/dt/dt-1.10.18/b-1.5.6/b-colvis-1.5.6/cr-1.5.0/fc-3.2.5/fh-3.1.4/r-2.2.2/sc-2.0.0/sl-1.3.0/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
	538	+ wp_register_style( 'visualizer-datatables', '//cdn.datatables.net/v/dt/dt-1.10.18/b-1.5.6/b-colvis-1.5.6/cr-1.5.0/fc-3.2.5/fh-3.1.4/r-2.2.2/sc-2.0.0/sl-1.3.0/datatables.min.css', array(), Visualizer_Plugin::VERSION );
	539	+ wp_register_style( 'visualizer-jquery-ui', sprintf( '//ajax.googleapis.com/ajax/libs/jqueryui/%s/themes/smoothness/jquery-ui.css', $wp_scripts->registered['jquery-ui-core']->ver ), array( 'visualizer-datatables' ), Visualizer_Plugin::VERSION );
738	540	wp_enqueue_script( 'visualizer-datatables' );
739	541	wp_enqueue_style( 'visualizer-jquery-ui' );
740	542
741		- if ( ! Visualizer_Module::is_pro() ) {
	543	+ if ( ! VISUALIZER_PRO ) {
742	544	return;
743	545	}
744	546
745		- $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( $chart_id );
	547	+ $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping();
746	548
747	549	if ( version_compare( $wp_version, '4.9.0', '<' ) ) {
748	550	// code mirror assets.
749	551	wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
		@@ -751,9 +553,9 @@
751	553	wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
752	554	wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
753	555	wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
754	556	wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
755		- 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 );
	557	+ 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 );
756	558	wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION );
757	559	wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
758	560
759	561	wp_enqueue_script( 'visualizer-codemirror-hint' );
		@@ -767,9 +569,9 @@
767	569	'lineWrapping' => true,
768	570	'dragDrop' => false,
769	571	'matchBrackets' => true,
770	572	'autoCloseBrackets' => true,
771		- 'extraKeys' => array( 'Shift-Space' => 'autocomplete' ),
	573	+ 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ),
772	574	'hintOptions' => array( 'tables' => $table_col_mapping ),
773	575	),
774	576	)
775	577	);
		@@ -778,25 +580,8 @@
778	580	return $table_col_mapping;
779	581	}
780	582
781	583	/**
782		- * Handle permissions from the new conslidated settings sidebar.
783		- */
784		- private function handlePermissions() {
785		- if ( ! Visualizer_Module::is_pro() ) {
786		- return;
787		- }
788		-
789		- // we will not support old free and new pro.
790		- // handling new free and old pro.
791		- if ( has_action( 'visualizer_pro_handle_tab' ) ) {
792		- do_action( 'visualizer_pro_handle_tab', 'permissions', $this->_chart );
793		- } else {
794		- do_action( 'visualizer_handle_permissions', $this->_chart );
795		- }
796		- }
797		-
798		- /**
799	584	* Handle data and settings page
800	585	*/
801	586	private function _handleDataAndSettingsPage() {
802	587	if ( isset( $_POST['map_api_key'] ) ) {
		@@ -801,61 +586,30 @@
801	586	private function _handleDataAndSettingsPage() {
802	587	if ( isset( $_POST['map_api_key'] ) ) {
803	588	update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
804	589	}
805		-
806	590	if ( $_SERVER['REQUEST_METHOD'] === 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
807		- $is_canceled = isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] );
808		- $is_newly_created = $this->_chart->post_status === 'auto-draft';
809		-
810		- if ( $is_newly_created && ! $is_canceled ) {
	591	+ if ( $this->_chart->post_status === 'auto-draft' ) {
811	592	$this->_chart->post_status = 'publish';
812	593
813	594	// 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.
814	595	// we do not want any difference in data so disable revisions temporarily.
815		- $this->disableRevisionsTemporarily();
816		-
	596	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
817	597	wp_update_post( $this->_chart->to_array() );
818	598	}
819	599	// save meta data only when it is NOT being canceled.
820		- if ( ! $is_canceled ) {
821		- $post_settings = $_POST;
822		- $existing = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
823		- if ( isset( $existing['colors'] ) && is_array( $existing['colors'] ) && ! isset( $post_settings['colors'] ) ) {
824		- $post_settings['colors'] = $existing['colors'];
825		- }
826		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $post_settings );
827		-
828		- // we will keep a parameter called 'internal_title' that will be set to the given title or, if empty, the chart ID
829		- // this will help in searching with the chart id.
830		- $settings = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
831		- $title = null;
832		- if ( isset( $settings['title'] ) && ! empty( $settings['title'] ) ) {
833		- $title = $settings['title'];
834		- if ( is_array( $title ) ) {
835		- $title = $settings['title']['text'];
836		- }
837		- }
838		- if ( empty( $title ) ) {
839		- $title = $this->_chart->ID;
840		- }
841		- $settings['internal_title'] = $title;
842		- $settings_label = isset( $settings['pieResidueSliceLabel'] ) ? $settings['pieResidueSliceLabel'] : '';
843		- if ( empty( $settings_label ) ) {
844		- $settings['pieResidueSliceLabel'] = esc_html__( 'Other', 'visualizer' );
845		- } else {
846		- $settings['pieResidueSliceLabel'] = $settings_label;
847		- }
848		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
	600	+ if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
	601	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
849	602	}
850	603	$render = new Visualizer_Render_Page_Send();
851	604	$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
852	605	wp_iframe( array( $render, 'render' ) );
	606	+
853	607	return;
854	608	}
855	609	$data = $this->_getChartArray();
856	610	$sidebar = '';
857		- $sidebar_class = $this->load_chart_class_name( $this->_chart->ID );
	611	+ $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
858	612	if ( class_exists( $sidebar_class, true ) ) {
859	613	$sidebar = new $sidebar_class( $data['settings'] );
860	614	$sidebar->__series = $data['series'];
861	615	$sidebar->__data = $data['data'];
		@@ -865,17 +619,16 @@
865	619	$sidebar->__series = $data['series'];
866	620	$sidebar->__data = $data['data'];
867	621	}
868	622	}
869		- unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
	623	+ unset( $data['settings']['width'], $data['settings']['height'] );
870	624	wp_enqueue_style( 'wp-color-picker' );
871	625	wp_enqueue_style( 'visualizer-frame' );
872	626	wp_enqueue_script( 'visualizer-preview' );
873	627	wp_enqueue_script( 'visualizer-chosen' );
874	628	wp_enqueue_script( 'visualizer-render' );
875		- wp_enqueue_code_editor( array( 'type' => 'application/json' ) );
876	629
877		- if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
	630	+ if ( ! VISUALIZER_PRO ) {
878	631	wp_enqueue_script( 'visualizer-editor-simple' );
879	632	wp_localize_script(
880	633	'visualizer-editor-simple',
881	634	'visualizer1',
		@@ -881,16 +634,18 @@
881	634	'visualizer1',
882	635	array(
883	636	'ajax' => array(
884	637	'url' => admin_url( 'admin-ajax.php' ),
885		- 'nonces' => array(),
886		- 'actions' => array(),
	638	+ 'nonces' => array(
	639	+ ),
	640	+ 'actions' => array(
	641	+ ),
887	642	),
888	643	)
889	644	);
890	645	}
891	646
892		- $table_col_mapping = $this->loadCodeEditorAssets( $this->_chart->ID );
	647	+ $table_col_mapping = $this->loadCodeEditorAssets();
893	648
894	649	wp_localize_script(
895	650	'visualizer-render',
896	651	'visualizer',
		@@ -895,15 +650,11 @@
895	650	'visualizer-render',
896	651	'visualizer',
897	652	array(
898	653	'l10n' => array(
899		- 'invalid_source' => esc_html__( 'The URL you entered is invalid. Please enter a valid URL.', 'visualizer' ),
900		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
901		- 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
902		- 'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
903		- 'save_settings' => __( 'You have modified the chart\'s settings. To modify the source/data again, you must save this chart and reopen it for editing. If you continue without saving the chart, you may lose your changes.', 'visualizer' ),
904		- 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
905		- 'invalid_format' => esc_html__( 'This format pattern is not supported in the series settings field. Use the Manual Configuration option instead.', 'visualizer' ),
	654	+ 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
	655	+ 'loading' => esc_html__( 'Loading...', 'visualizer' ),
	656	+ 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
906	657	),
907	658	'charts' => array(
908	659	'canvas' => $data,
909	660	'id' => $this->_chart->ID,
		@@ -929,14 +680,13 @@
929	680	),
930	681	'db_query' => array(
931	682	'tables' => $table_col_mapping,
932	683	),
933		- 'is_pro' => Visualizer_Module::is_pro(),
	684	+ 'is_pro' => VISUALIZER_PRO,
934	685	'page_type' => 'chart',
935	686	'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR,
936	687	'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW,
937	688	'is_front' => false,
938		- 'rest_base' => get_rest_url( null, 'wc/v3/reports/' ),
939	689	)
940	690	);
941	691
942	692	$render = new Visualizer_Render_Page_Data();
		@@ -947,21 +697,18 @@
947	697	if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
948	698	$render->button = filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART
949	699	? esc_html__( 'Save Chart', 'visualizer' )
950	700	: esc_html__( 'Create Chart', 'visualizer' );
951		-
952		- $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
	701	+ if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) {
	702	+ $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
	703	+ }
953	704	} else {
954	705	$render->button = esc_attr__( 'Insert Chart', 'visualizer' );
955	706	}
956		-
957		- do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
958		-
959		- if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
	707	+ if ( VISUALIZER_PRO ) {
960	708	global $Visualizer_Pro;
961		- $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
	709	+ $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
962	710	}
963		-
964	711	$this->_addAction( 'admin_head', 'renderFlattrScript' );
965	712	wp_iframe( array( $render, 'render' ) );
966	713	}
967	714
		@@ -973,35 +720,24 @@
973	720	* @access private
974	721	*/
975	722	private function _handleTypesPage() {
976	723	// process post request
977		- if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ), 'visualizer-upload-data' ) ) {
	724	+ if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
978	725	$type = filter_input( INPUT_POST, 'type' );
979		- $library = filter_input( INPUT_POST, 'chart-library' );
980		- if ( Visualizer_Module_Admin::checkChartStatus( $type ) ) {
981		- if ( empty( $library ) ) {
982		- // library cannot be empty.
983		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Chart library empty while creating the chart! Aborting...', 'error', __FILE__, __LINE__ );
984		- return;
985		- }
986		-
	726	+ if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
987	727	// save new chart type
988	728	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
989		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, $library );
990	729	// if the chart has default data, update it with appropriate default data for new type
991	730	if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
992	731	$source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
993	732	$source->fetch();
994		- $this->_chart->post_content = $source->getData( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
	733	+ $this->_chart->post_content = $source->getData();
995	734	wp_update_post( $this->_chart->to_array() );
996	735	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
997	736	}
998		-
999		- Visualizer_Module_Utility::set_defaults( $this->_chart );
1000		-
1001	737	// redirect to next tab
1002	738	// changed by Ash/Upwork
1003		- wp_redirect( esc_url_raw( add_query_arg( 'tab', 'settings' ) ) );
	739	+ wp_redirect( add_query_arg( 'tab', 'settings' ) );
1004	740
1005	741	return;
1006	742	}
1007	743	}
		@@ -1006,9 +742,9 @@
1006	742	}
1007	743	}
1008	744	$render = new Visualizer_Render_Page_Types();
1009	745	$render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
1010		- $render->types = Visualizer_Module_Admin::_getChartTypesLocalized( false, false, false, 'types' );
	746	+ $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
1011	747	$render->chart = $this->_chart;
1012	748	wp_enqueue_style( 'visualizer-frame' );
1013	749	wp_enqueue_script( 'visualizer-frame' );
1014	750	wp_iframe( array( $render, 'render' ) );
		@@ -1030,123 +766,28 @@
1030	766	* Processes the CSV that is sent in the request as a string.
1031	767	*
1032	768	* @since 3.2.0
1033	769	*/
1034		- /**
1035		- * Determines whether a remote URL serves an XLSX file.
1036		- *
1037		- * Used as a fallback when the URL path has no recognisable file extension
1038		- * (e.g. SharePoint, signed S3 URLs, or "download?id=…" endpoints).
1039		- *
1040		- * Uses wp_safe_remote_get() to block requests to private/loopback addresses,
1041		- * and streams the response to a temp file so no body data is held in memory
1042		- * regardless of whether the server honours the Range header.
1043		- *
1044		- * The check relies on the ZIP magic number (PK\x03\x04) that every XLSX
1045		- * file begins with, making it immune to misleading Content-Type headers
1046		- * such as application/octet-stream. Content-Type is used as a last-resort
1047		- * fallback only when the temp file is empty (e.g. a HEAD-only server).
1048		- *
1049		- * @access private
1050		- * @param string $url The remote URL to probe.
1051		- * @return bool TRUE if the file appears to be XLSX, FALSE otherwise.
1052		- */
1053		- private static function _url_is_xlsx( $url ) {
1054		- $tmpfile = wp_tempnam( 'visualizer_xlsx_probe' );
1055		- if ( ! $tmpfile ) {
1056		- return false;
1057		- }
1058		-
1059		- $response = wp_safe_remote_get(
1060		- $url,
1061		- array(
1062		- 'timeout' => 10,
1063		- 'user-agent' => 'WordPress/' . get_bloginfo( 'version' ),
1064		- 'headers' => array( 'Range' => 'bytes=0-3' ),
1065		- 'stream' => true,
1066		- 'filename' => $tmpfile,
1067		- )
1068		- );
1069		-
1070		- if ( is_wp_error( $response ) ) {
1071		- @unlink( $tmpfile ); // phpcs:ignore WordPress.PHP.NoSilencedErrors
1072		- return false;
1073		- }
1074		-
1075		- $magic = '';
1076		- // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fopen
1077		- $fh = @fopen( $tmpfile, 'rb' ); // phpcs:ignore WordPress.PHP.NoSilencedErrors
1078		- if ( $fh ) {
1079		- $magic = fread( $fh, 4 ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fread
1080		- fclose( $fh ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fclose
1081		- }
1082		- @unlink( $tmpfile ); // phpcs:ignore WordPress.PHP.NoSilencedErrors
1083		-
1084		- if ( strlen( $magic ) >= 4 ) {
1085		- // XLSX (and all ZIP-based Office formats) start with PK\x03\x04.
1086		- return $magic === "PK\x03\x04";
1087		- }
1088		-
1089		- // Last resort: server returned an empty body (e.g. ignored Range and
1090		- // returned only headers). Check Content-Type from the same response.
1091		- // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
1092		- return false !== strpos(
1093		- wp_remote_retrieve_header( $response, 'content-type' ),
1094		- 'spreadsheetml'
1095		- );
1096		- }
1097		-
1098		- /**
1099		- * Parses a raw CSV string or editor payload and returns a source object.
1100		- *
1101		- * @access private
1102		- * @param string $data The raw CSV data string.
1103		- * @param string $editor_type The editor type ('text' or 'tabular').
1104		- * @return Visualizer_Source|null The populated source object, or null on failure.
1105		- */
1106		- private function handleCSVasString( $data, $editor_type ) {
	770	+ private function handleCSVasString( $data ) {
1107	771	$source = null;
1108		-
1109		- switch ( $editor_type ) {
1110		- case 'text':
1111		- // data coming in from the text editor.
1112		- $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
1113		- $handle = fopen( $tmpfile, 'w' );
1114		- $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) );
1115		- if ( $values ) {
1116		- foreach ( $values as $row ) {
1117		- if ( empty( $row ) ) {
1118		- continue;
1119		- }
1120		- $row = explode( ',', $row );
1121		- $row = array_map(
1122		- function ( $r ) {
1123		- return '' === $r ? ' ' : $r;
1124		- },
1125		- $row
1126		- );
1127		- $row = implode( ',', $row );
1128		- // don't use fpucsv here because we need to just dump the data
1129		- // minus the empty rows
1130		- // because fputcsv needs to tokenize
1131		- // we can standardize the CSV enclosure here and replace all ' with "
1132		- // we can assume that if there are an even number of ' they should be changed to "
1133		- // but that will screw up words like fo'c'sle
1134		- // so here let's just assume ' will NOT be used for enclosures
1135		- fwrite( $handle, $row );
1136		- fwrite( $handle, PHP_EOL );
	772	+ if ( VISUALIZER_PRO ) {
	773	+ $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );
	774	+ } else {
	775	+ // data coming in from the text editor.
	776	+ $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
	777	+ $handle = fopen( $tmpfile, 'w' );
	778	+ $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) );
	779	+ if ( $values ) {
	780	+ foreach ( $values as $row ) {
	781	+ if ( empty( $row ) ) {
	782	+ continue;
1137	783	}
	784	+ $columns = explode( ',', $row );
	785	+ fputcsv( $handle, $columns );
1138	786	}
1139		- $source = new Visualizer_Source_Csv( $tmpfile );
1140		- fclose( $handle );
1141		- break;
1142		- case 'table':
1143		- // Import from Chart
1144		- // fall-through.
1145		- case 'excel':
1146		- // data coming in from the excel editor.
1147		- $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );
1148		- break;
	787	+ }
	788	+ $source = new Visualizer_Source_Csv( $tmpfile );
	789	+ fclose( $handle );
1149	790	}
1150	791	return $source;
1151	792	}
1152	793
		@@ -1169,9 +810,9 @@
1169	810	foreach ( $types as $type ) {
1170	811	if ( empty( $type ) ) {
1171	812	$exclude[] = $index;
1172	813	}
1173		- ++$index;
	814	+ $index++;
1174	815	}
1175	816
1176	817	// when N headers are being renamed, the number of headers increases by N
1177	818	// because of the way datatable duplicates header information
		@@ -1195,9 +836,9 @@
1195	836	$csv[] = $types;
1196	837	for ( $j = 0; $j < count( $columns[0] ); $j++ ) {
1197	838	$row = array();
1198	839	for ( $i = 0; $i < count( $headers ); $i++ ) {
1199		- $row[] = sanitize_text_field( $columns[ $i ][ $j ] );
	840	+ $row[] = $columns[ $i ][ $j ];
1200	841	}
1201	842	$csv[] = $row;
1202	843	}
1203	844
		@@ -1231,13 +872,9 @@
1231	872	// otherwise, assume this is a normal web request.
1232	873	$can_die = ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE );
1233	874
1234	875	// validate nonce
1235		- if (
1236		- ! isset( $_GET['nonce'] ) ||
1237		- ! wp_verify_nonce( $_GET['nonce'], 'visualizer-upload-data' ) ||
1238		- ! current_user_can( 'edit_posts' )
1239		- ) {
	876	+ if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {
1240	877	if ( ! $can_die ) {
1241	878	return;
1242	879	}
1243	880	status_header( 403 );
		@@ -1246,15 +883,9 @@
1246	883
1247	884	// check chart, if chart exists
1248	885	// do not use filter_input as it does not work for phpunit test cases, use filter_var instead
1249	886	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
1250		- $chart = $chart_id ? get_post( $chart_id ) : null;
1251		- if (
1252		- ! $chart_id ||
1253		- ! $chart ||
1254		- $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ||
1255		- ! current_user_can( 'edit_post', $chart_id )
1256		- ) {
	887	+ if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
1257	888	if ( ! $can_die ) {
1258	889	return;
1259	890	}
1260	891	status_header( 400 );
		@@ -1260,10 +891,8 @@
1260	891	status_header( 400 );
1261	892	exit;
1262	893	}
1263	894
1264		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Uploading data for chart %d with POST = %s and GET = %s', $chart_id, print_r( $_POST, true ), print_r( $_GET, true ) ), 'debug', __FILE__, __LINE__ );
1265		-
1266	895	if ( ! isset( $_POST['vz-import-time'] ) ) {
1267	896	apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
1268	897	}
1269	898
		@@ -1275,9 +904,8 @@
1275	904
1276	905	// delete "import from db" specific parameters.
1277	906	delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
1278	907	delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
1279		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS );
1280	908	}
1281	909
1282	910	// delete json related data.
1283	911	delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL );
		@@ -1282,60 +910,29 @@
1282	910	// delete json related data.
1283	911	delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL );
1284	912	delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT );
1285	913	delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING );
1286		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_HEADERS );
1287	914
1288		- // delete last error
1289		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
1290		-
1291		- // delete editor related data.
1292		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR );
1293		-
1294		- // delete this so that a JSON import can be later edited manually without a problem.
1295		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE );
1296		-
1297	915	$source = null;
1298	916	$render = new Visualizer_Render_Page_Update();
1299		-
1300		- $remote_data = false;
1301		- if ( isset( $_POST['remote_data'] ) && function_exists( 'wp_http_validate_url' ) ) {
1302		- $remote_data = wp_http_validate_url( $_POST['remote_data'] );
1303		- }
1304		- if ( false !== $remote_data ) {
1305		- $remote_ext = strtolower( pathinfo( parse_url( $remote_data, PHP_URL_PATH ), PATHINFO_EXTENSION ) );
1306		- if ( 'xlsx' === $remote_ext || ( 'csv' !== $remote_ext && self::_url_is_xlsx( $remote_data ) ) ) {
1307		- $source = new Visualizer_Source_Xlsx_Remote( $remote_data );
1308		- } else {
1309		- $source = new Visualizer_Source_Csv_Remote( $remote_data );
1310		- }
	917	+ if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
	918	+ $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
1311	919	if ( isset( $_POST['vz-import-time'] ) ) {
1312		- apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $remote_data, $_POST['vz-import-time'] );
	920	+ apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
1313	921	}
1314		- } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] === 0 ) {
1315		- $local_ext = strtolower( pathinfo( isset( $_FILES['local_data']['name'] ) ? $_FILES['local_data']['name'] : '', PATHINFO_EXTENSION ) );
1316		- if ( 'xlsx' === $local_ext ) {
1317		- $source = new Visualizer_Source_Xlsx( $_FILES['local_data']['tmp_name'] );
1318		- } else {
1319		- $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
1320		- }
	922	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
	923	+ } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
	924	+ $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
1321	925	} elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
1322		- $source = $this->handleCSVasString( $_POST['chart_data'], $_POST['editor-type'] );
1323		- update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
	926	+ $source = $this->handleCSVasString( $_POST['chart_data'] );
1324	927	} elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) {
1325	928	$source = $this->handleTabularData();
1326		- update_post_meta( $chart_id, Visualizer_Plugin::CF_EDITOR, $_POST['editor-type'] );
1327	929	} else {
1328		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'CSV file with chart data was not uploaded for chart %d.', $chart_id ), 'error', __FILE__, __LINE__ );
1329		- $render->message = esc_html__( 'No CSV file was received. Select a file and try uploading again.', 'visualizer' );
1330		- update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, esc_html__( 'No CSV file was received. Select a file and try uploading again.', 'visualizer' ) );
	930	+ $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
1331	931	}
1332		-
1333		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Uploaded data for chart %d with source %s', $chart_id, print_r( $source, true ) ), 'debug', __FILE__, __LINE__ );
1334		-
1335	932	if ( $source ) {
1336	933	if ( $source->fetch() ) {
1337		- $content = $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) );
	934	+ $content = $source->getData();
1338	935	$populate = true;
1339	936	if ( is_string( $content ) && is_array( unserialize( $content ) ) ) {
1340	937	$json = unserialize( $content );
1341	938	// if source exists, so should data. if source exists but data is blank, do not populate the chart.
		@@ -1341,9 +938,8 @@
1341	938	// if source exists, so should data. if source exists but data is blank, do not populate the chart.
1342	939	// if we populate the data even if it is empty, the chart will show "Table has no columns".
1343	940	if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) {
1344	941	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__ );
1345		- update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, sprintf( 'Not populating chart data as source exists (%s) but data is empty!', $json['source'] ) );
1346	942	$populate = false;
1347	943	}
1348	944	}
1349	945	if ( $populate ) {
		@@ -1349,49 +945,23 @@
1349	945	if ( $populate ) {
1350	946	$chart->post_content = $content;
1351	947	}
1352	948	wp_update_post( $chart->to_array() );
1353		-
1354	949	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
1355	950	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
1356	951	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1357		-
1358		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Updated post for chart %d', $chart_id ), 'debug', __FILE__, __LINE__ );
1359		-
1360		- Visualizer_Module_Utility::set_defaults( $chart, null );
1361		-
1362		- $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
1363		- if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $source->getSeries() ) > 1 ) ) {
1364		- $diff_total_series = abs( count( $settings['series'] ) - count( $source->getSeries() ) );
1365		- if ( $diff_total_series ) {
1366		- foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) {
1367		- $settings['series'][] = end( $settings['series'] );
1368		- }
1369		- update_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
1370		- }
1371		- }
1372		-
1373	952	$render->id = $chart->ID;
1374		- $render->data = json_encode( $source->getRawData( get_post_meta( $chart->ID, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
	953	+ $render->data = json_encode( $source->getRawData() );
1375	954	$render->series = json_encode( $source->getSeries() );
1376		- $render->settings = json_encode( $settings );
1377	955	} else {
1378		- $error = $source->get_error();
1379		- if ( empty( $error ) ) {
1380		- $error = esc_html__( 'The CSV file couldn\'t be read. Check that it\'s properly formatted and try again.', 'visualizer' );
1381		- }
1382		- $render->message = $error;
1383		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( '%s for chart %d.', $error, $chart_id ), 'error', __FILE__, __LINE__ );
1384		- update_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, $error );
	956	+ $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
1385	957	}
1386		- } else {
1387		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unknown internal error for chart %d.', $chart_id ), 'error', __FILE__, __LINE__ );
1388	958	}
1389	959	$render->render();
1390	960	if ( ! $can_die ) {
1391	961	return;
1392	962	}
1393		- ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
	963	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1394	964	}
1395	965
1396	966	/**
1397	967	* Clones the chart.
		@@ -1401,18 +971,27 @@
1401	971	* @access public
1402	972	*/
1403	973	public function cloneChart() {
1404	974	$chart_id = $success = false;
1405		- $nonce = isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'], Visualizer_Plugin::ACTION_CLONE_CHART );
	975	+ $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
1406	976	$capable = current_user_can( 'edit_posts' );
1407	977	if ( $nonce && $capable ) {
1408		- $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
	978	+ $chart_id = filter_input(
	979	+ INPUT_GET,
	980	+ 'chart',
	981	+ FILTER_VALIDATE_INT,
	982	+ array(
	983	+ 'options' => array(
	984	+ 'min_range' => 1,
	985	+ ),
	986	+ )
	987	+ );
1409	988	if ( $chart_id ) {
1410	989	$chart = get_post( $chart_id );
1411	990	$success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
1412	991	}
1413	992	}
1414		- $redirect = remove_query_arg( 'vaction', wp_get_referer() );
	993	+ $redirect = wp_get_referer();
1415	994	if ( $success ) {
1416	995	$new_chart_id = wp_insert_post(
1417	996	array(
1418	997	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
		@@ -1421,35 +1000,23 @@
1421	1000	'post_status' => $chart->post_status,
1422	1001	'post_content' => $chart->post_content,
1423	1002	)
1424	1003	);
1425		- if ( is_wp_error( $new_chart_id ) ) {
1426		- do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Error while cloning chart %d = %s', $chart_id, print_r( $new_chart_id, true ) ), 'error', __FILE__, __LINE__ );
1427		- } else {
1428		- $post_meta = get_post_meta( $chart_id );
1429		- foreach ( $post_meta as $key => $value ) {
1430		- if ( strpos( $key, 'visualizer-' ) !== false ) {
1431		- add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
1432		- }
1433		- }
1434		- $redirect = esc_url(
1435		- add_query_arg(
1436		- array(
1437		- 'page' => 'visualizer',
1438		- 'type' => filter_input( INPUT_GET, 'type' ),
1439		- 'vaction' => false,
1440		- ),
1441		- admin_url( 'admin.php' )
	1004	+ if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
	1005	+ add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
	1006	+ add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
	1007	+ add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
	1008	+ add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
	1009	+ add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SETTINGS, get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) );
	1010	+ $redirect = add_query_arg(
	1011	+ array(
	1012	+ 'page' => 'visualizer',
	1013	+ 'type' => filter_input( INPUT_GET, 'type' ),
1442	1014	),
1443		- null,
1444		- 'db'
	1015	+ admin_url( 'upload.php' )
1445	1016	);
1446	1017	}
1447	1018	}
1448		-
1449		- if ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) {
1450		- wp_die();
1451		- }
1452	1019	wp_redirect( $redirect );
1453	1020	exit;
1454	1021	}
1455	1022
		@@ -1480,9 +1047,9 @@
1480	1047	}
1481	1048	}
1482	1049	}
1483	1050
1484		- ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
	1051	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1485	1052	}
1486	1053
1487	1054	/**
1488	1055	* Handles chart data page.
		@@ -1495,12 +1062,9 @@
1495	1062	$data = $this->_getChartArray();
1496	1063	$render = new Visualizer_Render_Page_Data();
1497	1064	$render->chart = $this->_chart;
1498	1065	$render->type = $data['type'];
1499		-
1500		- if ( $data && $data['settings'] ) {
1501		- unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
1502		- }
	1066	+ unset( $data['settings']['width'], $data['settings']['height'] );
1503	1067	wp_enqueue_style( 'visualizer-frame' );
1504	1068	wp_enqueue_script( 'visualizer-render' );
1505	1069	wp_localize_script(
1506	1070	'visualizer-render',
		@@ -1506,11 +1070,10 @@
1506	1070	'visualizer-render',
1507	1071	'visualizer',
1508	1072	array(
1509	1073	'l10n' => array(
1510		- 'invalid_source' => esc_html__( 'The URL you entered is invalid. Please enter a valid URL.', 'visualizer' ),
1511		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
1512		- 'invalid_format' => esc_html__( 'This format pattern is not supported in the series settings field. To display percentages, use the Manual Configuration option instead.', 'visualizer' ),
	1074	+ 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
	1075	+ 'loading' => esc_html__( 'Loading...', 'visualizer' ),
1513	1076	),
1514	1077	'charts' => array(
1515	1078	'canvas' => $data,
1516	1079	),
		@@ -1515,16 +1078,13 @@
1515	1078	'canvas' => $data,
1516	1079	),
1517	1080	)
1518	1081	);
1519		-
1520		- do_action( 'visualizer_enqueue_scripts_and_styles', $data, $this->_chart->ID );
1521		-
1522		- if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
	1082	+ // Added by Ash/Upwork
	1083	+ if ( VISUALIZER_PRO ) {
1523	1084	global $Visualizer_Pro;
1524		- $Visualizer_Pro->_enqueueScriptsAndStyles( $data, $this->_chart->ID );
	1085	+ $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
1525	1086	}
1526		-
1527	1087	// Added by Ash/Upwork
1528	1088	$this->_addAction( 'admin_head', 'renderFlattrScript' );
1529	1089	wp_iframe( array( $render, 'render' ) );
1530	1090	}
		@@ -1536,27 +1096,14 @@
1536	1096	*/
1537	1097	public function getQueryData() {
1538	1098	check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
1539	1099
1540		- if ( ! current_user_can( 'administrator' ) ) {
1541		- wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1542		- }
1543		- if ( ! is_super_admin() ) {
1544		- wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1545		- }
1546		-
1547		- if ( ! Visualizer_Module::is_pro() ) {
1548		- wp_send_json_error( array( 'msg' => __( 'Feature is not available.', 'visualizer' ) ) );
1549		- }
1550		-
1551	1100	$params = wp_parse_args( $_POST['params'] );
1552		- $chart_id = filter_var( $params['chart_id'], FILTER_VALIDATE_INT );
1553		- $query = trim( $params['query'], ';' );
1554		-
1555		- $source = new Visualizer_Source_Query( stripslashes( $query ), $chart_id, $params );
	1101	+ $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
1556	1102	$html = $source->fetch( true );
1557		- $error = $source->get_error();
1558		- if ( ! empty( $error ) ) {
	1103	+ $error = '';
	1104	+ if ( empty( $html ) ) {
	1105	+ $error = $source->get_error();
1559	1106	wp_send_json_error( array( 'msg' => $error ) );
1560	1107	}
1561	1108	wp_send_json_success( array( 'table' => $html ) );
1562	1109	}
		@@ -1568,19 +1115,8 @@
1568	1115	*/
1569	1116	public function saveQuery() {
1570	1117	check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION, 'security' );
1571	1118
1572		- if ( ! current_user_can( 'administrator' ) ) {
1573		- wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1574		- }
1575		- if ( ! is_super_admin() ) {
1576		- wp_send_json_error( array( 'msg' => __( 'Action not allowed for this user.', 'visualizer' ) ) );
1577		- }
1578		-
1579		- if ( ! Visualizer_Module::is_pro() ) {
1580		- wp_send_json_error( array( 'msg' => __( 'Feature is not available.', 'visualizer' ) ) );
1581		- }
1582		-
1583	1119	$chart_id = filter_input(
1584	1120	INPUT_GET,
1585	1121	'chart',
1586	1122	FILTER_VALIDATE_INT,
		@@ -1590,43 +1126,21 @@
1590	1126	),
1591	1127	)
1592	1128	);
1593	1129
1594		- $hours = filter_input(
1595		- INPUT_POST,
1596		- 'refresh',
1597		- FILTER_VALIDATE_FLOAT,
1598		- array(
1599		- 'options' => array(
1600		- 'min_range' => -1,
1601		- 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1602		- ),
1603		- )
1604		- );
1605		-
1606		- if ( ! is_numeric( $hours ) ) {
1607		- $hours = -1;
1608		- }
1609		-
1610	1130	$render = new Visualizer_Render_Page_Update();
1611	1131	if ( $chart_id ) {
1612	1132	$params = wp_parse_args( $_POST['params'] );
1613		- $query = trim( $params['query'], ';' );
1614		- $source = new Visualizer_Source_Query( stripslashes( $query ), $chart_id, $params );
	1133	+ $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
1615	1134	$source->fetch( false );
1616	1135	$error = $source->get_error();
1617	1136	if ( empty( $error ) ) {
1618		- update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $query ) );
	1137	+ $hours = $_POST['refresh'];
	1138	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) );
1619	1139	update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
1620	1140	update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
1621	1141	update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours );
1622	1142	update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
1623		- if ( isset( $params['db_type'] ) && $params['db_type'] !== Visualizer_Plugin::WP_DB_NAME ) {
1624		- $remote_db_params = $params;
1625		- unset( $remote_db_params['query'] );
1626		- unset( $remote_db_params['chart_id'] );
1627		- update_post_meta( $chart_id, Visualizer_Plugin::CF_REMOTE_DB_PARAMS, $remote_db_params );
1628		- }
1629	1143
1630	1144	$schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
1631	1145	$schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
1632	1146	update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules );
		@@ -1633,14 +1147,13 @@
1633	1147
1634	1148	wp_update_post(
1635	1149	array(
1636	1150	'ID' => $chart_id,
1637		- 'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
	1151	+ 'post_content' => $source->getData(),
1638	1152	)
1639	1153	);
1640		- $render->data = json_encode( $source->getRawData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ) );
	1154	+ $render->data = json_encode( $source->getRawData() );
1641	1155	$render->series = json_encode( $source->getSeries() );
1642		- $render->id = $chart_id;
1643	1156	} else {
1644	1157	$render->message = $error;
1645	1158	}
1646	1159	}
		@@ -1645,9 +1158,9 @@
1645	1158	}
1646	1159	}
1647	1160	$render->render();
1648	1161	if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
1649		- ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
	1162	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1650	1163	}
1651	1164	}
1652	1165
1653	1166
		@@ -1669,80 +1182,13 @@
1669	1182	),
1670	1183	)
1671	1184	);
1672	1185
1673		- $hours = filter_input(
1674		- INPUT_POST,
1675		- 'refresh',
1676		- FILTER_VALIDATE_FLOAT,
1677		- array(
1678		- 'options' => array(
1679		- 'min_range' => -1,
1680		- 'max_range' => apply_filters( 'visualizer_is_business', false ) ? PHP_INT_MAX : -1,
1681		- ),
1682		- )
1683		- );
	1186	+ $hours = $_POST['refresh'];
1684	1187
1685		- if ( ! is_numeric( $hours ) ) {
1686		- $hours = -1;
1687		- }
1688		-
1689	1188	do_action( 'visualizer_save_filter', $chart_id, $hours );
1690	1189
1691	1190	if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
1692		- ( defined( 'WP_TESTS_DOMAIN' ) && function_exists( 'tests_add_filter' ) ) ? wp_die() : exit();
	1191	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
1693	1192	}
1694		- }
1695		-
1696		- /**
1697		- * Save chart image.
1698		- *
1699		- * @param string $base64_img Chart image.
1700		- * @param int $chart_id Chart ID.
1701		- * @param bool $save_attachment Save attachment.
1702		- * @return attachment ID
1703		- */
1704		- public function save_chart_image( $base64_img, $chart_id, $save_attachment = true ) {
1705		- // Delete old chart image.
1706		- $old_attachment_id = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_IMAGE, true );
1707		- if ( $old_attachment_id ) {
1708		- wp_delete_attachment( $old_attachment_id, true );
1709		- }
1710		-
1711		- if ( ! $save_attachment ) {
1712		- return 0;
1713		- }
1714		-
1715		- // Upload dir.
1716		- $upload_dir = wp_upload_dir();
1717		- $upload_path = str_replace( '/', DIRECTORY_SEPARATOR, $upload_dir['path'] ) . DIRECTORY_SEPARATOR;
1718		-
1719		- $img = str_replace( 'data:image/png;base64,', '', $base64_img );
1720		- $img = str_replace( ' ', '+', $img );
1721		- $decoded = base64_decode( $img );
1722		- $filename = 'visualization-' . $chart_id . '.png';
1723		- $file_type = 'image/png';
1724		- $hashed_filename = $filename;
1725		-
1726		- // Save the image in the uploads directory.
1727		- require_once ABSPATH . '/wp-admin/includes/file.php';
1728		- \WP_Filesystem();
1729		- global $wp_filesystem;
1730		- if ( ! is_a( $wp_filesystem, 'WP_Filesystem_Base' ) ) {
1731		- $creds = request_filesystem_credentials( site_url() );
1732		- wp_filesystem( $creds );
1733		- }
1734		- $upload_file = $wp_filesystem->put_contents( $upload_path . $hashed_filename, $decoded );
1735		-
1736		- // Insert new chart image.
1737		- $attachment = array(
1738		- 'post_mime_type' => $file_type,
1739		- 'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $hashed_filename ) ),
1740		- 'post_content' => '',
1741		- 'post_status' => 'inherit',
1742		- 'guid' => $upload_dir['url'] . '/' . basename( $hashed_filename ),
1743		- );
1744		-
1745		- $attach_id = wp_insert_attachment( $attachment, $upload_dir['path'] . '/' . $hashed_filename );
1746		- return $attach_id;
1747	1193	}
1748	1194	}