← All changes | classes/Visualizer/Module/Chart.php +332 -624 3.1.3 → 1.5.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 |
		@@ -17,8 +18,9 @@
17	18	// | MA 02110-1301 USA |
18	19	// +----------------------------------------------------------------------+
19	20	// | Author: Eugene Manuilov <eugene@manuilov.org> |
20	21	// +----------------------------------------------------------------------+
	22	+
21	23	/**
22	24	* The module for all stuff related to getting, editing, creating and deleting charts.
23	25	*
24	26	* @category Visualizer
		@@ -45,13 +47,13 @@
45	47	*
46	48	* @since 1.0.0
47	49	*
48	50	* @access public
49		- *
50	51	* @param Visualizer_Plugin $plugin The instance of the plugin.
51	52	*/
52	53	public function __construct( Visualizer_Plugin $plugin ) {
53	54	parent::__construct( $plugin );
	55	+
54	56	$this->_addAjaxAction( Visualizer_Plugin::ACTION_GET_CHARTS, 'getCharts' );
55	57	$this->_addAjaxAction( Visualizer_Plugin::ACTION_DELETE_CHART, 'deleteChart' );
56	58	$this->_addAjaxAction( Visualizer_Plugin::ACTION_CREATE_CHART, 'renderChartPages' );
57	59	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' );
		@@ -56,80 +58,34 @@
56	58	$this->_addAjaxAction( Visualizer_Plugin::ACTION_CREATE_CHART, 'renderChartPages' );
57	59	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' );
58	60	$this->_addAjaxAction( Visualizer_Plugin::ACTION_UPLOAD_DATA, 'uploadData' );
59	61	$this->_addAjaxAction( Visualizer_Plugin::ACTION_CLONE_CHART, 'cloneChart' );
	62	+
	63	+ // Added by Ash/Upwork
60	64	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
	65	+ if( defined( 'Visualizer_Pro' ) ){
	66	+ global $Visualizer_Pro;
	67	+ list($action, $name, $class) = $Visualizer_Pro->_getAjaxAction($this);
	68	+ $this->_addAjaxAction($action, $name, $class);
	69	+ }
	70	+ // Added by Ash/Upwork
61	71
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' );
65	72	}
66	73
67	74	/**
68		- * Fetches charts from database.
	75	+ * Sends json response.
69	76	*
70		- * This method is also called from the media pop-up (classic editor: create a post and add chart from insert content).
71		- *
72	77	* @since 1.0.0
73	78	*
74		- * @access public
	79	+ * @access private
	80	+ * @param array $results The response array.
75	81	*/
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		- }
	82	+ public function _sendResponse( $results ) {
	83	+ header( 'Content-type: application/json' );
	84	+ nocache_headers();
97	85
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		- );
	86	+ echo json_encode( $results );
	87	+ exit;
132	88	}
133	89
134	90	/**
135	91	* Returns chart data required for rendering.
		@@ -136,11 +92,9 @@
136	92	*
137	93	* @since 1.0.0
138	94	*
139	95	* @access private
140		- *
141	96	* @param WP_Post $chart The chart object.
142		- *
143	97	* @return array The array of chart data.
144	98	*/
145	99	private function _getChartArray( WP_Post $chart = null ) {
146	100	if ( is_null( $chart ) ) {
		@@ -145,53 +99,68 @@
145	99	private function _getChartArray( WP_Post $chart = null ) {
146	100	if ( is_null( $chart ) ) {
147	101	$chart = $this->_chart;
148	102	}
149		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	103	+
	104	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
150	105	$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 );
	106	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
153	107
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	108	return array(
170	109	'type' => $type,
171	110	'series' => $series,
172		- 'settings' => $settings,
	111	+ 'settings' => get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ),
173	112	'data' => $data,
174		- 'library' => $library,
175		- 'css' => $css,
176		- 'date_formats' => $date_formats,
177	113	);
178	114	}
179	115
180	116	/**
181		- * Sends json response.
	117	+ * Fetches charts from database.
182	118	*
183	119	* @since 1.0.0
184	120	*
185		- * @access private
186		- *
187		- * @param array $results The response array.
	121	+ * @access public
188	122	*/
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();
	123	+ public function getCharts() {
	124	+ $query_args = array(
	125	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	126	+ 'posts_per_page' => 9,
	127	+ 'paged' => filter_input( INPUT_GET, 'page', FILTER_VALIDATE_INT, array(
	128	+ 'options' => array(
	129	+ 'min_range' => 1,
	130	+ 'default' => 1,
	131	+ )
	132	+ ) )
	133	+ );
	134	+
	135	+ $filter = filter_input( INPUT_GET, 'filter' );
	136	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	137	+ $query_args['meta_query'] = array(
	138	+ array(
	139	+ 'key' => Visualizer_Plugin::CF_CHART_TYPE,
	140	+ 'value' => $filter,
	141	+ 'compare' => '=',
	142	+ ),
	143	+ );
	144	+ }
	145	+
	146	+ $query = new WP_Query( $query_args );
	147	+
	148	+ $charts = array();
	149	+ while( $query->have_posts() ) {
	150	+ $chart = $query->next_post();
	151	+
	152	+ $chart_data = $this->_getChartArray( $chart );
	153	+ $chart_data['id'] = $chart->ID;
	154	+
	155	+ $charts[] = $chart_data;
	156	+ }
	157	+
	158	+ $this->_sendResponse( array(
	159	+ 'success' => true,
	160	+ 'data' => $charts,
	161	+ 'total' => $query->max_num_pages,
	162	+ ) );
194	163	}
195	164
196	165	/**
197	166	* Deletes a chart from database.
		@@ -201,72 +170,35 @@
201	170	*
202	171	* @access public
203	172	*/
204	173	public function deleteChart() {
205		- $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
	174	+ $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
206	175	$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' );
	176	+
	177	+ $chart_id = $success = false;
	178	+ $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
	179	+ $capable = current_user_can( 'delete_posts' );
210	180	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		- );
	181	+ $chart_id = filter_input( $input_method, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
221	182	if ( $chart_id ) {
222		- $chart = get_post( $chart_id );
	183	+ $chart = get_post( $chart_id );
223	184	$success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
224	185	}
225	186	}
	187	+
226	188	if ( $success ) {
227	189	wp_delete_post( $chart_id, true );
228	190	}
	191	+
229	192	if ( $is_post ) {
230		- self::_sendResponse(
231		- array(
232		- 'success' => $success,
233		- )
234		- );
	193	+ $this->_sendResponse( array( 'success' => $success ) );
235	194	}
	195	+
236	196	wp_redirect( wp_get_referer() );
237	197	exit;
238	198	}
239	199
240	200	/**
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	201	* Renders appropriate page for chart builder. Creates new auto draft chart
270	202	* if no chart has been specified.
271	203	*
272	204	* @since 1.0.0
		@@ -273,306 +205,228 @@
273	205	*
274	206	* @access public
275	207	*/
276	208	public function renderChartPages() {
277		- defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
	209	+ define ( 'IFRAME_REQUEST', 1 );
	210	+
278	211	// 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 ) : '';
280		- 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	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT );
	213	+ if ( !$chart_id || !( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
	214	+ $default_type = 'line';
	215	+
	216	+ $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
284	217	$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		- );
294		- if ( $chart_id && ! is_wp_error( $chart_id ) ) {
	218	+
	219	+ $chart_id = wp_insert_post( array(
	220	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	221	+ 'post_title' => 'Visualization',
	222	+ 'post_author' => get_current_user_id(),
	223	+ 'post_status' => 'auto-draft',
	224	+ 'post_content' => $source->getData(),
	225	+ ) );
	226	+
	227	+ if ( $chart_id && !is_wp_error( $chart_id ) ) {
295	228	add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
296	229	add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
297	230	add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
298	231	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 );
	232	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, array('focusTarget' => 'datum') );
307	233	}
308		- wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
309		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	234	+
	235	+ wp_redirect( add_query_arg( 'chart', (int)$chart_id ) );
	236	+ exit;
310	237	}
311	238
312		- $this->load_chart_type( $chart_id );
313		-
314	239	// 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_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array(), Visualizer_Plugin::VERSION );
317	241
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		- // added by Ash/Upwork
339		- if ( VISUALIZER_PRO ) {
340		- global $Visualizer_Pro;
341		- $Visualizer_Pro->_addScriptsAndStyles();
342		- }
343		- // dispatch pages
344		- $this->_chart = get_post( $chart_id );
345		- $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
	242	+ wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
	243	+ wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	244	+ wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array('google-jsapi-new'), null, true );
	245	+ wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'google-jsapi-new', 'visualizer-frame' ), Visualizer_Plugin::VERSION, true );
	246	+ wp_register_script( 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array( 'wp-color-picker', 'visualizer-render' ), Visualizer_Plugin::VERSION, true );
346	247
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		- }
	248	+ // added by Ash/Upwork
	249	+ if( defined( 'Visualizer_Pro' ) ){
	250	+ global $Visualizer_Pro;
	251	+ $Visualizer_Pro->_addScriptsAndStyles();
	252	+ }
351	253
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 ) {
	254	+ // dispatch pages
	255	+ $this->_chart = $chart;
	256	+ switch ( filter_input( INPUT_GET, 'tab' ) ) {
364	257	case 'settings':
	258	+ // changed by Ash/Upwork
365	259	$this->_handleDataAndSettingsPage();
366	260	break;
367		- case 'type': // fall through.
368		- case 'visualizer': // fall through.
	261	+ case 'type':
	262	+ default:
369	263	$this->_handleTypesPage();
370	264	break;
371		- default:
372		- do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
373		- break;
374	265	}
375		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	266	+
	267	+ exit;
376	268	}
377	269
378	270	/**
379		- * Load code editor assets.
	271	+ * Handles chart type selection page.
	272	+ *
	273	+ * @since 1.0.0
	274	+ *
	275	+ * @access private
380	276	*/
381		- private function loadCodeEditorAssets() {
382		- global $wp_version;
	277	+ private function _handleTypesPage() {
	278	+ // process post request
	279	+ if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_POST, 'nonce' ) ) ) {
	280	+ $type = filter_input( INPUT_POST, 'type' );
	281	+ if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) {
	282	+ // save new chart type
	283	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
383	284
384		- if ( ! VISUALIZER_PRO ) {
385		- return;
386		- }
	285	+ // if the chart has default data, update it with appropriate default data for new type
	286	+ if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
	287	+ $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
	288	+ $source->fetch();
387	289
388		- $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping();
	290	+ $this->_chart->post_content = $source->getData();
	291	+ wp_update_post( $this->_chart->to_array() );
389	292
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 );
	293	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	294	+ }
394	295
395		- wp_enqueue_script( 'visualizer-datatables' );
396		- wp_enqueue_style( 'visualizer-datatables-ui' );
	296	+ // redirect to next tab
	297	+ // changed by Ash/Upwork
	298	+ wp_redirect( add_query_arg( 'tab', 'settings' ) );
	299	+ return;
	300	+ }
	301	+ }
397	302
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 );
	303	+ $render = new Visualizer_Render_Page_Types();
	304	+ $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	305	+ $render->types = Visualizer_Plugin::getChartTypes();
	306	+ $render->chart = $this->_chart;
409	307
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		- );
427		- }
	308	+ wp_enqueue_style( 'visualizer-frame' );
	309	+ wp_enqueue_script( 'visualizer-frame' );
428	310
429		- return $table_col_mapping;
	311	+ wp_iframe( array( $render, 'render') );
430	312	}
431	313
432	314	/**
433		- * Handle data and settings page
	315	+ * Handles chart data page.
	316	+ *
	317	+ * @since 1.0.0
	318	+ *
	319	+ * @access private
434	320	*/
435		- 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'] ) ) {
	321	+ private function _handleDataPage() {
	322	+ $data = $this->_getChartArray();
	323	+
	324	+ $render = new Visualizer_Render_Page_Data();
	325	+ $render->chart = $this->_chart;
	326	+ $render->type = $data['type'];
	327	+
	328	+ unset( $data['settings']['width'], $data['settings']['height'] );
	329	+
	330	+ wp_enqueue_style( 'visualizer-frame' );
	331	+ wp_enqueue_script( 'visualizer-render' );
	332	+ wp_localize_script( 'visualizer-render', 'visualizer', array(
	333	+ 'l10n' => array(
	334	+ 'remotecsv_prompt' => esc_html__( 'Please, enter the URL of CSV file:', Visualizer_Plugin::NAME ),
	335	+ 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', Visualizer_Plugin::NAME ),
	336	+ ),
	337	+ 'charts' => array(
	338	+ 'canvas' => $data,
	339	+ ),
	340	+ ) );
	341	+
	342	+ // Added by Ash/Upwork
	343	+ if( defined( 'Visualizer_Pro' ) ){
	344	+ global $Visualizer_Pro;
	345	+ $Visualizer_Pro->_enqueueScriptsAndStyles($data);
	346	+ }
	347	+ // Added by Ash/Upwork
	348	+
	349	+ $this->_addAction( 'admin_head', 'renderFlattrScript' );
	350	+
	351	+ wp_iframe( array( $render, 'render') );
	352	+ }
	353	+
	354	+ // changed by Ash/Upwork
	355	+ private function _handleDataAndSettingsPage(){
	356	+ if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ) ) ) {
440	357	if ( $this->_chart->post_status == 'auto-draft' ) {
441	358	$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	359	wp_update_post( $this->_chart->to_array() );
447	360	}
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();
	361	+
	362	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
	363	+
	364	+ $render = new Visualizer_Render_Page_Send();
453	365	$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
454		- wp_iframe( array( $render, 'render' ) );
455	366
	367	+ wp_iframe( array( $render, 'render') );
456	368	return;
457	369	}
458		- $data = $this->_getChartArray();
459		- $sidebar = '';
	370	+
	371	+ $data = $this->_getChartArray();
	372	+
	373	+ $sidebar = '';
460	374	$sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
461	375	if ( class_exists( $sidebar_class, true ) ) {
462		- $sidebar = new $sidebar_class( $data['settings'] );
	376	+ $sidebar = new $sidebar_class( $data['settings'] );
463	377	$sidebar->__series = $data['series'];
464		- $sidebar->__data = $data['data'];
	378	+ $sidebar->__data = $data['data'];
465	379	} else {
466		- $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
467		- if ( $sidebar != '' ) {
468		- $sidebar->__series = $data['series'];
469		- $sidebar->__data = $data['data'];
470		- }
471		- }
	380	+ $sidebar = apply_filters("visualizer_pro_chart_type_sidebar", '', $data);
	381	+ if ($sidebar != '') {
	382	+ $sidebar->__series = $data['series'];
	383	+ $sidebar->__data = $data['data'];
	384	+ }
	385	+ }
	386	+
472	387	unset( $data['settings']['width'], $data['settings']['height'] );
	388	+
	389	+ wp_enqueue_style( 'visualizer-frame' );
473	390	wp_enqueue_style( 'wp-color-picker' );
474	391	wp_enqueue_style( 'visualizer-frame' );
	392	+
475	393	wp_enqueue_script( 'visualizer-preview' );
476		- wp_enqueue_script( 'visualizer-chosen' );
477	394	wp_enqueue_script( 'visualizer-render' );
	395	+ wp_localize_script( 'visualizer-render', 'visualizer', array(
	396	+ 'l10n' => array(
	397	+ 'remotecsv_prompt' => esc_html__( 'Please, enter the URL of CSV file:', Visualizer_Plugin::NAME ),
	398	+ 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', Visualizer_Plugin::NAME ),
	399	+ ),
	400	+ 'charts' => array(
	401	+ 'canvas' => $data,
	402	+ ),
	403	+ ) );
478	404
479		- $table_col_mapping = $this->loadCodeEditorAssets();
	405	+ $render = new Visualizer_Render_Page_Data();
	406	+ $render->chart = $this->_chart;
	407	+ $render->type = $data['type'];
480	408
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	409	$render->sidebar = $sidebar;
519	410	if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
520	411	$render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
521		- ? esc_html__( 'Save Chart', 'visualizer' )
522		- : 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		- }
	412	+ ? esc_html__( 'Save Chart', Visualizer_Plugin::NAME )
	413	+ : esc_html__( 'Create Chart', Visualizer_Plugin::NAME );
526	414	} else {
527		- $render->button = esc_attr__( 'Insert Chart', 'visualizer' );
	415	+ $render->button = esc_attr__( 'Insert Chart', Visualizer_Plugin::NAME );
528	416	}
529		- if ( VISUALIZER_PRO ) {
530		- global $Visualizer_Pro;
531		- $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
532		- }
	417	+
	418	+ if( defined( 'Visualizer_Pro' ) ){
	419	+ global $Visualizer_Pro;
	420	+ $Visualizer_Pro->_enqueueScriptsAndStyles($data);
	421	+ }
	422	+
533	423	$this->_addAction( 'admin_head', 'renderFlattrScript' );
534		- wp_iframe( array( $render, 'render' ) );
535		- }
536	424
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' ) );
	425	+ wp_iframe( array( $render, 'render') );
	426	+ }
	427	+ // changed by Ash/Upwork
562	428
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		- wp_iframe( array( $render, 'render' ) );
573		- }
574		-
575	429	/**
576	430	* Renders flattr script in the iframe <head>
577	431	*
578	432	* @since 1.4.2
		@@ -580,11 +434,11 @@
580	434	*
581	435	* @access public
582	436	*/
583	437	public function renderFlattrScript() {
584		- echo '';
	438	+ echo '';
585	439	}
586		- // changed by Ash/Upwork
	440	+
587	441	/**
588	442	* Parses uploaded CSV file and saves new data for the chart.
589	443	*
590	444	* @since 1.0.0
		@@ -591,93 +445,56 @@
591	445	*
592	446	* @access public
593	447	*/
594	448	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	449	// validate nonce
600		- if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {
601		- if ( ! $can_die ) {
602		- return;
603		- }
	450	+ if ( !wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ) ) ) {
604	451	status_header( 403 );
605	452	exit;
606	453	}
607	454
608	455	// 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 ) : '';
611		- if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
612		- if ( ! $can_die ) {
613		- return;
614		- }
	456	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT );
	457	+ if ( !$chart_id || !( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
615	458	status_header( 400 );
616	459	exit;
617	460	}
618	461
619		- if ( ! isset( $_POST['vz-import-time'] ) ) {
620		- apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
621		- }
	462	+ $source = null;
	463	+ $render = new Visualizer_Render_Page_Update();
	464	+ if ( filter_input( INPUT_POST, 'remote_data', FILTER_VALIDATE_URL ) ) {
	465	+ $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
	466	+ } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
	467	+ $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
622	468
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 );
	469	+ // Added by Ash/Upwork
	470	+ } elseif ( defined( 'Visualizer_Pro' ) && isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0){
	471	+ global $Visualizer_Pro;
	472	+ $source = $Visualizer_Pro->_handleChartData($_POST['chart_data']);
	473	+ // Added by Ash/Upwork
628	474
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 );
	475	+ } else {
	476	+ $render->message = esc_html__( "CSV file with chart data was not uploaded. Please, try again.", Visualizer_Plugin::NAME );
632	477	}
633	478
634		- $source = null;
635		- $render = new Visualizer_Render_Page_Update();
636		- if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
637		- $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		- } elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
642		- $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 );
645		- } else {
646		- $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
647		- }
648	479	if ( $source ) {
649	480	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		- }
	481	+ $chart->post_content = $source->getData();
664	482	wp_update_post( $chart->to_array() );
	483	+
665	484	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
666	485	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
667	486	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
668		- $render->id = $chart->ID;
669		- $render->data = json_encode( $source->getRawData() );
	487	+
	488	+ $render->data = json_encode( $source->getRawData() );
670	489	$render->series = json_encode( $source->getSeries() );
671	490	} else {
672		- $render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
	491	+ $render->message = esc_html__( "CSV file is broken or invalid. Please, try again.", Visualizer_Plugin::NAME );
673	492	}
674	493	}
	494	+
675	495	$render->render();
676		- if ( ! $can_die ) {
677		- return;
678		- }
679		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	496	+ exit;
680	497	}
681	498
682	499	/**
683	500	* Clones the chart.
		@@ -687,52 +504,42 @@
687	504	* @access public
688	505	*/
689	506	public function cloneChart() {
690	507	$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' );
	508	+ $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
	509	+ $capable = current_user_can( 'edit_posts' );
693	510	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		- );
	511	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
704	512	if ( $chart_id ) {
705		- $chart = get_post( $chart_id );
	513	+ $chart = get_post( $chart_id );
706	514	$success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
707	515	}
708	516	}
	517	+
709	518	$redirect = wp_get_referer();
710	519	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		- );
720		- if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
	520	+ $new_chart_id = wp_insert_post( array(
	521	+ 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
	522	+ 'post_title' => 'Visualization',
	523	+ 'post_author' => get_current_user_id(),
	524	+ 'post_status' => $chart->post_status,
	525	+ 'post_content' => $chart->post_content,
	526	+ ) );
	527	+
	528	+ if ( $new_chart_id && !is_wp_error( $new_chart_id ) ) {
721	529	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
722	530	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
723	531	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
724	532	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
725	533	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		- );
	534	+
	535	+ $redirect = add_query_arg( array(
	536	+ 'page' => 'visualizer',
	537	+ 'type' => filter_input( INPUT_GET, 'type' ),
	538	+ ), admin_url( 'upload.php' ) );
733	539	}
734	540	}
	541	+
735	542	wp_redirect( $redirect );
736	543	exit;
737	544	}
738	545
		@@ -743,168 +550,69 @@
743	550	*
744	551	* @access public
745	552	*/
746	553	public function exportData() {
747		- check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' );
748		- $capable = current_user_can( 'edit_posts' );
	554	+ check_ajax_referer(Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, "security");
	555	+
	556	+ $chart_id = $success = false;
	557	+ $capable = current_user_can( 'edit_posts' );
749	558	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		- ) : '';
	559	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
759	560	if ( $chart_id ) {
760		- $data = $this->_getDataAs( $chart_id, 'csv' );
761		- if ( $data ) {
762		- echo wp_send_json_success( $data );
763		- }
	561	+ $chart = get_post( $chart_id );
	562	+ $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
764	563	}
765	564	}
766	565
767		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
768		- }
	566	+ if ( $success ) {
	567	+ $settings = get_post_meta($chart_id, Visualizer_Plugin::CF_SETTINGS, true);
	568	+ $filename = $settings["title"];
	569	+ if (empty($filename)) {
	570	+ $filename = "export.csv";
	571	+ } else {
	572	+ $filename .= ".csv";
	573	+ }
	574	+ $rows = array();
	575	+ $series = get_post_meta($chart_id, Visualizer_Plugin::CF_SERIES, true);
	576	+ $data = unserialize($chart->post_content);
	577	+ if (!empty($series)) {
	578	+ $row = array();
	579	+ foreach ($series as $array) {
	580	+ $row[] = $array["label"];
	581	+ }
	582	+ $rows[] = $row;
769	583
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		- }
	584	+ $row = array();
	585	+ foreach ($series as $array) {
	586	+ $row[] = $array["type"];
	587	+ }
	588	+ $rows[] = $row;
	589	+ }
807	590
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' );
	591	+ if (!empty($data)) {
	592	+ foreach ($data as $array) {
	593	+ $rows[] = $array;
	594	+ }
	595	+ }
815	596
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		- }
	597	+ $fp = tmpfile();
	598	+ foreach ($rows as $row) {
	599	+ fputcsv($fp, $row);
	600	+ }
	601	+ rewind($fp);
826	602
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' );
	603	+ $csv = "";
	604	+ while (($array = fgetcsv($fp)) !== FALSE) {
	605	+ if (strlen($csv) > 0) $csv .= PHP_EOL;
	606	+ $csv .= implode(",", $array);
	607	+ }
	608	+ fclose($fp);
834	609
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;
874		- }
	610	+ echo wp_send_json_success(array(
	611	+ "csv" => $csv,
	612	+ "name" => $filename
	613	+ ));
875	614	}
876		- $render->render();
877		- if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
878		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
879		- }
880		- }
881	615
882		-
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		- }
	616	+ exit;
909	617	}
910		-}
	618	+}