← All changes | classes/Visualizer/Module/Admin.php +561 -70 3.0.6 → 3.4.5 View file →

		@@ -52,34 +52,193 @@
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	+
	68	+ // revision support.
	69	+ $this->_addFilter( 'wp_revisions_to_keep', 'limitRevisions', null, 10, 2 );
	70	+ $this->_addAction( '_wp_put_post_revision', 'addRevision', null, 10, 1 );
	71	+ $this->_addAction( 'wp_restore_post_revision', 'restoreRevision', null, 10, 2 );
	72	+
	73	+ $this->_addAction( 'visualizer_chart_schedules_spl', 'addSplChartSchedules', null, 10, 3 );
	74	+
65	75	$this->_addAction( 'admin_init', 'init' );
	76	+
	77	+ if ( defined( 'TI_CYPRESS_TESTING' ) ) {
	78	+ $this->load_cypress_hooks();
	79	+ }
	80	+
66	81	}
67	82
68	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	+ /**
	156	+ * No limits on revisions.
	157	+ */
	158	+ public function limitRevisions( $num, $post ) {
	159	+ if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
	160	+ return -1;
	161	+ }
	162	+ return $num;
	163	+ }
	164	+
	165	+ /**
	166	+ * Add a revision.
	167	+ */
	168	+ public function addRevision( $revision_id ) {
	169	+ $parent_id = wp_is_post_revision( $revision_id );
	170	+ if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $parent_id ) ) {
	171	+ // add the meta data to this revision.
	172	+ $meta = get_post_meta( $parent_id, '', true );
	173	+
	174	+ if ( $meta ) {
	175	+ foreach ( $meta as $key => $value ) {
	176	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	177	+ add_metadata( 'post', $revision_id, $key, maybe_unserialize( $value[0] ) );
	178	+ }
	179	+ }
	180	+ }
	181	+ }
	182	+ }
	183	+
	184	+ /**
	185	+ * Restore a revision.
	186	+ */
	187	+ public function restoreRevision( $post_id, $revision_id ) {
	188	+ if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $post_id ) ) {
	189	+ // get the meta information from the revision.
	190	+ $meta = get_metadata( 'post', $revision_id, '', true );
	191	+
	192	+ // delete all meta information from the post before adding.
	193	+ $post_meta = get_post_meta( $post_id, '', true );
	194	+ if ( $post_meta ) {
	195	+ foreach ( $meta as $key => $value ) {
	196	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	197	+ delete_post_meta( $post_id, $key );
	198	+ }
	199	+ }
	200	+ }
	201	+
	202	+ if ( $meta ) {
	203	+ foreach ( $meta as $key => $value ) {
	204	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	205	+ add_post_meta( $post_id, $key, maybe_unserialize( $value[0] ) );
	206	+ }
	207	+ }
	208	+ }
	209	+ }
	210	+ }
	211	+
	212	+ /**
69	213	* Admin init.
70	214	*
71	215	* @access public
72	216	*/
73	217	public function init() {
	218	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
74	219	if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
75	220	$this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
76	221	$this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
77	222	$this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
	223	+ $this->_addFilter( 'tiny_mce_before_init', 'get_strings_for_block', 10, 1 );
78	224	}
79	225	}
80	226
81	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	+ /**
82	241	* Load plugin translation for - TinyMCE API
83	242	*
84	243	* @access public
85	244	* @param array $arr The tinymce_lang array.
		@@ -150,14 +309,28 @@
150	309	public function enqueueMediaScripts() {
151	310	global $typenow;
152	311	if ( post_type_supports( $typenow, 'editor' ) ) {
153	312	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 );
	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_Tabular::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 );
157	321	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
158	322	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
159	323	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
	324	+ wp_localize_script(
	325	+ 'visualizer-media-view',
	326	+ 'visualizer',
	327	+ array(
	328	+ 'i10n' => array(
	329	+ 'insert' => __( 'Insert', 'visualizer' ),
	330	+ ),
	331	+ )
	332	+ );
160	333	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
161	334	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
162	335	}
163	336	}
		@@ -206,9 +379,9 @@
206	379	* @static
207	380	* @access private
208	381	* @return array The associated array of chart types with localized names.
209	382	*/
210		- 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 ) {
211	384	$additional = array();
212	385	if ( $add_select ) {
213	386	$additional['select'] = array(
214	387	'name' => esc_html__( 'All', 'visualizer' ),
		@@ -216,58 +389,88 @@
216	389	);
217	390	}
218	391
219	392	$types = array_merge(
220		- $additional, array(
	393	+ $additional,
	394	+ array(
	395	+ 'tabular' => array(
	396	+ 'name' => esc_html__( 'Table', 'visualizer' ),
	397	+ 'enabled' => true,
	398	+ 'supports' => array( 'Google Charts', 'DataTable' ),
	399	+ ),
221	400	'pie' => array(
222		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	401	+ 'name' => esc_html__( 'Pie/Donut', 'visualizer' ),
223	402	'enabled' => true,
	403	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
224	404	),
225	405	'line' => array(
226	406	'name' => esc_html__( 'Line', 'visualizer' ),
227	407	'enabled' => true,
	408	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
228	409	),
229	410	'area' => array(
230	411	'name' => esc_html__( 'Area', 'visualizer' ),
231	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' ),
232	415	),
233	416	'geo' => array(
234	417	'name' => esc_html__( 'Geo', 'visualizer' ),
235	418	'enabled' => true,
	419	+ 'supports' => array( 'Google Charts' ),
236	420	),
237	421	'bar' => array(
238	422	'name' => esc_html__( 'Bar', 'visualizer' ),
239	423	'enabled' => true,
	424	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
240	425	),
241	426	'column' => array(
242	427	'name' => esc_html__( 'Column', 'visualizer' ),
243	428	'enabled' => true,
	429	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
244	430	),
245		- 'gauge' => array(
246		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
	431	+ 'bubble' => array(
	432	+ 'name' => esc_html__( 'Bubble', 'visualizer' ),
247	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' ),
248	436	),
249	437	'scatter' => array(
250	438	'name' => esc_html__( 'Scatter', 'visualizer' ),
251	439	'enabled' => true,
	440	+ 'supports' => array( 'Google Charts' ),
252	441	),
	442	+ 'gauge' => array(
	443	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	444	+ 'enabled' => true,
	445	+ 'supports' => array( 'Google Charts' ),
	446	+ ),
253	447	'candlestick' => array(
254	448	'name' => esc_html__( 'Candlestick', 'visualizer' ),
255	449	'enabled' => true,
	450	+ 'supports' => array( 'Google Charts' ),
256	451	),
257	452	// pro types
258		- 'table' => array(
259		- 'name' => esc_html__( 'Table', 'visualizer' ),
260		- 'enabled' => false,
261		- ),
262	453	'timeline' => array(
263	454	'name' => esc_html__( 'Timeline', 'visualizer' ),
264	455	'enabled' => false,
	456	+ 'supports' => array( 'Google Charts', 'ChartJS' ),
265	457	),
266	458	'combo' => array(
267	459	'name' => esc_html__( 'Combo', 'visualizer' ),
268	460	'enabled' => false,
	461	+ 'supports' => array( 'Google Charts' ),
269	462	),
	463	+ 'polarArea' => array(
	464	+ 'name' => esc_html__( 'Polar Area', 'visualizer' ),
	465	+ 'enabled' => false,
	466	+ 'supports' => array( 'ChartJS' ),
	467	+ ),
	468	+ 'radar' => array(
	469	+ 'name' => esc_html__( 'Radar/Spider', 'visualizer' ),
	470	+ 'enabled' => false,
	471	+ 'supports' => array( 'ChartJS' ),
	472	+ ),
270	473	)
271	474	);
272	475	$types = apply_filters( 'visualizer_pro_chart_types', $types );
273	476	if ( $enabledOnly ) {
		@@ -276,8 +479,12 @@
276	479	if ( ! is_array( $array ) ) {
277	480	// support for old pro
278	481	$array = array( 'enabled' => true, 'name' => $array );
279	482	}
	483	+ // backward compatibility for PRO before v1.9.0
	484	+ if ( ! array_key_exists( 'supports', $array ) ) {
	485	+ $array['supports'] = array( 'Google Charts' );
	486	+ }
280	487	if ( ! $array['enabled'] ) {
281	488	continue;
282	489	}
283	490	$filtered[ $type ] = $array;
		@@ -290,13 +497,74 @@
290	497	if ( ! is_array( $array ) ) {
291	498	// support for old pro
292	499	$array = array( 'enabled' => true, 'name' => $array );
293	500	}
	501	+ // backward compatibility for PRO before v1.9.0
	502	+ if ( ! array_key_exists( 'supports', $array ) ) {
	503	+ $array['supports'] = array( 'Google Charts' );
	504	+ }
294	505	$doubleD[ $type ] = $array['name'];
295	506	}
296	507	$types = $doubleD;
297	508	}
298	509
	510	+ return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
	511	+ }
	512	+
	513	+ /**
	514	+ * Handle (soon-to-be) deprecated charts.
	515	+ */
	516	+ private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
	517	+ $deprecated = array();
	518	+
	519	+ switch ( $where ) {
	520	+ case 'types':
	521	+ // fall-through
	522	+ case 'library':
	523	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	524	+ if ( ! Visualizer_Module::is_pro() ) {
	525	+ if ( ! self::hasChartType( 'gauge' ) ) {
	526	+ if ( $get2Darray ) {
	527	+ $deprecated[] = 'gauge';
	528	+ } else {
	529	+ $types['gauge']['enabled'] = false;
	530	+ }
	531	+ }
	532	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	533	+ if ( $get2Darray ) {
	534	+ $deprecated[] = 'candlestick';
	535	+ } else {
	536	+ $types['candlestick']['enabled'] = false;
	537	+ }
	538	+ }
	539	+ }
	540	+ break;
	541	+ default:
	542	+ // if a user has a Gauge/Candlestick chart, then let them keep using it.
	543	+ if ( ! Visualizer_Module::is_pro() ) {
	544	+ if ( ! self::hasChartType( 'gauge' ) ) {
	545	+ if ( $get2Darray ) {
	546	+ $deprecated[] = 'gauge';
	547	+ } else {
	548	+ $types['gauge']['enabled'] = false;
	549	+ }
	550	+ }
	551	+ if ( ! self::hasChartType( 'candlestick' ) ) {
	552	+ if ( $get2Darray ) {
	553	+ $deprecated[] = 'candlestick';
	554	+ } else {
	555	+ $types['candlestick']['enabled'] = false;
	556	+ }
	557	+ }
	558	+ }
	559	+ }
	560	+
	561	+ if ( $deprecated ) {
	562	+ foreach ( $deprecated as $type ) {
	563	+ unset( $types[ $type ] );
	564	+ }
	565	+ }
	566	+
299	567	return $types;
300	568	}
301	569
302	570	/**
		@@ -306,11 +574,11 @@
306	574	* @global string $pagenow The name of the current page.
307	575	*
308	576	* @access public
309	577	*/
310		- public function renderTempaltes() {
	578	+ public function renderTemplates() {
311	579	global $pagenow;
312		- if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
	580	+ if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
313	581	return;
314	582	}
315	583	$render = new Visualizer_Render_Templates();
316	584	$render->render();
		@@ -328,26 +596,42 @@
328	596	*
329	597	* @param string $suffix The current page suffix.
330	598	*/
331	599	public function enqueueLibraryScripts( $suffix ) {
332		- if ( $suffix == $this->_libraryPage ) {
	600	+ if ( $suffix === $this->_libraryPage ) {
	601	+ wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
333	602	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
334	603	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
335	604	wp_enqueue_media();
336	605	wp_enqueue_script(
337		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	606	+ 'visualizer-library',
	607	+ VISUALIZER_ABSURL . 'js/library.js',
	608	+ array(
338	609	'jquery',
339	610	'media-views',
340		- ), Visualizer_Plugin::VERSION, true
	611	+ 'visualizer-clipboardjs',
	612	+ ),
	613	+ Visualizer_Plugin::VERSION,
	614	+ true
341	615	);
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		- );
	616	+
	617	+ wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
	618	+
	619	+ $query = $this->getQuery();
	620	+ while ( $query->have_posts() ) {
	621	+ $chart = $query->next_post();
	622	+ $library = $this->load_chart_type( $chart->ID );
	623	+ if ( is_null( $library ) ) {
	624	+ continue;
	625	+ }
	626	+ wp_enqueue_script(
	627	+ "visualizer-render-$library",
	628	+ VISUALIZER_ABSURL . 'js/render-facade.js',
	629	+ apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
	630	+ Visualizer_Plugin::VERSION,
	631	+ true
	632	+ );
	633	+ }
350	634	}
351	635	}
352	636
353	637	/**
		@@ -374,24 +658,140 @@
374	658	*
375	659	* @access public
376	660	*/
377	661	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 );
	662	+ $svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZCBTaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5MC4wMDAwMDAsIC00MzUuMDAwMDAwKSIgZmlsbD0iIzM5QzNEMiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMjguNSw1MTIgQzIwNy4yMzcwMzcsNTEyIDE5MCw0OTQuNzYyOTYzIDE5MCw0NzMuNSBDMTkwLDQ1Mi4yMzcwMzcgMjA3LjIzNzAzNyw0MzUgMjI4LjUsNDM1IEMyNDkuNzYyOTYzLDQzNSAyNjcsNDUyLjIzNzAzNyAyNjcsNDczLjUgQzI2Nyw0OTQuNzYyOTYzIDI0OS43NjI5NjMsNTEyIDIyOC41LDUxMiBaIE0yNDYuODQzNzUsNDgzLjU5MjA1OSBMMjE1LjYyNSw0ODMuNTkyMDU5IEwyMTUuNjI1LDQ2MC44MjY1NDQgQzIxNS42MjUsNDYwLjE2NDU0NyAyMTUuMTA3NTc4LDQ1OS42MjgzNTkgMjE0LjQ2ODc1LDQ1OS42MjgzNTkgTDIxMi4xNTYyNSw0NTkuNjI4MzU5IEMyMTEuNTE3NDIyLDQ1OS42MjgzNTkgMjExLDQ2MC4xNjQ1NDcgMjExLDQ2MC44MjY1NDQgTDIxMSw0ODUuOTg4NDI5IEMyMTEsNDg3LjMxMTY3NCAyMTIuMDM1NTY2LDQ4OC4zODQ3OTggMjEzLjMxMjUsNDg4LjM4NDc5OCBMMjQ2Ljg0Mzc1LDQ4OC4zODQ3OTggQzI0Ny40ODI1NzgsNDg4LjM4NDc5OCAyNDgsNDg3Ljg0ODYxMSAyNDgsNDg3LjE4NjYxMyBMMjQ4LDQ4NC43OTAyNDQgQzI0OCw0ODQuMTI4MjQ2IDI0Ny40ODI1NzgsNDgzLjU5MjA1OSAyNDYuODQzNzUsNDgzLjU5MjA1OSBaIE0yNDQuNTMxMjUsNDYyLjAyNDcyOSBMMjM1Ljk5OTU3LDQ2Mi4wMjQ3MjkgQzIzNC40NTQ1MzEsNDYyLjAyNDcyOSAyMzMuNjgwNTY2LDQ2My45NjA1NDcgMjM0Ljc3MzIyMyw0NjUuMDkyODMyIEwyMzcuMTE0NjI5LDQ2Ny41MTkxNTYgTDIzMS44MTI1LDQ3My4wMTQzMzIgTDIyNi41MTAzNzEsNDY3LjUxOTkwNSBDMjI1LjYwNzA1MSw0NjYuNTgzODIzIDIyNC4xNDI5NDksNDY2LjU4MzgyMyAyMjMuMjQwMzUyLDQ2Ny41MTk5MDUgTDIxOC4yNzY0MjYsNDcyLjY2Mzg2MyBDMjE3LjgyNDc2Niw0NzMuMTMxOTA0IDIxNy44MjQ3NjYsNDczLjg5MDUwNSAyMTguMjc2NDI2LDQ3NC4zNTg1NDYgTDIxOS45MTEwNzQsNDc2LjA1MjQ4IEMyMjAuMzYyNzM0LDQ3Ni41MjA1MjEgMjIxLjA5NDc4NSw0NzYuNTIwNTIxIDIyMS41NDY0NDUsNDc2LjA1MjQ4IEwyMjQuODc1LDQ3Mi42MDI0NTYgTDIzMC4xNzcxMjksNDc4LjA5Njg4MyBDMjMxLjA4MDQ0OSw0NzkuMDMyOTY1IDIzMi41NDQ1NTEsNDc5LjAzMjk2NSAyMzMuNDQ3MTQ4LDQ3OC4wOTY4ODMgTDI0MC4zODQ2NDgsNDcwLjkwNzc3MyBMMjQyLjcyNjA1NSw0NzMuMzM0MDk4IEMyNDMuODE4NzExLDQ3NC40NjYzODIgMjQ1LjY4Njc3Nyw0NzMuNjY0MzQ3IDI0NS42ODY3NzcsNDcyLjA2MzI3MyBMMjQ1LjY4Njc3Nyw0NjMuMjIyOTE0IEMyNDUuNjg3NSw0NjIuNTYwOTE3IDI0NS4xNzAwNzgsNDYyLjAyNDcyOSAyNDQuNTMxMjUsNDYyLjAyNDcyOSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==';
	663	+
	664	+ $this->_libraryPage = add_menu_page( __( 'Visualizer', 'visualizer' ), __( 'Visualizer', 'visualizer' ), 'edit_posts', Visualizer_Plugin::NAME, array( $this, 'renderLibraryPage' ), $svg_base64_icon, 99.7666 );
	665	+
	666	+ add_submenu_page(
	667	+ Visualizer_Plugin::NAME,
	668	+ __( 'Chart Library', 'visualizer' ),
	669	+ __( 'Chart Library', 'visualizer' ),
	670	+ 'edit_posts',
	671	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME )
	672	+ );
	673	+ add_submenu_page(
	674	+ Visualizer_Plugin::NAME,
	675	+ __( 'Add New Chart', 'visualizer' ),
	676	+ __( 'Add New Chart', 'visualizer' ),
	677	+ 'edit_posts',
	678	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
	679	+ );
	680	+ add_submenu_page(
	681	+ Visualizer_Plugin::NAME,
	682	+ __( 'Support', 'visualizer' ),
	683	+ __( '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>',
	684	+ 'edit_posts',
	685	+ 'viz-support',
	686	+ array( $this, 'renderSupportPage' )
	687	+ );
	688	+ remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
	689	+
	690	+ add_action( "load-{$this->_libraryPage}", array( $this, 'addScreenOptions' ) );
381	691	}
382	692
383	693	/**
384		- * Renders visualizer library page.
385		- *
386		- * @since 1.0.0
387		- *
388		- * @access public
	694	+ * Adds the screen options for pagination.
389	695	*/
390		- public function renderLibraryPage() {
	696	+ function addScreenOptions() {
	697	+ $screen = get_current_screen();
	698	+
	699	+ // bail if it's some other page.
	700	+ if ( ! is_object( $screen ) || $screen->id !== $this->_libraryPage ) {
	701	+ return;
	702	+ }
	703	+
	704	+ $args = array(
	705	+ 'label' => __( 'Number of charts per page:', 'visualizer' ),
	706	+ 'default' => 6,
	707	+ 'option' => 'visualizer_per_page_library',
	708	+ );
	709	+ add_screen_option( 'per_page', $args );
	710	+ }
	711	+
	712	+ /**
	713	+ * Returns the screen option for pagination.
	714	+ */
	715	+ function setScreenOptions( $status, $option, $value ) {
	716	+ if ( 'visualizer_per_page_library' === $option ) {
	717	+ return $value;
	718	+ }
	719	+ }
	720	+
	721	+ /**
	722	+ * Adds the display filters to be used in the meta_query while displaying the charts.
	723	+ */
	724	+ private function getDisplayFilters( &$query_args ) {
	725	+ $query = array();
	726	+
	727	+ // add chart type filter to the query arguments
	728	+ $type = filter_input( INPUT_GET, 'type' );
	729	+ if ( $type && in_array( $type, Visualizer_Plugin::getChartTypes(), true ) ) {
	730	+ $query[] = array(
	731	+ 'key' => Visualizer_Plugin::CF_CHART_TYPE,
	732	+ 'value' => $type,
	733	+ 'compare' => '=',
	734	+ );
	735	+ }
	736	+
	737	+ // add chart library filter to the query arguments
	738	+ $library = filter_input( INPUT_GET, 'library' );
	739	+ if ( $library ) {
	740	+ $query[] = array(
	741	+ 'key' => Visualizer_Plugin::CF_CHART_LIBRARY,
	742	+ 'value' => $library,
	743	+ 'compare' => '=',
	744	+ );
	745	+ }
	746	+
	747	+ // add date filter to the query arguments
	748	+ $date = filter_input( INPUT_GET, 'date' );
	749	+ $possible = array_keys( Visualizer_Plugin::getSupportedDateFilter() );
	750	+ if ( $date && in_array( $date, $possible, true ) ) {
	751	+ $query_args['date_query'] = array(
	752	+ 'after' => "$date -1 day",
	753	+ 'inclusive' => true,
	754	+ );
	755	+ }
	756	+
	757	+ // add source filter to the query arguments
	758	+ $source = filter_input( INPUT_GET, 'source' );
	759	+ if ( $source ) {
	760	+ $source = ucwords( $source );
	761	+ $source = "Visualizer_Source_{$source}";
	762	+ $query[] = array(
	763	+ 'key' => Visualizer_Plugin::CF_SOURCE,
	764	+ 'value' => $source,
	765	+ 'compare' => '=',
	766	+ );
	767	+ }
	768	+
	769	+ $query_args['meta_query'] = $query;
	770	+
	771	+ $orderby = filter_input( INPUT_GET, 'orderby' );
	772	+ $order = filter_input( INPUT_GET, 'order' );
	773	+ if ( $orderby ) {
	774	+ $query_args['order_by'] = $orderby;
	775	+ }
	776	+ $query_args['order'] = empty( $order ) ? 'desc' : $order;
	777	+ }
	778	+
	779	+ /**
	780	+ * Get the instance of WP_Query that fetches the charts as per the given criteria.
	781	+ */
	782	+ private function getQuery() {
	783	+ static $q;
	784	+ if ( ! is_null( $q ) ) {
	785	+ return $q;
	786	+ }
	787	+
391	788	// get current page
392	789	$page = filter_input(
393		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	790	+ INPUT_GET,
	791	+ 'vpage',
	792	+ FILTER_VALIDATE_INT,
	793	+ array(
394	794	'options' => array(
395	795	'min_range' => 1,
396	796	'default' => 1,
397	797	),
		@@ -396,27 +796,32 @@
396	796	'default' => 1,
397	797	),
398	798	)
399	799	);
	800	+
	801	+ $per_page = 6;
	802	+ $screen = get_current_screen();
	803	+ if ( $screen ) {
	804	+ // retrieve the per_page option
	805	+ $screen_option = $screen->get_option( 'per_page', 'option' );
	806	+ // retrieve the value stored for the current user
	807	+ $user = get_current_user_id();
	808	+ $per_page = get_user_meta( $user, $screen_option, true );
	809	+ if ( empty( $per_page ) || $per_page < 1 ) {
	810	+ // nothing set, get the default value
	811	+ $per_page = $screen->get_option( 'per_page', 'default' );
	812	+ }
	813	+ }
	814	+
400	815	// the initial query arguments to fetch charts
401	816	$query_args = array(
402	817	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
403		- 'posts_per_page' => 6,
	818	+ 'posts_per_page' => $per_page,
404	819	'paged' => $page,
405	820	);
406		- // add chart type filter to the query arguments
407		- $filter = filter_input( INPUT_GET, 'type' );
408		- if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
409		- $query_args['meta_query'] = array(
410		- array(
411		- 'key' => Visualizer_Plugin::CF_CHART_TYPE,
412		- 'value' => $filter,
413		- 'compare' => '=',
414		- ),
415		- );
416		- } else {
417		- $filter = 'all';
418		- }
	821	+
	822	+ $this->getDisplayFilters( $query_args );
	823	+
419	824	// Added by Ash/Upwork
420	825	$filterByMeta = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
421	826	if ( $filterByMeta ) {
422	827	$query = array(
		@@ -427,49 +832,134 @@
427	832	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
428	833	$meta[] = $query;
429	834	$query_args['meta_query'] = $meta;
430	835	}
431		- // Added by Ash/Upwork
432		- // fetch charts
	836	+ $q = new WP_Query( apply_filters( 'visualizer_query_args', $query_args ) );
	837	+ return $q;
	838	+ }
	839	+
	840	+ /**
	841	+ * Renders support page.
	842	+ *
	843	+ * @since 3.3.0
	844	+ *
	845	+ * @access public
	846	+ */
	847	+ public function renderSupportPage() {
	848	+ wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
	849	+ include_once VISUALIZER_ABSPATH . '/templates/support.php';
	850	+ }
	851	+
	852	+ /**
	853	+ * Renders visualizer library page.
	854	+ *
	855	+ * @since 1.0.0
	856	+ *
	857	+ * @access public
	858	+ */
	859	+ public function renderLibraryPage() {
433	860	$charts = array();
434		- $query = new WP_Query( $query_args );
	861	+ $query = $this->getQuery();
	862	+
	863	+ // get current page
	864	+ $page = filter_input(
	865	+ INPUT_GET,
	866	+ 'vpage',
	867	+ FILTER_VALIDATE_INT,
	868	+ array(
	869	+ 'options' => array(
	870	+ 'min_range' => 1,
	871	+ 'default' => 1,
	872	+ ),
	873	+ )
	874	+ );
	875	+ // add chart type filter to the query arguments
	876	+ $filter = filter_input( INPUT_GET, 'type' );
	877	+ if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes(), true ) ) ) {
	878	+ $filter = 'all';
	879	+ }
	880	+
	881	+ $css = '';
435	882	while ( $query->have_posts() ) {
436	883	$chart = $query->next_post();
	884	+
	885	+ // 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.
	886	+ $chart = $this->handleExistingRevisions( $chart->ID, $chart );
	887	+ // refresh a "live" db query chart.
	888	+ $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
	889	+
	890	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	891	+
437	892	// fetch and update settings
438	893	$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 );
	894	+
	895	+ $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
	896	+ if ( ! empty( $atts['settings'] ) ) {
	897	+ $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
	898	+ }
	899	+
	900	+ if ( $settings ) {
	901	+ unset( $settings['height'], $settings['width'], $settings['chartArea'] );
	902	+ }
	903	+
441	904	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
442		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	905	+ $data = self::get_chart_data( $chart, $type );
	906	+
	907	+ $library = $this->load_chart_type( $chart->ID );
	908	+
	909	+ $id = 'visualizer-' . $chart->ID;
	910	+ $arguments = $this->get_inline_custom_css( $id, $settings );
	911	+ if ( ! empty( $arguments ) ) {
	912	+ $css .= $arguments[0];
	913	+ $settings = $arguments[1];
	914	+ }
	915	+
443	916	// add chart to the array
444		- $charts[ 'visualizer-' . $chart->ID ] = array(
	917	+ $charts[ $id ] = array(
445	918	'id' => $chart->ID,
446	919	'type' => $type,
447	920	'series' => $series,
448	921	'settings' => $settings,
449	922	'data' => $data,
	923	+ 'library' => $library,
450	924	);
451	925	}
452	926	// enqueue charts array
453	927	$ajaxurl = admin_url( 'admin-ajax.php' );
454	928	wp_localize_script(
455		- 'visualizer-library', 'visualizer', array(
	929	+ 'visualizer-library',
	930	+ 'visualizer',
	931	+ array(
	932	+ 'language' => $this->get_language(),
	933	+ 'map_api_key' => get_option( 'visualizer-map-api-key' ),
456	934	'charts' => $charts,
457	935	'urls' => array(
458		- 'base' => add_query_arg( 'vpage', false ),
	936	+ 'base' => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
459	937	'create' => add_query_arg(
460	938	array(
461	939	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
462	940	'library' => 'yes',
463		- ), $ajaxurl
	941	+ 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	942	+ 'chart-library' => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
	943	+ 'vaction' => false,
	944	+ ),
	945	+ $ajaxurl
464	946	),
465	947	'edit' => add_query_arg(
466	948	array(
467	949	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
468	950	'library' => 'yes',
469		- ), $ajaxurl
	951	+ 'vaction' => false,
	952	+ ),
	953	+ $ajaxurl
470	954	),
471	955	),
	956	+ 'page_type' => 'library',
	957	+ 'is_front' => false,
	958	+ 'i10n' => array(
	959	+ 'copied' => __( 'The shortcode has been copied to your clipboard. Hit Ctrl-V/Cmd-V to paste it.', 'visualizer' ),
	960	+ 'conflict' => __( 'We have detected a potential conflict with another component that prevents Visualizer from functioning properly. Please disable any of the following components if they are activated on your instance: Modern Events Calendar plugin, Acronix plugin. In case the aforementioned components are not activated or you continue to see this error message, please disable all other plugins and enable them one by one to find out the component that is causing the conflict.', 'visualizer' ),
	961	+ ),
472	962	)
473	963	);
474	964	// render library page
475	965	$render = new Visualizer_Render_Library();
		@@ -474,12 +964,13 @@
474	964	// render library page
475	965	$render = new Visualizer_Render_Library();
476	966	$render->charts = $charts;
477	967	$render->type = $filter;
478		- $render->types = self::_getChartTypesLocalized();
	968	+ $render->types = self::_getChartTypesLocalized( false, false, false, true );
	969	+ $render->custom_css = $css;
479	970	$render->pagination = paginate_links(
480	971	array(
481		- 'base' => add_query_arg( 'vpage', '%#%' ),
	972	+ 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
482	973	'format' => '',
483	974	'current' => $page,
484	975	'total' => $query->max_num_pages,
485	976	'type' => 'array',
		@@ -500,14 +991,14 @@
500	991	*
501	992	* @return array Updated array of action links.
502	993	*/
503	994	public function getPluginActionLinks( $links, $file ) {
504		- if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	995	+ if ( $file === plugin_basename( VISUALIZER_BASEFILE ) ) {
505	996	array_unshift(
506	997	$links,
507	998	sprintf(
508	999	'<a href="%s">%s</a>',
509		- admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
	1000	+ admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
510	1001	esc_html__( 'Library', 'visualizer' )
511	1002	)
512	1003	);
513	1004	}
		@@ -527,17 +1018,17 @@
527	1018	*
528	1019	* @return array Updated array of plugin meta links.
529	1020	*/
530	1021	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
531		- if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {
	1022	+ if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
532	1023	// knowledge base link
533	1024	$plugin_meta[] = sprintf(
534		- '<a href="https://github.com/codeinwp/visualizer/wiki" target="_blank">%s</a>',
535		- esc_html__( 'Knowledge Base', 'visualizer' )
	1025	+ '<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
	1026	+ esc_html__( 'Docs', 'visualizer' )
536	1027	);
537	1028	// flattr link
538	1029	$plugin_meta[] = sprintf(
539		- '<a style="color:red" href="https://themeisle.com/plugins/visualizer-charts-and-graphs-pro-addon/" target="_blank">%s</a>',
	1030	+ '<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>',
540	1031	esc_html__( 'Pro Addon', 'visualizer' )
541	1032	);
542	1033	}
543	1034