← All changes | classes/Visualizer/Gutenberg/Block.php +371 -17 3.1.3 → 3.4.1 View file →

		@@ -45,9 +45,9 @@
45	45	/**
46	46	* Returns an instance of this class.
47	47	*/
48	48	public static function get_instance() {
49		- if ( null == self::$instance ) {
	49	+ if ( null === self::$instance ) {
50	50	self::$instance = new Visualizer_Gutenberg_Block();
51	51	}
52	52	return self::$instance;
53	53	}
		@@ -59,8 +59,9 @@
59	59	$this->version = Visualizer_Plugin::VERSION;
60	60	add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_gutenberg_scripts' ) );
61	61	add_action( 'init', array( $this, 'register_block_type' ) );
62	62	add_action( 'rest_api_init', array( $this, 'register_rest_endpoints' ) );
	63	+ add_filter( 'rest_visualizer_query', array( $this, 'add_rest_query_vars' ), 9, 2 );
63	64	}
64	65
65	66	/**
66	67	* Enqueue front end and editor JavaScript and CSS
		@@ -65,8 +66,10 @@
65	66	/**
66	67	* Enqueue front end and editor JavaScript and CSS
67	68	*/
68	69	public function enqueue_gutenberg_scripts() {
	70	+ global $wp_version;
	71	+
69	72	$blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.js';
70	73	$handsontableJS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.js';
71	74	$stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.css';
72	75	$handsontableCSS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.css';
		@@ -71,9 +74,9 @@
71	74	$stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.css';
72	75	$handsontableCSS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.css';
73	76
74	77	if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) {
75		- $version = filemtime( VISUALIZER_ABSPATH . 'classes/Visualizer/Gutenberg/build/block.js' );
	78	+ $version = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/block.js' );
76	79	} else {
77	80	$version = $this->version;
78	81	}
79	82
		@@ -78,29 +81,52 @@
78	81	}
79	82
80	83	// Enqueue the bundled block JS file
81	84	wp_enqueue_script( 'handsontable', $handsontableJS );
82		- wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable' ), $version, true );
	85	+ wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment' ), $version, true );
83	86
84	87	$type = 'community';
85	88
86		- if ( VISUALIZER_PRO ) {
	89	+ if ( Visualizer_Module::is_pro() ) {
87	90	$type = 'pro';
88	91	if ( apply_filters( 'visualizer_is_business', false ) ) {
89		- $type = 'developer';
	92	+ $type = 'business';
90	93	}
91	94	}
92	95
	96	+ $table_col_mapping = Visualizer_Source_Query_Params::get_all_db_tables_column_mapping( null, false );
	97	+
93	98	$translation_array = array(
94	99	'isPro' => $type,
95	100	'proTeaser' => Visualizer_Plugin::PRO_TEASER_URL,
96	101	'absurl' => VISUALIZER_ABSURL,
	102	+ 'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(),
	103	+ 'adminPage' => menu_page_url( 'visualizer', false ),
	104	+ 'sqlTable' => $table_col_mapping,
97	105	);
98	106	wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array );
99	107
100	108	// Enqueue frontend and editor block styles
101	109	wp_enqueue_style( 'handsontable', $handsontableCSS );
102		- wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, '', $version );
	110	+ wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, array( 'visualizer-datatables' ), $version );
	111	+
	112	+ if ( version_compare( $wp_version, '4.9.0', '>' ) ) {
	113	+
	114	+ wp_enqueue_code_editor(
	115	+ array(
	116	+ 'type' => 'sql',
	117	+ 'codemirror' => array(
	118	+ 'autofocus' => true,
	119	+ 'lineWrapping' => true,
	120	+ 'dragDrop' => false,
	121	+ 'matchBrackets' => true,
	122	+ 'autoCloseBrackets' => true,
	123	+ 'extraKeys' => array( 'Ctrl-Space' => 'autocomplete' ),
	124	+ 'hintOptions' => array( 'tables' => $table_col_mapping ),
	125	+ ),
	126	+ )
	127	+ );
	128	+ }
103	129	}
104	130	/**
105	131	* Hook server side rendering into render callback
106	132	*/
		@@ -143,8 +169,74 @@
143	169	);
144	170
145	171	register_rest_route(
146	172	'visualizer/v' . VISUALIZER_REST_VERSION,
	173	+ '/get-query-data',
	174	+ array(
	175	+ 'methods' => 'GET',
	176	+ 'callback' => array( $this, 'get_query_data' ),
	177	+ 'permission_callback' => function () {
	178	+ return current_user_can( 'edit_posts' );
	179	+ },
	180	+ )
	181	+ );
	182	+
	183	+ register_rest_route(
	184	+ 'visualizer/v' . VISUALIZER_REST_VERSION,
	185	+ '/get-json-root',
	186	+ array(
	187	+ 'methods' => 'GET',
	188	+ 'callback' => array( $this, 'get_json_root_data' ),
	189	+ 'args' => array(
	190	+ 'url' => array(
	191	+ 'sanitize_callback' => 'esc_url_raw',
	192	+ ),
	193	+ ),
	194	+ 'permission_callback' => function () {
	195	+ return current_user_can( 'edit_posts' );
	196	+ },
	197	+ )
	198	+ );
	199	+
	200	+ register_rest_route(
	201	+ 'visualizer/v' . VISUALIZER_REST_VERSION,
	202	+ '/get-json-data',
	203	+ array(
	204	+ 'methods' => 'GET',
	205	+ 'callback' => array( $this, 'get_json_data' ),
	206	+ 'args' => array(
	207	+ 'url' => array(
	208	+ 'sanitize_callback' => 'esc_url_raw',
	209	+ ),
	210	+ 'chart' => array(
	211	+ 'sanitize_callback' => 'absint',
	212	+ ),
	213	+ ),
	214	+ 'permission_callback' => function () {
	215	+ return current_user_can( 'edit_posts' );
	216	+ },
	217	+ )
	218	+ );
	219	+
	220	+ register_rest_route(
	221	+ 'visualizer/v' . VISUALIZER_REST_VERSION,
	222	+ '/set-json-data',
	223	+ array(
	224	+ 'methods' => 'GET',
	225	+ 'callback' => array( $this, 'set_json_data' ),
	226	+ 'args' => array(
	227	+ 'url' => array(
	228	+ 'sanitize_callback' => 'esc_url_raw',
	229	+ ),
	230	+ ),
	231	+ 'permission_callback' => function () {
	232	+ return current_user_can( 'edit_posts' );
	233	+ },
	234	+ )
	235	+ );
	236	+
	237	+ register_rest_route(
	238	+ 'visualizer/v' . VISUALIZER_REST_VERSION,
147	239	'/update-chart',
148	240	array(
149	241	'methods' => 'POST',
150	242	'callback' => array( $this, 'update_chart_data' ),
		@@ -152,8 +244,11 @@
152	244	'id' => array(
153	245	'sanitize_callback' => 'absint',
154	246	),
155	247	),
	248	+ 'permission_callback' => function () {
	249	+ return current_user_can( 'edit_posts' );
	250	+ },
156	251	)
157	252	);
158	253
159	254	register_rest_route(
		@@ -166,8 +261,11 @@
166	261	'url' => array(
167	262	'sanitize_callback' => 'esc_url_raw',
168	263	),
169	264	),
	265	+ 'permission_callback' => function () {
	266	+ return current_user_can( 'edit_posts' );
	267	+ },
170	268	)
171	269	);
172	270
173	271	register_rest_route(
		@@ -180,8 +278,11 @@
180	278	'type' => array(
181	279	'sanitize_callback' => 'sanitize_text_field',
182	280	),
183	281	),
	282	+ 'permission_callback' => function () {
	283	+ return current_user_can( 'edit_posts' );
	284	+ },
184	285	)
185	286	);
186	287	}
187	288
		@@ -188,13 +289,20 @@
188	289	/**
189	290	* Get Post Meta Fields
190	291	*/
191	292	public function get_visualizer_data( $post ) {
	293	+ if ( ! current_user_can( 'edit_posts' ) ) {
	294	+ return false;
	295	+ }
	296	+
192	297	$data = array();
193	298	$post_id = $post['id'];
194	299
195	300	$data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true );
196	301
	302	+ $library = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
	303	+ $data['visualizer-chart-library'] = $library;
	304	+
197	305	$data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true );
198	306
199	307	$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );
200	308
		@@ -209,18 +317,94 @@
209	317
210	318	// handle data filter hooks
211	319	$data['visualizer-data'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( get_the_content( $post_id ) ) ), $post_id, $data['visualizer-chart-type'] );
212	320
	321	+ $data['visualizer-data-exploded'] = '';
	322	+ // handle annotations for google charts
	323	+ if ( 'GoogleCharts' === $library ) {
	324	+ // this will contain the data of both axis.
	325	+ $settings = $data['visualizer-settings'];
	326	+ // this will contain data only of Y axis.
	327	+ $series = $data['visualizer-series'];
	328	+ $annotations = array();
	329	+ if ( isset( $settings['series'] ) ) {
	330	+ foreach ( $settings['series'] as $index => $serie ) {
	331	+ // skip X axis data.
	332	+ if ( $index === 0 ) {
	333	+ continue;
	334	+ }
	335	+ if ( ! empty( $serie['role'] ) ) {
	336	+ // this series is some kind of annotation, so let's collect its index.
	337	+ // the index will be +1 because the X axis value is index 0, which is being ignored.
	338	+ $annotations[ 'role' . ( intval( $index ) + 1 ) ] = $serie['role'];
	339	+ }
	340	+ }
	341	+ }
	342	+ if ( ! empty( $annotations ) ) {
	343	+ $exploded_data = array();
	344	+ $series_names = array();
	345	+ foreach ( $series as $index => $serie ) {
	346	+ // skip X axis data.
	347	+ if ( $index === 0 ) {
	348	+ continue;
	349	+ }
	350	+ if ( array_key_exists( 'role' . $index, $annotations ) ) {
	351	+ $series_names[] = (object) array( 'role' => $annotations[ 'role' . $index ], 'type' => $serie['type'] );
	352	+ } else {
	353	+ $series_names[] = $serie['label'];
	354	+ }
	355	+ }
	356	+ $exploded_data[] = $series_names;
	357	+
	358	+ foreach ( $data['visualizer-data'] as $datum ) {
	359	+ // skip X axis data.
	360	+ unset( $datum[0] );
	361	+ $exploded_data[] = $datum;
	362	+ }
	363	+ $data['visualizer-data-exploded'] = array( $exploded_data );
	364	+ }
	365	+ }
	366	+
213	367	$import = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_URL, true );
214	368
215	369	$schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
216	370
	371	+ $db_schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	372	+
	373	+ $db_query = get_post_meta( $post_id, Visualizer_Plugin::CF_DB_QUERY, true );
	374	+
	375	+ $json_url = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_URL, true );
	376	+
	377	+ $json_headers = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_HEADERS, true );
	378	+
	379	+ $json_schedule = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true );
	380	+
	381	+ $json_root = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_ROOT, true );
	382	+
	383	+ $json_paging = get_post_meta( $post_id, Visualizer_Plugin::CF_JSON_PAGING, true );
	384	+
217	385	if ( ! empty( $import ) && ! empty( $schedule ) ) {
218	386	$data['visualizer-chart-url'] = $import;
219	387	$data['visualizer-chart-schedule'] = $schedule;
220	388	}
221	389
222		- if ( VISUALIZER_PRO ) {
	390	+ if ( ! empty( $db_schedule ) && ! empty( $db_query ) ) {
	391	+ $data['visualizer-db-schedule'] = $db_schedule;
	392	+ $data['visualizer-db-query'] = $db_query;
	393	+ }
	394	+
	395	+ if ( ! empty( $json_url ) ) {
	396	+ $data['visualizer-json-schedule'] = $json_schedule;
	397	+ $data['visualizer-json-url'] = $json_url;
	398	+ $data['visualizer-json-headers'] = $json_headers;
	399	+ $data['visualizer-json-root'] = $json_root;
	400	+
	401	+ if ( Visualizer_Module::is_pro() && ! empty( $json_paging ) ) {
	402	+ $data['visualizer-json-paging'] = $json_paging;
	403	+ }
	404	+ }
	405	+
	406	+ if ( Visualizer_Module::is_pro() ) {
223	407	$permissions = get_post_meta( $post_id, Visualizer_PRO::CF_PERMISSIONS, true );
224	408
225	409	if ( ! empty( $permissions ) ) {
226	410	$data['visualizer-permissions'] = $permissions;
		@@ -230,33 +414,174 @@
230	414	return $data;
231	415	}
232	416
233	417	/**
	418	+ * Returns the data for the query.
	419	+ *
	420	+ * @access public
	421	+ */
	422	+ public function get_query_data( $data ) {
	423	+ if ( ! current_user_can( 'edit_posts' ) ) {
	424	+ return false;
	425	+ }
	426	+
	427	+ $source = new Visualizer_Source_Query( stripslashes( $data['query'] ) );
	428	+ $html = $source->fetch( true );
	429	+ $source->fetch( false );
	430	+ $name = $source->getSourceName();
	431	+ $series = $source->getSeries();
	432	+ $data = $source->getRawData();
	433	+ $error = '';
	434	+ if ( empty( $html ) ) {
	435	+ $error = $source->get_error();
	436	+ wp_send_json_error( array( 'msg' => $error ) );
	437	+ }
	438	+ wp_send_json_success( array( 'table' => $html, 'name' => $name, 'series' => $series, 'data' => $data ) );
	439	+ }
	440	+
	441	+ /**
	442	+ * Returns the JSON root.
	443	+ *
	444	+ * @access public
	445	+ */
	446	+ public function get_json_root_data( $data ) {
	447	+ if ( ! current_user_can( 'edit_posts' ) ) {
	448	+ return false;
	449	+ }
	450	+
	451	+ $source = new Visualizer_Source_Json( $data );
	452	+
	453	+ $roots = $source->fetchRoots();
	454	+ if ( empty( $roots ) ) {
	455	+ wp_send_json_error( array( 'msg' => $source->get_error() ) );
	456	+ }
	457	+
	458	+ wp_send_json_success( array( 'url' => $data['url'], 'roots' => $roots ) );
	459	+ }
	460	+
	461	+ /**
	462	+ * Returns the JSON data.
	463	+ *
	464	+ * @access public
	465	+ */
	466	+ public function get_json_data( $data ) {
	467	+ if ( ! current_user_can( 'edit_posts' ) ) {
	468	+ return false;
	469	+ }
	470	+
	471	+ $chart_id = $data['chart'];
	472	+
	473	+ if ( empty( $chart_id ) ) {
	474	+ wp_die();
	475	+ }
	476	+
	477	+ $source = new Visualizer_Source_Json( $data );
	478	+ $source->fetch();
	479	+ $table = $source->getRawData();
	480	+
	481	+ if ( empty( $table ) ) {
	482	+ wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
	483	+ }
	484	+
	485	+ $table = Visualizer_Render_Layout::show( 'editor-table', $table, $chart_id, 'viz-json-table', false, false );
	486	+ wp_send_json_success( array( 'table' => $table, 'root' => $data['root'], 'url' => $data['url'], 'paging' => $source->getPaginationElements() ) );
	487	+ }
	488	+
	489	+ /**
	490	+ * Set the JSON data.
	491	+ *
	492	+ * @access public
	493	+ */
	494	+ public function set_json_data( $data ) {
	495	+ if ( ! current_user_can( 'edit_posts' ) ) {
	496	+ return false;
	497	+ }
	498	+
	499	+ $source = new Visualizer_Source_Json( $data );
	500	+
	501	+ $table = $source->fetch();
	502	+ if ( empty( $table ) ) {
	503	+ wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
	504	+ }
	505	+
	506	+ $source->fetchFromEditableTable();
	507	+ $name = $source->getSourceName();
	508	+ $series = json_encode( $source->getSeries() );
	509	+ $data = json_encode( $source->getRawData() );
	510	+ wp_send_json_success( array( 'name' => $name, 'series' => $series, 'data' => $data ) );
	511	+ }
	512	+
	513	+ /**
234	514	* Rest Callback Method
235	515	*/
236	516	public function update_chart_data( $data ) {
	517	+ if ( ! current_user_can( 'edit_posts' ) ) {
	518	+ return false;
	519	+ }
	520	+
237	521	if ( $data['id'] && ! is_wp_error( $data['id'] ) ) {
238	522
239		- update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_TYPE, $data['visualizer-chart-type'] );
240		- update_post_meta( $data['id'], Visualizer_Plugin::CF_SOURCE, $data['visualizer-source'] );
	523	+ $chart_type = sanitize_text_field( $data['visualizer-chart-type'] );
	524	+ $source_type = sanitize_text_field( $data['visualizer-source'] );
	525	+
	526	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_TYPE, $chart_type );
	527	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_SOURCE, $source_type );
241	528	update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] );
242	529	update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] );
243	530	update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] );
244	531
245	532	if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) {
246		- update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $data['visualizer-chart-url'] );
247		- apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $data['visualizer-chart-url'], $data['visualizer-chart-schedule'] );
	533	+ $chart_url = esc_url_raw( $data['visualizer-chart-url'] );
	534	+ $chart_schedule = intval( $data['visualizer-chart-schedule'] );
	535	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url );
	536	+ apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $chart_url, $chart_schedule );
248	537	} else {
249	538	delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL );
250	539	apply_filters( 'visualizer_pro_remove_schedule', $data['id'] );
251	540	}
252	541
253		- if ( VISUALIZER_PRO ) {
	542	+ if ( $source_type === 'Visualizer_Source_Query' ) {
	543	+ $db_schedule = intval( $data['visualizer-db-schedule'] );
	544	+ $db_query = $data['visualizer-db-query'];
	545	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE, $db_schedule );
	546	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY, stripslashes( $db_query ) );
	547	+ } else {
	548	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE );
	549	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY );
	550	+ }
	551	+
	552	+ if ( $source_type === 'Visualizer_Source_Json' ) {
	553	+ $json_schedule = intval( $data['visualizer-json-schedule'] );
	554	+ $json_url = esc_url_raw( $data['visualizer-json-url'] );
	555	+ $json_headers = esc_url_raw( $data['visualizer-json-headers'] );
	556	+ $json_root = $data['visualizer-json-root'];
	557	+ $json_paging = $data['visualizer-json-paging'];
	558	+
	559	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_SCHEDULE, $json_schedule );
	560	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_URL, $json_url );
	561	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_HEADERS, $json_headers );
	562	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_ROOT, $json_root );
	563	+
	564	+ if ( ! empty( $json_paging ) ) {
	565	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING, $json_paging );
	566	+ } else {
	567	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING );
	568	+ }
	569	+ } else {
	570	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_SCHEDULE );
	571	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_URL );
	572	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_HEADERS );
	573	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_ROOT );
	574	+ delete_post_meta( $data['id'], Visualizer_Plugin::CF_JSON_PAGING );
	575	+ }
	576	+
	577	+ if ( Visualizer_Module::is_pro() ) {
254	578	update_post_meta( $data['id'], Visualizer_PRO::CF_PERMISSIONS, $data['visualizer-permissions'] );
255	579	}
256	580
257	581	if ( $data['visualizer-chart-url'] ) {
258		- $content['source'] = $data['visualizer-chart-url'];
	582	+ $chart_url = esc_url_raw( $data['visualizer-chart-url'] );
	583	+ $content['source'] = $chart_url;
259	584	$content['data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
260	585	} else {
261	586	$content = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
262	587	}
		@@ -296,21 +621,21 @@
296	621	if ( is_null( $series[ $i ] ) ) {
297	622	continue;
298	623	}
299	624
300		- if ( $row['type'] == 'number' ) {
	625	+ if ( $row['type'] === 'number' ) {
301	626	foreach ( $data as $o => $col ) {
302	627	$data[ $o ][ $i ] = ( is_numeric( $col[ $i ] ) ) ? floatval( $col[ $i ] ) : ( is_numeric( str_replace( ',', '', $col[ $i ] ) ) ? floatval( str_replace( ',', '', $col[ $i ] ) ) : null );
303	628	}
304	629	}
305	630
306		- if ( $row['type'] == 'boolean' ) {
	631	+ if ( $row['type'] === 'boolean' ) {
307	632	foreach ( $data as $o => $col ) {
308	633	$data[ $o ][ $i ] = ! empty( $col[ $i ] ) ? filter_validate( $col[ $i ], FILTER_VALIDATE_BOOLEAN ) : null;
309	634	}
310	635	}
311	636
312		- if ( $row['type'] == 'timeofday' ) {
	637	+ if ( $row['type'] === 'timeofday' ) {
313	638	foreach ( $data as $o => $col ) {
314	639	$date = new DateTime( '1984-03-16T' . $col[ $i ] );
315	640	if ( $date ) {
316	641	$data[ $o ][ $i ] = array(
		@@ -322,9 +647,9 @@
322	647	}
323	648	}
324	649	}
325	650
326		- if ( $row['type'] == 'string' ) {
	651	+ if ( $row['type'] === 'string' ) {
327	652	foreach ( $data as $o => $col ) {
328	653	$data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] );
329	654	}
330	655	}
		@@ -346,8 +671,12 @@
346	671	/**
347	672	* Handle remote CSV data
348	673	*/
349	674	public function upload_csv_data( $data ) {
	675	+ if ( ! current_user_can( 'edit_posts' ) ) {
	676	+ return false;
	677	+ }
	678	+
350	679	if ( $data['url'] && ! is_wp_error( $data['url'] ) && filter_var( $data['url'], FILTER_VALIDATE_URL ) ) {
351	680	$source = new Visualizer_Source_Csv_Remote( $data['url'] );
352	681	if ( $source->fetch() ) {
353	682	$temp = $source->getData();
		@@ -369,8 +698,12 @@
369	698	/**
370	699	* Get permission data
371	700	*/
372	701	public function get_permission_data( $data ) {
	702	+ if ( ! current_user_can( 'edit_posts' ) ) {
	703	+ return false;
	704	+ }
	705	+
373	706	$options = array();
374	707	switch ( $data['type'] ) {
375	708	case 'users':
376	709	$query = new WP_User_Query(
		@@ -408,5 +741,26 @@
408	741	}
409	742	return $options;
410	743	}
411	744
	745	+ /**
	746	+ * Filter Rest Query
	747	+ */
	748	+ public function add_rest_query_vars( $args, \WP_REST_Request $request ) {
	749	+ if ( isset( $request['meta_key'] ) && isset( $request['meta_value'] ) ) {
	750	+ $args['meta_query'] = array(
	751	+ 'relation' => 'OR',
	752	+ array(
	753	+ 'key' => $request->get_param( 'meta_key' ),
	754	+ 'value' => $request->get_param( 'meta_value' ),
	755	+ 'compare' => '!=',
	756	+ ),
	757	+ array(
	758	+ 'key' => $request->get_param( 'meta_key' ),
	759	+ 'value' => $request->get_param( 'meta_value' ),
	760	+ 'compare' => 'NOT EXISTS',
	761	+ ),
	762	+ );
	763	+ }
	764	+ return $args;
	765	+ }
412	766	}