← All changes | classes/Visualizer/Gutenberg/Block.php +63 -16 3.1.3 → 3.3.4 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
		@@ -78,16 +79,16 @@
78	79	}
79	80
80	81	// Enqueue the bundled block JS file
81	82	wp_enqueue_script( 'handsontable', $handsontableJS );
82		- wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable' ), $version, true );
	83	+ wp_enqueue_script( 'visualizer-gutenberg-block', $blockPath, array( 'wp-api', 'handsontable', 'visualizer-datatables', 'moment' ), $version, true );
83	84
84	85	$type = 'community';
85	86
86		- if ( VISUALIZER_PRO ) {
	87	+ if ( Visualizer_Module::is_pro() ) {
87	88	$type = 'pro';
88	89	if ( apply_filters( 'visualizer_is_business', false ) ) {
89		- $type = 'developer';
	90	+ $type = 'business';
90	91	}
91	92	}
92	93
93	94	$translation_array = array(
		@@ -93,14 +94,16 @@
93	94	$translation_array = array(
94	95	'isPro' => $type,
95	96	'proTeaser' => Visualizer_Plugin::PRO_TEASER_URL,
96	97	'absurl' => VISUALIZER_ABSURL,
	98	+ 'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(),
	99	+ 'adminPage' => menu_page_url( 'visualizer', false ),
97	100	);
98	101	wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array );
99	102
100	103	// Enqueue frontend and editor block styles
101	104	wp_enqueue_style( 'handsontable', $handsontableCSS );
102		- wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, '', $version );
	105	+ wp_enqueue_style( 'visualizer-gutenberg-block', $stylePath, array( 'visualizer-datatables' ), $version );
103	106	}
104	107	/**
105	108	* Hook server side rendering into render callback
106	109	*/
		@@ -152,8 +155,11 @@
152	155	'id' => array(
153	156	'sanitize_callback' => 'absint',
154	157	),
155	158	),
	159	+ 'permission_callback' => function () {
	160	+ return current_user_can( 'edit_posts' );
	161	+ },
156	162	)
157	163	);
158	164
159	165	register_rest_route(
		@@ -166,8 +172,11 @@
166	172	'url' => array(
167	173	'sanitize_callback' => 'esc_url_raw',
168	174	),
169	175	),
	176	+ 'permission_callback' => function () {
	177	+ return current_user_can( 'edit_posts' );
	178	+ },
170	179	)
171	180	);
172	181
173	182	register_rest_route(
		@@ -180,8 +189,11 @@
180	189	'type' => array(
181	190	'sanitize_callback' => 'sanitize_text_field',
182	191	),
183	192	),
	193	+ 'permission_callback' => function () {
	194	+ return current_user_can( 'edit_posts' );
	195	+ },
184	196	)
185	197	);
186	198	}
187	199
		@@ -188,13 +200,19 @@
188	200	/**
189	201	* Get Post Meta Fields
190	202	*/
191	203	public function get_visualizer_data( $post ) {
	204	+ if ( ! current_user_can( 'edit_posts' ) ) {
	205	+ return false;
	206	+ }
	207	+
192	208	$data = array();
193	209	$post_id = $post['id'];
194	210
195	211	$data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true );
196	212
	213	+ $data['visualizer-chart-library'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
	214	+
197	215	$data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true );
198	216
199	217	$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );
200	218
		@@ -218,9 +236,9 @@
218	236	$data['visualizer-chart-url'] = $import;
219	237	$data['visualizer-chart-schedule'] = $schedule;
220	238	}
221	239
222		- if ( VISUALIZER_PRO ) {
	240	+ if ( Visualizer_Module::is_pro() ) {
223	241	$permissions = get_post_meta( $post_id, Visualizer_PRO::CF_PERMISSIONS, true );
224	242
225	243	if ( ! empty( $permissions ) ) {
226	244	$data['visualizer-permissions'] = $permissions;
		@@ -233,30 +251,40 @@
233	251	/**
234	252	* Rest Callback Method
235	253	*/
236	254	public function update_chart_data( $data ) {
	255	+ if ( ! current_user_can( 'edit_posts' ) ) {
	256	+ return false;
	257	+ }
	258	+
237	259	if ( $data['id'] && ! is_wp_error( $data['id'] ) ) {
238	260
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'] );
	261	+ $chart_type = sanitize_text_field( $data['visualizer-chart-type'] );
	262	+ $source_type = sanitize_text_field( $data['visualizer-source'] );
	263	+
	264	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_TYPE, $chart_type );
	265	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_SOURCE, $source_type );
241	266	update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] );
242	267	update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] );
243	268	update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] );
244	269
245	270	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'] );
	271	+ $chart_url = esc_url_raw( $data['visualizer-chart-url'] );
	272	+ $chart_schedule = intval( $data['visualizer-chart-schedule'] );
	273	+ update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $chart_url );
	274	+ apply_filters( 'visualizer_pro_chart_schedule', $data['id'], $chart_url, $chart_schedule );
248	275	} else {
249	276	delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL );
250	277	apply_filters( 'visualizer_pro_remove_schedule', $data['id'] );
251	278	}
252	279
253		- if ( VISUALIZER_PRO ) {
	280	+ if ( Visualizer_Module::is_pro() ) {
254	281	update_post_meta( $data['id'], Visualizer_PRO::CF_PERMISSIONS, $data['visualizer-permissions'] );
255	282	}
256	283
257	284	if ( $data['visualizer-chart-url'] ) {
258		- $content['source'] = $data['visualizer-chart-url'];
	285	+ $chart_url = esc_url_raw( $data['visualizer-chart-url'] );
	286	+ $content['source'] = $chart_url;
259	287	$content['data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
260	288	} else {
261	289	$content = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
262	290	}
		@@ -296,21 +324,21 @@
296	324	if ( is_null( $series[ $i ] ) ) {
297	325	continue;
298	326	}
299	327
300		- if ( $row['type'] == 'number' ) {
	328	+ if ( $row['type'] === 'number' ) {
301	329	foreach ( $data as $o => $col ) {
302	330	$data[ $o ][ $i ] = ( is_numeric( $col[ $i ] ) ) ? floatval( $col[ $i ] ) : ( is_numeric( str_replace( ',', '', $col[ $i ] ) ) ? floatval( str_replace( ',', '', $col[ $i ] ) ) : null );
303	331	}
304	332	}
305	333
306		- if ( $row['type'] == 'boolean' ) {
	334	+ if ( $row['type'] === 'boolean' ) {
307	335	foreach ( $data as $o => $col ) {
308	336	$data[ $o ][ $i ] = ! empty( $col[ $i ] ) ? filter_validate( $col[ $i ], FILTER_VALIDATE_BOOLEAN ) : null;
309	337	}
310	338	}
311	339
312		- if ( $row['type'] == 'timeofday' ) {
	340	+ if ( $row['type'] === 'timeofday' ) {
313	341	foreach ( $data as $o => $col ) {
314	342	$date = new DateTime( '1984-03-16T' . $col[ $i ] );
315	343	if ( $date ) {
316	344	$data[ $o ][ $i ] = array(
		@@ -322,9 +350,9 @@
322	350	}
323	351	}
324	352	}
325	353
326		- if ( $row['type'] == 'string' ) {
	354	+ if ( $row['type'] === 'string' ) {
327	355	foreach ( $data as $o => $col ) {
328	356	$data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] );
329	357	}
330	358	}
		@@ -346,8 +374,12 @@
346	374	/**
347	375	* Handle remote CSV data
348	376	*/
349	377	public function upload_csv_data( $data ) {
	378	+ if ( ! current_user_can( 'edit_posts' ) ) {
	379	+ return false;
	380	+ }
	381	+
350	382	if ( $data['url'] && ! is_wp_error( $data['url'] ) && filter_var( $data['url'], FILTER_VALIDATE_URL ) ) {
351	383	$source = new Visualizer_Source_Csv_Remote( $data['url'] );
352	384	if ( $source->fetch() ) {
353	385	$temp = $source->getData();
		@@ -369,8 +401,12 @@
369	401	/**
370	402	* Get permission data
371	403	*/
372	404	public function get_permission_data( $data ) {
	405	+ if ( ! current_user_can( 'edit_posts' ) ) {
	406	+ return false;
	407	+ }
	408	+
373	409	$options = array();
374	410	switch ( $data['type'] ) {
375	411	case 'users':
376	412	$query = new WP_User_Query(
		@@ -408,5 +444,16 @@
408	444	}
409	445	return $options;
410	446	}
411	447
	448	+ /**
	449	+ * Filter Rest Query
	450	+ */
	451	+ public function add_rest_query_vars( $args, \WP_REST_Request $request ) {
	452	+ if ( isset( $request['meta_key'] ) && isset( $request['meta_value'] ) ) {
	453	+ $args['meta_key'] = $request->get_param( 'meta_key' );
	454	+ $args['meta_value'] = $request->get_param( 'meta_value' );
	455	+ $args['meta_compare'] = '!=';
	456	+ }
	457	+ return $args;
	458	+ }
412	459	}