← All changes | classes/Visualizer/Module/Admin.php +165 -21 3.1.2 → 3.4.0 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
		@@ -66,12 +67,71 @@
66	67	$this->_addFilter( 'wp_revisions_to_keep', 'limitRevisions', null, 10, 2 );
67	68	$this->_addAction( '_wp_put_post_revision', 'addRevision', null, 10, 1 );
68	69	$this->_addAction( 'wp_restore_post_revision', 'restoreRevision', null, 10, 2 );
69	70
	71	+ $this->_addAction( 'visualizer_chart_schedules_spl', 'addSplChartSchedules', null, 10, 3 );
	72	+
70	73	$this->_addAction( 'admin_init', 'init' );
71	74	}
72	75
	76	+
73	77	/**
	78	+ * Add disabled `optgroup` schedules to the drop downs.
	79	+ *
	80	+ * @since ?
	81	+ *
	82	+ * @access public
	83	+ *
	84	+ * @param string $feature The feature for which to add schedules.
	85	+ * @param int $chart_id The chart ID.
	86	+ * @param int $plan The plan number.
	87	+ */
	88	+ public function addSplChartSchedules( $feature, $chart_id, $plan ) {
	89	+ if ( apply_filters( 'visualizer_is_business', false ) ) {
	90	+ return;
	91	+ }
	92	+
	93	+ $license = __( 'PRO', 'visualizer' );
	94	+ if ( Visualizer_Module::is_pro() ) {
	95	+ switch ( $plan ) {
	96	+ case 1:
	97	+ $license = __( 'Developer', 'visualizer' );
	98	+ break;
	99	+ }
	100	+ }
	101	+
	102	+ $hours = array(
	103	+ '0' => __( 'Live', 'visualizer' ),
	104	+ '1' => __( 'Each hour', 'visualizer' ),
	105	+ '12' => __( 'Each 12 hours', 'visualizer' ),
	106	+ '24' => __( 'Each day', 'visualizer' ),
	107	+ '72' => __( 'Each 3 days', 'visualizer' ),
	108	+ );
	109	+
	110	+ switch ( $feature ) {
	111	+ case 'json':
	112	+ case 'csv':
	113	+ // no more schedules if pro is already active.
	114	+ if ( Visualizer_Module::is_pro() ) {
	115	+ return;
	116	+ }
	117	+ break;
	118	+ case 'wp':
	119	+ // fall-through.
	120	+ case 'db':
	121	+ break;
	122	+ default:
	123	+ return;
	124	+ }
	125	+
	126	+ echo '<optgroup disabled label="' . sprintf( __( 'More in the %s version', 'visualizer' ), $license ) . '">';
	127	+ foreach ( $hours as $hour => $desc ) {
	128	+ echo '<option disabled>' . $desc . '</option>';
	129	+ }
	130	+ echo '</optgroup>';
	131	+ }
	132	+
	133	+ /**
74	134	* No limits on revisions.
75	135	*/
76	136	public function limitRevisions( $num, $post ) {
77	137	if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
		@@ -132,8 +192,9 @@
132	192	*
133	193	* @access public
134	194	*/
135	195	public function init() {
	196	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
136	197	if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
137	198	$this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
138	199	$this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
139	200	$this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
		@@ -216,9 +277,9 @@
216	277
217	278	// Load all the assets for the different libraries we support.
218	279	$deps = array(
219	280	Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
220		- Visualizer_Render_Sidebar_Type_DataTable::enqueue_assets( array( 'media-editor' ) ),
	281	+ Visualizer_Render_Sidebar_Type_DataTable_DataTable::enqueue_assets( array( 'media-editor' ) ),
221	282	);
222	283
223	284	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
224	285	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
		@@ -295,60 +356,90 @@
295	356	$types = array_merge(
296	357	$additional,
297	358	array(
298	359	'dataTable' => array(
299		- 'name' => esc_html__( 'Table (New)', 'visualizer' ),
	360	+ 'name' => esc_html__( 'Table', 'visualizer' ),
300	361	'enabled' => true,
	362	+ 'supports' => array( 'DataTable' ),
301	363	),
302	364	'pie' => array(
303		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	365	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
304	366	'enabled' => true,
	367	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
305	368	),
306	369	'line' => array(
307	370	'name' => esc_html__( 'Line', 'visualizer' ),
308	371	'enabled' => true,
	372	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
309	373	),
310	374	'area' => array(
311	375	'name' => esc_html__( 'Area', 'visualizer' ),
312	376	'enabled' => true,
	377	+ // in ChartJS, the fill option is used to make Line chart an area: https://www.chartjs.org/docs/latest/charts/area.html
	378	+ 'supports' => array( 'Google Charts' ),
313	379	),
314	380	'geo' => array(
315	381	'name' => esc_html__( 'Geo', 'visualizer' ),
316	382	'enabled' => true,
	383	+ 'supports' => array( 'Google Charts' ),
317	384	),
318	385	'bar' => array(
319	386	'name' => esc_html__( 'Bar', 'visualizer' ),
320	387	'enabled' => true,
	388	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
321	389	),
322	390	'column' => array(
323	391	'name' => esc_html__( 'Column', 'visualizer' ),
324	392	'enabled' => true,
	393	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
325	394	),
	395	+ 'bubble' => array(
	396	+ 'name' => esc_html__( 'Bubble', 'visualizer' ),
	397	+ 'enabled' => true,
	398	+ // chartjs' bubble is ugly looking (and it won't work off the default bubble.csv) so it is being excluded for the time being.
	399	+ 'supports' => array( 'Google Charts' ),
	400	+ ),
326	401	'scatter' => array(
327	402	'name' => esc_html__( 'Scatter', 'visualizer' ),
328	403	'enabled' => true,
	404	+ 'supports' => array( 'Google Charts' ),
329	405	),
330	406	'gauge' => array(
331	407	'name' => esc_html__( 'Gauge', 'visualizer' ),
332	408	'enabled' => true,
	409	+ 'supports' => array( 'Google Charts' ),
333	410	),
334	411	'candlestick' => array(
335	412	'name' => esc_html__( 'Candlestick', 'visualizer' ),
336	413	'enabled' => true,
	414	+ 'supports' => array( 'Google Charts' ),
337	415	),
338	416	// pro types
339	417	'table' => array(
340	418	'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
341	419	'enabled' => false,
	420	+ 'supports' => array( 'Google Charts' ),
342	421	),
343	422	'timeline' => array(
344	423	'name' => esc_html__( 'Timeline', 'visualizer' ),
345	424	'enabled' => false,
	425	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
346	426	),
347	427	'combo' => array(
348	428	'name' => esc_html__( 'Combo', 'visualizer' ),
349	429	'enabled' => false,
	430	+ 'supports' => array( 'Google Charts' ),
350	431	),
	432	+ 'polarArea' => array(
	433	+ 'name' => esc_html__( 'Polar Area', 'visualizer' ),
	434	+ 'enabled' => false,
	435	+ 'supports' => array( 'ChartJS' ),
	436	+ ),
	437	+ 'radar' => array(
	438	+ 'name' => esc_html__( 'Radar/Spider', 'visualizer' ),
	439	+ 'enabled' => false,
	440	+ 'supports' => array( 'ChartJS' ),
	441	+ ),
351	442	)
352	443	);
353	444	$types = apply_filters( 'visualizer_pro_chart_types', $types );
354	445	if ( $enabledOnly ) {
		@@ -357,8 +448,12 @@
357	448	if ( ! is_array( $array ) ) {
358	449	// support for old pro
359	450	$array = array( 'enabled' => true, 'name' => $array );
360	451	}
	452	+ // backward compatibility for PRO before v1.9.0
	453	+ if ( ! array_key_exists( 'supports', $array ) ) {
	454	+ $array['supports'] = array( 'Google Charts' );
	455	+ }
361	456	if ( ! $array['enabled'] ) {
362	457	continue;
363	458	}
364	459	$filtered[ $type ] = $array;
		@@ -371,8 +466,12 @@
371	466	if ( ! is_array( $array ) ) {
372	467	// support for old pro
373	468	$array = array( 'enabled' => true, 'name' => $array );
374	469	}
	470	+ // backward compatibility for PRO before v1.9.0
	471	+ if ( ! array_key_exists( 'supports', $array ) ) {
	472	+ $array['supports'] = array( 'Google Charts' );
	473	+ }
375	474	$doubleD[ $type ] = $array['name'];
376	475	}
377	476	$types = $doubleD;
378	477	}
		@@ -386,8 +485,10 @@
386	485	private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
387	486	$deprecated = array();
388	487
389	488	switch ( $where ) {
	489	+ case 'types':
	490	+ // fall-through
390	491	case 'library':
391	492	// if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
392	493	if ( ! self::hasChartType( 'table' ) ) {
393	494	$deprecated[] = 'table';
		@@ -398,9 +499,9 @@
398	499	}
399	500	}
400	501
401	502	// if a user has a Gauge/Candlestick chart, then let them keep using it.
402		- if ( ! VISUALIZER_PRO ) {
	503	+ if ( ! Visualizer_Module::is_pro() ) {
403	504	if ( ! self::hasChartType( 'gauge' ) ) {
404	505	if ( $get2Darray ) {
405	506	$deprecated[] = 'gauge';
406	507	} else {
		@@ -427,9 +528,9 @@
427	528	$types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
428	529	}
429	530
430	531	// if a user has a Gauge/Candlestick chart, then let them keep using it.
431		- if ( ! VISUALIZER_PRO ) {
	532	+ if ( ! Visualizer_Module::is_pro() ) {
432	533	if ( ! self::hasChartType( 'gauge' ) ) {
433	534	if ( $get2Darray ) {
434	535	$deprecated[] = 'gauge';
435	536	} else {
		@@ -464,9 +565,9 @@
464	565	* @access public
465	566	*/
466	567	public function renderTemplates() {
467	568	global $pagenow;
468		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	569	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
469	570	return;
470	571	}
471	572	$render = new Visualizer_Render_Templates();
472	573	$render->render();
		@@ -484,9 +585,9 @@
484	585	*
485	586	* @param string $suffix The current page suffix.
486	587	*/
487	588	public function enqueueLibraryScripts( $suffix ) {
488		- if ( $suffix == $this->_libraryPage ) {
	589	+ if ( $suffix === $this->_libraryPage ) {
489	590	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
490	591	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
491	592	wp_enqueue_media();
492	593	wp_enqueue_script(
		@@ -544,11 +645,35 @@
544	645	*
545	646	* @access public
546	647	*/
547	648	public function registerAdminMenu() {
548		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
549		- $callback = array( $this, 'renderLibraryPage' );
550		- $this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
	649	+ $svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZCBTaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5MC4wMDAwMDAsIC00MzUuMDAwMDAwKSIgZmlsbD0iIzM5QzNEMiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMjguNSw1MTIgQzIwNy4yMzcwMzcsNTEyIDE5MCw0OTQuNzYyOTYzIDE5MCw0NzMuNSBDMTkwLDQ1Mi4yMzcwMzcgMjA3LjIzNzAzNyw0MzUgMjI4LjUsNDM1IEMyNDkuNzYyOTYzLDQzNSAyNjcsNDUyLjIzNzAzNyAyNjcsNDczLjUgQzI2Nyw0OTQuNzYyOTYzIDI0OS43NjI5NjMsNTEyIDIyOC41LDUxMiBaIE0yNDYuODQzNzUsNDgzLjU5MjA1OSBMMjE1LjYyNSw0ODMuNTkyMDU5IEwyMTUuNjI1LDQ2MC44MjY1NDQgQzIxNS42MjUsNDYwLjE2NDU0NyAyMTUuMTA3NTc4LDQ1OS42MjgzNTkgMjE0LjQ2ODc1LDQ1OS42MjgzNTkgTDIxMi4xNTYyNSw0NTkuNjI4MzU5IEMyMTEuNTE3NDIyLDQ1OS42MjgzNTkgMjExLDQ2MC4xNjQ1NDcgMjExLDQ2MC44MjY1NDQgTDIxMSw0ODUuOTg4NDI5IEMyMTEsNDg3LjMxMTY3NCAyMTIuMDM1NTY2LDQ4OC4zODQ3OTggMjEzLjMxMjUsNDg4LjM4NDc5OCBMMjQ2Ljg0Mzc1LDQ4OC4zODQ3OTggQzI0Ny40ODI1NzgsNDg4LjM4NDc5OCAyNDgsNDg3Ljg0ODYxMSAyNDgsNDg3LjE4NjYxMyBMMjQ4LDQ4NC43OTAyNDQgQzI0OCw0ODQuMTI4MjQ2IDI0Ny40ODI1NzgsNDgzLjU5MjA1OSAyNDYuODQzNzUsNDgzLjU5MjA1OSBaIE0yNDQuNTMxMjUsNDYyLjAyNDcyOSBMMjM1Ljk5OTU3LDQ2Mi4wMjQ3MjkgQzIzNC40NTQ1MzEsNDYyLjAyNDcyOSAyMzMuNjgwNTY2LDQ2My45NjA1NDcgMjM0Ljc3MzIyMyw0NjUuMDkyODMyIEwyMzcuMTE0NjI5LDQ2Ny41MTkxNTYgTDIzMS44MTI1LDQ3My4wMTQzMzIgTDIyNi41MTAzNzEsNDY3LjUxOTkwNSBDMjI1LjYwNzA1MSw0NjYuNTgzODIzIDIyNC4xNDI5NDksNDY2LjU4MzgyMyAyMjMuMjQwMzUyLDQ2Ny41MTk5MDUgTDIxOC4yNzY0MjYsNDcyLjY2Mzg2MyBDMjE3LjgyNDc2Niw0NzMuMTMxOTA0IDIxNy44MjQ3NjYsNDczLjg5MDUwNSAyMTguMjc2NDI2LDQ3NC4zNTg1NDYgTDIxOS45MTEwNzQsNDc2LjA1MjQ4IEMyMjAuMzYyNzM0LDQ3Ni41MjA1MjEgMjIxLjA5NDc4NSw0NzYuNTIwNTIxIDIyMS41NDY0NDUsNDc2LjA1MjQ4IEwyMjQuODc1LDQ3Mi42MDI0NTYgTDIzMC4xNzcxMjksNDc4LjA5Njg4MyBDMjMxLjA4MDQ0OSw0NzkuMDMyOTY1IDIzMi41NDQ1NTEsNDc5LjAzMjk2NSAyMzMuNDQ3MTQ4LDQ3OC4wOTY4ODMgTDI0MC4zODQ2NDgsNDcwLjkwNzc3MyBMMjQyLjcyNjA1NSw0NzMuMzM0MDk4IEMyNDMuODE4NzExLDQ3NC40NjYzODIgMjQ1LjY4Njc3Nyw0NzMuNjY0MzQ3IDI0NS42ODY3NzcsNDcyLjA2MzI3MyBMMjQ1LjY4Njc3Nyw0NjMuMjIyOTE0IEMyNDUuNjg3NSw0NjIuNTYwOTE3IDI0NS4xNzAwNzgsNDYyLjAyNDcyOSAyNDQuNTMxMjUsNDYyLjAyNDcyOSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==';
	650	+
	651	+ $this->_libraryPage = add_menu_page( __( 'Visualizer', 'visualizer' ), __( 'Visualizer', 'visualizer' ), 'edit_posts', Visualizer_Plugin::NAME, array( $this, 'renderLibraryPage' ), $svg_base64_icon, 99.7666 );
	652	+
	653	+ add_submenu_page(
	654	+ Visualizer_Plugin::NAME,
	655	+ __( 'Chart Library', 'visualizer' ),
	656	+ __( 'Chart Library', 'visualizer' ),
	657	+ 'edit_posts',
	658	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME )
	659	+ );
	660	+ add_submenu_page(
	661	+ Visualizer_Plugin::NAME,
	662	+ __( 'Add New Chart', 'visualizer' ),
	663	+ __( 'Add New Chart', 'visualizer' ),
	664	+ 'edit_posts',
	665	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
	666	+ );
	667	+ add_submenu_page(
	668	+ Visualizer_Plugin::NAME,
	669	+ __( 'Support', 'visualizer' ),
	670	+ __( '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>',
	671	+ 'edit_posts',
	672	+ 'viz-support',
	673	+ array( $this, 'renderSupportPage' )
	674	+ );
	675	+ remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
551	676	}
552	677
553	678	/**
554	679	* Get the instance of WP_Query that fetches the charts as per the given criteria.
		@@ -578,9 +703,9 @@
578	703	'paged' => $page,
579	704	);
580	705	// add chart type filter to the query arguments
581	706	$filter = filter_input( INPUT_GET, 'type' );
582		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	707	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
583	708	$query_args['meta_query'] = array(
584	709	array(
585	710	'key' => Visualizer_Plugin::CF_CHART_TYPE,
586	711	'value' => $filter,
		@@ -606,8 +731,20 @@
606	731	return $q;
607	732	}
608	733
609	734	/**
	735	+ * Renders support page.
	736	+ *
	737	+ * @since 3.3.0
	738	+ *
	739	+ * @access public
	740	+ */
	741	+ public function renderSupportPage() {
	742	+ wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
	743	+ include_once VISUALIZER_ABSPATH . '/templates/support.php';
	744	+ }
	745	+
	746	+ /**
610	747	* Renders visualizer library page.
611	748	*
612	749	* @since 1.0.0
613	750	*
		@@ -630,9 +767,9 @@
630	767	)
631	768	);
632	769	// add chart type filter to the query arguments
633	770	$filter = filter_input( INPUT_GET, 'type' );
634		- if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
	771	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
635	772	$filter = 'all';
636	773	}
637	774
638	775	$css = '';
		@@ -653,9 +790,12 @@
653	790	if ( ! empty( $atts['settings'] ) ) {
654	791	$settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
655	792	}
656	793
657		- unset( $settings['height'], $settings['width'] );
	794	+ if ( $settings ) {
	795	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
	796	+ }
	797	+
658	798	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
659	799	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
660	800
661	801	$library = $this->load_chart_type( $chart->ID );
		@@ -686,14 +826,16 @@
686	826	'language' => $this->get_language(),
687	827	'map_api_key' => get_option( 'visualizer-map-api-key' ),
688	828	'charts' => $charts,
689	829	'urls' => array(
690		- 'base' => add_query_arg( 'vpage', false ),
	830	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
691	831	'create' => add_query_arg(
692	832	array(
693	833	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
694	834	'library' => 'yes',
695	835	'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	836	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	837	+ 'vaction' => false,
696	838	),
697	839	$ajaxurl
698	840	),
699	841	'edit' => add_query_arg(
		@@ -699,13 +841,15 @@
699	841	'edit' => add_query_arg(
700	842	array(
701	843	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
702	844	'library' => 'yes',
	845	+ 'vaction' => false,
703	846	),
704	847	$ajaxurl
705	848	),
706	849	),
707	850	'page_type' => 'library',
	851	+ 'is_front' => false,
708	852	)
709	853	);
710	854	// render library page
711	855	$render = new Visualizer_Render_Library();
		@@ -714,9 +858,9 @@
714	858	$render->types = self::_getChartTypesLocalized( false, false, false, true );
715	859	$render->custom_css = $css;
716	860	$render->pagination = paginate_links(
717	861	array(
718		- 'base' => add_query_arg( 'vpage', '%#%' ),
	862	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
719	863	'format' => '',
720	864	'current' => $page,
721	865	'total' => $query->max_num_pages,
722	866	'type' => 'array',
		@@ -737,14 +881,14 @@
737	881	*
738	882	* @return array Updated array of action links.
739	883	*/
740	884	public function getPluginActionLinks( $links, $file ) {
741		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	885	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
742	886	array_unshift(
743	887	$links,
744	888	sprintf(
745	889	'<a href="%s">%s</a>',
746		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	890	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
747	891	esc_html__( 'Library', 'visualizer' )
748	892	)
749	893	);
750	894	}
		@@ -764,17 +908,17 @@
764	908	*
765	909	* @return array Updated array of plugin meta links.
766	910	*/
767	911	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
768		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	912	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
769	913	// knowledge base link
770	914	$plugin_meta[] = sprintf(
771		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
772		- esc_html__( 'Knowledge Base', 'visualizer' )
	915	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	916	+ esc_html__( 'Docs', 'visualizer' )
773	917	);
774	918	// flattr link
775	919	$plugin_meta[] = sprintf(
776		- '<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
	920	+ '<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>',
777	921	esc_html__( 'Pro Addon', 'visualizer' )
778	922	);
779	923	}
780	924