← All changes | classes/Visualizer/Module/Admin.php +367 -54 3.0.6 → 3.3.4 View file →

		@@ -52,26 +52,90 @@
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	+ // revision support.
	67	+ $this->_addFilter( 'wp_revisions_to_keep', 'limitRevisions', null, 10, 2 );
	68	+ $this->_addAction( '_wp_put_post_revision', 'addRevision', null, 10, 1 );
	69	+ $this->_addAction( 'wp_restore_post_revision', 'restoreRevision', null, 10, 2 );
	70	+
65	71	$this->_addAction( 'admin_init', 'init' );
66	72	}
67	73
68	74	/**
	75	+ * No limits on revisions.
	76	+ */
	77	+ public function limitRevisions( $num, $post ) {
	78	+ if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
	79	+ return -1;
	80	+ }
	81	+ return $num;
	82	+ }
	83	+
	84	+ /**
	85	+ * Add a revision.
	86	+ */
	87	+ public function addRevision( $revision_id ) {
	88	+ $parent_id = wp_is_post_revision( $revision_id );
	89	+ if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $parent_id ) ) {
	90	+ // add the meta data to this revision.
	91	+ $meta = get_post_meta( $parent_id, '', true );
	92	+
	93	+ if ( $meta ) {
	94	+ foreach ( $meta as $key => $value ) {
	95	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	96	+ add_metadata( 'post', $revision_id, $key, maybe_unserialize( $value[0] ) );
	97	+ }
	98	+ }
	99	+ }
	100	+ }
	101	+ }
	102	+
	103	+ /**
	104	+ * Restore a revision.
	105	+ */
	106	+ public function restoreRevision( $post_id, $revision_id ) {
	107	+ if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $post_id ) ) {
	108	+ // get the meta information from the revision.
	109	+ $meta = get_metadata( 'post', $revision_id, '', true );
	110	+
	111	+ // delete all meta information from the post before adding.
	112	+ $post_meta = get_post_meta( $post_id, '', true );
	113	+ if ( $post_meta ) {
	114	+ foreach ( $meta as $key => $value ) {
	115	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	116	+ delete_post_meta( $post_id, $key );
	117	+ }
	118	+ }
	119	+ }
	120	+
	121	+ if ( $meta ) {
	122	+ foreach ( $meta as $key => $value ) {
	123	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	124	+ add_post_meta( $post_id, $key, maybe_unserialize( $value[0] ) );
	125	+ }
	126	+ }
	127	+ }
	128	+ }
	129	+ }
	130	+
	131	+ /**
69	132	* Admin init.
70	133	*
71	134	* @access public
72	135	*/
73	136	public function init() {
	137	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
74	138	if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
75	139	$this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
76	140	$this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
77	141	$this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
		@@ -150,14 +214,28 @@
150	214	public function enqueueMediaScripts() {
151	215	global $typenow;
152	216	if ( post_type_supports( $typenow, 'editor' ) ) {
153	217	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
154		- wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
155		- wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
156		- wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
	218	+
	219	+ // Load all the assets for the different libraries we support.
	220	+ $deps = array(
	221	+ Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) ),
	222	+ Visualizer_Render_Sidebar_Type_DataTable_DataTable::enqueue_assets( array( 'media-editor' ) ),
	223	+ );
	224	+
	225	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
157	226	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
158	227	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
159	228	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
	229	+ wp_localize_script(
	230	+ 'visualizer-media-view',
	231	+ 'visualizer',
	232	+ array(
	233	+ 'i10n' => array(
	234	+ 'insert' => __( 'Insert', 'visualizer' ),
	235	+ ),
	236	+ )
	237	+ );
160	238	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
161	239	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
162	240	}
163	241	}
		@@ -206,9 +284,9 @@
206	284	* @static
207	285	* @access private
208	286	* @return array The associated array of chart types with localized names.
209	287	*/
210		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
	288	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
211	289	$additional = array();
212	290	if ( $add_select ) {
213	291	$additional['select'] = array(
214	292	'name' => esc_html__( 'All', 'visualizer' ),
		@@ -216,58 +294,87 @@
216	294	);
217	295	}
218	296
219	297	$types = array_merge(
220		- $additional, array(
	298	+ $additional,
	299	+ array(
	300	+ 'dataTable' => array(
	301	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	302	+ 'enabled' => true,
	303	+ 'supports' => array( 'DataTable' ),
	304	+ ),
221	305	'pie' => array(
222		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	306	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
223	307	'enabled' => true,
	308	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
224	309	),
225	310	'line' => array(
226	311	'name' => esc_html__( 'Line', 'visualizer' ),
227	312	'enabled' => true,
	313	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
228	314	),
229	315	'area' => array(
230	316	'name' => esc_html__( 'Area', 'visualizer' ),
231	317	'enabled' => true,
	318	+ // in ChartJS, the fill option is used to make Line chart an area: https://www.chartjs.org/docs/latest/charts/area.html
	319	+ 'supports' => array( 'Google Charts' ),
232	320	),
233	321	'geo' => array(
234	322	'name' => esc_html__( 'Geo', 'visualizer' ),
235	323	'enabled' => true,
	324	+ 'supports' => array( 'Google Charts' ),
236	325	),
237	326	'bar' => array(
238	327	'name' => esc_html__( 'Bar', 'visualizer' ),
239	328	'enabled' => true,
	329	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
240	330	),
241	331	'column' => array(
242	332	'name' => esc_html__( 'Column', 'visualizer' ),
243	333	'enabled' => true,
	334	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
244	335	),
	336	+ 'scatter' => array(
	337	+ 'name' => esc_html__( 'Scatter', 'visualizer' ),
	338	+ 'enabled' => true,
	339	+ 'supports' => array( 'Google Charts' ),
	340	+ ),
245	341	'gauge' => array(
246	342	'name' => esc_html__( 'Gauge', 'visualizer' ),
247	343	'enabled' => true,
	344	+ 'supports' => array( 'Google Charts' ),
248	345	),
249		- 'scatter' => array(
250		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
251		- 'enabled' => true,
252		- ),
253	346	'candlestick' => array(
254	347	'name' => esc_html__( 'Candlestick', 'visualizer' ),
255	348	'enabled' => true,
	349	+ 'supports' => array( 'Google Charts' ),
256	350	),
257	351	// pro types
258	352	'table' => array(
259		- 'name' => esc_html__( 'Table', 'visualizer' ),
	353	+ 'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
260	354	'enabled' => false,
	355	+ 'supports' => array( 'Google Charts' ),
261	356	),
262	357	'timeline' => array(
263	358	'name' => esc_html__( 'Timeline', 'visualizer' ),
264	359	'enabled' => false,
	360	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
265	361	),
266	362	'combo' => array(
267	363	'name' => esc_html__( 'Combo', 'visualizer' ),
268	364	'enabled' => false,
	365	+ 'supports' => array( 'Google Charts' ),
269	366	),
	367	+ 'polarArea' => array(
	368	+ 'name' => esc_html__( 'Polar Area', 'visualizer' ),
	369	+ 'enabled' => false,
	370	+ 'supports' => array( 'ChartJS' ),
	371	+ ),
	372	+ 'radar' => array(
	373	+ 'name' => esc_html__( 'Radar/Spider', 'visualizer' ),
	374	+ 'enabled' => false,
	375	+ 'supports' => array( 'ChartJS' ),
	376	+ ),
270	377	)
271	378	);
272	379	$types = apply_filters( 'visualizer_pro_chart_types', $types );
273	380	if ( $enabledOnly ) {
		@@ -276,8 +383,12 @@
276	383	if ( ! is_array( $array ) ) {
277	384	// support for old pro
278	385	$array = array( 'enabled' => true, 'name' => $array );
279	386	}
	387	+ // backward compatibility for PRO before v1.9.0
	388	+ if ( ! array_key_exists( 'supports', $array ) ) {
	389	+ $array['supports'] = array( 'Google Charts' );
	390	+ }
280	391	if ( ! $array['enabled'] ) {
281	392	continue;
282	393	}
283	394	$filtered[ $type ] = $array;
		@@ -290,13 +401,94 @@
290	401	if ( ! is_array( $array ) ) {
291	402	// support for old pro
292	403	$array = array( 'enabled' => true, 'name' => $array );
293	404	}
	405	+ // backward compatibility for PRO before v1.9.0
	406	+ if ( ! array_key_exists( 'supports', $array ) ) {
	407	+ $array['supports'] = array( 'Google Charts' );
	408	+ }
294	409	$doubleD[ $type ] = $array['name'];
295	410	}
296	411	$types = $doubleD;
297	412	}
298	413
	414	+ return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
	415	+ }
	416	+
	417	+ /**
	418	+ * Handle (soon-to-be) deprecated charts.
	419	+ */
	420	+ private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
	421	+ $deprecated = array();
	422	+
	423	+ switch ( $where ) {
	424	+ case 'types':
	425	+ // fall-through
	426	+ case 'library':
	427	+ // if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
	428	+ if ( ! self::hasChartType( 'table' ) ) {
	429	+ $deprecated[] = 'table';
	430	+ if ( $get2Darray ) {
	431	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	432	+ } else {
	433	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	434	+ }
	435	+ }
	436	+
	437	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	438	+ if ( ! Visualizer_Module::is_pro() ) {
	439	+ if ( ! self::hasChartType( 'gauge' ) ) {
	440	+ if ( $get2Darray ) {
	441	+ $deprecated[] = 'gauge';
	442	+ } else {
	443	+ $types['gauge']['enabled'] = false;
	444	+ }
	445	+ }
	446	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	447	+ if ( $get2Darray ) {
	448	+ $deprecated[] = 'candlestick';
	449	+ } else {
	450	+ $types['candlestick']['enabled'] = false;
	451	+ }
	452	+ }
	453	+ }
	454	+ break;
	455	+ default:
	456	+ // remove the option to create a Google Table chart.
	457	+ $deprecated[] = 'table';
	458	+
	459	+ // rename the new table chart type.
	460	+ if ( $get2Darray ) {
	461	+ $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
	462	+ } else {
	463	+ $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
	464	+ }
	465	+
	466	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	467	+ if ( ! Visualizer_Module::is_pro() ) {
	468	+ if ( ! self::hasChartType( 'gauge' ) ) {
	469	+ if ( $get2Darray ) {
	470	+ $deprecated[] = 'gauge';
	471	+ } else {
	472	+ $types['gauge']['enabled'] = false;
	473	+ }
	474	+ }
	475	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	476	+ if ( $get2Darray ) {
	477	+ $deprecated[] = 'candlestick';
	478	+ } else {
	479	+ $types['candlestick']['enabled'] = false;
	480	+ }
	481	+ }
	482	+ }
	483	+ }
	484	+
	485	+ if ( $deprecated ) {
	486	+ foreach ( $deprecated as $type ) {
	487	+ unset( $types[ $type ] );
	488	+ }
	489	+ }
	490	+
299	491	return $types;
300	492	}
301	493
302	494	/**
		@@ -306,11 +498,11 @@
306	498	* @global string $pagenow The name of the current page.
307	499	*
308	500	* @access public
309	501	*/
310		- public function renderTempaltes() {
	502	+ public function renderTemplates() {
311	503	global $pagenow;
312		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	504	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
313	505	return;
314	506	}
315	507	$render = new Visualizer_Render_Templates();
316	508	$render->render();
		@@ -328,26 +520,40 @@
328	520	*
329	521	* @param string $suffix The current page suffix.
330	522	*/
331	523	public function enqueueLibraryScripts( $suffix ) {
332		- if ( $suffix == $this->_libraryPage ) {
	524	+ if ( $suffix === $this->_libraryPage ) {
333	525	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
334	526	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
335	527	wp_enqueue_media();
336	528	wp_enqueue_script(
337		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	529	+ 'visualizer-library',
	530	+ VISUALIZER_ABSURL . 'js/library.js',
	531	+ array(
338	532	'jquery',
339	533	'media-views',
340		- ), Visualizer_Plugin::VERSION, true
	534	+ ),
	535	+ Visualizer_Plugin::VERSION,
	536	+ true
341	537	);
342		- wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
343		- wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
344		- wp_enqueue_script(
345		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
346		- 'google-jsapi-old',
347		- 'visualizer-library',
348		- ), Visualizer_Plugin::VERSION, true
349		- );
	538	+
	539	+ wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
	540	+
	541	+ $query = $this->getQuery();
	542	+ while ( $query->have_posts() ) {
	543	+ $chart = $query->next_post();
	544	+ $library = $this->load_chart_type( $chart->ID );
	545	+ if ( is_null( $library ) ) {
	546	+ continue;
	547	+ }
	548	+ wp_enqueue_script(
	549	+ "visualizer-render-$library",
	550	+ VISUALIZER_ABSURL . 'js/render-facade.js',
	551	+ apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
	552	+ Visualizer_Plugin::VERSION,
	553	+ true
	554	+ );
	555	+ }
350	556	}
351	557	}
352	558
353	559	/**
		@@ -374,24 +580,52 @@
374	580	*
375	581	* @access public
376	582	*/
377	583	public function registerAdminMenu() {
378		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
379		- $callback = array( $this, 'renderLibraryPage' );
380		- $this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
	584	+ $svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZCBTaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5MC4wMDAwMDAsIC00MzUuMDAwMDAwKSIgZmlsbD0iIzM5QzNEMiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMjguNSw1MTIgQzIwNy4yMzcwMzcsNTEyIDE5MCw0OTQuNzYyOTYzIDE5MCw0NzMuNSBDMTkwLDQ1Mi4yMzcwMzcgMjA3LjIzNzAzNyw0MzUgMjI4LjUsNDM1IEMyNDkuNzYyOTYzLDQzNSAyNjcsNDUyLjIzNzAzNyAyNjcsNDczLjUgQzI2Nyw0OTQuNzYyOTYzIDI0OS43NjI5NjMsNTEyIDIyOC41LDUxMiBaIE0yNDYuODQzNzUsNDgzLjU5MjA1OSBMMjE1LjYyNSw0ODMuNTkyMDU5IEwyMTUuNjI1LDQ2MC44MjY1NDQgQzIxNS42MjUsNDYwLjE2NDU0NyAyMTUuMTA3NTc4LDQ1OS42MjgzNTkgMjE0LjQ2ODc1LDQ1OS42MjgzNTkgTDIxMi4xNTYyNSw0NTkuNjI4MzU5IEMyMTEuNTE3NDIyLDQ1OS42MjgzNTkgMjExLDQ2MC4xNjQ1NDcgMjExLDQ2MC44MjY1NDQgTDIxMSw0ODUuOTg4NDI5IEMyMTEsNDg3LjMxMTY3NCAyMTIuMDM1NTY2LDQ4OC4zODQ3OTggMjEzLjMxMjUsNDg4LjM4NDc5OCBMMjQ2Ljg0Mzc1LDQ4OC4zODQ3OTggQzI0Ny40ODI1NzgsNDg4LjM4NDc5OCAyNDgsNDg3Ljg0ODYxMSAyNDgsNDg3LjE4NjYxMyBMMjQ4LDQ4NC43OTAyNDQgQzI0OCw0ODQuMTI4MjQ2IDI0Ny40ODI1NzgsNDgzLjU5MjA1OSAyNDYuODQzNzUsNDgzLjU5MjA1OSBaIE0yNDQuNTMxMjUsNDYyLjAyNDcyOSBMMjM1Ljk5OTU3LDQ2Mi4wMjQ3MjkgQzIzNC40NTQ1MzEsNDYyLjAyNDcyOSAyMzMuNjgwNTY2LDQ2My45NjA1NDcgMjM0Ljc3MzIyMyw0NjUuMDkyODMyIEwyMzcuMTE0NjI5LDQ2Ny41MTkxNTYgTDIzMS44MTI1LDQ3My4wMTQzMzIgTDIyNi41MTAzNzEsNDY3LjUxOTkwNSBDMjI1LjYwNzA1MSw0NjYuNTgzODIzIDIyNC4xNDI5NDksNDY2LjU4MzgyMyAyMjMuMjQwMzUyLDQ2Ny41MTk5MDUgTDIxOC4yNzY0MjYsNDcyLjY2Mzg2MyBDMjE3LjgyNDc2Niw0NzMuMTMxOTA0IDIxNy44MjQ3NjYsNDczLjg5MDUwNSAyMTguMjc2NDI2LDQ3NC4zNTg1NDYgTDIxOS45MTEwNzQsNDc2LjA1MjQ4IEMyMjAuMzYyNzM0LDQ3Ni41MjA1MjEgMjIxLjA5NDc4NSw0NzYuNTIwNTIxIDIyMS41NDY0NDUsNDc2LjA1MjQ4IEwyMjQuODc1LDQ3Mi42MDI0NTYgTDIzMC4xNzcxMjksNDc4LjA5Njg4MyBDMjMxLjA4MDQ0OSw0NzkuMDMyOTY1IDIzMi41NDQ1NTEsNDc5LjAzMjk2NSAyMzMuNDQ3MTQ4LDQ3OC4wOTY4ODMgTDI0MC4zODQ2NDgsNDcwLjkwNzc3MyBMMjQyLjcyNjA1NSw0NzMuMzM0MDk4IEMyNDMuODE4NzExLDQ3NC40NjYzODIgMjQ1LjY4Njc3Nyw0NzMuNjY0MzQ3IDI0NS42ODY3NzcsNDcyLjA2MzI3MyBMMjQ1LjY4Njc3Nyw0NjMuMjIyOTE0IEMyNDUuNjg3NSw0NjIuNTYwOTE3IDI0NS4xNzAwNzgsNDYyLjAyNDcyOSAyNDQuNTMxMjUsNDYyLjAyNDcyOSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==';
	585	+
	586	+ $this->_libraryPage = add_menu_page( __( 'Visualizer', 'visualizer' ), __( 'Visualizer', 'visualizer' ), 'edit_posts', Visualizer_Plugin::NAME, array( $this, 'renderLibraryPage' ), $svg_base64_icon, 99.7666 );
	587	+
	588	+ add_submenu_page(
	589	+ Visualizer_Plugin::NAME,
	590	+ __( 'Chart Library', 'visualizer' ),
	591	+ __( 'Chart Library', 'visualizer' ),
	592	+ 'edit_posts',
	593	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME )
	594	+ );
	595	+ add_submenu_page(
	596	+ Visualizer_Plugin::NAME,
	597	+ __( 'Add New Chart', 'visualizer' ),
	598	+ __( 'Add New Chart', 'visualizer' ),
	599	+ 'edit_posts',
	600	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
	601	+ );
	602	+ add_submenu_page(
	603	+ Visualizer_Plugin::NAME,
	604	+ __( 'Support', 'visualizer' ),
	605	+ __( '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>',
	606	+ 'edit_posts',
	607	+ 'viz-support',
	608	+ array( $this, 'renderSupportPage' )
	609	+ );
	610	+ remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
381	611	}
382	612
383	613	/**
384		- * Renders visualizer library page.
385		- *
386		- * @since 1.0.0
387		- *
388		- * @access public
	614	+ * Get the instance of WP_Query that fetches the charts as per the given criteria.
389	615	*/
390		- public function renderLibraryPage() {
	616	+ private function getQuery() {
	617	+ static $q;
	618	+ if ( ! is_null( $q ) ) {
	619	+ return $q;
	620	+ }
	621	+
391	622	// get current page
392	623	$page = filter_input(
393		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	624	+ INPUT_GET,
	625	+ 'vpage',
	626	+ FILTER_VALIDATE_INT,
	627	+ array(
394	628	'options' => array(
395	629	'min_range' => 1,
396	630	'default' => 1,
397	631	),
		@@ -404,9 +638,9 @@
404	638	'paged' => $page,
405	639	);
406	640	// add chart type filter to the query arguments
407	641	$filter = filter_input( INPUT_GET, 'type' );
408		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
	642	+ if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) {
409	643	$query_args['meta_query'] = array(
410	644	array(
411	645	'key' => Visualizer_Plugin::CF_CHART_TYPE,
412	646	'value' => $filter,
		@@ -427,49 +661,127 @@
427	661	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
428	662	$meta[] = $query;
429	663	$query_args['meta_query'] = $meta;
430	664	}
431		- // Added by Ash/Upwork
432		- // fetch charts
	665	+ $q = new WP_Query( $query_args );
	666	+ return $q;
	667	+ }
	668	+
	669	+ /**
	670	+ * Renders support page.
	671	+ *
	672	+ * @since 3.3.0
	673	+ *
	674	+ * @access public
	675	+ */
	676	+ public function renderSupportPage() {
	677	+ wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
	678	+ include_once VISUALIZER_ABSPATH . '/templates/support.php';
	679	+ }
	680	+
	681	+ /**
	682	+ * Renders visualizer library page.
	683	+ *
	684	+ * @since 1.0.0
	685	+ *
	686	+ * @access public
	687	+ */
	688	+ public function renderLibraryPage() {
433	689	$charts = array();
434		- $query = new WP_Query( $query_args );
	690	+ $query = $this->getQuery();
	691	+
	692	+ // get current page
	693	+ $page = filter_input(
	694	+ INPUT_GET,
	695	+ 'vpage',
	696	+ FILTER_VALIDATE_INT,
	697	+ array(
	698	+ 'options' => array(
	699	+ 'min_range' => 1,
	700	+ 'default' => 1,
	701	+ ),
	702	+ )
	703	+ );
	704	+ // add chart type filter to the query arguments
	705	+ $filter = filter_input( INPUT_GET, 'type' );
	706	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
	707	+ $filter = 'all';
	708	+ }
	709	+
	710	+ $css = '';
435	711	while ( $query->have_posts() ) {
436	712	$chart = $query->next_post();
	713	+
	714	+ // 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.
	715	+ $chart = $this->handleExistingRevisions( $chart->ID, $chart );
	716	+ // refresh a "live" db query chart.
	717	+ $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
	718	+
	719	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	720	+
437	721	// fetch and update settings
438	722	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
439		- unset( $settings['height'], $settings['width'] );
440		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	723	+
	724	+ $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
	725	+ if ( ! empty( $atts['settings'] ) ) {
	726	+ $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
	727	+ }
	728	+
	729	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
441	730	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
442	731	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	732	+
	733	+ $library = $this->load_chart_type( $chart->ID );
	734	+
	735	+ $id = 'visualizer-' . $chart->ID;
	736	+ $arguments = $this->get_inline_custom_css( $id, $settings );
	737	+ if ( ! empty( $arguments ) ) {
	738	+ $css .= $arguments[0];
	739	+ $settings = $arguments[1];
	740	+ }
	741	+
443	742	// add chart to the array
444		- $charts[ 'visualizer-' . $chart->ID ] = array(
	743	+ $charts[ $id ] = array(
445	744	'id' => $chart->ID,
446	745	'type' => $type,
447	746	'series' => $series,
448	747	'settings' => $settings,
449	748	'data' => $data,
	749	+ 'library' => $library,
450	750	);
451	751	}
452	752	// enqueue charts array
453	753	$ajaxurl = admin_url( 'admin-ajax.php' );
454	754	wp_localize_script(
455		- 'visualizer-library', 'visualizer', array(
	755	+ 'visualizer-library',
	756	+ 'visualizer',
	757	+ array(
	758	+ 'language' => $this->get_language(),
	759	+ 'map_api_key' => get_option( 'visualizer-map-api-key' ),
456	760	'charts' => $charts,
457	761	'urls' => array(
458		- 'base' => add_query_arg( 'vpage', false ),
	762	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
459	763	'create' => add_query_arg(
460	764	array(
461	765	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
462	766	'library' => 'yes',
463		- ), $ajaxurl
	767	+ 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	768	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	769	+ 'vaction' => false,
	770	+ ),
	771	+ $ajaxurl
464	772	),
465	773	'edit' => add_query_arg(
466	774	array(
467	775	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
468	776	'library' => 'yes',
469		- ), $ajaxurl
	777	+ 'vaction' => false,
	778	+ ),
	779	+ $ajaxurl
470	780	),
471	781	),
	782	+ 'page_type' => 'library',
	783	+ 'is_front' => false,
472	784	)
473	785	);
474	786	// render library page
475	787	$render = new Visualizer_Render_Library();
		@@ -474,12 +786,13 @@
474	786	// render library page
475	787	$render = new Visualizer_Render_Library();
476	788	$render->charts = $charts;
477	789	$render->type = $filter;
478		- $render->types = self::_getChartTypesLocalized();
	790	+ $render->types = self::_getChartTypesLocalized( false, false, false, true );
	791	+ $render->custom_css = $css;
479	792	$render->pagination = paginate_links(
480	793	array(
481		- 'base' => add_query_arg( 'vpage', '%#%' ),
	794	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
482	795	'format' => '',
483	796	'current' => $page,
484	797	'total' => $query->max_num_pages,
485	798	'type' => 'array',
		@@ -500,14 +813,14 @@
500	813	*
501	814	* @return array Updated array of action links.
502	815	*/
503	816	public function getPluginActionLinks( $links, $file ) {
504		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	817	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
505	818	array_unshift(
506	819	$links,
507	820	sprintf(
508	821	'<a href="%s">%s</a>',
509		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	822	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
510	823	esc_html__( 'Library', 'visualizer' )
511	824	)
512	825	);
513	826	}
		@@ -527,17 +840,17 @@
527	840	*
528	841	* @return array Updated array of plugin meta links.
529	842	*/
530	843	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
531		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	844	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
532	845	// knowledge base link
533	846	$plugin_meta[] = sprintf(
534		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
535		- esc_html__( 'Knowledge Base', 'visualizer' )
	847	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	848	+ esc_html__( 'Docs', 'visualizer' )
536	849	);
537	850	// flattr link
538	851	$plugin_meta[] = sprintf(
539		- '<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
	852	+ '<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>',
540	853	esc_html__( 'Pro Addon', 'visualizer' )
541	854	);
542	855	}
543	856