← All changes | classes/Visualizer/Module/Frontend.php +49 -142 4.0.8 → 3.9.5 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	*
		@@ -63,9 +63,8 @@
63	63
64	64	$this->_addAction( 'wp_print_footer_scripts', 'printFooterScripts' );
65	65	$this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' );
66	66	$this->_addAction( 'load-index.php', 'enqueueScripts' );
67		- $this->_addAction( 'load-visualizer_page_visualizer-setup-wizard', 'enqueueScripts' );
68	67	$this->_addAction( 'visualizer_enqueue_scripts', 'enqueueScripts' );
69	68	$this->_addFilter( 'visualizer_get_language', 'getLanguage' );
70	69	$this->_addShortcode( 'visualizer', 'renderChart' );
71	70
		@@ -86,9 +85,9 @@
86	85
87	86	/**
88	87	* Adds the async attribute to certain scripts.
89	88	*/
90		- public function script_loader_tag( $tag, $handle, $src ) {
	89	+ function script_loader_tag( $tag, $handle, $src ) {
91	90	if ( is_admin() ) {
92	91	return $tag;
93	92	}
94	93	// Async scripts.
		@@ -97,9 +96,9 @@
97	96	if ( $async === $handle ) {
98	97	$tag = str_replace( ' src', ' async src', $tag );
99	98	break;
100	99	}
101		- }
	100	+ };
102	101
103	102	// Async scripts.
104	103	$scripts = array( 'dom-to-image' );
105	104	foreach ( array( 'async', 'defer' ) as $attr ) {
		@@ -123,9 +122,9 @@
123	122
124	123	/**
125	124	* Returns the language/locale.
126	125	*/
127		- public function getLanguage( $dummy, $only_language ) {
	126	+ function getLanguage( $dummy, $only_language ) {
128	127	return $this->get_language();
129	128	}
130	129
131	130
		@@ -131,9 +130,9 @@
131	130
132	131	/**
133	132	* Registers the endpoints
134	133	*/
135		- public function endpoint_register() {
	134	+ function endpoint_register() {
136	135	register_rest_route(
137	136	'visualizer/v' . VISUALIZER_REST_VERSION,
138	137	'/action/(?P<chart>\d+)/(?P<type>.+)/',
139	138	array(
		@@ -141,9 +140,9 @@
141	140	'methods' => array( 'POST', 'GET' ),
142	141	'args' => array(
143	142	'chart' => array(
144	143	'required' => true,
145		- 'sanitize_callback' => function ( $param ) {
	144	+ 'sanitize_callback' => function( $param ) {
146	145	return is_numeric( $param ) ? $param : null;
147	146	},
148	147	),
149	148	'type' => array(
		@@ -152,27 +151,16 @@
152	151	'enum' => array_merge( array( 'save', 'cancel' ), array_keys( $this->get_actions() ) ),
153	152	),
154	153	),
155	154	'permission_callback' => function ( WP_REST_Request $request ) {
156		- $chart_id = absint( $request->get_param( 'chart' ) );
157		- if ( ! $chart_id ) {
158		- return false;
	155	+ $chart_id = filter_var( sanitize_text_field( $request->get_param( 'chart' ), FILTER_VALIDATE_INT ) );
	156	+ if ( ! empty( $chart_id ) && in_array( $request->get_param( 'type' ), array( 'save', 'cancel' ), true ) ) {
	157	+ // let save and cancel go without any check as past version of pro
	158	+ // did not send the X-WP-Nonce
	159	+ // we can change this at a later date.
	160	+ return true;
159	161	}
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 );
	162	+ return ! empty( $chart_id ) && apply_filters( 'visualizer_pro_show_chart', true, $chart_id );
175	163	},
176	164	'callback' => array( $this, 'perform_action' ),
177	165	)
178	166	);
		@@ -351,15 +339,12 @@
351	339	if ( ! is_admin() && ! empty( $chart_data['is_woocommerce_report'] ) ) {
352	340	return '';
353	341	}
354	342
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		- }
	343	+ // in case revisions exist.
	344	+ // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
	345	+ if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) {
	346	+ $chart = get_post( $chart->ID );
362	347	}
363	348
364	349	$id = 'visualizer-' . $atts['id'];
365	350	$defaultClass = 'visualizer-front';
		@@ -382,9 +367,8 @@
382	367	$chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
383	368
384	369	// Get and update settings.
385	370	$settings = $chart_data['settings'];
386		- $settings = ! empty( $settings ) ? $settings : array();
387	371	if ( empty( $settings['height'] ) ) {
388	372	$settings['height'] = '400';
389	373	}
390	374
		@@ -396,11 +380,10 @@
396	380
397	381	$lazy_load = isset( $settings['lazy_load_chart'] ) ? $settings['lazy_load_chart'] : false;
398	382	$lazy_load = apply_filters( 'visualizer_lazy_load_chart', $lazy_load, $chart->ID );
399	383	$container_class = 'visualizer-front-container';
400		- if ( ! $lazy_load ) {
401		- $this->lazy_render_script = false;
402		- } else {
	384	+ if ( $lazy_load ) {
	385	+ $this->lazy_render_script = true;
403	386	$container_class .= ' visualizer-lazy-render';
404	387	}
405	388
406	389	// handle data filter hooks
		@@ -446,9 +429,9 @@
446	429	unset( $settings['controls'] );
447	430	}
448	431
449	432	// add chart to the array
450		- $chart_entry = array(
	433	+ $this->_charts[ $id ] = array(
451	434	'type' => $type,
452	435	'series' => $series,
453	436	'settings' => $settings,
454	437	'data' => $data,
		@@ -454,15 +437,8 @@
454	437	'data' => $data,
455	438	'library' => $library,
456	439	);
457	440
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	441	$actions_div = '';
466	442	$actions_visible = apply_filters( 'visualizer_pro_add_actions', isset( $settings['actions'] ) ? $settings['actions'] : array(), $atts['id'] );
467	443	if ( ! empty( $actions_visible ) ) {
468	444	$actions = $this->get_actions();
		@@ -496,104 +472,42 @@
496	472
497	473	$_charts = array();
498	474	$_charts_type = '';
499	475	$count = 0;
500		- static $visualizer_localized = false;
501		- static $visualizer_charts = array();
502		- static $d3_localized = false;
503		- $facade_handle = 'visualizer-render-facade';
504	476	foreach ( $this->_charts as $id => $array ) {
505	477	$_charts = $this->_charts;
506	478	$library = $array['library'];
507	479	$_charts_type = $library;
508		- $facade_deps = apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true );
509		- if ( ! wp_script_is( $facade_handle, 'registered' ) ) {
	480	+ if ( ! wp_script_is( "visualizer-render-$library", 'registered' ) ) {
510	481	wp_register_script(
511		- $facade_handle,
	482	+ "visualizer-render-$library",
512	483	VISUALIZER_ABSURL . 'js/render-facade.js',
513		- $facade_deps,
	484	+ apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ),
514	485	Visualizer_Plugin::VERSION,
515	486	true
516	487	);
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		- }
	488	+ wp_enqueue_script( "visualizer-render-$library" );
529	489	}
530	490
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		- }
	491	+ if ( wp_script_is( "visualizer-render-$_charts_type" ) && 0 === $count ) {
	492	+ wp_localize_script(
	493	+ "visualizer-render-$_charts_type",
	494	+ 'visualizer',
	495	+ array(
	496	+ 'charts' => $this->_charts,
	497	+ 'language' => $this->get_language(),
	498	+ 'map_api_key' => get_option( 'visualizer-map-api-key' ),
	499	+ 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
	500	+ 'wp_nonce' => wp_create_nonce( 'wp_rest' ),
	501	+ 'i10n' => array(
	502	+ 'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
	503	+ ),
	504	+ 'page_type' => 'frontend',
	505	+ 'is_front' => true,
	506	+ )
	507	+ );
560	508	}
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;
	509	+ $count++;
596	510	}
597	511	$prefix = 'C' . 'h' . 'a' . 'rt';
598	512	if ( $type === 'tabular' ) {
599	513	$prefix = 'T' . 'a' . 'bl' . 'e';
		@@ -601,9 +515,9 @@
601	515	if ( Visualizer_Module::is_pro() && $enable_controls ) {
602	516	$actions_div .= '<div id="control_wrapper_' . $id . '"></div>';
603	517	}
604	518	// return placeholder div
605		- return '<div class="' . $container_class . '" id="chart_wrapper_' . $id . '">' . $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ) . '</div>';
	519	+ return '<div class="' . $container_class . '" id="chart_wrapper_' . $id . '">' . $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID ) . ( ! Visualizer_Module::is_pro() ? ( '<' . 'di' . 'v st' . 'yl' . 'e="' . 'op' . 'a' . 'ci' . 't' . 'y:' . '0' . '.7' . ';t' . 'ex' . 't-a' . 'li' . 'gn:' . 'ri' . 'gh' . 't;b' . 'o' . 'tto' . 'm: 1' . '0px; z-i' . 'nd' . 'ex:1' . '00' . '0; ' . 'le' . 'ft' . ':2' . '0px' . '; fo' . 'nt-si' . 'ze: 1' . '4px">' . $prefix . ' b' . 'y' . ' <a ' . 'h' . 're' . 'f="ht' . 'tp' . 's:/' . '/t' . 'he' . 'me' . 'i' . 'sl' . 'e' . '.c' . 'om' . '/p' . 'lu' . 'gi' . 'ns' . '/v' . 'i' . 'su' . 'al' . 'iz' . 'er' . '-c' . 'ha' . 'rts' . '-a' . 'nd' . '-gr' . 'ap' . 'hs' . '/" t' . 'arg' . 'et="' . '_bl' . 'an' . 'k" re' . 'l=' . '"no' . 'fol' . 'l' . 'ow"' . '>V' . 'is' . 'u' . 'a' . 'l' . 'i' . 'z' . 'e' . 'r' . '</' . 'a' . '>' . '<' . '/' . 'd' . 'i' . 'v' . '>' ) : '' ) . '</div>';
606	520	}
607	521
608	522	/**
609	523	* Converts the array of attributes to a string of HTML attributes.
		@@ -749,9 +663,9 @@
749	663	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
750	664	$series = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true );
751	665	$is_woocommerce_report = get_post_meta( $chart->ID, Visualizer_Plugin::CF_IS_WOOCOMMERCE_SOURCE, true );
752	666
753		- if ( isset( $settings['series'] ) && is_array( $settings['series'] ) && is_array( $series ) && ! ( count( $settings['series'] ) - count( $series ) > 1 ) ) {
	667	+ if ( isset( $settings['series'] ) && ! ( count( $settings['series'] ) - count( $series ) > 1 ) ) {
754	668	$diff_total_series = abs( count( $settings['series'] ) - count( $series ) );
755	669	if ( $diff_total_series ) {
756	670	foreach ( range( 1, $diff_total_series ) as $k => $diff_series ) {
757	671	$settings['series'][] = end( $settings['series'] );
		@@ -782,9 +696,8 @@
782	696	if ( $this->lazy_render_script ) {
783	697	?>
784	698	<script type="text/javascript">
785	699	var visualizerUserInteractionEvents = [
786		- "scroll",
787	700	"mouseover",
788	701	"keydown",
789	702	"touchmove",
790	703	"touchstart"
		@@ -802,22 +715,16 @@
802	715	}
803	716
804	717	function visualizerLoadScripts() {
805	718	document.querySelectorAll("script[data-visualizer-script]").forEach(function(elem) {
806		- // Replace the placeholder with a real script tag using async=false:
807		- // scripts download in parallel but execute in insertion order, which
808		- // preserves the WordPress dependency order. Parallel jQuery.getScript
809		- // calls could execute render-facade.js before the chart renderer had
810		- // registered its render event listener, leaving charts blank.
811		- var script = document.createElement("script");
812		- script.src = elem.getAttribute("data-visualizer-script");
813		- script.async = false;
814		- script.onload = function() {
	719	+ jQuery.getScript( elem.getAttribute("data-visualizer-script") )
	720	+ .done( function( script, textStatus ) {
	721	+ elem.setAttribute("src", elem.getAttribute("data-visualizer-script"));
	722	+ elem.removeAttribute("data-visualizer-script");
815	723	setTimeout( function() {
816	724	visualizerRefreshChart();
817	725	} );
818		- };
819		- elem.parentNode.replaceChild(script, elem);
	726	+ } );
820	727	});
821	728	}
822	729
823	730	function visualizerRefreshChart() {