← All changes | classes/Visualizer/Module/Admin.php +358 -53 3.0.9 → 3.4.0 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,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 );
		@@ -212,16 +273,23 @@
212	273	public function enqueueMediaScripts() {
213	274	global $typenow;
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		- 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 );
	277	+
	278	+ // Load all the assets for the different libraries we support.
	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	+ );
	283	+
	284	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
219	285	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
220	286	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
221	287	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
222	288	wp_localize_script(
223		- 'visualizer-media-view', 'visualizer', array(
	289	+ 'visualizer-media-view',
	290	+ 'visualizer',
	291	+ array(
224	292	'i10n' => array(
225	293	'insert' => __( 'Insert', 'visualizer' ),
226	294	),
227	295	)
		@@ -275,9 +343,9 @@
275	343	* @static
276	344	* @access private
277	345	* @return array The associated array of chart types with localized names.
278	346	*/
279		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
	347	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
280	348	$additional = array();
281	349	if ( $add_select ) {
282	350	$additional['select'] = array(
283	351	'name' => esc_html__( 'All', 'visualizer' ),
		@@ -285,58 +353,93 @@
285	353	);
286	354	}
287	355
288	356	$types = array_merge(
289		- $additional, array(
	357	+ $additional,
	358	+ array(
	359	+ 'dataTable' => array(
	360	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	361	+ 'enabled' => true,
	362	+ 'supports' => array( 'DataTable' ),
	363	+ ),
290	364	'pie' => array(
291		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	365	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
292	366	'enabled' => true,
	367	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
293	368	),
294	369	'line' => array(
295	370	'name' => esc_html__( 'Line', 'visualizer' ),
296	371	'enabled' => true,
	372	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
297	373	),
298	374	'area' => array(
299	375	'name' => esc_html__( 'Area', 'visualizer' ),
300	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' ),
301	379	),
302	380	'geo' => array(
303	381	'name' => esc_html__( 'Geo', 'visualizer' ),
304	382	'enabled' => true,
	383	+ 'supports' => array( 'Google Charts' ),
305	384	),
306	385	'bar' => array(
307	386	'name' => esc_html__( 'Bar', 'visualizer' ),
308	387	'enabled' => true,
	388	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
309	389	),
310	390	'column' => array(
311	391	'name' => esc_html__( 'Column', 'visualizer' ),
312	392	'enabled' => true,
	393	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
313	394	),
314		- 'gauge' => array(
315		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
	395	+ 'bubble' => array(
	396	+ 'name' => esc_html__( 'Bubble', 'visualizer' ),
316	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' ),
317	400	),
318	401	'scatter' => array(
319	402	'name' => esc_html__( 'Scatter', 'visualizer' ),
320	403	'enabled' => true,
	404	+ 'supports' => array( 'Google Charts' ),
321	405	),
	406	+ 'gauge' => array(
	407	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	408	+ 'enabled' => true,
	409	+ 'supports' => array( 'Google Charts' ),
	410	+ ),
322	411	'candlestick' => array(
323	412	'name' => esc_html__( 'Candlestick', 'visualizer' ),
324	413	'enabled' => true,
	414	+ 'supports' => array( 'Google Charts' ),
325	415	),
326	416	// pro types
327	417	'table' => array(
328		- 'name' => esc_html__( 'Table', 'visualizer' ),
	418	+ 'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
329	419	'enabled' => false,
	420	+ 'supports' => array( 'Google Charts' ),
330	421	),
331	422	'timeline' => array(
332	423	'name' => esc_html__( 'Timeline', 'visualizer' ),
333	424	'enabled' => false,
	425	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
334	426	),
335	427	'combo' => array(
336	428	'name' => esc_html__( 'Combo', 'visualizer' ),
337	429	'enabled' => false,
	430	+ 'supports' => array( 'Google Charts' ),
338	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	+ ),
339	442	)
340	443	);
341	444	$types = apply_filters( 'visualizer_pro_chart_types', $types );
342	445	if ( $enabledOnly ) {
		@@ -345,8 +448,12 @@
345	448	if ( ! is_array( $array ) ) {
346	449	// support for old pro
347	450	$array = array( 'enabled' => true, 'name' => $array );
348	451	}
	452	+ // backward compatibility for PRO before v1.9.0
	453	+ if ( ! array_key_exists( 'supports', $array ) ) {
	454	+ $array['supports'] = array( 'Google Charts' );
	455	+ }
349	456	if ( ! $array['enabled'] ) {
350	457	continue;
351	458	}
352	459	$filtered[ $type ] = $array;
		@@ -359,13 +466,94 @@
359	466	if ( ! is_array( $array ) ) {
360	467	// support for old pro
361	468	$array = array( 'enabled' => true, 'name' => $array );
362	469	}
	470	+ // backward compatibility for PRO before v1.9.0
	471	+ if ( ! array_key_exists( 'supports', $array ) ) {
	472	+ $array['supports'] = array( 'Google Charts' );
	473	+ }
363	474	$doubleD[ $type ] = $array['name'];
364	475	}
365	476	$types = $doubleD;
366	477	}
367	478
	479	+ return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
	480	+ }
	481	+
	482	+ /**
	483	+ * Handle (soon-to-be) deprecated charts.
	484	+ */
	485	+ private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
	486	+ $deprecated = array();
	487	+
	488	+ switch ( $where ) {
	489	+ case 'types':
	490	+ // fall-through
	491	+ case 'library':
	492	+ // if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
	493	+ if ( ! self::hasChartType( 'table' ) ) {
	494	+ $deprecated[] = 'table';
	495	+ if ( $get2Darray ) {
	496	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	497	+ } else {
	498	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	499	+ }
	500	+ }
	501	+
	502	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	503	+ if ( ! Visualizer_Module::is_pro() ) {
	504	+ if ( ! self::hasChartType( 'gauge' ) ) {
	505	+ if ( $get2Darray ) {
	506	+ $deprecated[] = 'gauge';
	507	+ } else {
	508	+ $types['gauge']['enabled'] = false;
	509	+ }
	510	+ }
	511	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	512	+ if ( $get2Darray ) {
	513	+ $deprecated[] = 'candlestick';
	514	+ } else {
	515	+ $types['candlestick']['enabled'] = false;
	516	+ }
	517	+ }
	518	+ }
	519	+ break;
	520	+ default:
	521	+ // remove the option to create a Google Table chart.
	522	+ $deprecated[] = 'table';
	523	+
	524	+ // rename the new table chart type.
	525	+ if ( $get2Darray ) {
	526	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	527	+ } else {
	528	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	529	+ }
	530	+
	531	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	532	+ if ( ! Visualizer_Module::is_pro() ) {
	533	+ if ( ! self::hasChartType( 'gauge' ) ) {
	534	+ if ( $get2Darray ) {
	535	+ $deprecated[] = 'gauge';
	536	+ } else {
	537	+ $types['gauge']['enabled'] = false;
	538	+ }
	539	+ }
	540	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	541	+ if ( $get2Darray ) {
	542	+ $deprecated[] = 'candlestick';
	543	+ } else {
	544	+ $types['candlestick']['enabled'] = false;
	545	+ }
	546	+ }
	547	+ }
	548	+ }
	549	+
	550	+ if ( $deprecated ) {
	551	+ foreach ( $deprecated as $type ) {
	552	+ unset( $types[ $type ] );
	553	+ }
	554	+ }
	555	+
368	556	return $types;
369	557	}
370	558
371	559	/**
		@@ -375,11 +563,11 @@
375	563	* @global string $pagenow The name of the current page.
376	564	*
377	565	* @access public
378	566	*/
379		- public function renderTempaltes() {
	567	+ public function renderTemplates() {
380	568	global $pagenow;
381		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	569	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
382	570	return;
383	571	}
384	572	$render = new Visualizer_Render_Templates();
385	573	$render->render();
		@@ -397,26 +585,40 @@
397	585	*
398	586	* @param string $suffix The current page suffix.
399	587	*/
400	588	public function enqueueLibraryScripts( $suffix ) {
401		- if ( $suffix == $this->_libraryPage ) {
	589	+ if ( $suffix === $this->_libraryPage ) {
402	590	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
403	591	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
404	592	wp_enqueue_media();
405	593	wp_enqueue_script(
406		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	594	+ 'visualizer-library',
	595	+ VISUALIZER_ABSURL . 'js/library.js',
	596	+ array(
407	597	'jquery',
408	598	'media-views',
409		- ), Visualizer_Plugin::VERSION, true
	599	+ ),
	600	+ Visualizer_Plugin::VERSION,
	601	+ true
410	602	);
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		- );
	603	+
	604	+ wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
	605	+
	606	+ $query = $this->getQuery();
	607	+ while ( $query->have_posts() ) {
	608	+ $chart = $query->next_post();
	609	+ $library = $this->load_chart_type( $chart->ID );
	610	+ if ( is_null( $library ) ) {
	611	+ continue;
	612	+ }
	613	+ wp_enqueue_script(
	614	+ "visualizer-render-$library",
	615	+ VISUALIZER_ABSURL . 'js/render-facade.js',
	616	+ apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
	617	+ Visualizer_Plugin::VERSION,
	618	+ true
	619	+ );
	620	+ }
419	621	}
420	622	}
421	623
422	624	/**
		@@ -443,24 +645,52 @@
443	645	*
444	646	* @access public
445	647	*/
446	648	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 );
	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 );
450	676	}
451	677
452	678	/**
453		- * Renders visualizer library page.
454		- *
455		- * @since 1.0.0
456		- *
457		- * @access public
	679	+ * Get the instance of WP_Query that fetches the charts as per the given criteria.
458	680	*/
459		- public function renderLibraryPage() {
	681	+ private function getQuery() {
	682	+ static $q;
	683	+ if ( ! is_null( $q ) ) {
	684	+ return $q;
	685	+ }
	686	+
460	687	// get current page
461	688	$page = filter_input(
462		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	689	+ INPUT_GET,
	690	+ 'vpage',
	691	+ FILTER_VALIDATE_INT,
	692	+ array(
463	693	'options' => array(
464	694	'min_range' => 1,
465	695	'default' => 1,
466	696	),
		@@ -473,9 +703,9 @@
473	703	'paged' => $page,
474	704	);
475	705	// add chart type filter to the query arguments
476	706	$filter = filter_input( INPUT_GET, 'type' );
477		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	707	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
478	708	$query_args['meta_query'] = array(
479	709	array(
480	710	'key' => Visualizer_Plugin::CF_CHART_TYPE,
481	711	'value' => $filter,
		@@ -496,56 +726,130 @@
496	726	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
497	727	$meta[] = $query;
498	728	$query_args['meta_query'] = $meta;
499	729	}
500		- // Added by Ash/Upwork
501		- // fetch charts
	730	+ $q = new WP_Query( $query_args );
	731	+ return $q;
	732	+ }
	733	+
	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	+ /**
	747	+ * Renders visualizer library page.
	748	+ *
	749	+ * @since 1.0.0
	750	+ *
	751	+ * @access public
	752	+ */
	753	+ public function renderLibraryPage() {
502	754	$charts = array();
503		- $query = new WP_Query( $query_args );
	755	+ $query = $this->getQuery();
	756	+
	757	+ // get current page
	758	+ $page = filter_input(
	759	+ INPUT_GET,
	760	+ 'vpage',
	761	+ FILTER_VALIDATE_INT,
	762	+ array(
	763	+ 'options' => array(
	764	+ 'min_range' => 1,
	765	+ 'default' => 1,
	766	+ ),
	767	+ )
	768	+ );
	769	+ // add chart type filter to the query arguments
	770	+ $filter = filter_input( INPUT_GET, 'type' );
	771	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
	772	+ $filter = 'all';
	773	+ }
	774	+
	775	+ $css = '';
504	776	while ( $query->have_posts() ) {
505	777	$chart = $query->next_post();
506	778
507	779	// 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	780	$chart = $this->handleExistingRevisions( $chart->ID, $chart );
	781	+ // refresh a "live" db query chart.
	782	+ $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
509	783
	784	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	785	+
510	786	// fetch and update settings
511	787	$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 );
	788	+
	789	+ $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
	790	+ if ( ! empty( $atts['settings'] ) ) {
	791	+ $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
	792	+ }
	793	+
	794	+ if ( $settings ) {
	795	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
	796	+ }
	797	+
514	798	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
515	799	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	800	+
	801	+ $library = $this->load_chart_type( $chart->ID );
	802	+
	803	+ $id = 'visualizer-' . $chart->ID;
	804	+ $arguments = $this->get_inline_custom_css( $id, $settings );
	805	+ if ( ! empty( $arguments ) ) {
	806	+ $css .= $arguments[0];
	807	+ $settings = $arguments[1];
	808	+ }
	809	+
516	810	// add chart to the array
517		- $charts[ 'visualizer-' . $chart->ID ] = array(
	811	+ $charts[ $id ] = array(
518	812	'id' => $chart->ID,
519	813	'type' => $type,
520	814	'series' => $series,
521	815	'settings' => $settings,
522	816	'data' => $data,
	817	+ 'library' => $library,
523	818	);
524	819	}
525	820	// enqueue charts array
526	821	$ajaxurl = admin_url( 'admin-ajax.php' );
527	822	wp_localize_script(
528		- 'visualizer-library', 'visualizer', array(
	823	+ 'visualizer-library',
	824	+ 'visualizer',
	825	+ array(
529	826	'language' => $this->get_language(),
530	827	'map_api_key' => get_option( 'visualizer-map-api-key' ),
531	828	'charts' => $charts,
532	829	'urls' => array(
533		- 'base' => add_query_arg( 'vpage', false ),
	830	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
534	831	'create' => add_query_arg(
535	832	array(
536	833	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
537	834	'library' => 'yes',
538	835	'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
539		- ), $ajaxurl
	836	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	837	+ 'vaction' => false,
	838	+ ),
	839	+ $ajaxurl
540	840	),
541	841	'edit' => add_query_arg(
542	842	array(
543	843	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
544	844	'library' => 'yes',
545		- ), $ajaxurl
	845	+ 'vaction' => false,
	846	+ ),
	847	+ $ajaxurl
546	848	),
547	849	),
	850	+ 'page_type' => 'library',
	851	+ 'is_front' => false,
548	852	)
549	853	);
550	854	// render library page
551	855	$render = new Visualizer_Render_Library();
		@@ -550,12 +854,13 @@
550	854	// render library page
551	855	$render = new Visualizer_Render_Library();
552	856	$render->charts = $charts;
553	857	$render->type = $filter;
554		- $render->types = self::_getChartTypesLocalized();
	858	+ $render->types = self::_getChartTypesLocalized( false, false, false, true );
	859	+ $render->custom_css = $css;
555	860	$render->pagination = paginate_links(
556	861	array(
557		- 'base' => add_query_arg( 'vpage', '%#%' ),
	862	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
558	863	'format' => '',
559	864	'current' => $page,
560	865	'total' => $query->max_num_pages,
561	866	'type' => 'array',
		@@ -576,14 +881,14 @@
576	881	*
577	882	* @return array Updated array of action links.
578	883	*/
579	884	public function getPluginActionLinks( $links, $file ) {
580		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	885	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
581	886	array_unshift(
582	887	$links,
583	888	sprintf(
584	889	'<a href="%s">%s</a>',
585		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	890	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
586	891	esc_html__( 'Library', 'visualizer' )
587	892	)
588	893	);
589	894	}
		@@ -603,17 +908,17 @@
603	908	*
604	909	* @return array Updated array of plugin meta links.
605	910	*/
606	911	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
607		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	912	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
608	913	// knowledge base link
609	914	$plugin_meta[] = sprintf(
610		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
611		- esc_html__( 'Knowledge Base', 'visualizer' )
	915	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	916	+ esc_html__( 'Docs', 'visualizer' )
612	917	);
613	918	// flattr link
614	919	$plugin_meta[] = sprintf(
615		- '<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>',
616	921	esc_html__( 'Pro Addon', 'visualizer' )
617	922	);
618	923	}
619	924