← All changes | classes/Visualizer/Module/Admin.php +168 -22 3.1.1 → 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 );
		@@ -214,10 +275,12 @@
214	275	if ( post_type_supports( $typenow, 'editor' ) ) {
215	276	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216	277
217	278	// 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' ) );
	279	+ $deps = array(
	280	+ Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
	281	+ Visualizer_Render_Sidebar_Type_DataTable_DataTable::enqueue_assets( array( 'media-editor' ) ),
	282	+ );
220	283
221	284	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
222	285	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
223	286	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
		@@ -293,60 +356,90 @@
293	356	$types = array_merge(
294	357	$additional,
295	358	array(
296	359	'dataTable' => array(
297		- 'name' => esc_html__( 'Table (New)', 'visualizer' ),
	360	+ 'name' => esc_html__( 'Table', 'visualizer' ),
298	361	'enabled' => true,
	362	+ 'supports' => array( 'DataTable' ),
299	363	),
300	364	'pie' => array(
301		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	365	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
302	366	'enabled' => true,
	367	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
303	368	),
304	369	'line' => array(
305	370	'name' => esc_html__( 'Line', 'visualizer' ),
306	371	'enabled' => true,
	372	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
307	373	),
308	374	'area' => array(
309	375	'name' => esc_html__( 'Area', 'visualizer' ),
310	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' ),
311	379	),
312	380	'geo' => array(
313	381	'name' => esc_html__( 'Geo', 'visualizer' ),
314	382	'enabled' => true,
	383	+ 'supports' => array( 'Google Charts' ),
315	384	),
316	385	'bar' => array(
317	386	'name' => esc_html__( 'Bar', 'visualizer' ),
318	387	'enabled' => true,
	388	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
319	389	),
320	390	'column' => array(
321	391	'name' => esc_html__( 'Column', 'visualizer' ),
322	392	'enabled' => true,
	393	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
323	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	+ ),
324	401	'scatter' => array(
325	402	'name' => esc_html__( 'Scatter', 'visualizer' ),
326	403	'enabled' => true,
	404	+ 'supports' => array( 'Google Charts' ),
327	405	),
328	406	'gauge' => array(
329	407	'name' => esc_html__( 'Gauge', 'visualizer' ),
330	408	'enabled' => true,
	409	+ 'supports' => array( 'Google Charts' ),
331	410	),
332	411	'candlestick' => array(
333	412	'name' => esc_html__( 'Candlestick', 'visualizer' ),
334	413	'enabled' => true,
	414	+ 'supports' => array( 'Google Charts' ),
335	415	),
336	416	// pro types
337	417	'table' => array(
338	418	'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
339	419	'enabled' => false,
	420	+ 'supports' => array( 'Google Charts' ),
340	421	),
341	422	'timeline' => array(
342	423	'name' => esc_html__( 'Timeline', 'visualizer' ),
343	424	'enabled' => false,
	425	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
344	426	),
345	427	'combo' => array(
346	428	'name' => esc_html__( 'Combo', 'visualizer' ),
347	429	'enabled' => false,
	430	+ 'supports' => array( 'Google Charts' ),
348	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	+ ),
349	442	)
350	443	);
351	444	$types = apply_filters( 'visualizer_pro_chart_types', $types );
352	445	if ( $enabledOnly ) {
		@@ -355,8 +448,12 @@
355	448	if ( ! is_array( $array ) ) {
356	449	// support for old pro
357	450	$array = array( 'enabled' => true, 'name' => $array );
358	451	}
	452	+ // backward compatibility for PRO before v1.9.0
	453	+ if ( ! array_key_exists( 'supports', $array ) ) {
	454	+ $array['supports'] = array( 'Google Charts' );
	455	+ }
359	456	if ( ! $array['enabled'] ) {
360	457	continue;
361	458	}
362	459	$filtered[ $type ] = $array;
		@@ -369,8 +466,12 @@
369	466	if ( ! is_array( $array ) ) {
370	467	// support for old pro
371	468	$array = array( 'enabled' => true, 'name' => $array );
372	469	}
	470	+ // backward compatibility for PRO before v1.9.0
	471	+ if ( ! array_key_exists( 'supports', $array ) ) {
	472	+ $array['supports'] = array( 'Google Charts' );
	473	+ }
373	474	$doubleD[ $type ] = $array['name'];
374	475	}
375	476	$types = $doubleD;
376	477	}
		@@ -384,8 +485,10 @@
384	485	private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
385	486	$deprecated = array();
386	487
387	488	switch ( $where ) {
	489	+ case 'types':
	490	+ // fall-through
388	491	case 'library':
389	492	// if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
390	493	if ( ! self::hasChartType( 'table' ) ) {
391	494	$deprecated[] = 'table';
		@@ -396,9 +499,9 @@
396	499	}
397	500	}
398	501
399	502	// if a user has a Gauge/Candlestick chart, then let them keep using it.
400		- if ( ! VISUALIZER_PRO ) {
	503	+ if ( ! Visualizer_Module::is_pro() ) {
401	504	if ( ! self::hasChartType( 'gauge' ) ) {
402	505	if ( $get2Darray ) {
403	506	$deprecated[] = 'gauge';
404	507	} else {
		@@ -425,9 +528,9 @@
425	528	$types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
426	529	}
427	530
428	531	// if a user has a Gauge/Candlestick chart, then let them keep using it.
429		- if ( ! VISUALIZER_PRO ) {
	532	+ if ( ! Visualizer_Module::is_pro() ) {
430	533	if ( ! self::hasChartType( 'gauge' ) ) {
431	534	if ( $get2Darray ) {
432	535	$deprecated[] = 'gauge';
433	536	} else {
		@@ -462,9 +565,9 @@
462	565	* @access public
463	566	*/
464	567	public function renderTemplates() {
465	568	global $pagenow;
466		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	569	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
467	570	return;
468	571	}
469	572	$render = new Visualizer_Render_Templates();
470	573	$render->render();
		@@ -482,9 +585,9 @@
482	585	*
483	586	* @param string $suffix The current page suffix.
484	587	*/
485	588	public function enqueueLibraryScripts( $suffix ) {
486		- if ( $suffix == $this->_libraryPage ) {
	589	+ if ( $suffix === $this->_libraryPage ) {
487	590	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
488	591	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
489	592	wp_enqueue_media();
490	593	wp_enqueue_script(
		@@ -542,11 +645,35 @@
542	645	*
543	646	* @access public
544	647	*/
545	648	public function registerAdminMenu() {
546		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
547		- $callback = array( $this, 'renderLibraryPage' );
548		- $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 );
549	676	}
550	677
551	678	/**
552	679	* Get the instance of WP_Query that fetches the charts as per the given criteria.
		@@ -576,9 +703,9 @@
576	703	'paged' => $page,
577	704	);
578	705	// add chart type filter to the query arguments
579	706	$filter = filter_input( INPUT_GET, 'type' );
580		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	707	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
581	708	$query_args['meta_query'] = array(
582	709	array(
583	710	'key' => Visualizer_Plugin::CF_CHART_TYPE,
584	711	'value' => $filter,
		@@ -604,8 +731,20 @@
604	731	return $q;
605	732	}
606	733
607	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	+ /**
608	747	* Renders visualizer library page.
609	748	*
610	749	* @since 1.0.0
611	750	*
		@@ -628,9 +767,9 @@
628	767	)
629	768	);
630	769	// add chart type filter to the query arguments
631	770	$filter = filter_input( INPUT_GET, 'type' );
632		- if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
	771	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
633	772	$filter = 'all';
634	773	}
635	774
636	775	$css = '';
		@@ -651,9 +790,12 @@
651	790	if ( ! empty( $atts['settings'] ) ) {
652	791	$settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
653	792	}
654	793
655		- unset( $settings['height'], $settings['width'] );
	794	+ if ( $settings ) {
	795	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
	796	+ }
	797	+
656	798	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
657	799	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
658	800
659	801	$library = $this->load_chart_type( $chart->ID );
		@@ -684,14 +826,16 @@
684	826	'language' => $this->get_language(),
685	827	'map_api_key' => get_option( 'visualizer-map-api-key' ),
686	828	'charts' => $charts,
687	829	'urls' => array(
688		- 'base' => add_query_arg( 'vpage', false ),
	830	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
689	831	'create' => add_query_arg(
690	832	array(
691	833	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
692	834	'library' => 'yes',
693	835	'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	836	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	837	+ 'vaction' => false,
694	838	),
695	839	$ajaxurl
696	840	),
697	841	'edit' => add_query_arg(
		@@ -697,13 +841,15 @@
697	841	'edit' => add_query_arg(
698	842	array(
699	843	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
700	844	'library' => 'yes',
	845	+ 'vaction' => false,
701	846	),
702	847	$ajaxurl
703	848	),
704	849	),
705	850	'page_type' => 'library',
	851	+ 'is_front' => false,
706	852	)
707	853	);
708	854	// render library page
709	855	$render = new Visualizer_Render_Library();
		@@ -712,9 +858,9 @@
712	858	$render->types = self::_getChartTypesLocalized( false, false, false, true );
713	859	$render->custom_css = $css;
714	860	$render->pagination = paginate_links(
715	861	array(
716		- 'base' => add_query_arg( 'vpage', '%#%' ),
	862	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
717	863	'format' => '',
718	864	'current' => $page,
719	865	'total' => $query->max_num_pages,
720	866	'type' => 'array',
		@@ -735,14 +881,14 @@
735	881	*
736	882	* @return array Updated array of action links.
737	883	*/
738	884	public function getPluginActionLinks( $links, $file ) {
739		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	885	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
740	886	array_unshift(
741	887	$links,
742	888	sprintf(
743	889	'<a href="%s">%s</a>',
744		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	890	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
745	891	esc_html__( 'Library', 'visualizer' )
746	892	)
747	893	);
748	894	}
		@@ -762,17 +908,17 @@
762	908	*
763	909	* @return array Updated array of plugin meta links.
764	910	*/
765	911	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
766		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	912	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
767	913	// knowledge base link
768	914	$plugin_meta[] = sprintf(
769		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
770		- esc_html__( 'Knowledge Base', 'visualizer' )
	915	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	916	+ esc_html__( 'Docs', 'visualizer' )
771	917	);
772	918	// flattr link
773	919	$plugin_meta[] = sprintf(
774		- '<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>',
775	921	esc_html__( 'Pro Addon', 'visualizer' )
776	922	);
777	923	}
778	924