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