← All changes | classes/Visualizer/Module/Chart.php +397 -59 3.1.3 → 3.3.4 View file →

		@@ -60,12 +60,159 @@
60	60	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
61	61
62	62	$this->_addAjaxAction( Visualizer_Plugin::ACTION_FETCH_DB_DATA, 'getQueryData' );
63	63	$this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_DB_QUERY, 'saveQuery' );
	64	+
	65	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_GET_ROOTS, 'getJsonRoots' );
	66	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_GET_DATA, 'getJsonData' );
	67	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_DATA, 'setJsonData' );
	68	+ $this->_addAjaxAction( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE, 'setJsonSchedule' );
	69	+
64	70	$this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
	71	+
65	72	}
66	73
67	74	/**
	75	+ * Sets the schedule for how JSON-endpoint charts should be updated.
	76	+ *
	77	+ * @since ?
	78	+ *
	79	+ * @access public
	80	+ */
	81	+ public function setJsonSchedule() {
	82	+ check_ajax_referer( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE . Visualizer_Plugin::VERSION, 'security' );
	83	+
	84	+ $chart_id = filter_input(
	85	+ INPUT_POST,
	86	+ 'chart',
	87	+ FILTER_VALIDATE_INT,
	88	+ array(
	89	+ 'options' => array(
	90	+ 'min_range' => 1,
	91	+ ),
	92	+ )
	93	+ );
	94	+
	95	+ if ( ! $chart_id ) {
	96	+ wp_send_json_error();
	97	+ }
	98	+
	99	+ $time = filter_input(
	100	+ INPUT_POST,
	101	+ 'time',
	102	+ FILTER_VALIDATE_INT,
	103	+ array(
	104	+ 'options' => array(
	105	+ 'min_range' => -1,
	106	+ ),
	107	+ )
	108	+ );
	109	+
	110	+ delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE );
	111	+
	112	+ if ( -1 < $time ) {
	113	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
	114	+ }
	115	+ wp_send_json_success();
	116	+ }
	117	+
	118	+ /**
	119	+ * Get the root elements for JSON-endpoint.
	120	+ *
	121	+ * @since ?
	122	+ *
	123	+ * @access public
	124	+ */
	125	+ public function getJsonRoots() {
	126	+ check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION, 'security' );
	127	+
	128	+ $params = wp_parse_args( $_POST['params'] );
	129	+
	130	+ $source = new Visualizer_Source_Json( $params );
	131	+
	132	+ $roots = $source->fetchRoots();
	133	+ if ( empty( $roots ) ) {
	134	+ wp_send_json_error( array( 'msg' => $source->get_error() ) );
	135	+ }
	136	+
	137	+ wp_send_json_success( array( 'url' => $params['url'], 'roots' => $roots ) );
	138	+ }
	139	+
	140	+ /**
	141	+ * Get the data for the JSON-endpoint corresponding to the chosen root.
	142	+ *
	143	+ * @since ?
	144	+ *
	145	+ * @access public
	146	+ */
	147	+ public function getJsonData() {
	148	+ check_ajax_referer( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION, 'security' );
	149	+
	150	+ $params = wp_parse_args( $_POST['params'] );
	151	+
	152	+ $chart_id = $params['chart'];
	153	+
	154	+ if ( empty( $chart_id ) ) {
	155	+ wp_die();
	156	+ }
	157	+
	158	+ $source = new Visualizer_Source_Json( $params );
	159	+
	160	+ $data = $source->parse();
	161	+ if ( empty( $data ) ) {
	162	+ wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
	163	+ }
	164	+
	165	+ $data = Visualizer_Render_Layout::show( 'editor-table', $data, $chart_id, 'viz-json-table', false, false );
	166	+ wp_send_json_success( array( 'table' => $data, 'root' => $params['root'], 'url' => $params['url'], 'paging' => $source->getPaginationElements() ) );
	167	+ }
	168	+
	169	+ /**
	170	+ * Updates the database with the correct post parameters for JSON-endpoint charts.
	171	+ *
	172	+ * @since ?
	173	+ *
	174	+ * @access public
	175	+ */
	176	+ public function setJsonData() {
	177	+ check_ajax_referer( Visualizer_Plugin::ACTION_JSON_SET_DATA . Visualizer_Plugin::VERSION, 'security' );
	178	+
	179	+ $params = $_POST;
	180	+ $chart_id = $_GET['chart'];
	181	+
	182	+ if ( empty( $chart_id ) ) {
	183	+ wp_die();
	184	+ }
	185	+
	186	+ $chart = get_post( $chart_id );
	187	+
	188	+ $source = new Visualizer_Source_Json( $params );
	189	+ $source->fetch();
	190	+
	191	+ $content = $source->getData();
	192	+ $chart->post_content = $content;
	193	+ wp_update_post( $chart->to_array() );
	194	+ update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	195	+ update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
	196	+ update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
	197	+ update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_URL, $params['url'] );
	198	+ update_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_ROOT, $params['root'] );
	199	+ delete_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING );
	200	+ if ( ! empty( $params['paging'] ) ) {
	201	+ add_post_meta( $chart->ID, Visualizer_Plugin::CF_JSON_PAGING, $params['paging'] );
	202	+ }
	203	+
	204	+ $render = new Visualizer_Render_Page_Update();
	205	+ $render->id = $chart->ID;
	206	+ $render->data = json_encode( $source->getRawData() );
	207	+ $render->series = json_encode( $source->getSeries() );
	208	+ $render->render();
	209	+
	210	+ defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	211	+ }
	212	+
	213	+
	214	+ /**
68	215	* Fetches charts from database.
69	216	*
70	217	* This method is also called from the media pop-up (classic editor: create a post and add chart from insert content).
71	218	*
		@@ -94,9 +241,9 @@
94	241	// 'filter' is from the modal from the add media button.
95	242	$filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
96	243	}
97	244
98		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	245	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
99	246	$query_args['meta_query'] = array(
100	247	array(
101	248	'key' => Visualizer_Plugin::CF_CHART_TYPE,
102	249	'value' => $filter,
		@@ -201,9 +348,9 @@
201	348	*
202	349	* @access public
203	350	*/
204	351	public function deleteChart() {
205		- $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
	352	+ $is_post = $_SERVER['REQUEST_METHOD'] === 'POST';
206	353	$input_method = $is_post ? INPUT_POST : INPUT_GET;
207	354	$chart_id = $success = false;
208	355	$nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
209	356	$capable = current_user_can( 'delete_posts' );
		@@ -219,9 +366,9 @@
219	366	)
220	367	);
221	368	if ( $chart_id ) {
222	369	$chart = get_post( $chart_id );
223		- $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
	370	+ $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
224	371	}
225	372	}
226	373	if ( $success ) {
227	374	wp_delete_post( $chart_id, true );
		@@ -232,9 +379,9 @@
232	379	'success' => $success,
233	380	)
234	381	);
235	382	}
236		- wp_redirect( wp_get_referer() );
	383	+ wp_redirect( remove_query_arg( 'vaction', wp_get_referer() ) );
237	384	exit;
238	385	}
239	386
240	387	/**
		@@ -276,9 +423,9 @@
276	423	public function renderChartPages() {
277	424	defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
278	425	// check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
279	426	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
280		- if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
	427	+ if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
281	428	$this->deleteOldCharts();
282	429	$default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
283	430	$source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
284	431	$source->fetch();
		@@ -295,8 +442,9 @@
295	442	add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
296	443	add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
297	444	add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
298	445	add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	446	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
299	447	add_post_meta(
300	448	$chart_id,
301	449	Visualizer_Plugin::CF_SETTINGS,
302	450	array(
		@@ -308,16 +456,23 @@
308	456	wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
309	457	defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
310	458	}
311	459
312		- $this->load_chart_type( $chart_id );
	460	+ $lib = $this->load_chart_type( $chart_id );
313	461
	462	+ // the alpha color picker (RGBA) is not supported by google.
	463	+ $color_picker_dep = 'wp-color-picker';
	464	+ if ( in_array( $lib, array( 'chartjs', 'datatables' ), true ) && ! wp_script_is( 'wp-color-picker-alpha', 'registered' ) ) {
	465	+ wp_register_script( 'wp-color-picker-alpha', VISUALIZER_ABSURL . 'js/lib/wp-color-picker-alpha.min.js', array( 'wp-color-picker' ), Visualizer_Plugin::VERSION );
	466	+ $color_picker_dep = 'wp-color-picker-alpha';
	467	+ }
	468	+
314	469	// enqueue and register scripts and styles
315	470	wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
316	471	wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
317	472
318	473	wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
319		- wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
	474	+ wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion' ), Visualizer_Plugin::VERSION, true );
320	475	wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
321	476	wp_register_script(
322	477	'visualizer-render',
323	478	VISUALIZER_ABSURL . 'js/render-facade.js',
		@@ -328,19 +483,23 @@
328	483	wp_register_script(
329	484	'visualizer-preview',
330	485	VISUALIZER_ABSURL . 'js/preview.js',
331	486	array(
332		- 'wp-color-picker',
	487	+ $color_picker_dep,
333	488	'visualizer-render',
334	489	),
335	490	Visualizer_Plugin::VERSION,
336	491	true
337	492	);
338		- // added by Ash/Upwork
339		- if ( VISUALIZER_PRO ) {
	493	+ wp_register_script( 'visualizer-editor-simple', VISUALIZER_ABSURL . 'js/simple-editor.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
	494	+
	495	+ do_action( 'visualizer_add_scripts' );
	496	+
	497	+ if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
340	498	global $Visualizer_Pro;
341	499	$Visualizer_Pro->_addScriptsAndStyles();
342	500	}
	501	+
343	502	// dispatch pages
344	503	$this->_chart = get_post( $chart_id );
345	504	$tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
346	505
		@@ -380,22 +539,23 @@
380	539	*/
381	540	private function loadCodeEditorAssets() {
382	541	global $wp_version;
383	542
384		- if ( ! VISUALIZER_PRO ) {
	543	+ $wp_scripts = wp_scripts();
	544	+
	545	+ // data tables assets.
	546	+ wp_register_script( 'visualizer-datatables', VISUALIZER_ABSURL . 'js/lib/datatables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
	547	+ wp_register_style( 'visualizer-datatables', VISUALIZER_ABSURL . 'css/lib/datatables.min.css', array(), Visualizer_Plugin::VERSION );
	548	+ 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 );
	549	+ wp_enqueue_script( 'visualizer-datatables' );
	550	+ wp_enqueue_style( 'visualizer-jquery-ui' );
	551	+
	552	+ if ( ! Visualizer_Module::is_pro() ) {
385	553	return;
386	554	}
387	555
388	556	$table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping();
389	557
390		- // data tables assets.
391		- wp_register_script( 'visualizer-datatables', '//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js', array( 'jquery-ui-core' ), Visualizer_Plugin::VERSION );
392		- wp_register_style( 'visualizer-datatables', '//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css', array(), Visualizer_Plugin::VERSION );
393		- wp_register_style( 'visualizer-datatables-ui', '//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css', array( 'visualizer-datatables' ), Visualizer_Plugin::VERSION );
394		-
395		- wp_enqueue_script( 'visualizer-datatables' );
396		- wp_enqueue_style( 'visualizer-datatables-ui' );
397		-
398	558	if ( version_compare( $wp_version, '4.9.0', '<' ) ) {
399	559	// code mirror assets.
400	560	wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
401	561	wp_register_script( 'visualizer-codemirror-placeholder', '//codemirror.net/addon/display/placeholder.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
		@@ -435,10 +595,10 @@
435	595	private function _handleDataAndSettingsPage() {
436	596	if ( isset( $_POST['map_api_key'] ) ) {
437	597	update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
438	598	}
439		- if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
440		- if ( $this->_chart->post_status == 'auto-draft' ) {
	599	+ if ( $_SERVER['REQUEST_METHOD'] === 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
	600	+ if ( $this->_chart->post_status === 'auto-draft' ) {
441	601	$this->_chart->post_status = 'publish';
442	602
443	603	// 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.
444	604	// we do not want any difference in data so disable revisions temporarily.
		@@ -447,8 +607,24 @@
447	607	}
448	608	// save meta data only when it is NOT being canceled.
449	609	if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
450	610	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
	611	+
	612	+ // we will keep a parameter called 'internal_title' that will be set to the given title or, if empty, the chart ID
	613	+ // this will help in searching with the chart id.
	614	+ $settings = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
	615	+ $title = null;
	616	+ if ( isset( $settings['title'] ) && ! empty( $settings['title'] ) ) {
	617	+ $title = $settings['title'];
	618	+ if ( is_array( $title ) ) {
	619	+ $title = $settings['title']['text'];
	620	+ }
	621	+ }
	622	+ if ( empty( $title ) ) {
	623	+ $title = $this->_chart->ID;
	624	+ }
	625	+ $settings['internal_title'] = $title;
	626	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
451	627	}
452	628	$render = new Visualizer_Render_Page_Send();
453	629	$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
454	630	wp_iframe( array( $render, 'render' ) );
		@@ -456,9 +632,9 @@
456	632	return;
457	633	}
458	634	$data = $this->_getChartArray();
459	635	$sidebar = '';
460		- $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
	636	+ $sidebar_class = $this->load_chart_class_name( $this->_chart->ID );
461	637	if ( class_exists( $sidebar_class, true ) ) {
462	638	$sidebar = new $sidebar_class( $data['settings'] );
463	639	$sidebar->__series = $data['series'];
464	640	$sidebar->__data = $data['data'];
		@@ -463,14 +639,14 @@
463	639	$sidebar->__series = $data['series'];
464	640	$sidebar->__data = $data['data'];
465	641	} else {
466	642	$sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
467		- if ( $sidebar != '' ) {
	643	+ if ( $sidebar !== '' ) {
468	644	$sidebar->__series = $data['series'];
469	645	$sidebar->__data = $data['data'];
470	646	}
471	647	}
472		- unset( $data['settings']['width'], $data['settings']['height'] );
	648	+ unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
473	649	wp_enqueue_style( 'wp-color-picker' );
474	650	wp_enqueue_style( 'visualizer-frame' );
475	651	wp_enqueue_script( 'visualizer-preview' );
476	652	wp_enqueue_script( 'visualizer-chosen' );
		@@ -475,8 +651,25 @@
475	651	wp_enqueue_script( 'visualizer-preview' );
476	652	wp_enqueue_script( 'visualizer-chosen' );
477	653	wp_enqueue_script( 'visualizer-render' );
478	654
	655	+ if ( ! Visualizer_Module::is_pro() ) {
	656	+ wp_enqueue_script( 'visualizer-editor-simple' );
	657	+ wp_localize_script(
	658	+ 'visualizer-editor-simple',
	659	+ 'visualizer1',
	660	+ array(
	661	+ 'ajax' => array(
	662	+ 'url' => admin_url( 'admin-ajax.php' ),
	663	+ 'nonces' => array(
	664	+ ),
	665	+ 'actions' => array(
	666	+ ),
	667	+ ),
	668	+ )
	669	+ );
	670	+ }
	671	+
479	672	$table_col_mapping = $this->loadCodeEditorAssets();
480	673
481	674	wp_localize_script(
482	675	'visualizer-render',
		@@ -484,8 +677,9 @@
484	677	array(
485	678	'l10n' => array(
486	679	'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
487	680	'loading' => esc_html__( 'Loading...', 'visualizer' ),
	681	+ 'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
488	682	),
489	683	'charts' => array(
490	684	'canvas' => $data,
491	685	'id' => $this->_chart->ID,
		@@ -496,19 +690,28 @@
496	690	'url' => admin_url( 'admin-ajax.php' ),
497	691	'nonces' => array(
498	692	'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
499	693	'db_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION ),
	694	+ 'json_get_roots' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_ROOTS . Visualizer_Plugin::VERSION ),
	695	+ 'json_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_GET_DATA . Visualizer_Plugin::VERSION ),
	696	+ 'json_set_schedule' => wp_create_nonce( Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE . Visualizer_Plugin::VERSION ),
500	697	),
501	698	'actions' => array(
502	699	'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
503	700	'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA,
	701	+ 'json_get_roots' => Visualizer_Plugin::ACTION_JSON_GET_ROOTS,
	702	+ 'json_get_data' => Visualizer_Plugin::ACTION_JSON_GET_DATA,
	703	+ 'json_set_schedule' => Visualizer_Plugin::ACTION_JSON_SET_SCHEDULE,
504	704	),
505	705	),
506	706	'db_query' => array(
507	707	'tables' => $table_col_mapping,
508	708	),
509		- 'is_pro' => VISUALIZER_PRO,
	709	+ 'is_pro' => Visualizer_Module::is_pro(),
510	710	'page_type' => 'chart',
	711	+ 'json_tag_separator' => Visualizer_Source_Json::TAG_SEPARATOR,
	712	+ 'json_tag_separator_view' => Visualizer_Source_Json::TAG_SEPARATOR_VIEW,
	713	+ 'is_front' => false,
511	714	)
512	715	);
513	716
514	717	$render = new Visualizer_Render_Page_Data();
		@@ -516,21 +719,25 @@
516	719	$render->type = $data['type'];
517	720	$render->custom_css = $data['css'];
518	721	$render->sidebar = $sidebar;
519	722	if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
520		- $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
	723	+ $render->button = filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART
521	724	? esc_html__( 'Save Chart', 'visualizer' )
522	725	: esc_html__( 'Create Chart', 'visualizer' );
523		- if ( filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART ) {
	726	+ if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) {
524	727	$render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
525	728	}
526	729	} else {
527	730	$render->button = esc_attr__( 'Insert Chart', 'visualizer' );
528	731	}
529		- if ( VISUALIZER_PRO ) {
	732	+
	733	+ do_action( 'visualizer_enqueue_scripts_and_styles', $data );
	734	+
	735	+ if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
530	736	global $Visualizer_Pro;
531	737	$Visualizer_Pro->_enqueueScriptsAndStyles( $data );
532	738	}
	739	+
533	740	$this->_addAction( 'admin_head', 'renderFlattrScript' );
534	741	wp_iframe( array( $render, 'render' ) );
535	742	}
536	743
		@@ -542,13 +749,21 @@
542	749	* @access private
543	750	*/
544	751	private function _handleTypesPage() {
545	752	// process post request
546		- if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
	753	+ if ( $_SERVER['REQUEST_METHOD'] === 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
547	754	$type = filter_input( INPUT_POST, 'type' );
548		- if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) {
	755	+ $library = filter_input( INPUT_POST, 'chart-library' );
	756	+ if ( in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
	757	+ if ( empty( $library ) ) {
	758	+ // library cannot be empty.
	759	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Chart library empty while creating the chart! Aborting...', 'error', __FILE__, __LINE__ );
	760	+ return;
	761	+ }
	762	+
549	763	// save new chart type
550	764	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
	765	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, $library );
551	766	// if the chart has default data, update it with appropriate default data for new type
552	767	if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
553	768	$source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
554	769	$source->fetch();
		@@ -555,8 +770,11 @@
555	770	$this->_chart->post_content = $source->getData();
556	771	wp_update_post( $this->_chart->to_array() );
557	772	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
558	773	}
	774	+
	775	+ Visualizer_Module_Utility::set_defaults( $this->_chart );
	776	+
559	777	// redirect to next tab
560	778	// changed by Ash/Upwork
561	779	wp_redirect( add_query_arg( 'tab', 'settings' ) );
562	780
		@@ -564,9 +782,9 @@
564	782	}
565	783	}
566	784	$render = new Visualizer_Render_Page_Types();
567	785	$render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
568		- $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
	786	+ $render->types = Visualizer_Module_Admin::_getChartTypesLocalized( false, false, false, 'types' );
569	787	$render->chart = $this->_chart;
570	788	wp_enqueue_style( 'visualizer-frame' );
571	789	wp_enqueue_script( 'visualizer-frame' );
572	790	wp_iframe( array( $render, 'render' ) );
		@@ -582,10 +800,110 @@
582	800	*/
583	801	public function renderFlattrScript() {
584	802	echo '';
585	803	}
586		- // changed by Ash/Upwork
	804	+
587	805	/**
	806	+ * Processes the CSV that is sent in the request as a string.
	807	+ *
	808	+ * @since 3.2.0
	809	+ */
	810	+ private function handleCSVasString( $data ) {
	811	+ $source = null;
	812	+
	813	+ // @issue https://github.com/Codeinwp/visualizer/issues/412
	814	+ if ( has_filter( 'visualizer_pro_handle_chart_data' ) ) {
	815	+ $source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );
	816	+ } else {
	817	+ // data coming in from the text editor.
	818	+ $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
	819	+ $handle = fopen( $tmpfile, 'w' );
	820	+ $values = preg_split( '/[\n\r]+/', stripslashes( trim( $data ) ) );
	821	+ if ( $values ) {
	822	+ foreach ( $values as $row ) {
	823	+ if ( empty( $row ) ) {
	824	+ continue;
	825	+ }
	826	+ $columns = explode( ',', $row );
	827	+ fputcsv( $handle, $columns );
	828	+ }
	829	+ }
	830	+ $source = new Visualizer_Source_Csv( $tmpfile );
	831	+ fclose( $handle );
	832	+ }
	833	+ return $source;
	834	+ }
	835	+
	836	+ /**
	837	+ * Parses the data uploaded as an HTML table.
	838	+ *
	839	+ * @since 3.2.0
	840	+ *
	841	+ * @access private
	842	+ */
	843	+ private function handleTabularData() {
	844	+ $csv = array();
	845	+ // the datatable mentions the headers twice, so lets remove the duplicates.
	846	+ $headers = array_unique( array_filter( $_POST['header'] ) );
	847	+ $types = $_POST['type'];
	848	+
	849	+ // capture all the indexes that correspond to excluded columns.
	850	+ $exclude = array();
	851	+ $index = 0;
	852	+ foreach ( $types as $type ) {
	853	+ if ( empty( $type ) ) {
	854	+ $exclude[] = $index;
	855	+ }
	856	+ $index++;
	857	+ }
	858	+
	859	+ // when N headers are being renamed, the number of headers increases by N
	860	+ // because of the way datatable duplicates header information
	861	+ // so unset the headers that have been renamed.
	862	+ if ( count( $headers ) !== count( $types ) ) {
	863	+ $to = count( $headers );
	864	+ for ( $i = count( $types ); $i < $to; $i++ ) {
	865	+ unset( $headers[ $i + 1 ] );
	866	+ }
	867	+ }
	868	+
	869	+ $columns = array();
	870	+ for ( $i = 0; $i < count( $headers ); $i++ ) {
	871	+ if ( ! isset( $_POST[ 'data' . $i ] ) ) {
	872	+ continue;
	873	+ }
	874	+ $columns[ $i ] = $_POST[ 'data' . $i ];
	875	+ }
	876	+
	877	+ $csv[] = $headers;
	878	+ $csv[] = $types;
	879	+ for ( $j = 0; $j < count( $columns[0] ); $j++ ) {
	880	+ $row = array();
	881	+ for ( $i = 0; $i < count( $headers ); $i++ ) {
	882	+ $row[] = $columns[ $i ][ $j ];
	883	+ }
	884	+ $csv[] = $row;
	885	+ }
	886	+
	887	+ $tmpfile = tempnam( get_temp_dir(), Visualizer_Plugin::NAME );
	888	+ $handle = fopen( $tmpfile, 'w' );
	889	+
	890	+ if ( $csv ) {
	891	+ $index = 0;
	892	+ foreach ( $csv as $row ) {
	893	+ // remove all the cells corresponding to the excluded headers.
	894	+ foreach ( $exclude as $j ) {
	895	+ unset( $row[ $j ] );
	896	+ }
	897	+ fputcsv( $handle, $row );
	898	+ }
	899	+ }
	900	+ $source = new Visualizer_Source_Csv( $tmpfile );
	901	+ fclose( $handle );
	902	+ return $source;
	903	+ }
	904	+
	905	+ /**
588	906	* Parses uploaded CSV file and saves new data for the chart.
589	907	*
590	908	* @since 1.0.0
591	909	*
		@@ -607,9 +925,9 @@
607	925
608	926	// check chart, if chart exists
609	927	// do not use filter_input as it does not work for phpunit test cases, use filter_var instead
610	928	$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
611		- if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
	929	+ if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type !== Visualizer_Plugin::CPT_VISUALIZER ) {
612	930	if ( ! $can_die ) {
613	931	return;
614	932	}
615	933	status_header( 400 );
		@@ -630,8 +948,13 @@
630	948	delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
631	949	delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
632	950	}
633	951
	952	+ // delete json related data.
	953	+ delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL );
	954	+ delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT );
	955	+ delete_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING );
	956	+
634	957	$source = null;
635	958	$render = new Visualizer_Render_Page_Update();
636	959	if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
637	960	$source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
		@@ -637,14 +960,17 @@
637	960	$source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
638	961	if ( isset( $_POST['vz-import-time'] ) ) {
639	962	apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
640	963	}
	964	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
641	965	} elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
642	966	$source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
643	967	} elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
644		- $source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '', $chart_id, $_POST );
	968	+ $source = $this->handleCSVasString( $_POST['chart_data'] );
	969	+ } elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) {
	970	+ $source = $this->handleTabularData();
645	971	} else {
646		- $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
	972	+ $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' );
647	973	}
648	974	if ( $source ) {
649	975	if ( $source->fetch() ) {
650	976	$content = $source->getData();
		@@ -664,13 +990,22 @@
664	990	wp_update_post( $chart->to_array() );
665	991	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
666	992	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
667	993	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
	994	+
	995	+ Visualizer_Module_Utility::set_defaults( $chart, null );
	996	+
	997	+ $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
	998	+
668	999	$render->id = $chart->ID;
669	1000	$render->data = json_encode( $source->getRawData() );
670	1001	$render->series = json_encode( $source->getSeries() );
	1002	+ $render->settings = json_encode( $settings );
671	1003	} else {
672		- $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
	1004	+ $render->message = $source->get_error();
	1005	+ if ( empty( $render->message ) ) {
	1006	+ $render->message = esc_html__( 'CSV file is broken or invalid. Please try again.', 'visualizer' );
	1007	+ }
673	1008	}
674	1009	}
675	1010	$render->render();
676	1011	if ( ! $can_die ) {
		@@ -687,27 +1022,18 @@
687	1022	* @access public
688	1023	*/
689	1024	public function cloneChart() {
690	1025	$chart_id = $success = false;
691		- $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
	1026	+ $nonce = isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'], Visualizer_Plugin::ACTION_CLONE_CHART );
692	1027	$capable = current_user_can( 'edit_posts' );
693	1028	if ( $nonce && $capable ) {
694		- $chart_id = filter_input(
695		- INPUT_GET,
696		- 'chart',
697		- FILTER_VALIDATE_INT,
698		- array(
699		- 'options' => array(
700		- 'min_range' => 1,
701		- ),
702		- )
703		- );
	1029	+ $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
704	1030	if ( $chart_id ) {
705	1031	$chart = get_post( $chart_id );
706		- $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
	1032	+ $success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
707	1033	}
708	1034	}
709		- $redirect = wp_get_referer();
	1035	+ $redirect = remove_query_arg( 'vaction', wp_get_referer() );
710	1036	if ( $success ) {
711	1037	$new_chart_id = wp_insert_post(
712	1038	array(
713	1039	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
		@@ -716,23 +1042,32 @@
716	1042	'post_status' => $chart->post_status,
717	1043	'post_content' => $chart->post_content,
718	1044	)
719	1045	);
720		- if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
721		- add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
722		- add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
723		- add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
724		- add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
725		- add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SETTINGS, get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) );
	1046	+ if ( is_wp_error( $new_chart_id ) ) {
	1047	+ 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__ );
	1048	+ } else {
	1049	+ $post_meta = get_post_meta( $chart_id );
	1050	+ foreach ( $post_meta as $key => $value ) {
	1051	+ if ( strpos( $key, 'visualizer-' ) !== false ) {
	1052	+ add_post_meta( $new_chart_id, $key, maybe_unserialize( $value[0] ) );
	1053	+ }
	1054	+ }
726	1055	$redirect = add_query_arg(
727	1056	array(
728	1057	'page' => 'visualizer',
729	1058	'type' => filter_input( INPUT_GET, 'type' ),
	1059	+ 'vaction' => false,
730	1060	),
731		- admin_url( 'upload.php' )
	1061	+ admin_url( 'admin.php' )
732	1062	);
733	1063	}
734	1064	}
	1065	+
	1066	+ if ( defined( 'WP_TESTS_DOMAIN' ) ) {
	1067	+ wp_die();
	1068	+ }
	1069	+
735	1070	wp_redirect( $redirect );
736	1071	exit;
737	1072	}
738	1073
		@@ -778,9 +1113,9 @@
778	1113	$data = $this->_getChartArray();
779	1114	$render = new Visualizer_Render_Page_Data();
780	1115	$render->chart = $this->_chart;
781	1116	$render->type = $data['type'];
782		- unset( $data['settings']['width'], $data['settings']['height'] );
	1117	+ unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
783	1118	wp_enqueue_style( 'visualizer-frame' );
784	1119	wp_enqueue_script( 'visualizer-render' );
785	1120	wp_localize_script(
786	1121	'visualizer-render',
		@@ -794,13 +1129,16 @@
794	1129	'canvas' => $data,
795	1130	),
796	1131	)
797	1132	);
798		- // Added by Ash/Upwork
799		- if ( VISUALIZER_PRO ) {
	1133	+
	1134	+ do_action( 'visualizer_enqueue_scripts_and_styles', $data );
	1135	+
	1136	+ if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
800	1137	global $Visualizer_Pro;
801	1138	$Visualizer_Pro->_enqueueScriptsAndStyles( $data );
802	1139	}
	1140	+
803	1141	// Added by Ash/Upwork
804	1142	$this->_addAction( 'admin_head', 'renderFlattrScript' );
805	1143	wp_iframe( array( $render, 'render' ) );
806	1144	}