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