← All changes | classes/Visualizer/Module/Admin.php +182 -22 3.1.1 → 3.4.1 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,16 +192,31 @@
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 );
	201	+ $this->_addFilter( 'tiny_mce_before_init', 'get_strings_for_block', 10, 1 );
140	202	}
141	203	}
142	204
143	205	/**
	206	+ * Add the strings required for the TinyMCE buttons for the classic block (not the classic editor).
	207	+ *
	208	+ * @since ?
	209	+ * @access friendly
	210	+ */
	211	+ function get_strings_for_block( $settings ) {
	212	+ $class = new Visualizer_Module_Language();
	213	+ $strings = $class->get_strings();
	214	+ $array = array( 'visualizer_tinymce_plugin' => json_encode( $strings ) );
	215	+ return array_merge( $settings, $array );
	216	+ }
	217	+
	218	+ /**
144	219	* Load plugin translation for - TinyMCE API
145	220	*
146	221	* @access public
147	222	* @param array $arr The tinymce_lang array.
		@@ -214,10 +289,12 @@
214	289	if ( post_type_supports( $typenow, 'editor' ) ) {
215	290	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216	291
217	292	// 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' ) );
	293	+ $deps = array(
	294	+ Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
	295	+ Visualizer_Render_Sidebar_Type_DataTable_DataTable::enqueue_assets( array( 'media-editor' ) ),
	296	+ );
220	297
221	298	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
222	299	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
223	300	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
		@@ -293,60 +370,90 @@
293	370	$types = array_merge(
294	371	$additional,
295	372	array(
296	373	'dataTable' => array(
297		- 'name' => esc_html__( 'Table (New)', 'visualizer' ),
	374	+ 'name' => esc_html__( 'Table', 'visualizer' ),
298	375	'enabled' => true,
	376	+ 'supports' => array( 'DataTable' ),
299	377	),
300	378	'pie' => array(
301		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	379	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
302	380	'enabled' => true,
	381	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
303	382	),
304	383	'line' => array(
305	384	'name' => esc_html__( 'Line', 'visualizer' ),
306	385	'enabled' => true,
	386	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
307	387	),
308	388	'area' => array(
309	389	'name' => esc_html__( 'Area', 'visualizer' ),
310	390	'enabled' => true,
	391	+ // in ChartJS, the fill option is used to make Line chart an area: https://www.chartjs.org/docs/latest/charts/area.html
	392	+ 'supports' => array( 'Google Charts' ),
311	393	),
312	394	'geo' => array(
313	395	'name' => esc_html__( 'Geo', 'visualizer' ),
314	396	'enabled' => true,
	397	+ 'supports' => array( 'Google Charts' ),
315	398	),
316	399	'bar' => array(
317	400	'name' => esc_html__( 'Bar', 'visualizer' ),
318	401	'enabled' => true,
	402	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
319	403	),
320	404	'column' => array(
321	405	'name' => esc_html__( 'Column', 'visualizer' ),
322	406	'enabled' => true,
	407	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
323	408	),
	409	+ 'bubble' => array(
	410	+ 'name' => esc_html__( 'Bubble', 'visualizer' ),
	411	+ 'enabled' => true,
	412	+ // chartjs' bubble is ugly looking (and it won't work off the default bubble.csv) so it is being excluded for the time being.
	413	+ 'supports' => array( 'Google Charts' ),
	414	+ ),
324	415	'scatter' => array(
325	416	'name' => esc_html__( 'Scatter', 'visualizer' ),
326	417	'enabled' => true,
	418	+ 'supports' => array( 'Google Charts' ),
327	419	),
328	420	'gauge' => array(
329	421	'name' => esc_html__( 'Gauge', 'visualizer' ),
330	422	'enabled' => true,
	423	+ 'supports' => array( 'Google Charts' ),
331	424	),
332	425	'candlestick' => array(
333	426	'name' => esc_html__( 'Candlestick', 'visualizer' ),
334	427	'enabled' => true,
	428	+ 'supports' => array( 'Google Charts' ),
335	429	),
336	430	// pro types
337	431	'table' => array(
338	432	'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
339	433	'enabled' => false,
	434	+ 'supports' => array( 'Google Charts' ),
340	435	),
341	436	'timeline' => array(
342	437	'name' => esc_html__( 'Timeline', 'visualizer' ),
343	438	'enabled' => false,
	439	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
344	440	),
345	441	'combo' => array(
346	442	'name' => esc_html__( 'Combo', 'visualizer' ),
347	443	'enabled' => false,
	444	+ 'supports' => array( 'Google Charts' ),
348	445	),
	446	+ 'polarArea' => array(
	447	+ 'name' => esc_html__( 'Polar Area', 'visualizer' ),
	448	+ 'enabled' => false,
	449	+ 'supports' => array( 'ChartJS' ),
	450	+ ),
	451	+ 'radar' => array(
	452	+ 'name' => esc_html__( 'Radar/Spider', 'visualizer' ),
	453	+ 'enabled' => false,
	454	+ 'supports' => array( 'ChartJS' ),
	455	+ ),
349	456	)
350	457	);
351	458	$types = apply_filters( 'visualizer_pro_chart_types', $types );
352	459	if ( $enabledOnly ) {
		@@ -355,8 +462,12 @@
355	462	if ( ! is_array( $array ) ) {
356	463	// support for old pro
357	464	$array = array( 'enabled' => true, 'name' => $array );
358	465	}
	466	+ // backward compatibility for PRO before v1.9.0
	467	+ if ( ! array_key_exists( 'supports', $array ) ) {
	468	+ $array['supports'] = array( 'Google Charts' );
	469	+ }
359	470	if ( ! $array['enabled'] ) {
360	471	continue;
361	472	}
362	473	$filtered[ $type ] = $array;
		@@ -369,8 +480,12 @@
369	480	if ( ! is_array( $array ) ) {
370	481	// support for old pro
371	482	$array = array( 'enabled' => true, 'name' => $array );
372	483	}
	484	+ // backward compatibility for PRO before v1.9.0
	485	+ if ( ! array_key_exists( 'supports', $array ) ) {
	486	+ $array['supports'] = array( 'Google Charts' );
	487	+ }
373	488	$doubleD[ $type ] = $array['name'];
374	489	}
375	490	$types = $doubleD;
376	491	}
		@@ -384,8 +499,10 @@
384	499	private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
385	500	$deprecated = array();
386	501
387	502	switch ( $where ) {
	503	+ case 'types':
	504	+ // fall-through
388	505	case 'library':
389	506	// if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
390	507	if ( ! self::hasChartType( 'table' ) ) {
391	508	$deprecated[] = 'table';
		@@ -396,9 +513,9 @@
396	513	}
397	514	}
398	515
399	516	// if a user has a Gauge/Candlestick chart, then let them keep using it.
400		- if ( ! VISUALIZER_PRO ) {
	517	+ if ( ! Visualizer_Module::is_pro() ) {
401	518	if ( ! self::hasChartType( 'gauge' ) ) {
402	519	if ( $get2Darray ) {
403	520	$deprecated[] = 'gauge';
404	521	} else {
		@@ -425,9 +542,9 @@
425	542	$types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
426	543	}
427	544
428	545	// if a user has a Gauge/Candlestick chart, then let them keep using it.
429		- if ( ! VISUALIZER_PRO ) {
	546	+ if ( ! Visualizer_Module::is_pro() ) {
430	547	if ( ! self::hasChartType( 'gauge' ) ) {
431	548	if ( $get2Darray ) {
432	549	$deprecated[] = 'gauge';
433	550	} else {
		@@ -462,9 +579,9 @@
462	579	* @access public
463	580	*/
464	581	public function renderTemplates() {
465	582	global $pagenow;
466		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	583	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
467	584	return;
468	585	}
469	586	$render = new Visualizer_Render_Templates();
470	587	$render->render();
		@@ -482,9 +599,9 @@
482	599	*
483	600	* @param string $suffix The current page suffix.
484	601	*/
485	602	public function enqueueLibraryScripts( $suffix ) {
486		- if ( $suffix == $this->_libraryPage ) {
	603	+ if ( $suffix === $this->_libraryPage ) {
487	604	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
488	605	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
489	606	wp_enqueue_media();
490	607	wp_enqueue_script(
		@@ -542,11 +659,35 @@
542	659	*
543	660	* @access public
544	661	*/
545	662	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 );
	663	+ $svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZCBTaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5MC4wMDAwMDAsIC00MzUuMDAwMDAwKSIgZmlsbD0iIzM5QzNEMiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMjguNSw1MTIgQzIwNy4yMzcwMzcsNTEyIDE5MCw0OTQuNzYyOTYzIDE5MCw0NzMuNSBDMTkwLDQ1Mi4yMzcwMzcgMjA3LjIzNzAzNyw0MzUgMjI4LjUsNDM1IEMyNDkuNzYyOTYzLDQzNSAyNjcsNDUyLjIzNzAzNyAyNjcsNDczLjUgQzI2Nyw0OTQuNzYyOTYzIDI0OS43NjI5NjMsNTEyIDIyOC41LDUxMiBaIE0yNDYuODQzNzUsNDgzLjU5MjA1OSBMMjE1LjYyNSw0ODMuNTkyMDU5IEwyMTUuNjI1LDQ2MC44MjY1NDQgQzIxNS42MjUsNDYwLjE2NDU0NyAyMTUuMTA3NTc4LDQ1OS42MjgzNTkgMjE0LjQ2ODc1LDQ1OS42MjgzNTkgTDIxMi4xNTYyNSw0NTkuNjI4MzU5IEMyMTEuNTE3NDIyLDQ1OS42MjgzNTkgMjExLDQ2MC4xNjQ1NDcgMjExLDQ2MC44MjY1NDQgTDIxMSw0ODUuOTg4NDI5IEMyMTEsNDg3LjMxMTY3NCAyMTIuMDM1NTY2LDQ4OC4zODQ3OTggMjEzLjMxMjUsNDg4LjM4NDc5OCBMMjQ2Ljg0Mzc1LDQ4OC4zODQ3OTggQzI0Ny40ODI1NzgsNDg4LjM4NDc5OCAyNDgsNDg3Ljg0ODYxMSAyNDgsNDg3LjE4NjYxMyBMMjQ4LDQ4NC43OTAyNDQgQzI0OCw0ODQuMTI4MjQ2IDI0Ny40ODI1NzgsNDgzLjU5MjA1OSAyNDYuODQzNzUsNDgzLjU5MjA1OSBaIE0yNDQuNTMxMjUsNDYyLjAyNDcyOSBMMjM1Ljk5OTU3LDQ2Mi4wMjQ3MjkgQzIzNC40NTQ1MzEsNDYyLjAyNDcyOSAyMzMuNjgwNTY2LDQ2My45NjA1NDcgMjM0Ljc3MzIyMyw0NjUuMDkyODMyIEwyMzcuMTE0NjI5LDQ2Ny41MTkxNTYgTDIzMS44MTI1LDQ3My4wMTQzMzIgTDIyNi41MTAzNzEsNDY3LjUxOTkwNSBDMjI1LjYwNzA1MSw0NjYuNTgzODIzIDIyNC4xNDI5NDksNDY2LjU4MzgyMyAyMjMuMjQwMzUyLDQ2Ny41MTk5MDUgTDIxOC4yNzY0MjYsNDcyLjY2Mzg2MyBDMjE3LjgyNDc2Niw0NzMuMTMxOTA0IDIxNy44MjQ3NjYsNDczLjg5MDUwNSAyMTguMjc2NDI2LDQ3NC4zNTg1NDYgTDIxOS45MTEwNzQsNDc2LjA1MjQ4IEMyMjAuMzYyNzM0LDQ3Ni41MjA1MjEgMjIxLjA5NDc4NSw0NzYuNTIwNTIxIDIyMS41NDY0NDUsNDc2LjA1MjQ4IEwyMjQuODc1LDQ3Mi42MDI0NTYgTDIzMC4xNzcxMjksNDc4LjA5Njg4MyBDMjMxLjA4MDQ0OSw0NzkuMDMyOTY1IDIzMi41NDQ1NTEsNDc5LjAzMjk2NSAyMzMuNDQ3MTQ4LDQ3OC4wOTY4ODMgTDI0MC4zODQ2NDgsNDcwLjkwNzc3MyBMMjQyLjcyNjA1NSw0NzMuMzM0MDk4IEMyNDMuODE4NzExLDQ3NC40NjYzODIgMjQ1LjY4Njc3Nyw0NzMuNjY0MzQ3IDI0NS42ODY3NzcsNDcyLjA2MzI3MyBMMjQ1LjY4Njc3Nyw0NjMuMjIyOTE0IEMyNDUuNjg3NSw0NjIuNTYwOTE3IDI0NS4xNzAwNzgsNDYyLjAyNDcyOSAyNDQuNTMxMjUsNDYyLjAyNDcyOSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==';
	664	+
	665	+ $this->_libraryPage = add_menu_page( __( 'Visualizer', 'visualizer' ), __( 'Visualizer', 'visualizer' ), 'edit_posts', Visualizer_Plugin::NAME, array( $this, 'renderLibraryPage' ), $svg_base64_icon, 99.7666 );
	666	+
	667	+ add_submenu_page(
	668	+ Visualizer_Plugin::NAME,
	669	+ __( 'Chart Library', 'visualizer' ),
	670	+ __( 'Chart Library', 'visualizer' ),
	671	+ 'edit_posts',
	672	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME )
	673	+ );
	674	+ add_submenu_page(
	675	+ Visualizer_Plugin::NAME,
	676	+ __( 'Add New Chart', 'visualizer' ),
	677	+ __( 'Add New Chart', 'visualizer' ),
	678	+ 'edit_posts',
	679	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
	680	+ );
	681	+ add_submenu_page(
	682	+ Visualizer_Plugin::NAME,
	683	+ __( 'Support', 'visualizer' ),
	684	+ __( '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>',
	685	+ 'edit_posts',
	686	+ 'viz-support',
	687	+ array( $this, 'renderSupportPage' )
	688	+ );
	689	+ remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
549	690	}
550	691
551	692	/**
552	693	* Get the instance of WP_Query that fetches the charts as per the given criteria.
		@@ -576,9 +717,9 @@
576	717	'paged' => $page,
577	718	);
578	719	// add chart type filter to the query arguments
579	720	$filter = filter_input( INPUT_GET, 'type' );
580		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	721	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
581	722	$query_args['meta_query'] = array(
582	723	array(
583	724	'key' => Visualizer_Plugin::CF_CHART_TYPE,
584	725	'value' => $filter,
		@@ -604,8 +745,20 @@
604	745	return $q;
605	746	}
606	747
607	748	/**
	749	+ * Renders support page.
	750	+ *
	751	+ * @since 3.3.0
	752	+ *
	753	+ * @access public
	754	+ */
	755	+ public function renderSupportPage() {
	756	+ wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
	757	+ include_once VISUALIZER_ABSPATH . '/templates/support.php';
	758	+ }
	759	+
	760	+ /**
608	761	* Renders visualizer library page.
609	762	*
610	763	* @since 1.0.0
611	764	*
		@@ -628,9 +781,9 @@
628	781	)
629	782	);
630	783	// add chart type filter to the query arguments
631	784	$filter = filter_input( INPUT_GET, 'type' );
632		- if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
	785	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
633	786	$filter = 'all';
634	787	}
635	788
636	789	$css = '';
		@@ -651,9 +804,12 @@
651	804	if ( ! empty( $atts['settings'] ) ) {
652	805	$settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
653	806	}
654	807
655		- unset( $settings['height'], $settings['width'] );
	808	+ if ( $settings ) {
	809	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
	810	+ }
	811	+
656	812	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
657	813	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
658	814
659	815	$library = $this->load_chart_type( $chart->ID );
		@@ -684,14 +840,16 @@
684	840	'language' => $this->get_language(),
685	841	'map_api_key' => get_option( 'visualizer-map-api-key' ),
686	842	'charts' => $charts,
687	843	'urls' => array(
688		- 'base' => add_query_arg( 'vpage', false ),
	844	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
689	845	'create' => add_query_arg(
690	846	array(
691	847	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
692	848	'library' => 'yes',
693	849	'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	850	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	851	+ 'vaction' => false,
694	852	),
695	853	$ajaxurl
696	854	),
697	855	'edit' => add_query_arg(
		@@ -697,13 +855,15 @@
697	855	'edit' => add_query_arg(
698	856	array(
699	857	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
700	858	'library' => 'yes',
	859	+ 'vaction' => false,
701	860	),
702	861	$ajaxurl
703	862	),
704	863	),
705	864	'page_type' => 'library',
	865	+ 'is_front' => false,
706	866	)
707	867	);
708	868	// render library page
709	869	$render = new Visualizer_Render_Library();
		@@ -712,9 +872,9 @@
712	872	$render->types = self::_getChartTypesLocalized( false, false, false, true );
713	873	$render->custom_css = $css;
714	874	$render->pagination = paginate_links(
715	875	array(
716		- 'base' => add_query_arg( 'vpage', '%#%' ),
	876	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
717	877	'format' => '',
718	878	'current' => $page,
719	879	'total' => $query->max_num_pages,
720	880	'type' => 'array',
		@@ -735,14 +895,14 @@
735	895	*
736	896	* @return array Updated array of action links.
737	897	*/
738	898	public function getPluginActionLinks( $links, $file ) {
739		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	899	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
740	900	array_unshift(
741	901	$links,
742	902	sprintf(
743	903	'<a href="%s">%s</a>',
744		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	904	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
745	905	esc_html__( 'Library', 'visualizer' )
746	906	)
747	907	);
748	908	}
		@@ -762,17 +922,17 @@
762	922	*
763	923	* @return array Updated array of plugin meta links.
764	924	*/
765	925	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
766		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	926	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
767	927	// knowledge base link
768	928	$plugin_meta[] = sprintf(
769		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
770		- esc_html__( 'Knowledge Base', 'visualizer' )
	929	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	930	+ esc_html__( 'Docs', 'visualizer' )
771	931	);
772	932	// flattr link
773	933	$plugin_meta[] = sprintf(
774		- '<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
	934	+ '<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>',
775	935	esc_html__( 'Pro Addon', 'visualizer' )
776	936	);
777	937	}
778	938