← All changes | classes/Visualizer/Module/Admin.php +392 -53 3.0.9 → 3.4.2 View file →

		@@ -52,13 +52,14 @@
52	52	public function __construct( Visualizer_Plugin $plugin ) {
53	53	parent::__construct( $plugin );
54	54	$this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
55	55	$this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
56		- $this->_addAction( 'admin_footer', 'renderTempaltes' );
	56	+ $this->_addAction( 'admin_footer', 'renderTemplates' );
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.
		@@ -212,16 +307,23 @@
212	307	public function enqueueMediaScripts() {
213	308	global $typenow;
214	309	if ( post_type_supports( $typenow, 'editor' ) ) {
215	310	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216		- wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
217		- wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
218		- wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
	311	+
	312	+ // Load all the assets for the different libraries we support.
	313	+ $deps = array(
	314	+ Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
	315	+ Visualizer_Render_Sidebar_Type_DataTable_DataTable::enqueue_assets( array( 'media-editor' ) ),
	316	+ );
	317	+
	318	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
219	319	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
220	320	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
221	321	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
222	322	wp_localize_script(
223		- 'visualizer-media-view', 'visualizer', array(
	323	+ 'visualizer-media-view',
	324	+ 'visualizer',
	325	+ array(
224	326	'i10n' => array(
225	327	'insert' => __( 'Insert', 'visualizer' ),
226	328	),
227	329	)
		@@ -275,9 +377,9 @@
275	377	* @static
276	378	* @access private
277	379	* @return array The associated array of chart types with localized names.
278	380	*/
279		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
	381	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
280	382	$additional = array();
281	383	if ( $add_select ) {
282	384	$additional['select'] = array(
283	385	'name' => esc_html__( 'All', 'visualizer' ),
		@@ -285,58 +387,93 @@
285	387	);
286	388	}
287	389
288	390	$types = array_merge(
289		- $additional, array(
	391	+ $additional,
	392	+ array(
	393	+ 'dataTable' => array(
	394	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	395	+ 'enabled' => true,
	396	+ 'supports' => array( 'DataTable' ),
	397	+ ),
290	398	'pie' => array(
291		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	399	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
292	400	'enabled' => true,
	401	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
293	402	),
294	403	'line' => array(
295	404	'name' => esc_html__( 'Line', 'visualizer' ),
296	405	'enabled' => true,
	406	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
297	407	),
298	408	'area' => array(
299	409	'name' => esc_html__( 'Area', 'visualizer' ),
300	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' ),
301	413	),
302	414	'geo' => array(
303	415	'name' => esc_html__( 'Geo', 'visualizer' ),
304	416	'enabled' => true,
	417	+ 'supports' => array( 'Google Charts' ),
305	418	),
306	419	'bar' => array(
307	420	'name' => esc_html__( 'Bar', 'visualizer' ),
308	421	'enabled' => true,
	422	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
309	423	),
310	424	'column' => array(
311	425	'name' => esc_html__( 'Column', 'visualizer' ),
312	426	'enabled' => true,
	427	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
313	428	),
314		- 'gauge' => array(
315		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
	429	+ 'bubble' => array(
	430	+ 'name' => esc_html__( 'Bubble', 'visualizer' ),
316	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' ),
317	434	),
318	435	'scatter' => array(
319	436	'name' => esc_html__( 'Scatter', 'visualizer' ),
320	437	'enabled' => true,
	438	+ 'supports' => array( 'Google Charts' ),
321	439	),
	440	+ 'gauge' => array(
	441	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	442	+ 'enabled' => true,
	443	+ 'supports' => array( 'Google Charts' ),
	444	+ ),
322	445	'candlestick' => array(
323	446	'name' => esc_html__( 'Candlestick', 'visualizer' ),
324	447	'enabled' => true,
	448	+ 'supports' => array( 'Google Charts' ),
325	449	),
326	450	// pro types
327	451	'table' => array(
328		- 'name' => esc_html__( 'Table', 'visualizer' ),
	452	+ 'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
329	453	'enabled' => false,
	454	+ 'supports' => array( 'Google Charts' ),
330	455	),
331	456	'timeline' => array(
332	457	'name' => esc_html__( 'Timeline', 'visualizer' ),
333	458	'enabled' => false,
	459	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
334	460	),
335	461	'combo' => array(
336	462	'name' => esc_html__( 'Combo', 'visualizer' ),
337	463	'enabled' => false,
	464	+ 'supports' => array( 'Google Charts' ),
338	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	+ ),
339	476	)
340	477	);
341	478	$types = apply_filters( 'visualizer_pro_chart_types', $types );
342	479	if ( $enabledOnly ) {
		@@ -345,8 +482,12 @@
345	482	if ( ! is_array( $array ) ) {
346	483	// support for old pro
347	484	$array = array( 'enabled' => true, 'name' => $array );
348	485	}
	486	+ // backward compatibility for PRO before v1.9.0
	487	+ if ( ! array_key_exists( 'supports', $array ) ) {
	488	+ $array['supports'] = array( 'Google Charts' );
	489	+ }
349	490	if ( ! $array['enabled'] ) {
350	491	continue;
351	492	}
352	493	$filtered[ $type ] = $array;
		@@ -359,13 +500,94 @@
359	500	if ( ! is_array( $array ) ) {
360	501	// support for old pro
361	502	$array = array( 'enabled' => true, 'name' => $array );
362	503	}
	504	+ // backward compatibility for PRO before v1.9.0
	505	+ if ( ! array_key_exists( 'supports', $array ) ) {
	506	+ $array['supports'] = array( 'Google Charts' );
	507	+ }
363	508	$doubleD[ $type ] = $array['name'];
364	509	}
365	510	$types = $doubleD;
366	511	}
367	512
	513	+ return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
	514	+ }
	515	+
	516	+ /**
	517	+ * Handle (soon-to-be) deprecated charts.
	518	+ */
	519	+ private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
	520	+ $deprecated = array();
	521	+
	522	+ switch ( $where ) {
	523	+ case 'types':
	524	+ // fall-through
	525	+ case 'library':
	526	+ // if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
	527	+ if ( ! self::hasChartType( 'table' ) ) {
	528	+ $deprecated[] = 'table';
	529	+ if ( $get2Darray ) {
	530	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	531	+ } else {
	532	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	533	+ }
	534	+ }
	535	+
	536	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	537	+ if ( ! Visualizer_Module::is_pro() ) {
	538	+ if ( ! self::hasChartType( 'gauge' ) ) {
	539	+ if ( $get2Darray ) {
	540	+ $deprecated[] = 'gauge';
	541	+ } else {
	542	+ $types['gauge']['enabled'] = false;
	543	+ }
	544	+ }
	545	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	546	+ if ( $get2Darray ) {
	547	+ $deprecated[] = 'candlestick';
	548	+ } else {
	549	+ $types['candlestick']['enabled'] = false;
	550	+ }
	551	+ }
	552	+ }
	553	+ break;
	554	+ default:
	555	+ // remove the option to create a Google Table chart.
	556	+ $deprecated[] = 'table';
	557	+
	558	+ // rename the new table chart type.
	559	+ if ( $get2Darray ) {
	560	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	561	+ } else {
	562	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	563	+ }
	564	+
	565	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	566	+ if ( ! Visualizer_Module::is_pro() ) {
	567	+ if ( ! self::hasChartType( 'gauge' ) ) {
	568	+ if ( $get2Darray ) {
	569	+ $deprecated[] = 'gauge';
	570	+ } else {
	571	+ $types['gauge']['enabled'] = false;
	572	+ }
	573	+ }
	574	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	575	+ if ( $get2Darray ) {
	576	+ $deprecated[] = 'candlestick';
	577	+ } else {
	578	+ $types['candlestick']['enabled'] = false;
	579	+ }
	580	+ }
	581	+ }
	582	+ }
	583	+
	584	+ if ( $deprecated ) {
	585	+ foreach ( $deprecated as $type ) {
	586	+ unset( $types[ $type ] );
	587	+ }
	588	+ }
	589	+
368	590	return $types;
369	591	}
370	592
371	593	/**
		@@ -375,11 +597,11 @@
375	597	* @global string $pagenow The name of the current page.
376	598	*
377	599	* @access public
378	600	*/
379		- public function renderTempaltes() {
	601	+ public function renderTemplates() {
380	602	global $pagenow;
381		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	603	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
382	604	return;
383	605	}
384	606	$render = new Visualizer_Render_Templates();
385	607	$render->render();
		@@ -397,26 +619,40 @@
397	619	*
398	620	* @param string $suffix The current page suffix.
399	621	*/
400	622	public function enqueueLibraryScripts( $suffix ) {
401		- if ( $suffix == $this->_libraryPage ) {
	623	+ if ( $suffix === $this->_libraryPage ) {
402	624	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
403	625	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
404	626	wp_enqueue_media();
405	627	wp_enqueue_script(
406		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	628	+ 'visualizer-library',
	629	+ VISUALIZER_ABSURL . 'js/library.js',
	630	+ array(
407	631	'jquery',
408	632	'media-views',
409		- ), Visualizer_Plugin::VERSION, true
	633	+ ),
	634	+ Visualizer_Plugin::VERSION,
	635	+ true
410	636	);
411		- wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
412		- wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
413		- wp_enqueue_script(
414		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
415		- 'google-jsapi-old',
416		- 'visualizer-library',
417		- ), Visualizer_Plugin::VERSION, true
418		- );
	637	+
	638	+ wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
	639	+
	640	+ $query = $this->getQuery();
	641	+ while ( $query->have_posts() ) {
	642	+ $chart = $query->next_post();
	643	+ $library = $this->load_chart_type( $chart->ID );
	644	+ if ( is_null( $library ) ) {
	645	+ continue;
	646	+ }
	647	+ wp_enqueue_script(
	648	+ "visualizer-render-$library",
	649	+ VISUALIZER_ABSURL . 'js/render-facade.js',
	650	+ apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
	651	+ Visualizer_Plugin::VERSION,
	652	+ true
	653	+ );
	654	+ }
419	655	}
420	656	}
421	657
422	658	/**
		@@ -443,24 +679,52 @@
443	679	*
444	680	* @access public
445	681	*/
446	682	public function registerAdminMenu() {
447		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
448		- $callback = array( $this, 'renderLibraryPage' );
449		- $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 );
450	710	}
451	711
452	712	/**
453		- * Renders visualizer library page.
454		- *
455		- * @since 1.0.0
456		- *
457		- * @access public
	713	+ * Get the instance of WP_Query that fetches the charts as per the given criteria.
458	714	*/
459		- public function renderLibraryPage() {
	715	+ private function getQuery() {
	716	+ static $q;
	717	+ if ( ! is_null( $q ) ) {
	718	+ return $q;
	719	+ }
	720	+
460	721	// get current page
461	722	$page = filter_input(
462		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	723	+ INPUT_GET,
	724	+ 'vpage',
	725	+ FILTER_VALIDATE_INT,
	726	+ array(
463	727	'options' => array(
464	728	'min_range' => 1,
465	729	'default' => 1,
466	730	),
		@@ -473,9 +737,9 @@
473	737	'paged' => $page,
474	738	);
475	739	// add chart type filter to the query arguments
476	740	$filter = filter_input( INPUT_GET, 'type' );
477		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	741	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
478	742	$query_args['meta_query'] = array(
479	743	array(
480	744	'key' => Visualizer_Plugin::CF_CHART_TYPE,
481	745	'value' => $filter,
		@@ -496,56 +760,130 @@
496	760	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
497	761	$meta[] = $query;
498	762	$query_args['meta_query'] = $meta;
499	763	}
500		- // Added by Ash/Upwork
501		- // fetch charts
	764	+ $q = new WP_Query( apply_filters( 'visualizer_query_args', $query_args ) );
	765	+ return $q;
	766	+ }
	767	+
	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	+ /**
	781	+ * Renders visualizer library page.
	782	+ *
	783	+ * @since 1.0.0
	784	+ *
	785	+ * @access public
	786	+ */
	787	+ public function renderLibraryPage() {
502	788	$charts = array();
503		- $query = new WP_Query( $query_args );
	789	+ $query = $this->getQuery();
	790	+
	791	+ // get current page
	792	+ $page = filter_input(
	793	+ INPUT_GET,
	794	+ 'vpage',
	795	+ FILTER_VALIDATE_INT,
	796	+ array(
	797	+ 'options' => array(
	798	+ 'min_range' => 1,
	799	+ 'default' => 1,
	800	+ ),
	801	+ )
	802	+ );
	803	+ // add chart type filter to the query arguments
	804	+ $filter = filter_input( INPUT_GET, 'type' );
	805	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
	806	+ $filter = 'all';
	807	+ }
	808	+
	809	+ $css = '';
504	810	while ( $query->have_posts() ) {
505	811	$chart = $query->next_post();
506	812
507	813	// if the user has updated a chart and instead of saving it, has closed the modal. If the user refreshes, they should get the original chart.
508	814	$chart = $this->handleExistingRevisions( $chart->ID, $chart );
	815	+ // refresh a "live" db query chart.
	816	+ $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
509	817
	818	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	819	+
510	820	// fetch and update settings
511	821	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
512		- unset( $settings['height'], $settings['width'] );
513		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	822	+
	823	+ $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
	824	+ if ( ! empty( $atts['settings'] ) ) {
	825	+ $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
	826	+ }
	827	+
	828	+ if ( $settings ) {
	829	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
	830	+ }
	831	+
514	832	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
515	833	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	834	+
	835	+ $library = $this->load_chart_type( $chart->ID );
	836	+
	837	+ $id = 'visualizer-' . $chart->ID;
	838	+ $arguments = $this->get_inline_custom_css( $id, $settings );
	839	+ if ( ! empty( $arguments ) ) {
	840	+ $css .= $arguments[0];
	841	+ $settings = $arguments[1];
	842	+ }
	843	+
516	844	// add chart to the array
517		- $charts[ 'visualizer-' . $chart->ID ] = array(
	845	+ $charts[ $id ] = array(
518	846	'id' => $chart->ID,
519	847	'type' => $type,
520	848	'series' => $series,
521	849	'settings' => $settings,
522	850	'data' => $data,
	851	+ 'library' => $library,
523	852	);
524	853	}
525	854	// enqueue charts array
526	855	$ajaxurl = admin_url( 'admin-ajax.php' );
527	856	wp_localize_script(
528		- 'visualizer-library', 'visualizer', array(
	857	+ 'visualizer-library',
	858	+ 'visualizer',
	859	+ array(
529	860	'language' => $this->get_language(),
530	861	'map_api_key' => get_option( 'visualizer-map-api-key' ),
531	862	'charts' => $charts,
532	863	'urls' => array(
533		- 'base' => add_query_arg( 'vpage', false ),
	864	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
534	865	'create' => add_query_arg(
535	866	array(
536	867	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
537	868	'library' => 'yes',
538	869	'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
539		- ), $ajaxurl
	870	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	871	+ 'vaction' => false,
	872	+ ),
	873	+ $ajaxurl
540	874	),
541	875	'edit' => add_query_arg(
542	876	array(
543	877	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
544	878	'library' => 'yes',
545		- ), $ajaxurl
	879	+ 'vaction' => false,
	880	+ ),
	881	+ $ajaxurl
546	882	),
547	883	),
	884	+ 'page_type' => 'library',
	885	+ 'is_front' => false,
548	886	)
549	887	);
550	888	// render library page
551	889	$render = new Visualizer_Render_Library();
		@@ -550,12 +888,13 @@
550	888	// render library page
551	889	$render = new Visualizer_Render_Library();
552	890	$render->charts = $charts;
553	891	$render->type = $filter;
554		- $render->types = self::_getChartTypesLocalized();
	892	+ $render->types = self::_getChartTypesLocalized( false, false, false, true );
	893	+ $render->custom_css = $css;
555	894	$render->pagination = paginate_links(
556	895	array(
557		- 'base' => add_query_arg( 'vpage', '%#%' ),
	896	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
558	897	'format' => '',
559	898	'current' => $page,
560	899	'total' => $query->max_num_pages,
561	900	'type' => 'array',
		@@ -576,14 +915,14 @@
576	915	*
577	916	* @return array Updated array of action links.
578	917	*/
579	918	public function getPluginActionLinks( $links, $file ) {
580		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	919	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
581	920	array_unshift(
582	921	$links,
583	922	sprintf(
584	923	'<a href="%s">%s</a>',
585		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	924	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
586	925	esc_html__( 'Library', 'visualizer' )
587	926	)
588	927	);
589	928	}
		@@ -603,17 +942,17 @@
603	942	*
604	943	* @return array Updated array of plugin meta links.
605	944	*/
606	945	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
607		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	946	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
608	947	// knowledge base link
609	948	$plugin_meta[] = sprintf(
610		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
611		- esc_html__( 'Knowledge Base', 'visualizer' )
	949	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	950	+ esc_html__( 'Docs', 'visualizer' )
612	951	);
613	952	// flattr link
614	953	$plugin_meta[] = sprintf(
615		- '<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>',
616	955	esc_html__( 'Pro Addon', 'visualizer' )
617	956	);
618	957	}
619	958