← All changes | classes/Visualizer/Module/Admin.php +128 -36 3.1.0 → 3.3.2 View file →

		@@ -57,8 +57,9 @@
57	57	$this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
58	58	$this->_addAction( 'admin_menu', 'registerAdminMenu' );
59	59	$this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
60	60	$this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 );
	61	+ $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 );
61	62	$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
62	63	$this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
63	64	$this->_addFilter( 'visualizer_feedback_review_trigger', 'feedbackReviewTrigger' );
64	65
		@@ -132,8 +133,9 @@
132	133	*
133	134	* @access public
134	135	*/
135	136	public function init() {
	137	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
136	138	if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
137	139	$this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
138	140	$this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
139	141	$this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
		@@ -214,10 +216,12 @@
214	216	if ( post_type_supports( $typenow, 'editor' ) ) {
215	217	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216	218
217	219	// Load all the assets for the different libraries we support.
218		- $deps = Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) );
219		- $deps += Visualizer_Render_Sidebar_Type_DataTable::enqueue_assets( array( 'media-editor' ) );
	220	+ $deps = array(
	221	+ Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
	222	+ Visualizer_Render_Sidebar_Type_DataTable_DataTable::enqueue_assets( array( 'media-editor' ) ),
	223	+ );
220	224
221	225	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
222	226	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
223	227	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
		@@ -293,60 +297,84 @@
293	297	$types = array_merge(
294	298	$additional,
295	299	array(
296	300	'dataTable' => array(
297		- 'name' => esc_html__( 'Table (New)', 'visualizer' ),
	301	+ 'name' => esc_html__( 'Table', 'visualizer' ),
298	302	'enabled' => true,
	303	+ 'supports' => array( 'DataTable' ),
299	304	),
300	305	'pie' => array(
301		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	306	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
302	307	'enabled' => true,
	308	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
303	309	),
304	310	'line' => array(
305	311	'name' => esc_html__( 'Line', 'visualizer' ),
306	312	'enabled' => true,
	313	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
307	314	),
308	315	'area' => array(
309	316	'name' => esc_html__( 'Area', 'visualizer' ),
310	317	'enabled' => true,
	318	+ // in ChartJS, the fill option is used to make Line chart an area: https://www.chartjs.org/docs/latest/charts/area.html
	319	+ 'supports' => array( 'Google Charts' ),
311	320	),
312	321	'geo' => array(
313	322	'name' => esc_html__( 'Geo', 'visualizer' ),
314	323	'enabled' => true,
	324	+ 'supports' => array( 'Google Charts' ),
315	325	),
316	326	'bar' => array(
317	327	'name' => esc_html__( 'Bar', 'visualizer' ),
318	328	'enabled' => true,
	329	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
319	330	),
320	331	'column' => array(
321	332	'name' => esc_html__( 'Column', 'visualizer' ),
322	333	'enabled' => true,
	334	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
323	335	),
	336	+ 'scatter' => array(
	337	+ 'name' => esc_html__( 'Scatter', 'visualizer' ),
	338	+ 'enabled' => true,
	339	+ 'supports' => array( 'Google Charts' ),
	340	+ ),
324	341	'gauge' => array(
325	342	'name' => esc_html__( 'Gauge', 'visualizer' ),
326	343	'enabled' => true,
	344	+ 'supports' => array( 'Google Charts' ),
327	345	),
328		- 'scatter' => array(
329		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
330		- 'enabled' => true,
331		- ),
332	346	'candlestick' => array(
333	347	'name' => esc_html__( 'Candlestick', 'visualizer' ),
334	348	'enabled' => true,
	349	+ 'supports' => array( 'Google Charts' ),
335	350	),
336	351	// pro types
337	352	'table' => array(
338	353	'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
339	354	'enabled' => false,
	355	+ 'supports' => array( 'Google Charts' ),
340	356	),
341	357	'timeline' => array(
342	358	'name' => esc_html__( 'Timeline', 'visualizer' ),
343	359	'enabled' => false,
	360	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
344	361	),
345	362	'combo' => array(
346	363	'name' => esc_html__( 'Combo', 'visualizer' ),
347	364	'enabled' => false,
	365	+ 'supports' => array( 'Google Charts' ),
348	366	),
	367	+ 'polarArea' => array(
	368	+ 'name' => esc_html__( 'Polar Area', 'visualizer' ),
	369	+ 'enabled' => false,
	370	+ 'supports' => array( 'ChartJS' ),
	371	+ ),
	372	+ 'radar' => array(
	373	+ 'name' => esc_html__( 'Radar/Spider', 'visualizer' ),
	374	+ 'enabled' => false,
	375	+ 'supports' => array( 'ChartJS' ),
	376	+ ),
349	377	)
350	378	);
351	379	$types = apply_filters( 'visualizer_pro_chart_types', $types );
352	380	if ( $enabledOnly ) {
		@@ -355,8 +383,12 @@
355	383	if ( ! is_array( $array ) ) {
356	384	// support for old pro
357	385	$array = array( 'enabled' => true, 'name' => $array );
358	386	}
	387	+ // backward compatibility for PRO before v1.9.0
	388	+ if ( ! array_key_exists( 'supports', $array ) ) {
	389	+ $array['supports'] = array( 'Google Charts' );
	390	+ }
359	391	if ( ! $array['enabled'] ) {
360	392	continue;
361	393	}
362	394	$filtered[ $type ] = $array;
		@@ -369,8 +401,12 @@
369	401	if ( ! is_array( $array ) ) {
370	402	// support for old pro
371	403	$array = array( 'enabled' => true, 'name' => $array );
372	404	}
	405	+ // backward compatibility for PRO before v1.9.0
	406	+ if ( ! array_key_exists( 'supports', $array ) ) {
	407	+ $array['supports'] = array( 'Google Charts' );
	408	+ }
373	409	$doubleD[ $type ] = $array['name'];
374	410	}
375	411	$types = $doubleD;
376	412	}
		@@ -384,8 +420,10 @@
384	420	private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
385	421	$deprecated = array();
386	422
387	423	switch ( $where ) {
	424	+ case 'types':
	425	+ // fall-through
388	426	case 'library':
389	427	// if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
390	428	if ( ! self::hasChartType( 'table' ) ) {
391	429	$deprecated[] = 'table';
		@@ -396,14 +434,22 @@
396	434	}
397	435	}
398	436
399	437	// if a user has a Gauge/Candlestick chart, then let them keep using it.
400		- if ( ! VISUALIZER_PRO ) {
	438	+ if ( ! Visualizer_Module::is_pro() ) {
401	439	if ( ! self::hasChartType( 'gauge' ) ) {
402		- $deprecated[] = 'gauge';
	440	+ if ( $get2Darray ) {
	441	+ $deprecated[] = 'gauge';
	442	+ } else {
	443	+ $types['gauge']['enabled'] = false;
	444	+ }
403	445	}
404	446	if ( ! self::hasChartType( 'candlestick' ) ) {
405		- $deprecated[] = 'candlestick';
	447	+ if ( $get2Darray ) {
	448	+ $deprecated[] = 'candlestick';
	449	+ } else {
	450	+ $types['candlestick']['enabled'] = false;
	451	+ }
406	452	}
407	453	}
408	454	break;
409	455	default:
		@@ -410,23 +456,29 @@
410	456	// remove the option to create a Google Table chart.
411	457	$deprecated[] = 'table';
412	458
413	459	// rename the new table chart type.
414		- if ( self::hasChartType( 'table' ) ) {
415		- if ( $get2Darray ) {
416		- $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
417		- } else {
418		- $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
419		- }
	460	+ if ( $get2Darray ) {
	461	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	462	+ } else {
	463	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
420	464	}
421	465
422	466	// if a user has a Gauge/Candlestick chart, then let them keep using it.
423		- if ( ! VISUALIZER_PRO ) {
	467	+ if ( ! Visualizer_Module::is_pro() ) {
424	468	if ( ! self::hasChartType( 'gauge' ) ) {
425		- $deprecated[] = 'gauge';
	469	+ if ( $get2Darray ) {
	470	+ $deprecated[] = 'gauge';
	471	+ } else {
	472	+ $types['gauge']['enabled'] = false;
	473	+ }
426	474	}
427	475	if ( ! self::hasChartType( 'candlestick' ) ) {
428		- $deprecated[] = 'candlestick';
	476	+ if ( $get2Darray ) {
	477	+ $deprecated[] = 'candlestick';
	478	+ } else {
	479	+ $types['candlestick']['enabled'] = false;
	480	+ }
429	481	}
430	482	}
431	483	}
432	484
		@@ -448,9 +500,9 @@
448	500	* @access public
449	501	*/
450	502	public function renderTemplates() {
451	503	global $pagenow;
452		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	504	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
453	505	return;
454	506	}
455	507	$render = new Visualizer_Render_Templates();
456	508	$render->render();
		@@ -468,9 +520,9 @@
468	520	*
469	521	* @param string $suffix The current page suffix.
470	522	*/
471	523	public function enqueueLibraryScripts( $suffix ) {
472		- if ( $suffix == $this->_libraryPage ) {
	524	+ if ( $suffix === $this->_libraryPage ) {
473	525	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
474	526	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
475	527	wp_enqueue_media();
476	528	wp_enqueue_script(
		@@ -528,11 +580,35 @@
528	580	*
529	581	* @access public
530	582	*/
531	583	public function registerAdminMenu() {
532		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
533		- $callback = array( $this, 'renderLibraryPage' );
534		- $this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
	584	+ $svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZCBTaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5MC4wMDAwMDAsIC00MzUuMDAwMDAwKSIgZmlsbD0iIzM5QzNEMiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMjguNSw1MTIgQzIwNy4yMzcwMzcsNTEyIDE5MCw0OTQuNzYyOTYzIDE5MCw0NzMuNSBDMTkwLDQ1Mi4yMzcwMzcgMjA3LjIzNzAzNyw0MzUgMjI4LjUsNDM1IEMyNDkuNzYyOTYzLDQzNSAyNjcsNDUyLjIzNzAzNyAyNjcsNDczLjUgQzI2Nyw0OTQuNzYyOTYzIDI0OS43NjI5NjMsNTEyIDIyOC41LDUxMiBaIE0yNDYuODQzNzUsNDgzLjU5MjA1OSBMMjE1LjYyNSw0ODMuNTkyMDU5IEwyMTUuNjI1LDQ2MC44MjY1NDQgQzIxNS42MjUsNDYwLjE2NDU0NyAyMTUuMTA3NTc4LDQ1OS42MjgzNTkgMjE0LjQ2ODc1LDQ1OS42MjgzNTkgTDIxMi4xNTYyNSw0NTkuNjI4MzU5IEMyMTEuNTE3NDIyLDQ1OS42MjgzNTkgMjExLDQ2MC4xNjQ1NDcgMjExLDQ2MC44MjY1NDQgTDIxMSw0ODUuOTg4NDI5IEMyMTEsNDg3LjMxMTY3NCAyMTIuMDM1NTY2LDQ4OC4zODQ3OTggMjEzLjMxMjUsNDg4LjM4NDc5OCBMMjQ2Ljg0Mzc1LDQ4OC4zODQ3OTggQzI0Ny40ODI1NzgsNDg4LjM4NDc5OCAyNDgsNDg3Ljg0ODYxMSAyNDgsNDg3LjE4NjYxMyBMMjQ4LDQ4NC43OTAyNDQgQzI0OCw0ODQuMTI4MjQ2IDI0Ny40ODI1NzgsNDgzLjU5MjA1OSAyNDYuODQzNzUsNDgzLjU5MjA1OSBaIE0yNDQuNTMxMjUsNDYyLjAyNDcyOSBMMjM1Ljk5OTU3LDQ2Mi4wMjQ3MjkgQzIzNC40NTQ1MzEsNDYyLjAyNDcyOSAyMzMuNjgwNTY2LDQ2My45NjA1NDcgMjM0Ljc3MzIyMyw0NjUuMDkyODMyIEwyMzcuMTE0NjI5LDQ2Ny41MTkxNTYgTDIzMS44MTI1LDQ3My4wMTQzMzIgTDIyNi41MTAzNzEsNDY3LjUxOTkwNSBDMjI1LjYwNzA1MSw0NjYuNTgzODIzIDIyNC4xNDI5NDksNDY2LjU4MzgyMyAyMjMuMjQwMzUyLDQ2Ny41MTk5MDUgTDIxOC4yNzY0MjYsNDcyLjY2Mzg2MyBDMjE3LjgyNDc2Niw0NzMuMTMxOTA0IDIxNy44MjQ3NjYsNDczLjg5MDUwNSAyMTguMjc2NDI2LDQ3NC4zNTg1NDYgTDIxOS45MTEwNzQsNDc2LjA1MjQ4IEMyMjAuMzYyNzM0LDQ3Ni41MjA1MjEgMjIxLjA5NDc4NSw0NzYuNTIwNTIxIDIyMS41NDY0NDUsNDc2LjA1MjQ4IEwyMjQuODc1LDQ3Mi42MDI0NTYgTDIzMC4xNzcxMjksNDc4LjA5Njg4MyBDMjMxLjA4MDQ0OSw0NzkuMDMyOTY1IDIzMi41NDQ1NTEsNDc5LjAzMjk2NSAyMzMuNDQ3MTQ4LDQ3OC4wOTY4ODMgTDI0MC4zODQ2NDgsNDcwLjkwNzc3MyBMMjQyLjcyNjA1NSw0NzMuMzM0MDk4IEMyNDMuODE4NzExLDQ3NC40NjYzODIgMjQ1LjY4Njc3Nyw0NzMuNjY0MzQ3IDI0NS42ODY3NzcsNDcyLjA2MzI3MyBMMjQ1LjY4Njc3Nyw0NjMuMjIyOTE0IEMyNDUuNjg3NSw0NjIuNTYwOTE3IDI0NS4xNzAwNzgsNDYyLjAyNDcyOSAyNDQuNTMxMjUsNDYyLjAyNDcyOSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==';
	585	+
	586	+ $this->_libraryPage = add_menu_page( __( 'Visualizer', 'visualizer' ), __( 'Visualizer', 'visualizer' ), 'edit_posts', Visualizer_Plugin::NAME, array( $this, 'renderLibraryPage' ), $svg_base64_icon, 99.7666 );
	587	+
	588	+ add_submenu_page(
	589	+ Visualizer_Plugin::NAME,
	590	+ __( 'Chart Library', 'visualizer' ),
	591	+ __( 'Chart Library', 'visualizer' ),
	592	+ 'edit_posts',
	593	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME )
	594	+ );
	595	+ add_submenu_page(
	596	+ Visualizer_Plugin::NAME,
	597	+ __( 'Add New Chart', 'visualizer' ),
	598	+ __( 'Add New Chart', 'visualizer' ),
	599	+ 'edit_posts',
	600	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
	601	+ );
	602	+ add_submenu_page(
	603	+ Visualizer_Plugin::NAME,
	604	+ __( 'Support', 'visualizer' ),
	605	+ __( 'Support', 'visualizer' ) . '<span class="dashicons dashicons-editor-help more-features-icon" style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;"></span>',
	606	+ 'edit_posts',
	607	+ 'viz-support',
	608	+ array( $this, 'renderSupportPage' )
	609	+ );
	610	+ remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
535	611	}
536	612
537	613	/**
538	614	* Get the instance of WP_Query that fetches the charts as per the given criteria.
		@@ -562,9 +638,9 @@
562	638	'paged' => $page,
563	639	);
564	640	// add chart type filter to the query arguments
565	641	$filter = filter_input( INPUT_GET, 'type' );
566		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	642	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
567	643	$query_args['meta_query'] = array(
568	644	array(
569	645	'key' => Visualizer_Plugin::CF_CHART_TYPE,
570	646	'value' => $filter,
		@@ -590,8 +666,20 @@
590	666	return $q;
591	667	}
592	668
593	669	/**
	670	+ * Renders support page.
	671	+ *
	672	+ * @since 3.3.0
	673	+ *
	674	+ * @access public
	675	+ */
	676	+ public function renderSupportPage() {
	677	+ wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
	678	+ include_once VISUALIZER_ABSPATH . '/templates/support.php';
	679	+ }
	680	+
	681	+ /**
594	682	* Renders visualizer library page.
595	683	*
596	684	* @since 1.0.0
597	685	*
		@@ -614,9 +702,9 @@
614	702	)
615	703	);
616	704	// add chart type filter to the query arguments
617	705	$filter = filter_input( INPUT_GET, 'type' );
618		- if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
	706	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
619	707	$filter = 'all';
620	708	}
621	709
622	710	$css = '';
		@@ -637,9 +725,9 @@
637	725	if ( ! empty( $atts['settings'] ) ) {
638	726	$settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
639	727	}
640	728
641		- unset( $settings['height'], $settings['width'] );
	729	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
642	730	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
643	731	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
644	732
645	733	$library = $this->load_chart_type( $chart->ID );
		@@ -670,14 +758,16 @@
670	758	'language' => $this->get_language(),
671	759	'map_api_key' => get_option( 'visualizer-map-api-key' ),
672	760	'charts' => $charts,
673	761	'urls' => array(
674		- 'base' => add_query_arg( 'vpage', false ),
	762	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
675	763	'create' => add_query_arg(
676	764	array(
677	765	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
678	766	'library' => 'yes',
679	767	'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	768	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	769	+ 'vaction' => false,
680	770	),
681	771	$ajaxurl
682	772	),
683	773	'edit' => add_query_arg(
		@@ -683,13 +773,15 @@
683	773	'edit' => add_query_arg(
684	774	array(
685	775	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
686	776	'library' => 'yes',
	777	+ 'vaction' => false,
687	778	),
688	779	$ajaxurl
689	780	),
690	781	),
691	782	'page_type' => 'library',
	783	+ 'is_front' => false,
692	784	)
693	785	);
694	786	// render library page
695	787	$render = new Visualizer_Render_Library();
		@@ -698,9 +790,9 @@
698	790	$render->types = self::_getChartTypesLocalized( false, false, false, true );
699	791	$render->custom_css = $css;
700	792	$render->pagination = paginate_links(
701	793	array(
702		- 'base' => add_query_arg( 'vpage', '%#%' ),
	794	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
703	795	'format' => '',
704	796	'current' => $page,
705	797	'total' => $query->max_num_pages,
706	798	'type' => 'array',
		@@ -721,14 +813,14 @@
721	813	*
722	814	* @return array Updated array of action links.
723	815	*/
724	816	public function getPluginActionLinks( $links, $file ) {
725		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	817	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
726	818	array_unshift(
727	819	$links,
728	820	sprintf(
729	821	'<a href="%s">%s</a>',
730		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	822	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
731	823	esc_html__( 'Library', 'visualizer' )
732	824	)
733	825	);
734	826	}
		@@ -748,17 +840,17 @@
748	840	*
749	841	* @return array Updated array of plugin meta links.
750	842	*/
751	843	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
752		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	844	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
753	845	// knowledge base link
754	846	$plugin_meta[] = sprintf(
755		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
756		- esc_html__( 'Knowledge Base', 'visualizer' )
	847	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	848	+ esc_html__( 'Docs', 'visualizer' )
757	849	);
758	850	// flattr link
759	851	$plugin_meta[] = sprintf(
760		- '<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
	852	+ '<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>',
761	853	esc_html__( 'Pro Addon', 'visualizer' )
762	854	);
763	855	}
764	856