← All changes | classes/Visualizer/Render/Library.php +57 -97 3.10.13 → 3.6.1 View file →

		@@ -215,13 +215,15 @@
215	215	* @access private
216	216	*/
217	217	private function _renderLibrary() {
218	218	// Added by Ash/Upwork
219		- $filterBy = ! empty( $_GET['s'] ) ? sanitize_text_field( wp_unslash( $_GET['s'] ) ) : null; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	219	+ $filterBy = null;
	220	+ if ( isset( $_GET['s'] ) && strlen( $_GET['s'] ) > 0 ) {
	221	+ $filterBy = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
	222	+ }
220	223	// Added by Ash/Upwork
221	224	echo $this->custom_css;
222	225	echo '<div id="visualizer-types" class="visualizer-clearfix">';
223		- echo '<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"><symbol id="list-icon" fill="currentColor"><path d="M8 0C3.58 0 0 3.58 0 8C0 12.42 3.58 16 8 16C12.42 16 16 12.42 16 8C16 3.58 12.42 0 8 0ZM7.385 12.66H6.045L2.805 8.12L4.146 6.87L6.715 9.27L11.856 3.339L13.196 4.279L7.385 12.66Z"/></symbol></svg>';
224	226	$this->getDisplayForm();
225	227	echo '</div>';
226	228	echo '<div id="visualizer-content-wrapper">';
227	229	if ( ! empty( $this->charts ) ) {
		@@ -227,24 +229,12 @@
227	229	if ( ! empty( $this->charts ) ) {
228	230	echo '<div id="visualizer-library" class="visualizer-clearfix">';
229	231	$count = 0;
230	232	foreach ( $this->charts as $placeholder_id => $chart ) {
	233	+ $this->_renderChartBox( $placeholder_id, $chart['id'] );
231	234	// show the sidebar after the first 3 charts.
232		- $count++;
233		- $enable_controls = false;
234		- $settings = isset( $chart['settings'] ) ? $chart['settings'] : array();
235		- if ( ! empty( $settings['controls']['controlType'] ) ) {
236		- $column_index = $settings['controls']['filterColumnIndex'];
237		- $column_label = $settings['controls']['filterColumnLabel'];
238		- if ( 'false' !== $column_index || 'false' !== $column_label ) {
239		- $enable_controls = true;
240		- }
241		- }
242		- if ( 3 === $count ) {
	235	+ if ( $count++ === 2 ) {
243	236	$this->_renderSidebar();
244		- $this->_renderChartBox( $placeholder_id, $chart['id'], $enable_controls );
245		- } else {
246		- $this->_renderChartBox( $placeholder_id, $chart['id'], $enable_controls );
247	237	}
248	238	}
249	239	// show the sidebar if there are less than 3 charts.
250	240	if ( $count < 3 ) {
		@@ -252,23 +242,20 @@
252	242	}
253	243	echo '</div>';
254	244	} else {
255	245	echo '<div id="visualizer-library" class="visualizer-clearfix">';
256		- echo '<div class="items"><div class="visualizer-chart">';
	246	+ echo '<div class="visualizer-chart">';
257	247	echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">';
258	248	echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', 'visualizer' ), '<p><h2><a href="javascript:;" class="add-new-h2 add-new-chart">', esc_html__( 'Add New', 'visualizer' ), '</a></h2></p></div>';
259	249	echo '</div>';
260	250	echo '<div class="visualizer-chart-footer visualizer-clearfix">';
261		- echo '<div class="visualizer-action-group visualizer-nochart">';
262		- echo '<span class="visualizer-chart-action visualizer-nochart-delete"><span class="dashicons dashicons-trash"></span></span>';
263		- echo '<span class="visualizer-chart-action visualizer-nochart-shortcode"><span class="dashicons dashicons-shortcode"></span></span>';
264		- echo '<span class="visualizer-chart-action visualizer-nochart-image"><span class="dashicons dashicons-format-image"></span></span>';
265		- echo '<span class="visualizer-chart-action visualizer-nochart-export"><span class="dashicons dashicons-download"></span></span>';
266		- echo '<span class="visualizer-chart-action visualizer-nochart-clone"><span class="dashicons dashicons-admin-page"></span></span>';
267		- echo '<span class="visualizer-chart-action visualizer-nochart-edit"><span class="dashicons dashicons-admin-generic"></span></span>';
	251	+ echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>';
	252	+ echo '<span class="visualizer-chart-action visualizer-nochart-clone"></span>';
	253	+ echo '<span class="visualizer-chart-action visualizer-nochart-edit"></span>';
	254	+ echo '<span class="visualizer-chart-action visualizer-nochart-export"></span>';
	255	+ echo '<span class="visualizer-chart-action visualizer-nochart-shortcode"></span>';
268	256	echo '</div>';
269	257	echo '</div>';
270		- echo '</div></div>';
271	258	$this->_renderSidebar();
272	259	echo '</div>';
273	260	}
274	261	echo '</div>';
		@@ -290,9 +277,9 @@
290	277	*
291	278	* @param string $placeholder_id The placeholder's id for the chart.
292	279	* @param int $chart_id The id of the chart.
293	280	*/
294		- private function _renderChartBox( $placeholder_id, $chart_id, $with_filter = false ) {
	281	+ private function _renderChartBox( $placeholder_id, $chart_id ) {
295	282	$settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS );
296	283	$title = '#' . $chart_id;
297	284	if ( ! empty( $settings[0]['title'] ) ) {
298	285	$title = $settings[0]['title'];
		@@ -305,38 +292,32 @@
305	292	$title = '#' . $chart_id;
306	293	}
307	294
308	295	$ajax_url = admin_url( 'admin-ajax.php' );
309		- $delete_url = esc_url(
310		- add_query_arg(
311		- array(
312		- 'action' => Visualizer_Plugin::ACTION_DELETE_CHART,
313		- 'nonce' => wp_create_nonce(),
314		- 'chart' => $chart_id,
315		- ),
316		- $ajax_url
317		- )
	296	+ $delete_url = add_query_arg(
	297	+ array(
	298	+ 'action' => Visualizer_Plugin::ACTION_DELETE_CHART,
	299	+ 'nonce' => wp_create_nonce(),
	300	+ 'chart' => $chart_id,
	301	+ ),
	302	+ $ajax_url
318	303	);
319		- $clone_url = esc_url(
320		- add_query_arg(
321		- array(
322		- 'action' => Visualizer_Plugin::ACTION_CLONE_CHART,
323		- 'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_CLONE_CHART ),
324		- 'chart' => $chart_id,
325		- 'type' => $this->type,
326		- ),
327		- $ajax_url
328		- )
	304	+ $clone_url = add_query_arg(
	305	+ array(
	306	+ 'action' => Visualizer_Plugin::ACTION_CLONE_CHART,
	307	+ 'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_CLONE_CHART ),
	308	+ 'chart' => $chart_id,
	309	+ 'type' => $this->type,
	310	+ ),
	311	+ $ajax_url
329	312	);
330		- $export_link = esc_url(
331		- add_query_arg(
332		- array(
333		- 'action' => Visualizer_Plugin::ACTION_EXPORT_DATA,
334		- 'chart' => $chart_id,
335		- 'security' => wp_create_nonce( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION ),
336		- ),
337		- admin_url( 'admin-ajax.php' )
338		- )
	313	+ $export_link = add_query_arg(
	314	+ array(
	315	+ 'action' => Visualizer_Plugin::ACTION_EXPORT_DATA,
	316	+ 'chart' => $chart_id,
	317	+ 'security' => wp_create_nonce( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION ),
	318	+ ),
	319	+ admin_url( 'admin-ajax.php' )
339	320	);
340	321
341	322	$chart_status = array( 'date' => get_the_modified_date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $chart_id ), 'error' => get_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, true ), 'icon' => 'dashicons-yes-alt', 'title' => 'A-OK!' );
342	323	if ( ! empty( $chart_status['error'] ) ) {
		@@ -343,67 +324,46 @@
343	324	$chart_status['icon'] = 'error dashicons-dismiss';
344	325	$chart_status['title'] = __( 'Click to view the error', 'visualizer' );
345	326	}
346	327	$shortcode = sprintf( '[visualizer id="%s" lazy="no" class=""]', $chart_id );
347		- echo '<div class="items"><div class="visualizer-chart"><div class="visualizer-chart-title">', esc_html( $title ), '</div>';
348		- if ( Visualizer_Module::is_pro() && $with_filter ) {
349		- echo '<div id="chart_wrapper_' . $placeholder_id . '">';
350		- echo '<div id="control_wrapper_' . $placeholder_id . '" class="vz-library-chart-filter"></div>';
351		- }
	328	+ echo '<div class="visualizer-chart"><div class="visualizer-chart-title">', esc_html( $title ), '</div>';
352	329	echo '<div id="', $placeholder_id, '" class="visualizer-chart-canvas">';
353	330	echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
354	331	echo '</div>';
355		- if ( Visualizer_Module::is_pro() && $with_filter ) {
356		- echo '</div>';
357		- }
358	332	echo '<div class="visualizer-chart-footer visualizer-clearfix">';
359		- echo '<div class="visualizer-action-group">';
360		- echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" onclick="return showNotice.warn();"><span class="dashicons dashicons-trash"></span><span class="tooltip-text">' . esc_attr__( 'Delete', 'visualizer' ) . '</span></a>';
361		- echo '<a class="visualizer-chart-action visualizer-chart-shortcode" href="javascript:;" data-clipboard-text="', esc_attr( $shortcode ), '"><span class="dashicons dashicons-shortcode"></span><span class="tooltip-text">' . esc_attr__( 'Copy Shortcode', 'visualizer' ) . '</span></a>';
	333	+ echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" title="', esc_attr__( 'Delete', 'visualizer' ), '" onclick="return showNotice.warn();"></a>';
	334	+ echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '" title="', esc_attr__( 'Clone', 'visualizer' ), '"></a>';
	335	+ echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" title="', esc_attr__( 'Edit', 'visualizer' ), '" data-chart="', $chart_id, '"></a>';
	336	+ echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" title="', esc_attr__( 'Export', 'visualizer' ), '" data-chart="', $export_link, '"></a>';
362	337	if ( $this->can_chart_have_action( 'image', $chart_id ) ) {
363		- echo '<a class="visualizer-chart-action visualizer-chart-image" href="javascript:;" data-chart="visualizer-', $chart_id, '" data-chart-title="', $title, '"><span class="dashicons dashicons-format-image"></span><span class="tooltip-text">' . esc_attr__( 'Download PNG', 'visualizer' ) . '</span></a>';
	338	+ echo '<a class="visualizer-chart-action visualizer-chart-image" href="javascript:;" title="', esc_attr__( 'Download as image', 'visualizer' ), '" data-chart="visualizer-', $chart_id, '" data-chart-title="', $title, '"></a>';
364	339	}
365		- echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" data-chart="', $export_link, '"><span class="dashicons dashicons-download"></span><span class="tooltip-text">' . esc_attr__( 'Export CSV', 'visualizer' ) . '</span></a>';
366		- echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '"><span class="dashicons dashicons-admin-page"></span><span class="tooltip-text">' . esc_attr__( 'Duplicate', 'visualizer' ) . '</span></a>';
367		- echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" data-chart="', $chart_id, '"><span class="dashicons dashicons-admin-generic"></span><span class="tooltip-text">' . esc_attr__( 'Edit', 'visualizer' ) . '</span></a>';
	340	+ echo '<a class="visualizer-chart-action visualizer-chart-shortcode" href="javascript:;" title="', esc_attr__( 'Click to copy shortcode', 'visualizer' ), '" data-clipboard-text="', esc_attr( $shortcode ), '"></a>';
	341	+ echo '<span>&nbsp;</span>';
	342	+ echo '<hr><div class="visualizer-chart-status"><span title="' . __( 'Chart ID', 'visualizer' ) . '">(' . $chart_id . '):</span> <span class="visualizer-date" title="' . __( 'Last Updated', 'visualizer' ) . '">' . $chart_status['date'] . '</span><span class="visualizer-error"><i class="dashicons ' . $chart_status['icon'] . '" data-viz-error="' . esc_attr( str_replace( '"', "'", $chart_status['error'] ) ) . '" title="' . esc_attr( $chart_status['title'] ) . '"></i></span></div>';
368	343	echo '</div>';
369		- do_action( 'visualizer_chart_languages', $chart_id );
370		- echo '<hr><div class="visualizer-chart-status"><span title="' . __( 'Chart ID', 'visualizer' ) . '">(' . $chart_id . '):</span> <span class="visualizer-date" title="' . __( 'Last Updated', 'visualizer' ) . '">' . $chart_status['date'] . '</span><span class="visualizer-error"><i class="dashicons ' . $chart_status['icon'] . '" data-viz-error="' . esc_attr( str_replace( '"', "'", $chart_status['error'] ) ) . '" title="' . esc_attr( $chart_status['title'] ) . '"></i></span></div>';
371	344	echo '</div>';
372		- echo '</div></div>';
373	345	}
374	346
375	347	/**
376		- * Render 2-col sidebar
	348	+ * Render sidebar.
377	349	*/
378	350	private function _renderSidebar() {
379	351	if ( ! Visualizer_Module::is_pro() ) {
380		- echo '<div class="items">';
381		- echo '<div class="viz-pro">';
382		- echo '<div id="visualizer-sidebar" class="one-columns">';
	352	+ echo '<div id="visualizer-sidebar">';
383	353	echo '<div class="visualizer-sidebar-box">';
384	354	echo '<h3>' . __( 'Discover the power of PRO!', 'visualizer' ) . '</h3><ul>';
385		- if ( Visualizer_Module_Admin::proFeaturesLocked() ) {
386		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '6 more chart types', 'visualizer' );
387		- } else {
388		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '11 more chart types', 'visualizer' ) . '</li>';
389		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Manual Data Editor', 'visualizer' ) . '</li>';
390		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'ChartJS Charts', 'visualizer' ) . '</li>';
391		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Table Google chart', 'visualizer' ) . '</li>';
392		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '</li>';
393		- }
394		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Spreadsheet like editor', 'visualizer' ) . '</li>';
395		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Import from other charts', 'visualizer' ) . '</li>';
396		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Use database query to create charts', 'visualizer' ) . '</li>';
397		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Create charts from WordPress tables', 'visualizer' ) . '</li>';
398		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend editor', 'visualizer' ) . '</li>';
399		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Private charts', 'visualizer' ) . '</li>';
400		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'WPML support for translating charts', 'visualizer' ) . '</li>';
401		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Integration with Woocommerce Data endpoints', 'visualizer' ) . '</li>';
402		- echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li></ul>';
403		- echo '<p><a href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'sidebarupsell' ) . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a></p>';
404		- echo '</div>';
405		- echo '</div>';
	355	+ echo '<li>' . __( 'Spreadsheet like editor', 'visualizer' ) . '</li>';
	356	+ echo '<li>' . __( 'Import from other charts', 'visualizer' ) . '</li>';
	357	+ echo '<li>' . __( 'Use database query to create charts', 'visualizer' ) . '</li>';
	358	+ echo '<li>' . __( 'Create charts from WordPress tables', 'visualizer' ) . '</li>';
	359	+ echo '<li>' . __( 'Frontend editor', 'visualizer' ) . '</li>';
	360	+ echo '<li>' . __( 'Private charts', 'visualizer' ) . '</li>';
	361	+ echo '<li>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li>';
	362	+ echo '<li>' . __( '6 more chart types', 'visualizer' ) . '</li></ul>';
	363	+ echo '<p><a href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a></p>';
	364	+ echo '<p style="background-color: #0073aac7; color: #ffffff; padding: 2px; font-weight: bold;">' . __( 'We offer a 30-day no-questions-asked money back guarantee!', 'visualizer' ) . '</p>';
	365	+ echo '<p><a href="' . VISUALIZER_SURVEY . '" target="_blank" class="">' . __( 'Don\'t see the features you need? Help us improve!', 'visualizer' ) . '</a></p>';
406	366	echo '</div>';
407	367	echo '</div>';
408	368	}
409	369	}