← All changes | classes/Visualizer/Module/Admin.php +502 -68 3.0.8 → 3.4.3 View file →

		@@ -52,26 +52,108 @@
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		- $this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
63	63	$this->_addFilter( 'visualizer_feedback_review_trigger', 'feedbackReviewTrigger' );
64	64
	65	+ // screen pagination
	66	+ $this->_addFilter( 'set-screen-option', 'setScreenOptions', 10, 3 );
	67	+
65	68	// revision support.
66	69	$this->_addFilter( 'wp_revisions_to_keep', 'limitRevisions', null, 10, 2 );
67	70	$this->_addAction( '_wp_put_post_revision', 'addRevision', null, 10, 1 );
68	71	$this->_addAction( 'wp_restore_post_revision', 'restoreRevision', null, 10, 2 );
69	72
	73	+ $this->_addAction( 'visualizer_chart_schedules_spl', 'addSplChartSchedules', null, 10, 3 );
	74	+
70	75	$this->_addAction( 'admin_init', 'init' );
	76	+
	77	+ if ( defined( 'TI_CYPRESS_TESTING' ) ) {
	78	+ $this->load_cypress_hooks();
	79	+ }
	80	+
71	81	}
72	82
73	83	/**
	84	+ * Define the hooks that are needed for cypress.
	85	+ *
	86	+ * @since 3.4.0
	87	+ * @access private
	88	+ */
	89	+ private function load_cypress_hooks() {
	90	+ // all charts should load on the same page without pagination.
	91	+ add_filter(
	92	+ 'visualizer_query_args', function( $args ) {
	93	+ $args['posts_per_page'] = 20;
	94	+ return $args;
	95	+ }, 10, 1
	96	+ );
	97	+ }
	98	+
	99	+ /**
	100	+ * Add disabled `optgroup` schedules to the drop downs.
	101	+ *
	102	+ * @since ?
	103	+ *
	104	+ * @access public
	105	+ *
	106	+ * @param string $feature The feature for which to add schedules.
	107	+ * @param int $chart_id The chart ID.
	108	+ * @param int $plan The plan number.
	109	+ */
	110	+ public function addSplChartSchedules( $feature, $chart_id, $plan ) {
	111	+ if ( apply_filters( 'visualizer_is_business', false ) ) {
	112	+ return;
	113	+ }
	114	+
	115	+ $license = __( 'PRO', 'visualizer' );
	116	+ if ( Visualizer_Module::is_pro() ) {
	117	+ switch ( $plan ) {
	118	+ case 1:
	119	+ $license = __( 'Developer', 'visualizer' );
	120	+ break;
	121	+ }
	122	+ }
	123	+
	124	+ $hours = array(
	125	+ '0' => __( 'Live', 'visualizer' ),
	126	+ '1' => __( 'Each hour', 'visualizer' ),
	127	+ '12' => __( 'Each 12 hours', 'visualizer' ),
	128	+ '24' => __( 'Each day', 'visualizer' ),
	129	+ '72' => __( 'Each 3 days', 'visualizer' ),
	130	+ );
	131	+
	132	+ switch ( $feature ) {
	133	+ case 'json':
	134	+ case 'csv':
	135	+ // no more schedules if pro is already active.
	136	+ if ( Visualizer_Module::is_pro() ) {
	137	+ return;
	138	+ }
	139	+ break;
	140	+ case 'wp':
	141	+ // fall-through.
	142	+ case 'db':
	143	+ break;
	144	+ default:
	145	+ return;
	146	+ }
	147	+
	148	+ echo '<optgroup disabled label="' . sprintf( __( 'More in the %s version', 'visualizer' ), $license ) . '">';
	149	+ foreach ( $hours as $hour => $desc ) {
	150	+ echo '<option disabled>' . $desc . '</option>';
	151	+ }
	152	+ echo '</optgroup>';
	153	+ }
	154	+
	155	+ /**
74	156	* No limits on revisions.
75	157	*/
76	158	public function limitRevisions( $num, $post ) {
77	159	if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
		@@ -132,16 +214,31 @@
132	214	*
133	215	* @access public
134	216	*/
135	217	public function init() {
	218	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
136	219	if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
137	220	$this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
138	221	$this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
139	222	$this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
	223	+ $this->_addFilter( 'tiny_mce_before_init', 'get_strings_for_block', 10, 1 );
140	224	}
141	225	}
142	226
143	227	/**
	228	+ * Add the strings required for the TinyMCE buttons for the classic block (not the classic editor).
	229	+ *
	230	+ * @since ?
	231	+ * @access friendly
	232	+ */
	233	+ function get_strings_for_block( $settings ) {
	234	+ $class = new Visualizer_Module_Language();
	235	+ $strings = $class->get_strings();
	236	+ $array = array( 'visualizer_tinymce_plugin' => json_encode( $strings ) );
	237	+ return array_merge( $settings, $array );
	238	+ }
	239	+
	240	+ /**
144	241	* Load plugin translation for - TinyMCE API
145	242	*
146	243	* @access public
147	244	* @param array $arr The tinymce_lang array.
		@@ -212,16 +309,23 @@
212	309	public function enqueueMediaScripts() {
213	310	global $typenow;
214	311	if ( post_type_supports( $typenow, 'editor' ) ) {
215	312	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 );
	313	+
	314	+ // Load all the assets for the different libraries we support.
	315	+ $deps = array(
	316	+ Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
	317	+ Visualizer_Render_Sidebar_Type_DataTable_DataTable::enqueue_assets( array( 'media-editor' ) ),
	318	+ );
	319	+
	320	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
219	321	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
220	322	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
221	323	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
222	324	wp_localize_script(
223		- 'visualizer-media-view', 'visualizer', array(
	325	+ 'visualizer-media-view',
	326	+ 'visualizer',
	327	+ array(
224	328	'i10n' => array(
225	329	'insert' => __( 'Insert', 'visualizer' ),
226	330	),
227	331	)
		@@ -275,9 +379,9 @@
275	379	* @static
276	380	* @access private
277	381	* @return array The associated array of chart types with localized names.
278	382	*/
279		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
	383	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
280	384	$additional = array();
281	385	if ( $add_select ) {
282	386	$additional['select'] = array(
283	387	'name' => esc_html__( 'All', 'visualizer' ),
		@@ -285,58 +389,93 @@
285	389	);
286	390	}
287	391
288	392	$types = array_merge(
289		- $additional, array(
	393	+ $additional,
	394	+ array(
	395	+ 'dataTable' => array(
	396	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	397	+ 'enabled' => true,
	398	+ 'supports' => array( 'DataTable' ),
	399	+ ),
290	400	'pie' => array(
291		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	401	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
292	402	'enabled' => true,
	403	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
293	404	),
294	405	'line' => array(
295	406	'name' => esc_html__( 'Line', 'visualizer' ),
296	407	'enabled' => true,
	408	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
297	409	),
298	410	'area' => array(
299	411	'name' => esc_html__( 'Area', 'visualizer' ),
300	412	'enabled' => true,
	413	+ // in ChartJS, the fill option is used to make Line chart an area: https://www.chartjs.org/docs/latest/charts/area.html
	414	+ 'supports' => array( 'Google Charts' ),
301	415	),
302	416	'geo' => array(
303	417	'name' => esc_html__( 'Geo', 'visualizer' ),
304	418	'enabled' => true,
	419	+ 'supports' => array( 'Google Charts' ),
305	420	),
306	421	'bar' => array(
307	422	'name' => esc_html__( 'Bar', 'visualizer' ),
308	423	'enabled' => true,
	424	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
309	425	),
310	426	'column' => array(
311	427	'name' => esc_html__( 'Column', 'visualizer' ),
312	428	'enabled' => true,
	429	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
313	430	),
314		- 'gauge' => array(
315		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
	431	+ 'bubble' => array(
	432	+ 'name' => esc_html__( 'Bubble', 'visualizer' ),
316	433	'enabled' => true,
	434	+ // chartjs' bubble is ugly looking (and it won't work off the default bubble.csv) so it is being excluded for the time being.
	435	+ 'supports' => array( 'Google Charts' ),
317	436	),
318	437	'scatter' => array(
319	438	'name' => esc_html__( 'Scatter', 'visualizer' ),
320	439	'enabled' => true,
	440	+ 'supports' => array( 'Google Charts' ),
321	441	),
	442	+ 'gauge' => array(
	443	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	444	+ 'enabled' => true,
	445	+ 'supports' => array( 'Google Charts' ),
	446	+ ),
322	447	'candlestick' => array(
323	448	'name' => esc_html__( 'Candlestick', 'visualizer' ),
324	449	'enabled' => true,
	450	+ 'supports' => array( 'Google Charts' ),
325	451	),
326	452	// pro types
327	453	'table' => array(
328		- 'name' => esc_html__( 'Table', 'visualizer' ),
	454	+ 'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
329	455	'enabled' => false,
	456	+ 'supports' => array( 'Google Charts' ),
330	457	),
331	458	'timeline' => array(
332	459	'name' => esc_html__( 'Timeline', 'visualizer' ),
333	460	'enabled' => false,
	461	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
334	462	),
335	463	'combo' => array(
336	464	'name' => esc_html__( 'Combo', 'visualizer' ),
337	465	'enabled' => false,
	466	+ 'supports' => array( 'Google Charts' ),
338	467	),
	468	+ 'polarArea' => array(
	469	+ 'name' => esc_html__( 'Polar Area', 'visualizer' ),
	470	+ 'enabled' => false,
	471	+ 'supports' => array( 'ChartJS' ),
	472	+ ),
	473	+ 'radar' => array(
	474	+ 'name' => esc_html__( 'Radar/Spider', 'visualizer' ),
	475	+ 'enabled' => false,
	476	+ 'supports' => array( 'ChartJS' ),
	477	+ ),
339	478	)
340	479	);
341	480	$types = apply_filters( 'visualizer_pro_chart_types', $types );
342	481	if ( $enabledOnly ) {
		@@ -345,8 +484,12 @@
345	484	if ( ! is_array( $array ) ) {
346	485	// support for old pro
347	486	$array = array( 'enabled' => true, 'name' => $array );
348	487	}
	488	+ // backward compatibility for PRO before v1.9.0
	489	+ if ( ! array_key_exists( 'supports', $array ) ) {
	490	+ $array['supports'] = array( 'Google Charts' );
	491	+ }
349	492	if ( ! $array['enabled'] ) {
350	493	continue;
351	494	}
352	495	$filtered[ $type ] = $array;
		@@ -359,13 +502,94 @@
359	502	if ( ! is_array( $array ) ) {
360	503	// support for old pro
361	504	$array = array( 'enabled' => true, 'name' => $array );
362	505	}
	506	+ // backward compatibility for PRO before v1.9.0
	507	+ if ( ! array_key_exists( 'supports', $array ) ) {
	508	+ $array['supports'] = array( 'Google Charts' );
	509	+ }
363	510	$doubleD[ $type ] = $array['name'];
364	511	}
365	512	$types = $doubleD;
366	513	}
367	514
	515	+ return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
	516	+ }
	517	+
	518	+ /**
	519	+ * Handle (soon-to-be) deprecated charts.
	520	+ */
	521	+ private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
	522	+ $deprecated = array();
	523	+
	524	+ switch ( $where ) {
	525	+ case 'types':
	526	+ // fall-through
	527	+ case 'library':
	528	+ // if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
	529	+ if ( ! self::hasChartType( 'table' ) ) {
	530	+ $deprecated[] = 'table';
	531	+ if ( $get2Darray ) {
	532	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	533	+ } else {
	534	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	535	+ }
	536	+ }
	537	+
	538	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	539	+ if ( ! Visualizer_Module::is_pro() ) {
	540	+ if ( ! self::hasChartType( 'gauge' ) ) {
	541	+ if ( $get2Darray ) {
	542	+ $deprecated[] = 'gauge';
	543	+ } else {
	544	+ $types['gauge']['enabled'] = false;
	545	+ }
	546	+ }
	547	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	548	+ if ( $get2Darray ) {
	549	+ $deprecated[] = 'candlestick';
	550	+ } else {
	551	+ $types['candlestick']['enabled'] = false;
	552	+ }
	553	+ }
	554	+ }
	555	+ break;
	556	+ default:
	557	+ // remove the option to create a Google Table chart.
	558	+ $deprecated[] = 'table';
	559	+
	560	+ // rename the new table chart type.
	561	+ if ( $get2Darray ) {
	562	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	563	+ } else {
	564	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	565	+ }
	566	+
	567	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	568	+ if ( ! Visualizer_Module::is_pro() ) {
	569	+ if ( ! self::hasChartType( 'gauge' ) ) {
	570	+ if ( $get2Darray ) {
	571	+ $deprecated[] = 'gauge';
	572	+ } else {
	573	+ $types['gauge']['enabled'] = false;
	574	+ }
	575	+ }
	576	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	577	+ if ( $get2Darray ) {
	578	+ $deprecated[] = 'candlestick';
	579	+ } else {
	580	+ $types['candlestick']['enabled'] = false;
	581	+ }
	582	+ }
	583	+ }
	584	+ }
	585	+
	586	+ if ( $deprecated ) {
	587	+ foreach ( $deprecated as $type ) {
	588	+ unset( $types[ $type ] );
	589	+ }
	590	+ }
	591	+
368	592	return $types;
369	593	}
370	594
371	595	/**
		@@ -375,11 +599,11 @@
375	599	* @global string $pagenow The name of the current page.
376	600	*
377	601	* @access public
378	602	*/
379		- public function renderTempaltes() {
	603	+ public function renderTemplates() {
380	604	global $pagenow;
381		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	605	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
382	606	return;
383	607	}
384	608	$render = new Visualizer_Render_Templates();
385	609	$render->render();
		@@ -397,26 +621,40 @@
397	621	*
398	622	* @param string $suffix The current page suffix.
399	623	*/
400	624	public function enqueueLibraryScripts( $suffix ) {
401		- if ( $suffix == $this->_libraryPage ) {
	625	+ if ( $suffix === $this->_libraryPage ) {
402	626	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
403	627	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
404	628	wp_enqueue_media();
405	629	wp_enqueue_script(
406		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	630	+ 'visualizer-library',
	631	+ VISUALIZER_ABSURL . 'js/library.js',
	632	+ array(
407	633	'jquery',
408	634	'media-views',
409		- ), Visualizer_Plugin::VERSION, true
	635	+ ),
	636	+ Visualizer_Plugin::VERSION,
	637	+ true
410	638	);
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		- );
	639	+
	640	+ wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
	641	+
	642	+ $query = $this->getQuery();
	643	+ while ( $query->have_posts() ) {
	644	+ $chart = $query->next_post();
	645	+ $library = $this->load_chart_type( $chart->ID );
	646	+ if ( is_null( $library ) ) {
	647	+ continue;
	648	+ }
	649	+ wp_enqueue_script(
	650	+ "visualizer-render-$library",
	651	+ VISUALIZER_ABSURL . 'js/render-facade.js',
	652	+ apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
	653	+ Visualizer_Plugin::VERSION,
	654	+ true
	655	+ );
	656	+ }
419	657	}
420	658	}
421	659
422	660	/**
		@@ -443,24 +681,140 @@
443	681	*
444	682	* @access public
445	683	*/
446	684	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 );
	685	+ $svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZCBTaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5MC4wMDAwMDAsIC00MzUuMDAwMDAwKSIgZmlsbD0iIzM5QzNEMiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMjguNSw1MTIgQzIwNy4yMzcwMzcsNTEyIDE5MCw0OTQuNzYyOTYzIDE5MCw0NzMuNSBDMTkwLDQ1Mi4yMzcwMzcgMjA3LjIzNzAzNyw0MzUgMjI4LjUsNDM1IEMyNDkuNzYyOTYzLDQzNSAyNjcsNDUyLjIzNzAzNyAyNjcsNDczLjUgQzI2Nyw0OTQuNzYyOTYzIDI0OS43NjI5NjMsNTEyIDIyOC41LDUxMiBaIE0yNDYuODQzNzUsNDgzLjU5MjA1OSBMMjE1LjYyNSw0ODMuNTkyMDU5IEwyMTUuNjI1LDQ2MC44MjY1NDQgQzIxNS42MjUsNDYwLjE2NDU0NyAyMTUuMTA3NTc4LDQ1OS42MjgzNTkgMjE0LjQ2ODc1LDQ1OS42MjgzNTkgTDIxMi4xNTYyNSw0NTkuNjI4MzU5IEMyMTEuNTE3NDIyLDQ1OS42MjgzNTkgMjExLDQ2MC4xNjQ1NDcgMjExLDQ2MC44MjY1NDQgTDIxMSw0ODUuOTg4NDI5IEMyMTEsNDg3LjMxMTY3NCAyMTIuMDM1NTY2LDQ4OC4zODQ3OTggMjEzLjMxMjUsNDg4LjM4NDc5OCBMMjQ2Ljg0Mzc1LDQ4OC4zODQ3OTggQzI0Ny40ODI1NzgsNDg4LjM4NDc5OCAyNDgsNDg3Ljg0ODYxMSAyNDgsNDg3LjE4NjYxMyBMMjQ4LDQ4NC43OTAyNDQgQzI0OCw0ODQuMTI4MjQ2IDI0Ny40ODI1NzgsNDgzLjU5MjA1OSAyNDYuODQzNzUsNDgzLjU5MjA1OSBaIE0yNDQuNTMxMjUsNDYyLjAyNDcyOSBMMjM1Ljk5OTU3LDQ2Mi4wMjQ3MjkgQzIzNC40NTQ1MzEsNDYyLjAyNDcyOSAyMzMuNjgwNTY2LDQ2My45NjA1NDcgMjM0Ljc3MzIyMyw0NjUuMDkyODMyIEwyMzcuMTE0NjI5LDQ2Ny41MTkxNTYgTDIzMS44MTI1LDQ3My4wMTQzMzIgTDIyNi41MTAzNzEsNDY3LjUxOTkwNSBDMjI1LjYwNzA1MSw0NjYuNTgzODIzIDIyNC4xNDI5NDksNDY2LjU4MzgyMyAyMjMuMjQwMzUyLDQ2Ny41MTk5MDUgTDIxOC4yNzY0MjYsNDcyLjY2Mzg2MyBDMjE3LjgyNDc2Niw0NzMuMTMxOTA0IDIxNy44MjQ3NjYsNDczLjg5MDUwNSAyMTguMjc2NDI2LDQ3NC4zNTg1NDYgTDIxOS45MTEwNzQsNDc2LjA1MjQ4IEMyMjAuMzYyNzM0LDQ3Ni41MjA1MjEgMjIxLjA5NDc4NSw0NzYuNTIwNTIxIDIyMS41NDY0NDUsNDc2LjA1MjQ4IEwyMjQuODc1LDQ3Mi42MDI0NTYgTDIzMC4xNzcxMjksNDc4LjA5Njg4MyBDMjMxLjA4MDQ0OSw0NzkuMDMyOTY1IDIzMi41NDQ1NTEsNDc5LjAzMjk2NSAyMzMuNDQ3MTQ4LDQ3OC4wOTY4ODMgTDI0MC4zODQ2NDgsNDcwLjkwNzc3MyBMMjQyLjcyNjA1NSw0NzMuMzM0MDk4IEMyNDMuODE4NzExLDQ3NC40NjYzODIgMjQ1LjY4Njc3Nyw0NzMuNjY0MzQ3IDI0NS42ODY3NzcsNDcyLjA2MzI3MyBMMjQ1LjY4Njc3Nyw0NjMuMjIyOTE0IEMyNDUuNjg3NSw0NjIuNTYwOTE3IDI0NS4xNzAwNzgsNDYyLjAyNDcyOSAyNDQuNTMxMjUsNDYyLjAyNDcyOSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==';
	686	+
	687	+ $this->_libraryPage = add_menu_page( __( 'Visualizer', 'visualizer' ), __( 'Visualizer', 'visualizer' ), 'edit_posts', Visualizer_Plugin::NAME, array( $this, 'renderLibraryPage' ), $svg_base64_icon, 99.7666 );
	688	+
	689	+ add_submenu_page(
	690	+ Visualizer_Plugin::NAME,
	691	+ __( 'Chart Library', 'visualizer' ),
	692	+ __( 'Chart Library', 'visualizer' ),
	693	+ 'edit_posts',
	694	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME )
	695	+ );
	696	+ add_submenu_page(
	697	+ Visualizer_Plugin::NAME,
	698	+ __( 'Add New Chart', 'visualizer' ),
	699	+ __( 'Add New Chart', 'visualizer' ),
	700	+ 'edit_posts',
	701	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
	702	+ );
	703	+ add_submenu_page(
	704	+ Visualizer_Plugin::NAME,
	705	+ __( 'Support', 'visualizer' ),
	706	+ __( '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>',
	707	+ 'edit_posts',
	708	+ 'viz-support',
	709	+ array( $this, 'renderSupportPage' )
	710	+ );
	711	+ remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
	712	+
	713	+ add_action( "load-{$this->_libraryPage}", array( $this, 'addScreenOptions' ) );
450	714	}
451	715
452	716	/**
453		- * Renders visualizer library page.
454		- *
455		- * @since 1.0.0
456		- *
457		- * @access public
	717	+ * Adds the screen options for pagination.
458	718	*/
459		- public function renderLibraryPage() {
	719	+ function addScreenOptions() {
	720	+ $screen = get_current_screen();
	721	+
	722	+ // bail if it's some other page.
	723	+ if ( ! is_object( $screen ) || $screen->id !== $this->_libraryPage ) {
	724	+ return;
	725	+ }
	726	+
	727	+ $args = array(
	728	+ 'label' => __( 'Number of charts per page:', 'visualizer' ),
	729	+ 'default' => 6,
	730	+ 'option' => 'visualizer_per_page_library',
	731	+ );
	732	+ add_screen_option( 'per_page', $args );
	733	+ }
	734	+
	735	+ /**
	736	+ * Returns the screen option for pagination.
	737	+ */
	738	+ function setScreenOptions( $status, $option, $value ) {
	739	+ if ( 'visualizer_per_page_library' === $option ) {
	740	+ return $value;
	741	+ }
	742	+ }
	743	+
	744	+ /**
	745	+ * Adds the display filters to be used in the meta_query while displaying the charts.
	746	+ */
	747	+ private function getDisplayFilters( &$query_args ) {
	748	+ $query = array();
	749	+
	750	+ // add chart type filter to the query arguments
	751	+ $type = filter_input( INPUT_GET, 'type' );
	752	+ if ( $type && in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
	753	+ $query[] = array(
	754	+ 'key' => Visualizer_Plugin::CF_CHART_TYPE,
	755	+ 'value' => $type,
	756	+ 'compare' => '=',
	757	+ );
	758	+ }
	759	+
	760	+ // add chart library filter to the query arguments
	761	+ $library = filter_input( INPUT_GET, 'library' );
	762	+ if ( $library ) {
	763	+ $query[] = array(
	764	+ 'key' => Visualizer_Plugin::CF_CHART_LIBRARY,
	765	+ 'value' => $library,
	766	+ 'compare' => '=',
	767	+ );
	768	+ }
	769	+
	770	+ // add date filter to the query arguments
	771	+ $date = filter_input( INPUT_GET, 'date' );
	772	+ $possible = array_keys( Visualizer_Plugin::getSupportedDateFilter() );
	773	+ if ( $date && in_array( $date, $possible, true ) ) {
	774	+ $query_args['date_query'] = array(
	775	+ 'after' => "$date -1 day",
	776	+ 'inclusive' => true,
	777	+ );
	778	+ }
	779	+
	780	+ // add source filter to the query arguments
	781	+ $source = filter_input( INPUT_GET, 'source' );
	782	+ if ( $source ) {
	783	+ $source = ucwords( $source );
	784	+ $source = "Visualizer_Source_{$source}";
	785	+ $query[] = array(
	786	+ 'key' => Visualizer_Plugin::CF_SOURCE,
	787	+ 'value' => $source,
	788	+ 'compare' => '=',
	789	+ );
	790	+ }
	791	+
	792	+ $query_args['meta_query'] = $query;
	793	+
	794	+ $orderby = filter_input( INPUT_GET, 'orderby' );
	795	+ $order = filter_input( INPUT_GET, 'order' );
	796	+ if ( $orderby ) {
	797	+ $query_args['order_by'] = $orderby;
	798	+ }
	799	+ $query_args['order'] = empty( $order ) ? 'desc' : $order;
	800	+ }
	801	+
	802	+ /**
	803	+ * Get the instance of WP_Query that fetches the charts as per the given criteria.
	804	+ */
	805	+ private function getQuery() {
	806	+ static $q;
	807	+ if ( ! is_null( $q ) ) {
	808	+ return $q;
	809	+ }
	810	+
460	811	// get current page
461	812	$page = filter_input(
462		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	813	+ INPUT_GET,
	814	+ 'vpage',
	815	+ FILTER_VALIDATE_INT,
	816	+ array(
463	817	'options' => array(
464	818	'min_range' => 1,
465	819	'default' => 1,
466	820	),
		@@ -465,27 +819,32 @@
465	819	'default' => 1,
466	820	),
467	821	)
468	822	);
	823	+
	824	+ $per_page = 6;
	825	+ $screen = get_current_screen();
	826	+ if ( $screen ) {
	827	+ // retrieve the per_page option
	828	+ $screen_option = $screen->get_option( 'per_page', 'option' );
	829	+ // retrieve the value stored for the current user
	830	+ $user = get_current_user_id();
	831	+ $per_page = get_user_meta( $user, $screen_option, true );
	832	+ if ( empty( $per_page ) || $per_page < 1 ) {
	833	+ // nothing set, get the default value
	834	+ $per_page = $screen->get_option( 'per_page', 'default' );
	835	+ }
	836	+ }
	837	+
469	838	// the initial query arguments to fetch charts
470	839	$query_args = array(
471	840	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
472		- 'posts_per_page' => 6,
	841	+ 'posts_per_page' => $per_page,
473	842	'paged' => $page,
474	843	);
475		- // add chart type filter to the query arguments
476		- $filter = filter_input( INPUT_GET, 'type' );
477		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
478		- $query_args['meta_query'] = array(
479		- array(
480		- 'key' => Visualizer_Plugin::CF_CHART_TYPE,
481		- 'value' => $filter,
482		- 'compare' => '=',
483		- ),
484		- );
485		- } else {
486		- $filter = 'all';
487		- }
	844	+
	845	+ $this->getDisplayFilters( $query_args );
	846	+
488	847	// Added by Ash/Upwork
489	848	$filterByMeta = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
490	849	if ( $filterByMeta ) {
491	850	$query = array(
		@@ -496,56 +855,130 @@
496	855	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
497	856	$meta[] = $query;
498	857	$query_args['meta_query'] = $meta;
499	858	}
500		- // Added by Ash/Upwork
501		- // fetch charts
	859	+ $q = new WP_Query( apply_filters( 'visualizer_query_args', $query_args ) );
	860	+ return $q;
	861	+ }
	862	+
	863	+ /**
	864	+ * Renders support page.
	865	+ *
	866	+ * @since 3.3.0
	867	+ *
	868	+ * @access public
	869	+ */
	870	+ public function renderSupportPage() {
	871	+ wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
	872	+ include_once VISUALIZER_ABSPATH . '/templates/support.php';
	873	+ }
	874	+
	875	+ /**
	876	+ * Renders visualizer library page.
	877	+ *
	878	+ * @since 1.0.0
	879	+ *
	880	+ * @access public
	881	+ */
	882	+ public function renderLibraryPage() {
502	883	$charts = array();
503		- $query = new WP_Query( $query_args );
	884	+ $query = $this->getQuery();
	885	+
	886	+ // get current page
	887	+ $page = filter_input(
	888	+ INPUT_GET,
	889	+ 'vpage',
	890	+ FILTER_VALIDATE_INT,
	891	+ array(
	892	+ 'options' => array(
	893	+ 'min_range' => 1,
	894	+ 'default' => 1,
	895	+ ),
	896	+ )
	897	+ );
	898	+ // add chart type filter to the query arguments
	899	+ $filter = filter_input( INPUT_GET, 'type' );
	900	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
	901	+ $filter = 'all';
	902	+ }
	903	+
	904	+ $css = '';
504	905	while ( $query->have_posts() ) {
505	906	$chart = $query->next_post();
506	907
507	908	// 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	909	$chart = $this->handleExistingRevisions( $chart->ID, $chart );
	910	+ // refresh a "live" db query chart.
	911	+ $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
509	912
	913	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	914	+
510	915	// fetch and update settings
511	916	$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 );
	917	+
	918	+ $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
	919	+ if ( ! empty( $atts['settings'] ) ) {
	920	+ $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
	921	+ }
	922	+
	923	+ if ( $settings ) {
	924	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
	925	+ }
	926	+
514	927	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
515		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	928	+ $data = self::get_chart_data( $chart, $type );
	929	+
	930	+ $library = $this->load_chart_type( $chart->ID );
	931	+
	932	+ $id = 'visualizer-' . $chart->ID;
	933	+ $arguments = $this->get_inline_custom_css( $id, $settings );
	934	+ if ( ! empty( $arguments ) ) {
	935	+ $css .= $arguments[0];
	936	+ $settings = $arguments[1];
	937	+ }
	938	+
516	939	// add chart to the array
517		- $charts[ 'visualizer-' . $chart->ID ] = array(
	940	+ $charts[ $id ] = array(
518	941	'id' => $chart->ID,
519	942	'type' => $type,
520	943	'series' => $series,
521	944	'settings' => $settings,
522	945	'data' => $data,
	946	+ 'library' => $library,
523	947	);
524	948	}
525	949	// enqueue charts array
526	950	$ajaxurl = admin_url( 'admin-ajax.php' );
527	951	wp_localize_script(
528		- 'visualizer-library', 'visualizer', array(
	952	+ 'visualizer-library',
	953	+ 'visualizer',
	954	+ array(
529	955	'language' => $this->get_language(),
530	956	'map_api_key' => get_option( 'visualizer-map-api-key' ),
531	957	'charts' => $charts,
532	958	'urls' => array(
533		- 'base' => add_query_arg( 'vpage', false ),
	959	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
534	960	'create' => add_query_arg(
535	961	array(
536	962	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
537	963	'library' => 'yes',
538	964	'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
539		- ), $ajaxurl
	965	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	966	+ 'vaction' => false,
	967	+ ),
	968	+ $ajaxurl
540	969	),
541	970	'edit' => add_query_arg(
542	971	array(
543	972	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
544	973	'library' => 'yes',
545		- ), $ajaxurl
	974	+ 'vaction' => false,
	975	+ ),
	976	+ $ajaxurl
546	977	),
547	978	),
	979	+ 'page_type' => 'library',
	980	+ 'is_front' => false,
548	981	)
549	982	);
550	983	// render library page
551	984	$render = new Visualizer_Render_Library();
		@@ -550,12 +983,13 @@
550	983	// render library page
551	984	$render = new Visualizer_Render_Library();
552	985	$render->charts = $charts;
553	986	$render->type = $filter;
554		- $render->types = self::_getChartTypesLocalized();
	987	+ $render->types = self::_getChartTypesLocalized( false, false, false, true );
	988	+ $render->custom_css = $css;
555	989	$render->pagination = paginate_links(
556	990	array(
557		- 'base' => add_query_arg( 'vpage', '%#%' ),
	991	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
558	992	'format' => '',
559	993	'current' => $page,
560	994	'total' => $query->max_num_pages,
561	995	'type' => 'array',
		@@ -576,14 +1010,14 @@
576	1010	*
577	1011	* @return array Updated array of action links.
578	1012	*/
579	1013	public function getPluginActionLinks( $links, $file ) {
580		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	1014	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
581	1015	array_unshift(
582	1016	$links,
583	1017	sprintf(
584	1018	'<a href="%s">%s</a>',
585		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	1019	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
586	1020	esc_html__( 'Library', 'visualizer' )
587	1021	)
588	1022	);
589	1023	}
		@@ -603,17 +1037,17 @@
603	1037	*
604	1038	* @return array Updated array of plugin meta links.
605	1039	*/
606	1040	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
607		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	1041	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
608	1042	// knowledge base link
609	1043	$plugin_meta[] = sprintf(
610		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
611		- esc_html__( 'Knowledge Base', 'visualizer' )
	1044	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	1045	+ esc_html__( 'Docs', 'visualizer' )
612	1046	);
613	1047	// flattr link
614	1048	$plugin_meta[] = sprintf(
615		- '<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
	1049	+ '<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>',
616	1050	esc_html__( 'Pro Addon', 'visualizer' )
617	1051	);
618	1052	}
619	1053