← All changes | classes/Visualizer/Module/Chart.php +343 -326 3.0.6 → 1.6.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,63 +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' );
60		- // Added by Ash/Upwork
	62	+
	63	+ // Added by Ash/Upwork
61	64	$this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
62		- // Added by Ash/Upwork
	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
	71	+
63	72	}
64	73
65	74	/**
66		- * Fetches charts from database.
	75	+ * Sends json response.
67	76	*
68	77	* @since 1.0.0
69	78	*
70		- * @access public
	79	+ * @access private
	80	+ * @param array $results The response array.
71	81	*/
72		- public function getCharts() {
73		- $query_args = array(
74		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
75		- 'posts_per_page' => 9,
76		- 'paged' => filter_input(
77		- INPUT_GET, 'page', FILTER_VALIDATE_INT, array(
78		- 'options' => array(
79		- 'min_range' => 1,
80		- 'default' => 1,
81		- ),
82		- )
83		- ),
84		- );
85		- $filter = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
86		- if ( empty( $filter ) ) {
87		- // 'filter' is from the modal from the add media button.
88		- $filter = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
89		- }
	82	+ public function _sendResponse( $results ) {
	83	+ header( 'Content-type: application/json' );
	84	+ nocache_headers();
90	85
91		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
92		- $query_args['meta_query'] = array(
93		- array(
94		- 'key' => Visualizer_Plugin::CF_CHART_TYPE,
95		- 'value' => $filter,
96		- 'compare' => '=',
97		- ),
98		- );
99		- }
100		- $query = new WP_Query( $query_args );
101		- $charts = array();
102		- while ( $query->have_posts() ) {
103		- $chart = $query->next_post();
104		- $chart_data = $this->_getChartArray( $chart );
105		- $chart_data['id'] = $chart->ID;
106		- $charts[] = $chart_data;
107		- }
108		- self::_sendResponse(
109		- array(
110		- 'success' => true,
111		- 'data' => $charts,
112		- 'total' => $query->max_num_pages,
113		- )
114		- );
	86	+ echo json_encode( $results );
	87	+ exit;
115	88	}
116	89
117	90	/**
118	91	* Returns chart data required for rendering.
		@@ -119,11 +92,9 @@
119	92	*
120	93	* @since 1.0.0
121	94	*
122	95	* @access private
123		- *
124	96	* @param WP_Post $chart The chart object.
125		- *
126	97	* @return array The array of chart data.
127	98	*/
128	99	private function _getChartArray( WP_Post $chart = null ) {
129	100	if ( is_null( $chart ) ) {
		@@ -128,11 +99,12 @@
128	99	private function _getChartArray( WP_Post $chart = null ) {
129	100	if ( is_null( $chart ) ) {
130	101	$chart = $this->_chart;
131	102	}
132		- $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 );
133	105	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
134		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
	106	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
135	107
136	108	return array(
137	109	'type' => $type,
138	110	'series' => $series,
		@@ -141,21 +113,54 @@
141	113	);
142	114	}
143	115
144	116	/**
145		- * Sends json response.
	117	+ * Fetches charts from database.
146	118	*
147	119	* @since 1.0.0
148	120	*
149		- * @access private
150		- *
151		- * @param array $results The response array.
	121	+ * @access public
152	122	*/
153		- public static function _sendResponse( $results ) {
154		- header( 'Content-type: application/json' );
155		- nocache_headers();
156		- echo json_encode( $results );
157		- 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', FILTER_SANITIZE_STRING );
	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	+ ) );
158	163	}
159	164
160	165	/**
161	166	* Deletes a chart from database.
		@@ -165,36 +170,30 @@
165	170	*
166	171	* @access public
167	172	*/
168	173	public function deleteChart() {
169		- $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
	174	+ $is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
170	175	$input_method = $is_post ? INPUT_POST : INPUT_GET;
171		- $chart_id = $success = false;
172		- $nonce = wp_verify_nonce( filter_input( $input_method, 'nonce' ) );
173		- $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' );
174	180	if ( $nonce && $capable ) {
175		- $chart_id = filter_input(
176		- $input_method, 'chart', FILTER_VALIDATE_INT, array(
177		- 'options' => array(
178		- 'min_range' => 1,
179		- ),
180		- )
181		- );
	181	+ $chart_id = filter_input( $input_method, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
182	182	if ( $chart_id ) {
183		- $chart = get_post( $chart_id );
	183	+ $chart = get_post( $chart_id );
184	184	$success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
185	185	}
186	186	}
	187	+
187	188	if ( $success ) {
188	189	wp_delete_post( $chart_id, true );
189	190	}
	191	+
190	192	if ( $is_post ) {
191		- self::_sendResponse(
192		- array(
193		- 'success' => $success,
194		- )
195		- );
	193	+ $this->_sendResponse( array( 'success' => $success ) );
196	194	}
	195	+
197	196	wp_redirect( wp_get_referer() );
198	197	exit;
199	198	}
200	199
		@@ -206,166 +205,67 @@
206	205	*
207	206	* @access public
208	207	*/
209	208	public function renderChartPages() {
210		- defined( 'IFRAME_REQUEST' ) || define( 'IFRAME_REQUEST', 1 );
	209	+ define ( 'IFRAME_REQUEST', 1 );
	210	+
211	211	// check chart, if chart not exists, will create new one and redirects to the same page with proper chart id
212		- $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
213		- if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
	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	214	$default_type = 'line';
215		- $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
	215	+
	216	+ $source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $default_type . '.csv' );
216	217	$source->fetch();
217		- $chart_id = wp_insert_post(
218		- array(
219		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
220		- 'post_title' => 'Visualization',
221		- 'post_author' => get_current_user_id(),
222		- 'post_status' => 'auto-draft',
223		- 'post_content' => $source->getData(),
224		- )
225		- );
226		- 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 ) ) {
227	228	add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, $default_type );
228	229	add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
229	230	add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
230	231	add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
231		- add_post_meta(
232		- $chart_id, Visualizer_Plugin::CF_SETTINGS, array(
233		- 'focusTarget' => 'datum',
234		- )
235		- );
236		- do_action( 'visualizer_pro_new_chart_defaults', $chart_id );
	232	+ add_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, array('focusTarget' => 'datum') );
237	233	}
238		- wp_redirect( add_query_arg( 'chart', (int) $chart_id ) );
239		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
	234	+
	235	+ wp_redirect( add_query_arg( 'chart', (int)$chart_id ) );
	236	+ exit;
240	237	}
	238	+
241	239	// enqueue and register scripts and styles
242		- wp_register_script( 'visualizer-chosen', VISUALIZER_ABSURL . 'js/lib/chosen.jquery.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION );
243		- 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 );
244	241
245		- wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
246		- wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION, true );
	242	+ wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
247	243	wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
248		- wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
249		- wp_register_script(
250		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
251		- 'google-jsapi-old',
252		- 'google-jsapi-new',
253		- 'visualizer-frame',
254		- ), Visualizer_Plugin::VERSION, true
255		- );
256		- wp_register_script(
257		- 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array(
258		- 'wp-color-picker',
259		- 'visualizer-render',
260		- ), Visualizer_Plugin::VERSION, true
261		- );
262		- // added by Ash/Upwork
263		- if ( VISUALIZER_PRO ) {
264		- global $Visualizer_Pro;
265		- $Visualizer_Pro->_addScriptsAndStyles();
266		- }
267		- // dispatch pages
268		- $this->_chart = get_post( $chart_id );
269		- $tab = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
	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 );
270	247
271		- // skip chart type pages only for existing charts.
272		- if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status ) {
273		- $tab = 'settings';
274		- }
	248	+ // added by Ash/Upwork
	249	+ if( defined( 'Visualizer_Pro' ) ){
	250	+ global $Visualizer_Pro;
	251	+ $Visualizer_Pro->_addScriptsAndStyles();
	252	+ }
275	253
276		- switch ( $tab ) {
	254	+ // dispatch pages
	255	+ $this->_chart = $chart;
	256	+ switch ( filter_input( INPUT_GET, 'tab' ) ) {
277	257	case 'settings':
	258	+ // changed by Ash/Upwork
278	259	$this->_handleDataAndSettingsPage();
279	260	break;
280		- case 'type': // fall through.
281		- case 'visualizer': // fall through.
	261	+ case 'type':
	262	+ default:
282	263	$this->_handleTypesPage();
283	264	break;
284		- default:
285		- do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
286		- break;
287	265	}
288		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
289		- }
290	266
291		- /**
292		- * Handle data and settings page
293		- */
294		- private function _handleDataAndSettingsPage() {
295		- if ( isset( $_POST['map_api_key'] ) ) {
296		- update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
297		- }
298		- if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
299		- if ( $this->_chart->post_status == 'auto-draft' ) {
300		- $this->_chart->post_status = 'publish';
301		- wp_update_post( $this->_chart->to_array() );
302		- }
303		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
304		- $render = new Visualizer_Render_Page_Send();
305		- $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
306		- wp_iframe( array( $render, 'render' ) );
307		-
308		- return;
309		- }
310		- $data = $this->_getChartArray();
311		- $sidebar = '';
312		- $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
313		- if ( class_exists( $sidebar_class, true ) ) {
314		- $sidebar = new $sidebar_class( $data['settings'] );
315		- $sidebar->__series = $data['series'];
316		- $sidebar->__data = $data['data'];
317		- } else {
318		- $sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
319		- if ( $sidebar != '' ) {
320		- $sidebar->__series = $data['series'];
321		- $sidebar->__data = $data['data'];
322		- }
323		- }
324		- unset( $data['settings']['width'], $data['settings']['height'] );
325		- wp_enqueue_style( 'visualizer-frame' );
326		- wp_enqueue_style( 'wp-color-picker' );
327		- wp_enqueue_style( 'visualizer-frame' );
328		- wp_enqueue_script( 'visualizer-preview' );
329		- wp_enqueue_script( 'visualizer-render' );
330		- wp_localize_script(
331		- 'visualizer-render', 'visualizer', array(
332		- 'l10n' => array(
333		- 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
334		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
335		- ),
336		- 'charts' => array(
337		- 'canvas' => $data,
338		- ),
339		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
340		- 'ajax' => array(
341		- 'url' => admin_url( 'admin-ajax.php' ),
342		- 'nonces' => array(
343		- 'permissions' => wp_create_nonce( Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA ),
344		- ),
345		- 'actions' => array(
346		- 'permissions' => Visualizer_Plugin::ACTION_FETCH_PERMISSIONS_DATA,
347		- ),
348		- ),
349		- )
350		- );
351		- $render = new Visualizer_Render_Page_Data();
352		- $render->chart = $this->_chart;
353		- $render->type = $data['type'];
354		- $render->sidebar = $sidebar;
355		- if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
356		- $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
357		- ? esc_html__( 'Save Chart', 'visualizer' )
358		- : esc_html__( 'Create Chart', 'visualizer' );
359		- } else {
360		- $render->button = esc_attr__( 'Insert Chart', 'visualizer' );
361		- }
362		- if ( VISUALIZER_PRO ) {
363		- global $Visualizer_Pro;
364		- $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
365		- }
366		- $this->_addAction( 'admin_head', 'renderFlattrScript' );
367		- wp_iframe( array( $render, 'render' ) );
	267	+ exit;
368	268	}
369	269
370	270	/**
371	271	* Handles chart type selection page.
		@@ -380,33 +280,154 @@
380	280	$type = filter_input( INPUT_POST, 'type' );
381	281	if ( in_array( $type, Visualizer_Plugin::getChartTypes() ) ) {
382	282	// save new chart type
383	283	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, $type );
	284	+
384	285	// if the chart has default data, update it with appropriate default data for new type
385	286	if ( filter_var( get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, true ), FILTER_VALIDATE_BOOLEAN ) ) {
386	287	$source = new Visualizer_Source_Csv( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . $type . '.csv' );
387	288	$source->fetch();
	289	+
388	290	$this->_chart->post_content = $source->getData();
389	291	wp_update_post( $this->_chart->to_array() );
	292	+
390	293	update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
391	294	}
	295	+
392	296	// redirect to next tab
393	297	// changed by Ash/Upwork
394		- wp_redirect( add_query_arg( 'tab', 'settings' ) );
395		-
	298	+ wp_redirect( add_query_arg( 'tab', 'settings' ) );
396	299	return;
397	300	}
398	301	}
399		- $render = new Visualizer_Render_Page_Types();
400		- $render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
401		- $render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
	302	+
	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();
402	306	$render->chart = $this->_chart;
	307	+
403	308	wp_enqueue_style( 'visualizer-frame' );
404	309	wp_enqueue_script( 'visualizer-frame' );
405		- wp_iframe( array( $render, 'render' ) );
	310	+
	311	+ wp_iframe( array( $render, 'render') );
406	312	}
407	313
408	314	/**
	315	+ * Handles chart data page.
	316	+ *
	317	+ * @since 1.0.0
	318	+ *
	319	+ * @access private
	320	+ */
	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' ) ) ) {
	357	+ if ( $this->_chart->post_status == 'auto-draft' ) {
	358	+ $this->_chart->post_status = 'publish';
	359	+ wp_update_post( $this->_chart->to_array() );
	360	+ }
	361	+
	362	+ update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
	363	+
	364	+ $render = new Visualizer_Render_Page_Send();
	365	+ $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
	366	+
	367	+ wp_iframe( array( $render, 'render') );
	368	+ return;
	369	+ }
	370	+
	371	+ $data = $this->_getChartArray();
	372	+
	373	+ $sidebar = '';
	374	+ $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
	375	+ if ( class_exists( $sidebar_class, true ) ) {
	376	+ $sidebar = new $sidebar_class( $data['settings'] );
	377	+ $sidebar->__series = $data['series'];
	378	+ $sidebar->__data = $data['data'];
	379	+ } else {
	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	+
	387	+ unset( $data['settings']['width'], $data['settings']['height'] );
	388	+
	389	+ wp_enqueue_style( 'visualizer-frame' );
	390	+ wp_enqueue_style( 'wp-color-picker' );
	391	+ wp_enqueue_style( 'visualizer-frame' );
	392	+
	393	+ wp_enqueue_script( 'visualizer-preview' );
	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	+ ) );
	404	+
	405	+ $render = new Visualizer_Render_Page_Data();
	406	+ $render->chart = $this->_chart;
	407	+ $render->type = $data['type'];
	408	+
	409	+ $render->sidebar = $sidebar;
	410	+ if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
	411	+ $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
	412	+ ? esc_html__( 'Save Chart', Visualizer_Plugin::NAME )
	413	+ : esc_html__( 'Create Chart', Visualizer_Plugin::NAME );
	414	+ } else {
	415	+ $render->button = esc_attr__( 'Insert Chart', Visualizer_Plugin::NAME );
	416	+ }
	417	+
	418	+ if( defined( 'Visualizer_Pro' ) ){
	419	+ global $Visualizer_Pro;
	420	+ $Visualizer_Pro->_enqueueScriptsAndStyles($data);
	421	+ }
	422	+
	423	+ $this->_addAction( 'admin_head', 'renderFlattrScript' );
	424	+
	425	+ wp_iframe( array( $render, 'render') );
	426	+ }
	427	+ // changed by Ash/Upwork
	428	+
	429	+ /**
409	430	* Renders flattr script in the iframe <head>
410	431	*
411	432	* @since 1.4.2
412	433	* @action admin_head
		@@ -413,11 +434,11 @@
413	434	*
414	435	* @access public
415	436	*/
416	437	public function renderFlattrScript() {
417		- echo '';
	438	+ echo '';
418	439	}
419		- // changed by Ash/Upwork
	440	+
420	441	/**
421	442	* Parses uploaded CSV file and saves new data for the chart.
422	443	*
423	444	* @since 1.0.0
		@@ -425,61 +446,55 @@
425	446	* @access public
426	447	*/
427	448	public function uploadData() {
428	449	// validate nonce
429		- // do not use filter_input as it does not work for phpunit test cases, use filter_var instead
430		- if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {
	450	+ if ( !wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ) ) ) {
431	451	status_header( 403 );
432	452	exit;
433	453	}
	454	+
434	455	// check chart, if chart exists
435		- $chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
436		- if ( ! $chart_id || ! ( $chart = get_post( $chart_id ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) {
	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 ) {
437	458	status_header( 400 );
438	459	exit;
439	460	}
440		- if ( ! isset( $_POST['vz-import-time'] ) ) {
441		- apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
442		- }
443	461
444		- if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
445		- // delete the filters in case this chart is being uploaded from other data sources
446		- delete_post_meta( $chart_id, 'visualizer-filter-config' );
447		- }
448		-
449	462	$source = null;
450	463	$render = new Visualizer_Render_Page_Update();
451		- if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {
452		- $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
453		- if ( isset( $_POST['vz-import-time'] ) ) {
454		- apply_filters( 'visualizer_pro_chart_schedule', $chart_id, $_POST['remote_data'], $_POST['vz-import-time'] );
455		- }
	464	+ if ( filter_input( INPUT_POST, 'remote_data', FILTER_VALIDATE_URL ) ) {
	465	+ $source = new Visualizer_Source_Csv_Remote( $_POST['remote_data'] );
456	466	} elseif ( isset( $_FILES['local_data'] ) && $_FILES['local_data']['error'] == 0 ) {
457		- $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
458		- // Added by Ash/Upwork
459		- } elseif ( isset( $_POST['chart_data'] ) && strlen( $_POST['chart_data'] ) > 0 ) {
460		- $source = apply_filters( 'visualizer_pro_handle_chart_data', $_POST['chart_data'], '' );
461		- // Added by Ash/Upwork
462		- } else {
463		- $render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
	467	+ $source = new Visualizer_Source_Csv( $_FILES['local_data']['tmp_name'] );
	468	+
	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
	474	+
	475	+ } else {
	476	+ $render->message = esc_html__( "CSV file with chart data was not uploaded. Please, try again.", Visualizer_Plugin::NAME );
464	477	}
	478	+
465	479	if ( $source ) {
466	480	if ( $source->fetch() ) {
467	481	$chart->post_content = $source->getData();
468	482	wp_update_post( $chart->to_array() );
	483	+
469	484	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
470	485	update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
471	486	update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
472		- $render->data = json_encode( $source->getRawData() );
	487	+
	488	+ $render->data = json_encode( $source->getRawData() );
473	489	$render->series = json_encode( $source->getSeries() );
474	490	} else {
475		- $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 );
476	492	}
477	493	}
	494	+
478	495	$render->render();
479		- if ( ! ( defined( 'VISUALIZER_DO_NOT_DIE' ) && VISUALIZER_DO_NOT_DIE ) ) {
480		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
481		- }
	496	+ exit;
482	497	}
483	498
484	499	/**
485	500	* Clones the chart.
		@@ -489,48 +504,42 @@
489	504	* @access public
490	505	*/
491	506	public function cloneChart() {
492	507	$chart_id = $success = false;
493		- $nonce = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
494		- $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' );
495	510	if ( $nonce && $capable ) {
496		- $chart_id = filter_input(
497		- INPUT_GET, 'chart', FILTER_VALIDATE_INT, array(
498		- 'options' => array(
499		- 'min_range' => 1,
500		- ),
501		- )
502		- );
	511	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
503	512	if ( $chart_id ) {
504		- $chart = get_post( $chart_id );
	513	+ $chart = get_post( $chart_id );
505	514	$success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
506	515	}
507	516	}
	517	+
508	518	$redirect = wp_get_referer();
509	519	if ( $success ) {
510		- $new_chart_id = wp_insert_post(
511		- array(
512		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
513		- 'post_title' => 'Visualization',
514		- 'post_author' => get_current_user_id(),
515		- 'post_status' => $chart->post_status,
516		- 'post_content' => $chart->post_content,
517		- )
518		- );
519		- 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 ) ) {
520	529	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
521	530	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
522	531	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
523	532	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
524	533	add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SETTINGS, get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) );
525		- $redirect = add_query_arg(
526		- array(
527		- 'page' => 'visualizer',
528		- 'type' => filter_input( INPUT_GET, 'type' ),
529		- ), admin_url( 'upload.php' )
530		- );
	534	+
	535	+ $redirect = add_query_arg( array(
	536	+ 'page' => 'visualizer',
	537	+ 'type' => filter_input( INPUT_GET, 'type' ),
	538	+ ), admin_url( 'upload.php' ) );
531	539	}
532	540	}
	541	+
533	542	wp_redirect( $redirect );
534	543	exit;
535	544	}
536	545
		@@ -541,61 +550,69 @@
541	550	*
542	551	* @access public
543	552	*/
544	553	public function exportData() {
545		- check_ajax_referer( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION, 'security' );
546		- $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' );
547	558	if ( $capable ) {
548		- $chart_id = isset( $_GET['chart'] ) ? filter_var(
549		- $_GET['chart'], FILTER_VALIDATE_INT, array(
550		- 'options' => array(
551		- 'min_range' => 1,
552		- ),
553		- )
554		- ) : '';
	559	+ $chart_id = filter_input( INPUT_GET, 'chart', FILTER_VALIDATE_INT, array( 'options' => array( 'min_range' => 1 ) ) );
555	560	if ( $chart_id ) {
556		- $data = $this->_getDataAs( $chart_id, 'csv' );
557		- if ( $data ) {
558		- echo wp_send_json_success( $data );
559		- }
	561	+ $chart = get_post( $chart_id );
	562	+ $success = $chart && $chart->post_type == Visualizer_Plugin::CPT_VISUALIZER;
560	563	}
561	564	}
562	565
563		- defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
564		- }
	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;
565	583
566		- /**
567		- * Handles chart data page.
568		- *
569		- * @since 1.0.0
570		- *
571		- * @access private
572		- */
573		- private function _handleDataPage() {
574		- $data = $this->_getChartArray();
575		- $render = new Visualizer_Render_Page_Data();
576		- $render->chart = $this->_chart;
577		- $render->type = $data['type'];
578		- unset( $data['settings']['width'], $data['settings']['height'] );
579		- wp_enqueue_style( 'visualizer-frame' );
580		- wp_enqueue_script( 'visualizer-render' );
581		- wp_localize_script(
582		- 'visualizer-render', 'visualizer', array(
583		- 'l10n' => array(
584		- 'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
585		- 'loading' => esc_html__( 'Loading...', 'visualizer' ),
586		- ),
587		- 'charts' => array(
588		- 'canvas' => $data,
589		- ),
590		- )
591		- );
592		- // Added by Ash/Upwork
593		- if ( VISUALIZER_PRO ) {
594		- global $Visualizer_Pro;
595		- $Visualizer_Pro->_enqueueScriptsAndStyles( $data );
	584	+ $row = array();
	585	+ foreach ($series as $array) {
	586	+ $row[] = $array["type"];
	587	+ }
	588	+ $rows[] = $row;
	589	+ }
	590	+
	591	+ if (!empty($data)) {
	592	+ foreach ($data as $array) {
	593	+ $rows[] = $array;
	594	+ }
	595	+ }
	596	+
	597	+ $fp = tmpfile();
	598	+ foreach ($rows as $row) {
	599	+ fputcsv($fp, $row);
	600	+ }
	601	+ rewind($fp);
	602	+
	603	+ $csv = "";
	604	+ while (($array = fgetcsv($fp)) !== FALSE) {
	605	+ if (strlen($csv) > 0) $csv .= PHP_EOL;
	606	+ $csv .= implode(",", $array);
	607	+ }
	608	+ fclose($fp);
	609	+
	610	+ echo wp_send_json_success(array(
	611	+ "csv" => $csv,
	612	+ "name" => $filename
	613	+ ));
596	614	}
597		- // Added by Ash/Upwork
598		- $this->_addAction( 'admin_head', 'renderFlattrScript' );
599		- wp_iframe( array( $render, 'render' ) );
	615	+
	616	+ exit;
600	617	}
601		-}
	618	+}