← All changes | classes/Visualizer/Gutenberg/Block.php +73 -24 3.1.0 → 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
		@@ -65,15 +66,15 @@
65	66	/**
66	67	* Enqueue front end and editor JavaScript and CSS
67	68	*/
68	69	public function enqueue_gutenberg_scripts() {
69		- $blockPath = VISUALIZER_ABSURL . '/classes/Visualizer/Gutenberg/build/block.js';
70		- $handsontableJS = VISUALIZER_ABSURL . '/classes/Visualizer/Gutenberg/build/handsontable.js';
71		- $stylePath = VISUALIZER_ABSURL . '/classes/Visualizer/Gutenberg/build/block.css';
72		- $handsontableCSS = VISUALIZER_ABSURL . '/classes/Visualizer/Gutenberg/build/handsontable.css';
	70	+ $blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.js';
	71	+ $handsontableJS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.js';
	72	+ $stylePath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.css';
	73	+ $handsontableCSS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.css';
73	74
74	75	if ( VISUALIZER_TEST_JS_CUSTOMIZATION ) {
75		- $version = filemtime( VISUALIZER_ABSPATH . '/classes/Visualizer/Gutenberg/build/block.js' );
	76	+ $version = filemtime( VISUALIZER_ABSPATH . 'classes/Visualizer/Gutenberg/build/block.js' );
76	77	} else {
77	78	$version = $this->version;
78	79	}
79	80
		@@ -78,13 +79,13 @@
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 );
	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	90	$type = 'business';
90	91	}
		@@ -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	*/
		@@ -120,13 +123,15 @@
120	123	/**
121	124	* Gutenberg Block Callback Function
122	125	*/
123	126	public function gutenberg_block_callback( $attr ) {
124		- $id = $attr['id'];
125		- if ( empty( $id ) || $id === 'none' ) {
126		- return ''; // no id = no fun
	127	+ if ( isset( $attr['id'] ) ) {
	128	+ $id = $attr['id'];
	129	+ if ( empty( $id ) || $id === 'none' ) {
	130	+ return ''; // no id = no fun
	131	+ }
	132	+ return '[visualizer id="' . $id . '"]';
127	133	}
128		- return '[visualizer id="' . $id . '"]';
129	134	}
130	135
131	136	/**
132	137	* Hook server side rendering into render callback
		@@ -150,8 +155,11 @@
150	155	'id' => array(
151	156	'sanitize_callback' => 'absint',
152	157	),
153	158	),
	159	+ 'permission_callback' => function () {
	160	+ return current_user_can( 'edit_posts' );
	161	+ },
154	162	)
155	163	);
156	164
157	165	register_rest_route(
		@@ -164,8 +172,11 @@
164	172	'url' => array(
165	173	'sanitize_callback' => 'esc_url_raw',
166	174	),
167	175	),
	176	+ 'permission_callback' => function () {
	177	+ return current_user_can( 'edit_posts' );
	178	+ },
168	179	)
169	180	);
170	181
171	182	register_rest_route(
		@@ -178,8 +189,11 @@
178	189	'type' => array(
179	190	'sanitize_callback' => 'sanitize_text_field',
180	191	),
181	192	),
	193	+ 'permission_callback' => function () {
	194	+ return current_user_can( 'edit_posts' );
	195	+ },
182	196	)
183	197	);
184	198	}
185	199
		@@ -186,13 +200,19 @@
186	200	/**
187	201	* Get Post Meta Fields
188	202	*/
189	203	public function get_visualizer_data( $post ) {
	204	+ if ( ! current_user_can( 'edit_posts' ) ) {
	205	+ return false;
	206	+ }
	207	+
190	208	$data = array();
191	209	$post_id = $post['id'];
192	210
193	211	$data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true );
194	212
	213	+ $data['visualizer-chart-library'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
	214	+
195	215	$data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true );
196	216
197	217	$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );
198	218
		@@ -216,9 +236,9 @@
216	236	$data['visualizer-chart-url'] = $import;
217	237	$data['visualizer-chart-schedule'] = $schedule;
218	238	}
219	239
220		- if ( VISUALIZER_PRO ) {
	240	+ if ( Visualizer_Module::is_pro() ) {
221	241	$permissions = get_post_meta( $post_id, Visualizer_PRO::CF_PERMISSIONS, true );
222	242
223	243	if ( ! empty( $permissions ) ) {
224	244	$data['visualizer-permissions'] = $permissions;
		@@ -231,30 +251,40 @@
231	251	/**
232	252	* Rest Callback Method
233	253	*/
234	254	public function update_chart_data( $data ) {
	255	+ if ( ! current_user_can( 'edit_posts' ) ) {
	256	+ return false;
	257	+ }
	258	+
235	259	if ( $data['id'] && ! is_wp_error( $data['id'] ) ) {
236	260
237		- update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_TYPE, $data['visualizer-chart-type'] );
238		- 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 );
239	266	update_post_meta( $data['id'], Visualizer_Plugin::CF_DEFAULT_DATA, $data['visualizer-default-data'] );
240	267	update_post_meta( $data['id'], Visualizer_Plugin::CF_SERIES, $data['visualizer-series'] );
241	268	update_post_meta( $data['id'], Visualizer_Plugin::CF_SETTINGS, $data['visualizer-settings'] );
242	269
243	270	if ( $data['visualizer-chart-url'] && $data['visualizer-chart-schedule'] ) {
244		- update_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL, $data['visualizer-chart-url'] );
245		- 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 );
246	275	} else {
247	276	delete_post_meta( $data['id'], Visualizer_Plugin::CF_CHART_URL );
248	277	apply_filters( 'visualizer_pro_remove_schedule', $data['id'] );
249	278	}
250	279
251		- if ( VISUALIZER_PRO ) {
	280	+ if ( Visualizer_Module::is_pro() ) {
252	281	update_post_meta( $data['id'], Visualizer_PRO::CF_PERMISSIONS, $data['visualizer-permissions'] );
253	282	}
254	283
255	284	if ( $data['visualizer-chart-url'] ) {
256		- $content['source'] = $data['visualizer-chart-url'];
	285	+ $chart_url = esc_url_raw( $data['visualizer-chart-url'] );
	286	+ $content['source'] = $chart_url;
257	287	$content['data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
258	288	} else {
259	289	$content = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
260	290	}
		@@ -294,21 +324,21 @@
294	324	if ( is_null( $series[ $i ] ) ) {
295	325	continue;
296	326	}
297	327
298		- if ( $row['type'] == 'number' ) {
	328	+ if ( $row['type'] === 'number' ) {
299	329	foreach ( $data as $o => $col ) {
300	330	$data[ $o ][ $i ] = ( is_numeric( $col[ $i ] ) ) ? floatval( $col[ $i ] ) : ( is_numeric( str_replace( ',', '', $col[ $i ] ) ) ? floatval( str_replace( ',', '', $col[ $i ] ) ) : null );
301	331	}
302	332	}
303	333
304		- if ( $row['type'] == 'boolean' ) {
	334	+ if ( $row['type'] === 'boolean' ) {
305	335	foreach ( $data as $o => $col ) {
306	336	$data[ $o ][ $i ] = ! empty( $col[ $i ] ) ? filter_validate( $col[ $i ], FILTER_VALIDATE_BOOLEAN ) : null;
307	337	}
308	338	}
309	339
310		- if ( $row['type'] == 'timeofday' ) {
	340	+ if ( $row['type'] === 'timeofday' ) {
311	341	foreach ( $data as $o => $col ) {
312	342	$date = new DateTime( '1984-03-16T' . $col[ $i ] );
313	343	if ( $date ) {
314	344	$data[ $o ][ $i ] = array(
		@@ -320,9 +350,9 @@
320	350	}
321	351	}
322	352	}
323	353
324		- if ( $row['type'] == 'string' ) {
	354	+ if ( $row['type'] === 'string' ) {
325	355	foreach ( $data as $o => $col ) {
326	356	$data[ $o ][ $i ] = $this->toUTF8( $col[ $i ] );
327	357	}
328	358	}
		@@ -344,8 +374,12 @@
344	374	/**
345	375	* Handle remote CSV data
346	376	*/
347	377	public function upload_csv_data( $data ) {
	378	+ if ( ! current_user_can( 'edit_posts' ) ) {
	379	+ return false;
	380	+ }
	381	+
348	382	if ( $data['url'] && ! is_wp_error( $data['url'] ) && filter_var( $data['url'], FILTER_VALIDATE_URL ) ) {
349	383	$source = new Visualizer_Source_Csv_Remote( $data['url'] );
350	384	if ( $source->fetch() ) {
351	385	$temp = $source->getData();
		@@ -367,8 +401,12 @@
367	401	/**
368	402	* Get permission data
369	403	*/
370	404	public function get_permission_data( $data ) {
	405	+ if ( ! current_user_can( 'edit_posts' ) ) {
	406	+ return false;
	407	+ }
	408	+
371	409	$options = array();
372	410	switch ( $data['type'] ) {
373	411	case 'users':
374	412	$query = new WP_User_Query(
		@@ -406,5 +444,16 @@
406	444	}
407	445	return $options;
408	446	}
409	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	+ }
410	459	}