← All changes | classes/Visualizer/Module/Admin.php +200 -22 3.1.2 → 3.4.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
		@@ -66,12 +67,91 @@
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' );
	74	+
	75	+ if ( defined( 'TI_CYPRESS_TESTING' ) ) {
	76	+ $this->load_cypress_hooks();
	77	+ }
	78	+
71	79	}
72	80
73	81	/**
	82	+ * Define the hooks that are needed for cypress.
	83	+ *
	84	+ * @since 3.4.0
	85	+ * @access private
	86	+ */
	87	+ private function load_cypress_hooks() {
	88	+ // all charts should load on the same page without pagination.
	89	+ add_filter(
	90	+ 'visualizer_query_args', function( $args ) {
	91	+ $args['posts_per_page'] = 20;
	92	+ return $args;
	93	+ }, 10, 1
	94	+ );
	95	+ }
	96	+
	97	+ /**
	98	+ * Add disabled `optgroup` schedules to the drop downs.
	99	+ *
	100	+ * @since ?
	101	+ *
	102	+ * @access public
	103	+ *
	104	+ * @param string $feature The feature for which to add schedules.
	105	+ * @param int $chart_id The chart ID.
	106	+ * @param int $plan The plan number.
	107	+ */
	108	+ public function addSplChartSchedules( $feature, $chart_id, $plan ) {
	109	+ if ( apply_filters( 'visualizer_is_business', false ) ) {
	110	+ return;
	111	+ }
	112	+
	113	+ $license = __( 'PRO', 'visualizer' );
	114	+ if ( Visualizer_Module::is_pro() ) {
	115	+ switch ( $plan ) {
	116	+ case 1:
	117	+ $license = __( 'Developer', 'visualizer' );
	118	+ break;
	119	+ }
	120	+ }
	121	+
	122	+ $hours = array(
	123	+ '0' => __( 'Live', 'visualizer' ),
	124	+ '1' => __( 'Each hour', 'visualizer' ),
	125	+ '12' => __( 'Each 12 hours', 'visualizer' ),
	126	+ '24' => __( 'Each day', 'visualizer' ),
	127	+ '72' => __( 'Each 3 days', 'visualizer' ),
	128	+ );
	129	+
	130	+ switch ( $feature ) {
	131	+ case 'json':
	132	+ case 'csv':
	133	+ // no more schedules if pro is already active.
	134	+ if ( Visualizer_Module::is_pro() ) {
	135	+ return;
	136	+ }
	137	+ break;
	138	+ case 'wp':
	139	+ // fall-through.
	140	+ case 'db':
	141	+ break;
	142	+ default:
	143	+ return;
	144	+ }
	145	+
	146	+ echo '<optgroup disabled label="' . sprintf( __( 'More in the %s version', 'visualizer' ), $license ) . '">';
	147	+ foreach ( $hours as $hour => $desc ) {
	148	+ echo '<option disabled>' . $desc . '</option>';
	149	+ }
	150	+ echo '</optgroup>';
	151	+ }
	152	+
	153	+ /**
74	154	* No limits on revisions.
75	155	*/
76	156	public function limitRevisions( $num, $post ) {
77	157	if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
		@@ -132,16 +212,31 @@
132	212	*
133	213	* @access public
134	214	*/
135	215	public function init() {
	216	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
136	217	if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
137	218	$this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
138	219	$this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
139	220	$this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
	221	+ $this->_addFilter( 'tiny_mce_before_init', 'get_strings_for_block', 10, 1 );
140	222	}
141	223	}
142	224
143	225	/**
	226	+ * Add the strings required for the TinyMCE buttons for the classic block (not the classic editor).
	227	+ *
	228	+ * @since ?
	229	+ * @access friendly
	230	+ */
	231	+ function get_strings_for_block( $settings ) {
	232	+ $class = new Visualizer_Module_Language();
	233	+ $strings = $class->get_strings();
	234	+ $array = array( 'visualizer_tinymce_plugin' => json_encode( $strings ) );
	235	+ return array_merge( $settings, $array );
	236	+ }
	237	+
	238	+ /**
144	239	* Load plugin translation for - TinyMCE API
145	240	*
146	241	* @access public
147	242	* @param array $arr The tinymce_lang array.
		@@ -216,9 +311,9 @@
216	311
217	312	// Load all the assets for the different libraries we support.
218	313	$deps = array(
219	314	Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
220		- Visualizer_Render_Sidebar_Type_DataTable::enqueue_assets( array( 'media-editor' ) ),
	315	+ Visualizer_Render_Sidebar_Type_DataTable_DataTable::enqueue_assets( array( 'media-editor' ) ),
221	316	);
222	317
223	318	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
224	319	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
		@@ -295,60 +390,90 @@
295	390	$types = array_merge(
296	391	$additional,
297	392	array(
298	393	'dataTable' => array(
299		- 'name' => esc_html__( 'Table (New)', 'visualizer' ),
	394	+ 'name' => esc_html__( 'Table', 'visualizer' ),
300	395	'enabled' => true,
	396	+ 'supports' => array( 'DataTable' ),
301	397	),
302	398	'pie' => array(
303		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	399	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
304	400	'enabled' => true,
	401	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
305	402	),
306	403	'line' => array(
307	404	'name' => esc_html__( 'Line', 'visualizer' ),
308	405	'enabled' => true,
	406	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
309	407	),
310	408	'area' => array(
311	409	'name' => esc_html__( 'Area', 'visualizer' ),
312	410	'enabled' => true,
	411	+ // in ChartJS, the fill option is used to make Line chart an area: https://www.chartjs.org/docs/latest/charts/area.html
	412	+ 'supports' => array( 'Google Charts' ),
313	413	),
314	414	'geo' => array(
315	415	'name' => esc_html__( 'Geo', 'visualizer' ),
316	416	'enabled' => true,
	417	+ 'supports' => array( 'Google Charts' ),
317	418	),
318	419	'bar' => array(
319	420	'name' => esc_html__( 'Bar', 'visualizer' ),
320	421	'enabled' => true,
	422	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
321	423	),
322	424	'column' => array(
323	425	'name' => esc_html__( 'Column', 'visualizer' ),
324	426	'enabled' => true,
	427	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
325	428	),
	429	+ 'bubble' => array(
	430	+ 'name' => esc_html__( 'Bubble', 'visualizer' ),
	431	+ 'enabled' => true,
	432	+ // chartjs' bubble is ugly looking (and it won't work off the default bubble.csv) so it is being excluded for the time being.
	433	+ 'supports' => array( 'Google Charts' ),
	434	+ ),
326	435	'scatter' => array(
327	436	'name' => esc_html__( 'Scatter', 'visualizer' ),
328	437	'enabled' => true,
	438	+ 'supports' => array( 'Google Charts' ),
329	439	),
330	440	'gauge' => array(
331	441	'name' => esc_html__( 'Gauge', 'visualizer' ),
332	442	'enabled' => true,
	443	+ 'supports' => array( 'Google Charts' ),
333	444	),
334	445	'candlestick' => array(
335	446	'name' => esc_html__( 'Candlestick', 'visualizer' ),
336	447	'enabled' => true,
	448	+ 'supports' => array( 'Google Charts' ),
337	449	),
338	450	// pro types
339	451	'table' => array(
340	452	'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
341	453	'enabled' => false,
	454	+ 'supports' => array( 'Google Charts' ),
342	455	),
343	456	'timeline' => array(
344	457	'name' => esc_html__( 'Timeline', 'visualizer' ),
345	458	'enabled' => false,
	459	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
346	460	),
347	461	'combo' => array(
348	462	'name' => esc_html__( 'Combo', 'visualizer' ),
349	463	'enabled' => false,
	464	+ 'supports' => array( 'Google Charts' ),
350	465	),
	466	+ 'polarArea' => array(
	467	+ 'name' => esc_html__( 'Polar Area', 'visualizer' ),
	468	+ 'enabled' => false,
	469	+ 'supports' => array( 'ChartJS' ),
	470	+ ),
	471	+ 'radar' => array(
	472	+ 'name' => esc_html__( 'Radar/Spider', 'visualizer' ),
	473	+ 'enabled' => false,
	474	+ 'supports' => array( 'ChartJS' ),
	475	+ ),
351	476	)
352	477	);
353	478	$types = apply_filters( 'visualizer_pro_chart_types', $types );
354	479	if ( $enabledOnly ) {
		@@ -357,8 +482,12 @@
357	482	if ( ! is_array( $array ) ) {
358	483	// support for old pro
359	484	$array = array( 'enabled' => true, 'name' => $array );
360	485	}
	486	+ // backward compatibility for PRO before v1.9.0
	487	+ if ( ! array_key_exists( 'supports', $array ) ) {
	488	+ $array['supports'] = array( 'Google Charts' );
	489	+ }
361	490	if ( ! $array['enabled'] ) {
362	491	continue;
363	492	}
364	493	$filtered[ $type ] = $array;
		@@ -371,8 +500,12 @@
371	500	if ( ! is_array( $array ) ) {
372	501	// support for old pro
373	502	$array = array( 'enabled' => true, 'name' => $array );
374	503	}
	504	+ // backward compatibility for PRO before v1.9.0
	505	+ if ( ! array_key_exists( 'supports', $array ) ) {
	506	+ $array['supports'] = array( 'Google Charts' );
	507	+ }
375	508	$doubleD[ $type ] = $array['name'];
376	509	}
377	510	$types = $doubleD;
378	511	}
		@@ -386,8 +519,10 @@
386	519	private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
387	520	$deprecated = array();
388	521
389	522	switch ( $where ) {
	523	+ case 'types':
	524	+ // fall-through
390	525	case 'library':
391	526	// if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
392	527	if ( ! self::hasChartType( 'table' ) ) {
393	528	$deprecated[] = 'table';
		@@ -398,9 +533,9 @@
398	533	}
399	534	}
400	535
401	536	// if a user has a Gauge/Candlestick chart, then let them keep using it.
402		- if ( ! VISUALIZER_PRO ) {
	537	+ if ( ! Visualizer_Module::is_pro() ) {
403	538	if ( ! self::hasChartType( 'gauge' ) ) {
404	539	if ( $get2Darray ) {
405	540	$deprecated[] = 'gauge';
406	541	} else {
		@@ -427,9 +562,9 @@
427	562	$types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
428	563	}
429	564
430	565	// if a user has a Gauge/Candlestick chart, then let them keep using it.
431		- if ( ! VISUALIZER_PRO ) {
	566	+ if ( ! Visualizer_Module::is_pro() ) {
432	567	if ( ! self::hasChartType( 'gauge' ) ) {
433	568	if ( $get2Darray ) {
434	569	$deprecated[] = 'gauge';
435	570	} else {
		@@ -464,9 +599,9 @@
464	599	* @access public
465	600	*/
466	601	public function renderTemplates() {
467	602	global $pagenow;
468		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	603	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
469	604	return;
470	605	}
471	606	$render = new Visualizer_Render_Templates();
472	607	$render->render();
		@@ -484,9 +619,9 @@
484	619	*
485	620	* @param string $suffix The current page suffix.
486	621	*/
487	622	public function enqueueLibraryScripts( $suffix ) {
488		- if ( $suffix == $this->_libraryPage ) {
	623	+ if ( $suffix === $this->_libraryPage ) {
489	624	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
490	625	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
491	626	wp_enqueue_media();
492	627	wp_enqueue_script(
		@@ -544,11 +679,35 @@
544	679	*
545	680	* @access public
546	681	*/
547	682	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 );
	683	+ $svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZCBTaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5MC4wMDAwMDAsIC00MzUuMDAwMDAwKSIgZmlsbD0iIzM5QzNEMiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMjguNSw1MTIgQzIwNy4yMzcwMzcsNTEyIDE5MCw0OTQuNzYyOTYzIDE5MCw0NzMuNSBDMTkwLDQ1Mi4yMzcwMzcgMjA3LjIzNzAzNyw0MzUgMjI4LjUsNDM1IEMyNDkuNzYyOTYzLDQzNSAyNjcsNDUyLjIzNzAzNyAyNjcsNDczLjUgQzI2Nyw0OTQuNzYyOTYzIDI0OS43NjI5NjMsNTEyIDIyOC41LDUxMiBaIE0yNDYuODQzNzUsNDgzLjU5MjA1OSBMMjE1LjYyNSw0ODMuNTkyMDU5IEwyMTUuNjI1LDQ2MC44MjY1NDQgQzIxNS42MjUsNDYwLjE2NDU0NyAyMTUuMTA3NTc4LDQ1OS42MjgzNTkgMjE0LjQ2ODc1LDQ1OS42MjgzNTkgTDIxMi4xNTYyNSw0NTkuNjI4MzU5IEMyMTEuNTE3NDIyLDQ1OS42MjgzNTkgMjExLDQ2MC4xNjQ1NDcgMjExLDQ2MC44MjY1NDQgTDIxMSw0ODUuOTg4NDI5IEMyMTEsNDg3LjMxMTY3NCAyMTIuMDM1NTY2LDQ4OC4zODQ3OTggMjEzLjMxMjUsNDg4LjM4NDc5OCBMMjQ2Ljg0Mzc1LDQ4OC4zODQ3OTggQzI0Ny40ODI1NzgsNDg4LjM4NDc5OCAyNDgsNDg3Ljg0ODYxMSAyNDgsNDg3LjE4NjYxMyBMMjQ4LDQ4NC43OTAyNDQgQzI0OCw0ODQuMTI4MjQ2IDI0Ny40ODI1NzgsNDgzLjU5MjA1OSAyNDYuODQzNzUsNDgzLjU5MjA1OSBaIE0yNDQuNTMxMjUsNDYyLjAyNDcyOSBMMjM1Ljk5OTU3LDQ2Mi4wMjQ3MjkgQzIzNC40NTQ1MzEsNDYyLjAyNDcyOSAyMzMuNjgwNTY2LDQ2My45NjA1NDcgMjM0Ljc3MzIyMyw0NjUuMDkyODMyIEwyMzcuMTE0NjI5LDQ2Ny41MTkxNTYgTDIzMS44MTI1LDQ3My4wMTQzMzIgTDIyNi41MTAzNzEsNDY3LjUxOTkwNSBDMjI1LjYwNzA1MSw0NjYuNTgzODIzIDIyNC4xNDI5NDksNDY2LjU4MzgyMyAyMjMuMjQwMzUyLDQ2Ny41MTk5MDUgTDIxOC4yNzY0MjYsNDcyLjY2Mzg2MyBDMjE3LjgyNDc2Niw0NzMuMTMxOTA0IDIxNy44MjQ3NjYsNDczLjg5MDUwNSAyMTguMjc2NDI2LDQ3NC4zNTg1NDYgTDIxOS45MTEwNzQsNDc2LjA1MjQ4IEMyMjAuMzYyNzM0LDQ3Ni41MjA1MjEgMjIxLjA5NDc4NSw0NzYuNTIwNTIxIDIyMS41NDY0NDUsNDc2LjA1MjQ4IEwyMjQuODc1LDQ3Mi42MDI0NTYgTDIzMC4xNzcxMjksNDc4LjA5Njg4MyBDMjMxLjA4MDQ0OSw0NzkuMDMyOTY1IDIzMi41NDQ1NTEsNDc5LjAzMjk2NSAyMzMuNDQ3MTQ4LDQ3OC4wOTY4ODMgTDI0MC4zODQ2NDgsNDcwLjkwNzc3MyBMMjQyLjcyNjA1NSw0NzMuMzM0MDk4IEMyNDMuODE4NzExLDQ3NC40NjYzODIgMjQ1LjY4Njc3Nyw0NzMuNjY0MzQ3IDI0NS42ODY3NzcsNDcyLjA2MzI3MyBMMjQ1LjY4Njc3Nyw0NjMuMjIyOTE0IEMyNDUuNjg3NSw0NjIuNTYwOTE3IDI0NS4xNzAwNzgsNDYyLjAyNDcyOSAyNDQuNTMxMjUsNDYyLjAyNDcyOSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==';
	684	+
	685	+ $this->_libraryPage = add_menu_page( __( 'Visualizer', 'visualizer' ), __( 'Visualizer', 'visualizer' ), 'edit_posts', Visualizer_Plugin::NAME, array( $this, 'renderLibraryPage' ), $svg_base64_icon, 99.7666 );
	686	+
	687	+ add_submenu_page(
	688	+ Visualizer_Plugin::NAME,
	689	+ __( 'Chart Library', 'visualizer' ),
	690	+ __( 'Chart Library', 'visualizer' ),
	691	+ 'edit_posts',
	692	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME )
	693	+ );
	694	+ add_submenu_page(
	695	+ Visualizer_Plugin::NAME,
	696	+ __( 'Add New Chart', 'visualizer' ),
	697	+ __( 'Add New Chart', 'visualizer' ),
	698	+ 'edit_posts',
	699	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
	700	+ );
	701	+ add_submenu_page(
	702	+ Visualizer_Plugin::NAME,
	703	+ __( 'Support', 'visualizer' ),
	704	+ __( '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>',
	705	+ 'edit_posts',
	706	+ 'viz-support',
	707	+ array( $this, 'renderSupportPage' )
	708	+ );
	709	+ remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
551	710	}
552	711
553	712	/**
554	713	* Get the instance of WP_Query that fetches the charts as per the given criteria.
		@@ -578,9 +737,9 @@
578	737	'paged' => $page,
579	738	);
580	739	// add chart type filter to the query arguments
581	740	$filter = filter_input( INPUT_GET, 'type' );
582		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	741	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
583	742	$query_args['meta_query'] = array(
584	743	array(
585	744	'key' => Visualizer_Plugin::CF_CHART_TYPE,
586	745	'value' => $filter,
		@@ -601,13 +760,25 @@
601	760	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
602	761	$meta[] = $query;
603	762	$query_args['meta_query'] = $meta;
604	763	}
605		- $q = new WP_Query( $query_args );
	764	+ $q = new WP_Query( apply_filters( 'visualizer_query_args', $query_args ) );
606	765	return $q;
607	766	}
608	767
609	768	/**
	769	+ * Renders support page.
	770	+ *
	771	+ * @since 3.3.0
	772	+ *
	773	+ * @access public
	774	+ */
	775	+ public function renderSupportPage() {
	776	+ wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
	777	+ include_once VISUALIZER_ABSPATH . '/templates/support.php';
	778	+ }
	779	+
	780	+ /**
610	781	* Renders visualizer library page.
611	782	*
612	783	* @since 1.0.0
613	784	*
		@@ -630,9 +801,9 @@
630	801	)
631	802	);
632	803	// add chart type filter to the query arguments
633	804	$filter = filter_input( INPUT_GET, 'type' );
634		- if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
	805	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
635	806	$filter = 'all';
636	807	}
637	808
638	809	$css = '';
		@@ -653,9 +824,12 @@
653	824	if ( ! empty( $atts['settings'] ) ) {
654	825	$settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
655	826	}
656	827
657		- unset( $settings['height'], $settings['width'] );
	828	+ if ( $settings ) {
	829	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
	830	+ }
	831	+
658	832	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
659	833	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
660	834
661	835	$library = $this->load_chart_type( $chart->ID );
		@@ -686,14 +860,16 @@
686	860	'language' => $this->get_language(),
687	861	'map_api_key' => get_option( 'visualizer-map-api-key' ),
688	862	'charts' => $charts,
689	863	'urls' => array(
690		- 'base' => add_query_arg( 'vpage', false ),
	864	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
691	865	'create' => add_query_arg(
692	866	array(
693	867	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
694	868	'library' => 'yes',
695	869	'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	870	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	871	+ 'vaction' => false,
696	872	),
697	873	$ajaxurl
698	874	),
699	875	'edit' => add_query_arg(
		@@ -699,13 +875,15 @@
699	875	'edit' => add_query_arg(
700	876	array(
701	877	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
702	878	'library' => 'yes',
	879	+ 'vaction' => false,
703	880	),
704	881	$ajaxurl
705	882	),
706	883	),
707	884	'page_type' => 'library',
	885	+ 'is_front' => false,
708	886	)
709	887	);
710	888	// render library page
711	889	$render = new Visualizer_Render_Library();
		@@ -714,9 +892,9 @@
714	892	$render->types = self::_getChartTypesLocalized( false, false, false, true );
715	893	$render->custom_css = $css;
716	894	$render->pagination = paginate_links(
717	895	array(
718		- 'base' => add_query_arg( 'vpage', '%#%' ),
	896	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
719	897	'format' => '',
720	898	'current' => $page,
721	899	'total' => $query->max_num_pages,
722	900	'type' => 'array',
		@@ -737,14 +915,14 @@
737	915	*
738	916	* @return array Updated array of action links.
739	917	*/
740	918	public function getPluginActionLinks( $links, $file ) {
741		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	919	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
742	920	array_unshift(
743	921	$links,
744	922	sprintf(
745	923	'<a href="%s">%s</a>',
746		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	924	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
747	925	esc_html__( 'Library', 'visualizer' )
748	926	)
749	927	);
750	928	}
		@@ -764,17 +942,17 @@
764	942	*
765	943	* @return array Updated array of plugin meta links.
766	944	*/
767	945	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
768		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	946	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
769	947	// knowledge base link
770	948	$plugin_meta[] = sprintf(
771		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
772		- esc_html__( 'Knowledge Base', 'visualizer' )
	949	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	950	+ esc_html__( 'Docs', 'visualizer' )
773	951	);
774	952	// flattr link
775	953	$plugin_meta[] = sprintf(
776		- '<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
	954	+ '<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>',
777	955	esc_html__( 'Pro Addon', 'visualizer' )
778	956	);
779	957	}
780	958