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