← All changes | classes/Visualizer/Module/Frontend.php +42 -127 4.0.4 → 3.11.7 View file →

		@@ -46,9 +46,9 @@
46	46	*
47	47	* @access private
48	48	* @var bool
49	49	*/
50		- private $lazy_render_script = true;
	50	+ private $lazy_render_script = false;
51	51
52	52	/**
53	53	* Constructor.
54	54	*
		@@ -86,9 +86,9 @@
86	86
87	87	/**
88	88	* Adds the async attribute to certain scripts.
89	89	*/
90		- public function script_loader_tag( $tag, $handle, $src ) {
	90	+ function script_loader_tag( $tag, $handle, $src ) {
91	91	if ( is_admin() ) {
92	92	return $tag;
93	93	}
94	94	// Async scripts.
		@@ -97,9 +97,9 @@
97	97	if ( $async === $handle ) {
98	98	$tag = str_replace( ' src', ' async src', $tag );
99	99	break;
100	100	}
101		- }
	101	+ };
102	102
103	103	// Async scripts.
104	104	$scripts = array( 'dom-to-image' );
105	105	foreach ( array( 'async', 'defer' ) as $attr ) {
		@@ -123,9 +123,9 @@
123	123
124	124	/**
125	125	* Returns the language/locale.
126	126	*/
127		- public function getLanguage( $dummy, $only_language ) {
	127	+ function getLanguage( $dummy, $only_language ) {
128	128	return $this->get_language();
129	129	}
130	130
131	131
		@@ -131,9 +131,9 @@
131	131
132	132	/**
133	133	* Registers the endpoints
134	134	*/
135		- public function endpoint_register() {
	135	+ function endpoint_register() {
136	136	register_rest_route(
137	137	'visualizer/v' . VISUALIZER_REST_VERSION,
138	138	'/action/(?P<chart>\d+)/(?P<type>.+)/',
139	139	array(
		@@ -141,9 +141,9 @@
141	141	'methods' => array( 'POST', 'GET' ),
142	142	'args' => array(
143	143	'chart' => array(
144	144	'required' => true,
145		- 'sanitize_callback' => function ( $param ) {
	145	+ 'sanitize_callback' => function( $param ) {
146	146	return is_numeric( $param ) ? $param : null;
147	147	},
148	148	),
149	149	'type' => array(
		@@ -152,27 +152,16 @@
152	152	'enum' => array_merge( array( 'save', 'cancel' ), array_keys( $this->get_actions() ) ),
153	153	),
154	154	),
155	155	'permission_callback' => function ( WP_REST_Request $request ) {
156		- $chart_id = absint( $request->get_param( 'chart' ) );
157		- if ( ! $chart_id ) {
158		- return false;
	156	+ $chart_id = filter_var( sanitize_text_field( $request->get_param( 'chart' ), FILTER_VALIDATE_INT ) );
	157	+ if ( ! empty( $chart_id ) && in_array( $request->get_param( 'type' ), array( 'save', 'cancel' ), true ) ) {
	158	+ // let save and cancel go without any check as past version of pro
	159	+ // did not send the X-WP-Nonce
	160	+ // we can change this at a later date.
	161	+ return true;
159	162	}
160		-
161		- $chart = get_post( $chart_id );
162		- if ( ! $chart || Visualizer_Plugin::CPT_VISUALIZER !== $chart->post_type ) {
163		- return false;
164		- }
165		-
166		- if ( in_array( $request->get_param( 'type' ), array( 'save', 'cancel' ), true ) ) {
167		- return current_user_can( 'edit_post', $chart_id );
168		- }
169		-
170		- if ( 'publish' !== $chart->post_status ) {
171		- return current_user_can( 'edit_post', $chart_id );
172		- }
173		-
174		- return apply_filters( 'visualizer_pro_show_chart', true, $chart_id );
	163	+ return ! empty( $chart_id ) && apply_filters( 'visualizer_pro_show_chart', true, $chart_id );
175	164	},
176	165	'callback' => array( $this, 'perform_action' ),
177	166	)
178	167	);
		@@ -351,15 +340,12 @@
351	340	if ( ! is_admin() && ! empty( $chart_data['is_woocommerce_report'] ) ) {
352	341	return '';
353	342	}
354	343
355		- // in case revisions exist (skip D3 charts to avoid reverting AI data).
356		- $chart_library = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, true );
357		- if ( 'd3' !== $chart_library ) {
358		- $revisions = $this->undoRevisions( $chart->ID, true );
359		- if ( true === $revisions ) {
360		- $chart = get_post( $chart->ID );
361		- }
	344	+ // in case revisions exist.
	345	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
	346	+ if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) {
	347	+ $chart = get_post( $chart->ID );
362	348	}
363	349
364	350	$id = 'visualizer-' . $atts['id'];
365	351	$defaultClass = 'visualizer-front';
		@@ -396,11 +382,10 @@
396	382
397	383	$lazy_load = isset( $settings['lazy_load_chart'] ) ? $settings['lazy_load_chart'] : false;
398	384	$lazy_load = apply_filters( 'visualizer_lazy_load_chart', $lazy_load, $chart->ID );
399	385	$container_class = 'visualizer-front-container';
400		- if ( ! $lazy_load ) {
401		- $this->lazy_render_script = false;
402		- } else {
	386	+ if ( $lazy_load ) {
	387	+ $this->lazy_render_script = true;
403	388	$container_class .= ' visualizer-lazy-render';
404	389	}
405	390
406	391	// handle data filter hooks
		@@ -446,9 +431,9 @@
446	431	unset( $settings['controls'] );
447	432	}
448	433
449	434	// add chart to the array
450		- $chart_entry = array(
	435	+ $this->_charts[ $id ] = array(
451	436	'type' => $type,
452	437	'series' => $series,
453	438	'settings' => $settings,
454	439	'data' => $data,
		@@ -454,15 +439,8 @@
454	439	'data' => $data,
455	440	'library' => $library,
456	441	);
457	442
458		- // For D3 charts, include the stored code so the renderer can execute it.
459		- if ( 'd3' === $library ) {
460		- $chart_entry['code'] = get_post_meta( $chart->ID, Visualizer_Module_AIBuilder::CF_D3_CODE, true );
461		- }
462		-
463		- $this->_charts[ $id ] = $chart_entry;
464		-
465	443	$actions_div = '';
466	444	$actions_visible = apply_filters( 'visualizer_pro_add_actions', isset( $settings['actions'] ) ? $settings['actions'] : array(), $atts['id'] );
467	445	if ( ! empty( $actions_visible ) ) {
468	446	$actions = $this->get_actions();
		@@ -496,104 +474,42 @@
496	474
497	475	$_charts = array();
498	476	$_charts_type = '';
499	477	$count = 0;
500		- static $visualizer_localized = false;
501		- static $visualizer_charts = array();
502		- static $d3_localized = false;
503		- $facade_handle = 'visualizer-render-facade';
504	478	foreach ( $this->_charts as $id => $array ) {
505	479	$_charts = $this->_charts;
506	480	$library = $array['library'];
507	481	$_charts_type = $library;
508		- $facade_deps = apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true );
509		- if ( ! wp_script_is( $facade_handle, 'registered' ) ) {
	482	+ if ( ! wp_script_is( "visualizer-render-$library", 'registered' ) ) {
510	483	wp_register_script(
511		- $facade_handle,
	484	+ "visualizer-render-$library",
512	485	VISUALIZER_ABSURL . 'js/render-facade.js',
513		- $facade_deps,
	486	+ apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ),
514	487	Visualizer_Plugin::VERSION,
515	488	true
516	489	);
517		- wp_enqueue_script( $facade_handle );
518		- } else {
519		- // Ensure newly discovered dependencies are attached to the facade.
520		- global $wp_scripts;
521		- if ( isset( $wp_scripts->registered[ $facade_handle ] ) ) {
522		- $wp_scripts->registered[ $facade_handle ]->deps = array_unique(
523		- array_merge( $wp_scripts->registered[ $facade_handle ]->deps, $facade_deps )
524		- );
525		- }
526		- foreach ( $facade_deps as $dep_handle ) {
527		- wp_enqueue_script( $dep_handle );
528		- }
	490	+ wp_enqueue_script( "visualizer-render-$library" );
529	491	}
530	492
531		- // For D3 charts, also enqueue the dedicated renderer bundle.
532		- if ( 'd3' === $library ) {
533		- $d3_renderer_asset = VISUALIZER_ABSPATH . '/classes/Visualizer/D3Renderer/build/index.asset.php';
534		- if ( file_exists( $d3_renderer_asset ) && ! wp_script_is( 'visualizer-d3-renderer', 'registered' ) ) {
535		- /**
536		- * Ignore missing build asset in source checkout.
537		- *
538		- * @phpstan-ignore-next-line
539		- */
540		- $d3_asset = include $d3_renderer_asset;
541		- wp_register_script(
542		- 'visualizer-d3-renderer',
543		- VISUALIZER_ABSURL . 'classes/Visualizer/D3Renderer/build/index.js',
544		- array_merge( $d3_asset['dependencies'], array( 'jquery' ) ),
545		- $d3_asset['version'],
546		- true
547		- );
548		- wp_enqueue_script( 'visualizer-d3-renderer' );
549		- }
550		- if ( ! $d3_localized ) {
551		- wp_localize_script(
552		- 'visualizer-d3-renderer',
553		- 'vizD3Renderer',
554		- array(
555		- 'iframeJsUrl' => VISUALIZER_ABSURL . 'classes/Visualizer/D3Renderer/build/iframe.js',
556		- )
557		- );
558		- $d3_localized = true;
559		- }
	493	+ if ( wp_script_is( "visualizer-render-$_charts_type" ) && 0 === $count ) {
	494	+ wp_localize_script(
	495	+ "visualizer-render-$_charts_type",
	496	+ 'visualizer',
	497	+ array(
	498	+ 'charts' => $this->_charts,
	499	+ 'language' => $this->get_language(),
	500	+ 'map_api_key' => get_option( 'visualizer-map-api-key' ),
	501	+ 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
	502	+ 'wp_nonce' => wp_create_nonce( 'wp_rest' ),
	503	+ 'i10n' => array(
	504	+ 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
	505	+ ),
	506	+ 'page_type' => 'frontend',
	507	+ 'is_front' => true,
	508	+ )
	509	+ );
560	510	}
561		-
562		- if ( wp_script_is( $facade_handle ) && 0 === $count ) {
563		- if ( ! $visualizer_localized ) {
564		- $visualizer_charts = $this->_charts;
565		- wp_localize_script(
566		- $facade_handle,
567		- 'visualizer',
568		- array(
569		- 'charts' => $this->_charts,
570		- 'language' => $this->get_language(),
571		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
572		- 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
573		- 'wp_nonce' => wp_create_nonce( 'wp_rest' ),
574		- 'i10n' => array(
575		- 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
576		- ),
577		- 'page_type' => 'frontend',
578		- 'is_front' => true,
579		- )
580		- );
581		- $visualizer_localized = true;
582		- } else {
583		- $new_charts = array_diff_key( $this->_charts, $visualizer_charts );
584		- if ( ! empty( $new_charts ) ) {
585		- wp_add_inline_script(
586		- $facade_handle,
587		- 'window.visualizer = window.visualizer || {};' .
588		- 'window.visualizer.charts = Object.assign(window.visualizer.charts || {}, ' . wp_json_encode( $new_charts ) . ');',
589		- 'before'
590		- );
591		- $visualizer_charts = array_merge( $visualizer_charts, $new_charts );
592		- }
593		- }
594		- }
595		- ++$count;
	511	+ $count++;
596	512	}
597	513	$prefix = 'C' . 'h' . 'a' . 'rt';
598	514	if ( $type === 'tabular' ) {
599	515	$prefix = 'T' . 'a' . 'bl' . 'e';
		@@ -782,9 +698,8 @@
782	698	if ( $this->lazy_render_script ) {
783	699	?>
784	700	<script type="text/javascript">
785	701	var visualizerUserInteractionEvents = [
786		- "scroll",
787	702	"mouseover",
788	703	"keydown",
789	704	"touchmove",
790	705	"touchstart"