← All changes | classes/Visualizer/Module/Admin.php +104 -509 3.1.1 → 1.7.1 View file →

		@@ -1,5 +1,6 @@
1	1	<?php
	2	+
2	3	// +----------------------------------------------------------------------+
3	4	// | Copyright 2013 Madpixels (email : visualizer@madpixels.net) |
4	5	// +----------------------------------------------------------------------+
5	6	// | This program is free software; you can redistribute it and/or modify |
		@@ -45,163 +46,53 @@
45	46	*
46	47	* @since 1.0.0
47	48	*
48	49	* @access public
49		- *
50	50	* @param Visualizer_Plugin $plugin The instance of the plugin.
51	51	*/
52	52	public function __construct( Visualizer_Plugin $plugin ) {
53	53	parent::__construct( $plugin );
	54	+
54	55	$this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
55	56	$this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
56		- $this->_addAction( 'admin_footer', 'renderTemplates' );
57		- $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
	57	+ $this->_addAction( 'admin_footer', 'renderTempaltes' );
	58	+ $this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts' );
58	59	$this->_addAction( 'admin_menu', 'registerAdminMenu' );
	60	+
59	61	$this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
60	62	$this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 );
61		- $this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
62		- $this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
63		- $this->_addFilter( 'visualizer_feedback_review_trigger', 'feedbackReviewTrigger' );
64		-
65		- // revision support.
66		- $this->_addFilter( 'wp_revisions_to_keep', 'limitRevisions', null, 10, 2 );
67		- $this->_addAction( '_wp_put_post_revision', 'addRevision', null, 10, 1 );
68		- $this->_addAction( 'wp_restore_post_revision', 'restoreRevision', null, 10, 2 );
69		-
70		- $this->_addAction( 'admin_init', 'init' );
	63	+ $this->_addFilter( 'plugin_row_meta', 'getPluginMetaLinks', 10, 2 );
71	64	}
72	65
73	66	/**
74		- * No limits on revisions.
75		- */
76		- public function limitRevisions( $num, $post ) {
77		- if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
78		- return -1;
79		- }
80		- return $num;
81		- }
82		-
83		- /**
84		- * Add a revision.
85		- */
86		- public function addRevision( $revision_id ) {
87		- $parent_id = wp_is_post_revision( $revision_id );
88		- if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $parent_id ) ) {
89		- // add the meta data to this revision.
90		- $meta = get_post_meta( $parent_id, '', true );
91		-
92		- if ( $meta ) {
93		- foreach ( $meta as $key => $value ) {
94		- if ( 0 === strpos( $key, 'visualizer' ) ) {
95		- add_metadata( 'post', $revision_id, $key, maybe_unserialize( $value[0] ) );
96		- }
97		- }
98		- }
99		- }
100		- }
101		-
102		- /**
103		- * Restore a revision.
104		- */
105		- public function restoreRevision( $post_id, $revision_id ) {
106		- if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $post_id ) ) {
107		- // get the meta information from the revision.
108		- $meta = get_metadata( 'post', $revision_id, '', true );
109		-
110		- // delete all meta information from the post before adding.
111		- $post_meta = get_post_meta( $post_id, '', true );
112		- if ( $post_meta ) {
113		- foreach ( $meta as $key => $value ) {
114		- if ( 0 === strpos( $key, 'visualizer' ) ) {
115		- delete_post_meta( $post_id, $key );
116		- }
117		- }
118		- }
119		-
120		- if ( $meta ) {
121		- foreach ( $meta as $key => $value ) {
122		- if ( 0 === strpos( $key, 'visualizer' ) ) {
123		- add_post_meta( $post_id, $key, maybe_unserialize( $value[0] ) );
124		- }
125		- }
126		- }
127		- }
128		- }
129		-
130		- /**
131		- * Admin init.
	67	+ * Returns associated array of chart types and localized names.
132	68	*
133		- * @access public
134		- */
135		- public function init() {
136		- if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
137		- $this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
138		- $this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
139		- $this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
140		- }
141		- }
142		-
143		- /**
144		- * Load plugin translation for - TinyMCE API
	69	+ * @since 1.0.0
145	70	*
146		- * @access public
147		- * @param array $arr The tinymce_lang array.
148		- * @return array
	71	+ * @static
	72	+ * @access private
	73	+ * @return array The associated array of chart types with localized names.
149	74	*/
150		- public function add_tinymce_lang( $arr ) {
151		- $ui_lang = VISUALIZER_ABSPATH . '/classes/Visualizer/Module/Language.php';
152		- $ui_lang = apply_filters( 'visualizer_ui_lang_filter', $ui_lang );
153		- $arr[] = $ui_lang;
154		- return $arr;
155		- }
	75	+ public static function _getChartTypesLocalized() {
	76	+ $types = array(
	77	+ 'all' => esc_html__( 'All', 'visualizer' ),
	78	+ 'pie' => esc_html__( 'Pie', 'visualizer' ),
	79	+ 'line' => esc_html__( 'Line', 'visualizer' ),
	80	+ 'area' => esc_html__( 'Area', 'visualizer' ),
	81	+ 'geo' => esc_html__( 'Geo', 'visualizer' ),
	82	+ 'bar' => esc_html__( 'Bar', 'visualizer' ),
	83	+ 'column' => esc_html__( 'Column', 'visualizer' ),
	84	+ 'gauge' => esc_html__( 'Gauge', 'visualizer' ),
	85	+ 'scatter' => esc_html__( 'Scatter', 'visualizer' ),
	86	+ 'candlestick' => esc_html__( 'Candlestick', 'visualizer' ),
	87	+ );
156	88
157		- /**
158		- * Load custom js options - TinyMCE API
159		- *
160		- * @access public
161		- * @param array $plugin_array The tinymce plugin array.
162		- * @return array
163		- */
164		- public function tinymce_plugin( $plugin_array ) {
165		- $plugin_array['visualizer_mce_button'] = VISUALIZER_ABSURL . 'js/mce.js';
166		- return $plugin_array;
167		- }
	89	+ $types = apply_filters( 'visualizer_pro_chart_types', $types );
168	90
169		- /**
170		- * Register new button in the editor
171		- *
172		- * @access public
173		- * @param array $buttons The tinymce buttons array.
174		- * @return array
175		- */
176		- public function register_mce_button( $buttons ) {
177		- array_push( $buttons, 'visualizer_mce_button' );
178		- return $buttons;
	91	+ return $types;
179	92	}
180	93
181	94	/**
182		- * Whether to show the feedback review or not.
183		- *
184		- * @access public
185		- */
186		- public function feedbackReviewTrigger( $dumb ) {
187		- $query = new WP_Query(
188		- array(
189		- 'posts_per_page' => 50,
190		- 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
191		- 'fields' => 'ids',
192		- 'update_post_meta_cache' => false,
193		- 'update_post_term_cache' => false,
194		- )
195		- );
196		-
197		- if ( $query->have_posts() && $query->post_count > 0 ) {
198		- return true;
199		- }
200		- return false;
201		- }
202		-
203		- /**
204	95	* Enqueues media scripts and styles.
205	96	*
206	97	* @since 1.0.0
207	98	* @uses wp_enqueue_style To enqueue style file.
		@@ -210,30 +101,20 @@
210	101	* @access public
211	102	*/
212	103	public function enqueueMediaScripts() {
213	104	global $typenow;
	105	+
214	106	if ( post_type_supports( $typenow, 'editor' ) ) {
215	107	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216	108
217		- // Load all the assets for the different libraries we support.
218		- $deps = Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) );
219		- $deps += Visualizer_Render_Sidebar_Type_DataTable::enqueue_assets( array( 'media-editor' ) );
220		-
221		- wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
222		- wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
	109	+ wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
	110	+ wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
	111	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
	112	+ wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
223	113	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
224		- wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
225		- wp_localize_script(
226		- 'visualizer-media-view',
227		- 'visualizer',
228		- array(
229		- 'i10n' => array(
230		- 'insert' => __( 'Insert', 'visualizer' ),
231		- ),
232		- )
233		- );
234		- wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
235		- wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
	114	+ wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
	115	+ wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
	116	+ wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
236	117	}
237	118	}
238	119
239	120	/**
		@@ -241,17 +122,14 @@
241	122	*
242	123	* @since 1.0.0
243	124	*
244	125	* @access public
245		- *
246	126	* @param array $strings The array of media view strings.
247		- *
248	127	* @return array The extended array of media view strings.
249	128	*/
250	129	public function setupMediaViewStrings( $strings ) {
251		- $chart_types = self::_getChartTypesLocalized( true, true, true );
252	130	$strings['visualizer'] = array(
253		- 'actions' => array(
	131	+ 'actions' => array(
254	132	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
255	133	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
256	134	),
257	135	'controller' => array(
		@@ -256,18 +134,17 @@
256	134	),
257	135	'controller' => array(
258	136	'title' => esc_html__( 'Visualizations', 'visualizer' ),
259	137	),
260		- 'routers' => array(
	138	+ 'routers' => array(
261	139	'library' => esc_html__( 'From Library', 'visualizer' ),
262	140	'create' => esc_html__( 'Create New', 'visualizer' ),
263	141	),
264		- 'library' => array(
265		- 'filters' => $chart_types,
266		- 'types' => array_keys( $chart_types ),
	142	+ 'library' => array(
	143	+ 'filters' => self::_getChartTypesLocalized(),
267	144	),
268		- 'nonce' => wp_create_nonce(),
269		- 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
	145	+ 'nonce' => wp_create_nonce(),
	146	+ 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
270	147	);
271	148
272	149	return $strings;
273	150	}
		@@ -272,189 +149,8 @@
272	149	return $strings;
273	150	}
274	151
275	152	/**
276		- * Returns associated array of chart types and localized names.
277		- *
278		- * @since 1.0.0
279		- *
280		- * @static
281		- * @access private
282		- * @return array The associated array of chart types with localized names.
283		- */
284		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
285		- $additional = array();
286		- if ( $add_select ) {
287		- $additional['select'] = array(
288		- 'name' => esc_html__( 'All', 'visualizer' ),
289		- 'enabled' => true,
290		- );
291		- }
292		-
293		- $types = array_merge(
294		- $additional,
295		- array(
296		- 'dataTable' => array(
297		- 'name' => esc_html__( 'Table (New)', 'visualizer' ),
298		- 'enabled' => true,
299		- ),
300		- 'pie' => array(
301		- 'name' => esc_html__( 'Pie', 'visualizer' ),
302		- 'enabled' => true,
303		- ),
304		- 'line' => array(
305		- 'name' => esc_html__( 'Line', 'visualizer' ),
306		- 'enabled' => true,
307		- ),
308		- 'area' => array(
309		- 'name' => esc_html__( 'Area', 'visualizer' ),
310		- 'enabled' => true,
311		- ),
312		- 'geo' => array(
313		- 'name' => esc_html__( 'Geo', 'visualizer' ),
314		- 'enabled' => true,
315		- ),
316		- 'bar' => array(
317		- 'name' => esc_html__( 'Bar', 'visualizer' ),
318		- 'enabled' => true,
319		- ),
320		- 'column' => array(
321		- 'name' => esc_html__( 'Column', 'visualizer' ),
322		- 'enabled' => true,
323		- ),
324		- 'scatter' => array(
325		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
326		- 'enabled' => true,
327		- ),
328		- 'gauge' => array(
329		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
330		- 'enabled' => true,
331		- ),
332		- 'candlestick' => array(
333		- 'name' => esc_html__( 'Candlestick', 'visualizer' ),
334		- 'enabled' => true,
335		- ),
336		- // pro types
337		- 'table' => array(
338		- 'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
339		- 'enabled' => false,
340		- ),
341		- 'timeline' => array(
342		- 'name' => esc_html__( 'Timeline', 'visualizer' ),
343		- 'enabled' => false,
344		- ),
345		- 'combo' => array(
346		- 'name' => esc_html__( 'Combo', 'visualizer' ),
347		- 'enabled' => false,
348		- ),
349		- )
350		- );
351		- $types = apply_filters( 'visualizer_pro_chart_types', $types );
352		- if ( $enabledOnly ) {
353		- $filtered = array();
354		- foreach ( $types as $type => $array ) {
355		- if ( ! is_array( $array ) ) {
356		- // support for old pro
357		- $array = array( 'enabled' => true, 'name' => $array );
358		- }
359		- if ( ! $array['enabled'] ) {
360		- continue;
361		- }
362		- $filtered[ $type ] = $array;
363		- }
364		- $types = $filtered;
365		- }
366		- if ( $get2Darray ) {
367		- $doubleD = array();
368		- foreach ( $types as $type => $array ) {
369		- if ( ! is_array( $array ) ) {
370		- // support for old pro
371		- $array = array( 'enabled' => true, 'name' => $array );
372		- }
373		- $doubleD[ $type ] = $array['name'];
374		- }
375		- $types = $doubleD;
376		- }
377		-
378		- return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
379		- }
380		-
381		- /**
382		- * Handle (soon-to-be) deprecated charts.
383		- */
384		- private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
385		- $deprecated = array();
386		-
387		- switch ( $where ) {
388		- case 'library':
389		- // if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
390		- if ( ! self::hasChartType( 'table' ) ) {
391		- $deprecated[] = 'table';
392		- if ( $get2Darray ) {
393		- $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
394		- } else {
395		- $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
396		- }
397		- }
398		-
399		- // if a user has a Gauge/Candlestick chart, then let them keep using it.
400		- if ( ! VISUALIZER_PRO ) {
401		- if ( ! self::hasChartType( 'gauge' ) ) {
402		- if ( $get2Darray ) {
403		- $deprecated[] = 'gauge';
404		- } else {
405		- $types['gauge']['enabled'] = false;
406		- }
407		- }
408		- if ( ! self::hasChartType( 'candlestick' ) ) {
409		- if ( $get2Darray ) {
410		- $deprecated[] = 'candlestick';
411		- } else {
412		- $types['candlestick']['enabled'] = false;
413		- }
414		- }
415		- }
416		- break;
417		- default:
418		- // remove the option to create a Google Table chart.
419		- $deprecated[] = 'table';
420		-
421		- // rename the new table chart type.
422		- if ( $get2Darray ) {
423		- $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
424		- } else {
425		- $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
426		- }
427		-
428		- // if a user has a Gauge/Candlestick chart, then let them keep using it.
429		- if ( ! VISUALIZER_PRO ) {
430		- if ( ! self::hasChartType( 'gauge' ) ) {
431		- if ( $get2Darray ) {
432		- $deprecated[] = 'gauge';
433		- } else {
434		- $types['gauge']['enabled'] = false;
435		- }
436		- }
437		- if ( ! self::hasChartType( 'candlestick' ) ) {
438		- if ( $get2Darray ) {
439		- $deprecated[] = 'candlestick';
440		- } else {
441		- $types['candlestick']['enabled'] = false;
442		- }
443		- }
444		- }
445		- }
446		-
447		- if ( $deprecated ) {
448		- foreach ( $deprecated as $type ) {
449		- unset( $types[ $type ] );
450		- }
451		- }
452		-
453		- return $types;
454		- }
455		-
456		- /**
457	153	* Renders templates to use in media popup.
458	154	*
459	155	* @since 1.0.0
460	156	* @global string $pagenow The name of the current page.
		@@ -460,13 +156,15 @@
460	156	* @global string $pagenow The name of the current page.
461	157	*
462	158	* @access public
463	159	*/
464		- public function renderTemplates() {
	160	+ public function renderTempaltes() {
465	161	global $pagenow;
	162	+
466	163	if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
467	164	return;
468	165	}
	166	+
469	167	$render = new Visualizer_Render_Templates();
470	168	$render->render();
471	169	}
472	170
		@@ -478,44 +176,21 @@
478	176	* @uses wp_enqueue_script() To enqueue javascript file.
479	177	* @uses wp_enqueue_media() To enqueue media stuff.
480	178	*
481	179	* @access public
482		- *
483	180	* @param string $suffix The current page suffix.
484	181	*/
485	182	public function enqueueLibraryScripts( $suffix ) {
486	183	if ( $suffix == $this->_libraryPage ) {
487	184	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
	185	+
488	186	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
	187	+
489	188	wp_enqueue_media();
490		- wp_enqueue_script(
491		- 'visualizer-library',
492		- VISUALIZER_ABSURL . 'js/library.js',
493		- array(
494		- 'jquery',
495		- 'media-views',
496		- ),
497		- Visualizer_Plugin::VERSION,
498		- true
499		- );
500		-
501		- wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
502		-
503		- $query = $this->getQuery();
504		- while ( $query->have_posts() ) {
505		- $chart = $query->next_post();
506		- $library = $this->load_chart_type( $chart->ID );
507		- if ( is_null( $library ) ) {
508		- continue;
509		- }
510		- wp_enqueue_script(
511		- "visualizer-render-$library",
512		- VISUALIZER_ABSURL . 'js/render-facade.js',
513		- apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
514		- Visualizer_Plugin::VERSION,
515		- true
516		- );
517		- }
	189	+ wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( 'jquery', 'media-views' ), Visualizer_Plugin::VERSION, true );
	190	+ wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	191	+ wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
	192	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
518	193	}
519	194	}
520	195
521	196	/**
		@@ -523,16 +198,13 @@
523	198	*
524	199	* @since 1.0.0
525	200	*
526	201	* @access public
527		- *
528	202	* @param array $tabs The array of media upload tabs.
529		- *
530	203	* @return array Extended array of media upload tabs.
531	204	*/
532	205	public function setupVisualizerTab( $tabs ) {
533	206	$tabs['visualizer'] = 'Visualizer';
534		-
535	207	return $tabs;
536	208	}
537	209
538	210	/**
		@@ -542,34 +214,29 @@
542	214	*
543	215	* @access public
544	216	*/
545	217	public function registerAdminMenu() {
546		- $title = esc_html__( 'Visualizer Library', 'visualizer' );
547		- $callback = array( $this, 'renderLibraryPage' );
	218	+ $title = esc_html__( 'Visualizer Library', 'visualizer' );
	219	+ $callback = array( $this, 'renderLibraryPage' );
548	220	$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
549	221	}
550	222
551	223	/**
552		- * Get the instance of WP_Query that fetches the charts as per the given criteria.
	224	+ * Renders visualizer library page.
	225	+ *
	226	+ * @since 1.0.0
	227	+ *
	228	+ * @access public
553	229	*/
554		- private function getQuery() {
555		- static $q;
556		- if ( ! is_null( $q ) ) {
557		- return $q;
558		- }
	230	+ public function renderLibraryPage() {
	231	+ // get current page
	232	+ $page = filter_input( INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	233	+ 'options' => array(
	234	+ 'min_range' => 1,
	235	+ 'default' => 1,
	236	+ ),
	237	+ ) );
559	238
560		- // get current page
561		- $page = filter_input(
562		- INPUT_GET,
563		- 'vpage',
564		- FILTER_VALIDATE_INT,
565		- array(
566		- 'options' => array(
567		- 'min_range' => 1,
568		- 'default' => 1,
569		- ),
570		- )
571		- );
572	239	// the initial query arguments to fetch charts
573	240	$query_args = array(
574	241	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
575	242	'posts_per_page' => 6,
		@@ -574,8 +241,9 @@
574	241	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
575	242	'posts_per_page' => 6,
576	243	'paged' => $page,
577	244	);
	245	+
578	246	// add chart type filter to the query arguments
579	247	$filter = filter_input( INPUT_GET, 'type' );
580	248	if ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) {
581	249	$query_args['meta_query'] = array(
		@@ -587,140 +255,71 @@
587	255	);
588	256	} else {
589	257	$filter = 'all';
590	258	}
	259	+
591	260	// Added by Ash/Upwork
592		- $filterByMeta = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
	261	+ $filterByMeta = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
593	262	if ( $filterByMeta ) {
594		- $query = array(
595		- 'key' => Visualizer_Plugin::CF_SETTINGS,
596		- 'value' => $filterByMeta,
597		- 'compare' => 'LIKE',
	263	+ $query = array(
	264	+ 'key' => Visualizer_Plugin::CF_SETTINGS,
	265	+ 'value' => $filterByMeta,
	266	+ 'compare' => 'LIKE',
598	267	);
599		- $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
600		- $meta[] = $query;
601		- $query_args['meta_query'] = $meta;
	268	+ $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
	269	+ $meta[] = $query;
	270	+ $query_args['meta_query'] = $meta;
602	271	}
603		- $q = new WP_Query( $query_args );
604		- return $q;
605		- }
606		-
607		- /**
608		- * Renders visualizer library page.
609		- *
610		- * @since 1.0.0
611		- *
612		- * @access public
613		- */
614		- public function renderLibraryPage() {
	272	+ // Added by Ash/Upwork
	273	+ // fetch charts
615	274	$charts = array();
616		- $query = $this->getQuery();
617		-
618		- // get current page
619		- $page = filter_input(
620		- INPUT_GET,
621		- 'vpage',
622		- FILTER_VALIDATE_INT,
623		- array(
624		- 'options' => array(
625		- 'min_range' => 1,
626		- 'default' => 1,
627		- ),
628		- )
629		- );
630		- // add chart type filter to the query arguments
631		- $filter = filter_input( INPUT_GET, 'type' );
632		- if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
633		- $filter = 'all';
634		- }
635		-
636		- $css = '';
	275	+ $query = new WP_Query( $query_args );
637	276	while ( $query->have_posts() ) {
638	277	$chart = $query->next_post();
639	278
640		- // 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.
641		- $chart = $this->handleExistingRevisions( $chart->ID, $chart );
642		- // refresh a "live" db query chart.
643		- $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
644		-
645		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
646		-
647	279	// fetch and update settings
648	280	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
	281	+ unset( $settings['height'], $settings['width'] );
649	282
650		- $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
651		- if ( ! empty( $atts['settings'] ) ) {
652		- $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
653		- }
654		-
655		- unset( $settings['height'], $settings['width'] );
	283	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
656	284	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
657		- $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
	285	+ $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type );
658	286
659		- $library = $this->load_chart_type( $chart->ID );
660		-
661		- $id = 'visualizer-' . $chart->ID;
662		- $arguments = $this->get_inline_custom_css( $id, $settings );
663		- if ( ! empty( $arguments ) ) {
664		- $css .= $arguments[0];
665		- $settings = $arguments[1];
666		- }
667		-
668	287	// add chart to the array
669		- $charts[ $id ] = array(
	288	+ $charts[ 'visualizer-' . $chart->ID ] = array(
670	289	'id' => $chart->ID,
671	290	'type' => $type,
672	291	'series' => $series,
673	292	'settings' => $settings,
674	293	'data' => $data,
675		- 'library' => $library,
676	294	);
677	295	}
	296	+
678	297	// enqueue charts array
679	298	$ajaxurl = admin_url( 'admin-ajax.php' );
680		- wp_localize_script(
681		- 'visualizer-library',
682		- 'visualizer',
683		- array(
684		- 'language' => $this->get_language(),
685		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
686		- 'charts' => $charts,
687		- 'urls' => array(
688		- 'base' => add_query_arg( 'vpage', false ),
689		- 'create' => add_query_arg(
690		- array(
691		- 'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
692		- 'library' => 'yes',
693		- 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
694		- ),
695		- $ajaxurl
696		- ),
697		- 'edit' => add_query_arg(
698		- array(
699		- 'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
700		- 'library' => 'yes',
701		- ),
702		- $ajaxurl
703		- ),
704		- ),
705		- 'page_type' => 'library',
706		- )
707		- );
	299	+ wp_localize_script( 'visualizer-library', 'visualizer', array(
	300	+ 'charts' => $charts,
	301	+ 'urls' => array(
	302	+ 'base' => add_query_arg( 'vpage', false ),
	303	+ 'create' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, 'library' => 'yes' ), $ajaxurl ),
	304	+ 'edit' => add_query_arg( array( 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, 'library' => 'yes' ), $ajaxurl ),
	305	+ ),
	306	+ ) );
	307	+
708	308	// render library page
709		- $render = new Visualizer_Render_Library();
710		- $render->charts = $charts;
711		- $render->type = $filter;
712		- $render->types = self::_getChartTypesLocalized( false, false, false, true );
713		- $render->custom_css = $css;
714		- $render->pagination = paginate_links(
715		- array(
716		- 'base' => add_query_arg( 'vpage', '%#%' ),
717		- 'format' => '',
718		- 'current' => $page,
719		- 'total' => $query->max_num_pages,
720		- 'type' => 'array',
721		- )
722		- );
	309	+ $render = new Visualizer_Render_Library();
	310	+
	311	+ $render->charts = $charts;
	312	+ $render->type = $filter;
	313	+ $render->types = self::_getChartTypesLocalized();
	314	+ $render->pagination = paginate_links( array(
	315	+ 'base' => add_query_arg( 'vpage', '%#%' ),
	316	+ 'format' => '',
	317	+ 'current' => $page,
	318	+ 'total' => $query->max_num_pages,
	319	+ 'type' => 'array',
	320	+ ) );
	321	+
723	322	$render->render();
724	323	}
725	324
726	325	/**
		@@ -728,12 +327,10 @@
728	327	*
729	328	* @since 1.0.0
730	329	*
731	330	* @access public
732		- *
733	331	* @param array $links The array of original action links.
734	332	* @param string $file The plugin basename.
735		- *
736	333	* @return array Updated array of action links.
737	334	*/
738	335	public function getPluginActionLinks( $links, $file ) {
739	336	if ( $file == plugin_basename( VISUALIZER_BASEFILE ) ) {
		@@ -755,12 +352,10 @@
755	352	*
756	353	* @since 1.0.0
757	354	*
758	355	* @access public
759		- *
760	356	* @param array $plugin_meta The array of a plugin meta links.
761	357	* @param string $plugin_file The plugin's basename.
762		- *
763	358	* @return array Updated array of plugin meta links.
764	359	*/
765	360	public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
766	361	if ( $plugin_file == plugin_basename( VISUALIZER_BASEFILE ) ) {