← All changes | classes/Visualizer/Module/Chart.php +309 -593 3.1.3 → 1.7.6 View file →

		@@ -1,5 +1,6 @@
1	1	<?php
	2	+
2	3	// +----------------------------------------------------------------------+
3	4	// | Copyright 2013 Madpixels (email : visualizer@madpixels.net) |
4	5	// +----------------------------------------------------------------------+
5	6	// | This program is free software; you can redistribute it and/or modify |
		@@ -45,13 +46,13 @@
45	46	*
46	47	* @since 1.0.0
47	48	*
48	49	* @access public
49		- *
50	50	* @param Visualizer_Plugin $plugin The instance of the plugin.
51	51	*/
52	52	public function __construct( Visualizer_Plugin $plugin ) {
53	53	parent::__construct( $plugin );
	54	+
54	55	$this->_addAjaxAction( Visualizer_Plugin::ACTION_GET_CHARTS, 'getCharts' );
55	56	$this->_addAjaxAction( Visualizer_Plugin::ACTION_DELETE_CHART, 'deleteChart' );
56	57	$this->_addAjaxAction( Visualizer_Plugin::ACTION_CREATE_CHART, 'renderChartPages' );
57	58	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' );
		@@ -56,80 +57,33 @@
56	57	$this->_addAjaxAction( Visualizer_Plugin::ACTION_CREATE_CHART, 'renderChartPages' );
57	58	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' );
58	59	$this->_addAjaxAction( Visualizer_Plugin::ACTION_UPLOAD_DATA, 'uploadData' );
59	60	$this->_addAjaxAction( Visualizer_Plugin::ACTION_CLONE_CHART, 'cloneChart' );
	61	+
	62	+ // Added by Ash/Upwork
60	63	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
61		-
62		- $this->_addAjaxAction( Visualizer_Plugin::ACTION_FETCH_DB_DATA, 'getQueryData' );
63		- $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_DB_QUERY, 'saveQuery' );
64		- $this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
	64	+ if ( defined( 'Visualizer_Pro' ) ) {
	65	+ global $Visualizer_Pro;
	66	+ list($action, $name, $class) = $Visualizer_Pro->_getAjaxAction( $this );
	67	+ $this->_addAjaxAction( $action, $name, $class );
	68	+ }
	69	+ // Added by Ash/Upwork
65	70	}
66	71
67	72	/**
68		- * Fetches charts from database.
	73	+ * Sends json response.
69	74	*
70		- * This method is also called from the media pop-up (classic editor: create a post and add chart from insert content).
71		- *
72	75	* @since 1.0.0
73	76	*
74		- * @access public
	77	+ * @access private
	78	+ * @param array $results The response array.
75	79	*/
76		- public function getCharts() {
77		- $query_args = array(
78		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
79		- 'posts_per_page' => 9,
80		- 'paged' => filter_input(
81		- INPUT_GET,
82		- 'page',
83		- FILTER_VALIDATE_INT,
84		- array(
85		- 'options' => array(
86		- 'min_range' => 1,
87		- 'default' => 1,
88		- ),
89		- )
90		- ),
91		- );
92		- $filter = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
93		- if ( empty( $filter ) ) {
94		- // 'filter' is from the modal from the add media button.
95		- $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
96		- }
	80	+ public function _sendResponse( $results ) {
	81	+ header( 'Content-type: application/json' );
	82	+ nocache_headers();
97	83
98		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
99		- $query_args['meta_query'] = array(
100		- array(
101		- 'key' => Visualizer_Plugin::CF_CHART_TYPE,
102		- 'value' => $filter,
103		- 'compare' => '=',
104		- ),
105		- );
106		- }
107		- $query = new WP_Query( $query_args );
108		- $charts = array();
109		- while ( $query->have_posts() ) {
110		- $chart = $query->next_post();
111		- $chart_data = $this->_getChartArray( $chart );
112		- $chart_data['id'] = $chart->ID;
113		- $chart_data['library'] = $this->load_chart_type( $chart->ID );
114		- $css = '';
115		- $settings = $chart_data['settings'];
116		- $arguments = $this->get_inline_custom_css( 'visualizer-chart-' . $chart->ID, $settings );
117		- if ( ! empty( $arguments ) ) {
118		- $css = $arguments[0];
119		- $settings = $arguments[1];
120		- }
121		- $chart_data['settings'] = $settings;
122		- $chart_data['css'] = $css;
123		- $charts[] = $chart_data;
124		- }
125		- self::_sendResponse(
126		- array(
127		- 'success' => true,
128		- 'data' => $charts,
129		- 'total' => $query->max_num_pages,
130		- )
131		- );
	84	+ echo json_encode( $results );
	85	+ exit;
132	86	}
133	87
134	88	/**
135	89	* Returns chart data required for rendering.
		@@ -136,11 +90,9 @@
136	90	*
137	91	* @since 1.0.0
138	92	*
139	93	* @access private
140		- *
141	94	* @param WP_Post $chart The chart object.
142		- *
143	95	* @return array The array of chart data.
144	96	*/
145	97	private function _getChartArray( WP_Post $chart = null ) {
146	98	if ( is_null( $chart ) ) {
		@@ -145,53 +97,68 @@
145	97	private function _getChartArray( WP_Post $chart = null ) {
146	98	if ( is_null( $chart ) ) {
147	99	$chart = $this->_chart;
148	100	}
149		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	101	+
	102	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
150	103	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
151		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
152		- $library = $this->load_chart_type( $chart->ID );
	104	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
153	105
154		- $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
155		- $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
156		- if ( ! empty( $atts['settings'] ) ) {
157		- $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
158		- }
159		-
160		- $css = '';
161		- $arguments = $this->get_inline_custom_css( 'visualizer-' . $chart->ID, $settings );
162		- if ( ! empty( $arguments ) ) {
163		- $css = $arguments[0];
164		- $settings = $arguments[1];
165		- }
166		-
167		- $date_formats = Visualizer_Source::get_date_formats_if_exists( $series, $data );
168		-
169	106	return array(
170	107	'type' => $type,
171	108	'series' => $series,
172		- 'settings' => $settings,
	109	+ 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ),
173	110	'data' => $data,
174		- 'library' => $library,
175		- 'css' => $css,
176		- 'date_formats' => $date_formats,
177	111	);
178	112	}
179	113
180	114	/**
181		- * Sends json response.
	115	+ * Fetches charts from database.
182	116	*
183	117	* @since 1.0.0
184	118	*
185		- * @access private
186		- *
187		- * @param array $results The response array.
	119	+ * @access public
188	120	*/
189		- public static function _sendResponse( $results ) {
190		- header( 'Content-type: application/json' );
191		- nocache_headers();
192		- echo json_encode( $results );
193		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	121	+ public function getCharts() {
	122	+ $query_args = array(
	123	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	124	+ 'posts_per_page' => 9,
	125	+ 'paged' => filter_input( INPUT_GET, 'page', FILTER_VALIDATE_INT, array(
	126	+ 'options' => array(
	127	+ 'min_range' => 1,
	128	+ 'default' => 1,
	129	+ ),
	130	+ ) ),
	131	+ );
	132	+
	133	+ $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
	134	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	135	+ $query_args['meta_query'] = array(
	136	+ array(
	137	+ 'key' => Visualizer_Plugin::CF_CHART_TYPE,
	138	+ 'value' => $filter,
	139	+ 'compare' => '=',
	140	+ ),
	141	+ );
	142	+ }
	143	+
	144	+ $query = new WP_Query( $query_args );
	145	+
	146	+ $charts = array();
	147	+ while ( $query->have_posts() ) {
	148	+ $chart = $query->next_post();
	149	+
	150	+ $chart_data = $this->_getChartArray( $chart );
	151	+ $chart_data['id'] = $chart->ID;
	152	+
	153	+ $charts[] = $chart_data;
	154	+ }
	155	+
	156	+ $this->_sendResponse( array(
	157	+ 'success' => true,
	158	+ 'data' => $charts,
	159	+ 'total' => $query->max_num_pages,
	160	+ ) );
194	161	}
195	162
196	163	/**
197	164	* Deletes a chart from database.
		@@ -201,72 +168,35 @@
201	168	*
202	169	* @access public
203	170	*/
204	171	public function deleteChart() {
205		- $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
	172	+ $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
206	173	$input_method = $is_post ? INPUT_POST : INPUT_GET;
207		- $chart_id = $success = false;
208		- $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
209		- $capable = current_user_can( 'delete_posts' );
	174	+
	175	+ $chart_id = $success = false;
	176	+ $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
	177	+ $capable = current_user_can( 'delete_posts' );
210	178	if ( $nonce && $capable ) {
211		- $chart_id = filter_input(
212		- $input_method,
213		- 'chart',
214		- FILTER_VALIDATE_INT,
215		- array(
216		- 'options' => array(
217		- 'min_range' => 1,
218		- ),
219		- )
220		- );
	179	+ $chart_id = filter_input( $input_method, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
221	180	if ( $chart_id ) {
222		- $chart = get_post( $chart_id );
	181	+ $chart = get_post( $chart_id );
223	182	$success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
224	183	}
225	184	}
	185	+
226	186	if ( $success ) {
227	187	wp_delete_post( $chart_id, true );
228	188	}
	189	+
229	190	if ( $is_post ) {
230		- self::_sendResponse(
231		- array(
232		- 'success' => $success,
233		- )
234		- );
	191	+ $this->_sendResponse( array( 'success' => $success ) );
235	192	}
	193	+
236	194	wp_redirect( wp_get_referer() );
237	195	exit;
238	196	}
239	197
240	198	/**
241		- * Delete charts that are still in auto-draft mode.
242		- */
243		- private function deleteOldCharts() {
244		- $query = new WP_Query(
245		- array(
246		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
247		- 'post_status' => 'auto-draft',
248		- 'fields' => 'ids',
249		- 'update_post_meta_cache' => false,
250		- 'update_post_term_cache' => false,
251		- 'posts_per_page' => 50,
252		- 'date_query' => array(
253		- array(
254		- 'before' => 'today',
255		- ),
256		- ),
257		- )
258		- );
259		-
260		- if ( $query->have_posts() ) {
261		- $ids = array();
262		- while ( $query->have_posts() ) {
263		- wp_delete_post( $query->next_post(), true );
264		- }
265		- }
266		- }
267		-
268		- /**
269	199	* Renders appropriate page for chart builder. Creates new auto draft chart
270	200	* if no chart has been specified.
271	201	*
272	202	* @since 1.0.0
		@@ -273,161 +203,150 @@
273	203	*
274	204	* @access public
275	205	*/
276	206	public function renderChartPages() {
277		- defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
	207	+ define( 'IFRAME_REQUEST', 1 );
	208	+
278	209	// check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
279		- $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
	210	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT );
280	211	if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
281		- $this->deleteOldCharts();
282		- $default_type = isset( $_GET['type'] ) && ! empty( $_GET['type'] ) ? $_GET['type'] : 'line';
283		- $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
	212	+ $default_type = 'line';
	213	+
	214	+ $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
284	215	$source->fetch();
285		- $chart_id = wp_insert_post(
286		- array(
287		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
288		- 'post_title' => 'Visualization',
289		- 'post_author' => get_current_user_id(),
290		- 'post_status' => 'auto-draft',
291		- 'post_content' => $source->getData(),
292		- )
293		- );
	216	+
	217	+ $chart_id = wp_insert_post( array(
	218	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	219	+ 'post_title' => 'Visualization',
	220	+ 'post_author' => get_current_user_id(),
	221	+ 'post_status' => 'auto-draft',
	222	+ 'post_content' => $source->getData(),
	223	+ ) );
	224	+
294	225	if ( $chart_id && ! is_wp_error( $chart_id ) ) {
295	226	add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
296	227	add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
297	228	add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
298	229	add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
299		- add_post_meta(
300		- $chart_id,
301		- Visualizer_Plugin::CF_SETTINGS,
302		- array(
303		- 'focusTarget' => 'datum',
304		- )
305		- );
306		- do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
	230	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, array( 'focusTarget' => 'datum' ) );
307	231	}
	232	+
308	233	wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
309		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	234	+ exit;
310	235	}
311	236
312		- $this->load_chart_type( $chart_id );
	237	+ // enqueue and register scripts and styles
	238	+ wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array(), Visualizer_Plugin::VERSION );
313	239
314		- // enqueue and register scripts and styles
315		- wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
316		- wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
	240	+ wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
	241	+ wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	242	+ wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
	243	+ wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'google-jsapi-new', 'visualizer-frame' ), Visualizer_Plugin::VERSION, true );
	244	+ wp_register_script( 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array( 'wp-color-picker', 'visualizer-render' ), Visualizer_Plugin::VERSION, true );
317	245
318		- 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 );
320		- wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
321		- wp_register_script(
322		- 'visualizer-render',
323		- VISUALIZER_ABSURL . 'js/render-facade.js',
324		- apply_filters( 'visualizer_assets_render', array( 'visualizer-frame', 'visualizer-customization' ), false ),
325		- Visualizer_Plugin::VERSION,
326		- true
327		- );
328		- wp_register_script(
329		- 'visualizer-preview',
330		- VISUALIZER_ABSURL . 'js/preview.js',
331		- array(
332		- 'wp-color-picker',
333		- 'visualizer-render',
334		- ),
335		- Visualizer_Plugin::VERSION,
336		- true
337		- );
338	246	// added by Ash/Upwork
339		- if ( VISUALIZER_PRO ) {
	247	+ if ( defined( 'Visualizer_Pro' ) ) {
340	248	global $Visualizer_Pro;
341	249	$Visualizer_Pro->_addScriptsAndStyles();
342	250	}
	251	+
343	252	// dispatch pages
344		- $this->_chart = get_post( $chart_id );
345		- $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
346		-
347		- // skip chart type pages only for existing charts.
348		- if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status && ( ! empty( $_GET['tab'] ) && 'visualizer' === $_GET['tab'] ) ) {
349		- $tab = 'settings';
350		- }
351		-
352		- if ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) {
353		- // if the cancel button is clicked.
354		- $this->undoRevisions( $chart_id, true );
355		- } elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
356		- // if the save button is clicked.
357		- $this->undoRevisions( $chart_id, false );
358		- } else {
359		- // if the edit button is clicked.
360		- $this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart );
361		- }
362		-
363		- switch ( $tab ) {
	253	+ $this->_chart = $chart;
	254	+ switch ( filter_input( INPUT_GET, 'tab' ) ) {
364	255	case 'settings':
	256	+ // changed by Ash/Upwork
365	257	$this->_handleDataAndSettingsPage();
366	258	break;
367		- case 'type': // fall through.
368		- case 'visualizer': // fall through.
	259	+ case 'type':
	260	+ default:
369	261	$this->_handleTypesPage();
370	262	break;
371		- default:
372		- do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
373		- break;
374	263	}
375		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	264	+
	265	+ exit;
376	266	}
377	267
378	268	/**
379		- * Load code editor assets.
	269	+ * Handles chart type selection page.
	270	+ *
	271	+ * @since 1.0.0
	272	+ *
	273	+ * @access private
380	274	*/
381		- private function loadCodeEditorAssets() {
382		- global $wp_version;
	275	+ private function _handleTypesPage() {
	276	+ // process post request
	277	+ if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
	278	+ $type = filter_input( INPUT_POST, 'type' );
	279	+ if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) {
	280	+ // save new chart type
	281	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
383	282
384		- if ( ! VISUALIZER_PRO ) {
385		- return;
	283	+ // if the chart has default data, update it with appropriate default data for new type
	284	+ if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
	285	+ $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
	286	+ $source->fetch();
	287	+
	288	+ $this->_chart->post_content = $source->getData();
	289	+ wp_update_post( $this->_chart->to_array() );
	290	+
	291	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	292	+ }
	293	+
	294	+ // redirect to next tab
	295	+ // changed by Ash/Upwork
	296	+ wp_redirect( add_query_arg( 'tab', 'settings' ) );
	297	+ return;
	298	+ }
386	299	}
387	300
388		- $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping();
	301	+ $render = new Visualizer_Render_Page_Types();
	302	+ $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	303	+ $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
	304	+ $render->chart = $this->_chart;
389	305
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 );
	306	+ wp_enqueue_style( 'visualizer-frame' );
	307	+ wp_enqueue_script( 'visualizer-frame' );
394	308
395		- wp_enqueue_script( 'visualizer-datatables' );
396		- wp_enqueue_style( 'visualizer-datatables-ui' );
	309	+ wp_iframe( array( $render, 'render' ) );
	310	+ }
397	311
398		- if ( version_compare( $wp_version, '4.9.0', '<' ) ) {
399		- // code mirror assets.
400		- wp_register_script( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
401		- wp_register_script( 'visualizer-codemirror-placeholder', '//codemirror.net/addon/display/placeholder.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
402		- wp_register_script( 'visualizer-codemirror-matchbrackets', '//codemirror.net/addon/edit/matchbrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
403		- wp_register_script( 'visualizer-codemirror-closebrackets', '//codemirror.net/addon/edit/closebrackets.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
404		- wp_register_script( 'visualizer-codemirror-sql', '//codemirror.net/mode/sql/sql.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
405		- wp_register_script( 'visualizer-codemirror-sql-hint', '//codemirror.net/addon/hint/sql-hint.js', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
406		- 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 );
407		- wp_register_style( 'visualizer-codemirror-core', '//codemirror.net/lib/codemirror.css', array(), Visualizer_Plugin::VERSION );
408		- wp_register_style( 'visualizer-codemirror-hint', '//codemirror.net/addon/hint/show-hint.css', array( 'visualizer-codemirror-core' ), Visualizer_Plugin::VERSION );
	312	+ /**
	313	+ * Handles chart data page.
	314	+ *
	315	+ * @since 1.0.0
	316	+ *
	317	+ * @access private
	318	+ */
	319	+ private function _handleDataPage() {
	320	+ $data = $this->_getChartArray();
409	321
410		- wp_enqueue_script( 'visualizer-codemirror-hint' );
411		- wp_enqueue_style( 'visualizer-codemirror-hint' );
412		- } else {
413		- wp_enqueue_code_editor(
414		- array(
415		- 'type' => 'sql',
416		- 'codemirror' => array(
417		- 'autofocus' => true,
418		- 'lineWrapping' => true,
419		- 'dragDrop' => false,
420		- 'matchBrackets' => true,
421		- 'autoCloseBrackets' => true,
422		- 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ),
423		- 'hintOptions' => array( 'tables' => $table_col_mapping ),
424		- ),
425		- )
426		- );
	322	+ $render = new Visualizer_Render_Page_Data();
	323	+ $render->chart = $this->_chart;
	324	+ $render->type = $data['type'];
	325	+
	326	+ unset( $data['settings']['width'], $data['settings']['height'] );
	327	+
	328	+ wp_enqueue_style( 'visualizer-frame' );
	329	+ wp_enqueue_script( 'visualizer-render' );
	330	+ wp_localize_script( 'visualizer-render', 'visualizer', array(
	331	+ 'l10n' => array(
	332	+ 'remotecsv_prompt' => esc_html__( 'Please, enter the URL of CSV file:', 'visualizer' ),
	333	+ 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
	334	+ ),
	335	+ 'charts' => array(
	336	+ 'canvas' => $data,
	337	+ ),
	338	+ ) );
	339	+
	340	+ // Added by Ash/Upwork
	341	+ if ( defined( 'Visualizer_Pro' ) ) {
	342	+ global $Visualizer_Pro;
	343	+ $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
427	344	}
	345	+ // Added by Ash/Upwork
	346	+ $this->_addAction( 'admin_head', 'renderFlattrScript' );
428	347
429		- return $table_col_mapping;
	348	+ wp_iframe( array( $render, 'render' ) );
430	349	}
431	350
432	351	/**
433	352	* Handle data and settings page
		@@ -432,147 +351,80 @@
432	351	/**
433	352	* Handle data and settings page
434	353	*/
435	354	private function _handleDataAndSettingsPage() {
436		- if ( isset( $_POST['map_api_key'] ) ) {
437		- update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
438		- }
439		- if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
	355	+ if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ) ) ) {
440	356	if ( $this->_chart->post_status == 'auto-draft' ) {
441	357	$this->_chart->post_status = 'publish';
442		-
443		- // 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		- // we do not want any difference in data so disable revisions temporarily.
445		- add_filter( 'wp_revisions_to_keep', '__return_false' );
446	358	wp_update_post( $this->_chart->to_array() );
447	359	}
448		- // save meta data only when it is NOT being canceled.
449		- if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
450		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
451		- }
452		- $render = new Visualizer_Render_Page_Send();
	360	+
	361	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
	362	+
	363	+ $render = new Visualizer_Render_Page_Send();
453	364	$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
	365	+
454	366	wp_iframe( array( $render, 'render' ) );
455		-
456	367	return;
457	368	}
458		- $data = $this->_getChartArray();
459		- $sidebar = '';
	369	+
	370	+ $data = $this->_getChartArray();
	371	+
	372	+ $sidebar = '';
460	373	$sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
461	374	if ( class_exists( $sidebar_class, true ) ) {
462		- $sidebar = new $sidebar_class( $data['settings'] );
	375	+ $sidebar = new $sidebar_class( $data['settings'] );
463	376	$sidebar->__series = $data['series'];
464		- $sidebar->__data = $data['data'];
	377	+ $sidebar->__data = $data['data'];
465	378	} else {
466		- $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
	379	+ $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
467	380	if ( $sidebar != '' ) {
468	381	$sidebar->__series = $data['series'];
469		- $sidebar->__data = $data['data'];
	382	+ $sidebar->__data = $data['data'];
470	383	}
471	384	}
	385	+
472	386	unset( $data['settings']['width'], $data['settings']['height'] );
	387	+
	388	+ wp_enqueue_style( 'visualizer-frame' );
473	389	wp_enqueue_style( 'wp-color-picker' );
474	390	wp_enqueue_style( 'visualizer-frame' );
	391	+
475	392	wp_enqueue_script( 'visualizer-preview' );
476		- wp_enqueue_script( 'visualizer-chosen' );
477	393	wp_enqueue_script( 'visualizer-render' );
	394	+ wp_localize_script( 'visualizer-render', 'visualizer', array(
	395	+ 'l10n' => array(
	396	+ 'remotecsv_prompt' => esc_html__( 'Please, enter the URL of CSV file:', 'visualizer' ),
	397	+ 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
	398	+ ),
	399	+ 'charts' => array(
	400	+ 'canvas' => $data,
	401	+ ),
	402	+ ) );
478	403
479		- $table_col_mapping = $this->loadCodeEditorAssets();
	404	+ $render = new Visualizer_Render_Page_Data();
	405	+ $render->chart = $this->_chart;
	406	+ $render->type = $data['type'];
480	407
481		- wp_localize_script(
482		- 'visualizer-render',
483		- 'visualizer',
484		- array(
485		- 'l10n' => array(
486		- 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
487		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
488		- ),
489		- 'charts' => array(
490		- 'canvas' => $data,
491		- 'id' => $this->_chart->ID,
492		- ),
493		- 'language' => $this->get_language(),
494		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
495		- 'ajax' => array(
496		- 'url' => admin_url( 'admin-ajax.php' ),
497		- 'nonces' => array(
498		- 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
499		- 'db_get_data' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION ),
500		- ),
501		- 'actions' => array(
502		- 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
503		- 'db_get_data' => Visualizer_Plugin::ACTION_FETCH_DB_DATA,
504		- ),
505		- ),
506		- 'db_query' => array(
507		- 'tables' => $table_col_mapping,
508		- ),
509		- 'is_pro' => VISUALIZER_PRO,
510		- 'page_type' => 'chart',
511		- )
512		- );
513		-
514		- $render = new Visualizer_Render_Page_Data();
515		- $render->chart = $this->_chart;
516		- $render->type = $data['type'];
517		- $render->custom_css = $data['css'];
518	408	$render->sidebar = $sidebar;
519	409	if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
520	410	$render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
521	411	? esc_html__( 'Save Chart', 'visualizer' )
522	412	: esc_html__( 'Create Chart', 'visualizer' );
523		- if ( filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART ) {
524		- $render->cancel_button = esc_html__( 'Cancel', 'visualizer' );
525		- }
526	413	} else {
527	414	$render->button = esc_attr__( 'Insert Chart', 'visualizer' );
528	415	}
529		- if ( VISUALIZER_PRO ) {
	416	+
	417	+ if ( defined( 'Visualizer_Pro' ) ) {
530	418	global $Visualizer_Pro;
531	419	$Visualizer_Pro->_enqueueScriptsAndStyles( $data );
532	420	}
	421	+
533	422	$this->_addAction( 'admin_head', 'renderFlattrScript' );
534		- wp_iframe( array( $render, 'render' ) );
535		- }
536	423
537		- /**
538		- * Handles chart type selection page.
539		- *
540		- * @since 1.0.0
541		- *
542		- * @access private
543		- */
544		- private function _handleTypesPage() {
545		- // process post request
546		- if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
547		- $type = filter_input( INPUT_POST, 'type' );
548		- if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) {
549		- // save new chart type
550		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
551		- // if the chart has default data, update it with appropriate default data for new type
552		- if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
553		- $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
554		- $source->fetch();
555		- $this->_chart->post_content = $source->getData();
556		- wp_update_post( $this->_chart->to_array() );
557		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
558		- }
559		- // redirect to next tab
560		- // changed by Ash/Upwork
561		- wp_redirect( add_query_arg( 'tab', 'settings' ) );
562		-
563		- return;
564		- }
565		- }
566		- $render = new Visualizer_Render_Page_Types();
567		- $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
568		- $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
569		- $render->chart = $this->_chart;
570		- wp_enqueue_style( 'visualizer-frame' );
571		- wp_enqueue_script( 'visualizer-frame' );
572	424	wp_iframe( array( $render, 'render' ) );
573	425	}
574		-
	426	+ // changed by Ash/Upwork
575	427	/**
576	428	* Renders flattr script in the iframe <head>
577	429	*
578	430	* @since 1.4.2
		@@ -582,9 +434,9 @@
582	434	*/
583	435	public function renderFlattrScript() {
584	436	echo '';
585	437	}
586		- // changed by Ash/Upwork
	438	+
587	439	/**
588	440	* Parses uploaded CSV file and saves new data for the chart.
589	441	*
590	442	* @since 1.0.0
		@@ -591,93 +443,55 @@
591	443	*
592	444	* @access public
593	445	*/
594	446	public function uploadData() {
595		- // if this is being called internally from pro and VISUALIZER_DO_NOT_DIE is set.
596		- // otherwise, assume this is a normal web request.
597		- $can_die = ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE );
598		-
599	447	// validate nonce
600		- if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {
601		- if ( ! $can_die ) {
602		- return;
603		- }
	448	+ if ( ! wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ) ) ) {
604	449	status_header( 403 );
605	450	exit;
606	451	}
607	452
608	453	// check chart, if chart exists
609		- // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
610		- $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
	454	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT );
611	455	if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
612		- if ( ! $can_die ) {
613		- return;
614		- }
615	456	status_header( 400 );
616	457	exit;
617	458	}
618	459
619		- if ( ! isset( $_POST['vz-import-time'] ) ) {
620		- apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
621		- }
622		-
623		- if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
624		- // delete the filters in case this chart is being uploaded from other data sources
625		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_FILTER_CONFIG );
626		- delete_post_meta( $chart_id, '__transient-' . Visualizer_Plugin::CF_FILTER_CONFIG );
627		- delete_post_meta( $chart_id, '__transient-' . Visualizer_Plugin::CF_DB_QUERY );
628		-
629		- // delete "import from db" specific parameters.
630		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY );
631		- delete_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE );
632		- }
633		-
634	460	$source = null;
635	461	$render = new Visualizer_Render_Page_Update();
636		- if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
	462	+ if ( filter_input( INPUT_POST, 'remote_data', FILTER_VALIDATE_URL ) ) {
637	463	$source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
638		- if ( isset( $_POST['vz-import-time'] ) ) {
639		- apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
640		- }
641	464	} elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
642	465	$source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
643		- } 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 );
	466	+
	467	+ // Added by Ash/Upwork
	468	+ } elseif ( defined( 'Visualizer_Pro' ) && isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
	469	+ global $Visualizer_Pro;
	470	+ $source = $Visualizer_Pro->_handleChartData( $_POST['chart_data'] );
	471	+ // Added by Ash/Upwork
645	472	} else {
646	473	$render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
647	474	}
	475	+
648	476	if ( $source ) {
649	477	if ( $source->fetch() ) {
650		- $content = $source->getData();
651		- $populate = true;
652		- if ( is_string( $content ) && is_array( unserialize( $content ) ) ) {
653		- $json = unserialize( $content );
654		- // if source exists, so should data. if source exists but data is blank, do not populate the chart.
655		- // if we populate the data even if it is empty, the chart will show "Table has no columns".
656		- if ( array_key_exists( 'source', $json ) && ! empty( $json['source'] ) && ( ! array_key_exists( 'data', $json ) || empty( $json['data'] ) ) ) {
657		- 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__ );
658		- $populate = false;
659		- }
660		- }
661		- if ( $populate ) {
662		- $chart->post_content = $content;
663		- }
	478	+ $chart->post_content = $source->getData();
664	479	wp_update_post( $chart->to_array() );
	480	+
665	481	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
666	482	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
667	483	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
668		- $render->id = $chart->ID;
669		- $render->data = json_encode( $source->getRawData() );
	484	+
	485	+ $render->data = json_encode( $source->getRawData() );
670	486	$render->series = json_encode( $source->getSeries() );
671	487	} else {
672	488	$render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
673	489	}
674	490	}
	491	+
675	492	$render->render();
676		- if ( ! $can_die ) {
677		- return;
678		- }
679		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	493	+ exit;
680	494	}
681	495
682	496	/**
683	497	* Clones the chart.
		@@ -687,37 +501,28 @@
687	501	* @access public
688	502	*/
689	503	public function cloneChart() {
690	504	$chart_id = $success = false;
691		- $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
692		- $capable = current_user_can( 'edit_posts' );
	505	+ $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
	506	+ $capable = current_user_can( 'edit_posts' );
693	507	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		- );
	508	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
704	509	if ( $chart_id ) {
705		- $chart = get_post( $chart_id );
	510	+ $chart = get_post( $chart_id );
706	511	$success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
707	512	}
708	513	}
	514	+
709	515	$redirect = wp_get_referer();
710	516	if ( $success ) {
711		- $new_chart_id = wp_insert_post(
712		- array(
713		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
714		- 'post_title' => 'Visualization',
715		- 'post_author' => get_current_user_id(),
716		- 'post_status' => $chart->post_status,
717		- 'post_content' => $chart->post_content,
718		- )
719		- );
	517	+ $new_chart_id = wp_insert_post( array(
	518	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	519	+ 'post_title' => 'Visualization',
	520	+ 'post_author' => get_current_user_id(),
	521	+ 'post_status' => $chart->post_status,
	522	+ 'post_content' => $chart->post_content,
	523	+ ) );
	524	+
720	525	if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
721	526	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
722	527	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
723	528	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
		@@ -722,17 +527,16 @@
722	527	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
723	528	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
724	529	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
725	530	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SETTINGS, get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) );
726		- $redirect = add_query_arg(
727		- array(
728		- 'page' => 'visualizer',
729		- 'type' => filter_input( INPUT_GET, 'type' ),
730		- ),
731		- admin_url( 'upload.php' )
732		- );
	531	+
	532	+ $redirect = add_query_arg( array(
	533	+ 'page' => 'visualizer',
	534	+ 'type' => filter_input( INPUT_GET, 'type' ),
	535	+ ), admin_url( 'upload.php' ) );
733	536	}
734	537	}
	538	+
735	539	wp_redirect( $redirect );
736	540	exit;
737	541	}
738	542
		@@ -744,167 +548,79 @@
744	548	* @access public
745	549	*/
746	550	public function exportData() {
747	551	check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' );
748		- $capable = current_user_can( 'edit_posts' );
	552	+
	553	+ $chart_id = $success = false;
	554	+ $capable = current_user_can( 'edit_posts' );
749	555	if ( $capable ) {
750		- $chart_id = isset( $_GET['chart'] ) ? filter_var(
751		- $_GET['chart'],
752		- FILTER_VALIDATE_INT,
753		- array(
754		- 'options' => array(
755		- 'min_range' => 1,
756		- ),
757		- )
758		- ) : '';
	556	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
759	557	if ( $chart_id ) {
760		- $data = $this->_getDataAs( $chart_id, 'csv' );
761		- if ( $data ) {
762		- echo wp_send_json_success( $data );
763		- }
	558	+ $chart = get_post( $chart_id );
	559	+ $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
764	560	}
765	561	}
766	562
767		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
768		- }
	563	+ if ( $success ) {
	564	+ $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
	565	+ $filename = $settings['title'];
	566	+ if ( empty( $filename ) ) {
	567	+ $filename = 'export.csv';
	568	+ } else {
	569	+ $filename .= '.csv';
	570	+ }
	571	+ $rows = array();
	572	+ $series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
	573	+ $data = unserialize( $chart->post_content );
	574	+ if ( ! empty( $series ) ) {
	575	+ $row = array();
	576	+ foreach ( $series as $array ) {
	577	+ $row[] = $array['label'];
	578	+ }
	579	+ $rows[] = $row;
769	580
770		- /**
771		- * Handles chart data page.
772		- *
773		- * @since 1.0.0
774		- *
775		- * @access private
776		- */
777		- private function _handleDataPage() {
778		- $data = $this->_getChartArray();
779		- $render = new Visualizer_Render_Page_Data();
780		- $render->chart = $this->_chart;
781		- $render->type = $data['type'];
782		- unset( $data['settings']['width'], $data['settings']['height'] );
783		- wp_enqueue_style( 'visualizer-frame' );
784		- wp_enqueue_script( 'visualizer-render' );
785		- wp_localize_script(
786		- 'visualizer-render',
787		- 'visualizer',
788		- array(
789		- 'l10n' => array(
790		- 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
791		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
792		- ),
793		- 'charts' => array(
794		- 'canvas' => $data,
795		- ),
796		- )
797		- );
798		- // Added by Ash/Upwork
799		- if ( VISUALIZER_PRO ) {
800		- global $Visualizer_Pro;
801		- $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
802		- }
803		- // Added by Ash/Upwork
804		- $this->_addAction( 'admin_head', 'renderFlattrScript' );
805		- wp_iframe( array( $render, 'render' ) );
806		- }
	581	+ $row = array();
	582	+ foreach ( $series as $array ) {
	583	+ $row[] = $array['type'];
	584	+ }
	585	+ $rows[] = $row;
	586	+ }
807	587
808		- /**
809		- * Returns the data for the query.
810		- *
811		- * @access public
812		- */
813		- public function getQueryData() {
814		- check_ajax_referer( Visualizer_Plugin::ACTION_FETCH_DB_DATA . Visualizer_Plugin::VERSION, 'security' );
	588	+ if ( ! empty( $data ) ) {
	589	+ foreach ( $data as $array ) {
	590	+ // ignore strings
	591	+ if ( ! is_array( $array ) ) { continue; }
815	592
816		- $params = wp_parse_args( $_POST['params'] );
817		- $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
818		- $html = $source->fetch( true );
819		- $error = '';
820		- if ( empty( $html ) ) {
821		- $error = $source->get_error();
822		- wp_send_json_error( array( 'msg' => $error ) );
823		- }
824		- wp_send_json_success( array( 'table' => $html ) );
825		- }
	593	+ // if this is an array of arrays...
	594	+ if ( is_array( $array[0] ) ) {
	595	+ foreach ( $array as $arr ) {
	596	+ $rows[] = $arr;
	597	+ }
	598	+ } else {
	599	+ // just an array
	600	+ $rows[] = $array;
	601	+ }
	602	+ }
	603	+ }
826	604
827		- /**
828		- * Saves the query and the schedule.
829		- *
830		- * @access public
831		- */
832		- public function saveQuery() {
833		- check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION, 'security' );
	605	+ $fp = tmpfile();
	606	+ foreach ( $rows as $row ) {
	607	+ fputcsv( $fp, $row );
	608	+ }
	609	+ rewind( $fp );
834	610
835		- $chart_id = filter_input(
836		- INPUT_GET,
837		- 'chart',
838		- FILTER_VALIDATE_INT,
839		- array(
840		- 'options' => array(
841		- 'min_range' => 1,
842		- ),
843		- )
844		- );
845		-
846		- $render = new Visualizer_Render_Page_Update();
847		- if ( $chart_id ) {
848		- $params = wp_parse_args( $_POST['params'] );
849		- $source = new Visualizer_Source_Query( stripslashes( $params['query'] ) );
850		- $source->fetch( false );
851		- $error = $source->get_error();
852		- if ( empty( $error ) ) {
853		- $hours = $_POST['refresh'];
854		- update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, stripslashes( $params['query'] ) );
855		- update_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
856		- update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
857		- update_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, $hours );
858		- update_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
859		-
860		- $schedules = get_option( Visualizer_Plugin::CF_DB_SCHEDULE, array() );
861		- $schedules[ $chart_id ] = time() + $hours * HOUR_IN_SECONDS;
862		- update_option( Visualizer_Plugin::CF_DB_SCHEDULE, $schedules );
863		-
864		- wp_update_post(
865		- array(
866		- 'ID' => $chart_id,
867		- 'post_content' => $source->getData(),
868		- )
869		- );
870		- $render->data = json_encode( $source->getRawData() );
871		- $render->series = json_encode( $source->getSeries() );
872		- } else {
873		- $render->message = $error;
	611	+ $csv = '';
	612	+ while ( ($array = fgetcsv( $fp )) !== false ) {
	613	+ if ( strlen( $csv ) > 0 ) { $csv .= PHP_EOL; }
	614	+ $csv .= implode( ',', $array );
874	615	}
875		- }
876		- $render->render();
877		- if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
878		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
879		- }
880		- }
	616	+ fclose( $fp );
881	617
	618	+ echo wp_send_json_success(array(
	619	+ 'csv' => $csv,
	620	+ 'name' => $filename,
	621	+ ));
	622	+ }// End if().
882	623
883		- /**
884		- * Saves the filter query and the schedule.
885		- *
886		- * @access public
887		- */
888		- public function saveFilter() {
889		- check_ajax_referer( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY . Visualizer_Plugin::VERSION, 'security' );
890		-
891		- $chart_id = filter_input(
892		- INPUT_GET,
893		- 'chart',
894		- FILTER_VALIDATE_INT,
895		- array(
896		- 'options' => array(
897		- 'min_range' => 1,
898		- ),
899		- )
900		- );
901		-
902		- $hours = $_POST['refresh'];
903		-
904		- do_action( 'visualizer_save_filter', $chart_id, $hours );
905		-
906		- if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
907		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
908		- }
	624	+ exit;
909	625	}
910	626	}